Merge branch 'release/v4.4.1'

.travis.yml

@@ -0,0 +1,10 @@
+dist: trusty
+language: node_js
+node_js:
+  - '6'
+before_install: npm install -g grunt-cli
+before_script:
+  - cd build
+script:
+  - npm install
+  - grunt --level=ADVANCED

Readme.md

@@ -1,4 +1,4 @@
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)
+[![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
 

apps/api/documents/api.js

@@ -43,6 +43,7 @@
                     print: <can print>, // default = true
                     rename: <can rename>, // default = false
                     changeHistory: <can change history>, // default = false
+                    comment: <can comment in view mode> // default = edit
                 }
             },
             editorConfig: {
@@ -328,7 +329,7 @@
                 if (type && typeof type[1] === 'string') {
                     if (!_config.document.permissions)
                         _config.document.permissions = {};
-                    _config.document.permissions.edit = false;
+                    _config.document.permissions.edit = _config.document.permissions.review = false;
                     _config.editorConfig.canUseHistory = false;
                 }
 
@@ -411,21 +412,12 @@
             });
         };
 
-        var _showError = function(title, msg) {
+        var _showMessage = function(title, msg) {
-            _showMessage(title, msg, "error");
+            msg = msg || title;
-        };
-
-        // severity could be one of: "error", "info" or "warning"
-        var _showMessage = function(title, msg, severity) {
-            if (typeof severity !== 'string') {
-                severity = "info";
-            }
             _sendCommand({
                 command: 'showMessage',
                 data: {
-                    title: title,
+                    msg: msg
-                    msg: msg,
-                    severity: severity
                 }
             });
         };
@@ -542,7 +534,6 @@
         };
 
         return {
-            showError           : _showError,
             showMessage         : _showMessage,
             processSaveResult   : _processSaveResult,
             processRightsChange : _processRightsChange,

apps/common/embed/resources/less/common.less

@@ -563,6 +563,10 @@
             background-position: 0 -22px;
         }
     }
+
+    a {
+        cursor: pointer;
+    }
 }
 
 .masked {

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

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

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

@@ -188,6 +188,11 @@ define([
                             title       : me.options.hint,
                             placement   : me.options.hintAnchor||'cursor'
                         });
+
+                        var modalParents = el.closest('.asc-window');
+                        if (modalParents.length > 0) {
+                            el.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
+                        }
                     }
 
                     el.on('show.bs.dropdown',             _.bind(me.onBeforeShowMenu, me));
@@ -227,6 +232,7 @@ define([
                         minScrollbarLength: 40,
                         scrollYMarginOffset: 30,
                         includePadding: true,
+                        wheelSpeed: 10,
                         alwaysVisibleY: this.scrollAlwaysVisible
                     }, this.options.scroller));
                 }
@@ -251,6 +257,7 @@ define([
                         minScrollbarLength: 40,
                         scrollYMarginOffset: 30,
                         includePadding: true,
+                        wheelSpeed: 10,
                         alwaysVisibleY: this.scrollAlwaysVisible
                     }, this.options.scroller));
                 }
@@ -547,7 +554,7 @@ define([
                         '<% _.each(items, function(item) { %>',
                            '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
                         '<% }); %>'
-                    ].join(''), {
+                    ].join(''))({
                         items: this.store.toJSON(),
                         scope: this
                     }));
@@ -562,6 +569,7 @@ define([
                     minScrollbarLength : 40,
                     scrollYMarginOffset: 30,
                     includePadding     : true,
+                    wheelSpeed: 10,
                     alwaysVisibleY: this.scrollAlwaysVisible
                 }, this.options.scroller));
             }

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

@@ -87,6 +87,7 @@ define([
                 Common.UI.ComboBox.prototype.initialize.call(this, _.extend(options, {
                     displayField: 'name',
                     scroller: {
+                        wheelSpeed: 20,
                         alwaysVisibleY: true,
                         onChange: this.updateVisibleFontsTiles.bind(this)
                     }
@@ -353,7 +354,7 @@ define([
                     '<li id="<%= item.id %>">',
                         '<a class="font-item" tabindex="-1" type="menuitem" style="vertical-align:middle; margin: 0 0 0 -10px; height:<%=scope.getListItemHeight()%>px;"/>',
                     '</li>'
-                ].join(''), {
+                ].join(''))({
                     item: item.attributes,
                     scope: this
                 }));

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

@@ -59,7 +59,8 @@ define([
             enableKeyEvents     : false,
             beforeOpenHandler   : null,
             additionalMenuItems  : null,
-            showLast: true
+            showLast: true,
+            minWidth: -1
         },
 
         template: _.template([
@@ -86,6 +87,7 @@ define([
             this.rootHeight  = 0;
             this.rendered    = false;
             this.needFillComboView = false;
+            this.minWidth = this.options.minWidth;
 
             this.fieldPicker = new Common.UI.DataView({
                 cls: 'field-picker',
@@ -215,6 +217,8 @@ define([
                     width  = this.cmpEl.width(),
                     height = this.cmpEl.height();
 
+                if (width < this.minWidth) return;
+
                 if (this.rootWidth != width || this.rootHeight != height) {
                     this.rootWidth  = width;
                     this.rootHeight = height;
@@ -420,7 +424,7 @@ define([
 
                         var indexRec = store.indexOf(record),
                             countRec = store.length,
-                            maxViewCount = Math.floor((fieldPickerEl.width()) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
+                            maxViewCount = Math.floor(Math.max(fieldPickerEl.width(), me.minWidth) / (me.itemWidth + (me.itemMarginLeft || 0) + (me.itemMarginRight || 0) + (me.itemPaddingLeft || 0) + (me.itemPaddingRight || 0) +
                                                                                                 (me.itemBorderLeft || 0) + (me.itemBorderRight || 0))),
                             newStyles = [];
 
@@ -452,6 +456,10 @@ define([
             }
         },
 
+        clearComboView: function() {
+            this.fieldPicker.store.reset([]);
+        },
+
         selectByIndex: function(index) {
             if (index < 0)
                 this.fieldPicker.deselectAll();

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

@@ -297,7 +297,7 @@ define([
 
             if (_.isUndefined(this.scroller) && this.allowScrollbar) {
                 this.scroller = new Common.UI.Scroller({
-                    el: $(this.el).find('.inner').andSelf().filter('.inner'),
+                    el: $(this.el).find('.inner').addBack().filter('.inner'),
                     useKeyboard: this.enableKeyEvents && !this.handleSelect,
                     minScrollbarLength  : 40,
                     wheelSpeed: 10
@@ -394,7 +394,7 @@ define([
             });
 
             if (view) {
-                var innerEl = $(this.el).find('.inner').andSelf().filter('.inner');
+                var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
 
                 if (this.groups && this.groups.length > 0) {
                     var group = this.groups.findWhere({id: record.get('group')});
@@ -452,7 +452,7 @@ define([
             }
 
             if (this.store.length < 1 && this.emptyText.length > 0)
-                $(this.el).find('.inner').andSelf().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
+                $(this.el).find('.inner').addBack().filter('.inner').append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
 
             _.each(this.dataViewItems, function(item) {
                 this.stopListening(item);
@@ -464,7 +464,7 @@ define([
 
             if (this.allowScrollbar) {
                 this.scroller = new Common.UI.Scroller({
-                    el: $(this.el).find('.inner').andSelf().filter('.inner'),
+                    el: $(this.el).find('.inner').addBack().filter('.inner'),
                     useKeyboard: this.enableKeyEvents && !this.handleSelect,
                     minScrollbarLength  : 40,
                     wheelSpeed: 10
@@ -487,7 +487,7 @@ define([
             view.stopListening();
 
             if (this.store.length < 1 && this.emptyText.length > 0) {
-                var el = $(this.el).find('.inner').andSelf().filter('.inner');
+                var el = $(this.el).find('.inner').addBack().filter('.inner');
                 if ( el.find('.empty-text').length<=0 )
                     el.append('<table cellpadding="10" class="empty-text"><tr><td>' + this.emptyText + '</td></tr></table>');
             }
@@ -653,7 +653,7 @@ define([
 
         attachKeyEvents: function() {
             if (this.enableKeyEvents && this.handleSelect) {
-                var el = $(this.el).find('.inner').andSelf().filter('.inner');
+                var el = $(this.el).find('.inner').addBack().filter('.inner');
                 el.addClass('canfocused');
                 el.attr('tabindex', '0');
                 el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
@@ -673,7 +673,7 @@ define([
 
         setDisabled: function(disabled) {
             this.disabled = disabled;
-            $(this.el).find('.inner').andSelf().filter('.inner').toggleClass('disabled', disabled);
+            $(this.el).find('.inner').addBack().filter('.inner').toggleClass('disabled', disabled);
         },
 
         isDisabled: function() {
@@ -688,7 +688,7 @@ define([
             var menuRoot = (this.parentMenu.cmpEl.attr('role') === 'menu')
                             ? this.parentMenu.cmpEl
                             : this.parentMenu.cmpEl.find('[role=menu]'),
-                innerEl = $(this.el).find('.inner').andSelf().filter('.inner'),
+                innerEl = $(this.el).find('.inner').addBack().filter('.inner'),
                 docH = Common.Utils.innerHeight(),
                 menuH = menuRoot.outerHeight(),
                 top = parseInt(menuRoot.css('top'));

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

@@ -150,7 +150,7 @@ define([
                 if (!me.rendered) {
                     var el = this.cmpEl;
 
-                    this._input = this.cmpEl.find('input').andSelf().filter('input');
+                    this._input = this.cmpEl.find('input').addBack().filter('input');
 
                     if (this.editable) {
                         this._input.on('blur',   _.bind(this.onInputChanged, this));

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

@@ -405,6 +405,7 @@ define([
                     item.off('click').off('toggle');
                     item.remove();
                 });
+                this.rendered && this.cmpEl.find('.menu-scroll').off('click').remove();
 
                 me.items = [];
             },

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

@@ -150,6 +150,18 @@ define([
             }
             style = Common.Utils.String.format('linear-gradient(to right, {0} {1}%, {2} {3}%)',  this.colorValues[0], this.getValue(0), this.colorValues[1], this.getValue(1));
             this.trackEl.css('background', style);
+        },
+
+        sortThumbs: function() {
+            var recalc_indexes = Common.UI.MultiSlider.prototype.sortThumbs.call(this),
+                new_colors = [],
+                me = this;
+            _.each (recalc_indexes, function(recalc_index) {
+                new_colors.push(me.colorValues[recalc_index]);
+            });
+            this.colorValues = new_colors;
+            this.trigger('sortthumbs', me, recalc_indexes);
+            return recalc_indexes;
         }
     });
 });

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

@@ -338,16 +338,21 @@ define([
                 e.preventDefault();
                 e.stopPropagation();
 
-                var index = e.data,
+                var index = e.data.index,
                     lastValue = me.thumbs[index].value,
                     minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
                     maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
-                    pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
+                    position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
+                    need_sort = position < minValue || position > maxValue,
+                    pos = Math.max(0, Math.min(100, position)),
                     value = pos/me.delta + me.minValue;
 
                 me.setThumbPosition(index, pos);
                 me.thumbs[index].value = value;
 
+                if (need_sort)
+                    me.sortThumbs();
+
                 $(document).off('mouseup', onMouseUp);
                 $(document).off('mousemove', onMouseMove);
 
@@ -362,16 +367,21 @@ define([
                 e.preventDefault();
                 e.stopPropagation();
 
-                var index = e.data,
+                var index = e.data.index,
                     lastValue = me.thumbs[index].value,
                     minValue = (index-1<0) ? 0 : me.thumbs[index-1].position,
                     maxValue = (index+1<me.thumbs.length) ? me.thumbs[index+1].position : 100,
-                    pos = Math.max(minValue, Math.min(maxValue, (Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100)))),
+                    position = Math.round((e.pageX*Common.Utils.zoom() - me.cmpEl.offset().left - me._dragstart) / me.width * 100),
+                    need_sort = position < minValue || position > maxValue,
+                    pos = Math.max(0, Math.min(100, position)),
                     value = pos/me.delta + me.minValue;
 
                 me.setThumbPosition(index, pos);
                 me.thumbs[index].value = value;
 
+                if (need_sort)
+                    me.sortThumbs();
+
                 if (Math.abs(value-lastValue)>0.001)
                     me.trigger('change', me, value, lastValue);
             };
@@ -379,7 +389,7 @@ define([
             var onMouseDown = function (e) {
                 if ( me.disabled ) return;
 
-                var index = e.data,
+                var index = e.data.index,
                     thumb = me.thumbs[index].thumb;
 
                 me._dragstart = e.pageX*Common.Utils.zoom() - thumb.offset().left - thumb.width()/2;
@@ -389,8 +399,8 @@ define([
                     (index == idx) ? item.thumb.css('z-index', 500) : item.thumb.css('z-index', '');
                 });
 
-                $(document).on('mouseup', null, index, onMouseUp);
+                $(document).on('mouseup', null, e.data, onMouseUp);
-                $(document).on('mousemove', null, index, onMouseMove);
+                $(document).on('mousemove', null, e.data, onMouseMove);
             };
 
             var onTrackMouseDown = function (e) {
@@ -441,7 +451,7 @@ define([
                     index: index
                 });
                 me.setValue(index, me.options.values[index]);
-                thumb.on('mousedown', null, index, onMouseDown);
+                thumb.on('mousedown', null, me.thumbs[index], onMouseDown);
             });
             me.setActiveThumb(0, true);
 
@@ -489,6 +499,18 @@ define([
             if (disabled !== this.disabled)
                 this.cmpEl.toggleClass('disabled', disabled);
             this.disabled = disabled;
+        },
+
+        sortThumbs: function() {
+            this.thumbs.sort(function(a, b) {
+                return (a.position - b.position);
+            });
+            var recalc_indexes = [];
+            _.each (this.thumbs, function(thumb, index) {
+                recalc_indexes.push(thumb.index);
+                thumb.index = index;
+            });
+            return recalc_indexes;
         }
     });
 });

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

@@ -247,8 +247,8 @@ define([
             Common.UI.Menu.Manager.hideAll();
             var zoom = (event instanceof jQuery.Event) ? Common.Utils.zoom() : 1;
             this.dragging.enabled = true;
-            this.dragging.initx = event.pageX*zoom - parseInt(this.$window.css('left'));
+            this.dragging.initx = event.pageX*zoom - this.getLeft();
-            this.dragging.inity = event.pageY*zoom - parseInt(this.$window.css('top'));
+            this.dragging.inity = event.pageY*zoom - this.getTop();
 
             if (window.innerHeight == undefined) {
                 var main_width  = document.documentElement.offsetWidth;
@@ -258,8 +258,8 @@ define([
                 main_height = Common.Utils.innerHeight();
             }
 
-            this.dragging.maxx  = main_width - parseInt(this.$window.css("width"));
+            this.dragging.maxx  = main_width - this.getWidth();
-            this.dragging.maxy  = main_height - parseInt(this.$window.css("height"));
+            this.dragging.maxy  = main_height - this.getHeight();
 
             $(document).on('mousemove', this.binding.drag);
             $(document).on('mouseup', this.binding.dragStop);
@@ -297,16 +297,16 @@ define([
         function _resizestart(event) {
             Common.UI.Menu.Manager.hideAll();
             var el = $(event.target),
-                left = parseInt(this.$window.css('left')),
+                left = this.getLeft(),
-                top = parseInt(this.$window.css('top'));
+                top = this.getTop();
 
             this.resizing.enabled = true;
             this.resizing.initpage_x = event.pageX*Common.Utils.zoom();
             this.resizing.initpage_y = event.pageY*Common.Utils.zoom();
             this.resizing.initx = this.resizing.initpage_x - left;
             this.resizing.inity = this.resizing.initpage_y - top;
-            this.resizing.initw = parseInt(this.$window.css("width"));
+            this.resizing.initw = this.getWidth();
-            this.resizing.inith = parseInt(this.$window.css("height"));
+            this.resizing.inith = this.getHeight();
             this.resizing.type = [el.hasClass('left') ? -1 : (el.hasClass('right') ? 1 : 0), el.hasClass('top') ? -1 : (el.hasClass('bottom') ? 1 : 0)];
 
             var main_width  = (window.innerHeight == undefined) ? document.documentElement.offsetWidth : Common.Utils.innerWidth(),
@@ -421,7 +421,7 @@ define([
             _.extend(options, {
                 cls: 'alert',
                 onprimary: onKeyDown,
-                tpl: _.template(template, options)
+                tpl: _.template(template)(options)
             });
 
             var win = new Common.UI.Window(options),
@@ -433,7 +433,8 @@ define([
                 var footer      = window.getChild('.footer');
                 var header      = window.getChild('.header');
                 var body        = window.getChild('.body');
-                var icon        = window.getChild('.icon');
+                var icon        = window.getChild('.icon'),
+                    icon_height = (icon.length>0) ? icon.height() : 0;
                 var check       = window.getChild('.info-box .dont-show-checkbox');
 
                 if (!options.dontshow) body.css('padding-bottom', '10px');
@@ -443,19 +444,19 @@ define([
                         options.width = options.maxwidth;
                 }
                 if (options.width=='auto') {
-                    text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon.height()));
+                    text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon_height));
                     body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
                     window.setSize(text.position().left + text.width() + parseInt(text_cnt.css('padding-right')),
                         parseInt(body.css('height')) + parseInt(header.css('height')));
                 } else {
                     text.css('white-space', 'normal');
                     window.setWidth(options.width);
-                    text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon.height()));
+                    text_cnt.height(Math.max(text.height() + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0), icon_height));
                     body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
                     window.setHeight(parseInt(body.css('height')) + parseInt(header.css('height')));
                 }
-                if (text.height() < icon.height()-10)
+                if (text.height() < icon_height-10)
-                    text.css({'vertical-align': 'baseline', 'line-height': icon.height()+'px'});
+                    text.css({'vertical-align': 'baseline', 'line-height': icon_height+'px'});
             }
 
             function onBtnClick(event) {
@@ -556,7 +557,7 @@ define([
             render : function() {
                 var renderto = this.initConfig.renderTo || document.body;
                 $(renderto).append(
-                    _.template(template, this.initConfig)
+                    _.template(template)(this.initConfig)
                 );
 
                 this.$window = $('#' + this.initConfig.id);
@@ -695,7 +696,7 @@ define([
                         hide_mask = true;
                     mask.attr('counter', parseInt(mask.attr('counter'))-1);
 
-                    if (this.$lastmodal.size() > 0) {
+                    if (this.$lastmodal.length > 0) {
                         this.$lastmodal.removeClass('dethrone');
                         hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
                     }
@@ -736,7 +737,7 @@ define([
                             hide_mask = true;
                         mask.attr('counter', parseInt(mask.attr('counter'))-1);
 
-                        if (this.$lastmodal.size() > 0) {
+                        if (this.$lastmodal.length > 0) {
                             this.$lastmodal.removeClass('dethrone');
                             hide_mask = !(this.$lastmodal.hasClass('modal') && this.$lastmodal.is(':visible'));
                         }
@@ -825,6 +826,14 @@ define([
                 return this.$window.find('> .header > .title').text();
             },
 
+            getLeft: function() {
+                return parseInt(this.$window.css('left'));
+            },
+
+            getTop: function() {
+                return parseInt(this.$window.css('top'));
+            },
+
             isVisible: function() {
                 return this.$window && this.$window.is(':visible');
             },

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

@@ -211,8 +211,8 @@ define([
                 ascComment.asc_putText(comment.get('comment'));
                 ascComment.asc_putQuoteText(comment.get('quote'));
                 ascComment.asc_putTime(t.utcDateToString(new Date(comment.get('time'))));
-                ascComment.asc_putUserId(t.currentUserId);
+                ascComment.asc_putUserId(comment.get('userid'));
-                ascComment.asc_putUserName(t.currentUserName);
+                ascComment.asc_putUserName(comment.get('username'));
                 ascComment.asc_putSolved(!comment.get('resolved'));
 
                 if (!_.isUndefined(ascComment.asc_putDocumentFlag)) {
@@ -744,14 +744,15 @@ define([
             if (this.mode && !this.mode.canComments)
                 hint = true;
 
-            if (this.getPopover()) {
+            var popover = this.getPopover();
+            if (popover) {
                 this.clearDummyComment();
 
                 if (this.isSelectedComment && (0 === _.difference(this.uids, uids).length)) {
                     //NOTE: click to sdk view ?
                     if (this.api) {
                         //this.view.txtComment.blur();
-                        this.getPopover().commentsView.setFocusToTextBox(true);
+                        popover.commentsView && popover.commentsView.setFocusToTextBox(true);
                         this.api.asc_enableKeyEvents(true);
                     }
 
@@ -807,12 +808,12 @@ define([
                     this._dontScrollToComment = false;
                 }
 
-                if (this.getPopover().isVisible()) {
+                if (popover.isVisible()) {
-                    this.getPopover().hide();
+                    popover.hide();
                 }
 
-                this.getPopover().setLeftTop(posX, posY, leftX);
+                popover.setLeftTop(posX, posY, leftX);
-                this.getPopover().show(animate, false, true, text);
+                popover.show(animate, false, true, text);
             }
         },
         onApiHideComment: function (hint) {

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

@@ -126,6 +126,7 @@ define([
                     variation.set_Url(itemVar.get('url'));
                     variation.set_Icons(itemVar.get('icons'));
                     variation.set_Visual(itemVar.get('isVisual'));
+                    variation.set_CustomWindow(itemVar.get('isCustomWindow'));
                     variation.set_Viewer(itemVar.get('isViewer'));
                     variation.set_EditorsSupport(itemVar.get('EditorsSupport'));
                     variation.set_Modal(itemVar.get('isModal'));
@@ -226,6 +227,7 @@ define([
                         this.api.asc_pluginButtonClick(-1);
                 } else {
                     var me = this,
+                        isCustomWindow = variation.get_CustomWindow(),
                         arrBtns = variation.get_Buttons(),
                         newBtns = {},
                         size = variation.get_Size();
@@ -238,11 +240,13 @@ define([
                     }
 
                     me.pluginDlg = new Common.Views.PluginDlg({
+                        cls: isCustomWindow ? 'plain' : '',
+                        header: !isCustomWindow,
                         title: plugin.get_Name(),
                         width: size[0], // inner width
                         height: size[1], // inner height
                         url: url,
-                        buttons: newBtns,
+                        buttons: isCustomWindow ? undefined : newBtns,
                         toolcallback: _.bind(this.onToolClose, this)
                     });
                     me.pluginDlg.on('render:after', function(obj){

apps/common/main/lib/extend/Bootstrap.js

@@ -81,8 +81,8 @@ function patchDropDownKeyDown(e) {
     if (!isActive || (isActive && e.keyCode == 27)) {
         if (e.which == 27) {
             $items = $('[role=menu] li.dropdown-submenu.over:visible', $parent);
-            if ($items.size()) {
+            if ($items.length) {
-                $items.eq($items.size()-1).removeClass('over');
+                $items.eq($items.length-1).removeClass('over');
                 return false;
             } else if ($parent.hasClass('dropdown-submenu') && $parent.hasClass('over')) {
                 $parent.removeClass('over');
@@ -110,6 +110,7 @@ function patchDropDownKeyDown(e) {
              _.delay(function() {
                  var mnu = $('> [role=menu]', li),
                     $subitems = mnu.find('> li:not(.divider):not(.disabled):visible > a'),
+                    $dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'),
                     focusIdx = 0;
                  if (mnu.find('> .menu-scroll').length>0) {
                     var offset = mnu.scrollTop();
@@ -119,7 +120,7 @@ function patchDropDownKeyDown(e) {
                         }
                     }
                 }
-                if ($subitems.length>0)
+                if ($subitems.length>0 && $dataviews.length<1)
                     $subitems.eq(focusIdx).focus();
             }, 250);
         }

apps/common/main/lib/model/Plugin.js

@@ -58,6 +58,7 @@ define([
                 isViewer: false,
                 EditorsSupport: ["word", "cell", "slide"],
                 isVisual: false,
+                isCustomWindow: false,
                 isModal: false,
                 isInsideMode: false,
                 initDataType: 0,

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

@@ -142,6 +142,8 @@ Common.util.LanguageInfo = new(function() {
         0x0809 : ["en-GB", "English (United Kingdom)"],
         0x0409 : ["en-US", "English (United States)"],
         0x3009 : ["en-ZW", "English (Zimbabwe)"],
+        0x3c09 : ["en-HK", "English (Hong Kong)"],
+        0x3809 : ["en-ID", "English (Indonesia)"],
         0x0025 : ["et", "Eesti"],
         0x0425 : ["et-EE", "Eesti (Eesti)"],
         0x0038 : ["fo", "Føroyskt"],
@@ -157,6 +159,15 @@ Common.util.LanguageInfo = new(function() {
         0x140C : ["fr-LU", "Français (Luxembourg)"],
         0x180C : ["fr-MC", "Français (Principauté de Monaco)"],
         0x100C : ["fr-CH", "Français (Suisse)"],
+        0x3c0c : ["fr-HT", "French (Haiti)"],
+        0x240c : ["fr-CG", "French (Congo)"],
+        0x300c : ["fr-CI", "French (Cote d'Ivoire)"],
+        0x2c0c : ["fr-CM", "French (Cameroon)"],
+        0x380c : ["fr-MA", "French (Morocco)"],
+        0x340c : ["fr-ML", "French (Mali)"],
+        0x200c : ["fr-RE", "French (Reunion)"],
+        0x280c : ["fr-SN", "French (Senegal)"],
+        0x1c0c : ["fr-West", "French"],
         0x0062 : ["fy", "Frysk"],
         0x0462 : ["fy-NL", "Frysk (Nederlân)"],
         0x0056 : ["gl", "Galego"],
@@ -284,10 +295,12 @@ Common.util.LanguageInfo = new(function() {
         0x0C6B : ["quz-PE", "Runasimi (Piruw)"],
         0x0018 : ["ro", "Română"],
         0x0418 : ["ro-RO", "Română (România)"],
+        0x0818 : ["ro-MD", "Română (Moldova)"],
         0x0017 : ["rm", "Rumantsch"],
         0x0417 : ["rm-CH", "Rumantsch (Svizra)"],
         0x0019 : ["ru", "Русский"],
         0x0419 : ["ru-RU", "Русский (Россия)"],
+        0x0819 : ["ru-MD", "Русский (Молдавия)"],
         0x703B : ["smn", "Sämikielâ"],
         0x7C3B : ["smj", "Julevusámegiella"],
         0x003B : ["se", "Davvisámegiella"],
@@ -348,6 +361,7 @@ Common.util.LanguageInfo = new(function() {
         0x540A : ["es-US", "Español (Estados Unidos)"],
         0x380A : ["es-UY", "Español (Uruguay)"],
         0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)"],
+        0x040a : ["es-ES_tradnl", "Spanish"],
         0x001D : ["sv", "Svenska"],
         0x081D : ["sv-FI", "Svenska (Finland)"],
         0x041D : ["sv-SE", "Svenska (Sverige)"],
@@ -398,45 +412,31 @@ Common.util.LanguageInfo = new(function() {
         0x0478 : ["ii-CN", "ꆈꌠꁱꂷ (ꍏꉸꏓꂱꇭꉼꇩ)"],
         0x006A : ["yo", "Yoruba"],
         0x046A : ["yo-NG", "Yoruba (Nigeria)"],
-        0x0851 : ["bo-BT", "Tibetan, Bhutan"],
+        0x0851 : ["bo-BT", "Tibetan (Bhutan)"],
-        0x0466 : ["bin-NG", "Bini, Nigeria"],
+        0x0466 : ["bin-NG", "Bini (Nigeria)"],
-        0x045c : ["chr-US", "Cherokee, United States"],
+        0x045c : ["chr-US", "Cherokee (United States)"],
-        0x3c09 : ["en-HK", "English, Hong Kong"],
+        0x0467 : ["fuv-NG", "Nigerian Fulfulde (Nigeria)"],
-        0x3809 : ["en-ID", "English, Indonesia"],
+        0x0472 : ["gaz-ET", "West Central Oromo (Ethiopia)"],
-        0x040a : ["es-ES_tradnl", "Spanish"],
+        0x0474 : ["gn-PY", "Guarani (Paraguay)"],
-        0x3c0c : ["fr-HT", "French, Haiti"],
+        0x0475 : ["haw-US", "Hawaiian (United States)"],
-        0x240c : ["fr-CG", "French, Congo"],
+        0x0469 : ["ibb-NG", "Ibibio (Nigeria)"],
-        0x300c : ["fr-CI", "French, Cote d'Ivoire"],
+        0x0471 : ["kr-NG", "Kanuri (Nigeria)"],
-        0x2c0c : ["fr-CM", "French, Cameroon"],
-        0x380c : ["fr-MA", "French, Morocco"],
-        0x340c : ["fr-ML", "French, Mali"],
-        0x200c : ["fr-RE", "French, Reunion"],
-        0x280c : ["fr-SN", "French, Senegal"],
-        0x1c0c : ["fr-West", "French"],
-        0x0467 : ["fuv-NG", "Nigerian Fulfulde, Nigeria"],
-        0x0472 : ["gaz-ET", "West Central Oromo, Ethiopia"],
-        0x0474 : ["gn-PY", "Guarani, Paraguay"],
-        0x0475 : ["haw-US", "Hawaiian, UnitedStates"],
-        0x0469 : ["ibb-NG", "Ibibio, Nigeria"],
-        0x0471 : ["kr-NG", "Kanuri, Nigeria"],
         0x0458 : ["mni", "Manipuri"],
-        0x0455 : ["my-MM", "Burmese, Myanmar"],
+        0x0455 : ["my-MM", "Burmese (Myanmar)"],
-        0x0861 : ["ne-IN", "Nepali, India"],
+        0x0861 : ["ne-IN", "Nepali (India)"],
         0x0479 : ["pap-AN", "Papiamento, Netherlands Antilles"],
-        0x0846 : ["pa-PK", "Panjabi, Pakistan"],
+        0x0846 : ["pa-PK", "Panjabi (Pakistan)"],
-        0x048d : ["plt-MG", "Plateau Malagasy, Madagascar"],
+        0x048d : ["plt-MG", "Plateau Malagasy (Madagascar)"],
-        0x0818 : ["ro-MO", "Romanian, Macao"],
+        0x0459 : ["sd-IN", "Sindhi (India)"],
-        0x0819 : ["ru-MO", "Russian, Macao"],
+        0x0859 : ["sd-PK", "Sindhi (Pakistan)"],
-        0x0459 : ["sd-IN", "Sindhi, India"],
+        0x0477 : ["so-SO", "Somali (Somalia)"],
-        0x0859 : ["sd-PK", "Sindhi, Pakistan"],
+        0x0430 : ["st-ZA", "Southern Sotho (South Africa)"],
-        0x0477 : ["so-SO", "Somali, Somalia"],
+        0x0473 : ["ti-ER", "Tigrinya (Eritrea)"],
-        0x0430 : ["st-ZA", "Southern Sotho, South Africa"],
+        0x0873 : ["ti-ET", "Tigrinya (Ethiopia)"],
-        0x0473 : ["ti-ER", "Tigrinya, Eritrea"],
-        0x0873 : ["ti-ET", "Tigrinya, Ethiopia"],
         0x045f : ["tmz", "Tamanaku"],
-        0x0c5f : ["tmz-MA", "Tamanaku, Morocco"],
+        0x0c5f : ["tmz-MA", "Tamanaku (Morocco)"],
-        0x0431 : ["ts-ZA", "Tsonga, South Africa"],
+        0x0431 : ["ts-ZA", "Tsonga (South Africa)"],
-        0x0820 : ["ur-IN", "Urdu, India"],
+        0x0820 : ["ur-IN", "Urdu (India)"],
         0x0433 : ["ven-ZA", "South Africa"]
     };
 

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

@@ -63,7 +63,12 @@ define(['gateway'], function () {
 
         var _setItem = function(name, value, just) {
             if (_lsAllowed) {
-                localStorage.setItem(name, value);
+                try
+                {
+                    localStorage.setItem(name, value);
+                }
+                catch (error){}
+
             } else {
                 _store[name] = value;
 

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

@@ -71,7 +71,7 @@ define([
                 '</div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.handler = _options.handler;
             this.toggleGroup = _options.toggleGroup;
@@ -102,9 +102,10 @@ define([
                 btn.on('click', _.bind(me.onCategoryClick, me));
                 me.btnsCategory.push(btn);
             });
-            var cnt_panel = $window.find('.content-panel');
+            var cnt_panel = $window.find('.content-panel'),
+                menu_panel = $window.find('.menu-panel');
             cnt_panel.width(this.contentWidth);
-            $window.width($window.find('.menu-panel').width() + cnt_panel.outerWidth() + 2);
+            $window.width(((menu_panel.length>0) ? menu_panel.width() : 0) + cnt_panel.outerWidth() + 2);
 
             this.content_panels = $window.find('.settings-panel');
             if (this.btnsCategory.length>0)

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

@@ -67,7 +67,7 @@ define([
 
         templateUserList: _.template('<ul>' +
                         '<% _.each(users, function(item) { %>' +
-                            '<%= _.template(usertpl, {user: item, scope: scope}) %>' +
+                            '<%= _.template(usertpl)({user: item, scope: scope}) %>' +
                         '<% }); %>' +
                     '</ul>'),
 
@@ -82,7 +82,7 @@ define([
 
         templateMsgList: _.template('<ul>' +
                         '<% _.each(messages, function(item) { %>' +
-                            '<%= _.template(msgtpl, {msg: item, scope: scope}) %>' +
+                            '<%= _.template(msgtpl)({msg: item, scope: scope}) %>' +
                         '<% }); %>' +
                     '</ul>'),
 
@@ -162,7 +162,7 @@ define([
 
         _onAddUser: function(m, c, opts) {
             if (this.panelUsers) {
-                this.panelUsers.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
+                this.panelUsers.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
                 this.panelUsers.scroller.update({minScrollbarLength  : 25, alwaysVisibleY: true});
             }
         },
@@ -186,7 +186,7 @@ define([
                 var content = this.panelMessages.find('ul');
                 if (content && content.length) {
                     this._prepareMessage(m);
-                    content.append(_.template(this.tplMsg, {msg: m, scope: this}));
+                    content.append(_.template(this.tplMsg)({msg: m, scope: this}));
 
                     // scroll to end
 

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

@@ -98,7 +98,7 @@ define([
             this.store      = options.store;
             this.delegate   = options.delegate;
 
-            _options.tpl    = _.template(this.template, _options);
+            _options.tpl    = _.template(this.template)(_options);
 
             this.arrow      = {margin: 20, width: 12, height: 34};
             this.sdkBounds  = {width: 0, height: 0, padding: 10, paddingTop: 20};
@@ -517,7 +517,7 @@ define([
             if (this.handlerHide) {
                 this.handlerHide ();
             }
-
+            this.hideTips();
             Common.UI.Window.prototype.hide.call(this);
 
             if (!_.isUndefined(this.e) && this.e.keyCode == Common.UI.Keys.ESC) {

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

@@ -83,7 +83,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },

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

@@ -48,7 +48,7 @@ define([
             var _options = {};
             _.extend(_options,  {
                 title: this.textTitle,
-                width: 850,
+                width: 600,
                 height: 536,
                 header: true
             }, options);
@@ -57,7 +57,7 @@ define([
                 '<div id="id-sharing-placeholder"></div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.settingsurl = options.settingsurl || '';
             Common.UI.Window.prototype.initialize.call(this, _options);

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

@@ -66,7 +66,7 @@ define([
                 '</div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.handler = _options.handler;
             this._chartData = null;

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

@@ -66,7 +66,7 @@ define([
                 '</div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.handler = _options.handler;
             this._mergeData = null;

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

@@ -65,7 +65,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },

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

@@ -73,7 +73,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },

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

@@ -0,0 +1,143 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2017
+ *
+ * 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 Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * 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
+ *
+ */
+
+/**
+ *  LanguageDialog.js
+ *
+ *  Created by Julia Radzhabova on 04/25/2017
+ *  Copyright (c) 2017 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+define([
+    'common/main/lib/component/Window'
+], function () { 'use strict';
+
+    Common.Views.LanguageDialog = Common.UI.Window.extend(_.extend({
+
+    options: {
+        header: false,
+        width: 350,
+        cls: 'modal-dlg'
+    },
+
+    template:   '<div class="box">' +
+    '<div class="input-row">' +
+    '<label><%= label %></label>' +
+    '</div>' +
+    '<div class="input-row" id="id-document-language">' +
+    '</div>' +
+    '</div>' +
+    '<div class="footer right">' +
+    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;"><%= btns.ok %></button>'+
+    '<button class="btn normal dlg-btn" result="cancel"><%= btns.cancel %></button>'+
+    '</div>',
+
+    initialize : function(options) {
+        _.extend(this.options, options || {}, {
+            label: this.labelSelect,
+            btns: {ok: this.btnOk, cancel: this.btnCancel}
+        });
+        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 $window = this.getChild();
+        $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+        this.cmbLanguage = new Common.UI.ComboBox({
+            el: $window.find('#id-document-language'),
+            cls: 'input-group-nr',
+            menuStyle: 'min-width: 318px; max-height: 300px;',
+            editable: false,
+            template: _.template([
+                '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
+                '<input type="text" class="form-control">',
+                '<span class="input-lang-icon lang-flag" style="position: absolute;"></span>',
+                '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
+                '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
+                '<% _.each(items, function(item) { %>',
+                '<li id="<%= item.id %>" data-value="<%= item.value %>">',
+                '<a tabindex="-1" type="menuitem" style="padding-left: 26px !important;">',
+                '<span class="lang-item-icon lang-flag <%= item.value %>" style="position: absolute;margin-left:-21px;"></span>',
+                '<%= scope.getDisplayValue(item) %>',
+                '</a>',
+                '</li>',
+                '<% }); %>',
+                '</ul>',
+                '</span>'
+            ].join('')),
+            data: this.options.languages
+        });
+
+        if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
+        this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
+        this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
+        this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
+    },
+
+    close: function(suppressevent) {
+        var $window = this.getChild();
+        if (!$window.find('.combobox.open').length) {
+            Common.UI.Window.prototype.close.call(this, arguments);
+        }
+    },
+
+    onBtnClick: function(event) {
+        if (this.options.handler) {
+            this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbLanguage.getValue());
+        }
+
+        this.close();
+    },
+
+    onLangSelect: function(cmb, rec, e) {
+        var icon    = cmb.$el.find('.input-lang-icon'),
+            plang   = icon.attr('lang');
+
+        if (plang) icon.removeClass(plang);
+        icon.addClass(rec.value).attr('lang',rec.value);
+    },
+
+    labelSelect     : 'Select document language',
+    btnCancel       : 'Cancel',
+    btnOk           : 'Ok'
+    }, Common.Views.LanguageDialog || {}))
+});

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

@@ -76,7 +76,10 @@ define([
                         '<div id="id-codepages-combo" class="input-group-nr" style="margin-bottom:15px;"></div>',
                         '<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>',
                         '<label class="header">' + t.txtDelimiter + '</label>',
-                        '<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;"></div>',
+                        '<div>',
+                            '<div id="id-delimiters-combo" class="input-group-nr" style="max-width: 110px;display: inline-block; vertical-align: middle;"></div>',
+                            '<div id="id-delimiter-other" class="input-row" style="display: inline-block; vertical-align: middle;margin-left: 10px;"></div>',
+                        '</div>',
                         '<% } %>',
                     '<% } %>',
                     '</div>',
@@ -93,7 +96,7 @@ define([
             this.codepages      =   options.codepages;
             this.settings       =   options.settings;
 
-            _options.tpl        =   _.template(this.template, _options);
+            _options.tpl        =   _.template(this.template)(_options);
 
             Common.UI.Window.prototype.initialize.call(this, _options);
         },
@@ -135,9 +138,12 @@ define([
 
         onBtnClick: function (event) {
             if (this.handler) {
-                if (this.cmbEncoding)
+                if (this.cmbEncoding) {
-                    this.handler.call(this, this.cmbEncoding.getValue(), this.cmbDelimiter ? this.cmbDelimiter.getValue() : null);
+                    var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
-                else
+                        delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
+                    (delimiter == -1) && (delimiter = null);
+                    this.handler.call(this, this.cmbEncoding.getValue(), delimiter, delimiterChar);
+                } else
                     this.handler.call(this, this.inputPwd.getValue());
             }
 
@@ -337,14 +343,29 @@ define([
                             {value: 2, displayValue: ';'},
                             {value: 3, displayValue: ':'},
                             {value: 1, displayValue: this.txtTab},
-                            {value: 5, displayValue: this.txtSpace}],
+                            {value: 5, displayValue: this.txtSpace},
+                            {value: -1, displayValue: this.txtOther}],
                         editable: false
                     });
                     this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
+                    this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
+
+                    this.inputDelimiter = new Common.UI.InputField({
+                        el          : $('#id-delimiter-other'),
+                        style       : 'width: 30px;',
+                        maxLength: 1,
+                        value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
+                    });
+                    this.inputDelimiter.setVisible(false);
+
                 }
             }
         },
 
+        onCmbDelimiterSelect: function(combo, record){
+            this.inputDelimiter.setVisible(record.value == -1);
+        },
+
         okButtonText       : "OK",
         cancelButtonText   : "Cancel",
         txtDelimiter       : "Delimiter",
@@ -353,7 +374,8 @@ define([
         txtTab             : "Tab",
         txtTitle           : "Choose %1 options",
         txtPassword        : "Password",
-        txtTitleProtected  : "Protected File"
+        txtTitleProtected  : "Protected File",
+        txtOther: 'Other'
 
     }, Common.Views.OpenDialog || {}));
 });

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

@@ -201,21 +201,23 @@ define([
         initialize : function(options) {
             var _options = {};
             _.extend(_options,  {
-                cls: 'advanced-settings-dlg',
                 header: true,
                 enableKeyEvents: false
             }, options);
 
             var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
-            _options.width = (Common.Utils.innerWidth()-_options.width)<0 ? Common.Utils.innerWidth(): _options.width,
+            if (!_options.header) header_footer -= 34;
+            this.bordersOffset = 25;
+            _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
             _options.height += header_footer;
-            _options.height = (Common.Utils.innerHeight()-_options.height)<0 ? Common.Utils.innerHeight(): _options.height;
+            _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
+            _options.cls += ' advanced-settings-dlg';
 
             this.template = [
                 '<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
                     '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
-                '<% if (_.size(buttons) > 0) { %>',
+                '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
                     '<div class="separator horizontal"/>',
                     '<div class="footer" style="text-align: center;">',
                         '<% for(var bt in buttons) { %>',
@@ -225,7 +227,7 @@ define([
                 '<% } %>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.url = options.url || '';
             Common.UI.Window.prototype.initialize.call(this, _options);
@@ -237,6 +239,7 @@ define([
 
             this.boxEl = this.$window.find('.body > .box');
             this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
+            if (!this.options.header) this._headerFooterHeight -= 34;
             this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
 
             var iframe = document.createElement("iframe");
@@ -264,6 +267,14 @@ define([
             this.on('resizing', function(args){
                 me.boxEl.css('height', parseInt(me.$window.css('height')) - me._headerFooterHeight);
             });
+
+            var onMainWindowResize = function(){
+                me.onWindowResize();
+            };
+            $(window).on('resize', onMainWindowResize);
+            this.on('close', function() {
+                $(window).off('resize', onMainWindowResize);
+            });
         },
 
         _onLoad: function() {
@@ -275,11 +286,12 @@ define([
         setInnerSize: function(width, height) {
             var maxHeight = Common.Utils.innerHeight(),
                 maxWidth = Common.Utils.innerWidth(),
-                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width')));
+                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
-            if (maxHeight<height + this._headerFooterHeight)
+                bordersOffset = this.bordersOffset*2;
-                height = maxHeight - this._headerFooterHeight;
+            if (maxHeight - bordersOffset<height + this._headerFooterHeight)
-            if (maxWidth<width + borders_width)
+                height = maxHeight - bordersOffset - this._headerFooterHeight;
-                width = maxWidth - borders_width;
+            if (maxWidth - bordersOffset<width + borders_width)
+                width = maxWidth - bordersOffset - borders_width;
 
             this.boxEl.css('height', height);
 
@@ -290,6 +302,35 @@ define([
             this.$window.css('top',((maxHeight - height - this._headerFooterHeight) / 2) * 0.9);
         },
 
+        onWindowResize: function() {
+            var main_width  = Common.Utils.innerWidth(),
+                main_height = Common.Utils.innerHeight(),
+                win_width = this.getWidth(),
+                win_height = this.getHeight(),
+                bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
+            if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
+                var left = this.getLeft(),
+                    top = this.getTop();
+
+                if (top<bordersOffset) this.$window.css('top', bordersOffset);
+                else if (top+win_height>main_height-bordersOffset)
+                    this.$window.css('top', main_height-bordersOffset - win_height);
+                if (left<bordersOffset) this.$window.css('left', bordersOffset);
+                else if (left+win_width>main_width-bordersOffset)
+                    this.$window.css('left', main_width-bordersOffset-win_width);
+            } else {
+                if (win_height>main_height-bordersOffset*2) {
+                    this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
+                    this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
+                    this.$window.css('top', bordersOffset);
+                }
+                if (win_width>main_width-bordersOffset*2) {
+                    this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
+                    this.$window.css('left', bordersOffset);
+                }
+            }
+        },
+
         textLoading : 'Loading'
     }, Common.Views.PluginDlg || {}));
 });

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

@@ -66,7 +66,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },

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

@@ -80,7 +80,7 @@ define([
             this.store      = options.store;
             this.delegate   = options.delegate;
 
-            _options.tpl    = _.template(this.template, _options);
+            _options.tpl    = _.template(this.template)(_options);
 
             this.arrow      = {margin: 20, width: 12, height: 34};
             this.sdkBounds  = {width: 0, height: 0, padding: 10, paddingTop: 20};
@@ -441,7 +441,7 @@ define([
             var el = $(this.el),
                 me = this;
             el.addClass('review-changes');
-            el.html(_.template(this.template, {
+            el.html(_.template(this.template)({
                 scope: this
             }));
 

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

@@ -105,7 +105,7 @@
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },

apps/common/main/resources/less/asc-mixins.less

@@ -178,4 +178,20 @@
         background-image: data-uri(%("%s",'@{common-image-path}/hsbcolorpicker/hsb-colorpicker@2x.png'));
         background-size:  @img-colorpicker-width auto;
     }
+}
+
+@img-flags-width: 48px;
+.lang-flag {
+    width: 16px;
+    height: 12px;
+    background-image: data-uri(%("%s",'@{common-image-path}/controls/flags.png'));
+    background-repeat: no-repeat;
+
+    @media
+    only screen and (-webkit-min-device-pixel-ratio: 2),
+    only screen and (min-resolution: 2dppx),
+    only screen and (min-resolution: 192dpi) {
+        background-image: data-uri(%("%s",'@{common-image-path}/controls/flags@2x.png'));
+        background-size:  @img-flags-width auto;
+    }
 }

apps/common/main/resources/less/language-dialog.less

@@ -0,0 +1,67 @@
+.combo-langs {
+  .dropdown-menu {
+    li .lang-item-icon {
+      margin-top: 1px;
+    }
+  }
+
+  .input-lang-icon {
+    position: absolute;
+    left: 5px;
+    top: 5px;
+  }
+
+  input {
+    padding-left: 25px !important;
+  }
+}
+
+.lang-flag {
+  background-position: -16px -108px;
+
+  &.ca, &.ca-ES                     {background-position: 0          0;}
+  &.cs, &.cs-CZ                     {background-position: -16px      0;}
+  &.da, &.da-DK                     {background-position: -32px      0;}
+  &.de, &.de-DE                     {background-position: 0          -12px;}
+  &.el, &.el-GR                     {background-position: -16px      -12px;}
+  &.en, &.en-US                     {background-position: -32px      -12px;}
+  &.fr, &.fr-FR                     {background-position: 0          -24px;}
+  &.hu, &.hu-HU                     {background-position: -16px      -24px;}
+  &.it, &.it-IT                     {background-position: -32px      -24px;}
+  &.ko, &.ko-KR                     {background-position: 0          -36px;}
+  &.nl, &.nl-NL                     {background-position: -16px      -36px;}
+  &.nb, &.nb-NO                     {background-position: -32px      -36px;}
+  &.pl, &.pl-PL                     {background-position: 0          -48px;}
+  &.pt, &.pt-BR                     {background-position: -16px      -48px;}
+  &.ro, &.ro-RO                     {background-position: -32px      -48px;}
+  &.ru, &.ru-RU                     {background-position: 0          -60px;}
+  &.sv, &.sv-SE                     {background-position: -32px      -60px;}
+  &.tr, &.tr-TR                     {background-position: 0          -72px;}
+  &.uk, &.uk-UA                     {background-position: -16px      -72px;}
+  &.lv, &.lv-LV                     {background-position: -32px      -72px;}
+  &.lt, &.lt-LT                     {background-position: 0          -84px;}
+  &.vi, &.vi-VN                     {background-position: -16px      -84px;}
+  &.de-CH                           {background-position: -32px      -84px;}
+  &.nn, &.nn-NO                     {background-position: 0          -96px;}
+  &.pt-PT                           {background-position: -16px      -96px;}
+  &.de-AT                           {background-position: -32px      -96px;}
+  &.es, &.es-ES                     {background-position: 0          -108px;}
+  &.en-GB                           {background-position: -32px      -108px;}
+  &.en-AU                           {background-position: 0          -120px;}
+  &.az-Latn-AZ                      {background-position: -16px      -120px;}
+  &.id, &.id-ID                     {background-position: -32px      -120px;}
+
+  &.bg, &.bg-BG                     {background-position: 0          -132px;}
+  &.ca-ES-valencia                  {background-position: -16px      -132px;}
+  &.en-CA                           {background-position: -32px      -132px;}
+  &.en-ZA                           {background-position: 0          -144px;}
+  &.eu, &.eu-ES                     {background-position: -16px      -144px;}
+  &.gl, &.gl-ES                     {background-position: -32px      -144px;}
+  &.hr, &.hr-HR                     {background-position: 0          -156px;}
+  &.lb, &.lb-LU                     {background-position: -16px      -156px;}
+  &.mn, &.mn-MN                     {background-position: -32px      -156px;}
+  &.sl, &.sl-SI                     {background-position: 0          -168px;}
+  &.sr, &.sr-Cyrl-RS, &.sr-Latn-RS  {background-position: -16px      -168px;}
+  &.sk, &.sk-SK                     {background-position: -32px      -168px;}
+  &.kk, &.kk-KZ                     {background-position: 0          -180px;}
+}

apps/common/main/resources/less/window.less

@@ -190,6 +190,16 @@
         -o-transition: none !important;
     }
 
+    &.plain {
+        border: none;
+        box-shadow: none;
+        border-radius: 0;
+
+        .body, .resize-border {
+            border-radius: 0 !important;
+        }
+    }
+
     .resize-border {
         position: absolute;
         width: 5px;

apps/documenteditor/embed/index.html

@@ -321,9 +321,6 @@
 
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
 
       <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
       <script>

apps/documenteditor/embed/index.html.deploy

@@ -312,9 +312,6 @@
       <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
 
       <!--sdk-->
       <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>

apps/documenteditor/embed/js/ApplicationController.js

@@ -313,7 +313,7 @@ var ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( params.asc_getCanBranding() && (typeof config.customization == 'object') &&
+        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
              config.customization && config.customization.logo ) {
 
             var logo = $('#header-logo');
@@ -402,14 +402,14 @@ var ApplicationController = new(function(){
         Common.Analytics.trackEvent('Internal Error', id.toString());
     }
 
-    function onExternalError(error) {
+    function onExternalMessage(error) {
         if (error) {
             hidePreloader();
-            $('#id-error-mask-title').text(error.title);
+            $('#id-error-mask-title').text('Error');
             $('#id-error-mask-text').text(error.msg);
             $('#id-error-mask').css('display', 'block');
 
-            Common.Analytics.trackEvent('External Error', error.title);
+            Common.Analytics.trackEvent('External Error');
         }
     }
 
@@ -497,7 +497,7 @@ var ApplicationController = new(function(){
             // Initialize api gateway
             Common.Gateway.on('init',               loadConfig);
             Common.Gateway.on('opendocument',       loadDocument);
-            Common.Gateway.on('showerror',          onExternalError);
+            Common.Gateway.on('showmessage',        onExternalMessage);
             Common.Gateway.ready();
         }
 

apps/documenteditor/embed/js/ApplicationView.js

@@ -41,10 +41,10 @@ var ApplicationView = new(function(){
         $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true');
         $btnTools.parent().append(
             '<ul class="dropdown-menu">' +
-                '<li><a id="idt-download" href="#"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
+                '<li><a id="idt-download"><span class="mi-icon svg-icon download"></span>Download</a></li>' +
-                '<li><a id="idt-share" href="#" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
+                '<li><a id="idt-share" data-toggle="modal"><span class="mi-icon svg-icon share"></span>Share</a></li>' +
-                '<li><a id="idt-embed" href="#" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
+                '<li><a id="idt-embed" data-toggle="modal"><span class="mi-icon svg-icon embed"></span>Embed</a></li>' +
-                '<li><a id="idt-fullscreen" href="#"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
+                '<li><a id="idt-fullscreen"><span class="mi-icon svg-icon fullscr"></span>Full Screen</a></li>' +
             '</ul>');
     }
 

apps/documenteditor/main/app.js

@@ -56,7 +56,6 @@ require.config({
         sockjs          : '../vendor/sockjs/sockjs.min',
         jszip           : '../vendor/jszip/jszip.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
-        jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/word/sdk-all-min',
         api             : 'api/documents/api',
@@ -112,8 +111,7 @@ require.config({
                 'xregexp',
                 'sockjs',
                 'jszip',
-                'jsziputils',
+                'jsziputils'
-                'jsrsasign'
             ]
         },
         gateway: {
@@ -202,37 +200,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

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

@@ -158,7 +158,7 @@ define([
         createDelayedElements: function() {
             /** coauthoring begin **/
             if ( this.mode.canCoAuthoring ) {
-                this.leftMenu.btnComments[(this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
+                this.leftMenu.btnComments[(this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
                 if (this.mode.canComments)
                     this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView('Common.Views.Comments'));
 
@@ -302,7 +302,8 @@ define([
             }
 
             value = Common.localStorage.getItem("de-settings-livecomment");
-            (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments() : this.api.asc_hideComments();
+            var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
+            (!(value!==null && parseInt(value) == 0)) ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
             /** coauthoring end **/
 
             value = Common.localStorage.getItem("de-settings-fontrender");
@@ -312,11 +313,13 @@ define([
             case '0':     this.api.SetFontRenderingMode(3); break;
             }
 
-            value = Common.localStorage.getItem("de-settings-autosave");
+            if (this.mode.isEdit) {
-            this.api.asc_setAutoSaveGap(parseInt(value));
+                value = Common.localStorage.getItem("de-settings-autosave");
+                this.api.asc_setAutoSaveGap(parseInt(value));
 
-            value = Common.localStorage.getItem("de-settings-spellcheck");
+                value = Common.localStorage.getItem("de-settings-spellcheck");
-            this.api.asc_setSpellCheck(value===null || parseInt(value) == 1);
+                this.api.asc_setSpellCheck(value===null || parseInt(value) == 1);
+            }
 
             value = Common.localStorage.getItem("de-settings-showsnaplines");
             this.api.put_ShowSnapLines(value===null || parseInt(value) == 1);
@@ -498,9 +501,12 @@ define([
         },
 
         commentsShowHide: function(mode) {
-            var value = Common.localStorage.getItem("de-settings-livecomment");
+            var value = Common.localStorage.getItem("de-settings-livecomment"),
-            if (value !== null && 0 === parseInt(value)) {
+                resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
-                (mode === 'show') ? this.api.asc_showComments() : this.api.asc_hideComments();
+            value = (value!==null && parseInt(value) == 0);
+            resolved = (resolved!==null && parseInt(resolved) == 0);
+            if (value || resolved) {
+                (mode === 'show') ? this.api.asc_showComments(true) : ((!value) ? this.api.asc_showComments(!resolved) : this.api.asc_hideComments());
             }
 
             if (mode === 'show') {
@@ -592,7 +598,7 @@ define([
                     }
                     return false;
                 case 'comments':
-                    if (this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments && !this.mode.isLightVersion) {
+                    if (this.mode.canCoAuthoring && this.mode.canComments && !this.mode.isLightVersion) {
                         Common.UI.Menu.Manager.hideAll();
                         this.leftMenu.showMenu('comments');
                         this.getApplication().getController('Common.Controllers.Comments').onAfterShow();

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

@@ -105,7 +105,8 @@ define([
                 });
 
                 this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
-
+                this.languages = null;
+                this.translationTable = [];
                 // Initialize viewport
 
                 if (!Common.Utils.isBrowserSupported()){
@@ -121,8 +122,23 @@ define([
                 // Initialize api
 
                 window["flat_desine"] = true;
+
+                var styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5',
+                                  'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph'],
+                    translate = {
+                        'Series': this.txtSeries,
+                        'Diagram Title': this.txtDiagramTitle,
+                        'X Axis': this.txtXAxis,
+                        'Y Axis': this.txtYAxis,
+                        'Your text here': this.txtArt
+                    };
+                styleNames.forEach(function(item){
+                    translate[item] = me.translationTable[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item;
+                });
+
                 this.api = new Asc.asc_docs_api({
-                    'id-view'  : 'editor_sdk'
+                    'id-view'  : 'editor_sdk',
+                    'translate': translate
                 });
 
                 if (this.api){
@@ -141,6 +157,8 @@ define([
                     this.api.asc_registerCallback('asc_onDocumentName',             _.bind(this.onDocumentName, this));
                     this.api.asc_registerCallback('asc_onPrintUrl',                 _.bind(this.onPrintUrl, this));
                     this.api.asc_registerCallback('asc_onMeta',                     _.bind(this.onMeta, this));
+                    this.api.asc_registerCallback('asc_onSpellCheckInit',           _.bind(this.loadLanguages, this));
+
                     Common.NotificationCenter.on('api:disconnect',                  _.bind(this.onCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('goback',                          _.bind(this.goBack, this));
 
@@ -202,13 +220,13 @@ define([
                             me.api.asc_enableKeyEvents(false);
                         },
                         'modal:close': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }
                         },
                         'modal:hide': function(dlg) {
-                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.size() < 1) {
+                            if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
                                 me.isModalShowed = false;
                                 me.api.asc_enableKeyEvents(true);
                             }
@@ -231,6 +249,15 @@ define([
                     });
 
                     this.initNames(); //for shapes
+
+                    Common.util.Shortcuts.delegateShortcuts({
+                        shortcuts: {
+                            'command+s,ctrl+s': _.bind(function (e) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                            }, this)
+                        }
+                    });
                 }
             },
 
@@ -734,7 +761,8 @@ define([
                 /** coauthoring begin **/
                 value = Common.localStorage.getItem("de-settings-livecomment");
                 this.isLiveCommenting = !(value!==null && parseInt(value) == 0);
-                this.isLiveCommenting ? this.api.asc_showComments() : this.api.asc_hideComments();
+                var resolved = Common.localStorage.getItem("de-settings-resolvedcomment");
+                this.isLiveCommenting ? this.api.asc_showComments(!(resolved!==null && parseInt(resolved) == 0)) : this.api.asc_hideComments();
                 /** coauthoring end **/
 
                 value = Common.localStorage.getItem("de-settings-zoom");
@@ -797,6 +825,11 @@ define([
                                 value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
                     else
                         me.api.SetCollaborativeMarksShowType(me._state.fastCoauth ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges);
+                } else if (!me.appOptions.isEdit && me.appOptions.canComments) {
+                    me._state.fastCoauth = true;
+                    me.api.asc_SetFastCollaborative(me._state.fastCoauth);
+                    me.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
+                    me.api.asc_setAutoSaveGap(1);
                 } else {
                     me._state.fastCoauth = false;
                     me.api.asc_SetFastCollaborative(me._state.fastCoauth);
@@ -859,7 +892,7 @@ define([
                             toolbarController.createDelayedElements();
 
                             documentHolderController.getView('DocumentHolder').createDelayedElements();
-                            me.loadLanguages();
+                            me.setLanguages();
 
                             var shapes = me.api.asc_getPropertyEditorShapes();
                             if (shapes)
@@ -878,9 +911,11 @@ define([
                                 Common.NotificationCenter.trigger('document:ready', 'main');
                         }
                     }, 50);
-                } else if (me.appOptions.canBrandingExt)
+                } else {
-                    Common.NotificationCenter.trigger('document:ready', 'main');
+                    documentHolderController.getView('DocumentHolder').createDelayedElementsViewer();
-
+                    if (me.appOptions.canBrandingExt)
+                        Common.NotificationCenter.trigger('document:ready', 'main');
+                }
 
                 if (this.appOptions.canAnalytics && false)
                     Common.component.Analytics.initialize('UA-12442749-13', 'Document Editor');
@@ -967,8 +1002,9 @@ define([
                 this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore && !!this.permissions.changeHistory;
                 this.appOptions.canUseMailMerge= this.appOptions.canLicense && this.appOptions.canEdit && /*!this.appOptions.isDesktopApp*/ !this.appOptions.isOffline;
                 this.appOptions.canSendEmailAddresses  = this.appOptions.canLicense && this.editorConfig.canSendEmailAddresses && this.appOptions.canEdit && this.appOptions.canCoAuthoring;
-                this.appOptions.canComments    = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
+                this.appOptions.canComments    = this.appOptions.canLicense && (this.permissions.comment===undefined ? this.appOptions.isEdit : this.permissions.comment);
-                this.appOptions.canChat        = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit) && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
+                this.appOptions.canComments    = this.appOptions.canComments && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
+                this.appOptions.canChat        = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
                 this.appOptions.canEditStyles  = this.appOptions.canLicense && this.appOptions.canEdit;
                 this.appOptions.canPrint       = (this.permissions.print !== false);
                 this.appOptions.canRename      = !!this.permissions.rename;
@@ -998,7 +1034,8 @@ define([
                 this.applyModeCommonElements();
                 this.applyModeEditorElements();
 
-                this.api.asc_setViewMode(!this.appOptions.isEdit);
+                this.api.asc_setViewMode(!this.appOptions.isEdit && !this.appOptions.canComments);
+                (!this.appOptions.isEdit && this.appOptions.canComments) && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
                 this.api.asc_LoadDocument();
 
                 if (!this.appOptions.isEdit) {
@@ -1035,22 +1072,15 @@ define([
 
                 this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
                 this.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(this.onDownloadUrl, this));
-
-                if (this.api) {
-                    var translateChart = new Asc.asc_CChartTranslate();
-                    translateChart.asc_setTitle(this.txtDiagramTitle);
-                    translateChart.asc_setXAxis(this.txtXAxis);
-                    translateChart.asc_setYAxis(this.txtYAxis);
-                    translateChart.asc_setSeries(this.txtSeries);
-                    this.api.asc_setChartTranslate(translateChart);
-
-                    var translateArt = new Asc.asc_TextArtTranslate();
-                    translateArt.asc_setDefaultText(this.txtArt);
-                    this.api.asc_setTextArtTranslate(translateArt);
-                }
             },
 
             applyModeEditorElements: function() {
+                if (this.appOptions.canComments || this.appOptions.isEdit) {
+                    /** coauthoring begin **/
+                    this.contComments.setMode(this.appOptions);
+                    this.contComments.setConfig({config: this.editorConfig}, this.api);
+                    /** coauthoring end **/
+                }
                 if (this.appOptions.isEdit) {
                     var me = this,
                         application         = this.getApplication(),
@@ -1062,10 +1092,6 @@ define([
                     fontsControllers    && fontsControllers.setApi(me.api);
                     toolbarController   && toolbarController.setApi(me.api);
 
-                    /** coauthoring begin **/
-                    me.contComments.setMode(me.appOptions);
-                    me.contComments.setConfig({config: me.editorConfig}, me.api);
-                    /** coauthoring end **/
                     rightmenuController && rightmenuController.setApi(me.api);
 
                     if (reviewController)
@@ -1131,7 +1157,7 @@ define([
                     msg.msg = (msg.msg).toString();
                     this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]);
 
-                    Common.component.Analytics.trackEvent('External Error', msg.title);
+                    Common.component.Analytics.trackEvent('External Error');
                 }
             },
 
@@ -1646,15 +1672,15 @@ define([
                 }
             },
 
-            loadLanguages: function() {
+            loadLanguages: function(apiLangs) {
-                var apiLangs = this.api.asc_getSpellCheckLanguages(),
+                var langs = [], info;
-                    langs = [], info;
                 _.each(apiLangs, function(lang, index, list){
-                    info = Common.util.LanguageInfo.getLocalLanguageName(lang.asc_getId());
+                    lang = parseInt(lang);
+                    info = Common.util.LanguageInfo.getLocalLanguageName(lang);
                     langs.push({
                         title:  info[1],
                         tip:    info[0],
-                        code:   lang.asc_getId()
+                        code:   lang
                     });
                 }, this);
 
@@ -1664,8 +1690,15 @@ define([
                     return 0;
                 });
 
-                this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(langs);
+                this.languages = langs;
-                this.getApplication().getController('Statusbar').setLanguages(langs);
+                window.styles_loaded && this.setLanguages();
+            },
+
+            setLanguages: function() {
+                if (this.languages && this.languages.length>0) {
+                    this.getApplication().getController('DocumentHolder').getView('DocumentHolder').setLanguages(this.languages);
+                    this.getApplication().getController('Statusbar').setLanguages(this.languages);
+                }
             },
 
             onInsertTable:  function() {
@@ -1970,6 +2003,7 @@ define([
                                     isViewer: itemVar.isViewer,
                                     EditorsSupport: itemVar.EditorsSupport,
                                     isVisual: itemVar.isVisual,
+                                    isCustomWindow: itemVar.isCustomWindow,
                                     isModal: itemVar.isModal,
                                     isInsideMode: itemVar.isInsideMode,
                                     initDataType: itemVar.initDataType,
@@ -2121,7 +2155,23 @@ define([
             titleServerVersion: 'Editor updated',
             errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.',
             textChangesSaved: 'All changes saved',
-            errorBadImageUrl: 'Image url is incorrect'
+            errorBadImageUrl: 'Image url is incorrect',
+            txtStyle_Normal: 'Normal',
+            txtStyle_No_Spacing: 'No Spacing',
+            txtStyle_Heading_1: 'Heading 1',
+            txtStyle_Heading_2: 'Heading 2',
+            txtStyle_Heading_3: 'Heading 3',
+            txtStyle_Heading_4: 'Heading 4',
+            txtStyle_Heading_5: 'Heading 5',
+            txtStyle_Heading_6: 'Heading 6',
+            txtStyle_Heading_7: 'Heading 7',
+            txtStyle_Heading_8: 'Heading 8',
+            txtStyle_Heading_9: 'Heading 9',
+            txtStyle_Title: 'Title',
+            txtStyle_Subtitle: 'Subtitle',
+            txtStyle_Quote: 'Quote',
+            txtStyle_Intense_Quote: 'Intense Quote',
+            txtStyle_List_Paragraph: 'List Paragraph'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -44,7 +44,8 @@ define([
     'core',
     'documenteditor/main/app/view/Statusbar',
     'common/main/lib/util/LanguageInfo',
-    'common/main/lib/view/ReviewChanges'
+    'common/main/lib/view/ReviewChanges',
+    'common/main/lib/view/LanguageDialog'
 ], function () {
     'use strict';
 
@@ -141,9 +142,6 @@ define([
             });
         },
 
-        /*
-        * */
-
         setLanguages: function(langs) {
             this.langs = langs;
             this.statusbar.reloadLanguages(langs);
@@ -207,7 +205,7 @@ define([
                     } else {
                         var iconEl = $('.btn-icon', this.statusbar.btnReview.cmpEl);
                        (this.api.asc_HaveRevisionsChanges()) ? iconEl.removeClass(this.statusbar.btnReviewCls).addClass('btn-ic-changes') : iconEl.removeClass('btn-ic-changes').addClass(this.statusbar.btnReviewCls);
-                        if (value!==null && parseInt(value) == 1) {
+                        if (value!==null && parseInt(value) == 1 && !showChangesPanel) { // when customization.showReviewChanges == true "track revisions" mode must be off!!!
                             this.changeReviewStatus(!this.statusbar.mode.isLightVersion);
                             // show tooltip "track changes in this document" and change icon
                             if (this.showTrackChangesTip && !statusbarIsHidden){
@@ -243,7 +241,7 @@ define([
             });
 
             var me = this;
-            (new DE.Views.Statusbar.LanguageDialog({
+            (new Common.Views.LanguageDialog({
                 languages: langs,
                 current: me.api.asc_getDefaultLanguage(),
                 handler: function(result, tip) {

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

@@ -54,7 +54,8 @@ define([
     'documenteditor/main/app/view/StyleTitleDialog',
     'documenteditor/main/app/view/PageMarginsDialog',
     'documenteditor/main/app/view/PageSizeDialog',
-    'documenteditor/main/app/view/NoteSettingsDialog'
+    'documenteditor/main/app/view/NoteSettingsDialog',
+    'documenteditor/main/app/view/CustomColumnsDialog'
 ], function () {
     'use strict';
 
@@ -712,6 +713,10 @@ define([
             if (need_disable !== toolbar.btnNotes.isDisabled())
                 toolbar.btnNotes.setDisabled(need_disable);
 
+            need_disable = paragraph_locked || header_locked || in_image;
+            if (need_disable != toolbar.btnColumns.isDisabled())
+                toolbar.btnColumns.setDisabled(need_disable);
+
             if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
@@ -733,7 +738,7 @@ define([
                     var styleRec = listStyle.menuPicker.store.findWhere({
                         title: name
                     });
-                    this._state.prstyle = (listStyle.menuPicker.store.length>0) ? name : undefined;
+                    this._state.prstyle = (listStyle.menuPicker.store.length>0 || window.styles_loaded) ? name : undefined;
 
                     listStyle.menuPicker.selectRecord(styleRec);
                     listStyle.resumeEvents();
@@ -1636,23 +1641,40 @@ define([
                 return;
 
             this._state.columns = undefined;
-            if (this.api && item.checked) {
-                var props = new Asc.CDocumentColumnsProps(),
-                    cols = item.value,
-                    def_space = 12.5;
-                props.put_EqualWidth(cols<3);
 
-                if (cols<3) {
+            if (this.api) {
-                    props.put_Num(cols+1);
+                if (item.value == 'advanced') {
-                    props.put_Space(def_space);
+                    var win, props = this.api.asc_GetSectionProps(),
-                } else {
+                        me = this;
-                    var total = this.api.asc_GetColumnsProps().get_TotalWidth(),
+                    win = new DE.Views.CustomColumnsDialog({
-                        left = (total - def_space*2)/3,
+                        handler: function(dlg, result) {
-                        right = total - def_space - left;
+                            if (result == 'ok') {
-                    props.put_ColByValue(0, (cols == 3) ? left : right, def_space);
+                                props = dlg.getSettings();
-                    props.put_ColByValue(1, (cols == 3) ? right : left, 0);
+                                me.api.asc_SetColumnsProps(props);
+                                Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                            }
+                        }
+                    });
+                    win.show();
+                    win.setSettings(me.api.asc_GetColumnsProps());
+                } else if (item.checked) {
+                    var props = new Asc.CDocumentColumnsProps(),
+                        cols = item.value,
+                        def_space = 12.5;
+                    props.put_EqualWidth(cols<3);
+
+                    if (cols<3) {
+                        props.put_Num(cols+1);
+                        props.put_Space(def_space);
+                    } else {
+                        var total = this.api.asc_GetColumnsProps().get_TotalWidth(),
+                            left = (total - def_space*2)/3,
+                            right = total - def_space - left;
+                        props.put_ColByValue(0, (cols == 3) ? left : right, def_space);
+                        props.put_ColByValue(1, (cols == 3) ? right : left, 0);
+                    }
+                    this.api.asc_SetColumnsProps(props);
                 }
-                this.api.asc_SetColumnsProps(props);
             }
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@@ -1892,15 +1914,16 @@ define([
                         me._state.prstyle = title;
                         style.put_Name(title);
                         characterStyle.put_Name(title + '_character');
-                        style.put_Next(nextStyle.asc_getName());
+                        style.put_Next((nextStyle) ? nextStyle.asc_getName() : null);
                         me.api.asc_AddNewStyle(style);
                     }
                     Common.NotificationCenter.trigger('edit:complete', me.toolbar);
                 };
 
-                var formats = [];
+                var formats = [],
+                    mainController = me.getApplication().getController('Main');
                 _.each(window.styles.get_MergedStyles(), function (style) {
-                    formats.push({value: style, displayValue: style.get_Name()})
+                    formats.push({value: style, displayValue: mainController.translationTable[style.get_Name()] || style.get_Name()})
                 });
 
                 win = new DE.Views.StyleTitleDialog({
@@ -2516,7 +2539,7 @@ define([
                     store: this.getApplication().getCollection('Common.Collections.TextArt'),
                     parentMenu: this.toolbar.mnuInsertTextArt.menu,
                     showLast: false,
-                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
+                    itemTemplate: _.template('<div class="item-art"><img src="<%= imageUrl %>" id="<%= id %>" style="width:50px;height:50px;"></div>')
                 });
 
                 this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
@@ -2616,11 +2639,12 @@ define([
 
             listStyles.menuPicker.store.reset([]); // remove all
 
+            var mainController = this.getApplication().getController('Main');
             _.each(styles.get_MergedStyles(), function(style){
                 listStyles.menuPicker.store.add({
                     imageUrl: style.asc_getImage(),
                     title   : style.get_Name(),
-                    tip     : style.get_Name(),
+                    tip     : mainController.translationTable[style.get_Name()] || style.get_Name(),
                     id      : Common.UI.getId()
                 });
             });
@@ -2630,7 +2654,8 @@ define([
                 if (self._state.prstyle) styleRec = listStyles.menuPicker.store.findWhere({title: self._state.prstyle});
                 listStyles.fillComboView((styleRec) ? styleRec : listStyles.menuPicker.store.at(0), true);
                 Common.NotificationCenter.trigger('edit:complete', this);
-            }
+            } else if (listStyles.rendered)
+                listStyles.clearComboView();
             window.styles_loaded = true;
         },
 

apps/documenteditor/main/app/template/StatusBar.template

@@ -29,7 +29,7 @@
         <div class="separator short el-edit"></div>
         <div class="cnt-lang el-edit">
             <div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">
-                <span class="icon-lang-flag img-toolbarmenu lang-flag" data-vertical-offset="10" />
+                <span class="icon-lang-flag lang-flag" data-vertical-offset="10" />
                 <label id="status-label-lang" class="status-label">English (United States)</label>
                 <div class="caret up img-commonctrl" />
             </div>

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

@@ -145,7 +145,8 @@ define([
                         this.mnuChartTypePicker.selectRecord(record, true);
                         if (record) {
                             this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls'));
-                        }
+                        } else
+                            this.btnChartType.setIconCls('');
                         this.updateChartStyles(this.api.asc_getChartPreviews(type));
                         this._state.ChartType = type;
                     }
@@ -263,6 +264,7 @@ define([
                         { 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},
@@ -290,6 +292,11 @@ define([
                         { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     iconCls: 'area-pstack'},
                         { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            iconCls: 'point-normal'},
                         { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              iconCls: 'stock-normal'}
+                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      iconCls: 'surface-normal'},
+                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   iconCls: 'surface-wireframe'},
+                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      iconCls: 'contour-normal'},
+                        // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   iconCls: 'contour-wireframe'}
+
                     ]),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
                 });
@@ -552,7 +559,8 @@ define([
         textPie:            'Pie',
         textPoint:          'XY (Scatter)',
         textStock:          'Stock',
-        textStyle:          'Style'
+        textStyle:          'Style',
+        textSurface: 'Surface'
 
     }, DE.Views.ChartSettings || {}));
 });

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

@@ -0,0 +1,178 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2017
+ *
+ * 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 Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * 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
+ *
+*/
+/**
+ *  CustomColumnsDialog.js
+ *
+ *  Created by Julia Radzhabova on 6/23/17
+ *  Copyright (c) 2017 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/component/Window',
+    'common/main/lib/component/MetricSpinner',
+    'common/main/lib/component/CheckBox'
+], function () { 'use strict';
+
+    DE.Views.CustomColumnsDialog = Common.UI.Window.extend(_.extend({
+        options: {
+            width: 300,
+            header: true,
+            style: 'min-width: 216px;',
+            cls: 'modal-dlg'
+        },
+
+        initialize : function(options) {
+            _.extend(this.options, {
+                title: this.textTitle
+            }, options || {});
+
+            this.template = [
+                '<div class="box" style="height: 90px;">',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<label class="input-label">' + this.textColumns + '</label><div id="custom-columns-spin-num" style="float: right;"></div>',
+                    '</div>',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<label class="input-label">' + this.textSpacing + '</label><div id="custom-columns-spin-spacing" style="float: right;"></div>',
+                    '</div>',
+                    '<div class="input-row" style="margin: 10px 0;">',
+                        '<div id="custom-columns-separator"></div>',
+                    '</div>',
+                '</div>',
+                '<div class="separator horizontal"/>',
+                '<div class="footer center">',
+                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
+                '</div>'
+            ].join('');
+
+            this.options.tpl = _.template(this.template)(this.options);
+
+            this.spinners = [];
+            this._noApply = false;
+
+            Common.UI.Window.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+
+            this.spnColumns = new Common.UI.MetricSpinner({
+                el: $('#custom-columns-spin-num'),
+                step: 1,
+                allowDecimal: false,
+                width: 100,
+                defaultUnit : "",
+                value: '1',
+                maxValue: 12,
+                minValue: 1
+            });
+
+            this.spnSpacing = new Common.UI.MetricSpinner({
+                el: $('#custom-columns-spin-spacing'),
+                step: .1,
+                width: 100,
+                defaultUnit : "cm",
+                value: '0 cm',
+                maxValue: 40.64,
+                minValue: 0
+            });
+            this.spinners.push(this.spnSpacing);
+
+            this.chSeparator = new Common.UI.CheckBox({
+                el: $('#custom-columns-separator'),
+                labelText: this.textSeparator
+            });
+
+            this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+
+            this.updateMetricUnit();
+        },
+
+        _handleInput: function(state) {
+            if (this.options.handler) {
+                this.options.handler.call(this, this, state);
+            }
+
+            this.close();
+        },
+
+        onBtnClick: function(event) {
+            this._handleInput(event.currentTarget.attributes['result'].value);
+        },
+
+        onPrimary: function() {
+            this._handleInput('ok');
+            return false;
+        },
+
+        setSettings: function (props) {
+            if (props) {
+                var equal = props.get_EqualWidth(),
+                    num = (equal) ? props.get_Num() : props.get_ColsCount(),
+                    space = (equal) ? props.get_Space() : (num>1 ? props.get_Col(0).get_Space() : 12.5);
+
+                this.spnColumns.setValue(num, true);
+                this.spnSpacing.setValue(Common.Utils.Metric.fnRecalcFromMM(space), true);
+                this.chSeparator.setValue(props.get_Sep());
+            }
+        },
+
+        getSettings: function() {
+            var props = new Asc.CDocumentColumnsProps();
+            props.put_EqualWidth(true);
+            props.put_Num(this.spnColumns.getNumberValue());
+            props.put_Space(Common.Utils.Metric.fnRecalcToMM(this.spnSpacing.getNumberValue()));
+            props.put_Sep(this.chSeparator.getValue()=='checked');
+            return props;
+        },
+
+        updateMetricUnit: function() {
+            if (this.spinners) {
+                for (var i=0; i<this.spinners.length; i++) {
+                    var spinner = this.spinners[i];
+                    spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
+                    spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
+                }
+            }
+
+        },
+
+        textTitle: 'Columns',
+        textSpacing: 'Spacing between columns',
+        textColumns: 'Number of columns',
+        textSeparator: 'Column divider',
+        cancelButtonText:   'Cancel',
+        okButtonText:       'Ok'
+    }, DE.Views.CustomColumnsDialog || {}))
+});

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

@@ -81,7 +81,7 @@ define([
             me._currentParaObjDisabled = false;
 
             var showPopupMenu = function(menu, value, event, docElement, eOpts){
-                if (!_.isUndefined(menu)  && menu !== null && me.mode.isEdit){
+                if (!_.isUndefined(menu)  && menu !== null){
                     Common.UI.Menu.Manager.hideAll();
 
                     var showPoint = [event.get_X(), event.get_Y()],
@@ -186,9 +186,33 @@ define([
                 return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
             };
 
+            var fillViewMenuProps = function(selectedElements) {
+                if (!selectedElements || !_.isArray(selectedElements)) return;
+                var menu_props = {},
+                    menu_to_show = me.viewModeMenu,
+                    noobject = true;
+                for (var i = 0; i <selectedElements.length; i++) {
+                    var elType = selectedElements[i].get_ObjectType();
+                    var elValue = selectedElements[i].get_ObjectValue();
+                    if (Asc.c_oAscTypeSelectElement.Image == elType) {
+                        //image
+                        menu_props.imgProps = {};
+                        menu_props.imgProps.value = elValue;
+                        noobject = false;
+                    } else if (Asc.c_oAscTypeSelectElement.Paragraph == elType)
+                    {
+                        menu_props.paraProps = {};
+                        menu_props.paraProps.value = elValue;
+                        menu_props.paraProps.locked = (elValue) ? elValue.get_Locked() : false;
+                        noobject = false;
+                    }
+                }
+                return (!noobject) ? {menu_to_show: menu_to_show, menu_props: menu_props} : null;
+            };
+
             var showObjectMenu = function(event, docElement, eOpts){
-                if (me.api && me.mode.isEdit){
+                if (me.api){
-                    var obj = fillMenuProps(me.api.getSelectedElements());
+                    var obj = (me.mode.isEdit) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements());
                     if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
                 }
             };
@@ -204,8 +228,8 @@ define([
             };
 
             var onFocusObject = function(selectedElements) {
-                if (me.mode.isEdit && me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
+                if (me.currentMenu && me.currentMenu.isVisible() && me.currentMenu !== me.hdrMenu){
-                    var obj = fillMenuProps(selectedElements);
+                    var obj = (me.mode.isEdit) ? fillMenuProps(selectedElements) : fillViewMenuProps(selectedElements);
                     if (obj) {
                         if (obj.menu_to_show===me.currentMenu) {
                             me.currentMenu.options.initMenu(obj.menu_props);
@@ -574,6 +598,65 @@ define([
                 /** coauthoring end **/
             };
 
+            var onShowSpecialPasteOptions = function(specialPasteShowOptions) {
+                var coord  = specialPasteShowOptions.asc_getCellCoord(),
+                    pasteContainer = me.cmpEl.find('#special-paste-container'),
+                    pasteItems = specialPasteShowOptions.asc_getOptions();
+
+                // Prepare menu container
+                if (pasteContainer.length < 1) {
+                    me._arrSpecialPaste = [];
+                    me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.textPaste;
+                    me._arrSpecialPaste[Asc.c_oSpecialPasteProps.keepTextOnly] = me.txtKeepTextOnly;
+
+                    pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
+                    me.cmpEl.append(pasteContainer);
+
+                    me.btnSpecialPaste = new Common.UI.Button({
+                        cls         : 'btn-toolbar',
+                        iconCls     : 'btn-paste',
+                        menu        : new Common.UI.Menu({items: []})
+                    });
+                    me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
+                }
+
+                if (pasteItems.length>0) {
+                    var menu = me.btnSpecialPaste.menu;
+                    for (var i = 0; i < menu.items.length; i++) {
+                        menu.removeItem(menu.items[i]);
+                        i--;
+                    }
+
+                    var group_prev = -1;
+                    _.each(pasteItems, function(menuItem, index) {
+                        var mnu = new Common.UI.MenuItem({
+                            caption: me._arrSpecialPaste[menuItem],
+                            value: menuItem,
+                            checkable: true,
+                            toggleGroup : 'specialPasteGroup'
+                        }).on('click', function(item, e) {
+                            me.api.asc_SpecialPaste(item.value);
+                            setTimeout(function(){menu.hide();}, 100);
+                        });
+                        menu.addItem(mnu);
+                    });
+                    (menu.items.length>0) && menu.items[0].setChecked(true, true);
+                }
+                if (coord.asc_getX()<0 || coord.asc_getY()<0) {
+                    if (pasteContainer.is(':visible')) pasteContainer.hide();
+                } else {
+                    var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3];
+                    pasteContainer.css({left: showPoint[0], top : showPoint[1]});
+                    pasteContainer.show();
+                }
+            };
+
+            var onHideSpecialPasteOptions = function() {
+                var pasteContainer = me.cmpEl.find('#special-paste-container');
+                if (pasteContainer.is(':visible'))
+                    pasteContainer.hide();
+            };
+
             var onDialogAddHyperlink = function() {
                 var win, props, text;
                 if (me.api && me.mode.isEdit){
@@ -1438,6 +1521,9 @@ define([
                     this.api.asc_registerCallback('asc_onShowForeignCursorLabel',       _.bind(onShowForeignCursorLabel, this));
                     this.api.asc_registerCallback('asc_onHideForeignCursorLabel',       _.bind(onHideForeignCursorLabel, this));
                     this.api.asc_registerCallback('asc_onFocusObject',                  _.bind(onFocusObject, this));
+                    this.api.asc_registerCallback('asc_onShowSpecialPasteOptions',      _.bind(onShowSpecialPasteOptions, this));
+                    this.api.asc_registerCallback('asc_onHideSpecialPasteOptions',      _.bind(onHideSpecialPasteOptions, this));
+
                 }
 
                 return this;
@@ -1454,7 +1540,7 @@ define([
 
                 this.mode = m;
                 /** coauthoring begin **/
-                !(this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments)
+                !(this.mode.canCoAuthoring && this.mode.canComments)
                     ? Common.util.Shortcuts.suspendEvents(hkComments)
                     : Common.util.Shortcuts.resumeEvents(hkComments);
                 /** coauthoring end **/
@@ -1501,10 +1587,6 @@ define([
 
         onApiParagraphStyleChange: function(name) {
             window.currentStyleName = name;
-            var menuStyleUpdate = this.menuStyleUpdate;
-            if (menuStyleUpdate != undefined) {
-                menuStyleUpdate.setCaption(this.updateStyleText.replace('%1', window.currentStyleName));
-            }
         },
 
         _applyTableWrap: function(wrap, align){
@@ -1639,7 +1721,7 @@ define([
 
         /** coauthoring begin **/
         addComment: function(item, e, eOpt){
-            if (this.api && this.mode.canCoAuthoring && this.mode.isEdit && this.mode.canComments) {
+            if (this.api && this.mode.canCoAuthoring && this.mode.canComments) {
                 this.suppressEditComplete = true;
 
                 var controller = DE.getController('Common.Controllers.Comments');
@@ -1707,6 +1789,59 @@ define([
             me.fireEvent('editcomplete', me);
         },
 
+        createDelayedElementsViewer: function() {
+            var me = this;
+
+            var menuViewCopy = new Common.UI.MenuItem({
+                caption: me.textCopy,
+                value: 'copy'
+            }).on('click', _.bind(me.onCutCopyPaste, me));
+
+            var menuViewUndo = new Common.UI.MenuItem({
+                caption: me.textUndo
+            }).on('click', function () {
+                me.api.Undo();
+            });
+
+            var menuViewCopySeparator = new Common.UI.MenuItem({
+                caption: '--'
+            });
+
+            var menuViewAddComment = new Common.UI.MenuItem({
+                caption: me.addCommentText
+            }).on('click', _.bind(me.addComment, me));
+
+            this.viewModeMenu = new Common.UI.Menu({
+                initMenu: function (value) {
+                    var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties()));
+
+                    menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments);
+                    menuViewUndo.setDisabled(!me.api.asc_getCanUndo());
+                    menuViewCopySeparator.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments);
+                    menuViewAddComment.setVisible(!isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments);
+                    menuViewAddComment.setDisabled(value.paraProps && value.paraProps.locked === true);
+
+                    var cancopy = me.api && me.api.can_CopyCut();
+                    menuViewCopy.setDisabled(!cancopy);
+                },
+                items: [
+                    menuViewCopy,
+                    menuViewUndo,
+                    menuViewCopySeparator,
+                    menuViewAddComment
+                ]
+            }).on('hide:after', function (menu, e, isFromInputControl) {
+                if (me.suppressEditComplete) {
+                    me.suppressEditComplete = false;
+                    return;
+                }
+
+                if (!isFromInputControl) me.fireEvent('editcomplete', me);
+                me.currentMenu = null;
+            });
+
+        },
+
         createDelayedElements: function() {
             var me = this;
 
@@ -2209,21 +2344,21 @@ define([
                     menuAlign: 'tl-tr',
                     items   : [
                         me.menuTableCellTop = new Common.UI.MenuItem({
-                            caption     : me.topCellText,
+                            caption     : me.textShapeAlignTop,
                             toggleGroup : 'popuptablecellalign',
                             checkable   : true,
                             checked     : false,
                             valign      : Asc.c_oAscVertAlignJc.Top
                         }).on('click', _.bind(tableCellsVAlign, me)),
                         me.menuTableCellCenter = new Common.UI.MenuItem({
-                            caption     : me.centerCellText,
+                            caption     : me.textShapeAlignMiddle,
                             toggleGroup : 'popuptablecellalign',
                             checkable   : true,
                             checked     : false,
                             valign      : Asc.c_oAscVertAlignJc.Center
                         }).on('click', _.bind(tableCellsVAlign, me)),
                         me.menuTableCellBottom = new Common.UI.MenuItem({
-                            caption     : me.bottomCellText,
+                            caption     : me.textShapeAlignBottom,
                             toggleGroup : 'popuptablecellalign',
                             checkable   : true,
                             checked     : false,
@@ -2725,21 +2860,21 @@ define([
                     menuAlign: 'tl-tr',
                     items   : [
                         me.menuParagraphTop = new Common.UI.MenuItem({
-                            caption     : me.topCellText,
+                            caption     : me.textShapeAlignTop,
                             checkable   : true,
                             checked     : false,
                             toggleGroup : 'popupparagraphvalign',
                             valign      : Asc.c_oAscVAlign.Top
                         }).on('click', _.bind(paragraphVAlign, me)),
                         me.menuParagraphCenter = new Common.UI.MenuItem({
-                            caption     : me.centerCellText,
+                            caption     : me.textShapeAlignMiddle,
                             checkable   : true,
                             checked     : false,
                             toggleGroup : 'popupparagraphvalign',
                             valign      : Asc.c_oAscVAlign.Center
                         }).on('click', _.bind(paragraphVAlign, me)),
                         me.menuParagraphBottom = new Common.UI.MenuItem({
-                            caption     : me.bottomCellText,
+                            caption     : me.textShapeAlignBottom,
                             checkable   : true,
                             checked     : false,
                             toggleGroup : 'popupparagraphvalign',
@@ -3034,6 +3169,9 @@ define([
 
                     menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart);
                     menuStyle.setVisible(me.mode.canEditStyles && !isInChart);
+                    if (me.mode.canEditStyles && !isInChart) {
+                        me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
+                    }
                 },
                 items: [
                     me.menuSpellPara,
@@ -3119,7 +3257,9 @@ define([
         setLanguages: function(langs){
             var me = this;
 
-            if (langs && langs.length > 0) {
+            if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
+                me.langParaMenu.menu.removeAll();
+                me.langTableMenu.menu.removeAll();
                 _.each(langs, function(lang, index){
                     me.langParaMenu.menu.addItem(new Common.UI.MenuItem({
                         caption     : lang.title,
@@ -3217,9 +3357,6 @@ define([
         /** coauthoring begin **/
         addCommentText          : 'Add Comment',
         /** coauthoring end **/
-        topCellText:            'Align Top',
-        centerCellText:         'Align Center',
-        bottomCellText:         'Align Bottom',
         cellAlignText:          'Cell Vertical Alignment',
         txtInline: 'Inline',
         txtSquare: 'Square',
@@ -3265,8 +3402,8 @@ define([
         textCut: 'Cut',
         directionText: 'Text Direction',
         directHText: 'Horizontal',
-        direct90Text: 'Rotate at 90°',
+        direct90Text: 'Rotate Text Down',
-        direct270Text: 'Rotate at 270°',
+        direct270Text: 'Rotate Text Up°',
         txtRemoveAccentChar: 'Remove accent character',
         txtBorderProps: 'Borders property',
         txtHideTop: 'Hide top border',
@@ -3336,7 +3473,9 @@ define([
         txtAlignToChar: 'Align to character',
         txtDeleteRadical: 'Delete radical',
         txtDeleteChars: 'Delete enclosing characters',
-        txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators'
+        txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators',
+        txtKeepTextOnly: 'Keep text only',
+        textUndo: 'Undo'
 
     }, DE.Views.DocumentHolder || {}));
 });

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

@@ -111,10 +111,14 @@ define([
         template: _.template([
             '<table><tbody>',
                 /** coauthoring begin **/
-                '<tr class="coauth">',
+                '<tr class="comments">',
                     '<td class="left"><label><%= scope.txtLiveComment %></label></td>',
                     '<td class="right"><div id="fms-chb-live-comment"/></td>',
-                '</tr>','<tr class="divider coauth"></tr>',
+                '</tr>','<tr class="divider comments"></tr>',
+                '<tr class="comments">',
+                    '<td class="left"></td>',
+                    '<td class="right"><div id="fms-chb-resolved-comment"/></td>',
+                '</tr>','<tr class="divider comments"></tr>',
                 /** coauthoring end **/
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
@@ -185,6 +189,13 @@ define([
             this.chLiveComment = new Common.UI.CheckBox({
                 el: $('#fms-chb-live-comment'),
                 labelText: this.strLiveComment
+            }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                this.chResolvedComment.setDisabled(field.getValue()!=='checked');
+            }, this));
+
+            this.chResolvedComment = new Common.UI.CheckBox({
+                el: $('#fms-chb-resolved-comment'),
+                labelText: this.strResolvedComment
             });
             /** coauthoring end **/
 
@@ -326,6 +337,7 @@ define([
             /** coauthoring begin **/
             $('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide']();
             $('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
+            $('tr.comments', this.el)[mode.canCoAuthoring && mode.canComments ? 'show' : 'hide']();
             /** coauthoring end **/
         },
 
@@ -342,6 +354,9 @@ define([
             value = Common.localStorage.getItem("de-settings-livecomment");
             this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
 
+            value = Common.localStorage.getItem("de-settings-resolvedcomment");
+            this.chResolvedComment.setValue(!(value!==null && parseInt(value) == 0));
+
             value = Common.localStorage.getItem("de-settings-coauthmode");
             if (value===null && Common.localStorage.getItem("de-settings-autosave")===null &&
                 this.mode.customization && this.mode.customization.autosave===false)
@@ -391,6 +406,7 @@ define([
             Common.localStorage.setItem("de-settings-zoom", this.cmbZoom.getValue());
             /** coauthoring begin **/
             Common.localStorage.setItem("de-settings-livecomment", this.chLiveComment.isChecked() ? 1 : 0);
+            Common.localStorage.setItem("de-settings-resolvedcomment", this.chResolvedComment.isChecked() ? 1 : 0);
             if (this.mode.isEdit && !this.mode.isOffline && this.mode.canCoAuthoring) {
                 Common.localStorage.setItem("de-settings-coauthmode", this.cmbCoAuthMode.getValue());
                 Common.localStorage.setItem(this.cmbCoAuthMode.getValue() ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", this.cmbShowChanges.getValue());
@@ -463,7 +479,8 @@ define([
         txtFitPage: 'Fit to Page',
         txtFitWidth: 'Fit to Width',
         textForceSave: 'Save to Server',
-        strForcesave: 'Always save to server (otherwise save to server on document close)'
+        strForcesave: 'Always save to server (otherwise save to server on document close)',
+        strResolvedComment: 'Turn on display of the resolved comments'
     }, DE.Views.FileMenuPanels.Settings || {}));
 
     DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({

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

@@ -81,7 +81,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
             this.api = this.options.api;
 
             Common.UI.Window.prototype.initialize.call(this, this.options);

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

@@ -145,6 +145,7 @@ define([
             this.btnChat.hide();
 
             this.btnComments.on('click',        _.bind(this.onBtnMenuClick, this));
+            this.btnComments.on('toggle',       _.bind(this.onBtnCommentsToggle, this));
             this.btnChat.on('click',            _.bind(this.onBtnMenuClick, this));
             /** coauthoring end **/
 
@@ -185,6 +186,11 @@ define([
                 Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
         },
 
+        onBtnCommentsToggle: function(btn, state) {
+            if (!state)
+                this.fireEvent('comments:hide', this);
+        },
+
         onBtnMenuClick: function(btn, e) {
             this.supressEvents = true;
             this.btnFile.toggle(false);

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

@@ -54,7 +54,7 @@ define([
                 '<div id="id-mail-recepients-placeholder"></div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.fileChoiceUrl = options.fileChoiceUrl || '';
             Common.UI.Window.prototype.initialize.call(this, _options);

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

@@ -55,7 +55,7 @@ define([
                 '<div id="id-mail-merge-folder-placeholder"></div>'
             ].join('');
 
-            _options.tpl = _.template(this.template, _options);
+            _options.tpl = _.template(this.template)(_options);
 
             this.mergeFolderUrl = options.mergeFolderUrl || '';
             this.mergedFileUrl = options.mergedFileUrl || '';

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

@@ -89,7 +89,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             this.spinners = [];
             this._noApply = false;

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

@@ -79,7 +79,7 @@ define([
                 '</div>'
             ].join('');
 
-            this.options.tpl = _.template(this.template, this.options);
+            this.options.tpl = _.template(this.template)(this.options);
 
             this.spinners = [];
             this._noApply = false;

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

@@ -1341,6 +1341,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.fillControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -79,9 +79,6 @@ define([
             this.fireEvent('langchanged', [this, item.value.code, item.caption]);
         }
 
-        if ( DE.Views.Statusbar )
-            var LanguageDialog = DE.Views.Statusbar.LanguageDialog || {};
-
         DE.Views.Statusbar = Backbone.View.extend(_.extend({
             el: '#statusbar',
             template: _.template(template),
@@ -96,7 +93,7 @@ define([
 
             templateUserList: _.template('<ul>' +
                 '<% _.each(users, function(item) { %>' +
-                    '<%= _.template(usertpl, {user: item, scope: scope}) %>' +
+                    '<%= _.template(usertpl)({user: item, scope: scope}) %>' +
                 '<% }); %>' +
             '</ul>'),
 
@@ -194,7 +191,7 @@ define([
                     maxHeight: 300,
                     itemTemplate: _.template([
                         '<a id="<%= id %>" tabindex="-1" type="menuitem">',
-                            '<span class="lang-item-icon img-toolbarmenu lang-flag <%= iconCls %>"></span>',
+                            '<span class="lang-item-icon lang-flag <%= iconCls %>"></span>',
                             '<%= caption %>',
                         '</a>'
                     ].join('')),
@@ -436,7 +433,7 @@ define([
 
             _onAddUser: function(m, c, opts) {
                 if (this.panelUsersList) {
-                    this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
+                    this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
                     this.panelUsersList.scroller.update({minScrollbarLength  : 40, alwaysVisibleY: true});
                 }
             },
@@ -466,6 +463,7 @@ define([
             /** coauthoring end **/
 
             reloadLanguages: function(array) {
+                this.langMenu.removeAll();
                 _.each(array, function(item) {
                     this.langMenu.addItem({
                         iconCls     : item['tip'],
@@ -485,7 +483,7 @@ define([
             },
 
             setLanguage: function(info) {
-                if (this.langMenu.prevTip != info.tip) {
+                if (this.langMenu.prevTip != info.tip && info.code !== undefined) {
                     var $parent = $(this.langMenu.el.parentNode, this.$el);
                     $parent.find('.icon-lang-flag')
                         .removeClass(this.langMenu.prevTip)
@@ -541,99 +539,5 @@ define([
             tipViewUsers        : 'View users and manage document access rights',
             txAccessRights      : 'Change access rights'
         }, DE.Views.Statusbar || {}));
-
-        DE.Views.Statusbar.LanguageDialog = Common.UI.Window.extend(_.extend({
-            options: {
-                header: false,
-                width: 350,
-                cls: 'modal-dlg'
-            },
-
-            template:   '<div class="box">' +
-                            '<div class="input-row">' +
-                                '<label><%= label %></label>' +
-                            '</div>' +
-                            '<div class="input-row" id="id-document-language">' +
-                            '</div>' +
-                        '</div>' +
-                        '<div class="footer right">' +
-                            '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;"><%= btns.ok %></button>'+
-                            '<button class="btn normal dlg-btn" result="cancel"><%= btns.cancel %></button>'+
-                        '</div>',
-
-            initialize : function(options) {
-                _.extend(this.options, options || {}, {
-                    label: this.labelSelect,
-                    btns: {ok: this.btnOk, cancel: this.btnCancel}
-                });
-                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 $window = this.getChild();
-                $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
-
-                this.cmbLanguage = new Common.UI.ComboBox({
-                    el: $window.find('#id-document-language'),
-                    cls: 'input-group-nr',
-                    menuStyle: 'min-width: 318px; max-height: 300px;',
-                    editable: false,
-                    template: _.template([
-                        '<span class="input-group combobox <%= cls %> combo-langs" id="<%= id %>" style="<%= style %>">',
-                            '<input type="text" class="form-control">',
-                            '<span class="input-lang-icon img-toolbarmenu lang-flag" style="position: absolute;"></span>',
-                            '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
-                            '<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
-                                '<% _.each(items, function(item) { %>',
-                                    '<li id="<%= item.id %>" data-value="<%= item.value %>">',
-                                        '<a tabindex="-1" type="menuitem" style="padding-left: 26px !important;">',
-                                            '<span class="lang-item-icon img-toolbarmenu lang-flag <%= item.value %>" style="position: absolute;margin-left:-21px;"></span>',
-                                            '<%= scope.getDisplayValue(item) %>',
-                                        '</a>',
-                                    '</li>',
-                                '<% }); %>',
-                            '</ul>',
-                        '</span>'
-                    ].join('')),
-                    data: this.options.languages
-                });
-
-                if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
-                this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
-                this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
-                this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
-            },
-
-            close: function(suppressevent) {
-                var $window = this.getChild();
-                if (!$window.find('.combobox.open').length) {
-                    Common.UI.Window.prototype.close.call(this, arguments);
-                }
-            },
-
-            onBtnClick: function(event) {
-                if (this.options.handler) {
-                    this.options.handler.call(this, event.currentTarget.attributes['result'].value, this.cmbLanguage.getValue());
-                }
-
-                this.close();
-            },
-
-            onLangSelect: function(cmb, rec, e) {
-                var icon    = cmb.$el.find('.input-lang-icon'),
-                    plang   = icon.attr('lang');
-
-                if (plang) icon.removeClass(plang);
-                icon.addClass(rec.value).attr('lang',rec.value);
-            },
-
-            labelSelect     : 'Select document language',
-            btnCancel       : 'Cancel',
-            btnOk           : 'Ok'
-        }, LanguageDialog||{}));
     }
 );

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

@@ -70,7 +70,7 @@ define([
                     '</div>'
                 ].join('');
 
-                this.options.tpl = _.template(this.template, this.options);
+                this.options.tpl = _.template(this.template)(this.options);
 
                 Common.UI.Window.prototype.initialize.call(this, this.options);
             },
@@ -107,10 +107,11 @@ define([
                 menuStyle   : 'width: 100%; max-height: 290px;',
                 editable    : false,
                 cls         : 'input-group-nr',
-                data        : this.options.formats
+                data        : this.options.formats,
+                disabled    : (this.options.formats.length==0)
             });
-
+            if (this.options.formats.length>0)
-            this.cmbNextStyle.setValue(this.options.formats[0].value);
+                this.cmbNextStyle.setValue(this.options.formats[0].value);
         },
 
         show: function() {
@@ -129,7 +130,7 @@ define([
 
         getNextStyle: function () {
             var me = this;
-            return me.cmbNextStyle.getValue();
+            return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
         },
 
         onBtnClick: function(event) {

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

@@ -916,6 +916,18 @@ define([
             this.sldrGradient.on('thumbdblclick', function(cmp){
                 me.btnGradColor.cmpEl.find('button').dropdown('toggle');
             });
+            this.sldrGradient.on('sortthumbs', function(cmp, recalc_indexes){
+                var colors = [],
+                    currentIdx;
+                _.each (recalc_indexes, function(recalc_index, index) {
+                    colors.push(me.GradColor.colors[recalc_index]);
+                    if (me.GradColor.currentIdx == recalc_index)
+                        currentIdx = index;
+                });
+                me.OriginalFillType = null;
+                me.GradColor.colors = colors;
+                me.GradColor.currentIdx = currentIdx;
+            });
             this.lockedControls.push(this.sldrGradient);
 
             this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({

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

@@ -606,7 +606,9 @@ define([
                         { caption: this.textColumnsTwo,     iconCls: 'mnu-columns-two',   checkable: true, toggleGroup: 'menuColumns', value: 1 },
                         { caption: this.textColumnsThree,   iconCls: 'mnu-columns-three', checkable: true, toggleGroup: 'menuColumns', value: 2 },
                         { caption: this.textColumnsLeft,    iconCls: 'mnu-columns-left',  checkable: true, toggleGroup: 'menuColumns', value: 3 },
-                        { caption: this.textColumnsRight,   iconCls: 'mnu-columns-right', checkable: true, toggleGroup: 'menuColumns', value: 4 }
+                        { caption: this.textColumnsRight,   iconCls: 'mnu-columns-right', checkable: true, toggleGroup: 'menuColumns', value: 4 },
+                        { caption: '--' },
+                        { caption: this.textColumnsCustom, value: 'advanced' }
                     ]
                 })
             });
@@ -1220,15 +1222,16 @@ define([
             this.btnNumbers.setMenu(
                 new Common.UI.Menu({
                     items: [
-                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 330px; margin: 0 5px;"></div>') }
+                        { template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 5px;"></div>') }
                     ]
                 })
             );
 
             this.btnMultilevels.setMenu(
                 new Common.UI.Menu({
+                    style: 'min-width: 90px',
                     items: [
-                        { template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 165px; margin: 0 5px;"></div>') }
+                        { template: _.template('<div id="id-toolbar-menu-multilevels" class="menu-markers" style="width: 93px; margin: 0 5px;"></div>') }
                     ]
                 })
             );
@@ -1353,19 +1356,19 @@ define([
             this.mnuNumbersPicker = new Common.UI.DataView({
                 el: $('#id-toolbar-menu-numbering'),
                 parentMenu: this.btnNumbers.menu,
-                restoreHeight: 164,
+                restoreHeight: 92,
                 allowScrollbar: false,
                 store: new Common.UI.DataViewStore([
                     {offsety: 0, data: {type: 1, subtype: -1}},
-                    {offsety: 518, data: {type: 1, subtype: 4}},
+                    {offsety: 570, data: {type: 1, subtype: 4}},
-                    {offsety: 592, data: {type: 1, subtype: 5}},
+                    {offsety: 532, data: {type: 1, subtype: 5}},
-                    {offsety: 666, data: {type: 1, subtype: 6}},
+                    {offsety: 608, data: {type: 1, subtype: 6}},
-                    {offsety: 296, data: {type: 1, subtype: 1}},
+                    {offsety: 418, data: {type: 1, subtype: 1}},
-                    {offsety: 370, data: {type: 1, subtype: 2}},
+                    {offsety: 456, data: {type: 1, subtype: 2}},
-                    {offsety: 444, data: {type: 1, subtype: 3}},
+                    {offsety: 494, data: {type: 1, subtype: 3}},
-                    {offsety: 740, data: {type: 1, subtype: 7}}
+                    {offsety: 646, data: {type: 1, subtype: 7}}
                 ]),
-                itemTemplate: _.template('<div id="<%= id %>" class="item-numberlist" style="background-position: 0 -<%= offsety %>px;"></div>')
+                itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
             });
             _conf && this.mnuNumbersPicker.selectByIndex(_conf.index, true);
 
@@ -1373,15 +1376,15 @@ define([
             this.mnuMultilevelPicker = new Common.UI.DataView({
                 el: $('#id-toolbar-menu-multilevels'),
                 parentMenu: this.btnMultilevels.menu,
-                restoreHeight: 164,
+                restoreHeight: 92,
                 allowScrollbar: false,
                 store: new Common.UI.DataViewStore([
                         { offsety:0,   data:{type:2, subtype:-1} },
-                        { offsety:74,  data:{type:2, subtype:1} },
+                        {offsety: 304, data: {type: 2, subtype: 1}},
-                        { offsety:148, data:{type:2, subtype:2} },
+                        {offsety: 342, data: {type: 2, subtype: 2}},
-                        { offsety:222, data:{type:2, subtype:3} }
+                        {offsety: 380, data: {type: 2, subtype: 3}}
-                    ]),
+                ]),
-                itemTemplate: _.template('<div id="<%= id %>" class="item-multilevellist" style="background-position: 0 -<%= offsety %>px;"></div>')
+                itemTemplate: _.template('<div id="<%= id %>" class="item-markerlist" style="background-position: 0 -<%= offsety %>px;"></div>')
             });
             _conf && this.mnuMultilevelPicker.selectByIndex(_conf.index, true);
 
@@ -1414,6 +1417,7 @@ define([
                     { 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,          allowSelected: true, iconCls: 'column-normal', selected: true},
@@ -1441,6 +1445,10 @@ define([
                     { group: 'menu-chart-group-area',    type: Asc.c_oAscChartTypeSettings.areaStackedPer,     allowSelected: true, iconCls: 'area-pstack'},
                     { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter,            allowSelected: true, iconCls: 'point-normal'},
                     { group: 'menu-chart-group-stock',   type: Asc.c_oAscChartTypeSettings.stock,              allowSelected: true, iconCls: 'stock-normal'}
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal,      allowSelected: true, iconCls: 'surface-normal'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe,   allowSelected: true, iconCls: 'surface-wireframe'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal,      allowSelected: true, iconCls: 'contour-normal'},
+                    // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe,   allowSelected: true, iconCls: 'contour-wireframe'}
                 ]),
                 itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
             });
@@ -1962,7 +1970,9 @@ define([
         mniDelFootnote: 'Delete All Footnotes',
         mniNoteSettings: 'Notes Settings',
         textGotoFootnote: 'Go to Footnotes',
-        tipChangeChart: 'Change Chart Type'
+        tipChangeChart: 'Change Chart Type',
+        textColumnsCustom: 'Custom Columns',
+        textSurface: 'Surface'
 
     }, DE.Views.Toolbar || {}));
 });

apps/documenteditor/main/app_dev.js

@@ -56,7 +56,6 @@ require.config({
         sockjs          : '../vendor/sockjs/sockjs.min',
         jszip           : '../vendor/jszip/jszip.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
-        jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
@@ -125,7 +124,6 @@ require([
     'locale',
     'jszip',
     'jsziputils',
-    'jsrsasign',
     'sockjs',
 	'underscore'
 ], function (Backbone, Bootstrap, Core) {
@@ -193,37 +191,8 @@ require([
         app.start();
     });
 }, function(err) {
-    if (err.requireType == 'timeout' && !reqerr) {
+    if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
-        var getUrlParams = function() {
+        reqerr = window.requireTimeourError();
-            var e,
-                a = /\+/g,  // Regex for replacing addition symbol with a space
-                r = /([^&=]+)=?([^&]*)/g,
-                d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
-                q = window.location.search.substring(1),
-                urlParams = {};
-
-            while (e = r.exec(q))
-                urlParams[d(e[1])] = d(e[2]);
-
-            return urlParams;
-        };
-
-        var encodeUrlParam = function(str) {
-            return str.replace(/&/g, '&')
-                    .replace(/"/g, '"')
-                    .replace(/'/g, ''')
-                    .replace(/</g, '&lt;')
-                    .replace(/>/g, '&gt;');
-        };
-
-        var lang = (getUrlParams()["lang"] || 'en').split("-")[0];
-
-        if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
-        else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
-        else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
-        else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
-        else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
-
         window.alert(reqerr);
         window.location.reload();
     }

apps/documenteditor/main/index.html

@@ -270,6 +270,18 @@
         window.sdk_dev_scrpipts.forEach(function(item){
             document.write('<script type="text/javascript" src="' + item + '"><\/script>');
         });
+
+        window.requireTimeourError = function(){
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
     </script>
     <!-- application -->
     <script data-main="app_dev" src="../../../vendor/requirejs/require.js"></script>

apps/documenteditor/main/index.html.deploy

@@ -9,7 +9,7 @@
     <link rel="icon" href="resources/img/favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">
 
-    <!-- splash -->        
+    <!-- splash -->
 
     <style type="text/css">
         .loadmask {
@@ -254,8 +254,28 @@
                 '</div>' +
             '</div>');
 
-        var require = { 
+        window.requireTimeourError = function(){
-            waitSeconds: 30 
+            var reqerr;
+
+            if ( lang == 'de')      reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.';
+            else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.';
+            else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.';
+            else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.';
+            else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.';
+
+            return reqerr;
+        };
+
+        var requireTimeoutID = setTimeout(function(){
+            window.alert(window.requireTimeourError());
+            window.location.reload();
+        }, 30000);
+
+        var require = {
+            waitSeconds: 30,
+            callback: function(){
+                clearTimeout(requireTimeoutID);
+            }
         };
     </script>
 

apps/documenteditor/main/locale/cs.json

@@ -81,10 +81,13 @@
   "Common.UI.SearchDialog.textTitle": "Najít a nahradit",
   "Common.UI.SearchDialog.textTitle2": "Najít",
   "Common.UI.SearchDialog.textWholeWords": "Pouze celá slova",
+  "Common.UI.SearchDialog.txtBtnHideReplace": "Hide Replace",
   "Common.UI.SearchDialog.txtBtnReplace": "Nahradit",
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Nahradit vše",
   "Common.UI.SynchronizeTip.textDontShow": "Nezobrazovat znovu tuto zprávu",
   "Common.UI.SynchronizeTip.textSynchronize": "Dokument byl pozměněn jiným uživatelem.<br/>Kliněte prosím pro uložení vašich změn a načtení úprav.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.UI.Window.cancelButtonText": "Zrušit",
   "Common.UI.Window.closeButtonText": "Zavřít",
   "Common.UI.Window.noButtonText": "Ne",
@@ -95,6 +98,8 @@
   "Common.UI.Window.textInformation": "Informace",
   "Common.UI.Window.textWarning": "Varování",
   "Common.UI.Window.yesButtonText": "Ano",
+  "Common.Utils.Metric.txtCm": "cm",
+  "Common.Utils.Metric.txtPt": "pt",
   "Common.Views.About.txtAddress": "adresa:",
   "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
   "Common.Views.About.txtLicensee": "DRŽITEL LICENCE",
@@ -136,7 +141,13 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Příjemci korespondence",
   "Common.Views.Header.openNewTabText": "Otevřít v nové záložce",
   "Common.Views.Header.textBack": "Jít do dokumentů",
-  "Common.Views.History.textHistoryHeader": "Zpátky k dokumentu",
+  "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.History.textCloseHistory": "Close History",
+  "Common.Views.History.textHide": "Collapse",
+  "Common.Views.History.textHideAll": "Hide detailed changes",
+  "Common.Views.History.textRestore": "Restore",
+  "Common.Views.History.textShow": "Expand",
+  "Common.Views.History.textShowAll": "Show detailed changes",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Zrušit",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Vložit URL obrázku:",
@@ -150,10 +161,23 @@
   "Common.Views.InsertTableDialog.txtMinText": "Minimální hodnota tohoto pole je {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Počet řádků",
   "Common.Views.InsertTableDialog.txtTitle": "Velikost tabulky",
+  "Common.Views.LanguageDialog.btnCancel": "Cancel",
+  "Common.Views.LanguageDialog.btnOk": "Ok",
+  "Common.Views.LanguageDialog.labelSelect": "Select document language",
   "Common.Views.OpenDialog.cancelButtonText": "Zrušit",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Kódování",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtTitle": "Vyberte %1 možností",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
+  "Common.Views.RenameDialog.cancelButtonText": "Cancel",
+  "Common.Views.RenameDialog.okButtonText": "Ok",
+  "Common.Views.RenameDialog.textName": "File name",
+  "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
   "Common.Views.ReviewChanges.txtAccept": "Accept",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Changes",
@@ -174,7 +198,6 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "Pokud budete pokračovat v ukládání v tomto formátu, vše kromě textu bude ztraceno.<br>Opravdu chcete pokračovat?",
   "DE.Controllers.Main.applyChangesTextText": "Načítání změn...",
   "DE.Controllers.Main.applyChangesTitleText": "Načítání změn",
-  "DE.Controllers.Main.convertationErrorText": "Konverze selhala.",
   "DE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.",
   "DE.Controllers.Main.criticalErrorExtText": "Kliněte na \"OK\" pro návrat k seznamu dokumentů",
   "DE.Controllers.Main.criticalErrorTitle": "Chyba",
@@ -184,6 +207,8 @@
   "DE.Controllers.Main.downloadMergeTitle": "Stahuji",
   "DE.Controllers.Main.downloadTextText": "Stahování dokumentu...",
   "DE.Controllers.Main.downloadTitleText": "Stahování dokumentu",
+  "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": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.",
   "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.errorDatabaseConnection": "Externí chyba.<br>Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.",
@@ -195,10 +220,17 @@
   "DE.Controllers.Main.errorMailMergeLoadFile": "Načítání selhalo",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Spojování selhalo.",
   "DE.Controllers.Main.errorProcessSaveResult": "Ukládání selhalo.",
+  "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "DE.Controllers.Main.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",
+  "DE.Controllers.Main.errorSessionIdle": "The document has not been edited for quite a long time. Please reload the page.",
+  "DE.Controllers.Main.errorSessionToken": "The connection to the server has been interrupted. Please reload the page.",
   "DE.Controllers.Main.errorStockChart": "Nespravné pořadí řádků. Chcete-li vytvořit burzovní graf umístěte data na list v následujícím pořadí:<br> otevírací cena, maximální cena, minimální cena, uzavírací cena.",
+  "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": "Verze souboru byla změněna. Stránka bude znovu načtena.",
   "DE.Controllers.Main.errorUserDrop": "Tento soubor není nyní přístupný.",
   "DE.Controllers.Main.errorUsersExceed": "Počet uživatelů povolených cenovým plánem byl překročen",
+  "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.leavePageText": "Máte neuložené změny v tomto dokumentu. Klikněte na \"Zůstat na této stránce\", poté na \"Uložit\" pro uložení. Klikněte na \"Opustit tuto stránku\" pro zahození všech neuložených změn.",
   "DE.Controllers.Main.loadFontsTextText": "Načítání dat...",
   "DE.Controllers.Main.loadFontsTitleText": "Načítání dat",
@@ -213,6 +245,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Načítání datového zdroje...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Načítání datového zdroje",
   "DE.Controllers.Main.notcriticalErrorTitle": "Varování",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "DE.Controllers.Main.openTextText": "Otevírání dokumentu...",
   "DE.Controllers.Main.openTitleText": "Otevírání dokumentu",
   "DE.Controllers.Main.printTextText": "Tisknutí dokumentu...",
@@ -220,6 +253,7 @@
   "DE.Controllers.Main.reloadButtonText": "Znovu načíst stránku",
   "DE.Controllers.Main.requestEditFailedMessageText": "Někdo právě upravuje tento dokument. Prosím zkuste to znovu později.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Přístup zamítnut",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "DE.Controllers.Main.savePreparingText": "Příprava na ukládání",
   "DE.Controllers.Main.savePreparingTitle": "Příprava ukládání. Prosím čekejte...",
   "DE.Controllers.Main.saveTextText": "Ukládání dokumentu...",
@@ -230,10 +264,17 @@
   "DE.Controllers.Main.splitMaxColsErrorText": "Počet sloupců musí být menší než %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "Počet řádků musí být menší než %1.",
   "DE.Controllers.Main.textAnonymous": "Anonymní",
+  "DE.Controllers.Main.textBuyNow": "Visit website",
+  "DE.Controllers.Main.textChangesSaved": "Všechny změny uloženy",
   "DE.Controllers.Main.textCloseTip": "Zavřete tento tip kliknutím",
+  "DE.Controllers.Main.textContactUs": "Contact sales",
   "DE.Controllers.Main.textLoadingDocument": "Načítání dokumentu",
+  "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
+  "DE.Controllers.Main.textShape": "Shape",
   "DE.Controllers.Main.textStrict": "Strict mode",
   "DE.Controllers.Main.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.",
+  "DE.Controllers.Main.titleLicenseExp": "License expired",
+  "DE.Controllers.Main.titleServerVersion": "Editor updated",
   "DE.Controllers.Main.titleUpdateVersion": "Verze změněna",
   "DE.Controllers.Main.txtArt": "Zde napište text",
   "DE.Controllers.Main.txtBasicShapes": "Základní tvary",
@@ -250,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Obdelníky",
   "DE.Controllers.Main.txtSeries": "Řady",
   "DE.Controllers.Main.txtStarsRibbons": "Hvězdy a stuhy",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Quote",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
+  "DE.Controllers.Main.txtStyle_Title": "Title",
   "DE.Controllers.Main.txtXAxis": "Osa X",
   "DE.Controllers.Main.txtYAxis": "Osa Y",
   "DE.Controllers.Main.unknownErrorText": "Neznámá chyba.",
@@ -261,11 +318,14 @@
   "DE.Controllers.Main.uploadImageTitleText": "Nahrávání obrázku",
   "DE.Controllers.Main.warnBrowserIE9": "Aplikace má slabou podporu v IE9. Použíjte IE10 nebo vyšší",
   "DE.Controllers.Main.warnBrowserZoom": "Aktuální přiblížení prohlížeče není plně podporováno. Obnovte prosím původní přiblížení stiknem CTRL+0.",
+  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
+  "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "Bylo Vám odebráno právo upravovat tento soubor",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.zoomText": "Přiblížení {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "Písmo, které se chystáte uložit není dostupné na stávajícím zařízení.<br>Text bude zobrazen s jedním ze systémových písem, uložené písmo bude použito, jakmile bude dostupné.<br>Chcete pokračovat?",
+  "DE.Controllers.Toolbar.confirmDeleteFootnotes": "Do you want to delete all footnotes?",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
   "DE.Controllers.Toolbar.textAccent": "Akcenty",
   "DE.Controllers.Toolbar.textBracket": "Závorky",
@@ -614,6 +674,7 @@
   "DE.Views.ChartSettings.textSize": "Velikost",
   "DE.Views.ChartSettings.textStock": "Burzovní graf",
   "DE.Views.ChartSettings.textStyle": "Styl",
+  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Odepnout od panelu",
   "DE.Views.ChartSettings.textWidth": "Šířka",
   "DE.Views.ChartSettings.textWrap": "Obtékání textu",
@@ -625,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "Těsný",
   "DE.Views.ChartSettings.txtTitle": "Graf",
   "DE.Views.ChartSettings.txtTopAndBottom": "Nahoře a dole",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
+  "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
+  "DE.Views.CustomColumnsDialog.textTitle": "Columns",
   "DE.Views.DocumentHolder.aboveText": "Nad",
   "DE.Views.DocumentHolder.addCommentText": "Přidat komentář",
   "DE.Views.DocumentHolder.advancedFrameText": "Pokročilé nastavení rámečku",
@@ -633,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Pokročilé nastavení",
   "DE.Views.DocumentHolder.alignmentText": "Zarovnání",
   "DE.Views.DocumentHolder.belowText": "Pod",
-  "DE.Views.DocumentHolder.bottomCellText": "Zarovnat dolů",
   "DE.Views.DocumentHolder.breakBeforeText": "Rozdělit stránku před",
   "DE.Views.DocumentHolder.cellAlignText": "Svislé zarovnání buňky",
   "DE.Views.DocumentHolder.cellText": "Buňka",
-  "DE.Views.DocumentHolder.centerCellText": "Zarovnat na střed",
   "DE.Views.DocumentHolder.centerText": "Střed",
   "DE.Views.DocumentHolder.chartText": "Pokročilé nastavení grafu",
   "DE.Views.DocumentHolder.columnText": "Sloupec",
@@ -709,9 +774,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Zarovnat uprostřed",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Zarovnat vpravo",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Zarovnat nahoru",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Obtékání textu",
   "DE.Views.DocumentHolder.tipIsLocked": "Tento element je upravován jiným uživatelem.",
-  "DE.Views.DocumentHolder.topCellText": "Zarovnat nahoru",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
   "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
@@ -762,6 +827,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
   "DE.Views.DocumentHolder.txtLimitChange": "Change limits location",
   "DE.Views.DocumentHolder.txtLimitOver": "Limit over text",
   "DE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
@@ -831,8 +897,6 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "Relativně k",
   "DE.Views.DropcapSettingsAdvanced.textRight": "Vpravo",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Výška v řádcích",
-  "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Standardní barvy",
-  "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Barvy schématu",
   "DE.Views.DropcapSettingsAdvanced.textTitle": "Iniciála - Pokročilé nastavení",
   "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Rámček - Pokročilé nastavení",
   "DE.Views.DropcapSettingsAdvanced.textTop": "Nahoře",
@@ -841,6 +905,7 @@
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Název písma",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Bez ohraničení",
   "DE.Views.FileMenu.btnBackCaption": "Jít do dokumentů",
+  "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Vytvořit nový",
   "DE.Views.FileMenu.btnDownloadCaption": "Stáhnout jako...",
   "DE.Views.FileMenu.btnHelpCaption": "Pomoc...",
@@ -848,6 +913,7 @@
   "DE.Views.FileMenu.btnInfoCaption": "Informace dokumentu...",
   "DE.Views.FileMenu.btnPrintCaption": "Tisk",
   "DE.Views.FileMenu.btnRecentFilesCaption": "Otevřít nedávné...",
+  "DE.Views.FileMenu.btnRenameCaption": "Rename...",
   "DE.Views.FileMenu.btnReturnCaption": "Zpátky k dokumentu",
   "DE.Views.FileMenu.btnRightsCaption": "Přístupové práva...",
   "DE.Views.FileMenu.btnSaveAsCaption": "Save as",
@@ -877,14 +943,17 @@
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Osoby, které mají práva",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Použít",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Zapnout tipy pro zarovnání",
+  "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Turn on autorecover",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Zapnout automatické ukládání",
   "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
   "DE.Views.FileMenuPanels.Settings.strFast": "Fast",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Zapnout hieroglyfy",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Zapnout zobrazování komentářů.",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Změny spolupráce v reálném čase",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Zapnout kontrolu pravopisu",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
@@ -895,11 +964,16 @@
   "DE.Views.FileMenuPanels.Settings.text5Minutes": "Každých 5 minut",
   "DE.Views.FileMenuPanels.Settings.text60Minutes": "Každou hodinu",
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Nápověda zarovnání",
+  "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatické ukládání",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Zakázáno",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Každou minutu",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Zobrazit všechny",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetr",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
+  "DE.Views.FileMenuPanels.Settings.txtInch": "Inch",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Náhradní vstup",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Zobraz poslední",
   "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Zobrazení komentářů",
@@ -933,6 +1007,8 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Toto pole je povinné",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Toto pole musí být URL adresa ve formátu \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Zobrazit pokročilé nastavení",
+  "DE.Views.ImageSettings.textEdit": "Edit",
+  "DE.Views.ImageSettings.textEditObject": "Edit Object",
   "DE.Views.ImageSettings.textFromFile": "Ze souboru",
   "DE.Views.ImageSettings.textFromUrl": "Z adresy URL",
   "DE.Views.ImageSettings.textHeight": "Výška",
@@ -951,8 +1027,14 @@
   "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Zrušit",
   "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
   "DE.Views.ImageSettingsAdvanced.strMargins": "Vnitřní odsazení textu",
+  "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolutně",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Zarovnání",
+  "DE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
+  "DE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
+  "DE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "DE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Šipky",
+  "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Lock aspect ratio",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Velikost začátku",
   "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Styl začátku",
   "DE.Views.ImageSettingsAdvanced.textBelow": "pod",
@@ -985,7 +1067,9 @@
   "DE.Views.ImageSettingsAdvanced.textPage": "Stránka",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Odstavec",
   "DE.Views.ImageSettingsAdvanced.textPosition": "Pozice",
+  "DE.Views.ImageSettingsAdvanced.textPositionPc": "Relative position",
   "DE.Views.ImageSettingsAdvanced.textRelative": "relativně k",
+  "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relative",
   "DE.Views.ImageSettingsAdvanced.textRight": "Vpravo",
   "DE.Views.ImageSettingsAdvanced.textRightMargin": "Pravý okraj",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "vpravo od",
@@ -1012,9 +1096,11 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Komentáře",
   "DE.Views.LeftMenu.tipFile": "Soubor",
+  "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Hledat",
   "DE.Views.LeftMenu.tipSupport": "Podpora a zpětná vazba",
   "DE.Views.LeftMenu.tipTitles": "Nadpisy",
+  "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Zrušit",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Poslat",
@@ -1067,6 +1153,25 @@
   "DE.Views.MailMergeSettings.txtPrev": "K předchozímu záznamu",
   "DE.Views.MailMergeSettings.txtUntitled": "Bez názvu",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Spuštění hromadné korespondence se nezdařilo",
+  "DE.Views.NoteSettingsDialog.textApply": "Apply",
+  "DE.Views.NoteSettingsDialog.textApplyTo": "Apply changes to",
+  "DE.Views.NoteSettingsDialog.textCancel": "Cancel",
+  "DE.Views.NoteSettingsDialog.textContinue": "Continuous",
+  "DE.Views.NoteSettingsDialog.textCustom": "Custom Mark",
+  "DE.Views.NoteSettingsDialog.textDocument": "Whole document",
+  "DE.Views.NoteSettingsDialog.textEachPage": "Restart each page",
+  "DE.Views.NoteSettingsDialog.textEachSection": "Restart each section",
+  "DE.Views.NoteSettingsDialog.textFootnote": "Footnote",
+  "DE.Views.NoteSettingsDialog.textFormat": "Format",
+  "DE.Views.NoteSettingsDialog.textInsert": "Insert",
+  "DE.Views.NoteSettingsDialog.textLocation": "Location",
+  "DE.Views.NoteSettingsDialog.textNumbering": "Numbering",
+  "DE.Views.NoteSettingsDialog.textNumFormat": "Number Format",
+  "DE.Views.NoteSettingsDialog.textPageBottom": "Bottom of page",
+  "DE.Views.NoteSettingsDialog.textSection": "Current section",
+  "DE.Views.NoteSettingsDialog.textStart": "Start at",
+  "DE.Views.NoteSettingsDialog.textTextBottom": "Below text",
+  "DE.Views.NoteSettingsDialog.textTitle": "Notes Settings",
   "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.okButtonText": "Ok",
@@ -1094,8 +1199,6 @@
   "DE.Views.ParagraphSettings.textBackColor": "Barva pozadí",
   "DE.Views.ParagraphSettings.textExact": "Přesně",
   "DE.Views.ParagraphSettings.textNewColor": "Přidat novou vlastní barvu",
-  "DE.Views.ParagraphSettings.textStandartColors": "Standardní barvy",
-  "DE.Views.ParagraphSettings.textThemeColors": "Barvy schématu",
   "DE.Views.ParagraphSettings.txtAutoText": "Automaticky",
   "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Zrušit",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Specifikované tabulátory se objeví v tomto poli",
@@ -1136,12 +1239,10 @@
   "DE.Views.ParagraphSettingsAdvanced.textRight": "Vpravo",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Specifikovat",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Řádkování",
-  "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Standardní barvy",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Střed",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Vlevo",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Pozice tabulátoru",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Vpravo",
-  "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Barvy schématu",
   "DE.Views.ParagraphSettingsAdvanced.textTitle": "Odstavec - Pokročilé nastavení",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "Nahoře",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Nastavit vnejší ohraničení a všechny vnitřní čáry",
@@ -1170,6 +1271,7 @@
   "DE.Views.ShapeSettings.strSize": "Velikost",
   "DE.Views.ShapeSettings.strStroke": "Tloušťka",
   "DE.Views.ShapeSettings.strTransparency": "Průhlednost",
+  "DE.Views.ShapeSettings.strType": "Type",
   "DE.Views.ShapeSettings.textAdvanced": "Zobrazit pokročilé nastavení",
   "DE.Views.ShapeSettings.textBorderSizeErr": "Zadaná hodnota není správná.<br>Zadejte prosím hodnotu mezi 0 a 1584.",
   "DE.Views.ShapeSettings.textColor": "Vyplnit barvou",
@@ -1186,11 +1288,9 @@
   "DE.Views.ShapeSettings.textPatternFill": "Vzor",
   "DE.Views.ShapeSettings.textRadial": "Kruhový",
   "DE.Views.ShapeSettings.textSelectTexture": "Vybrat",
-  "DE.Views.ShapeSettings.textStandartColors": "Standardní barvy",
   "DE.Views.ShapeSettings.textStretch": "Roztáhnout",
   "DE.Views.ShapeSettings.textStyle": "Styl",
   "DE.Views.ShapeSettings.textTexture": "Z textury",
-  "DE.Views.ShapeSettings.textThemeColors": "Barvy schématu",
   "DE.Views.ShapeSettings.textTile": "Dlaždice",
   "DE.Views.ShapeSettings.textWrap": "Obtékání textu",
   "DE.Views.ShapeSettings.txtBehind": "Za",
@@ -1213,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Nahoře a dole",
   "DE.Views.ShapeSettings.txtWood": "Dřevo",
   "DE.Views.Statusbar.goToPageText": "Jít na stránku",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Zrušit",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Vybrat jazyk dokumentu",
   "DE.Views.Statusbar.pageIndexText": "Stránka {0} z {1}",
   "DE.Views.Statusbar.textChangesPanel": "Changes Panel",
   "DE.Views.Statusbar.textTrackChanges": "Track Changes",
@@ -1271,11 +1368,9 @@
   "DE.Views.TableSettings.textOK": "OK",
   "DE.Views.TableSettings.textRows": "Řádky",
   "DE.Views.TableSettings.textSelectBorders": "Vyberte ohraničení, na které chcete použít styl vybraný výše.",
-  "DE.Views.TableSettings.textStandartColors": "Standardní barvy",
   "DE.Views.TableSettings.textTemplate": "Vybrat ze šablony",
-  "DE.Views.TableSettings.textThemeColors": "Barvy schématu",
   "DE.Views.TableSettings.textTotal": "Celkem",
-  "DE.Views.TableSettings.textWrap": "Obtékaní textu",
+  "DE.Views.TableSettings.textWrap": "Obtékání textu",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tabulka rovnoběžne s textem",
   "DE.Views.TableSettings.textWrapParallelTooltip": "Obtékat tabulku",
   "DE.Views.TableSettings.tipAll": "Nastavit vnejší ohraničení a všechny vnitřní čáry",
@@ -1294,6 +1389,10 @@
   "DE.Views.TableSettingsAdvanced.textAlign": "Zarovnání",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Zarovnání",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Povolit odsazení mezi buňkami",
+  "DE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",
+  "DE.Views.TableSettingsAdvanced.textAltDescription": "Description",
+  "DE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "DE.Views.TableSettingsAdvanced.textAltTitle": "Title",
   "DE.Views.TableSettingsAdvanced.textAnchorText": "Text",
   "DE.Views.TableSettingsAdvanced.textAutofit": "Automaticky upravit velikost podle obsahu",
   "DE.Views.TableSettingsAdvanced.textBackColor": "Pozadí buňky",
@@ -1303,7 +1402,9 @@
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Ohraničení a pozadí",
   "DE.Views.TableSettingsAdvanced.textBorderWidth": "Šířka ohraničení",
   "DE.Views.TableSettingsAdvanced.textBottom": "Dole",
+  "DE.Views.TableSettingsAdvanced.textCellOptions": "Cell Options",
   "DE.Views.TableSettingsAdvanced.textCellProps": "Vlastnosti buňky",
+  "DE.Views.TableSettingsAdvanced.textCellSize": "Cell Size",
   "DE.Views.TableSettingsAdvanced.textCenter": "Střed",
   "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Střed",
   "DE.Views.TableSettingsAdvanced.textCheckMargins": "Použít původní okraje",
@@ -1315,6 +1416,7 @@
   "DE.Views.TableSettingsAdvanced.textLeftTooltip": "Vlevo",
   "DE.Views.TableSettingsAdvanced.textMargin": "Okraj",
   "DE.Views.TableSettingsAdvanced.textMargins": "Okraje buňky",
+  "DE.Views.TableSettingsAdvanced.textMeasure": "Measure in",
   "DE.Views.TableSettingsAdvanced.textMove": "Přemístit objekt s textem",
   "DE.Views.TableSettingsAdvanced.textNewColor": "Přidat novou vlastní barvu",
   "DE.Views.TableSettingsAdvanced.textOnlyCells": "Pouze pro vybrané buňky",
@@ -1322,14 +1424,16 @@
   "DE.Views.TableSettingsAdvanced.textOverlap": "Povolit překrytí",
   "DE.Views.TableSettingsAdvanced.textPage": "Stránka",
   "DE.Views.TableSettingsAdvanced.textPosition": "Pozice",
+  "DE.Views.TableSettingsAdvanced.textPrefWidth": "Preferred width",
   "DE.Views.TableSettingsAdvanced.textPreview": "Náhled",
   "DE.Views.TableSettingsAdvanced.textRelative": "relativně k",
   "DE.Views.TableSettingsAdvanced.textRight": "Vpravo",
   "DE.Views.TableSettingsAdvanced.textRightOf": "vpravo od",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Vpravo",
-  "DE.Views.TableSettingsAdvanced.textStandartColors": "Standardní barvy",
+  "DE.Views.TableSettingsAdvanced.textTable": "Table",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Pozadí tabulky",
-  "DE.Views.TableSettingsAdvanced.textThemeColors": "Barvy schématu",
+  "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
+  "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabulka - Pokročilé nastavení",
   "DE.Views.TableSettingsAdvanced.textTop": "Nahoře",
   "DE.Views.TableSettingsAdvanced.textVertical": "Svislé",
@@ -1338,6 +1442,8 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Obtékaní textu",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabulka rovnoběžne s textem",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Obtékat tabulku",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
+  "DE.Views.TableSettingsAdvanced.textWrapText": "Wrap text",
   "DE.Views.TableSettingsAdvanced.tipAll": "Nastavit vnejší ohraničení a všechny vnitřní čáry",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Nastavit ohraničení pouze pro vnitřní buňky",
   "DE.Views.TableSettingsAdvanced.tipCellInner": "Nastavit pouze svislé a vodorovné čáry pro vnitřní buňky",
@@ -1348,12 +1454,17 @@
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Nastavit vnější ohraničení a ohraničení všech vnitřních buňek",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Nastavit vnější ohraničení a svislé a vodorovné čáry pro vnitřní buňky",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Nastavit vnější ohraničení tabulky a vnější ohraničení vnitřních buňek",
+  "DE.Views.TableSettingsAdvanced.txtCm": "Centimeter",
+  "DE.Views.TableSettingsAdvanced.txtInch": "Inch",
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Bez ohraničení",
+  "DE.Views.TableSettingsAdvanced.txtPercent": "Percent",
+  "DE.Views.TableSettingsAdvanced.txtPt": "Point",
   "DE.Views.TextArtSettings.strColor": "Barva",
   "DE.Views.TextArtSettings.strFill": "Výplň",
   "DE.Views.TextArtSettings.strSize": "Velikost",
   "DE.Views.TextArtSettings.strStroke": "Tloušťka",
   "DE.Views.TextArtSettings.strTransparency": "Průhlednost",
+  "DE.Views.TextArtSettings.strType": "Type",
   "DE.Views.TextArtSettings.textBorderSizeErr": "Zadaná hodnota není správná.<br>Zadejte prosím hodnotu mezi 0 a 1584.",
   "DE.Views.TextArtSettings.textColor": "Vyplnit barvou",
   "DE.Views.TextArtSettings.textDirection": "Směr",
@@ -1364,13 +1475,12 @@
   "DE.Views.TextArtSettings.textNoFill": "Bez výplně",
   "DE.Views.TextArtSettings.textRadial": "Kruhový",
   "DE.Views.TextArtSettings.textSelectTexture": "Vybrat",
-  "DE.Views.TextArtSettings.textStandartColors": "Standardní barvy",
   "DE.Views.TextArtSettings.textStyle": "Styl",
   "DE.Views.TextArtSettings.textTemplate": "Šablona",
-  "DE.Views.TextArtSettings.textThemeColors": "Barvy schématu",
   "DE.Views.TextArtSettings.textTransform": "Transformovat",
   "DE.Views.TextArtSettings.txtNoBorders": "Bez čáry",
   "DE.Views.Toolbar.mniCustomTable": "Vložit vlastní tabulku",
+  "DE.Views.Toolbar.mniDelFootnote": "Delete All Footnotes",
   "DE.Views.Toolbar.mniEditDropCap": "Nastavení Iniciály",
   "DE.Views.Toolbar.mniEditFooter": "Upravit zápatí",
   "DE.Views.Toolbar.mniEditHeader": "Upravit záhlaví",
@@ -1378,13 +1488,17 @@
   "DE.Views.Toolbar.mniHiddenChars": "Netisknutelné znaky",
   "DE.Views.Toolbar.mniImageFromFile": "Obrázek ze souboru",
   "DE.Views.Toolbar.mniImageFromUrl": "Obrázek z adresy URL",
+  "DE.Views.Toolbar.mniInsFootnote": "Insert Footnote",
+  "DE.Views.Toolbar.mniNoteSettings": "Notes Settings",
   "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": "Charts",
   "DE.Views.Toolbar.textColumn": "Sloupcový graf",
+  "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
   "DE.Views.Toolbar.textColumnsRight": "Right",
@@ -1395,11 +1509,13 @@
   "DE.Views.Toolbar.textEvenPage": "Sudá stránka",
   "DE.Views.Toolbar.textFitPage": "Přízpůsobit stránce",
   "DE.Views.Toolbar.textFitWidth": "Přizpůsobit šířce",
+  "DE.Views.Toolbar.textGotoFootnote": "Go to Footnotes",
   "DE.Views.Toolbar.textHideLines": "Schovat pravítka",
   "DE.Views.Toolbar.textHideStatusBar": "Schovat stavový řádek",
   "DE.Views.Toolbar.textHideTitleBar": "Schovat lištu nadpisu",
   "DE.Views.Toolbar.textInMargin": "V okraji",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
+  "DE.Views.Toolbar.textInsertPageCount": "Insert number of pages",
   "DE.Views.Toolbar.textInsertPageNumber": "Vložit číslo stránky",
   "DE.Views.Toolbar.textInsPageBreak": "Vložit rozdělovač stránky",
   "DE.Views.Toolbar.textInsSectionBreak": "Vložit rozdělovač sekce",
@@ -1407,12 +1523,14 @@
   "DE.Views.Toolbar.textInsTextArt": "Vložit Text art",
   "DE.Views.Toolbar.textInText": "V textu",
   "DE.Views.Toolbar.textItalic": "Kurzíva",
+  "DE.Views.Toolbar.textLandscape": "Landscape",
   "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",
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
+  "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Wide",
   "DE.Views.Toolbar.textNewColor": "Přidat novou vlastní barvu",
   "DE.Views.Toolbar.textNextPage": "Další stránka",
@@ -1422,8 +1540,8 @@
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
   "DE.Views.Toolbar.textPie": "Kruhový diagram",
   "DE.Views.Toolbar.textPoint": "Bodový graf",
+  "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRight": "Right: ",
-  "DE.Views.Toolbar.textStandartColors": "Standardní barvy",
   "DE.Views.Toolbar.textStock": "Burzovní graf",
   "DE.Views.Toolbar.textStrikeout": "Přeškrtnout",
   "DE.Views.Toolbar.textStyleMenuDelete": "Odstranit styl",
@@ -1434,7 +1552,7 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovat z výběru",
   "DE.Views.Toolbar.textSubscript": "Dolní index",
   "DE.Views.Toolbar.textSuperscript": "Horní index",
-  "DE.Views.Toolbar.textThemeColors": "Barvy schématu",
+  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTitleError": "Chyba",
   "DE.Views.Toolbar.textToCurrent": "Na součásnou pozici",
   "DE.Views.Toolbar.textTop": "Top: ",
@@ -1446,6 +1564,7 @@
   "DE.Views.Toolbar.tipAlignLeft": "Zarovnat vlevo",
   "DE.Views.Toolbar.tipAlignRight": "Zarovnat vpravo",
   "DE.Views.Toolbar.tipBack": "Zpět",
+  "DE.Views.Toolbar.tipChangeChart": "Change Chart Type",
   "DE.Views.Toolbar.tipClearStyle": "Vymazat styl",
   "DE.Views.Toolbar.tipColorSchemas": "Změnit barevné schéma",
   "DE.Views.Toolbar.tipColumns": "Insert columns",
@@ -1475,6 +1594,7 @@
   "DE.Views.Toolbar.tipMarkers": "Odrážky",
   "DE.Views.Toolbar.tipMultilevels": "Obrys",
   "DE.Views.Toolbar.tipNewDocument": "Nový dokument",
+  "DE.Views.Toolbar.tipNotes": "Footnotes",
   "DE.Views.Toolbar.tipNumbers": "Číslování",
   "DE.Views.Toolbar.tipOpenDocument": "Otevřít dokument",
   "DE.Views.Toolbar.tipPageBreak": "Vložit rozdělovač stránky nebo sekce",

apps/documenteditor/main/locale/de.json

@@ -119,7 +119,7 @@
   "Common.Views.Comments.textCancel": "Abbrechen",
   "Common.Views.Comments.textClose": "Schließen",
   "Common.Views.Comments.textComments": "Kommentare",
-  "Common.Views.Comments.textEdit": "Bearbeiten",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Geben Sie Ihren Kommentar hier ein",
   "Common.Views.Comments.textOpenAgain": "Erneut öffnen",
   "Common.Views.Comments.textReply": "Antworten",
@@ -161,6 +161,9 @@
   "Common.Views.InsertTableDialog.txtMinText": "Der minimale Wert für dieses Feld ist {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Anzahl von Zeilen\t",
   "Common.Views.InsertTableDialog.txtTitle": "Größe der Tabelle",
+  "Common.Views.LanguageDialog.btnCancel": "Abbrechen",
+  "Common.Views.LanguageDialog.btnOk": "OK",
+  "Common.Views.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
   "Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ",
@@ -288,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Rechtecke",
   "DE.Controllers.Main.txtSeries": "Reihen",
   "DE.Controllers.Main.txtStarsRibbons": "Sterne und Bänder",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intensives Zitat",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "Listenabsatz",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "Kein Abstand",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Zitat",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Untertitel",
+  "DE.Controllers.Main.txtStyle_Title": "Titel\t",
   "DE.Controllers.Main.txtXAxis": "x-Achse",
   "DE.Controllers.Main.txtYAxis": "y-Achse",
   "DE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
@@ -655,6 +674,7 @@
   "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",
@@ -666,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "Passend",
   "DE.Views.ChartSettings.txtTitle": "Diagramm",
   "DE.Views.ChartSettings.txtTopAndBottom": "Oben und unten",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Abbrechen",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
+  "DE.Views.CustomColumnsDialog.textColumns": "Anzahl von Spalten\t",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Spaltenunterteilers",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Abstand zwischen Spalten",
+  "DE.Views.CustomColumnsDialog.textTitle": "Spalten",
   "DE.Views.DocumentHolder.aboveText": "Oben",
   "DE.Views.DocumentHolder.addCommentText": "Kommentar hinzufügen",
   "DE.Views.DocumentHolder.advancedFrameText": "Rahmen - Erweiterte Einstellungen",
@@ -674,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Erweiterte Einstellungen",
   "DE.Views.DocumentHolder.alignmentText": "Ausrichtung",
   "DE.Views.DocumentHolder.belowText": "Unten",
-  "DE.Views.DocumentHolder.bottomCellText": "Unten ausrichten",
   "DE.Views.DocumentHolder.breakBeforeText": "Seitenumbruch oberhalb",
   "DE.Views.DocumentHolder.cellAlignText": "Vertikale Ausrichtung in Zellen",
   "DE.Views.DocumentHolder.cellText": "Zelle",
-  "DE.Views.DocumentHolder.centerCellText": "Zentriert ausrichten",
   "DE.Views.DocumentHolder.centerText": "Zentriert",
   "DE.Views.DocumentHolder.chartText": "Erweiterte Einstellungen des Diagramms",
   "DE.Views.DocumentHolder.columnText": "Spalte",
@@ -686,8 +710,8 @@
   "DE.Views.DocumentHolder.deleteRowText": "Zeile löschen",
   "DE.Views.DocumentHolder.deleteTableText": "Tabelle löschen",
   "DE.Views.DocumentHolder.deleteText": "Löschen",
-  "DE.Views.DocumentHolder.direct270Text": "um 270° drehen",
+  "DE.Views.DocumentHolder.direct270Text": "Text nach oben drehen",
-  "DE.Views.DocumentHolder.direct90Text": "um 90° drehen ",
+  "DE.Views.DocumentHolder.direct90Text": "Text nach unten drehen",
   "DE.Views.DocumentHolder.directHText": "Horizontal",
   "DE.Views.DocumentHolder.directionText": "Textausrichtung\t",
   "DE.Views.DocumentHolder.editChartText": "Daten ändern",
@@ -750,9 +774,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Mittig ausrichten",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Rechtsbündig ausrichten",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Oben ausrichten",
+  "DE.Views.DocumentHolder.textUndo": "Rückgängig machen",
   "DE.Views.DocumentHolder.textWrap": "Textumbruch",
   "DE.Views.DocumentHolder.tipIsLocked": "Dieses Element wird gerade von einem anderen Benutzer bearbeitet.",
-  "DE.Views.DocumentHolder.topCellText": "Oben ausrichten",
   "DE.Views.DocumentHolder.txtAddBottom": "Unterer Rand hinzufügen",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Bruchstrich hinzufügen",
   "DE.Views.DocumentHolder.txtAddHor": "Horizontale Linie einfügen",
@@ -803,6 +827,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Manuellen Umbruch einfügen\t",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Formel nachher einfügen\t",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Formel vorher einfügen\t",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Nur Text beibehalten",
   "DE.Views.DocumentHolder.txtLimitChange": "Grenzwerten ändern ",
   "DE.Views.DocumentHolder.txtLimitOver": "Grenzwert über den Text\n",
   "DE.Views.DocumentHolder.txtLimitUnder": "Grenzwert unter den Text",
@@ -928,6 +953,7 @@
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Immer auf dem Server speichern (ansonsten auf dem Server beim Schließen des Dokuments speichern)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Hieroglyphen einschalten",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Live-Kommentare einschalten",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Die Anzeige der aufgelösten Kommentare einschalten",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Änderungen bei der Echtzeit-Zusammenarbeit zeigen",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Rechtschreibprüfung einschalten",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Formal",
@@ -1287,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Oben und unten",
   "DE.Views.ShapeSettings.txtWood": "Holz",
   "DE.Views.Statusbar.goToPageText": "Auf die Seite übergehen",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Abbrechen",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
   "DE.Views.Statusbar.pageIndexText": "Seite {0} von {1}",
   "DE.Views.Statusbar.textChangesPanel": "Änderungen anzeigen",
   "DE.Views.Statusbar.textTrackChanges": "Nachverfolgen von Änderungen",
@@ -1475,6 +1498,7 @@
   "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\t",
   "DE.Views.Toolbar.textColumnsRight": "Rechts",
@@ -1528,6 +1552,7 @@
   "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.textTitleError": "Fehler",
   "DE.Views.Toolbar.textToCurrent": "An aktueller Position",
   "DE.Views.Toolbar.textTop": "Oben: ",

apps/documenteditor/main/locale/en.json

@@ -119,7 +119,7 @@
   "Common.Views.Comments.textCancel": "Cancel",
   "Common.Views.Comments.textClose": "Close",
   "Common.Views.Comments.textComments": "Comments",
-  "Common.Views.Comments.textEdit": "Edit",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
   "Common.Views.Comments.textOpenAgain": "Open Again",
   "Common.Views.Comments.textReply": "Reply",
@@ -161,6 +161,9 @@
   "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Number of Rows",
   "Common.Views.InsertTableDialog.txtTitle": "Table Size",
+  "Common.Views.LanguageDialog.btnCancel": "Cancel",
+  "Common.Views.LanguageDialog.btnOk": "Ok",
+  "Common.Views.LanguageDialog.labelSelect": "Select document language",
   "Common.Views.OpenDialog.cancelButtonText": "Cancel",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
@@ -288,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Rectangles",
   "DE.Controllers.Main.txtSeries": "Series",
   "DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Quote",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
+  "DE.Controllers.Main.txtStyle_Title": "Title",
   "DE.Controllers.Main.txtXAxis": "X Axis",
   "DE.Controllers.Main.txtYAxis": "Y Axis",
   "DE.Controllers.Main.unknownErrorText": "Unknown error.",
@@ -655,6 +674,7 @@
   "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",
@@ -666,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "Tight",
   "DE.Views.ChartSettings.txtTitle": "Chart",
   "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
+  "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
+  "DE.Views.CustomColumnsDialog.textTitle": "Columns",
   "DE.Views.DocumentHolder.aboveText": "Above",
   "DE.Views.DocumentHolder.addCommentText": "Add Comment",
   "DE.Views.DocumentHolder.advancedFrameText": "Frame Advanced Settings",
@@ -674,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Advanced Settings",
   "DE.Views.DocumentHolder.alignmentText": "Alignment",
   "DE.Views.DocumentHolder.belowText": "Below",
-  "DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
   "DE.Views.DocumentHolder.breakBeforeText": "Page break before",
   "DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
   "DE.Views.DocumentHolder.cellText": "Cell",
-  "DE.Views.DocumentHolder.centerCellText": "Align Center",
   "DE.Views.DocumentHolder.centerText": "Center",
   "DE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
   "DE.Views.DocumentHolder.columnText": "Column",
@@ -686,8 +710,8 @@
   "DE.Views.DocumentHolder.deleteRowText": "Delete Row",
   "DE.Views.DocumentHolder.deleteTableText": "Delete Table",
   "DE.Views.DocumentHolder.deleteText": "Delete",
-  "DE.Views.DocumentHolder.direct270Text": "Rotate at 270°",
+  "DE.Views.DocumentHolder.direct270Text": "Rotate Text Up",
-  "DE.Views.DocumentHolder.direct90Text": "Rotate at 90°",
+  "DE.Views.DocumentHolder.direct90Text": "Rotate Text Down",
   "DE.Views.DocumentHolder.directHText": "Horizontal",
   "DE.Views.DocumentHolder.directionText": "Text Direction",
   "DE.Views.DocumentHolder.editChartText": "Edit Data",
@@ -750,9 +774,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Align Middle",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Align Right",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Wrapping Style",
   "DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
-  "DE.Views.DocumentHolder.topCellText": "Align Top",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
   "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",
@@ -803,6 +827,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
   "DE.Views.DocumentHolder.txtLimitChange": "Change limits location",
   "DE.Views.DocumentHolder.txtLimitOver": "Limit over text",
   "DE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
@@ -928,6 +953,7 @@
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Turn on spell checking option",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
@@ -1287,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom",
   "DE.Views.ShapeSettings.txtWood": "Wood",
   "DE.Views.Statusbar.goToPageText": "Go to Page",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancel",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "Ok",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Select document language",
   "DE.Views.Statusbar.pageIndexText": "Page {0} of {1}",
   "DE.Views.Statusbar.textChangesPanel": "Changes Panel",
   "DE.Views.Statusbar.textTrackChanges": "Track Changes",
@@ -1475,6 +1498,7 @@
   "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",
   "DE.Views.Toolbar.textColumnsRight": "Right",
@@ -1528,6 +1552,7 @@
   "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.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "To current position",
   "DE.Views.Toolbar.textTop": "Top: ",

apps/documenteditor/main/locale/es.json

@@ -105,7 +105,7 @@
   "Common.Views.About.txtLicensee": "LICENCIATARIO ",
   "Common.Views.About.txtLicensor": "LICENCIANTE",
   "Common.Views.About.txtMail": "email: ",
-  "Common.Views.About.txtPoweredBy": "Impulsado por",
+  "Common.Views.About.txtPoweredBy": "Desarrollado por",
   "Common.Views.About.txtTel": "tel.: ",
   "Common.Views.About.txtVersion": "Versión ",
   "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Cancelar",
@@ -119,7 +119,7 @@
   "Common.Views.Comments.textCancel": "Cancelar",
   "Common.Views.Comments.textClose": "Cerrar",
   "Common.Views.Comments.textComments": "Comentarios",
-  "Common.Views.Comments.textEdit": "Editar",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Introduzca su comentario aquí",
   "Common.Views.Comments.textOpenAgain": "Abrir de nuevo",
   "Common.Views.Comments.textReply": "Responder",
@@ -141,7 +141,6 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Receptores de Fusión de Correo",
   "Common.Views.Header.openNewTabText": "Abrir en pestaña nueva",
   "Common.Views.Header.textBack": "Ir a Documentos",
-  "Common.Views.Header.txtHeaderDeveloper": "MODO DE DESARROLLO",
   "Common.Views.Header.txtRename": "Renombrar",
   "Common.Views.History.textCloseHistory": "Cerrar historial",
   "Common.Views.History.textHide": "Plegar",
@@ -162,6 +161,9 @@
   "Common.Views.InsertTableDialog.txtMinText": "El valor mínimo para este campo es {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Número de filas",
   "Common.Views.InsertTableDialog.txtTitle": "Tamaño de tabla",
+  "Common.Views.LanguageDialog.btnCancel": "Cancelar",
+  "Common.Views.LanguageDialog.btnOk": "OK",
+  "Common.Views.LanguageDialog.labelSelect": "Seleccionar el idioma de documento",
   "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
   "Common.Views.OpenDialog.okButtonText": "Aceptar",
   "Common.Views.OpenDialog.txtEncoding": "Codificación",
@@ -206,8 +208,9 @@
   "DE.Controllers.Main.downloadTextText": "Cargando documento...",
   "DE.Controllers.Main.downloadTitleText": "Cargando documento",
   "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 pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
   "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.errorDataRange": "Rango de datos incorrecto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
@@ -262,10 +265,12 @@
   "DE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.",
   "DE.Controllers.Main.textAnonymous": "Anónimo",
   "DE.Controllers.Main.textBuyNow": "Visitar sitio web",
+  "DE.Controllers.Main.textChangesSaved": "Todos los cambios son guardados",
   "DE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
   "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
   "DE.Controllers.Main.textLoadingDocument": "Cargando documento",
   "DE.Controllers.Main.textNoLicenseTitle": "Versión de código abierto de ONLYOFFICE",
+  "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Modo estricto",
   "DE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
   "DE.Controllers.Main.titleLicenseExp": "Licencia ha expirado",
@@ -286,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Rectángulos",
   "DE.Controllers.Main.txtSeries": "Serie",
   "DE.Controllers.Main.txtStarsRibbons": "Cintas y estrellas",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Título 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Título 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Título 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Título 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Título 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Título 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Título 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Título 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Título 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Cita seleccionada",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "Párrafo de la lista",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "Sin espacio",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Cita",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtítulo",
+  "DE.Controllers.Main.txtStyle_Title": "Título",
   "DE.Controllers.Main.txtXAxis": "Eje X",
   "DE.Controllers.Main.txtYAxis": "Eje Y",
   "DE.Controllers.Main.unknownErrorText": "Error desconocido.",
@@ -649,10 +670,11 @@
   "DE.Views.ChartSettings.textLine": "Línea",
   "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado",
   "DE.Views.ChartSettings.textPie": "Gráfico circular",
-  "DE.Views.ChartSettings.textPoint": "Gráfico de Punto",
+  "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",
@@ -664,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "Estrecho",
   "DE.Views.ChartSettings.txtTitle": "Gráfico",
   "DE.Views.ChartSettings.txtTopAndBottom": "Superior e inferior",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancelar",
+  "DE.Views.CustomColumnsDialog.okButtonText": "OK",
+  "DE.Views.CustomColumnsDialog.textColumns": "Número de columnas",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Divisor de columnas",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Espacio entre columnas",
+  "DE.Views.CustomColumnsDialog.textTitle": "Columnas",
   "DE.Views.DocumentHolder.aboveText": "Arriba",
   "DE.Views.DocumentHolder.addCommentText": "Añadir comentario",
   "DE.Views.DocumentHolder.advancedFrameText": "Ajustes avanzados de marco",
@@ -672,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Ajustes avanzados",
   "DE.Views.DocumentHolder.alignmentText": "Alineación",
   "DE.Views.DocumentHolder.belowText": "Abajo",
-  "DE.Views.DocumentHolder.bottomCellText": "Alinear en la parte inferior",
   "DE.Views.DocumentHolder.breakBeforeText": "Salto de página antes",
   "DE.Views.DocumentHolder.cellAlignText": "Alineación vertical de celda",
   "DE.Views.DocumentHolder.cellText": "Celda",
-  "DE.Views.DocumentHolder.centerCellText": "Alinear al centro",
   "DE.Views.DocumentHolder.centerText": "Al centro",
   "DE.Views.DocumentHolder.chartText": "Ajustes avanzados de gráfico",
   "DE.Views.DocumentHolder.columnText": "Columna",
@@ -684,8 +710,8 @@
   "DE.Views.DocumentHolder.deleteRowText": "Borrar fila",
   "DE.Views.DocumentHolder.deleteTableText": "Borrar tabla",
   "DE.Views.DocumentHolder.deleteText": "Borrar",
-  "DE.Views.DocumentHolder.direct270Text": "Girar a 270°",
+  "DE.Views.DocumentHolder.direct270Text": "Girar texto hacia arriba",
-  "DE.Views.DocumentHolder.direct90Text": "Girar a 90°",
+  "DE.Views.DocumentHolder.direct90Text": "Girar texto hacia abajo",
   "DE.Views.DocumentHolder.directHText": "Horizontal ",
   "DE.Views.DocumentHolder.directionText": "Dirección de texto",
   "DE.Views.DocumentHolder.editChartText": "Editar datos",
@@ -748,9 +774,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinear al medio",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Alinear a la derecha",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Alinear en la parte superior",
+  "DE.Views.DocumentHolder.textUndo": "Deshacer",
   "DE.Views.DocumentHolder.textWrap": "Ajuste de texto",
   "DE.Views.DocumentHolder.tipIsLocked": "Otro usuario está editando este elemento ahora.",
-  "DE.Views.DocumentHolder.topCellText": "Alinear en la parte superior",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Añadir barra de fracción",
   "DE.Views.DocumentHolder.txtAddHor": "Añadir línea horizontal",
@@ -801,6 +827,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Insertar grieta manual",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insertar la ecuación después de",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insertar la ecuación antes de",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Mantener solo texto",
   "DE.Views.DocumentHolder.txtLimitChange": "Cambiar ubicación de límites",
   "DE.Views.DocumentHolder.txtLimitOver": "Límite sobre el texto",
   "DE.Views.DocumentHolder.txtLimitUnder": "Límite debajo del texto",
@@ -923,8 +950,10 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Usted tendrá que aceptar los cambios antes de poder verlos",
   "DE.Views.FileMenuPanels.Settings.strFast": "rápido",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Activar jeroglíficos",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activar opción de demostración de comentarios",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Activar la visualización de los comentarios resueltos",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Cambios de colaboración en tiempo real",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activar corrección ortográfica",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Estricto",
@@ -938,6 +967,7 @@
   "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorrecuperación",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Guardar automáticamente",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Desactivado",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Guardar al Servidor",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
@@ -1070,6 +1100,7 @@
   "DE.Views.LeftMenu.tipSearch": "Búsqueda",
   "DE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
   "DE.Views.LeftMenu.tipTitles": "Títulos",
+  "DE.Views.LeftMenu.txtDeveloper": "MODO DE DESARROLLO",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Enviar",
@@ -1282,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Superior e inferior",
   "DE.Views.ShapeSettings.txtWood": "Madera",
   "DE.Views.Statusbar.goToPageText": "Ir a página",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancelar",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "Aceptar",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Seleccione el idioma de documento",
   "DE.Views.Statusbar.pageIndexText": "Página {0} de {1}",
   "DE.Views.Statusbar.textChangesPanel": "Panel de cambios",
   "DE.Views.Statusbar.textTrackChanges": "Cambio de pista",
@@ -1342,7 +1370,7 @@
   "DE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
   "DE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
   "DE.Views.TableSettings.textTotal": "Total",
-  "DE.Views.TableSettings.textWrap": "Ajuste de texto",
+  "DE.Views.TableSettings.textWrap": "Estilo de ajuste",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tabla en línea",
   "DE.Views.TableSettings.textWrapParallelTooltip": "Tabla flujo",
   "DE.Views.TableSettings.tipAll": "Fijar borde exterior y todas líneas interiores ",
@@ -1470,6 +1498,7 @@
   "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",
   "DE.Views.Toolbar.textColumnsRight": "Derecho",
@@ -1510,7 +1539,7 @@
   "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.textPoint": "Gráfico de Punto",
+  "DE.Views.Toolbar.textPoint": "XY (Dispersión)",
   "DE.Views.Toolbar.textPortrait": "Vertical",
   "DE.Views.Toolbar.textRight": "Derecho: ",
   "DE.Views.Toolbar.textStock": "De cotizaciones",
@@ -1523,6 +1552,7 @@
   "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.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "A la posición actual",
   "DE.Views.Toolbar.textTop": "Top: ",

apps/documenteditor/main/locale/fr.json

@@ -20,7 +20,7 @@
   "Common.Controllers.ReviewChanges.textCenter": "Aligner au centre",
   "Common.Controllers.ReviewChanges.textChart": "Graphique",
   "Common.Controllers.ReviewChanges.textColor": "Couleur de police",
-  "Common.Controllers.ReviewChanges.textContextual": "N'ajoutez pas l'intervalle entre paragraphes du même style",
+  "Common.Controllers.ReviewChanges.textContextual": "Ne pas ajouter d'intervalle entre paragraphes du même style",
   "Common.Controllers.ReviewChanges.textDeleted": "<b>Supprimé:</b>\n\n",
   "Common.Controllers.ReviewChanges.textDStrikeout": "Double barré",
   "Common.Controllers.ReviewChanges.textEquation": "Équation",
@@ -119,7 +119,7 @@
   "Common.Views.Comments.textCancel": "Annuler",
   "Common.Views.Comments.textClose": "Fermer",
   "Common.Views.Comments.textComments": "Commentaires",
-  "Common.Views.Comments.textEdit": "Modifier",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Entrez votre commentaire ici",
   "Common.Views.Comments.textOpenAgain": "Ouvrir à nouveau",
   "Common.Views.Comments.textReply": "Répondre",
@@ -161,6 +161,9 @@
   "Common.Views.InsertTableDialog.txtMinText": "La valeur minimale pour ce champ est {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Nombre de lignes",
   "Common.Views.InsertTableDialog.txtTitle": "Taille du tableau",
+  "Common.Views.LanguageDialog.btnCancel": "Annuler",
+  "Common.Views.LanguageDialog.btnOk": "OK",
+  "Common.Views.LanguageDialog.labelSelect": "Sélectionner la langue du document",
   "Common.Views.OpenDialog.cancelButtonText": "Annuler",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Codage ",
@@ -195,7 +198,7 @@
   "DE.Controllers.LeftMenu.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.Main.applyChangesTextText": "Chargement des changemets...",
   "DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
-  "DE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
+  "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
   "DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.",
   "DE.Controllers.Main.criticalErrorTitle": "Erreur",
   "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
@@ -218,8 +221,8 @@
   "DE.Controllers.Main.errorMailMergeSaveFile": "Fusionner échoué.",
   "DE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement",
   "DE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
-  "DE.Controllers.Main.errorSessionAbsolute": "La session de la modification de document a expiré.Veuillez recharger la page.",
+  "DE.Controllers.Main.errorSessionAbsolute": "Votre session a expiré. Veuillez recharger la page.",
-  "DE.Controllers.Main.errorSessionIdle": "Le document n'est pas modifié depuis longtemps. Veuillez recharger la page.",
+  "DE.Controllers.Main.errorSessionIdle": "Le document n'a pas été modifié depuis trop longtemps. Veuillez recharger la page.",
   "DE.Controllers.Main.errorSessionToken": "La connexion au serveur a été interrompue. Veuillez recharger la page.",
   "DE.Controllers.Main.errorStockChart": "Ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:<br> cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
   "DE.Controllers.Main.errorToken": "Le jeton de sécurité du document n’était pas formé correctement.<br>Veuillez contacter l'administrateur de Document Server.",
@@ -262,7 +265,7 @@
   "DE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.",
   "DE.Controllers.Main.textAnonymous": "Anonyme",
   "DE.Controllers.Main.textBuyNow": "Visiter le site web",
-  "DE.Controllers.Main.textChangesSaved": "Toutes les modifications sont enregistrées",
+  "DE.Controllers.Main.textChangesSaved": "Toutes les modifications ont été enregistrées",
   "DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil",
   "DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
   "DE.Controllers.Main.textLoadingDocument": "Chargement du document",
@@ -674,11 +677,9 @@
   "DE.Views.DocumentHolder.advancedText": "Paramètres avancés",
   "DE.Views.DocumentHolder.alignmentText": "Alignement",
   "DE.Views.DocumentHolder.belowText": "En dessous",
-  "DE.Views.DocumentHolder.bottomCellText": "Aligner en bas",
   "DE.Views.DocumentHolder.breakBeforeText": "Saut de page avant",
   "DE.Views.DocumentHolder.cellAlignText": "Alignement vertical de la cellule",
   "DE.Views.DocumentHolder.cellText": "Cellule",
-  "DE.Views.DocumentHolder.centerCellText": "Aligner au centre",
   "DE.Views.DocumentHolder.centerText": "Centre",
   "DE.Views.DocumentHolder.chartText": "Paramètres avancés du graphique ",
   "DE.Views.DocumentHolder.columnText": "Colonne",
@@ -686,8 +687,8 @@
   "DE.Views.DocumentHolder.deleteRowText": "Supprimer la ligne",
   "DE.Views.DocumentHolder.deleteTableText": "Supprimer le tableau",
   "DE.Views.DocumentHolder.deleteText": "Supprimer",
-  "DE.Views.DocumentHolder.direct270Text": "Rotation à 270 °",
+  "DE.Views.DocumentHolder.direct270Text": "Rotation du texte vers le haut",
-  "DE.Views.DocumentHolder.direct90Text": "Rotation à 90 °",
+  "DE.Views.DocumentHolder.direct90Text": "Rotation du texte vers le bas",
   "DE.Views.DocumentHolder.directHText": "Horizontal",
   "DE.Views.DocumentHolder.directionText": "Orientation du texte",
   "DE.Views.DocumentHolder.editChartText": "Modifier les données",
@@ -750,9 +751,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Aligner au milieu",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Aligner à droite",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Aligner en haut",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "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.topCellText": "Aligner en haut",
   "DE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction",
   "DE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale",
@@ -803,6 +804,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Insérer pause manuelle",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Insérer équation après",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Insérez l'équation avant",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
   "DE.Views.DocumentHolder.txtLimitChange": "Modifier d'emplacement des locations",
   "DE.Views.DocumentHolder.txtLimitOver": "Limite au-dessous le texte",
   "DE.Views.DocumentHolder.txtLimitUnder": "Limite en dessous le texte",
@@ -921,14 +923,15 @@
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Activer la récupération automatique",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Activer l'enregistrement automatique",
   "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Mode de co-édition ",
-  "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs pourront voir immédiatement vos modifications ",
+  "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Les autres utilisateurs verront vos modifications en temps reel",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Avant de pouvoir afficher les modifications, vous avez besoin de les accépter ",
   "DE.Views.FileMenuPanels.Settings.strFast": "Rapide",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting de la police",
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Toujours enregistrer sur le serveur ( sinon enregistrer sur le serveur lors de la fermeture du document )",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Activer des hiéroglyphes",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activer l'affichage des commentaires",
-  "DE.Views.FileMenuPanels.Settings.strShowChanges": "Changements de collaboration en temps réel",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
+  "DE.Views.FileMenuPanels.Settings.strShowChanges": "Visibilité des modifications en co-édition",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activer la vérification de l'orthographe",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
   "DE.Views.FileMenuPanels.Settings.strUnit": "Unité de mesure",
@@ -943,7 +946,7 @@
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
-  "DE.Views.FileMenuPanels.Settings.txtAll": "Tous",
+  "DE.Views.FileMenuPanels.Settings.txtAll": "Surligner toutes les modifications",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajuster à la page",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajuster à la largeur",
@@ -953,7 +956,7 @@
   "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Affichage des commentaires ",
   "DE.Views.FileMenuPanels.Settings.txtMac": "comme OS X",
   "DE.Views.FileMenuPanels.Settings.txtNative": "Natif",
-  "DE.Views.FileMenuPanels.Settings.txtNone": "Aucuns",
+  "DE.Views.FileMenuPanels.Settings.txtNone": "Surligner aucune modification",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Point",
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe",
   "DE.Views.FileMenuPanels.Settings.txtWin": "comme Windows",
@@ -1163,7 +1166,7 @@
   "DE.Views.PageSizeDialog.textWidth": "Largeur",
   "DE.Views.ParagraphSettings.strLineHeight": "Interligne",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Espacement de paragraphe",
-  "DE.Views.ParagraphSettings.strSomeParagraphSpace": "N'ajoutez pas l'intervalle entre paragraphes du même style",
+  "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",
   "DE.Views.ParagraphSettings.strSpacingAfter": "Après",
   "DE.Views.ParagraphSettings.strSpacingBefore": "Avant",
   "DE.Views.ParagraphSettings.textAdvanced": "Afficher les paramètres avancés",
@@ -1180,7 +1183,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Toutes en majuscules",
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
-  "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Barré double",
+  "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Première ligne",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
@@ -1287,9 +1290,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Haut et bas",
   "DE.Views.ShapeSettings.txtWood": "Bois",
   "DE.Views.Statusbar.goToPageText": "Aller à la page",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Annuler",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Sélectionner la langue du document",
   "DE.Views.Statusbar.pageIndexText": "Page {0} de {1}",
   "DE.Views.Statusbar.textChangesPanel": "Сhangements de panneau",
   "DE.Views.Statusbar.textTrackChanges": "Suivi des modifications",
@@ -1408,7 +1408,7 @@
   "DE.Views.TableSettingsAdvanced.textRightOf": "à droite de",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "A droite",
   "DE.Views.TableSettingsAdvanced.textTable": "Tableau",
-  "DE.Views.TableSettingsAdvanced.textTableBackColor": "Tableau de fond",
+  "DE.Views.TableSettingsAdvanced.textTableBackColor": "Fond du tableau",
   "DE.Views.TableSettingsAdvanced.textTablePosition": "Position du tableau",
   "DE.Views.TableSettingsAdvanced.textTableSize": "Taille du tableau",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tableau - Paramètres avancés",
@@ -1456,7 +1456,7 @@
   "DE.Views.TextArtSettings.textTemplate": "Modèle",
   "DE.Views.TextArtSettings.textTransform": "Transformer",
   "DE.Views.TextArtSettings.txtNoBorders": "Pas de ligne",
-  "DE.Views.Toolbar.mniCustomTable": "Inserer tableau personnalisé",
+  "DE.Views.Toolbar.mniCustomTable": "Inserer un tableau personnalisé",
   "DE.Views.Toolbar.mniDelFootnote": "Supprimer les notes de bas de page",
   "DE.Views.Toolbar.mniEditDropCap": "Paramètres de la lettrine",
   "DE.Views.Toolbar.mniEditFooter": "Modifier le pied de page",

apps/documenteditor/main/locale/it.json

@@ -114,7 +114,7 @@
   "Common.Views.Comments.textCancel": "Annulla",
   "Common.Views.Comments.textClose": "Chiudi",
   "Common.Views.Comments.textComments": "Commenti",
-  "Common.Views.Comments.textEdit": "Modifica",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Inserisci il commento qui",
   "Common.Views.Comments.textOpenAgain": "Apri di nuovo",
   "Common.Views.Comments.textReply": "Rispondi",

apps/documenteditor/main/locale/pt.json

@@ -23,7 +23,7 @@
   "Common.Controllers.ReviewChanges.textContextual": "Don't add interval between paragraphs of the same style",
   "Common.Controllers.ReviewChanges.textDeleted": "<b>Deleted:</b>",
   "Common.Controllers.ReviewChanges.textDStrikeout": "Double strikeout",
-  "Common.Controllers.ReviewChanges.textEquation": "Equation",
+  "Common.Controllers.ReviewChanges.textEquation": "Equação",
   "Common.Controllers.ReviewChanges.textExact": "exactly",
   "Common.Controllers.ReviewChanges.textFirstLine": "First line",
   "Common.Controllers.ReviewChanges.textFontSize": "Font size",
@@ -81,10 +81,13 @@
   "Common.UI.SearchDialog.textTitle": "Localizar e substituir",
   "Common.UI.SearchDialog.textTitle2": "Localizar",
   "Common.UI.SearchDialog.textWholeWords": "Palavras inteiras apenas",
+  "Common.UI.SearchDialog.txtBtnHideReplace": "Ocultar Substituição",
   "Common.UI.SearchDialog.txtBtnReplace": "Substituir",
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Substituir tudo",
   "Common.UI.SynchronizeTip.textDontShow": "Não exibir esta mensagem novamente",
   "Common.UI.SynchronizeTip.textSynchronize": "O documento foi alterado por outro usuário.<br/>Clique para salvar suas alterações e recarregar as atualizações.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Cores padronizadas",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Cores de tema",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Fechar",
   "Common.UI.Window.noButtonText": "Não",
@@ -95,6 +98,8 @@
   "Common.UI.Window.textInformation": "Informações",
   "Common.UI.Window.textWarning": "Aviso",
   "Common.UI.Window.yesButtonText": "Sim",
+  "Common.Utils.Metric.txtCm": "cm",
+  "Common.Utils.Metric.txtPt": "Pt",
   "Common.Views.About.txtAddress": "endereço:",
   "Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
   "Common.Views.About.txtLicensee": "LICENÇA",
@@ -136,7 +141,13 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recepients",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Ir para Documentos",
-  "Common.Views.History.textHistoryHeader": "Back to Document",
+  "Common.Views.Header.txtRename": "Renomear",
+  "Common.Views.History.textCloseHistory": "Fechar histórico",
+  "Common.Views.History.textHide": "Minimizar",
+  "Common.Views.History.textHideAll": "Ocultar alterações detalhadas ",
+  "Common.Views.History.textRestore": "Restaurar",
+  "Common.Views.History.textShow": "Expandir",
+  "Common.Views.History.textShowAll": "Mostrar alterações detalhadas",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Colar uma URL de imagem:",
@@ -150,10 +161,23 @@
   "Common.Views.InsertTableDialog.txtMinText": "O valor mínimo para este campo é {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Número de linhas",
   "Common.Views.InsertTableDialog.txtTitle": "Tamanho da tabela",
-  "Common.Views.OpenDialog.cancelButtonText": "Cancel",
+  "Common.Views.LanguageDialog.btnCancel": "Cancel",
+  "Common.Views.LanguageDialog.btnOk": "Ok",
+  "Common.Views.LanguageDialog.labelSelect": "Select document language",
+  "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
+  "Common.Views.OpenDialog.txtPassword": "Senha",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
+  "Common.Views.OpenDialog.txtTitleProtected": "Arquivo protegido",
+  "Common.Views.PluginDlg.textLoading": "Carregamento",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Carregamento",
+  "Common.Views.Plugins.textStart": "Iniciar",
+  "Common.Views.RenameDialog.cancelButtonText": "Cancelar",
+  "Common.Views.RenameDialog.okButtonText": "Aceitar",
+  "Common.Views.RenameDialog.textName": "Nome de arquivo",
+  "Common.Views.RenameDialog.txtInvalidName": "Nome de arquivo não pode conter os seguintes caracteres:",
   "Common.Views.ReviewChanges.txtAccept": "Accept",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Changes",
@@ -174,7 +198,6 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.Main.applyChangesTextText": "Carregando as alterações...",
   "DE.Controllers.Main.applyChangesTitleText": "Carregando as alterações",
-  "DE.Controllers.Main.convertationErrorText": "Conversão falhou.",
   "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.",
   "DE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documentos.",
   "DE.Controllers.Main.criticalErrorTitle": "Erro",
@@ -184,6 +207,8 @@
   "DE.Controllers.Main.downloadMergeTitle": "Downloading",
   "DE.Controllers.Main.downloadTextText": "Baixando documento...",
   "DE.Controllers.Main.downloadTitleText": "Baixando documento",
+  "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": "Image URL is incorrect",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
   "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.errorDatabaseConnection": "Erro externo.<br>Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.",
@@ -195,10 +220,17 @@
   "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.",
   "DE.Controllers.Main.errorProcessSaveResult": "Salvamento falhou.",
+  "DE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+  "DE.Controllers.Main.errorSessionAbsolute": "A sessão de edição de documentos expirou. Por Favor atualize a página.",
+  "DE.Controllers.Main.errorSessionIdle": "O documento ficou sem edição por muito tempo. Por favor atualize a página.",
+  "DE.Controllers.Main.errorSessionToken": "A conexão com o servidor foi interrompida. Por favor atualize a página.",
   "DE.Controllers.Main.errorStockChart": "Ordem da linha incorreta. Para criar um gráfico de ações coloque os dados na planilha na seguinte ordem:<br>preço de abertura, preço máx., preço mín., preço de fechamento.",
+  "DE.Controllers.Main.errorToken": "O token de segurança do documento não foi formado corretamente. <br> Entre em contato com o administrador do Document Server.",
+  "DE.Controllers.Main.errorTokenExpire": "O token de segurança do documento expirou. <br> Entre em contato com o administrador do Document Server.",
   "DE.Controllers.Main.errorUpdateVersion": "A versão do arquivo foi alterada. A página será recarregada.",
   "DE.Controllers.Main.errorUserDrop": "O arquivo não pode ser acessado agora.",
   "DE.Controllers.Main.errorUsersExceed": "O número de usuários permitidos pelo plano de preços foi excedido",
+  "DE.Controllers.Main.errorViewerDisconnect": "A ligação foi perdida. Você ainda pode ver o documento,<br> mas não pode fazer o download ou imprimir até que a conexão seja restaurada.",
   "DE.Controllers.Main.leavePageText": "Você não salvou as alterações neste documento. Clique em \"Permanecer nesta página\", em seguida, clique em \"Salvar\" para salvá-las. Clique em \"Sair desta página\" para descartar todas as alterações não salvas.",
   "DE.Controllers.Main.loadFontsTextText": "Carregando dados...",
   "DE.Controllers.Main.loadFontsTitleText": "Carregando dados",
@@ -213,6 +245,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
   "DE.Controllers.Main.notcriticalErrorTitle": "Aviso",
+  "DE.Controllers.Main.openErrorText": "Ocorreu um erro ao abrir o arquivo",
   "DE.Controllers.Main.openTextText": "Abrindo documento...",
   "DE.Controllers.Main.openTitleText": "Abrindo documento",
   "DE.Controllers.Main.printTextText": "Imprimindo documento...",
@@ -220,6 +253,7 @@
   "DE.Controllers.Main.reloadButtonText": "Recarregar página",
   "DE.Controllers.Main.requestEditFailedMessageText": "Alguém está editando este documento neste momento. Tente novamente mais tarde.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Acesso negado",
+  "DE.Controllers.Main.saveErrorText": "Ocorreu um erro ao gravar o arquivo",
   "DE.Controllers.Main.savePreparingText": "Preparando para salvar",
   "DE.Controllers.Main.savePreparingTitle": "Preparando para salvar. Aguarde...",
   "DE.Controllers.Main.saveTextText": "Salvando documento...",
@@ -230,10 +264,17 @@
   "DE.Controllers.Main.splitMaxColsErrorText": "O número de colunas deve ser inferior a %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "O número de linhas deve ser inferior a %1.",
   "DE.Controllers.Main.textAnonymous": "Anônimo",
+  "DE.Controllers.Main.textBuyNow": "Visitar website",
+  "DE.Controllers.Main.textChangesSaved": "All changes saved",
   "DE.Controllers.Main.textCloseTip": "Clique para fechar a dica",
+  "DE.Controllers.Main.textContactUs": "Contate as vendas",
   "DE.Controllers.Main.textLoadingDocument": "Carregando documento",
+  "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE versão open source",
+  "DE.Controllers.Main.textShape": "Shape",
   "DE.Controllers.Main.textStrict": "Strict mode",
   "DE.Controllers.Main.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.",
+  "DE.Controllers.Main.titleLicenseExp": "A licença expirou",
+  "DE.Controllers.Main.titleServerVersion": "Editor updated",
   "DE.Controllers.Main.titleUpdateVersion": "Versão alterada",
   "DE.Controllers.Main.txtArt": "Your text here",
   "DE.Controllers.Main.txtBasicShapes": "Formas básicas",
@@ -242,6 +283,7 @@
   "DE.Controllers.Main.txtCharts": "Gráficos",
   "DE.Controllers.Main.txtDiagramTitle": "Título do diagrama",
   "DE.Controllers.Main.txtEditingMode": "Definir modo de edição...",
+  "DE.Controllers.Main.txtErrorLoadHistory": "O carregamento de histórico falhou",
   "DE.Controllers.Main.txtFiguredArrows": "Setas figuradas",
   "DE.Controllers.Main.txtLines": "Linhas",
   "DE.Controllers.Main.txtMath": "Matemática",
@@ -249,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Retângulos",
   "DE.Controllers.Main.txtSeries": "Série",
   "DE.Controllers.Main.txtStarsRibbons": "Estrelas e arco-íris",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Heading 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Heading 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Heading 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Heading 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Heading 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Heading 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Intense Quote",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "List Paragraph",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "No Spacing",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Quote",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Subtitle",
+  "DE.Controllers.Main.txtStyle_Title": "Title",
   "DE.Controllers.Main.txtXAxis": "Eixo X",
   "DE.Controllers.Main.txtYAxis": "Eixo Y",
   "DE.Controllers.Main.unknownErrorText": "Erro desconhecido.",
@@ -260,11 +318,15 @@
   "DE.Controllers.Main.uploadImageTitleText": "Carregando imagem",
   "DE.Controllers.Main.warnBrowserIE9": "O aplicativo tem baixa capacidade no IE9. Usar IE10 ou superior",
   "DE.Controllers.Main.warnBrowserZoom": "A configuração de zoom atual de seu navegador não é completamente suportada. Redefina para o zoom padrão pressionando Ctrl+0.",
+  "DE.Controllers.Main.warnLicenseExp": "Sua licença expirou.<br>Atualize sua licença e refresque a página.",
+  "DE.Controllers.Main.warnNoLicense": "Você está usando uma versão de código aberto de ONLYOFFICE. A versão tem limitações para conexões simultâneas com servidor de documentos (20 conexões por vez). <br> Se você precisar de mais, por favor considere a compra de uma licença comercial.",
   "DE.Controllers.Main.warnProcessRightsChange": "Foi negado a você o direito de editar o arquivo.",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "DE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the device fonts, the saved font will be used when it is available.<br>Do you want to continue?",
+  "DE.Controllers.Toolbar.confirmDeleteFootnotes": "Deseja excluir todas as notas de rodapé?",
+  "DE.Controllers.Toolbar.notcriticalErrorTitle": "Aviso",
   "DE.Controllers.Toolbar.textAccent": "Destaques",
   "DE.Controllers.Toolbar.textBracket": "Parênteses",
   "DE.Controllers.Toolbar.textEmptyImgUrl": "Você precisa especificar uma URL de imagem.",
@@ -453,6 +515,8 @@
   "DE.Controllers.Toolbar.txtLimitLog_LogBase": "Logaritmo",
   "DE.Controllers.Toolbar.txtLimitLog_Max": "Máximo",
   "DE.Controllers.Toolbar.txtLimitLog_Min": "Mínimo",
+  "DE.Controllers.Toolbar.txtMarginsH": "Margens superior e inferior são muito altas para uma determinada altura da página",
+  "DE.Controllers.Toolbar.txtMarginsW": "Margens são muito grandes para uma determinada largura da página",
   "DE.Controllers.Toolbar.txtMatrix_1_2": "Matriz Vazia 1x2",
   "DE.Controllers.Toolbar.txtMatrix_1_3": "Matriz Vazia 1x3",
   "DE.Controllers.Toolbar.txtMatrix_2_1": "Matriz Vazia 2x1",
@@ -610,6 +674,7 @@
   "DE.Views.ChartSettings.textSize": "Tamanho",
   "DE.Views.ChartSettings.textStock": "Gráfico de ações",
   "DE.Views.ChartSettings.textStyle": "Estilo",
+  "DE.Views.ChartSettings.textSurface": "Surface",
   "DE.Views.ChartSettings.textUndock": "Desencaixar do painel",
   "DE.Views.ChartSettings.textWidth": "Largura",
   "DE.Views.ChartSettings.textWrap": "Estilo da quebra automática",
@@ -621,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "Justo",
   "DE.Views.ChartSettings.txtTitle": "Gráfico",
   "DE.Views.ChartSettings.txtTopAndBottom": "Parte superior e inferior",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
+  "DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
+  "DE.Views.CustomColumnsDialog.textTitle": "Columns",
   "DE.Views.DocumentHolder.aboveText": "Acima",
   "DE.Views.DocumentHolder.addCommentText": "Adicionar comentário",
   "DE.Views.DocumentHolder.advancedFrameText": "Configurações avançadas de moldura",
@@ -629,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Configurações avançadas",
   "DE.Views.DocumentHolder.alignmentText": "Alinhamento",
   "DE.Views.DocumentHolder.belowText": "Abaixo",
-  "DE.Views.DocumentHolder.bottomCellText": "Alinhar à parte inferior",
   "DE.Views.DocumentHolder.breakBeforeText": "Quebra de página antes",
   "DE.Views.DocumentHolder.cellAlignText": "Alinhamento vertical da célula",
   "DE.Views.DocumentHolder.cellText": "Célula",
-  "DE.Views.DocumentHolder.centerCellText": "Alinhar ao centro",
   "DE.Views.DocumentHolder.centerText": "Centro",
   "DE.Views.DocumentHolder.chartText": "Configurações avançadas de gráfico",
   "DE.Views.DocumentHolder.columnText": "Coluna",
@@ -705,18 +774,89 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinhar ao meio",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Alinhar à direita",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Alinhar à parte superior",
+  "DE.Views.DocumentHolder.textUndo": "Undo",
   "DE.Views.DocumentHolder.textWrap": "Estilo da quebra automática",
   "DE.Views.DocumentHolder.tipIsLocked": "Este elemento está sendo atualmente editado por outro usuário.",
-  "DE.Views.DocumentHolder.topCellText": "Alinhar à parte superior",
+  "DE.Views.DocumentHolder.txtAddBottom": "Adicionar borda inferior",
+  "DE.Views.DocumentHolder.txtAddFractionBar": "Adicionar barra de fração",
+  "DE.Views.DocumentHolder.txtAddHor": "Adicionar linha horizontal",
+  "DE.Views.DocumentHolder.txtAddLB": "Adicionar linha inferior esquerda",
+  "DE.Views.DocumentHolder.txtAddLeft": "Adicionar borda esquerda",
+  "DE.Views.DocumentHolder.txtAddLT": "Adicionar linha superior esquerda",
+  "DE.Views.DocumentHolder.txtAddRight": "Adicionar borda direita",
+  "DE.Views.DocumentHolder.txtAddTop": "Adicionar borda superior",
+  "DE.Views.DocumentHolder.txtAddVer": "Adicionar linha vertical",
+  "DE.Views.DocumentHolder.txtAlignToChar": "Alinhar à símbolo",
   "DE.Views.DocumentHolder.txtBehind": "Atrás",
+  "DE.Views.DocumentHolder.txtBorderProps": "Propriedades de borda",
+  "DE.Views.DocumentHolder.txtBottom": "Inferior",
+  "DE.Views.DocumentHolder.txtColumnAlign": "Alinhamento de colunas",
+  "DE.Views.DocumentHolder.txtDecreaseArg": "Diminuir tamanho de argumento",
+  "DE.Views.DocumentHolder.txtDeleteArg": "Excluir argumento",
+  "DE.Views.DocumentHolder.txtDeleteBreak": "Eliminar quebra manual",
+  "DE.Views.DocumentHolder.txtDeleteChars": "Excluir caracteres anexos ",
+  "DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Excluir separadores e caracteres anexos",
+  "DE.Views.DocumentHolder.txtDeleteEq": "Remover equação",
+  "DE.Views.DocumentHolder.txtDeleteGroupChar": "Excluir caractere",
+  "DE.Views.DocumentHolder.txtDeleteRadical": "Eliminar radical",
+  "DE.Views.DocumentHolder.txtFractionLinear": "Alterar para fração linear",
+  "DE.Views.DocumentHolder.txtFractionSkewed": "Alterar para fração inclinada",
+  "DE.Views.DocumentHolder.txtFractionStacked": "Alterar para fração empilhada",
   "DE.Views.DocumentHolder.txtGroup": "Grupo",
+  "DE.Views.DocumentHolder.txtGroupCharOver": "Caractere sobre texto",
+  "DE.Views.DocumentHolder.txtGroupCharUnder": "Caractere sob texto",
+  "DE.Views.DocumentHolder.txtHideBottom": "Ocultar borda inferior",
+  "DE.Views.DocumentHolder.txtHideBottomLimit": "Ocultar limite inferior",
+  "DE.Views.DocumentHolder.txtHideCloseBracket": "Ocultar colchete de fechamento",
+  "DE.Views.DocumentHolder.txtHideDegree": "Ocultar grau",
+  "DE.Views.DocumentHolder.txtHideHor": "Ocultar linha horizontal",
+  "DE.Views.DocumentHolder.txtHideLB": "Ocultar linha inferior esquerda",
+  "DE.Views.DocumentHolder.txtHideLeft": "Ocultar borda esquerda",
+  "DE.Views.DocumentHolder.txtHideLT": "Ocultar linha superior esquerda",
+  "DE.Views.DocumentHolder.txtHideOpenBracket": "Ocultar colchete de abertura",
+  "DE.Views.DocumentHolder.txtHidePlaceholder": "Ocultar espaço reservado",
+  "DE.Views.DocumentHolder.txtHideRight": "Ocultar borda direita",
+  "DE.Views.DocumentHolder.txtHideTop": "Ocultar borda superior",
+  "DE.Views.DocumentHolder.txtHideTopLimit": "Ocultar limite superior",
+  "DE.Views.DocumentHolder.txtHideVer": "Ocultar linha vertical",
+  "DE.Views.DocumentHolder.txtIncreaseArg": "Aumentar o tamanho do argumento",
   "DE.Views.DocumentHolder.txtInFront": "Em frente",
   "DE.Views.DocumentHolder.txtInline": "Embutido",
+  "DE.Views.DocumentHolder.txtInsertArgAfter": "Inserir argumento após",
+  "DE.Views.DocumentHolder.txtInsertArgBefore": "Inserir argumento antes",
+  "DE.Views.DocumentHolder.txtInsertBreak": "Inserir quebra manual",
+  "DE.Views.DocumentHolder.txtInsertEqAfter": "Inserir equação a seguir",
+  "DE.Views.DocumentHolder.txtInsertEqBefore": "Inserir equação à frente",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",
+  "DE.Views.DocumentHolder.txtLimitChange": "Alterar localização de limites",
+  "DE.Views.DocumentHolder.txtLimitOver": "Limite sobre o texto",
+  "DE.Views.DocumentHolder.txtLimitUnder": "Limite sob o texto",
+  "DE.Views.DocumentHolder.txtMatchBrackets": "Combinar parênteses com a altura do argumento",
+  "DE.Views.DocumentHolder.txtMatrixAlign": "Alinhamento de matriz",
+  "DE.Views.DocumentHolder.txtOverbar": "Barra sobre texto",
   "DE.Views.DocumentHolder.txtPressLink": "Pressione CTRL e clique no link",
+  "DE.Views.DocumentHolder.txtRemFractionBar": "Remover barra de fração",
+  "DE.Views.DocumentHolder.txtRemLimit": "Remover limite",
+  "DE.Views.DocumentHolder.txtRemoveAccentChar": "Remover acento",
+  "DE.Views.DocumentHolder.txtRemoveBar": "Remover barra",
+  "DE.Views.DocumentHolder.txtRemScripts": "Remover scripts",
+  "DE.Views.DocumentHolder.txtRemSubscript": "Remover subscrito",
+  "DE.Views.DocumentHolder.txtRemSuperscript": "Remover sobrescrito",
+  "DE.Views.DocumentHolder.txtScriptsAfter": "Scripts após o texto",
+  "DE.Views.DocumentHolder.txtScriptsBefore": "Scripts antes do texto",
+  "DE.Views.DocumentHolder.txtShowBottomLimit": "Mostrar limite inferior",
+  "DE.Views.DocumentHolder.txtShowCloseBracket": "Mostrar encerramento dos colchetes",
+  "DE.Views.DocumentHolder.txtShowDegree": "Mostrar grau",
+  "DE.Views.DocumentHolder.txtShowOpenBracket": "Mostrar abertura dos colchetes",
+  "DE.Views.DocumentHolder.txtShowPlaceholder": "Mostrar espaço reservado",
+  "DE.Views.DocumentHolder.txtShowTopLimit": "Mostrar limite superior",
   "DE.Views.DocumentHolder.txtSquare": "Quadrado",
+  "DE.Views.DocumentHolder.txtStretchBrackets": "Esticar colchetes",
   "DE.Views.DocumentHolder.txtThrough": "Através",
   "DE.Views.DocumentHolder.txtTight": "Justo",
+  "DE.Views.DocumentHolder.txtTop": "Parte superior",
   "DE.Views.DocumentHolder.txtTopAndBottom": "Parte superior e inferior",
+  "DE.Views.DocumentHolder.txtUnderbar": "Barra abaixo de texto",
   "DE.Views.DocumentHolder.txtUngroup": "Desagrupar",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Alinhamento vertical",
@@ -757,8 +897,6 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "Relativo para",
   "DE.Views.DropcapSettingsAdvanced.textRight": "Direita",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Altura em linhas",
-  "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Cores padrão",
-  "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Cores do tema",
   "DE.Views.DropcapSettingsAdvanced.textTitle": "Letra capitular - Configurações avançadas",
   "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Moldura - Configurações Avançadas",
   "DE.Views.DropcapSettingsAdvanced.textTop": "Parte superior",
@@ -767,6 +905,7 @@
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Nome da fonte",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Sem bordas",
   "DE.Views.FileMenu.btnBackCaption": "Ir para Documentos",
+  "DE.Views.FileMenu.btnCloseMenuCaption": "Fechar menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Criar novo",
   "DE.Views.FileMenu.btnDownloadCaption": "Baixar como...",
   "DE.Views.FileMenu.btnHelpCaption": "Ajuda...",
@@ -774,6 +913,7 @@
   "DE.Views.FileMenu.btnInfoCaption": "Informações do documento...",
   "DE.Views.FileMenu.btnPrintCaption": "Imprimir",
   "DE.Views.FileMenu.btnRecentFilesCaption": "Abrir recente...",
+  "DE.Views.FileMenu.btnRenameCaption": "Renomear...",
   "DE.Views.FileMenu.btnReturnCaption": "Voltar para documento",
   "DE.Views.FileMenu.btnRightsCaption": "Direitos de Acesso...",
   "DE.Views.FileMenu.btnSaveAsCaption": "Save as",
@@ -803,14 +943,17 @@
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Pessoas que têm direitos",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Aplicar",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Ativar guias de alinhamento",
+  "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Ativar recuperação automática",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Ativar salvamento automático",
   "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
   "DE.Views.FileMenuPanels.Settings.strFast": "Fast",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Dicas de fonte",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Ativar hieróglifos",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Ativar opção comentário ao vivo",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Alterações de colaboração em tempo real",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Ativar a opção de verificação ortográfica",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
@@ -821,11 +964,16 @@
   "DE.Views.FileMenuPanels.Settings.text5Minutes": "Cada 5 minutos",
   "DE.Views.FileMenuPanels.Settings.text60Minutes": "Cada hora",
   "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guias de alinhamento",
+  "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Recuperação automática",
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Salvamento automático",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Desabilitado",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Visualizar todos",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajustar a página",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajustar largura",
+  "DE.Views.FileMenuPanels.Settings.txtInch": "Polegada",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Visualizar último",
   "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Comentário ao vivo",
@@ -859,6 +1007,8 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo é obrigatório",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Este campo deve ser uma URL no formato \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Exibir configurações avançadas",
+  "DE.Views.ImageSettings.textEdit": "Editar",
+  "DE.Views.ImageSettings.textEditObject": "Editar objeto",
   "DE.Views.ImageSettings.textFromFile": "Do Arquivo",
   "DE.Views.ImageSettings.textFromUrl": "Da URL",
   "DE.Views.ImageSettings.textHeight": "Altura",
@@ -877,8 +1027,14 @@
   "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
   "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
   "DE.Views.ImageSettingsAdvanced.strMargins": "Preenchimento de texto",
+  "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Alinhamento",
+  "DE.Views.ImageSettingsAdvanced.textAlt": "Texto Alternativo",
+  "DE.Views.ImageSettingsAdvanced.textAltDescription": "Descrição",
+  "DE.Views.ImageSettingsAdvanced.textAltTip": "A representação alternativa baseada em texto da informação visual do objeto, que será lida para as pessoas com deficiências visuais ou cognitivas para ajudá-los a entender melhor que informação existe na imagem, auto-forma, gráfico ou tabela.",
+  "DE.Views.ImageSettingsAdvanced.textAltTitle": "Título",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Setas",
+  "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Bloquear proporção",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Tamanho inicial",
   "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Estilo inicial",
   "DE.Views.ImageSettingsAdvanced.textBelow": "abaixo",
@@ -911,7 +1067,9 @@
   "DE.Views.ImageSettingsAdvanced.textPage": "Página",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Parágrafo",
   "DE.Views.ImageSettingsAdvanced.textPosition": "Posição",
+  "DE.Views.ImageSettingsAdvanced.textPositionPc": "Posição relativa",
   "DE.Views.ImageSettingsAdvanced.textRelative": "relativo para",
+  "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relativo",
   "DE.Views.ImageSettingsAdvanced.textRight": "Direita",
   "DE.Views.ImageSettingsAdvanced.textRightMargin": "Margem direita",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "para a direita de",
@@ -938,10 +1096,12 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comentários",
   "DE.Views.LeftMenu.tipFile": "Arquivo",
+  "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Pesquisar",
   "DE.Views.LeftMenu.tipSupport": "Feedback e Suporte",
   "DE.Views.LeftMenu.tipTitles": "Títulos",
-  "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
+  "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
+  "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -993,6 +1153,40 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
+  "DE.Views.NoteSettingsDialog.textApply": "Aplicar",
+  "DE.Views.NoteSettingsDialog.textApplyTo": "Aplicar alterações a",
+  "DE.Views.NoteSettingsDialog.textCancel": "Cancelar",
+  "DE.Views.NoteSettingsDialog.textContinue": "Contínua",
+  "DE.Views.NoteSettingsDialog.textCustom": "Marca personalizada",
+  "DE.Views.NoteSettingsDialog.textDocument": "Documento inteiro",
+  "DE.Views.NoteSettingsDialog.textEachPage": "Reiniciar cada uma das página",
+  "DE.Views.NoteSettingsDialog.textEachSection": "Reiniciar cada uma das seções",
+  "DE.Views.NoteSettingsDialog.textFootnote": "Nota de rodapé",
+  "DE.Views.NoteSettingsDialog.textFormat": "Formato",
+  "DE.Views.NoteSettingsDialog.textInsert": "Inserir",
+  "DE.Views.NoteSettingsDialog.textLocation": "Localização",
+  "DE.Views.NoteSettingsDialog.textNumbering": "Numeração",
+  "DE.Views.NoteSettingsDialog.textNumFormat": "Formato Numérico",
+  "DE.Views.NoteSettingsDialog.textPageBottom": "Inferior da página",
+  "DE.Views.NoteSettingsDialog.textSection": "Seção atual",
+  "DE.Views.NoteSettingsDialog.textStart": "Começar em",
+  "DE.Views.NoteSettingsDialog.textTextBottom": "Abaixo do texto",
+  "DE.Views.NoteSettingsDialog.textTitle": "Definições de Notas",
+  "DE.Views.PageMarginsDialog.cancelButtonText": "Cancelar",
+  "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Aviso",
+  "DE.Views.PageMarginsDialog.okButtonText": "Aceitar",
+  "DE.Views.PageMarginsDialog.textBottom": "Inferior",
+  "DE.Views.PageMarginsDialog.textLeft": "Esquerda",
+  "DE.Views.PageMarginsDialog.textRight": "Direita",
+  "DE.Views.PageMarginsDialog.textTitle": "Margens",
+  "DE.Views.PageMarginsDialog.textTop": "Parte superior",
+  "DE.Views.PageMarginsDialog.txtMarginsH": "Margens superior e inferior são muito altas para uma determinada altura da página",
+  "DE.Views.PageMarginsDialog.txtMarginsW": "Margens são muito grandes para uma determinada largura da página",
+  "DE.Views.PageSizeDialog.cancelButtonText": "Cancelar",
+  "DE.Views.PageSizeDialog.okButtonText": "Aceitar",
+  "DE.Views.PageSizeDialog.textHeight": "Altura",
+  "DE.Views.PageSizeDialog.textTitle": "Tamanho da página",
+  "DE.Views.PageSizeDialog.textWidth": "Largura",
   "DE.Views.ParagraphSettings.strLineHeight": "Espaçamento de linha",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Espaçamento",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Não adicionar intervalo entre parágrafos do mesmo estilo",
@@ -1005,8 +1199,6 @@
   "DE.Views.ParagraphSettings.textBackColor": "Cor do plano de fundo",
   "DE.Views.ParagraphSettings.textExact": "Exatamente",
   "DE.Views.ParagraphSettings.textNewColor": "Adicionar nova cor personalizada",
-  "DE.Views.ParagraphSettings.textStandartColors": "Cores padrão",
-  "DE.Views.ParagraphSettings.textThemeColors": "Cores do tema",
   "DE.Views.ParagraphSettings.txtAutoText": "Automático",
   "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancelar",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "As abas especificadas aparecerão neste campo",
@@ -1047,12 +1239,10 @@
   "DE.Views.ParagraphSettingsAdvanced.textRight": "Direita",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Especificar",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Espaçamento",
-  "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Cores padrão",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Centro",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Esquerda",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Posição da aba",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Direita",
-  "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Cores do tema",
   "DE.Views.ParagraphSettingsAdvanced.textTitle": "Parágrafo - Configurações avançadas",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "Parte superior",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Definir borda externa e todas as linhas internas",
@@ -1081,6 +1271,7 @@
   "DE.Views.ShapeSettings.strSize": "Tamanho",
   "DE.Views.ShapeSettings.strStroke": "Traço",
   "DE.Views.ShapeSettings.strTransparency": "Opacidade",
+  "DE.Views.ShapeSettings.strType": "Tipo",
   "DE.Views.ShapeSettings.textAdvanced": "Exibir configurações avançadas",
   "DE.Views.ShapeSettings.textBorderSizeErr": "O valor inserido está incorreto.<br>Insira um valor entre 0 pt e 1.584 pt.",
   "DE.Views.ShapeSettings.textColor": "Preenchimento de cor",
@@ -1097,11 +1288,9 @@
   "DE.Views.ShapeSettings.textPatternFill": "Padrão",
   "DE.Views.ShapeSettings.textRadial": "Radial",
   "DE.Views.ShapeSettings.textSelectTexture": "Selecionar",
-  "DE.Views.ShapeSettings.textStandartColors": "Cores padrão",
   "DE.Views.ShapeSettings.textStretch": "Alongar",
   "DE.Views.ShapeSettings.textStyle": "Estilo",
   "DE.Views.ShapeSettings.textTexture": "Da Textura",
-  "DE.Views.ShapeSettings.textThemeColors": "Cores do tema",
   "DE.Views.ShapeSettings.textTile": "Lado a lado",
   "DE.Views.ShapeSettings.textWrap": "Estilo da quebra automática",
   "DE.Views.ShapeSettings.txtBehind": "Atrás",
@@ -1124,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Parte superior e inferior",
   "DE.Views.ShapeSettings.txtWood": "Madeira",
   "DE.Views.Statusbar.goToPageText": "Ir para a Página",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Cancelar",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "OK",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Selecionar idioma do documento",
   "DE.Views.Statusbar.pageIndexText": "Página {0} de {1}",
   "DE.Views.Statusbar.textChangesPanel": "Changes Panel",
   "DE.Views.Statusbar.textTrackChanges": "Track Changes",
@@ -1182,11 +1368,9 @@
   "DE.Views.TableSettings.textOK": "OK",
   "DE.Views.TableSettings.textRows": "Linhas",
   "DE.Views.TableSettings.textSelectBorders": "Selecione as bordas que você deseja alterar aplicando o estilo escolhido acima",
-  "DE.Views.TableSettings.textStandartColors": "Cores padrão",
   "DE.Views.TableSettings.textTemplate": "Selecionar a partir do modelo",
-  "DE.Views.TableSettings.textThemeColors": "Cores do tema",
   "DE.Views.TableSettings.textTotal": "Total",
-  "DE.Views.TableSettings.textWrap": "Disposição do texto",
+  "DE.Views.TableSettings.textWrap": "Estilo da quebra",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tabela embutida",
   "DE.Views.TableSettings.textWrapParallelTooltip": "Tabela de fluxo",
   "DE.Views.TableSettings.tipAll": "Definir borda externa e todas as linhas internas",
@@ -1205,6 +1389,10 @@
   "DE.Views.TableSettingsAdvanced.textAlign": "Alinhamento",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alinhamento",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Permitir espaçamento entre células",
+  "DE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",
+  "DE.Views.TableSettingsAdvanced.textAltDescription": "Description",
+  "DE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.",
+  "DE.Views.TableSettingsAdvanced.textAltTitle": "Title",
   "DE.Views.TableSettingsAdvanced.textAnchorText": "Тexto",
   "DE.Views.TableSettingsAdvanced.textAutofit": "Automaticamente redimensionado para ajustar conteúdo",
   "DE.Views.TableSettingsAdvanced.textBackColor": "Plano de fundo da célula",
@@ -1214,7 +1402,9 @@
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Bordas e Plano de fundo",
   "DE.Views.TableSettingsAdvanced.textBorderWidth": "Tamanho da borda",
   "DE.Views.TableSettingsAdvanced.textBottom": "Inferior",
+  "DE.Views.TableSettingsAdvanced.textCellOptions": "Opções de célula",
   "DE.Views.TableSettingsAdvanced.textCellProps": "Propriedades da célula",
+  "DE.Views.TableSettingsAdvanced.textCellSize": "Tamanho de célula",
   "DE.Views.TableSettingsAdvanced.textCenter": "Centro",
   "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Centro",
   "DE.Views.TableSettingsAdvanced.textCheckMargins": "Usar margens padrão",
@@ -1226,6 +1416,7 @@
   "DE.Views.TableSettingsAdvanced.textLeftTooltip": "Esquerda",
   "DE.Views.TableSettingsAdvanced.textMargin": "Margem",
   "DE.Views.TableSettingsAdvanced.textMargins": "Margens da célula",
+  "DE.Views.TableSettingsAdvanced.textMeasure": "Medir em",
   "DE.Views.TableSettingsAdvanced.textMove": "Mover objeto com texto",
   "DE.Views.TableSettingsAdvanced.textNewColor": "Adicionar nova cor personalizada",
   "DE.Views.TableSettingsAdvanced.textOnlyCells": "Apenas para as células selecionadas",
@@ -1233,14 +1424,16 @@
   "DE.Views.TableSettingsAdvanced.textOverlap": "Permitir sobreposição",
   "DE.Views.TableSettingsAdvanced.textPage": "Página",
   "DE.Views.TableSettingsAdvanced.textPosition": "Posição",
+  "DE.Views.TableSettingsAdvanced.textPrefWidth": "Largura preferida",
   "DE.Views.TableSettingsAdvanced.textPreview": "Pré-visualizar",
   "DE.Views.TableSettingsAdvanced.textRelative": "relativo para",
   "DE.Views.TableSettingsAdvanced.textRight": "Direita",
   "DE.Views.TableSettingsAdvanced.textRightOf": "para a direita de",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Direita",
-  "DE.Views.TableSettingsAdvanced.textStandartColors": "Cores padrão",
+  "DE.Views.TableSettingsAdvanced.textTable": "Tabela",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Plano de fundo da tabela",
-  "DE.Views.TableSettingsAdvanced.textThemeColors": "Cores do tema",
+  "DE.Views.TableSettingsAdvanced.textTablePosition": "Posição de tabela",
+  "DE.Views.TableSettingsAdvanced.textTableSize": "Tamanho de tabela",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabela - Configurações avançadas",
   "DE.Views.TableSettingsAdvanced.textTop": "Parte superior",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertical",
@@ -1249,6 +1442,8 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Disposição do texto",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabela embutida",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Tabela de fluxo",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Estilo da quebra",
+  "DE.Views.TableSettingsAdvanced.textWrapText": "Quebrar texto ",
   "DE.Views.TableSettingsAdvanced.tipAll": "Definir borda externa e todas as linhas internas",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Definir bordas para células internas apenas",
   "DE.Views.TableSettingsAdvanced.tipCellInner": "Definir linhas verticais e horizontais apenas para células internas",
@@ -1259,12 +1454,17 @@
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Definir borda externa e bordas para todas as células internas",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Definir borda externa e linhas verticais e horizontais para células internas",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Definir borda externa da tabela e bordas externas para células internas",
+  "DE.Views.TableSettingsAdvanced.txtCm": "Centímetro",
+  "DE.Views.TableSettingsAdvanced.txtInch": "Polegada",
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Sem bordas",
+  "DE.Views.TableSettingsAdvanced.txtPercent": "Por cento",
+  "DE.Views.TableSettingsAdvanced.txtPt": "Ponto",
   "DE.Views.TextArtSettings.strColor": "Color",
   "DE.Views.TextArtSettings.strFill": "Fill",
   "DE.Views.TextArtSettings.strSize": "Size",
   "DE.Views.TextArtSettings.strStroke": "Stroke",
   "DE.Views.TextArtSettings.strTransparency": "Opacity",
+  "DE.Views.TextArtSettings.strType": "Tipo",
   "DE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
   "DE.Views.TextArtSettings.textColor": "Color Fill",
   "DE.Views.TextArtSettings.textDirection": "Direction",
@@ -1275,13 +1475,12 @@
   "DE.Views.TextArtSettings.textNoFill": "No Fill",
   "DE.Views.TextArtSettings.textRadial": "Radial",
   "DE.Views.TextArtSettings.textSelectTexture": "Select",
-  "DE.Views.TextArtSettings.textStandartColors": "Standard Colors",
   "DE.Views.TextArtSettings.textStyle": "Style",
   "DE.Views.TextArtSettings.textTemplate": "Template",
-  "DE.Views.TextArtSettings.textThemeColors": "Theme Colors",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
   "DE.Views.Toolbar.mniCustomTable": "Inserir tabela personalizada",
+  "DE.Views.Toolbar.mniDelFootnote": "Excluir todas as notas de rodapé",
   "DE.Views.Toolbar.mniEditDropCap": "Configurações avançadas de Letra capitular",
   "DE.Views.Toolbar.mniEditFooter": "Editar rodapé",
   "DE.Views.Toolbar.mniEditHeader": "Editar cabeçalho",
@@ -1289,21 +1488,34 @@
   "DE.Views.Toolbar.mniHiddenChars": "Caracteres não imprimíveis",
   "DE.Views.Toolbar.mniImageFromFile": "Imagem do arquivo",
   "DE.Views.Toolbar.mniImageFromUrl": "Imagem da URL",
+  "DE.Views.Toolbar.mniInsFootnote": "Inserir nota de rodapé",
+  "DE.Views.Toolbar.mniNoteSettings": "Definições de Notas",
   "DE.Views.Toolbar.strMenuNoFill": "Sem preenchimento",
   "DE.Views.Toolbar.textArea": "Gráfico da Área",
   "DE.Views.Toolbar.textAutoColor": "Automático",
   "DE.Views.Toolbar.textBar": "Gráfico de barras",
   "DE.Views.Toolbar.textBold": "Negrito",
+  "DE.Views.Toolbar.textBottom": "Inferior:",
+  "DE.Views.Toolbar.textCharts": "Gráficos",
   "DE.Views.Toolbar.textColumn": "Gráfico de coluna",
+  "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
+  "DE.Views.Toolbar.textColumnsLeft": "Esquerda",
+  "DE.Views.Toolbar.textColumnsOne": "Uma",
+  "DE.Views.Toolbar.textColumnsRight": "Direita",
+  "DE.Views.Toolbar.textColumnsThree": "Três",
+  "DE.Views.Toolbar.textColumnsTwo": "Duas",
   "DE.Views.Toolbar.textCompactView": "Visualizar barra de ferramentas compacta",
   "DE.Views.Toolbar.textContPage": "Página contínua",
   "DE.Views.Toolbar.textEvenPage": "Página par",
   "DE.Views.Toolbar.textFitPage": "Ajustar página",
   "DE.Views.Toolbar.textFitWidth": "Ajustar largura",
+  "DE.Views.Toolbar.textGotoFootnote": "Ir para notas de rodapé",
   "DE.Views.Toolbar.textHideLines": "Ocultar réguas",
   "DE.Views.Toolbar.textHideStatusBar": "Ocultar barra de status",
   "DE.Views.Toolbar.textHideTitleBar": "Ocultar barra de título",
   "DE.Views.Toolbar.textInMargin": "Na margem",
+  "DE.Views.Toolbar.textInsColumnBreak": "Inserir quebra de coluna",
+  "DE.Views.Toolbar.textInsertPageCount": "Inserir número de páginas",
   "DE.Views.Toolbar.textInsertPageNumber": "Inserir número de página",
   "DE.Views.Toolbar.textInsPageBreak": "Inserir quebra de página",
   "DE.Views.Toolbar.textInsSectionBreak": "Inserir quebra de seção",
@@ -1311,14 +1523,25 @@
   "DE.Views.Toolbar.textInsTextArt": "Insert Text Art",
   "DE.Views.Toolbar.textInText": "No texto",
   "DE.Views.Toolbar.textItalic": "Itálico",
+  "DE.Views.Toolbar.textLandscape": "Paisagem",
+  "DE.Views.Toolbar.textLeft": "Esquerda:",
   "DE.Views.Toolbar.textLine": "Gráfico de linha",
+  "DE.Views.Toolbar.textMarginsLast": "Últimos personalizados",
+  "DE.Views.Toolbar.textMarginsModerate": "Moderado",
+  "DE.Views.Toolbar.textMarginsNarrow": "Estreito\n",
+  "DE.Views.Toolbar.textMarginsNormal": "Normal",
+  "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
+  "DE.Views.Toolbar.textMarginsWide": "Amplo",
   "DE.Views.Toolbar.textNewColor": "Adicionar nova cor personalizada",
   "DE.Views.Toolbar.textNextPage": "Próxima página",
   "DE.Views.Toolbar.textNone": "Nenhum",
   "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.textPoint": "Gráfico de pontos",
-  "DE.Views.Toolbar.textStandartColors": "Cores padrão",
+  "DE.Views.Toolbar.textPortrait": "Retrato ",
+  "DE.Views.Toolbar.textRight": "Direita:",
   "DE.Views.Toolbar.textStock": "Gráfico de ações",
   "DE.Views.Toolbar.textStrikeout": "Riscado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
@@ -1329,9 +1552,10 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscrito",
   "DE.Views.Toolbar.textSuperscript": "Sobrescrito",
-  "DE.Views.Toolbar.textThemeColors": "Cores do tema",
+  "DE.Views.Toolbar.textSurface": "Surface",
   "DE.Views.Toolbar.textTitleError": "Erro",
   "DE.Views.Toolbar.textToCurrent": "Para posição atual",
+  "DE.Views.Toolbar.textTop": "Parte superior: ",
   "DE.Views.Toolbar.textUnderline": "Sublinhado",
   "DE.Views.Toolbar.textZoom": "Zoom",
   "DE.Views.Toolbar.tipAdvSettings": "Configurações avançadas",
@@ -1340,8 +1564,10 @@
   "DE.Views.Toolbar.tipAlignLeft": "Alinhar à esquerda",
   "DE.Views.Toolbar.tipAlignRight": "Alinhar à direita",
   "DE.Views.Toolbar.tipBack": "Voltar",
+  "DE.Views.Toolbar.tipChangeChart": "Alterar Tipo de Gráfico",
   "DE.Views.Toolbar.tipClearStyle": "Limpar estilo",
   "DE.Views.Toolbar.tipColorSchemas": "Alterar esquema de cor",
+  "DE.Views.Toolbar.tipColumns": "Inserir colunas",
   "DE.Views.Toolbar.tipCopy": "Copiar",
   "DE.Views.Toolbar.tipCopyStyle": "Copiar estilo",
   "DE.Views.Toolbar.tipDecFont": "Diminuir tamanho da fonte",
@@ -1368,9 +1594,11 @@
   "DE.Views.Toolbar.tipMarkers": "Marcadores",
   "DE.Views.Toolbar.tipMultilevels": "Contorno",
   "DE.Views.Toolbar.tipNewDocument": "Novo documento",
+  "DE.Views.Toolbar.tipNotes": "Notas de rodapé",
   "DE.Views.Toolbar.tipNumbers": "Numeração",
   "DE.Views.Toolbar.tipOpenDocument": "Abrir documento",
   "DE.Views.Toolbar.tipPageBreak": "Inserir página ou quebra de seção",
+  "DE.Views.Toolbar.tipPageMargins": "Margens da página",
   "DE.Views.Toolbar.tipPageOrient": "Orientação da página",
   "DE.Views.Toolbar.tipPageSize": "Tamanho da página",
   "DE.Views.Toolbar.tipParagraphStyle": "Estilo do parágrafo",

apps/documenteditor/main/locale/ru.json

@@ -119,7 +119,7 @@
   "Common.Views.Comments.textCancel": "Отмена",
   "Common.Views.Comments.textClose": "Закрыть",
   "Common.Views.Comments.textComments": "Комментарии",
-  "Common.Views.Comments.textEdit": "Правка",
+  "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Введите здесь свой комментарий",
   "Common.Views.Comments.textOpenAgain": "Открыть снова",
   "Common.Views.Comments.textReply": "Ответить",
@@ -161,6 +161,9 @@
   "Common.Views.InsertTableDialog.txtMinText": "Минимальное значение для этого поля - {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Количество строк",
   "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы",
+  "Common.Views.LanguageDialog.btnCancel": "Отмена",
+  "Common.Views.LanguageDialog.btnOk": "Ок",
+  "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа",
   "Common.Views.OpenDialog.cancelButtonText": "Отмена",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Кодировка",
@@ -288,6 +291,22 @@
   "DE.Controllers.Main.txtRectangles": "Прямоугольники",
   "DE.Controllers.Main.txtSeries": "Ряд",
   "DE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
+  "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",
+  "DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2",
+  "DE.Controllers.Main.txtStyle_Heading_3": "Заголовок 3",
+  "DE.Controllers.Main.txtStyle_Heading_4": "Заголовок 4",
+  "DE.Controllers.Main.txtStyle_Heading_5": "Заголовок 5",
+  "DE.Controllers.Main.txtStyle_Heading_6": "Заголовок 6",
+  "DE.Controllers.Main.txtStyle_Heading_7": "Заголовок 7",
+  "DE.Controllers.Main.txtStyle_Heading_8": "Заголовок 8",
+  "DE.Controllers.Main.txtStyle_Heading_9": "Заголовок 9",
+  "DE.Controllers.Main.txtStyle_Intense_Quote": "Выделенная цитата",
+  "DE.Controllers.Main.txtStyle_List_Paragraph": "Абзац списка",
+  "DE.Controllers.Main.txtStyle_No_Spacing": "Без интервала",
+  "DE.Controllers.Main.txtStyle_Normal": "Обычный",
+  "DE.Controllers.Main.txtStyle_Quote": "Цитата",
+  "DE.Controllers.Main.txtStyle_Subtitle": "Подзаголовок",
+  "DE.Controllers.Main.txtStyle_Title": "Название",
   "DE.Controllers.Main.txtXAxis": "Ось X",
   "DE.Controllers.Main.txtYAxis": "Ось Y",
   "DE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
@@ -655,6 +674,7 @@
   "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": "Стиль обтекания",
@@ -666,6 +686,12 @@
   "DE.Views.ChartSettings.txtTight": "По контуру",
   "DE.Views.ChartSettings.txtTitle": "Диаграмма",
   "DE.Views.ChartSettings.txtTopAndBottom": "Сверху и снизу",
+  "DE.Views.CustomColumnsDialog.cancelButtonText": "Отмена",
+  "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
+  "DE.Views.CustomColumnsDialog.textColumns": "Количество колонок",
+  "DE.Views.CustomColumnsDialog.textSeparator": "Разделитель",
+  "DE.Views.CustomColumnsDialog.textSpacing": "Интервал между колонками",
+  "DE.Views.CustomColumnsDialog.textTitle": "Колонки",
   "DE.Views.DocumentHolder.aboveText": "Выше",
   "DE.Views.DocumentHolder.addCommentText": "Добавить комментарий",
   "DE.Views.DocumentHolder.advancedFrameText": "Дополнительные параметры рамки",
@@ -674,11 +700,9 @@
   "DE.Views.DocumentHolder.advancedText": "Дополнительные параметры",
   "DE.Views.DocumentHolder.alignmentText": "Выравнивание",
   "DE.Views.DocumentHolder.belowText": "Ниже",
-  "DE.Views.DocumentHolder.bottomCellText": "По нижнему краю",
   "DE.Views.DocumentHolder.breakBeforeText": "С новой страницы",
   "DE.Views.DocumentHolder.cellAlignText": "Вертикальное выравнивание в ячейках",
   "DE.Views.DocumentHolder.cellText": "Ячейку",
-  "DE.Views.DocumentHolder.centerCellText": "По центру",
   "DE.Views.DocumentHolder.centerText": "По центру",
   "DE.Views.DocumentHolder.chartText": "Дополнительные параметры диаграммы",
   "DE.Views.DocumentHolder.columnText": "Столбец",
@@ -686,8 +710,8 @@
   "DE.Views.DocumentHolder.deleteRowText": "Удалить строку",
   "DE.Views.DocumentHolder.deleteTableText": "Удалить таблицу",
   "DE.Views.DocumentHolder.deleteText": "Удалить",
-  "DE.Views.DocumentHolder.direct270Text": "Поворот на 270°",
+  "DE.Views.DocumentHolder.direct270Text": "Повернуть текст вверх",
-  "DE.Views.DocumentHolder.direct90Text": "Поворот на 90°",
+  "DE.Views.DocumentHolder.direct90Text": "Повернуть текст вниз",
   "DE.Views.DocumentHolder.directHText": "Горизонтальное",
   "DE.Views.DocumentHolder.directionText": "Направление текста",
   "DE.Views.DocumentHolder.editChartText": "Изменить данные",
@@ -750,9 +774,9 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Выровнять по середине",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Выровнять по правому краю",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Выровнять по верхнему краю",
+  "DE.Views.DocumentHolder.textUndo": "Отменить",
   "DE.Views.DocumentHolder.textWrap": "Стиль обтекания",
   "DE.Views.DocumentHolder.tipIsLocked": "Этот элемент редактируется другим пользователем.",
-  "DE.Views.DocumentHolder.topCellText": "По верхнему краю",
   "DE.Views.DocumentHolder.txtAddBottom": "Добавить нижнюю границу",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Добавить дробную черту",
   "DE.Views.DocumentHolder.txtAddHor": "Добавить горизонтальную линию",
@@ -803,6 +827,7 @@
   "DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
   "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после",
   "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед",
+  "DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
   "DE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов",
   "DE.Views.DocumentHolder.txtLimitOver": "Предел над текстом",
   "DE.Views.DocumentHolder.txtLimitUnder": "Предел под текстом",
@@ -928,6 +953,7 @@
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте",
+  "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Включить проверку орфографии",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Строгий",
@@ -1287,9 +1313,6 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "Сверху и снизу",
   "DE.Views.ShapeSettings.txtWood": "Дерево",
   "DE.Views.Statusbar.goToPageText": "Перейти на страницу",
-  "DE.Views.Statusbar.LanguageDialog.btnCancel": "Отмена",
-  "DE.Views.Statusbar.LanguageDialog.btnOk": "ОК",
-  "DE.Views.Statusbar.LanguageDialog.labelSelect": "Выбрать язык документа",
   "DE.Views.Statusbar.pageIndexText": "Страница {0} из {1}",
   "DE.Views.Statusbar.textChangesPanel": "Панель изменений",
   "DE.Views.Statusbar.textTrackChanges": "Отслеживание изменений",
@@ -1475,6 +1498,7 @@
   "DE.Views.Toolbar.textBottom": "Нижнее: ",
   "DE.Views.Toolbar.textCharts": "Диаграммы",
   "DE.Views.Toolbar.textColumn": "Гистограмма",
+  "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
   "DE.Views.Toolbar.textColumnsLeft": "Слева",
   "DE.Views.Toolbar.textColumnsOne": "Одна",
   "DE.Views.Toolbar.textColumnsRight": "Справа",
@@ -1528,6 +1552,7 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента",
   "DE.Views.Toolbar.textSubscript": "Подстрочные знаки",
   "DE.Views.Toolbar.textSuperscript": "Надстрочные знаки",
+  "DE.Views.Toolbar.textSurface": "Поверхность",
   "DE.Views.Toolbar.textTitleError": "Ошибка",
   "DE.Views.Toolbar.textToCurrent": "В текущей позиции",
   "DE.Views.Toolbar.textTop": "Верхнее: ",

apps/documenteditor/main/resources/help/en/Contents.json

@@ -23,7 +23,8 @@
 	{"src": "UsageInstructions/AddHyperlinks.htm", "name": "Add hyperlinks"},
 	{"src": "UsageInstructions/InsertDropCap.htm", "name": "Insert a drop cap"},
 	{"src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Insert headers and footers"},
-    {"src":"UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
+    { "src": "UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers" },
+    {"src": "UsageInstructions/InsertFootnotes.htm", "name": "Insert footnotes" },
     {"src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations" },
     {"src": "UsageInstructions/InsertTextObjects.htm", "name": "Insert text objects" },
     {"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge"},

apps/documenteditor/main/resources/help/en/HelpfulHints/AdvancedSettings.htm

@@ -12,7 +12,7 @@
         <p><b>Document Editor</b> lets you change its advanced settings. To access them, click the <b>File</b> <img alt="File icon" src="../images/file.png" /> icon at the left sidebar and select the <b>Advanced Settings...</b> option. You can also use the <img alt="Advanced Settings icon" src="../images/advanced_settings_icon.png" /> icon in the right upper corner of the top toolbar.</p>
         <p>The advanced settings are:</p>
         <ul>
-            <li><b>Commenting Display</b><sup class="oOfficeFeatures">*</sup> is used to turn on/off the live commenting option. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
+            <li><b>Commenting Display</b> is used to turn on/off the live commenting option. If you disable this feature, the commented passages will be highlighted only if you click the <b>Comments</b> <img alt="Comments icon" src="../images/commentsicon.png" /> icon.</li>
             <li><b>Spell Checking</b> is used to turn on/off the spell checking option.</li>
             <li><b>Alternate Input</b> is used to turn on/off hieroglyphs.</li>
             <li><b>Alignment Guides</b> is used to turn on/off alignment guides that appear when you move objects and allow you to position them on the page precisely.</li>
@@ -43,7 +43,6 @@
             <li><b>Unit of Measurement</b> is used to specify what units are used on the rulers and in properties windows for measuring elements parameters such as width, height, spacing, margins etc. You can select the <b>Centimeter</b>, <b>Point</b>, or <b>Inch</b> option.</li>
         </ul>
         <p>To save the changes you made, click the <b>Apply</b> button.</p>
-        <p class="oOfficeFeatures"><sup>*</sup>available for paid versions only</p>
     </div>
 </body>
 </html>

apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm

@@ -26,7 +26,7 @@
         <p>When no users are viewing or editing the file, the icon in the status bar will look like <img alt="Manage document access rights icon" src="../images/access_rights.png" /> allowing you to manage the users who have access to the file right from the document: invite new users giving them either full or read-only access, or denying some users access rights to the file. Click this icon to manage the access to the file; this can be done both when there are no other users who view or co-edit the document at the moment and when there are other users and the icon looks like <img alt="Number of users icon" src="../images/usersnumber.png" />.</p>
         <p>As soon as one of the users saves his/her changes by clicking the <img alt="Save icon" src="../images/savewhilecoediting.png" /> icon, the others will see a note within the status bar stating that they have updates. To save the changes you made, so that other users can view them, and get the updates saved by your co-editors, click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar. The updates will be highlighted for you to check what exactly has been changed.</p>
         <p>You can specify what changes you want to be highlighted during co-editing if you click the <img alt="File icon" src="../images/file.png" /> icon at the left sidebar, select the <b>Advanced Settings...</b> option and choose between <b>none</b>, <b>all</b> and <b>last</b> realtime collaboration changes. Selecting <b>View all</b> changes, all the changes made during the current session will be highlighted. Selecting <b>View last</b> changes, only the changes made since you last time clicked the <img alt="Save icon" src="../images/saveupdate.png" /> icon will be highlighted. Selecting <b>View None</b> changes, changes made during the current session will not be highlighted.</p>
-        <h3>Chat<a class="sup_link" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
+        <h3>Chat</h3>
         <p>You can use this tool to coordinate the co-editing process on-the-fly, for example, to arrange with your collaborators about who is doing what, which paragraph you are going to edit now etc.</p>
         <p>The chat messages are stored during one session only. To discuss the document content it is better to use comments which are stored until you decide to delete them.</p>
         <p>To access the chat and leave a message for other users,</p>
@@ -38,7 +38,7 @@
         <p>All the messages left by users will be displayed on the panel on the left. If there are new messages you haven't read yet, the chat icon will look like this - <img alt="Chat icon" src="../images/chaticon_new.png" />.</p>
         <p>To close the panel with chat messages, click the <img alt="Chat icon" src="../images/chaticon.png" /> icon once again.</p>
         </div>
-                <h3>Comments<a class="sup_link oOfficeFeatures" href="../HelpfulHints/CollaborativeEditing.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></h3>
+                <h3>Comments</h3>
         <p>To leave a comment,</p>
         <ol>
             <li>select a text passage where you think there is an error or problem,</li>
@@ -59,7 +59,6 @@
         </ul>
         <p>New comments added by other users will become visible only after you click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar.</p>
         <p>To close the panel with comments, click the <img alt="Comments icon" src="../images/commentsicon.png" /> icon once again.</p>
-        <p class="oOfficeFeatures"><sup id="footnote">*</sup>available for paid versions only</p>
     </div>
 </body>
 </html>

apps/documenteditor/main/resources/help/en/HelpfulHints/KeyboardShortcuts.htm

@@ -25,17 +25,17 @@
 					<td>Open the <b>Search</b> panel to start searching for a character/word/phrase in the currently edited document.</td>
 				</tr>
 				<tr>
-					<td>Open 'Comments' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open 'Comments' panel</td>
 					<td>Ctrl+Shift+H</td>
 					<td>Open the <b>Comments</b> panel to add your own comment or reply to other users' comments.</td>
 				</tr>
 				<tr>
-					<td>Open comment field<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open comment field</td>
 					<td>Alt+H</td>
 					<td>Open a data entry field where you can add the text of your comment.</td>
 				</tr>
 				<tr class="onlineDocumentFeatures">
-					<td>Open 'Chat' panel<a class="sup_link oOfficeFeatures" href="../HelpfulHints/KeyboardShortcuts.htm#footnote" onclick="onhyperlinkclick(this)"><sup>*</sup></a></td>
+					<td>Open 'Chat' panel</td>
 					<td>Alt+Q</td>
 					<td>Open the <b>Chat</b> panel and send a message.</td>
 				</tr>
@@ -347,7 +347,6 @@
 					<td>Hold down the Ctrl key and use the keybord arrows to move the selected object by three pixels at a time.</td>
 				</tr>
 			</table>
-            <p class="oOfficeFeatures"><sup id="footnote">*</sup> - available for paid versions only</p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertAutoshapes.htm

@@ -183,6 +183,8 @@
             <p><img alt="Shape - Advanced Settings" src="../images/shape_properties_4.png" /></p>
 			<p>The <b>Text Padding</b> tab allows to change the autoshape <b>Top</b>, <b>Bottom</b>, <b>Left</b> and <b>Right</b> internal margins (i.e. the distance between the text within the shape and the autoshape borders).</p>
             <p class="note"><b>Note</b>: this tab is only available if text is added within the autoshape, otherwise the tab is disabled.</p>
+            <p><img alt="Shape - Advanced Settings" src="../images/shape_properties_5.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the shape.</p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertCharts.htm

@@ -158,6 +158,8 @@
                         </ul>
                         </li>
                     </ul>
+                    <p><img alt="Chart - Advanced Settings" src="../images/chartsettings5.png" /></p>
+                    <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
                     </li>
 			</ol>
 			<hr />
@@ -242,6 +244,8 @@
 				<li><b>Move object with text</b> controls whether the chart moves as the text to which it is anchored moves.</li>
 				<li><b>Allow overlap</b> controls whether two charts overlap or not if you drag them near each other on the page.</li>
 			</ul>
+            <p><img alt="Chart - Advanced Settings" src="../images/chart_properties_3.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the chart.</p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertFootnotes.htm

@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Insert footnotes</title>
+		<meta charset="utf-8" />
+        <meta name="description" content="Insert footnotes to provide explanations for some terms or make references to the sources" />
+		<link type="text/css" rel="stylesheet" href="../editor.css" />
+        <script type="text/javascript" src="../callback.js"></script>
+	</head>
+	<body>
+		<div class="mainpart">
+			<h1>Insert footnotes</h1>
+            <p>You can add footnotes to provide explanations or comments for certain sentences or terms used in your text, make references to the sources etc.</p>
+			<p>To insert a footnote into your document,</p>
+			<ol>
+                <li>position the insertion point at the end of the text passage that you want to add a footnote to,</li>
+				<li>click the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/addfootnote.png" /> icon at the top toolbar, or<br/>
+                click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon and select the <b>Insert Footnote</b> option from the menu,
+                <p>The footnote mark (i.e. the superscript character that indicates a footnote) appears in the document text and the insertion point moves to the bottom of the current page.</p>
+                </li>
+				<li>type in the footnote text.</li>
+			</ol>
+            <p>Repeat the above mentioned operations to add subsequent footnotes for other text passages in the document. The footnotes are numbered automatically.</p>
+            <p><img alt="Footnotes" src="../images/footnotesadded.png" /></p>
+            <p>If you hover the mouse pointer over the footnote mark in the document text, a small pop-up window with the footnote text appears.</p>
+            <p><img alt="Footnote text" src="../images/footnotetext.png" /></p>
+            <p>To easily navigate between the added footnotes within the document text,</p>
+            <ol>
+                <li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon,</li>
+                <li>in the <b>Go to Footnotes</b> section, use the <img alt="Previous footnote icon" src="../images/previousfootnote.png" /> arrow to go to the previous footnote or the <img alt="Next footnote icon" src="../images/nextfootnote.png" /> arrow to go to the next footnote.</li>
+            </ol>
+            <hr />
+			<p>To edit the footnotes settings,</p>
+			<ol>
+				<li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
+                <li>select the <b>Notes Settings</b> option from the menu,</li>
+				<li>change the current parameters in the <b>Notes Settings</b> window that opens: 
+				<p><img alt="Footnotes Settings window" src="../images/footnotes_settings.png" /></p>
+				<ul>
+				<li>Set the <b>Location</b> of footnotes on the page selecting one of the available options: 
+                    <ul>
+                        <li><b>Bottom of page</b> - to position footnotes at the bottom of the page (this option is selected by default).</li>
+                        <li><b>Below text</b> - to position footnotes closer to the text. This option can be useful in cases when the page contains a short text.</li>
+                    </ul>
+                </li>
+                <li>Adjust the footnotes <b>Format</b>:
+                    <ul>
+                        <li><b>Number Format</b> - select the necessary number format from the available ones: <em>1, 2, 3,...</em>, <em>a, b, c,...</em>, <em>A, B, C,...</em>, <em>i, ii, iii,...</em>, <em>I, II, III,...</em>.</li>
+                        <li><b>Start at</b> - use the arrows to set the number or letter you want to start numbering with.</li>
+                        <li><b>Numbering</b> - select a way to number your footnotes:
+                        <ul>
+                            <li><b>Continuous</b> - to number footnotes sequentially throughout the document,</li>
+                            <li><b>Restart each section</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each section,</li>
+                            <li><b>Restart each page</b> - to start footnote numbering with the number 1 (or some other specified character) at the beginning of each page.</li>
+                        </ul>
+                        </li>
+                        <li><b>Custom Mark</b> - set a special character or a word you want to use as the footnote mark (e.g. * or Note1). Enter the necessary character/word into the text entry field and click the <b>Insert</b> button at the bottom of the <b>Notes Settings</b> window.</li>
+                    </ul>
+                </li>
+                <li>Use the <b>Apply changes to</b> drop-down list to select if you want to apply the specified notes settings to the <b>Whole document</b> or the <b>Current section</b> only.
+                <p class="note"><b>Note</b>: to use different footnotes formatting in separate parts of the document, you need to add <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">section breaks</a> first.</p>
+                </li>
+				</ul>
+				</li>
+                <li>When ready, click the <b>Apply</b> button.</li>
+			</ol>
+            
+            <hr />
+            <p>To remove a single footnote, position the insertion point directly before the footnote mark in the document text and press <b>Delete</b>. Other footnotes will be renumbered automatically.</p>
+            <p>To delete all the footnotes in the document,</p>
+            <ol>
+                <li>click the arrow next to the <b>Footnotes</b> <img alt="Footnotes icon" src="../images/footnotes.png" /> icon at the top toolbar,</li>
+                <li>select the <b>Delete All Footnotes</b> option from the menu.</li>
+            </ol>
+		</div>
+	</body>
+</html>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertImages.htm

@@ -46,7 +46,7 @@
 				<li><b>Image Advanced Settings</b> is used to open the 'Image - Advanced Settings' window.</li>
 			</ul>
 			<hr />
-			<p>To change its advanced settings, click the image with the right mouse button and select <b>Advanced Settings</b> from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
+			<p>To change its advanced settings, click the image with the right mouse button and select the <b>Image Advanced Settings</b> option from the right-click menu or just click the <b>Show advanced settings</b> link at the right sidebar. The image properties window will open:</p>
 			<p><img alt="Image - Advanced Settings: Size" src="../images/image_properties.png" /></p>
 			<p>The <b>Size</b> tab contains the following parameters:</p>
 			<ul>
@@ -92,6 +92,8 @@
                 <li><b>Move object with text</b> controls whether the image moves as the text to which it is anchored moves.</li>
 				<li><b>Allow overlap</b> controls whether two images overlap or not if you drag them near each other on the page.</li>
 			</ul>
+            <p><img alt="Image - Advanced Settings" src="../images/image_properties_3.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image.</p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertPageNumbers.htm

@@ -37,7 +37,7 @@
 				<li>Set the <b>Position</b> of page numbers on the page as well as relative to the top and bottom of the page.</li>
 				<li>Check the <b>Different first page</b> box to apply a different page number to the very first page or in case you don't want to add any number to it at all. </li>
 				<li>Use the <b>Different odd and even pages</b> box to insert different page numbers for odd and even pages. </li>
-				<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document, for example, to start each section numbering at 1. The <b>Same as Previous</b> label will no longer be displayed.</li>
+				<li>The <b>Link to Previous</b> option is available in case you've previously added <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">sections</a> into your document. If not, it will be grayed out. Moreover, this option is also unavailable for the very first section (i.e. when a header or footer that belongs to the first section is selected). By default, this box is checked, so that unified numbering is applied to all the sections. If you select a header or footer area, you will see that the area is marked with the <b>Same as Previous</b> label. Uncheck the <b>Link to Previous</b> box to use different page numbering for each section of the document. The <b>Same as Previous</b> label will no longer be displayed.</li>
 				</ul>
 				<p><img alt="Same as previous label" src="../images/sameasprevious_label.png" /></p>
 				</li>

apps/documenteditor/main/resources/help/en/UsageInstructions/InsertTables.htm

@@ -64,7 +64,7 @@
 				</li>
 				<li><p><b>Select from Template</b> is used to choose a table template from the available ones.</p></li>
 				<li><p><b>Borders Style</b> is used to select the border size, color, style as well as background color.</p></li>
-				<li><p><b>Text Wrapping</b> is used to select between two text wrapping styles - inline and flow.</p></li>
+				<li><p><b>Wrapping Style</b> is used to select between two text wrapping styles - inline and flow.</p></li>
 				<li><p><b>Rows &amp; Columns</b> is used to perform some operations with the table: select, delete, insert rows and columns, merge cells, split a cell.</p></li>
 				<li><p><b>Repeat as header row at the top of each page</b> is used to insert the same header row at the top of each page in long tables.</p></li>
 				<li><p><b>Show advanced settings</b> is used to open the 'Table - Advanced Settings' window.</p></li>
@@ -149,7 +149,9 @@
                     </ul>
                 </li>
             </ul>
-            
+            <p><img alt="Table - Advanced Settings" src="../images/table_properties_6.png" /></p>
+            <p>The <b>Alternative Text</b> tab allows to specify a <b>Title</b> and <b>Description</b> which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the table.</p>
+                        
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/en/UsageInstructions/ParagraphIndents.htm

@@ -25,7 +25,8 @@
 			<p>Select the necessary paragraph(s) and drag the indent markers along the ruler.</p>
 			<ul>
 			<li><b>First Line Indent</b> marker <img alt="First Line Indent marker" src="../images/firstline_indent.png" /> is used to set the offset from the left side of the page for the first line of the paragraph.</li>
-			<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second and all the subsequent lines of the paragraph.</li>
+			<li><b>Hanging Indent</b> marker <img alt="Hanging Indent marker" src="../images/hanging.png" /> is used to set the offset from the left side of the page for the second line and all the subsequent lines of the paragraph.</li>
+            <li><b>Left Indent</b> marker <img alt="Left Indent marker" src="../images/leftindent.png" /> is used to set the entire paragraph offset from the left side of the page.</li>
 			<li><b>Right Indent</b> marker <img alt="Right Indent marker" src="../images/right_indent.png" /> is used to set the paragraph offset from the right side of the page.</li>
 			</ul>
 		</div>

apps/documenteditor/main/resources/help/en/UsageInstructions/SectionBreaks.htm

@@ -10,7 +10,7 @@
 	<body>
 		<div class="mainpart">
 			<h1>Insert section breaks</h1>
-			<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
+			<p>Section breaks allow you to apply a different layout or formatting for the certain parts of your document. For example, you can use individual <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a>, <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbering</a>, <a href="../UsageInstructions/InsertFootnotes.htm" onclick="onhyperlinkclick(this)">footnotes format</a>, <a href="../UsageInstructions/SetPageParameters.htm" onclick="onhyperlinkclick(this)">margins, size, orientation, or column number</a> for each separate section.</p>
 			<p class="note"><b>Note</b>: an inserted section break defines formatting of the preceding part of the document.</p>
 			<p>To insert a section break at the current cursor position:</p>
 			<ol>