Merge branch 'develop' into feature/alt-keys

apps/common/IrregularStack.js

@@ -69,7 +69,7 @@ Common.IrregularStack = function(config) {
     }
 
     var _get = function(obj) {
-        var index = _indexOf(obj, _weakCompare);
+        var index = (typeof obj === 'object')? _indexOf(obj, _weakCompare) : obj;
         if (index != -1) 
             return _stack[index];
         return undefined;
@@ -79,10 +79,15 @@ Common.IrregularStack = function(config) {
         return !(_indexOf(obj, _strongCompare) < 0);
     }
 
+    var _length = function() {
+        return _stack.length;
+    }
+
     return {
         push: _push,
         pop: _pop,
         get: _get,
-        exist: _exist
+        exist: _exist,
+        length: _length
     }
 };

apps/common/locale.js

@@ -39,7 +39,8 @@ Common.Locale = new(function() {
     var l10n = null;
     var loadcallback,
         apply = false,
-        currentLang = 'en';
+        defLang = '{{DEFAULT_LANG}}',
+        currentLang = defLang;
 
     var _applyLocalization = function(callback) {
         try {
@@ -83,7 +84,11 @@ Common.Locale = new(function() {
     };
 
     var _getCurrentLanguage = function() {
-        return (currentLang || 'en');
+        return currentLang;
+    };
+
+    var _getLoadedLanguage = function() {
+        return loadedLang;
     };
 
     var _getUrlParameterByName = function(name) {
@@ -94,23 +99,26 @@ Common.Locale = new(function() {
     };
 
     var _requireLang = function () {
-        var lang = (_getUrlParameterByName('lang') || 'en').split(/[\-_]/)[0];
+        var lang = (_getUrlParameterByName('lang') || defLang).split(/[\-_]/)[0];
         currentLang = lang;
         fetch('locale/' + lang + '.json')
             .then(function(response) {
                 if (!response.ok) {
-                    currentLang = 'en';
-                    if (lang != 'en')
+                    currentLang = defLang;
+                    if (lang != defLang)
                         /* load default lang if fetch failed */
-                        return fetch('locale/en.json');
+                        return fetch('locale/' + defLang + '.json');
 
                     throw new Error('server error');
                 }
                 return response.json();
             }).then(function(response) {
-                if ( response.then )
+                if ( response.json ) {
+                    if (!response.ok)
+                        throw new Error('server error');
+
                     return response.json();
-                else {
+                } else {
                     l10n = response;
                     /* to break promises chain */
                     throw new Error('loaded');
@@ -122,8 +130,10 @@ Common.Locale = new(function() {
                 l10n = l10n || {};
                 apply && _applyLocalization();
                 if ( e.message == 'loaded' ) {
-                } else
+                } else {
+                    currentLang = null;
                     console.log('fetch error: ' + e);
+                }
             });
     };
 

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

@@ -39,7 +39,191 @@ define([
 ], function () {
     'use strict';
 
-    Common.UI.ColorButton = Common.UI.Button.extend(_.extend({
+  Common.UI.ButtonColored = Common.UI.Button.extend(_.extend({
+        render: function(parentEl) {
+            Common.UI.Button.prototype.render.call(this, parentEl);
+
+            $('button:first-child', this.cmpEl).append( $('<div class="btn-color-value-line"></div>'));
+            this.colorEl = this.cmpEl.find('.btn-color-value-line');
+
+            if (this.options.auto)
+                this.autocolor = (typeof this.options.auto == 'object') ? this.options.auto.color || '000000' : '000000';
+
+            if (this.options.color!==undefined)
+                this.setColor(this.options.color);
+        },
+
+        getPicker: function(color, colors) {
+            if (!this.colorPicker) {
+                this.colorPicker = new Common.UI.ThemeColorPalette({
+                    el: this.cmpEl.find('#' + this.menu.id + '-color-menu'),
+                    transparent: this.options.transparent,
+                    value: color,
+                    colors: colors,
+                    parentButton: this
+                });
+                this.colorPicker.on('select', _.bind(this.onColorSelect, this));
+                this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this));
+                if (this.options.auto) {
+                    this.cmpEl.find('#' + this.menu.id + '-color-auto').on('click', _.bind(this.onAutoColorSelect, this));
+                    this.colorAuto = this.cmpEl.find('#' + this.menu.id + '-color-auto > a');
+                    (color == 'auto') && this.setAutoColor(true);
+                }
+            }
+            return this.colorPicker;
+        },
+
+        setPicker: function(picker) {
+            this.colorPicker = picker;
+        },
+
+        getMenu: function(options) {
+            if (typeof this.menu !== 'object') {
+                options = options || this.options;
+                var height = options.paletteHeight || 240,
+                    id = Common.UI.getId(),
+                    auto = [];
+                if (options.auto) {
+                    this.autocolor = (typeof options.auto == 'object') ? options.auto.color || '000000' : '000000';
+                    auto.push({
+                        id: id + '-color-auto',
+                        caption: (typeof options.auto == 'object') ? options.auto.caption || this.textAutoColor : this.textAutoColor,
+                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #' + this.autocolor + ';"></span><%= caption %></a>')
+                    });
+                    auto.push({caption: '--'});
+                }
+
+                var menu = new Common.UI.Menu({
+                    id: id,
+                    cls: 'shifted-left',
+                    additionalAlign: options.additionalAlign,
+                    items: (options.additionalItems ? options.additionalItems : []).concat(auto).concat([
+                        { template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height:' + height + 'px; margin: 10px;"></div>') },
+                        {
+                            id: id + '-color-new',
+                            template: _.template('<a tabindex="-1" type="menuitem" style="">' + this.textNewColor + '</a>')
+                        }
+                    ])
+                });
+                this.colorPicker && (this.colorPicker.parentButton = menu);
+                var me = this;
+                menu.on('keydown:before', _.bind(this.onBeforeKeyDown, this));
+                menu.on('show:after', function(menu) {
+                    me.colorPicker && _.delay(function() {
+                        me.colorPicker.showLastSelected();
+                        !(options.additionalItems || options.auto) && me.colorPicker.focus();
+                    }, 10);
+                }).on('hide:after', function() {
+                    if (me.options.takeFocusOnClose) {
+                        setTimeout(function(){me.focus();}, 1);
+                    }
+                });
+                return menu;
+            }
+            return this.menu;
+        },
+
+        setMenu: function (m) {
+            m = m || this.getMenu();
+            Common.UI.Button.prototype.setMenu.call(this, m);
+            this.getPicker(this.options.color, this.options.colors);
+        },
+
+        onColorSelect: function(picker, color) {
+            this.setColor(color);
+            this.setAutoColor(false);
+            this.trigger('color:select', this, color);
+        },
+
+        setColor: function(color) {
+            if (color == 'auto' && this.options.auto)
+                color = this.autocolor;
+            this.color = color;
+
+            if (this.colorEl) {
+                this.colorEl.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
+                this.colorEl.toggleClass('bordered', color=='transparent');
+            }
+        },
+
+        setAutoColor: function(selected) {
+            if (!this.colorAuto) return;
+            if (selected && !this.colorAuto.hasClass('selected'))
+                this.colorAuto.addClass('selected');
+            else if (!selected && this.colorAuto.hasClass('selected'))
+                this.colorAuto.removeClass('selected');
+        },
+
+        isAutoColor: function() {
+            return this.colorAuto && this.colorAuto.hasClass('selected');
+        },
+
+        onAutoColorSelect: function() {
+            this.setColor('auto');
+            this.setAutoColor(true);
+            this.colorPicker && this.colorPicker.clearSelection();
+            this.trigger('auto:select', this, this.autocolor);
+        },
+
+        addNewColor: function() {
+            this.colorPicker && this.colorPicker.addNewColor((typeof(this.color) == 'object') ? this.color.color : this.color);
+        },
+
+        onBeforeKeyDown: function(menu, e) {
+            if ((e.keyCode == Common.UI.Keys.DOWN || e.keyCode == Common.UI.Keys.SPACE) && !this.isMenuOpen()) {
+                $('button', this.cmpEl).click();
+                return false;
+            }
+            if (e.keyCode == Common.UI.Keys.RETURN) {
+                var li = $(e.target).closest('li');
+                if (li.length>0) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    li.click();
+                }
+                Common.UI.Menu.Manager.hideAll();
+            } else if (e.namespace!=="after.bs.dropdown" && (e.keyCode == Common.UI.Keys.DOWN || e.keyCode == Common.UI.Keys.UP)) {
+                var $items = $('> [role=menu] > li:not(.divider):not(.disabled):visible', menu.$el).find('> a');
+                if (!$items.length) return;
+                var index = $items.index($items.filter(':focus')),
+                    me = this,
+                    pickerIndex = $items.length-1 ;
+                if (e.keyCode == Common.UI.Keys.DOWN && (index==pickerIndex-1 || pickerIndex==0) || e.keyCode == Common.UI.Keys.UP && index==pickerIndex) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    _.delay(function() {
+                        me.focusInner(e);
+                    }, 10);
+                }
+            }
+        },
+
+        isMenuOpen: function() {
+            return this.cmpEl.hasClass('open');
+        },
+
+        focusInner: function(e) {
+            if (!this.colorPicker) return;
+
+            this.colorPicker.focus(e.keyCode == Common.UI.Keys.DOWN ? 'first' : 'last');
+        },
+
+        focusOuter: function(e) {
+            if (!this.menu) return;
+
+            var $items = $('> [role=menu] > li:not(.divider):not(.disabled):visible', this.menu.$el).find('> a');
+            if (!$items.length) return;
+
+            $items.eq(e.keyCode == Common.UI.Keys.UP ? $items.length-2 : $items.length-1).focus();
+        },
+
+        textNewColor: 'Add New Custom Color',
+        textAutoColor: 'Automatic'
+
+    }, Common.UI.ButtonColored || {}));
+
+
+    Common.UI.ColorButton = Common.UI.ButtonColored.extend(_.extend({
         options : {
             id              : null,
             hint            : false,
@@ -90,12 +274,6 @@ define([
                 this.setColor(this.options.color);
         },
 
-        onColorSelect: function(picker, color) {
-            this.setColor(color);
-            this.setAutoColor(false);
-            this.trigger('color:select', this, color);
-        },
-
         setColor: function(color) {
             if (color == 'auto' && this.options.auto)
                 color = this.autocolor;
@@ -106,105 +284,9 @@ define([
             span.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
         },
 
-        getPicker: function(color, colors) {
-            if (!this.colorPicker) {
-                this.colorPicker = new Common.UI.ThemeColorPalette({
-                    el: this.cmpEl.find('#' + this.menu.id + '-color-menu'),
-                    transparent: this.options.transparent,
-                    value: color,
-                    colors: colors
-                });
-                this.colorPicker.on('select', _.bind(this.onColorSelect, this));
-                this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this));
-                if (this.options.auto) {
-                    this.cmpEl.find('#' + this.menu.id + '-color-auto').on('click', _.bind(this.onAutoColorSelect, this));
-                    this.colorAuto = this.cmpEl.find('#' + this.menu.id + '-color-auto > a');
-                    (color == 'auto') && this.setAutoColor(true);
-                }
-            }
-            return this.colorPicker;
-        },
-
-        getMenu: function(options) {
-            if (typeof this.menu !== 'object') {
-                options = options || this.options;
-                var height = options.paletteHeight || 216,
-                    id = Common.UI.getId(),
-                    auto = [];
-                if (options.auto) {
-                    this.autocolor = (typeof options.auto == 'object') ? options.auto.color || '000000' : '000000';
-                    auto.push({
-                        id: id + '-color-auto',
-                        caption: (typeof options.auto == 'object') ? options.auto.caption || this.textAutoColor : this.textAutoColor,
-                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #' + this.autocolor + ';"></span><%= caption %></a>')
-                    });
-                    auto.push({caption: '--'});
-                }
-
-                var menu = new Common.UI.Menu({
-                    id: id,
-                    cls: 'shifted-left',
-                    additionalAlign: options.additionalAlign,
-                    items: (options.additionalItems ? options.additionalItems : []).concat(auto).concat([
-                        { template: _.template('<div id="' + id + '-color-menu" style="width: 169px; height:' + height + 'px; margin: 10px;"></div>') },
-                        { template: _.template('<a id="' + id + '-color-new" style="">' + this.textNewColor + '</a>') }
-                    ])
-                });
-                return menu;
-            }
-            return this.menu;
-        },
-
-        setMenu: function (m) {
-            m = m || this.getMenu();
-            Common.UI.Button.prototype.setMenu.call(this, m);
-            this.getPicker(this.options.color, this.options.colors);
-        },
-
-        addNewColor: function() {
-            this.colorPicker && this.colorPicker.addNewColor((typeof(this.color) == 'object') ? this.color.color : this.color);
-        },
-
-        onAutoColorSelect: function() {
-            this.setColor('auto');
-            this.setAutoColor(true);
-            this.colorPicker && this.colorPicker.clearSelection();
-            this.trigger('auto:select', this, this.autocolor);
-        },
-
-        setAutoColor: function(selected) {
-            if (!this.colorAuto) return;
-            if (selected && !this.colorAuto.hasClass('selected'))
-                this.colorAuto.addClass('selected');
-            else if (!selected && this.colorAuto.hasClass('selected'))
-                this.colorAuto.removeClass('selected');
-        },
-
-        isAutoColor: function() {
-            return this.colorAuto && this.colorAuto.hasClass('selected');
-        },
-
-        textNewColor: 'Add New Custom Color',
-        textAutoColor: 'Automatic'
-
-    }, Common.UI.ColorButton || {}));
-
-
-    Common.UI.ButtonColored = Common.UI.Button.extend(_.extend({
-        render: function(parentEl) {
-            Common.UI.Button.prototype.render.call(this, parentEl);
-
-            $('button:first-child', this.cmpEl).append( $('<div class="btn-color-value-line"></div>'));
-            this.colorEl = this.cmpEl.find('.btn-color-value-line');
-        },
-
-        setColor: function(color) {
-            if (this.colorEl) {
-                this.colorEl.css({'background-color': (color=='transparent') ? color : ((typeof(color) == 'object') ? '#'+color.color : '#'+color)});
-                this.colorEl.toggleClass('bordered', color=='transparent');
-            }
+        focus: function() {
+            $('button', this.cmpEl).focus();
         }
 
-    }, Common.UI.ButtonColored || {}));
-
+    }, Common.UI.ColorButton || {}));
 });

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

@@ -122,6 +122,7 @@ define([
 
         render : function(parentEl) {
             Common.UI.ComboBox.prototype.render.call(this, parentEl);
+            this._formControl  = this.cmpEl.find('.form-control');
             return this;
         },
 
@@ -172,6 +173,10 @@ define([
             }
         },
 
+        focus: function() {
+            this._formControl && this._formControl.focus();
+        },
+
         txtNoBorders: 'No Borders'
     }, Common.UI.ComboBorderSize || {}));
 

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

@@ -128,6 +128,9 @@ define([
                         bottom = Common.Utils.innerHeight() - showxy.top - this.target.height()/2;
                     } else if (pos == 'bottom') {
                         top = showxy.top + this.target.height()/2;
+                        var height = this.cmpEl.height();
+                        if (top+height>Common.Utils.innerHeight())
+                            top = Common.Utils.innerHeight() - height - 10;
                     } else if (pos == 'left') {
                         right = Common.Utils.innerWidth() - showxy.left - this.target.width()/2;
                     } else if (pos == 'right') {

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

@@ -55,26 +55,28 @@ define([
             effects: 5,
             allowReselect: true,
             transparent: false,
-            value: '000000'
+            value: '000000',
+            enableKeyEvents: true,
+            keyMoveDirection: 'both' // 'vertical', 'horizontal'
         },
 
         template    :
             _.template(
                 '<div style="padding: 8px 12px 12px;">' +
-                '<% var me = this; %>' +
+                '<% var me = this; var idx = 0; %>' +
                 '<% $(colors).each(function(num, item) { %>' +
                     '<% if (me.isBlankSeparator(item)) { %> <div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +
                     '<% } else if (me.isSeparator(item)) { %> </div><div class="divider" style="width:100%;float:left;"></div><div style="padding: 12px;">' +
                     '<% } else if (me.isColor(item)) { %> ' +
-                        '<a class="palette-color color-<%=item%>" style="background:#<%=item%>" hidefocus="on">' +
+                        '<a class="palette-color color-<%=item%>" style="background:#<%=item%>" idx="<%=idx++%>">' +
                         '<em><span style="background:#<%=item%>;" unselectable="on">&#160;</span></em>' +
                         '</a>' +
                     '<% } else if (me.isTransparent(item)) { %>' +
-                        '<a class="color-<%=item%>" hidefocus="on">' +
+                        '<a class="color-<%=item%>" idx="<%=idx++%>">' +
                         '<em><span unselectable="on">&#160;</span></em>' +
                         '</a>' +
                     '<% } else if (me.isEffect(item)) { %>' +
-                        '<a effectid="<%=item.effectId%>" effectvalue="<%=item.effectValue%>" class="palette-color-effect color-<%=item.color%>" style="background:#<%=item.color%>" hidefocus="on">' +
+                        '<a effectid="<%=item.effectId%>" effectvalue="<%=item.effectValue%>" class="palette-color-effect color-<%=item.color%>" style="background:#<%=item.color%>" idx="<%=idx++%>">' +
                         '<em><span style="background:#<%=item.color%>;" unselectable="on">&#160;</span></em>' +
                         '</a>' +
                     '<% } else if (me.isCaption(item)) { %>' +
@@ -85,7 +87,7 @@ define([
                 '<% if (me.options.dynamiccolors!==undefined) { %>' +
                 '<div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div><div style="padding: 12px;">' +
                     '<% for (var i=0; i<me.options.dynamiccolors; i++) { %>' +
-                        '<a class="color-dynamic-<%=i%> dynamic-empty-color" style="background:#ffffff" color="" hidefocus="on">' +
+                        '<a class="color-dynamic-<%=i%> dynamic-empty-color" style="background:#ffffff" color="" idx="<%=idx++%>">' +
                         '<em><span unselectable="on">&#160;</span></em></a>' +
                     '<% } %>' +
                 '<% } %>' +
@@ -101,6 +103,18 @@ define([
                 el = me.$el || $(this.el);
 
             this.colors = me.options.colors || this.generateColorData(me.options.themecolors, me.options.effects, me.options.standardcolors, me.options.transparent);
+            this.enableKeyEvents= me.options.enableKeyEvents;
+            this.tabindex = me.options.tabindex || 0;
+            this.parentButton     = me.options.parentButton;
+            this.lastSelectedIdx = -1;
+
+            me.colorItems = [];
+            if (me.options.keyMoveDirection=='vertical')
+                me.moveKeys = [Common.UI.Keys.UP, Common.UI.Keys.DOWN];
+            else if (me.options.keyMoveDirection=='horizontal')
+                me.moveKeys = [Common.UI.Keys.LEFT, Common.UI.Keys.RIGHT];
+            else
+                me.moveKeys = [Common.UI.Keys.UP, Common.UI.Keys.DOWN, Common.UI.Keys.LEFT, Common.UI.Keys.RIGHT];
 
             el.addClass('theme-colorpalette');
             this.render();
@@ -117,6 +131,12 @@ define([
 
         render: function () {
             this.$el.html(this.template({colors: this.colors}));
+
+            var me = this;
+            this.moveKeys && this.$el.find('a').each(function(num, item) {
+                me.colorItems.push({el: item, index: num});
+            });
+            this.attachKeyEvents();
             return this;
         },
 
@@ -146,7 +166,7 @@ define([
         updateCustomColors: function() {
             var el = this.$el || $(this.el);
             if (el) {
-                var selected = el.find('a.' + this.selectedCls),
+                var selected = (this.lastSelectedIdx>=0) ? $(this.colorItems[this.lastSelectedIdx].el) : el.find('a.' + this.selectedCls),
                     color = (selected.length>0 && /color-dynamic/.test(selected[0].className)) ? selected.attr('color') : undefined;
                 if (color) { // custom color was selected
                     color = color.toUpperCase();
@@ -165,6 +185,7 @@ define([
                     });
                     if (colors[i] == color) {
                         colorEl.addClass(this.selectedCls);
+                        this.lastSelectedIdx = parseInt(colorEl.attr('idx'));
                         color = undefined; //select only first found color
                     }
                 }
@@ -179,42 +200,55 @@ define([
             if (target.length==0) return;
 
             if (target.hasClass('color-transparent') ) {
-                $(me.el).find('a.' + me.selectedCls).removeClass(me.selectedCls);
+                me.clearSelection(true);
                 target.addClass(me.selectedCls);
-                me.value = 'transparent';
-                me.trigger('select', me, 'transparent');
+                if (!e.suppressEvent) {
+                    me.lastSelectedIdx = parseInt(target.attr('idx'));
+                    me.value = 'transparent';
+                    me.trigger('select', me, 'transparent');
+                }
             } else if ( !(target[0].className.search('color-dynamic')<0) ) {
                 if (!/dynamic-empty-color/.test(target[0].className)) {
-                    $(me.el).find('a.' + me.selectedCls).removeClass(me.selectedCls);
+                    me.clearSelection(true);
                     target.addClass(me.selectedCls);
-                    color = target.attr('color');
-                    if (color)  me.trigger('select', me, color);
-
-                    me.value = color.toUpperCase();
+                    if (!e.suppressEvent)  {
+                        me.lastSelectedIdx = parseInt(target.attr('idx'));
+                        color = target.attr('color');
+                        me.trigger('select', me, color);
+                        me.value = color.toUpperCase();
+                    }
                 } else {
-                    setTimeout(function(){
-                        me.addNewColor();
-                    }, 10);
+                    if (e.suppressEvent) {
+                        me.clearSelection(true);
+                        target.addClass(me.selectedCls);
+                    } else
+                        setTimeout(function(){
+                            me.addNewColor();
+                        }, 10);
                 }
             } else {
                 if (!/^[a-fA-F0-9]{6}$/.test(me.value) || _.indexOf(me.colors, me.value)<0 )
                     me.value = false;
 
-                $(me.el).find('a.' + me.selectedCls).removeClass(me.selectedCls);
+                me.clearSelection(true);
                 target.addClass(me.selectedCls);
 
                 color = target[0].className.match(me.colorRe)[1];
                 if ( target.hasClass('palette-color-effect') ) {
                     var effectId = parseInt(target.attr('effectid'));
-                    if (color)  {
+                    if (color && !e.suppressEvent)  {
                         me.value = color.toUpperCase();
                         me.trigger('select', me, {color: color, effectId: effectId});
+                        me.lastSelectedIdx = parseInt(target.attr('idx'));
                     }
                 } else {
                     if (/#?[a-fA-F0-9]{6}/.test(color)) {
                         color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase();
-                        me.value = color;
-                        me.trigger('select', me, color);
+                        if (color && !e.suppressEvent)  {
+                            me.value = color;
+                            me.trigger('select', me, color);
+                            me.lastSelectedIdx = parseInt(target.attr('idx'));
+                        }
                     }
                 }
             }
@@ -225,8 +259,7 @@ define([
             color = /#?([a-fA-F0-9]{6})/.exec(color);
             if (color) {
                 this.saveCustomColor(color[1]);
-
-                el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
+                this.clearSelection(true);
 
                 var child = el.find('.dynamic-empty-color');
                 if (child.length==0) {
@@ -273,7 +306,7 @@ define([
 
         select: function(color, suppressEvent) {
             var el = this.$el || $(this.el);
-            el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
+            this.clearSelection();
 
             if (typeof(color) == 'object' ) {
                 var effectEl;
@@ -281,6 +314,7 @@ define([
                     effectEl = el.find('a[effectid="'+color.effectId+'"]').first();
                     if (effectEl.length>0) {
                         effectEl.addClass(this.selectedCls);
+                        this.lastSelectedIdx = parseInt(effectEl.attr('idx'));
                         this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase();
                     } else
                         this.value = false;
@@ -288,6 +322,7 @@ define([
                     effectEl = el.find('a[effectvalue="'+color.effectValue+'"].color-' + color.color.toUpperCase()).first();
                     if (effectEl.length>0) {
                         effectEl.addClass(this.selectedCls);
+                        this.lastSelectedIdx = parseInt(effectEl.attr('idx'));
                         this.value = effectEl[0].className.match(this.colorRe)[1].toUpperCase();
                     } else
                         this.value = false;
@@ -302,8 +337,9 @@ define([
                     if (_.indexOf(this.colors, this.value)<0) this.value = false;
 
                     if (color != this.value || this.options.allowReselect) {
-                        (color == 'transparent') ? el.find('a.color-transparent').addClass(this.selectedCls) : el.find('a.palette-color.color-' + color).first().addClass(this.selectedCls);
+                        var co = (color == 'transparent') ? el.find('a.color-transparent').addClass(this.selectedCls) : el.find('a.palette-color.color-' + color).first().addClass(this.selectedCls);
                         this.value = color;
+                        this.lastSelectedIdx = parseInt(co.attr('idx'));
                         if (suppressEvent !== true) {
                             this.fireEvent('select', this, color);
                         }
@@ -314,6 +350,7 @@ define([
                         co = el.find('a[color="'+color+'"]').first();
                     if (co.length>0) {
                         co.addClass(this.selectedCls);
+                        this.lastSelectedIdx = parseInt(co.attr('idx'));
                         this.value = color.toUpperCase();
                     }
                 }
@@ -322,7 +359,7 @@ define([
 
         selectByRGB: function(rgb, suppressEvent) {
             var el = this.$el || $(this.el);
-            el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
+            this.clearSelection(true);
 
             var color = (typeof(rgb) == 'object') ? rgb.color : rgb;
             if (/#?[a-fA-F0-9]{6}/.test(color)) {
@@ -338,6 +375,7 @@ define([
                         co = el.find('a[color="'+color+'"]').first();
                     if (co.length>0) {
                         co.addClass(this.selectedCls);
+                        this.lastSelectedIdx = parseInt(co.attr('idx'));
                         this.value = color;
                     }
                     if (suppressEvent !== true) {
@@ -417,7 +455,28 @@ define([
 
         clearSelection: function(suppressEvent) {
             this.$el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
-            this.value = undefined;
+            if (!suppressEvent) {
+                this.value = undefined;
+                this.lastSelectedIdx = -1;
+            }
+        },
+
+        showLastSelected: function() {
+            this.selectByIndex(this.lastSelectedIdx, true);
+        },
+
+        getSelectedColor: function() {
+            var el = this.$el || $(this.el);
+            var idx = el.find('a.' + this.selectedCls).attr('idx');
+            return (idx!==undefined) ? this.colorItems[parseInt(idx)] : null;
+        },
+
+        selectByIndex: function(index, suppressEvent) {
+            this.clearSelection(true);
+
+            if (index>=0 && index<this.colorItems.length) {
+                this.handleClick({target: this.colorItems[index].el, suppressEvent: suppressEvent});
+            }
         },
 
         generateColorData: function(themecolors, effects, standardcolors, transparent) {
@@ -449,6 +508,133 @@ define([
             return arr;
         },
 
+        onKeyDown: function (e, data) {
+            if (data===undefined) data = e;
+            if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
+                data.preventDefault();
+                data.stopPropagation();
+                var rec = this.getSelectedColor();
+                if (data.keyCode==Common.UI.Keys.RETURN) {
+                    rec && this.selectByIndex(rec.index);
+                    if (this.parentButton && this.parentButton.menu)
+                        this.parentButton.menu.hide();
+                } else {
+                    var idx = rec ? rec.index : -1;
+                    if (idx<0) {
+                        idx = 0;
+                    } else if (this.options.keyMoveDirection == 'both') {
+                        if (this._layoutParams === undefined)
+                            this.fillIndexesArray();
+                        var topIdx = this.colorItems[idx].topIdx,
+                            leftIdx = this.colorItems[idx].leftIdx;
+
+                        idx = undefined;
+                        if (data.keyCode==Common.UI.Keys.LEFT) {
+                            while (idx===undefined) {
+                                leftIdx--;
+                                if (leftIdx<0) {
+                                    leftIdx = this._layoutParams.columns-1;
+                                }
+                                idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+                            }
+                        } else if (data.keyCode==Common.UI.Keys.RIGHT) {
+                            while (idx===undefined) {
+                                leftIdx++;
+                                if (leftIdx>this._layoutParams.columns-1) leftIdx = 0;
+                                idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+                            }
+                        } else if (data.keyCode==Common.UI.Keys.UP) {
+                            if (topIdx==0 && this.parentButton) {
+                                this.clearSelection(true);
+                                this.parentButton.focusOuter(data);
+                            } else
+                                while (idx===undefined) {
+                                    topIdx--;
+                                    if (topIdx<0) topIdx = this._layoutParams.rows-1;
+                                    idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+                                }
+                        } else {
+                            if (topIdx==this._layoutParams.rows-1 && this.parentButton) {
+                                this.clearSelection(true);
+                                this.parentButton.focusOuter(data);
+                            } else
+                                while (idx===undefined) {
+                                    topIdx++;
+                                    if (topIdx>this._layoutParams.rows-1) topIdx = 0;
+                                    idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+                                }
+                        }
+                    } else {
+                        idx = (data.keyCode==Common.UI.Keys.UP || data.keyCode==Common.UI.Keys.LEFT)
+                            ? Math.max(0, idx-1)
+                            : Math.min(this.colorItems.length - 1, idx + 1) ;
+                    }
+
+                    if (idx !== undefined && idx>=0) {
+                        this._fromKeyDown = true;
+                        this.selectByIndex(idx, true);
+                        this._fromKeyDown = false;
+                    }
+                }
+            }
+        },
+
+        fillIndexesArray: function() {
+            if (this.colorItems.length<=0) return;
+
+            this._layoutParams = {
+                itemsIndexes:   [],
+                columns:        0,
+                rows:           0
+            };
+
+            var el = $(this.colorItems[0].el),
+                itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
+                offsetLeft = this.$el.offset().left,
+                offsetTop = el.offset().top,
+                prevtop = -1, topIdx = 0, leftIdx = 0;
+
+            for (var i=0; i<this.colorItems.length; i++) {
+                var top = $(this.colorItems[i].el).offset().top - offsetTop;
+                leftIdx = Math.floor(($(this.colorItems[i].el).offset().left - offsetLeft)/itemW);
+                if (top>prevtop) {
+                    prevtop = top;
+                    this._layoutParams.itemsIndexes.push([]);
+                    topIdx = this._layoutParams.itemsIndexes.length-1;
+                }
+                this._layoutParams.itemsIndexes[topIdx][leftIdx] = i;
+                this.colorItems[i].topIdx = topIdx;
+                this.colorItems[i].leftIdx = leftIdx;
+                if (this._layoutParams.columns<leftIdx) this._layoutParams.columns = leftIdx;
+            }
+            this._layoutParams.rows = this._layoutParams.itemsIndexes.length;
+            this._layoutParams.columns++;
+        },
+
+        attachKeyEvents: function() {
+            if (this.enableKeyEvents) {
+                var el = this.$el || $(this.el);
+                el.addClass('canfocused');
+                el.attr('tabindex', this.tabindex.toString());
+                el.on('keydown', _.bind(this.onKeyDown, this));
+            }
+        },
+
+        focus: function(index) {
+            var el = this.$el || $(this.el);
+            el && el.focus();
+            if (typeof index == 'string') {
+                if (index == 'first') {
+                    this.selectByIndex(0, true);
+                } else if (index == 'last') {
+                    if (this._layoutParams === undefined)
+                        this.fillIndexesArray();
+                    this.selectByIndex(this._layoutParams.itemsIndexes[this._layoutParams.rows-1][0], true);
+                }
+            } else if (index !== undefined)
+                this.selectByIndex(index, true);
+        },
+
         textThemeColors         : 'Theme Colors',
         textStandartColors      : 'Standart Colors'
     }, Common.UI.ThemeColorPalette || {}));

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

@@ -632,7 +632,7 @@ define([
 
                 this.$window = $('#' + this.initConfig.id);
 
-                if (Common.Locale.getCurrentLanguage() !== 'en')
+                if (Common.Locale.getCurrentLanguage() && Common.Locale.getCurrentLanguage() !== 'en')
                     this.$window.attr('applang', Common.Locale.getCurrentLanguage());
 
                 this.binding.keydown = _.bind(_keydown,this);

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

@@ -102,7 +102,8 @@ define([
 
                     // work handlers
 
-                    'comment:closeEditing':     _.bind(this.closeEditing, this)
+                    'comment:closeEditing':     _.bind(this.closeEditing, this),
+                    'comment:sort':             _.bind(this.setComparator, this)
                 },
 
                 'Common.Views.ReviewPopover': {
@@ -144,10 +145,11 @@ define([
             }.bind(this));
         },
         onLaunch: function () {
+            var filter = Common.localStorage.getKeysFilter();
+            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
+
             this.collection                     =   this.getApplication().getCollection('Common.Collections.Comments');
-            if (this.collection) {
-                this.collection.comparator      =   function (collection) { return -collection.get('time'); };
-            }
+            this.setComparator();
 
             this.popoverComments                =   new Common.Collections.Comments();
             if (this.popoverComments) {
@@ -204,6 +206,38 @@ define([
         },
         //
 
+        setComparator: function(type) {
+            if (this.collection) {
+                var sort = (type !== undefined);
+                if (type === undefined) {
+                    type = Common.localStorage.getItem(this.appPrefix + "comments-sort") || 'date-desc';
+                }
+                Common.localStorage.setItem(this.appPrefix + "comments-sort", type);
+                Common.Utils.InternalSettings.set(this.appPrefix + "comments-sort", type);
+
+                if (type=='position') {
+                } else if (type=='author-asc' || type=='author-desc') {
+                    var direction = (type=='author-asc') ? 1 : -1;
+                    this.collection.comparator = function(item1, item2) {
+                        var n1 = item1.get('parsedName').toLowerCase(),
+                            n2 = item2.get('parsedName').toLowerCase();
+                        if (n1==n2) return 0;
+                        return (n1<n2) ? -direction : direction;
+                    };
+                } else { // date
+                    var direction = (type=='date-asc') ? 1 : -1;
+                    this.collection.comparator = function (collection) {
+                        return direction * collection.get('time');
+                    };
+                }
+                sort && this.updateComments(true);
+            }
+        },
+
+        getComparator: function() {
+            return Common.Utils.InternalSettings.get(this.appPrefix + "comments-sort") || 'date';
+        },
+
         onCreateComment: function (panel, commentVal, editMode, hidereply, documentFlag) {
             if (this.api && commentVal && commentVal.length > 0) {
                 var comment = buildCommentData();   //  new asc_CCommentData(null);
@@ -776,9 +810,11 @@ define([
                        ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime())));
 
                 var user = this.userCollection.findOriginalUser(data.asc_getUserId());
+                var needSort = (this.getComparator() == 'author-asc' || this.getComparator() == 'author-desc') && (data.asc_getUserName() !== comment.get('username'));
                 comment.set('comment',  data.asc_getText());
                 comment.set('userid',   data.asc_getUserId());
                 comment.set('username', data.asc_getUserName());
+                comment.set('parsedName', AscCommon.UserInfoParser.getParsedName(data.asc_getUserName()));
                 comment.set('usercolor', (user) ? user.get('color') : null);
                 comment.set('resolved', data.asc_getSolved());
                 comment.set('quote',    data.asc_getQuoteText());
@@ -804,6 +840,7 @@ define([
                         id                  : Common.UI.getId(),
                         userid              : data.asc_getReply(i).asc_getUserId(),
                         username            : data.asc_getReply(i).asc_getUserName(),
+                        parsedName          : AscCommon.UserInfoParser.getParsedName(data.asc_getReply(i).asc_getUserName()),
                         usercolor           : (user) ? user.get('color') : null,
                         date                : t.dateToLocaleTimeString(dateReply),
                         reply               : data.asc_getReply(i).asc_getText(),
@@ -825,7 +862,7 @@ define([
                 }
 
                 if (!silentUpdate) {
-                    this.updateComments(false, true);
+                    this.updateComments(needSort, !needSort);
 
                     // if (this.getPopover() && this.getPopover().isVisible()) {
                     //     this._dontScrollToComment = true;
@@ -1089,7 +1126,7 @@ define([
 
             var i, end = true;
 
-            if (_.isUndefined(disableSort)) {
+            if (!disableSort) {
                 this.collection.sort();
             }
 
@@ -1253,6 +1290,7 @@ define([
                 guid                : data.asc_getGuid(),
                 userid              : data.asc_getUserId(),
                 username            : data.asc_getUserName(),
+                parsedName          : AscCommon.UserInfoParser.getParsedName(data.asc_getUserName()),
                 usercolor           : (user) ? user.get('color') : null,
                 date                : this.dateToLocaleTimeString(date),
                 quote               : data.asc_getQuoteText(),
@@ -1299,6 +1337,7 @@ define([
                         id                  : Common.UI.getId(),
                         userid              : data.asc_getReply(i).asc_getUserId(),
                         username            : data.asc_getReply(i).asc_getUserName(),
+                        parsedName          : AscCommon.UserInfoParser.getParsedName(data.asc_getReply(i).asc_getUserName()),
                         usercolor           : (user) ? user.get('color') : null,
                         date                : this.dateToLocaleTimeString(date),
                         reply               : data.asc_getReply(i).asc_getText(),
@@ -1340,6 +1379,7 @@ define([
                         date: this.dateToLocaleTimeString(date),
                         userid: this.currentUserId,
                         username: AscCommon.UserInfoParser.getCurrentName(),
+                        parsedName: AscCommon.UserInfoParser.getParsedName(AscCommon.UserInfoParser.getCurrentName()),
                         usercolor: (user) ? user.get('color') : null,
                         editTextInPopover: true,
                         showReplyInPopover: false,

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

@@ -48,7 +48,7 @@ define([
     'common/main/lib/view/ExternalDiagramEditor'
 ], function () { 'use strict';
     Common.Controllers.ExternalDiagramEditor = Backbone.Controller.extend(_.extend((function() {
-        var appLang         = 'en',
+        var appLang         = '{{DEFAULT_LANG}}',
             customization   = undefined,
             targetApp       = '',
             externalEditor  = null,

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

@@ -48,7 +48,7 @@ define([
     'common/main/lib/view/ExternalMergeEditor'
 ], function () { 'use strict';
     Common.Controllers.ExternalMergeEditor = Backbone.Controller.extend(_.extend((function() {
-        var appLang         = 'en',
+        var appLang         = '{{DEFAULT_LANG}}',
             customization   = undefined,
             targetApp       = '',
             externalEditor  = null;

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

@@ -728,25 +728,26 @@ define([
         },
 
         disableEditing: function(disable) {
-            var app = this.getApplication();
-            app.getController('Toolbar').DisableToolbar(disable, false, true);
-            app.getController('DocumentHolder').getView().SetDisabled(disable);
-
-            if (this.appConfig.canReview) {
-                app.getController('RightMenu').getView('RightMenu').clearSelection();
-                app.getController('RightMenu').SetDisabled(disable, false);
-                app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
-                app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
-                app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
-            }
-
-            var comments = app.getController('Common.Controllers.Comments');
-            if (comments)
-                comments.setPreviewMode(disable);
-
-            var leftMenu = app.getController('LeftMenu');
-            leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
-            leftMenu.setPreviewMode(disable);
+            Common.NotificationCenter.trigger('editing:disable', disable, {
+                viewMode: false,
+                reviewMode: true,
+                fillFormwMode: false,
+                allowMerge: false,
+                allowSignature: false,
+                allowProtect: false,
+                rightMenu: {clear: true, disable: true},
+                statusBar: true,
+                leftMenu: {disable: false, previewMode: true},
+                fileMenu: {protect: true},
+                navigation: {disable: false, previewMode: true},
+                comments: {disable: false, previewMode: true},
+                chat: false,
+                review: false,
+                viewport: false,
+                documentHolder: true,
+                toolbar: true,
+                plugins: true
+            }, 'review');
 
             if (this.view) {
                 this.view.$el.find('.no-group-mask.review').css('opacity', 1);

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

@@ -7,6 +7,8 @@ define([
 ], function () {
     'use strict';
 
+    !Common.UI && (Common.UI = {});
+    
     Common.UI.Themes = new (function(locale) {
         !locale && (locale = {});
         var themes_map = {
@@ -237,7 +239,7 @@ define([
 
                 $(window).on('storage', function (e) {
                     if ( e.key == 'ui-theme' || e.key == 'ui-theme-id' ) {
-                        me.setTheme(e.originalEvent.newValue);
+                        me.setTheme(e.originalEvent.newValue, true);
                     }
                 })
 
@@ -250,6 +252,10 @@ define([
                     $('body').addClass(theme_name);
                 }
 
+                if ( !document.body.className.match(/theme-type-/) ) {
+                    document.body.classList.add('theme-type-' + themes_map[theme_name].type);
+                }
+
                 var obj = get_current_theme_colors(name_colors);
                 obj.type = themes_map[theme_name].type;
                 obj.name = theme_name;
@@ -263,7 +269,7 @@ define([
             },
 
             setAvailable: function (value) {
-                this.locked = value;
+                this.locked = !value;
             },
 
             map: function () {
@@ -293,16 +299,16 @@ define([
             setTheme: function (obj, force) {
                 var id = get_ui_theme_name(obj);
                 if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
-                    var classname = document.body.className.replace(/theme-\w+\s?/, '');
-                    document.body.className = classname;
+                    document.body.className = document.body.className.replace(/theme-[\w-]+\s?/gi, '').trim();
+                    document.body.classList.add(id, 'theme-type-' + themes_map[id].type);
 
-                    $('body').addClass(id);
+                    if ( this.api ) {
+                        var obj = get_current_theme_colors(name_colors);
+                        obj.type = themes_map[id].type;
+                        obj.name = id;
 
-                    var obj = get_current_theme_colors(name_colors);
-                    obj.type = themes_map[id].type;
-                    obj.name = id;
-
-                    this.api.asc_setSkin(obj);
+                        this.api.asc_setSkin(obj);
+                    }
 
                     if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) {
                         var theme_obj = {

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

@@ -56,6 +56,7 @@ define([
             guid                : '',
             userid              : 0,
             username            : 'Guest',
+            parsedName          : 'Guest',
             usercolor           : null,
             date                : undefined,
             quote               : '',
@@ -88,6 +89,7 @@ define([
             time                : 0,                    //  acs
             userid              : 0,
             username            : 'Guest',
+            parsedName          : 'Guest',
             usercolor           : null,
             reply               : '',
             date                : undefined,

apps/common/main/lib/template/Comments.template

@@ -4,7 +4,7 @@
         <!-- comment block -->
 
         <div class="user-name">
-            <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(username) %>
+            <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(parsedName) %>
         </div>
         <div class="user-date"><%=date%></div>
         <% if (quote!==null && quote!=='') { %>
@@ -31,7 +31,7 @@
                 <% } %>
                 <div class="reply-item-ct" <% if (scope.viewmode && index==replys.length-1) { %>style="padding-bottom: 0;" <% } %>;>
                     <div class="user-name">
-                        <div class="color" style="display: inline-block; background-color: <% if (item.get("usercolor")!==null) { %><%=item.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(item.get("username")) %>
+                        <div class="color" style="display: inline-block; background-color: <% if (item.get("usercolor")!==null) { %><%=item.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(item.get("parsedName")) %>
                     </div>
                     <div class="user-date"><%=item.get("date")%></div>
                     <% if (!item.get("editText")) { %>

apps/common/main/lib/template/CommentsPanel.template

@@ -10,4 +10,9 @@
         <button class="btn add normal dlg-btn primary" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textAddComment%></button>
         <button class="btn cancel normal dlg-btn" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%=textCancel%></button>
     </div>
+    <div id="comments-header" class="">
+        <label><%=textComments%></label>
+        <div id="comments-btn-close" style="float:right;margin-left: 4px;"></div>
+        <div id="comments-btn-sort" style="float:right;"></div>
+    </div>
 </div>

apps/common/main/lib/template/CommentsPopover.template

@@ -4,7 +4,7 @@
     <!-- comment block -->
 
     <div class="user-name">
-        <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(username) %>
+        <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(parsedName) %>
     </div>
     <div class="user-date"><%=date%></div>
     <% if (!editTextInPopover || hint) { %>
@@ -32,7 +32,7 @@
             <% } %>
             <div class="reply-item-ct">
                 <div class="user-name">
-                    <div class="color" style="display: inline-block; background-color: <% if (item.get("usercolor")!==null) { %><%=item.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(item.get("username")) %>
+                    <div class="color" style="display: inline-block; background-color: <% if (item.get("usercolor")!==null) { %><%=item.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(item.get("parsedName")) %>
                 </div>
                 <div class="user-date"><%=item.get("date")%></div>
                 <% if (!item.get("editTextInPopover")) { %>

apps/common/main/lib/template/ReviewChangesPopover.template

@@ -14,8 +14,8 @@
                 <div class="btn-delete img-commonctrl"></div>
                 <% } %>
             <% } else if (editable) { %>
-            <div class="btn-accept img-commonctrl"></div>
-            <div class="btn-reject img-commonctrl"></div>
+            <div class="btn-accept"></div>
+            <div class="btn-reject tool "></div>
             <% } %>
         <% } %>
     </div>

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

@@ -293,6 +293,9 @@ define([
             Common.UI.BaseView.prototype.initialize.call(this, options);
 
             this.store = this.options.store;
+
+            var filter = Common.localStorage.getKeysFilter();
+            this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
         },
 
         render: function () {
@@ -304,7 +307,8 @@ define([
                     textAddComment: me.textAddComment,
                     textCancel: me.textCancel,
                     textEnterCommentHint: me.textEnterCommentHint,
-                    maxCommLength: Asc.c_oAscMaxCellOrCommentLength
+                    maxCommLength: Asc.c_oAscMaxCellOrCommentLength,
+                    textComments: me.textComments
                 }));
 
                 this.buttonAddCommentToDoc = new Common.UI.Button({
@@ -321,9 +325,73 @@ define([
                     enableToggle: false
                 });
 
+                this.buttonSort = new Common.UI.Button({
+                    parentEl: $('#comments-btn-sort', this.$el),
+                    cls: 'btn-toolbar',
+                    iconCls: 'toolbar__icon btn-sorting',
+                    hint: this.textSort,
+                    menu: new Common.UI.Menu({
+                        menuAlign: 'tr-br',
+                        style: 'min-width: auto;',
+                        items: [
+                            {
+                                caption: this.mniDateDesc,
+                                value: 'date-desc',
+                                checkable: true,
+                                checked: (Common.localStorage.getItem(this.appPrefix + "comments-sort") || 'date-desc') === 'date-desc',
+                                toggleGroup: 'sortcomments'
+                            },
+                            {
+                                caption: this.mniDateAsc,
+                                value: 'date-asc',
+                                checkable: true,
+                                checked: (Common.localStorage.getItem(this.appPrefix + "comments-sort") || 'date-desc') === 'date-asc',
+                                toggleGroup: 'sortcomments'
+                            },
+                            {
+                                caption: this.mniAuthorAsc,
+                                value: 'author-asc',
+                                checkable: true,
+                                checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'author-asc',
+                                toggleGroup: 'sortcomments'
+                            },
+                            {
+                                caption: this.mniAuthorDesc,
+                                value: 'author-desc',
+                                checkable: true,
+                                checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'author-desc',
+                                toggleGroup: 'sortcomments'
+                            }
+                            // {
+                            //     caption: this.mniPositionAsc,
+                            //     value: 'position-asc',
+                            //     checkable: true,
+                            //     checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-asc',
+                            //     toggleGroup: 'sortcomments'
+                            // }
+                            // {
+                            //     caption: this.mniPositionDesc,
+                            //     value: 'position-desc',
+                            //     checkable: true,
+                            //     checked: Common.localStorage.getItem(this.appPrefix + "comments-sort") === 'position-desc',
+                            //     toggleGroup: 'sortcomments'
+                            // }
+                        ]
+                    })
+                });
+
+                this.buttonClose = new Common.UI.Button({
+                    parentEl: $('#comments-btn-close', this.$el),
+                    cls: 'btn-toolbar',
+                    iconCls: 'toolbar__icon btn-close',
+                    hint: this.textClosePanel
+                });
+
                 this.buttonAddCommentToDoc.on('click', _.bind(this.onClickShowBoxDocumentComment, this));
                 this.buttonAdd.on('click', _.bind(this.onClickAddDocumentComment, this));
                 this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
+                this.buttonClose.on('click', _.bind(this.onClickClosePanel, this));
+                this.buttonSort.menu.on('item:toggle', _.bind(this.onSortClick, this));
 
                 this.txtComment = $('#comment-msg-new', this.el);
                 this.txtComment.keydown(function (event) {
@@ -658,6 +726,9 @@ define([
         getUserName: function (username) {
             return Common.Utils.String.htmlEncode(AscCommon.UserInfoParser.getParsedName(username));
         },
+        getEncodedName: function (username) {
+            return Common.Utils.String.htmlEncode(username);
+        },
 
         pickLink: function (message) {
             var arr = [], offset, len;
@@ -730,6 +801,14 @@ define([
             });
         },
 
+        onSortClick: function(menu, item, state) {
+            state && this.fireEvent('comment:sort', [item.value]);
+        },
+
+        onClickClosePanel: function() {
+            Common.NotificationCenter.trigger('leftmenu:change', 'hide');
+        },
+
         textComments            : 'Comments',
         textAnonym              : 'Guest',
         textAddCommentToDoc     : 'Add Comment to Document',
@@ -744,6 +823,14 @@ define([
         textEdit                : 'Edit',
         textAdd                 : "Add",
         textOpenAgain           : "Open Again",
-        textHintAddComment      : 'Add Comment'
+        textHintAddComment      : 'Add Comment',
+        textSort: 'Sort comments',
+        mniPositionAsc: 'From top',
+        mniPositionDesc: 'From bottom',
+        mniAuthorAsc: 'Author A to Z',
+        mniAuthorDesc: 'Author Z to A',
+        mniDateDesc: 'Newest',
+        mniDateAsc: 'Oldest',
+        textClosePanel: 'Close comments'
     }, Common.Views.Comments || {}))
 });

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

@@ -103,7 +103,7 @@ define([
                                 '</div>' +
                                 '<div class="hedset">' +
                                     '<div class="btn-slot" id="slot-btn-user-name"></div>' +
-                                    '<div class="btn-current-user hidden">' +
+                                    '<div class="btn-current-user btn-header hidden">' +
                                         '<i class="icon toolbar__icon icon--inverse btn-user"></i>' +
                                     '</div>' +
                                 '</div>' +

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

@@ -292,7 +292,9 @@ define([
                 parentEl: $window.find('#id-dlg-list-color'),
                 style: "width:45px;",
                 additionalAlign: this.menuAddAlign,
-                color: this.color
+                color: this.color,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnColor.on('color:select', _.bind(this.onColorsSelect, this));
             this.colors = this.btnColor.getPicker();
@@ -321,7 +323,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.cmbNumFormat, this.cmbBulletFormat, this.spnSize, this.spnStart];
+            return [this.cmbNumFormat, this.cmbBulletFormat, this.spnSize, this.spnStart, this.btnColor];
         },
 
         afterRender: function() {

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

@@ -105,15 +105,15 @@ define([
                     '<table style="margin-top: 30px;">',
                         '<tr>',
                             '<td><label style="font-weight: bold;margin-bottom: 3px;">' + this.textCertificate + '</label></td>' +
-                            '<td rowspan="2" style="vertical-align: top; padding-left: 30px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="">' + this.textSelect + '</button></td>',
+                            '<td rowspan="2" style="vertical-align: top; padding-left: 20px;"><button id="id-dlg-sign-change" class="btn btn-text-default" style="float:right;">' + this.textSelect + '</button></td>',
                         '</tr>',
-                        '<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 212px;overflow: hidden;"></td></tr>',
+                        '<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 240px;overflow: hidden;white-space: nowrap;"></td></tr>',
                     '</table>',
                 '</div>'
             ].join('');
 
             this.templateCertificate = _.template([
-                '<label style="display: block;margin-bottom: 3px;"><%= Common.Utils.String.htmlEncode(name) %></label>',
+                '<label style="display: block;margin-bottom: 3px;overflow: hidden;text-overflow: ellipsis;"><%= Common.Utils.String.htmlEncode(name) %></label>',
                 '<label style="display: block;"><%= Common.Utils.String.htmlEncode(valid) %></label>'
             ].join(''));
 

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

@@ -332,7 +332,7 @@
     .border-radius(1px);
     background-color: transparent;
 
-    .masked & {
+    .masked:not(.statusbar) & {
         &:disabled {
             opacity: 1;
         }
@@ -679,6 +679,13 @@
         .caret {
         }
     }
+
+    &:not(.disabled) {
+        &:focus, .btn-group.open &, .btn-group:active & {
+            border-color: @border-control-focus-ie;
+            border-color: @border-control-focus;
+        }
+    }
 }
 
 // for color button auto color
@@ -739,6 +746,11 @@
         width: 28px;
         height: 28px;
     }
+
+    &:focus:not(.disabled) {
+        box-shadow: inset 0 0 0 @scaled-one-px-value-ie @border-control-focus-ie;
+        box-shadow: inset 0 0 0 @scaled-one-px-value @border-control-focus;
+    }
 }
 
 .btn-text-default {
@@ -985,6 +997,18 @@
     &.disabled {
         opacity: @component-disabled-opacity;
     }
+
+    &:not(:disabled) {
+        .icon {
+            opacity: 1;
+        }
+
+        &:hover {
+            .icon {
+                .icon();
+            }
+        }
+    }
 }
 
 .cnt-lang {

apps/common/main/resources/less/colors-table-classic.less

@@ -47,7 +47,7 @@
         --text-contrast-background: #fff;
 
         --icon-normal: #444;
-        --icon-normal-pressed: #fff;
+        --icon-normal-pressed: #444;
         --icon-inverse: #444;
         --icon-toolbar-header: fade(#fff, 80%);
         --icon-notification-badge: #000;

apps/common/main/resources/less/comments.less

@@ -7,6 +7,33 @@
         display: table-row;
     }
 
+    #comments-header {
+        position: absolute;
+        height: 45px;
+        left: 0;
+        top: 0;
+        right: 0;
+        padding: 12px;
+        overflow: hidden;
+        border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
+        border-bottom: @scaled-one-px-value solid @border-toolbar;
+
+        label {
+            font-size: 12px;
+            font-weight: bold;
+            margin-top: 2px;
+        }
+
+        #comments-btn-sort {
+            .btn-toolbar {
+                min-width: 20px;
+            }
+            .inner-box-caret {
+                display: none;
+            }
+        }
+    }
+
     .messages-ct {
         position: absolute;
         overflow: hidden;
@@ -14,6 +41,7 @@
         right: 0;
         bottom: 45px;
         height: 300px;
+        padding-top: 45px;
         border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-bottom: @scaled-one-px-value solid @border-toolbar;
 
@@ -273,15 +301,65 @@
         background-position: -22px -232px;
     }
 
-    .btn-accept {
-        background-position: -2px -253px;
+    
+    .tool {
+        float: right;
+        width: 16px;
+        height: 16px;
+        cursor: pointer;
+        overflow: hidden;
+        padding: 0px;
+        margin-right: 2px;
+
+        &.btn-reject {
+            position: relative;
+
+            &.disabled {
+                cursor: default;
+            }
+
+            &:before, &:after {
+                content: ' ';
+                position: absolute;
+                left: 8px;
+                top: 2px;
+                height: 12px;
+                width: 2px;
+                background-color: @icon-normal-ie;
+                background-color: @icon-normal;
+            }
+
+            &:before {
+                transform: rotate(45deg);
+            }
+
+            &:after {
+                transform: rotate(-45deg);
+            }
+        }
+
+        &.help {
+            width: 20px;
+            margin-right:0;
+            line-height: 14px;
+            font-size: 14px;
+            font-weight: bold;
+            color: @text-normal-ie;
+            color: @text-normal;
+            opacity: 0.7;
+
+            &:hover {
+                opacity: 1;
+            }
+
+            &.disabled {
+                opacity: @component-disabled-opacity;
+                cursor: default;
+            }
+        }
     }
 
-    .btn-reject {
-        background-position: -22px -253px;
-    }
-
-    .btn-resolve {
+    .btn-resolve,.btn-accept {
         position: relative;
 
         &:after {

apps/common/main/resources/less/theme-colorpalette.less

@@ -29,7 +29,7 @@
             border: @scaled-one-px-value solid @border-color-shading;
         }
 
-        &:hover, &.selected {
+        &:hover, &:focus, &.selected {
             border-color: @icon-normal-ie;
             border-color: @icon-normal;
             em span {

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

@@ -386,11 +386,13 @@
             }
         }
 
-        .extra {
-            #header-logo {
-                i {
-                    background-image: ~"url('@{common-image-const-path}/header/dark-logo_s.svg')";
-                    background-repeat: no-repeat;
+        .theme-type-light & {
+            .extra {
+                #header-logo {
+                    i {
+                        background-image: ~"url('@{common-image-const-path}/header/dark-logo_s.svg')";
+                        background-repeat: no-repeat;
+                    }
                 }
             }
         }

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

@@ -85,10 +85,8 @@
             &.close {
                 position: relative;
                 opacity: 0.7;
-                transition: transform .3s;
 
                 &:hover {
-                    transform: scale(1.1);
                     opacity: 1;
                 }
 

apps/common/mobile/lib/controller/Plugins.jsx

@@ -182,7 +182,31 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
 
     const onPluginsInit = pluginsdata => {
         !(pluginsdata instanceof Array) && (pluginsdata = pluginsdata["pluginsData"]);
-        registerPlugins(pluginsdata)
+        parsePlugins(pluginsdata)
+    };
+
+    const parsePlugins = pluginsdata => {
+        let isEdit = storeAppOptions.isEdit;
+        
+        if ( pluginsdata instanceof Array ) { 
+            let lang = storeAppOptions.lang.split(/[\-_]/)[0];
+            pluginsdata.forEach((item) => {
+                item.variations.forEach( (itemVar) => { 
+                    let description = itemVar.description;
+                    if (typeof itemVar.descriptionLocale == 'object')
+                    description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
+
+                    if(itemVar.buttons !== undefined) {
+                        itemVar.buttons.forEach( (button) => {
+                            if (typeof button.textLocale == 'object')
+                                    button.text = button.textLocale[lang] || button.textLocale['en'] || button.text || '';
+                            button.visible = (isEdit || button.isViewer !== false);
+                        })
+                    }
+                })
+            });
+        } 
+        registerPlugins(pluginsdata);
     };
 
     const registerPlugins = plugins => {
@@ -194,6 +218,7 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
             plugin.set_Name(item['name']);
             plugin.set_Guid(item['guid']);
             plugin.set_BaseUrl(item['baseUrl']);
+            plugin.set_MinVersion && plugin.set_MinVersion(item.get('minVersion'));
 
             let variations = item['variations'],
                 variationsArr = [];
@@ -245,7 +270,7 @@ const PluginsController = inject('storeAppOptions')(observer(props => {
                 arr = arr.concat(plugins.plugins);
             }
 
-            registerPlugins(arr);
+            parsePlugins(arr);
         }
     };
 

apps/documenteditor/embed/locale/tr.json

@@ -22,6 +22,7 @@
   "DE.ApplicationController.textNext": "Sonraki alan",
   "DE.ApplicationController.textOf": "'in",
   "DE.ApplicationController.textSubmit": "Kaydet",
+  "DE.ApplicationController.textSubmited": "<b>Form başarılı bir şekilde kaydedildi</b><br>İpucunu kapatmak için tıklayın",
   "DE.ApplicationController.txtClose": "Kapat",
   "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.",

apps/documenteditor/embed/locale/zh.json

@@ -11,20 +11,29 @@
   "DE.ApplicationController.downloadTextText": "正在下载文件...",
   "DE.ApplicationController.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.ApplicationController.errorDefaultMessage": "错误代码：%1",
+  "DE.ApplicationController.errorEditingDownloadas": "在处理文档期间发生错误。<br>使用“下载为…”选项将文件备份复制到您的计算机硬盘中。",
   "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法被打开。",
   "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.<br>有关详细信息，请与文档服务器管理员联系。",
+  "DE.ApplicationController.errorSubmit": "提交失败",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已变更。<br>在继续工作之前，需要下载文件或复制其内容以避免丢失数据，然后刷新此页。",
   "DE.ApplicationController.errorUserDrop": "该文件现在无法访问。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
   "DE.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。",
+  "DE.ApplicationController.textClear": "清除所有字段",
   "DE.ApplicationController.textLoadingDocument": "文件加载中…",
+  "DE.ApplicationController.textNext": "下一域",
   "DE.ApplicationController.textOf": "的",
+  "DE.ApplicationController.textSubmit": "提交",
+  "DE.ApplicationController.textSubmited": "<b>表单成功地被提交了</b><br>点击以关闭贴士",
   "DE.ApplicationController.txtClose": "关闭",
   "DE.ApplicationController.unknownErrorText": "未知错误。",
   "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持",
   "DE.ApplicationController.waitText": "请稍候...",
   "DE.ApplicationView.txtDownload": "下载",
+  "DE.ApplicationView.txtDownloadDocx": "导出成docx格式",
+  "DE.ApplicationView.txtDownloadPdf": "导出成PDF格式",
   "DE.ApplicationView.txtEmbed": "嵌入",
+  "DE.ApplicationView.txtFileLocation": "打开文件所在位置",
   "DE.ApplicationView.txtFullScreen": "全屏",
   "DE.ApplicationView.txtPrint": "打印",
   "DE.ApplicationView.txtShare": "共享"

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

@@ -90,7 +90,6 @@ define([
             this.addListeners({
                 'FormsTab': {
                     'forms:insert': this.onControlsSelect,
-                    'forms:new-color': this.onNewControlsColor,
                     'forms:clear': this.onClearClick,
                     'forms:no-color': this.onNoControlsColor,
                     'forms:select-color': this.onSelectControlsColor,
@@ -206,10 +205,6 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
 
-        onNewControlsColor: function() {
-            this.view.mnuFormsColorPicker.addNewColor();
-        },
-
         onNoControlsColor: function(item) {
             if (!item.isChecked())
                 this.api.asc_SetSpecialFormsHighlightColor(201, 200, 255);
@@ -253,19 +248,26 @@ define([
             if (this._state.DisabledEditing != disable) {
                 this._state.DisabledEditing = disable;
 
-                var app = this.getApplication();
-                var rightMenuController = app.getController('RightMenu');
-                rightMenuController.getView('RightMenu').clearSelection();
-                rightMenuController.SetDisabled(disable);
-                app.getController('Toolbar').DisableToolbar(disable, false, false, true);
-                app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
-                app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
-                app.getController('DocumentHolder').getView().SetDisabled(disable);
-                app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
-                app.getController('LeftMenu').setPreviewMode(disable);
-                var comments = app.getController('Common.Controllers.Comments');
-                if (comments)
-                    comments.setPreviewMode(disable);
+                Common.NotificationCenter.trigger('editing:disable', disable, {
+                    viewMode: false,
+                    reviewMode: false,
+                    fillFormwMode: true,
+                    allowMerge: false,
+                    allowSignature: false,
+                    allowProtect: false,
+                    rightMenu: {clear: true, disable: true},
+                    statusBar: true,
+                    leftMenu: {disable: false, previewMode: true},
+                    fileMenu: false,
+                    navigation: {disable: false, previewMode: true},
+                    comments: {disable: false, previewMode: true},
+                    chat: false,
+                    review: true,
+                    viewport: false,
+                    documentHolder: true,
+                    toolbar: true,
+                    plugins: false
+                }, 'forms');
                 if (this.view)
                     this.view.$el.find('.no-group-mask.form-view').css('opacity', 1);
             }

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

@@ -666,21 +666,29 @@ define([
             this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search');
         },
 
-        SetDisabled: function(disable, disableFileMenu) {
-            this.mode.isEdit = !disable;
+        SetDisabled: function(disable, options) {
+            if (this.leftMenu._state.disabled !== disable) {
+                this.leftMenu._state.disabled = disable;
+                if (disable) {
+                    this.previsEdit = this.mode.isEdit;
+                    this.prevcanEdit = this.mode.canEdit;
+                    this.mode.isEdit = this.mode.canEdit = !disable;
+                } else {
+                    this.mode.isEdit = this.previsEdit;
+                    this.mode.canEdit = this.prevcanEdit;
+                }
+            }
+
             if (disable) this.leftMenu.close();
 
-            /** coauthoring begin **/
-            this.leftMenu.btnComments.setDisabled(disable);
-            var comments = this.getApplication().getController('Common.Controllers.Comments');
-            if (comments)
-                comments.setPreviewMode(disable);
-            this.setPreviewMode(disable);
-            this.leftMenu.btnChat.setDisabled(disable);
-            /** coauthoring end **/
+            if (!options || options.comments && options.comments.disable)
+                this.leftMenu.btnComments.setDisabled(disable);
+            if (!options || options.chat)
+                this.leftMenu.btnChat.setDisabled(disable);
+            if (!options || options.navigation && options.navigation.disable)
+                this.leftMenu.btnNavigation.setDisabled(disable);
+
             this.leftMenu.btnPlugins.setDisabled(disable);
-            this.leftMenu.btnNavigation.setDisabled(disable);
-            if (disableFileMenu) this.leftMenu.getMenu('file').SetDisabled(disable);
         },
 
         /** coauthoring begin **/

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

@@ -162,6 +162,11 @@ define([
                     weakCompare     : function(obj1, obj2){return obj1.type === obj2.type;}
                 });
 
+                this.stackDisableActions = new Common.IrregularStack({
+                    strongCompare   : function(obj1, obj2){return obj1.type === obj2.type;},
+                    weakCompare     : function(obj1, obj2){return obj1.type === obj2.type;}
+                });
+
                 this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false, isDocModified: false};
                 this.languages = null;
 
@@ -215,7 +220,7 @@ define([
                     Common.NotificationCenter.on('download:advanced',               _.bind(this.onAdvancedOptions, this));
                     Common.NotificationCenter.on('showmessage',                     _.bind(this.onExternalMessage, this));
                     Common.NotificationCenter.on('showerror',                       _.bind(this.onError, this));
-
+                    Common.NotificationCenter.on('editing:disable',                 _.bind(this.onEditingDisable, this));
 
                     this.isShowOpenDialog = false;
                     
@@ -706,18 +711,84 @@ define([
               return"#"+("000000"+color.toString(16)).substr(-6);
             },
 
-
-            disableEditing: function(disable) {
+            disableEditing: function(disable, temp) {
                 var app = this.getApplication();
-                if (this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
-                    app.getController('RightMenu').getView('RightMenu').clearSelection();
-                    app.getController('RightMenu').SetDisabled(disable, false);
+                Common.NotificationCenter.trigger('editing:disable', disable, {
+                    viewMode: disable,
+                    reviewMode: false,
+                    fillFormwMode: false,
+                    allowMerge: false,
+                    allowSignature: false,
+                    allowProtect: false,
+                    rightMenu: {clear: true, disable: true},
+                    statusBar: true,
+                    leftMenu: {disable: true, previewMode: true},
+                    fileMenu: {protect: true, history: temp},
+                    navigation: {disable: !temp, previewMode: true},
+                    comments: {disable: !temp, previewMode: true},
+                    chat: true,
+                    review: true,
+                    viewport: true,
+                    documentHolder: true,
+                    toolbar: true,
+                    plugins: false
+                }, temp ? 'reconnect' : 'disconnect');
+            },
+
+            onEditingDisable: function(disable, options, type) {
+                var app = this.getApplication();
+
+                var action = {type: type, disable: disable, options: options};
+                if (disable && !this.stackDisableActions.get({type: type}))
+                    this.stackDisableActions.push(action);
+                !disable && this.stackDisableActions.pop({type: type});
+                var prev_options = !disable && (this.stackDisableActions.length()>0) ? this.stackDisableActions.get(this.stackDisableActions.length()-1) : null;
+
+                if (options.rightMenu && app.getController('RightMenu')) {
+                    options.rightMenu.clear && app.getController('RightMenu').getView('RightMenu').clearSelection();
+                    options.rightMenu.disable && app.getController('RightMenu').SetDisabled(disable, options.allowMerge, options.allowSignature);
+                }
+                if (options.statusBar) {
                     app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
                 }
-                app.getController('LeftMenu').SetDisabled(disable, true);
-                app.getController('Toolbar').DisableToolbar(disable, disable);
-                app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
-                app.getController('Viewport').SetDisabled(disable);
+                if (options.review) {
+                    app.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
+                }
+                if (options.viewport) {
+                    app.getController('Viewport').SetDisabled(disable);
+                }
+                if (options.toolbar) {
+                    app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode);
+                }
+                if (options.documentHolder) {
+                    app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect);
+                }
+                if (options.leftMenu) {
+                    if (options.leftMenu.disable)
+                        app.getController('LeftMenu').SetDisabled(disable, options);
+                    if (options.leftMenu.previewMode)
+                        app.getController('LeftMenu').setPreviewMode(disable);
+                }
+                if (options.fileMenu) {
+                    app.getController('LeftMenu').leftMenu.getMenu('file').SetDisabled(disable, options.fileMenu);
+                    if (options.leftMenu.disable)
+                        app.getController('LeftMenu').leftMenu.getMenu('file').applyMode();
+                }
+                if (options.comments) {
+                    var comments = this.getApplication().getController('Common.Controllers.Comments');
+                    if (comments && options.comments.previewMode)
+                        comments.setPreviewMode(disable);
+                }
+                if (options.navigation && options.navigation.previewMode) {
+                    app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
+                }
+                if (options.plugins) {
+                    app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
+                }
+
+                if (prev_options) {
+                    this.onEditingDisable(prev_options.disable, prev_options.options, prev_options.type);
+                }
             },
 
             onRequestClose: function() {
@@ -849,6 +920,10 @@ define([
                     Common.Utils.InternalSettings.get("de-settings-livecomment") ? this.api.asc_showComments(Common.Utils.InternalSettings.get("de-settings-resolvedcomment")) : this.api.asc_hideComments();
                 }
 
+                if ( id == Asc.c_oAscAsyncAction['Disconnect']) {
+                    this.disableEditing(false, true);
+                }
+
                 if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
                     (!this.getApplication().getController('LeftMenu').dlgSearch || !this.getApplication().getController('LeftMenu').dlgSearch.isVisible()) &&
                     (!this.getApplication().getController('Toolbar').dlgSymbolTable || !this.getApplication().getController('Toolbar').dlgSymbolTable.isVisible()) &&
@@ -949,6 +1024,12 @@ define([
                         title   = this.loadingDocumentTitleText + '           ';
                         text    = this.loadingDocumentTextText;
                         break;
+
+                    case Asc.c_oAscAsyncAction['Disconnect']:
+                        text    = this.textDisconnect;
+                        this.disableEditing(true, true);
+                        break;
+
                     default:
                         if (typeof action.id == 'string'){
                             title   = action.id;
@@ -1268,7 +1349,7 @@ define([
                 if (Asc.c_oLicenseResult.ExpiredLimited === licType)
                     this._state.licenseType = licType;
 
-                if ( this.onServerVersion(params.asc_getBuildVersion()) ) return;
+                if ( this.onServerVersion(params.asc_getBuildVersion()) || !this.onLanguageLoaded()) return;
 
                 this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review;
 
@@ -2429,17 +2510,7 @@ define([
             warningDocumentIsLocked: function() {
                 var me = this;
                 var _disable_ui = function (disable) {
-                    me.disableEditing(disable);
-                    var app = me.getApplication();
-                    app.getController('DocumentHolder').getView().SetDisabled(disable);
-                    app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
-
-                    var leftMenu = app.getController('LeftMenu');
-                    leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
-                    leftMenu.setPreviewMode(disable);
-
-                    var comments = app.getController('Common.Controllers.Comments');
-                    if (comments) comments.setPreviewMode(disable);
+                    me.disableEditing(disable, true);
                 };
 
                 Common.Utils.warningDocumentIsLocked({disablefunc: _disable_ui});
@@ -2555,6 +2626,18 @@ define([
                 this.getApplication().getController('DocumentHolder').getView().focus();
             },
 
+            onLanguageLoaded: function() {
+                if (!Common.Locale.getCurrentLanguage()) {
+                    Common.UI.warning({
+                        msg: this.errorLang,
+                        buttons: [],
+                        closable: false
+                    });
+                    return false;
+                }
+                return true;
+            },
+
             leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.',
             criticalErrorTitle: 'Error',
             notcriticalErrorTitle: 'Warning',
@@ -2926,7 +3009,9 @@ define([
             txtNoTableOfFigures: "No table of figures entries found.",
             txtTableOfFigures: 'Table of figures',
             txtStyle_endnote_text: 'Endnote Text',
-            txtTOCHeading: 'TOC Heading'
+            txtTOCHeading: 'TOC Heading',
+            textDisconnect: 'Connection is lost',
+            errorLang: 'The interface language is not loaded.<br>Please contact your Document Server administrator.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -310,14 +310,12 @@ define([
             toolbar.mnuMultiChangeLevel.menu.on('item:click',           _.bind(this.onChangeLevelClick, this, 2));
             toolbar.btnHighlightColor.on('click',                       _.bind(this.onBtnHighlightColor, this));
             toolbar.btnFontColor.on('click',                            _.bind(this.onBtnFontColor, this));
+            toolbar.btnFontColor.on('color:select',                     _.bind(this.onSelectFontColor, this));
+            toolbar.btnFontColor.on('auto:select',                      _.bind(this.onAutoFontColor, this));
             toolbar.btnParagraphColor.on('click',                       _.bind(this.onBtnParagraphColor, this));
+            toolbar.btnParagraphColor.on('color:select',                _.bind(this.onParagraphColorPickerSelect, this));
             toolbar.mnuHighlightColorPicker.on('select',                _.bind(this.onSelectHighlightColor, this));
-            toolbar.mnuFontColorPicker.on('select',                     _.bind(this.onSelectFontColor, this));
-            toolbar.mnuParagraphColorPicker.on('select',                _.bind(this.onParagraphColorPickerSelect, this));
             toolbar.mnuHighlightTransparent.on('click',                 _.bind(this.onHighlightTransparentClick, this));
-            $('#id-toolbar-menu-auto-fontcolor').on('click',            _.bind(this.onAutoFontColor, this));
-            $('#id-toolbar-menu-new-fontcolor').on('click',             _.bind(this.onNewFontColor, this));
-            $('#id-toolbar-menu-new-paracolor').on('click',             _.bind(this.onNewParagraphColor, this));
             toolbar.mnuLineSpace.on('item:toggle',                      _.bind(this.onLineSpaceToggle, this));
             toolbar.mnuNonPrinting.on('item:toggle',                    _.bind(this.onMenuNonPrintingToggle, this));
             toolbar.btnShowHidenChars.on('toggle',                      _.bind(this.onNonPrintingToggle, this));
@@ -2437,10 +2435,6 @@ define([
             return out_value;
         },
 
-        onNewFontColor: function(picker, color) {
-            this.toolbar.mnuFontColorPicker.addNewColor();
-        },
-
         onAutoFontColor: function(e) {
             this._state.clrtext = this._state.clrtext_asccolor = undefined;
 
@@ -2449,21 +2443,14 @@ define([
             this.api.put_TextColor(color);
 
             this.toolbar.btnFontColor.currentColor = {color: color, isAuto: true};
-            this.toolbar.btnFontColor.setColor('000');
-
-            this.toolbar.mnuFontColorPicker.clearSelection();
             this.toolbar.mnuFontColorPicker.currentColor = {color: color, isAuto: true};
         },
 
-        onNewParagraphColor: function(picker, color) {
-            this.toolbar.mnuParagraphColorPicker.addNewColor();
-        },
-
         onSelectHighlightColor: function(picker, color) {
             this._setMarkerColor(color, 'menu');
         },
 
-        onSelectFontColor: function(picker, color) {
+        onSelectFontColor: function(btn, color) {
             this._state.clrtext = this._state.clrtext_asccolor = undefined;
 
             this.toolbar.btnFontColor.currentColor = color;
@@ -2476,7 +2463,7 @@ define([
             Common.component.Analytics.trackEvent('ToolBar', 'Text Color');
         },
 
-        onParagraphColorPickerSelect: function(picker, color) {
+        onParagraphColorPickerSelect: function(btn, color) {
             this._state.clrback = this._state.clrshd_asccolor = undefined;
 
             this.toolbar.btnParagraphColor.currentColor = color;
@@ -2514,9 +2501,6 @@ define([
 
         onHighlightTransparentClick: function(item, e) {
             this._setMarkerColor('transparent', 'menu');
-            item.setChecked(true, true);
-            this.toolbar.btnHighlightColor.currentColor = 'transparent';
-            this.toolbar.btnHighlightColor.setColor(this.toolbar.btnHighlightColor.currentColor);
         },
 
         onParagraphColor: function(shd) {
@@ -2562,9 +2546,8 @@ define([
         onApiTextColor: function(color) {
             if (color.get_auto()) {
                 if (this._state.clrtext !== 'auto') {
+                    this.toolbar.btnFontColor.setAutoColor(true);
                     this.toolbar.mnuFontColorPicker.clearSelection();
-                    var clr_item = this.toolbar.btnFontColor.menu.$el.find('#id-toolbar-menu-auto-fontcolor > a');
-                    !clr_item.hasClass('selected') && clr_item.addClass('selected');
                     this._state.clrtext = 'auto';
                 }
             } else {
@@ -2583,8 +2566,7 @@ define([
                     (clr.effectValue!==this._state.clrtext.effectValue || this._state.clrtext.color.indexOf(clr.color)<0)) ||
                     (type1!='object' && this._state.clrtext.indexOf(clr)<0 )) {
 
-                    var clr_item = this.toolbar.btnFontColor.menu.$el.find('#id-toolbar-menu-auto-fontcolor > a');
-                    clr_item.hasClass('selected') && clr_item.removeClass('selected');
+                    this.toolbar.btnFontColor.setAutoColor(false);
                     if ( typeof(clr) == 'object' ) {
                         var isselected = false;
                         for (var i=0; i<10; i++) {
@@ -2983,7 +2965,8 @@ define([
             var me = this;
 
             if (h === 'menu') {
-                me.toolbar.mnuHighlightTransparent.setChecked(false);
+                me._state.clrhighlight = undefined;
+                me.onApiHighlightColor();
 
                 me.toolbar.btnHighlightColor.currentColor = strcolor;
                 me.toolbar.btnHighlightColor.setColor(me.toolbar.btnHighlightColor.currentColor);

apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -174,7 +174,7 @@
 
             </div>
             <div>
-                <div class="padding-large" style="display: inline-block; margin-right: 9px;">
+                <div class="padding-large" style="display: inline-block; margin-right: 8px;">
                     <label class="input-label"><%= scope.textTabPosition %></label>
                     <div id="paraadv-spin-tab"></div>
                 </div>

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

@@ -141,7 +141,9 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
                     '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF',
                     '993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', 'C9C8FF', 'CC99FF', 'FFFFFF'
                 ],
-                paletteHeight: 94
+                paletteHeight: 94,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.colors = this.btnColor.getPicker();
 
@@ -357,7 +359,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
 
         getFocusedComponents: function() {
             return [
-                this.txtName, this.txtTag, this.txtPlaceholder, this.cmbShow, this.btnApplyAll, // 0 tab
+                this.txtName, this.txtTag, this.txtPlaceholder, this.cmbShow, this.btnColor, this.btnApplyAll, // 0 tab
                 this.chLockDelete , this.chLockEdit, // 1 tab
                 this.list, // 2 tab
                 this.txtDate, this.listFormats, this.cmbLang // 3 tab

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

@@ -112,6 +112,7 @@ define([
                 spacingMode: false
             });
 
+            this._btnsBorderPosition = [];
             _.each([
                 [c_tableBorder.BORDER_HORIZONTAL_TOP,     't',     'btn-borders-large toolbar__icon toolbar__icon-big paragraph-borders-top',       '00'],
                 [c_tableBorder.BORDER_HORIZONTAL_CENTER,  'm',     'btn-borders-large toolbar__icon toolbar__icon-big paragraph-borders-inner',     '01'],
@@ -134,6 +135,7 @@ define([
                 _btn.on('click', function(btn) {
                     me._ApplyBorderPreset(btn.options.strId);
                 });
+                me._btnsBorderPosition.push( _btn );
             }, this);
 
             var txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt);
@@ -164,7 +166,9 @@ define([
                 parentEl: $('#drop-advanced-button-bordercolor'),
                 additionalAlign: this.menuAddAlign,
                 color: 'auto',
-                auto: true
+                auto: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnBorderColor.on('color:select', _.bind(function(btn, color) {
                 this.tableStyler.setVirtualBorderColor((typeof(color) == 'object') ? color.color : color);
@@ -177,7 +181,9 @@ define([
             this.btnBackColor = new Common.UI.ColorButton({
                 parentEl: $('#drop-advanced-button-color'),
                 additionalAlign: this.menuAddAlign,
-                transparent: true
+                transparent: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnBackColor.on('color:select', _.bind(function(btn, color) {
                 var clr, border;
@@ -720,8 +726,9 @@ define([
             return [
                 this.cmbWidth, this.spnWidth, this.cmbHeight, this.spnHeight, this.cmbHAlign, this.cmbHRelative, this.spnX, this.cmbVAlign, this.cmbVRelative, this.spnY, this.chMove, // 0 tab
                 this.cmbFonts, this.spnRowHeight, this.numDistance, // 1 tab
+                this.cmbBorderSize, this.btnBorderColor].concat(this._btnsBorderPosition).concat([this.btnBackColor,  // 2 tab
                 this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight // 3 tab
-            ];
+            ]);
         },
 
         onCategoryClick: function(btn, index) {
@@ -729,12 +736,20 @@ define([
 
             var me = this;
             setTimeout(function(){
-                if (index==0) {
-                    me.cmbWidth.focus();
-                } else if (index==1) {
-                    me.cmbFonts.focus();
-                } else if (index==3)
-                    me.spnMarginTop.focus();
+                switch (index) {
+                    case 0:
+                        me.cmbWidth.focus();
+                        break;
+                    case 1:
+                        me.cmbFonts.focus();
+                        break;
+                    case 2:
+                        me.cmbBorderSize.focus();
+                        break;
+                    case 3:
+                        me.spnMarginTop.focus();
+                        break;
+                }
             }, 100);
         },
 

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

@@ -218,6 +218,10 @@ define([
                 dataHintDirection: 'left-top',
                 dataHintOffset: [2, 14]
             });
+            if ( !!this.options.miHistory ) {
+                this.miHistory.setDisabled(this.options.miHistory.isDisabled());
+                delete this.options.miHistory;
+            }
 
             this.miHelp = new Common.UI.MenuItem({
                 el      : $markup.elementById('#fm-btn-help'),
@@ -322,6 +326,8 @@ define([
         },
 
         applyMode: function() {
+            if (!this.rendered) return;
+
             if (!this.panels) {
                 this.panels = {
                     'opts'      : (new DE.Views.FileMenuPanels.Settings({menu:this})).render(this.$el.find('#panel-settings')),
@@ -414,8 +420,7 @@ define([
             }
 
             if (!delay) {
-                if ( this.rendered )
-                    this.applyMode();
+                this.applyMode();
             }
             return this;
         },
@@ -462,14 +467,12 @@ define([
             });
         },
 
-        SetDisabled: function(disable) {
-            var _btn_save = this.getButton('save'),
-                _btn_rename = this.getButton('rename'),
-                _btn_protect = this.getButton('protect');
+        SetDisabled: function(disable, options) {
+            var _btn_protect = this.getButton('protect'),
+                _btn_history = this.getButton('history');
 
-            _btn_save[(disable || !this.mode.isEdit)?'hide':'show']();
-            _btn_protect[(disable || !this.mode.isEdit)?'hide':'show']();
-            _btn_rename[(disable || !this.mode.canRename || this.mode.isDesktopApp) ?'hide':'show']();
+            options && options.protect && _btn_protect.setDisabled(disable);
+            options && options.history && _btn_history.setDisabled(disable);
         },
 
         isVisible: function () {
@@ -486,6 +489,9 @@ define([
                 } else
                 if (type == 'protect') {
                     return this.options.miProtect ? this.options.miProtect : (this.options.miProtect = new Common.UI.MenuItem({}));
+                } else
+                if (type == 'history') {
+                    return this.options.miHistory ? this.options.miHistory : (this.options.miHistory = new Common.UI.MenuItem({}));
                 }
             } else {
                 if (type == 'save') {
@@ -496,6 +502,9 @@ define([
                 }else
                 if (type == 'protect') {
                     return this.miProtect;
+                }else
+                if (type == 'history') {
+                    return this.miHistory;
                 }
             }
         },

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

@@ -1584,7 +1584,7 @@ define([
             Common.UI.BaseView.prototype.initialize.call(this,arguments);
 
             this.menu = options.menu;
-            this.urlPref = 'resources/help/en/';
+            this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
             this.openUrl = null;
 
             this.en_data = [
@@ -1702,12 +1702,12 @@ define([
                 var config = {
                     dataType: 'json',
                     error: function () {
-                        if ( me.urlPref.indexOf('resources/help/en/')<0 ) {
-                            me.urlPref = 'resources/help/en/';
-                            store.url = 'resources/help/en/Contents.json';
+                        if ( me.urlPref.indexOf('resources/help/{{DEFAULT_LANG}}/')<0 ) {
+                            me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
+                            store.url = 'resources/help/{{DEFAULT_LANG}}/Contents.json';
                             store.fetch(config);
                         } else {
-                            me.urlPref = 'resources/help/en/';
+                            me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
                             store.reset(me.en_data);
                         }
                     },

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

@@ -108,18 +108,12 @@ define([
                 me.fireEvent('forms:clear');
             });
             if (this.mnuFormsColorPicker) {
-                $('#id-toolbar-menu-new-form-color').on('click', function (b, e) {
-                    me.fireEvent('forms:new-color');
+                this.btnHighlight.on('color:select', function(btn, color) {
+                    me.fireEvent('forms:select-color', [color]);
                 });
                 this.mnuNoFormsColor.on('click', function (item) {
                     me.fireEvent('forms:no-color', [item]);
                 });
-                this.mnuFormsColorPicker.on('select', function(picker, color) {
-                    me.fireEvent('forms:select-color', [color]);
-                });
-                this.btnHighlight.menu.on('show:after', function(picker, color) {
-                    me.fireEvent('forms:open-color', [color]);
-                });
             }
             this.btnPrevForm && this.btnPrevForm.on('click', function (b, e) {
                 me.fireEvent('forms:goto', ['prev']);
@@ -247,7 +241,20 @@ define([
                         caption     : this.textHighlight,
                         menu        : true,
                         disabled: true,
-                        dataHint    : '1',
+                        additionalItems: [ this.mnuNoFormsColor = new Common.UI.MenuItem({
+                                              id: 'id-toolbar-menu-no-highlight-form',
+                                              caption: this.textNoHighlight,
+                                              checkable: true,
+                                              style: 'padding-left: 20px;'
+                                          }),
+                                          {caption: '--'}],
+                        colors: ['000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333', '800000', 'FF6600',
+                                    '808000', '00FF00', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900', '99CC00', '339966',
+                                    '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF',
+                                    '993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', 'C9C8FF', 'CC99FF', 'FFFFFF'
+                                ],
+                        paletteHeight: 94,
+                        dataHint: '1',
                         dataHintDirection: 'left',
                         dataHintOffset: 'small'
                     });
@@ -303,28 +310,9 @@ define([
                 })).then(function(){
                     if (config.isEdit && config.canFeatureContentControl) {
                         if (config.canEditContentControl) {
-                            me.btnHighlight.setMenu(new Common.UI.Menu({
-                                items: [
-                                    me.mnuNoFormsColor = new Common.UI.MenuItem({
-                                        id: 'id-toolbar-menu-no-highlight-form',
-                                        caption: me.textNoHighlight,
-                                        checkable: true,
-                                        checked: me.btnHighlight.currentColor === null
-                                    }),
-                                    {caption: '--'},
-                                    {template: _.template('<div id="id-toolbar-menu-form-color" style="width: 169px; height: 94px; margin: 10px;"></div>')},
-                                    {template: _.template('<a id="id-toolbar-menu-new-form-color" style="padding-left:12px;">' + me.textNewColor + '</a>')}
-                                ]
-                            }));
-                            me.mnuFormsColorPicker = new Common.UI.ThemeColorPalette({
-                                el: $('#id-toolbar-menu-form-color'),
-                                colors: ['000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333', '800000', 'FF6600',
-                                    '808000', '00FF00', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900', '99CC00', '339966',
-                                    '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF',
-                                    '993366', 'C0C0C0', 'FF99CC', 'FFCC99', 'FFFF99', 'CCFFCC', 'CCFFFF', '99CCFF', 'CC99FF', 'FFFFFF'
-                                ],
-                                value: me.btnHighlight.currentColor
-                            });
+                            me.btnHighlight.setMenu();
+                            me.mnuFormsColorPicker = me.btnHighlight.getPicker();
+                            me.mnuNoFormsColor.setChecked(me.btnHighlight.currentColor === null);
                             me.btnHighlight.setColor(me.btnHighlight.currentColor || 'transparent');
                         } else {
                             me.btnHighlight.cmpEl.parents('.group').hide().prev('.separator').hide();
@@ -416,7 +404,6 @@ define([
             tipImageField: 'Insert image',
             tipViewForm: 'View form',
             textNoHighlight: 'No highlighting',
-            textNewColor: 'Add New Custom Color',
             textClear: 'Clear Fields',
             capBtnPrev: 'Previous Field',
             capBtnNext: 'Next Field',

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

@@ -86,7 +86,7 @@ define([
 
         initialize: function () {
             this.minimizedMode = true;
-            this._state = {};
+            this._state = {disabled: false};
         },
 
         render: function () {

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

@@ -171,7 +171,9 @@ define([
                         style: 'padding-left: 20px;'
                     },
                     {caption: '--'}],
-                additionalAlign: this.menuAddAlign
+                additionalAlign: this.menuAddAlign,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnColor.on('color:select', _.bind(this.onColorsSelect, this));
             this.btnColor.menu.items[0].on('toggle', _.bind(this.onLikeTextColor, this));
@@ -342,7 +344,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.btnEdit, this.cmbFormat, this.cmbAlign, this.cmbSize, this.levelsList];
+            return [this.btnEdit, this.cmbFormat, this.cmbAlign, this.cmbSize, this.btnColor, this.levelsList];
         },
 
         getDefaultFocusableComponent: function () {

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

@@ -837,18 +837,26 @@ define([
         },
 
         disableEditing: function(disable) {
-            DE.getController('Toolbar').DisableToolbar(disable, disable);
-            DE.getController('RightMenu').SetDisabled(disable, true);
-            DE.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
-            DE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
-            DE.getController('DocumentHolder').getView().SetDisabled(disable);
-            DE.getController('Navigation') && DE.getController('Navigation').SetDisabled(disable);
-
-            var comments = DE.getController('Common.Controllers.Comments');
-            if (comments)
-                comments.setPreviewMode(disable);
-
-            DE.getController('LeftMenu').setPreviewMode(disable);
+            Common.NotificationCenter.trigger('editing:disable', disable, {
+                viewMode: disable,
+                reviewMode: false,
+                fillFormwMode: false,
+                allowMerge: true,
+                allowSignature: false,
+                allowProtect: false,
+                rightMenu: {clear: false, disable: true},
+                statusBar: true,
+                leftMenu: {disable: false, previewMode: true},
+                fileMenu: false,
+                navigation: {disable: false, previewMode: true},
+                comments: {disable: false, previewMode: true},
+                chat: false,
+                review: true,
+                viewport: false,
+                documentHolder: true,
+                toolbar: true,
+                plugins: false
+            }, 'mailmerge');
 
             this.lockControls(DE.enumLockMM.preview, disable, {array: [this.btnInsField, this.btnEditData]});
         },

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

@@ -366,7 +366,8 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
 
             this.cmbBorderSize = new Common.UI.ComboBorderSize({
                 el: $('#paragraphadv-combo-border-size'),
-                style: "width: 93px;"
+                style: "width: 93px;",
+                takeFocusOnClose: true
             });
             var rec = this.cmbBorderSize.store.at(2);
             this.BorderSize = {ptValue: rec.get('value'), pxValue: rec.get('pxValue')};
@@ -377,7 +378,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 parentEl: $('#paragraphadv-border-color-btn'),
                 additionalAlign: this.menuAddAlign,
                 color: 'auto',
-                auto: true
+                auto: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.colorsBorder = this.btnBorderColor.getPicker();
             this.btnBorderColor.on('color:select', _.bind(this.onColorsBorderSelect, this));
@@ -420,7 +423,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.btnBackColor = new Common.UI.ColorButton({
                 parentEl: $('#paragraphadv-back-color-btn'),
                 transparent: true,
-                additionalAlign: this.menuAddAlign
+                additionalAlign: this.menuAddAlign,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.colorsBack = this.btnBackColor.getPicker();
             this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
@@ -682,10 +687,11 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                 this.cmbTextAlignment, this.cmbOutlinelevel, this.numIndentsLeft, this.numIndentsRight, this.cmbSpecial, this.numSpecialBy,
                 this.numSpacingBefore, this.numSpacingAfter, this.cmbLineRule, this.numLineHeight, this.chAddInterval, // 0 tab
                 this.chBreakBefore, this.chKeepLines, this.chOrphan, this.chKeepNext, this.chLineNumbers, // 1 tab
+                this.cmbBorderSize, this.btnBorderColor].concat(this._btnsBorderPosition).concat([this.btnBackColor,  // 2 tab
                 this.chStrike, this.chSubscript, this.chDoubleStrike, this.chSmallCaps, this.chSuperscript, this.chAllCaps, this.numSpacing, this.numPosition, // 3 tab
                 this.numDefaultTab, this.numTab, this.cmbAlign, this.cmbLeader, this.tabList, this.btnAddTab, this.btnRemoveTab, this.btnRemoveAll,// 4 tab
                 this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight // 5 tab
-            ];
+            ]);
         },
 
         onCategoryClick: function(btn, index, cmp, e) {
@@ -700,6 +706,9 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                     case 1:
                         me.chBreakBefore.focus();
                         break;
+                    case 2:
+                        me.cmbBorderSize.focus();
+                        break;
                     case 3:
                         me.chStrike.focus();
                         if (e && (e instanceof jQuery.Event))

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

@@ -393,22 +393,26 @@ define([
             if (this._state.DisabledEditing != disable) {
                 this._state.DisabledEditing = disable;
 
-                var rightMenuController = DE.getController('RightMenu');
-                if (disable && rightMenuController.rightmenu.GetActivePane() !== 'id-signature-settings')
-                    rightMenuController.rightmenu.clearSelection();
-                rightMenuController.SetDisabled(disable, false, true);
-                DE.getController('Toolbar').DisableToolbar(disable, disable);
-                DE.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
-                DE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable);
-                DE.getController('DocumentHolder').getView().SetDisabled(disable, true);
-                DE.getController('Navigation') && DE.getController('Navigation').SetDisabled(disable);
-
-                // var leftMenu = DE.getController('LeftMenu').leftMenu;
-                // leftMenu.btnComments.setDisabled(disable);
-                DE.getController('LeftMenu').setPreviewMode(disable);
-                var comments = DE.getController('Common.Controllers.Comments');
-                if (comments)
-                    comments.setPreviewMode(disable);
+                Common.NotificationCenter.trigger('editing:disable', disable, {
+                    viewMode: disable,
+                    reviewMode: false,
+                    fillFormwMode: false,
+                    allowMerge: false,
+                    allowSignature: true,
+                    allowProtect: true,
+                    rightMenu: {clear: disable && (DE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true},
+                    statusBar: true,
+                    leftMenu: {disable: false, previewMode: true},
+                    fileMenu: false,
+                    navigation: {disable: false, previewMode: true},
+                    comments: {disable: false, previewMode: true},
+                    chat: false,
+                    review: true,
+                    viewport: false,
+                    documentHolder: true,
+                    toolbar: true,
+                    plugins: false
+                }, 'signature');
             }
         },
 

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

@@ -152,7 +152,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
                 this.cmbUnit.setDisabled(!value);
                 if (this._changedProps) {
                     if (value && this.nfWidth.getNumberValue()>0)
-                        this._changedProps.put_Width(this.cmbUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue()));
+                        this._changedProps.put_Width(this.cmbUnit.getValue() ? -this.nfWidth.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfWidth.getNumberValue()));
                     else
                         this._changedProps.put_Width(null);
                 }
@@ -447,7 +447,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
                 this.cmbPrefWidthUnit.setDisabled(!value);
                 if (this._changedProps) {
                     if (value && this.nfPrefWidth.getNumberValue()>0)
-                        this._changedProps.put_CellsWidth(this.cmbPrefWidthUnit.getValue() ? -field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfPrefWidth.getNumberValue()));
+                        this._changedProps.put_CellsWidth(this.cmbPrefWidthUnit.getValue() ? -this.nfPrefWidth.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(this.nfPrefWidth.getNumberValue()));
                     else
                         this._changedProps.put_CellsWidth(null);
                 }
@@ -879,7 +879,8 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
 
             this.cmbBorderSize = new Common.UI.ComboBorderSize({
                 el: $('#tableadv-combo-border-size'),
-                style: "width: 93px;"
+                style: "width: 93px;",
+                takeFocusOnClose: true
             });
             var rec = this.cmbBorderSize.store.at(1);
             this.BorderSize = {ptValue: rec.get('value'), pxValue: rec.get('pxValue')};
@@ -890,7 +891,9 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
                 parentEl: $('#tableadv-border-color-btn'),
                 additionalAlign: this.menuAddAlign,
                 color: 'auto',
-                auto: true
+                auto: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnBorderColor.on('color:select', _.bind(me.onColorsBorderSelect, me));
             this.btnBorderColor.on('auto:select', _.bind(me.onColorsBorderSelect, me));
@@ -899,7 +902,9 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.btnBackColor = new Common.UI.ColorButton({
                 parentEl: $('#tableadv-button-back-color'),
                 additionalAlign: this.menuAddAlign,
-                transparent: true
+                transparent: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnBackColor.on('color:select', _.bind(this.onColorsBackSelect, this));
             this.colorsBack = this.btnBackColor.getPicker();
@@ -907,7 +912,9 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             this.btnTableBackColor = new Common.UI.ColorButton({
                 parentEl: $('#tableadv-button-table-back-color'),
                 additionalAlign: this.menuAddAlign,
-                transparent: true
+                transparent: true,
+                cls: 'move-focus',
+                takeFocusOnClose: true
             });
             this.btnTableBackColor.on('color:select', _.bind(this.onColorsTableBackSelect, this));
             this.colorsTableBack = this.btnTableBackColor.getPicker();
@@ -1012,11 +1019,12 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             return [
                 this.chWidth, this.nfWidth, this.cmbUnit, this.chAutofit, this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, this.chAllowSpacing, this.nfSpacing, // 0 tab
                 this.chPrefWidth, this.nfPrefWidth, this.cmbPrefWidthUnit, this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, this.chWrapText, // 1 tab
+                this.cmbBorderSize, this.btnBorderColor].concat(this._btnsBorderPosition).concat(this._btnsTableBorderPosition).concat([this.btnBackColor, this.btnTableBackColor,
                 this.radioHAlign, this.cmbHAlign , this.radioHPosition, this.cmbHRelative, this.spnX, this.cmbHPosition,
                 this.radioVAlign, this.cmbVAlign , this.radioVPosition, this.cmbVRelative, this.spnY, this.cmbVPosition, this.chMove, this.chOverlap, // 3 tab
                 this.spnIndentLeft, this.spnDistanceTop, this.spnDistanceLeft, this.spnDistanceBottom, this.spnDistanceRight, // 4 tab
                 this.inputAltTitle, this.textareaAltDescription  // 5 tab
-            ];
+            ]);
         },
 
         onCategoryClick: function(btn, index) {
@@ -1038,6 +1046,9 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
                         else
                             me.chPrefWidth.focus();
                         break;
+                    case 2:
+                        me.cmbBorderSize.focus();
+                        break;
                     case 3:
                         if (!me.cmbHAlign.isDisabled())
                             me.cmbHAlign.focus();

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

@@ -284,19 +284,8 @@ define([
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-fontcolor',
                         split: true,
-                        menu: new Common.UI.Menu({
-                            cls: 'shifted-left',
-                            items: [
-                                {
-                                    id: 'id-toolbar-menu-auto-fontcolor',
-                                    caption: this.textAutoColor,
-                                    template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
-                                },
-                                {caption: '--'},
-                                {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')},
-                                {template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="">' + this.textNewColor + '</a>')}
-                            ]
-                        }),
+                        menu: true,
+                        auto: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: '0, -16'
@@ -308,12 +297,8 @@ define([
                         cls: 'btn-toolbar',
                         iconCls: 'toolbar__icon btn-paracolor',
                         split: true,
-                        menu: new Common.UI.Menu({
-                            items: [
-                                {template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 169px; height: 216px; margin: 10px;"></div>')},
-                                {template: _.template('<a id="id-toolbar-menu-new-paracolor" style="padding-left:12px;">' + this.textNewColor + '</a>')}
-                            ]
-                        }),
+                        transparent: true,
+                        menu: true,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
                         dataHintOffset: '0, -16'
@@ -2153,21 +2138,19 @@ define([
                         ]
                     });
                     this.mnuHighlightColorPicker.select('FFFF00');
+                    this.btnHighlightColor.setPicker(this.mnuHighlightColorPicker);
                 }
 
                 if (this.btnFontColor.cmpEl) {
+                    this.btnFontColor.setMenu();
+                    this.mnuFontColorPicker = this.btnFontColor.getPicker();
                     this.btnFontColor.setColor(this.btnFontColor.currentColor || 'transparent');
-                    this.mnuFontColorPicker = new Common.UI.ThemeColorPalette({
-                        el: $('#id-toolbar-menu-fontcolor')
-                    });
                 }
 
                 if (this.btnParagraphColor.cmpEl) {
+                    this.btnParagraphColor.setMenu();
+                    this.mnuParagraphColorPicker = this.btnParagraphColor.getPicker();
                     this.btnParagraphColor.setColor(this.btnParagraphColor.currentColor || 'transparent');
-                    this.mnuParagraphColorPicker = new Common.UI.ThemeColorPalette({
-                        el: $('#id-toolbar-menu-paracolor'),
-                        transparent: true
-                    });
                 }
 
                 if (this.btnContentControls.cmpEl) {

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

@@ -314,44 +314,24 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             });
             this.textControls.push(this.btnStrikeout);
 
-            var initNewColor = function(btn, picker_el) {
-                if (btn && btn.cmpEl) {
-                    btn.currentColor = 'c0c0c0';
-                    btn.setColor( btn.currentColor);
-                    var picker = new Common.UI.ThemeColorPalette({
-                        el: $(picker_el)
-                    });
-                }
-                btn.menu.cmpEl.on('click', picker_el+'-new', _.bind(function() {
-                    picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
-                }, me));
-                picker.on('select', _.bind(me.onColorSelect, me));
-                return picker;
-            };
             this.btnTextColor = new Common.UI.ButtonColored({
                 parentEl: $('#watermark-textcolor'),
                 cls         : 'btn-toolbar',
                 iconCls     : 'toolbar__icon btn-fontcolor',
                 hint        : this.textColor,
-                menu        : new Common.UI.Menu({
-                    cls: 'shifted-left',
-                    additionalAlign: this.menuAddAlign,
-                    items: [
-                    {
-                        id: 'watermark-auto-color',
-                        caption: this.textAuto,
-                        template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
-                    },
-                    {caption: '--'},
-                        { template: _.template('<div id="watermark-menu-textcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') },
-                        { template: _.template('<a id="watermark-menu-textcolor-new">' + this.textNewColor + '</a>') }
-                    ]
-                })
+                additionalAlign: this.menuAddAlign,
+                auto: true,
+                color: 'c0c0c0',
+                menu: true
             });
-            this.mnuTextColorPicker = initNewColor(this.btnTextColor, "#watermark-menu-textcolor");
-            $('#watermark-auto-color').on('click', _.bind(this.onAutoColor, this));
+            this.btnTextColor.setMenu();
+            this.mnuTextColorPicker = this.btnTextColor.getPicker();
+            this.btnTextColor.currentColor = 'c0c0c0';
             this.textControls.push(this.btnTextColor);
 
+            this.btnTextColor.on('color:select', _.bind(this.onColorSelect, this));
+            this.btnTextColor.on('auto:select',  _.bind(this.onAutoColor, this));
+
             this.chTransparency = new Common.UI.CheckBox({
                 el: $('#watermark-chb-transparency'),
                 labelText: this.textTransparency,
@@ -402,31 +382,18 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
             }, 10);
         },
 
-        onColorSelect: function(picker, color) {
-            var clr_item = this.btnTextColor.menu.$el.find('#watermark-auto-color > a');
-            clr_item.hasClass('selected') && clr_item.removeClass('selected');
+        onColorSelect: function(btn, color) {
             this.isAutoColor = false;
-
             this.btnTextColor.currentColor = color;
-            this.btnTextColor.setColor( this.btnTextColor.currentColor);
         },
 
         updateThemeColors: function() {
             this.mnuTextColorPicker.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
         },
 
-        addNewColor: function(picker, btn) {
-            picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
-        },
-
         onAutoColor: function(e) {
-            var clr_item = this.btnTextColor.menu.$el.find('#watermark-auto-color > a');
-            !clr_item.hasClass('selected') && clr_item.addClass('selected');
             this.isAutoColor = true;
-
             this.btnTextColor.currentColor = "000";
-            this.btnTextColor.setColor( this.btnTextColor.currentColor);
-            this.mnuTextColorPicker.clearSelection();
         },
 
         afterRender: function() {
@@ -582,16 +549,14 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                         this.btnUnderline.toggle(val.get_Underline());
                         this.btnStrikeout.toggle(val.get_Strikeout());
                         var color = val.get_Color(),
-                            clr_item = this.btnTextColor.menu.$el.find('#watermark-auto-color > a'),
                             clr = "c0c0c0";
 
                         if (color.get_auto()) {
                             clr = "000";
                             this.isAutoColor = true;
                             this.mnuTextColorPicker.clearSelection();
-                            !clr_item.hasClass('selected') && clr_item.addClass('selected');
+                            this.btnTextColor.setAutoColor(true);
                         } else {
-                            clr_item.hasClass('selected') && clr_item.removeClass('selected');
                             if (color) {
                                 color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME ?
                                     clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value()} :
@@ -718,7 +683,6 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
         textDiagonal: 'Diagonal',
         textHor: 'Horizontal',
         textColor: 'Text color',
-        textNewColor: 'Add New Custom Color',
         textLanguage: 'Language',
         textFromStorage: 'From Storage',
         textSelect: 'Select Image'

apps/documenteditor/main/locale/ca.json

@@ -18,6 +18,7 @@
   "Common.Controllers.ReviewChanges.textBreakBefore": "Salt de pàgina abans",
   "Common.Controllers.ReviewChanges.textCaps": "Majúscules ",
   "Common.Controllers.ReviewChanges.textCenter": "Centrar",
+  "Common.Controllers.ReviewChanges.textChar": "Nivell de caràcter",
   "Common.Controllers.ReviewChanges.textChart": "Gràfic",
   "Common.Controllers.ReviewChanges.textColor": "Color de Font",
   "Common.Controllers.ReviewChanges.textContextual": "No afegiu interval entre paràgrafs del mateix estil",
@@ -47,6 +48,10 @@
   "Common.Controllers.ReviewChanges.textNot": "No",
   "Common.Controllers.ReviewChanges.textNoWidow": "Sense control de la finestra",
   "Common.Controllers.ReviewChanges.textNum": "Canviar numeració",
+  "Common.Controllers.ReviewChanges.textOff": "{0} Ja no s'utilitza el seguiment de canvis.",
+  "Common.Controllers.ReviewChanges.textOffGlobal": "{0} S'ha inhabilitat el Seguiment de Canvis per a tothom.",
+  "Common.Controllers.ReviewChanges.textOn": "{0} Ara s'està utilitzant el seguiment de canvis.",
+  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} S'ha activat el seguiment de canvis per a tothom.",
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paràgraf Suprimit</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paràgraf Formatat",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paràgraf Inserit</b>",
@@ -57,6 +62,7 @@
   "Common.Controllers.ReviewChanges.textRight": "Alinear dreta",
   "Common.Controllers.ReviewChanges.textShape": "Forma",
   "Common.Controllers.ReviewChanges.textShd": "Color de Fons",
+  "Common.Controllers.ReviewChanges.textShow": "Mostra els canvis a",
   "Common.Controllers.ReviewChanges.textSmallCaps": "Majúscules petites",
   "Common.Controllers.ReviewChanges.textSpacing": "Espai",
   "Common.Controllers.ReviewChanges.textSpacingAfter": "Espai després",
@@ -68,19 +74,56 @@
   "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Files de Taula Afegides</b>",
   "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Files de Taula Suprimides</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Canviar tabulació",
+  "Common.Controllers.ReviewChanges.textTitleComparison": "Paràmetres de comparació",
   "Common.Controllers.ReviewChanges.textUnderline": "Subratllar",
   "Common.Controllers.ReviewChanges.textUrl": "Enganxar la URL del document",
   "Common.Controllers.ReviewChanges.textWidow": "Control Finestra",
+  "Common.Controllers.ReviewChanges.textWord": "Nivell de paraula",
   "Common.define.chartData.textArea": "Àrea",
+  "Common.define.chartData.textAreaStacked": "Àrea apilada",
+  "Common.define.chartData.textAreaStackedPer": "Àrea apilada al 100%",
   "Common.define.chartData.textBar": "Barra",
+  "Common.define.chartData.textBarNormal": "Columna agrupada",
+  "Common.define.chartData.textBarNormal3d": "Columna 3D agrupada",
+  "Common.define.chartData.textBarNormal3dPerspective": "Columna 3D",
+  "Common.define.chartData.textBarStacked": "Columna apilada",
+  "Common.define.chartData.textBarStacked3d": "Columna 3D apilada",
+  "Common.define.chartData.textBarStackedPer": "Columna apilada al 100%",
+  "Common.define.chartData.textBarStackedPer3d": "columna 3D apilada al  100%",
   "Common.define.chartData.textCharts": "Gràfics",
   "Common.define.chartData.textColumn": "Columna",
+  "Common.define.chartData.textCombo": "Combo",
+  "Common.define.chartData.textComboAreaBar": "Àrea apilada - columna agrupada",
+  "Common.define.chartData.textComboBarLine": "Columna-línia agrupada",
+  "Common.define.chartData.textComboBarLineSecondary": " Columna-línia agrupada a l'eix secundari",
+  "Common.define.chartData.textComboCustom": "Combinació personalitzada",
+  "Common.define.chartData.textDoughnut": "Donut",
+  "Common.define.chartData.textHBarNormal": "Barra agrupada",
+  "Common.define.chartData.textHBarNormal3d": "Barra 3D agrupada",
+  "Common.define.chartData.textHBarStacked": "Barra apilada",
+  "Common.define.chartData.textHBarStacked3d": "Barra 3D apilada",
+  "Common.define.chartData.textHBarStackedPer": "Barra apilada al 100%",
+  "Common.define.chartData.textHBarStackedPer3d": "Barra 3-D apilada al 100%",
   "Common.define.chartData.textLine": "Línia",
+  "Common.define.chartData.textLine3d": "Línia 3D",
+  "Common.define.chartData.textLineMarker": "Línia amb marcadors",
+  "Common.define.chartData.textLineStacked": "Línia apilada",
+  "Common.define.chartData.textLineStackedMarker": "Línia apilada amb marcadors",
+  "Common.define.chartData.textLineStackedPer": "Línia apilada al 100%",
+  "Common.define.chartData.textLineStackedPerMarker": "Línia apilada al 100% amb marcadors",
   "Common.define.chartData.textPie": "Gràfic circular",
+  "Common.define.chartData.textPie3d": "Pastís 3D",
   "Common.define.chartData.textPoint": "XY (Dispersió)",
+  "Common.define.chartData.textScatter": "Dispersió",
+  "Common.define.chartData.textScatterLine": "Dispersió amb línies rectes",
+  "Common.define.chartData.textScatterLineMarker": "Dispersió amb línies rectes i marcadors",
+  "Common.define.chartData.textScatterSmooth": "Dispersió amb línies suaus",
+  "Common.define.chartData.textScatterSmoothMarker": "Dispersió amb línies suaus i marcadors",
   "Common.define.chartData.textStock": "Existències",
   "Common.define.chartData.textSurface": "Superfície",
-  "Common.Translation.warnFileLocked": "El document està sent editat per una altra aplicació. Podeu continuar editant i guardar-lo com a còpia.",
+  "Common.Translation.warnFileLocked": "No pot editar aquest fitxer perquè s'està editant en una altra aplicació.",
+  "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
+  "Common.Translation.warnFileLockedBtnView": "Obrir per veure",
   "Common.UI.Calendar.textApril": "Abril",
   "Common.UI.Calendar.textAugust": "Agost",
   "Common.UI.Calendar.textDecember": "Desembre",
@@ -138,6 +181,9 @@
   "Common.UI.SynchronizeTip.textSynchronize": "Un altre usuari ha canviat el document.<br>Feu clic per desar els canvis i tornar a carregar les actualitzacions.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Colors Estàndards",
   "Common.UI.ThemeColorPalette.textThemeColors": "Colors Tema",
+  "Common.UI.Themes.txtThemeClassicLight": "Llum clàssica",
+  "Common.UI.Themes.txtThemeDark": "Fosc",
+  "Common.UI.Themes.txtThemeLight": "Llum",
   "Common.UI.Window.cancelButtonText": "Cancel·lar",
   "Common.UI.Window.closeButtonText": "Tancar",
   "Common.UI.Window.noButtonText": "No",
@@ -159,10 +205,12 @@
   "Common.Views.About.txtVersion": "Versió",
   "Common.Views.AutoCorrectDialog.textAdd": "Afegir",
   "Common.Views.AutoCorrectDialog.textApplyText": "Aplica a mesura que escrius",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Correcció Automàtica",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "Format automàtic a mesura que escriviu",
   "Common.Views.AutoCorrectDialog.textBulleted": "Llistes automàtiques de vinyetes",
   "Common.Views.AutoCorrectDialog.textBy": "Per",
   "Common.Views.AutoCorrectDialog.textDelete": "Esborrar",
+  "Common.Views.AutoCorrectDialog.textFLSentence": "Posa en majúscules la primera lletra de les frases",
   "Common.Views.AutoCorrectDialog.textHyphens": "Guions (--) amb guió (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Correcció Automàtica Matemàtica",
   "Common.Views.AutoCorrectDialog.textNumbered": "Llistes numerades automàtiques",
@@ -212,11 +260,13 @@
   "Common.Views.ExternalMergeEditor.textSave": "Desar i Sortir",
   "Common.Views.ExternalMergeEditor.textTitle": "Receptors de Fusió de Correu",
   "Common.Views.Header.labelCoUsersDescr": "Usuaris que editen el fitxer:",
+  "Common.Views.Header.textAddFavorite": "Marca com a favorit",
   "Common.Views.Header.textAdvSettings": "Configuració Avançada",
   "Common.Views.Header.textBack": "Obrir ubicació del arxiu",
   "Common.Views.Header.textCompactView": "Amagar la Barra d'Eines",
   "Common.Views.Header.textHideLines": "Amagar Regles",
   "Common.Views.Header.textHideStatusBar": "Amagar la Barra d'Estat",
+  "Common.Views.Header.textRemoveFavorite": "Elimina dels Favorits",
   "Common.Views.Header.textZoom": "Zoom",
   "Common.Views.Header.tipAccessRights": "Gestiona els drets d’accés al document",
   "Common.Views.Header.tipDownload": "Descarregar arxiu",
@@ -290,10 +340,15 @@
   "Common.Views.ReviewChanges.strFastDesc": "Co-edició a temps real. Tots",
   "Common.Views.ReviewChanges.strStrict": "Estricte",
   "Common.Views.ReviewChanges.strStrictDesc": "Feu servir el botó \"Desa\" per sincronitzar els canvis que feu i els altres.",
+  "Common.Views.ReviewChanges.textEnable": "Activar",
+  "Common.Views.ReviewChanges.textWarnTrackChanges": "El seguiment de canvis s'activarà per a tots els usuaris amb accés total. La pròxima vegada que algú obri el document, el seguiment de canvis seguirà activat.",
+  "Common.Views.ReviewChanges.textWarnTrackChangesTitle": "Voleu activar el seguiment de canvis per a tothom?",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Acceptar el canvi actual",
   "Common.Views.ReviewChanges.tipCoAuthMode": "Configura el mode de coedició",
   "Common.Views.ReviewChanges.tipCommentRem": "Esborrar comentaris",
   "Common.Views.ReviewChanges.tipCommentRemCurrent": "Esborrar comentaris actuals",
+  "Common.Views.ReviewChanges.tipCommentResolve": "Resoldre els comentaris",
+  "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Resol els comentaris actuals",
   "Common.Views.ReviewChanges.tipCompare": "Comparar el document actual amb un altre",
   "Common.Views.ReviewChanges.tipHistory": "Mostra l'historial de versions",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Rebutjar canvi actual",
@@ -305,7 +360,7 @@
   "Common.Views.ReviewChanges.txtAccept": "Acceptar",
   "Common.Views.ReviewChanges.txtAcceptAll": "Acceptar Tots els Canvis",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Acceptar canvis",
-  "Common.Views.ReviewChanges.txtAcceptCurrent": "Acceptar els Canvis Actuals",
+  "Common.Views.ReviewChanges.txtAcceptCurrent": "Acceptar el Canvis Actual",
   "Common.Views.ReviewChanges.txtChat": "Xat",
   "Common.Views.ReviewChanges.txtClose": "Tancar",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Mode de Coedició",
@@ -314,6 +369,11 @@
   "Common.Views.ReviewChanges.txtCommentRemMy": "Esborrar els meus comentaris",
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Esborrar els meus actuals comentaris",
   "Common.Views.ReviewChanges.txtCommentRemove": "Esborrar",
+  "Common.Views.ReviewChanges.txtCommentResolve": "Resol",
+  "Common.Views.ReviewChanges.txtCommentResolveAll": "Resoldre tots els comentaris",
+  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Resol els comentaris actuals",
+  "Common.Views.ReviewChanges.txtCommentResolveMy": "Resoldre els Meus Comentaris",
+  "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Resoldre els Meus Comentaris Actuals",
   "Common.Views.ReviewChanges.txtCompare": "Comparar",
   "Common.Views.ReviewChanges.txtDocLang": "Idioma",
   "Common.Views.ReviewChanges.txtFinal": "Tots el canvis acceptats (Previsualitzar)",
@@ -322,6 +382,10 @@
   "Common.Views.ReviewChanges.txtMarkup": "Tots els canvis (Edició)",
   "Common.Views.ReviewChanges.txtMarkupCap": "Cambis",
   "Common.Views.ReviewChanges.txtNext": "Següent",
+  "Common.Views.ReviewChanges.txtOff": "DESACTIVAT per mi",
+  "Common.Views.ReviewChanges.txtOffGlobal": "DESACTIVAT per mi i per tothom",
+  "Common.Views.ReviewChanges.txtOn": "ACTIU per mi",
+  "Common.Views.ReviewChanges.txtOnGlobal": "ACTIU per mi i per tothom",
   "Common.Views.ReviewChanges.txtOriginal": "Tots els canvis rebutjats (Previsualitzar)",
   "Common.Views.ReviewChanges.txtOriginalCap": "Original",
   "Common.Views.ReviewChanges.txtPrev": "Anterior",
@@ -336,7 +400,7 @@
   "Common.Views.ReviewChangesDialog.textTitle": "Revisar canvis",
   "Common.Views.ReviewChangesDialog.txtAccept": "Acceptar",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Acceptar Tots els Canvis",
-  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Acceptar el Canvi Actual",
+  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Acceptar el canvi actual",
   "Common.Views.ReviewChangesDialog.txtNext": "Al següent canvi",
   "Common.Views.ReviewChangesDialog.txtPrev": "Al canvi anterior",
   "Common.Views.ReviewChangesDialog.txtReject": "Rebutjar",
@@ -349,7 +413,7 @@
   "Common.Views.ReviewPopover.textEdit": "Acceptar",
   "Common.Views.ReviewPopover.textFollowMove": "Seguir Moure",
   "Common.Views.ReviewPopover.textMention": "+mention proporcionarà accés al document i enviarà un correu electrònic",
-  "Common.Views.ReviewPopover.textMentionNotify": "+mention notificarà l'usuari per correu electrònic",
+  "Common.Views.ReviewPopover.textMentionNotify": "+mention notificarà a l'usuari per correu electrònic",
   "Common.Views.ReviewPopover.textOpenAgain": "Obriu de nou",
   "Common.Views.ReviewPopover.textReply": "Contestar",
   "Common.Views.ReviewPopover.textResolve": "Resol",
@@ -362,6 +426,7 @@
   "Common.Views.SignDialog.textChange": "Canviar",
   "Common.Views.SignDialog.textInputName": "Posar nom de qui ho firma",
   "Common.Views.SignDialog.textItalic": "Itàlica",
+  "Common.Views.SignDialog.textNameError": "El nom del signant no pot estar buit.",
   "Common.Views.SignDialog.textPurpose": "Finalitat de signar aquest document",
   "Common.Views.SignDialog.textSelect": "Selecciona",
   "Common.Views.SignDialog.textSelectImage": "Seleccionar Imatge",
@@ -407,6 +472,9 @@
   "Common.Views.SymbolTableDialog.textSymbols": "Símbols",
   "Common.Views.SymbolTableDialog.textTitle": "Símbol",
   "Common.Views.SymbolTableDialog.textTradeMark": "Símbol de Marca Comercial",
+  "Common.Views.UserNameDialog.textDontShow": "No em tornis a preguntar",
+  "Common.Views.UserNameDialog.textLabel": "Etiqueta:",
+  "Common.Views.UserNameDialog.textLabelError": "L'etiqueta no pot estar en blanc.",
   "DE.Controllers.LeftMenu.leavePageText": "Es perdran tots els canvis no guardats en aquest document.<br>Feu clic a \"Cancel·lar\" i, a continuació, \"Desa\" per desar-los. Feu clic a \"OK\" per descartar tots els canvis no desats.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Document sense nom",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avis",
@@ -432,6 +500,7 @@
   "DE.Controllers.Main.errorAccessDeny": "Intenteu realitzar una acció per la qual no teniu drets.<br>Poseu-vos en contacte amb l'administrador del servidor de documents.",
   "DE.Controllers.Main.errorBadImageUrl": "Enllaç de la Imatge Incorrecte",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "S'ha perdut la connexió amb el servidor. El document no es pot editar ara mateix.",
+  "DE.Controllers.Main.errorComboSeries": "Per crear un diagrama combinat, seleccioneu almenys dues sèries de dades.",
   "DE.Controllers.Main.errorCompare": "La funció de comparació de documents no està disponible durant la coedició.",
   "DE.Controllers.Main.errorConnectToServer": "El document no s'ha pogut desar. Comproveu la configuració de la connexió o poseu-vos en contacte amb el vostre administrador.<br>Quan feu clic al botó \"D'acord\", se us demanarà que descarregueu el document.",
   "DE.Controllers.Main.errorDatabaseConnection": "Error extern.<br>Error de connexió de base de dades. Contacteu amb l'assistència en cas que l'error continuï.",
@@ -454,7 +523,9 @@
   "DE.Controllers.Main.errorSessionAbsolute": "La sessió d’edició del document ha caducat. Torneu a carregar la pàgina.",
   "DE.Controllers.Main.errorSessionIdle": "El document no s’ha editat des de fa temps. Torneu a carregar la pàgina.",
   "DE.Controllers.Main.errorSessionToken": "S'ha interromput la connexió amb el servidor. Torneu a carregar la pàgina.",
+  "DE.Controllers.Main.errorSetPassword": "No s'ha pogut establir la contrasenya.",
   "DE.Controllers.Main.errorStockChart": "Ordre de fila incorrecte. Per crear un gràfic de valors, col·loqueu les dades del full en l’ordre següent:<br>preu d’obertura, preu màxim, preu mínim, preu de tancament.",
+  "DE.Controllers.Main.errorSubmit": "L'enviament ha fallat.",
   "DE.Controllers.Main.errorToken": "El testimoni de seguretat del document no està format correctament.<br>Contacteu l'administrador del servidor de documents.",
   "DE.Controllers.Main.errorTokenExpire": "El testimoni de seguretat del document ha caducat.<br>Contacteu amb l'administrador del Document Server.",
   "DE.Controllers.Main.errorUpdateVersion": "La versió del fitxer s'ha canviat. La pàgina es tornarà a carregar.",
@@ -463,6 +534,7 @@
   "DE.Controllers.Main.errorUsersExceed": "S'ha superat el nombre d’usuaris permès pel pla de preus",
   "DE.Controllers.Main.errorViewerDisconnect": "Es perd la connexió. Encara podeu visualitzar el document,<br>però no podreu descarregar-lo ni imprimir-lo fins que no es restableixi la connexió i es torni a carregar la pàgina.",
   "DE.Controllers.Main.leavePageText": "Heu fet canvis no guardats en aquest document. Feu clic a \"Continua en aquesta pàgina\" i, a continuació, \"Desa\" per desar-les. Feu clic a \"Deixa aquesta pàgina\" per descartar tots els canvis no desats.",
+  "DE.Controllers.Main.leavePageTextOnClose": "Es perdran tots els canvis no guardats en aquest document.<br>Feu clic a \"Cancel·lar\" i, a continuació, \"Desa\" per desar-los. Feu clic a \"OK\" per descartar tots els canvis no desats.",
   "DE.Controllers.Main.loadFontsTextText": "Carregant dades...",
   "DE.Controllers.Main.loadFontsTitleText": "Carregant Dades",
   "DE.Controllers.Main.loadFontTextText": "Carregant dades...",
@@ -485,6 +557,7 @@
   "DE.Controllers.Main.requestEditFailedMessageText": "Algú està editant aquest document ara mateix. Si us plau, intenta-ho més tard.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Accés denegat",
   "DE.Controllers.Main.saveErrorText": "S'ha produït un error en desar el fitxer.",
+  "DE.Controllers.Main.saveErrorTextDesktop": "Aquest fitxer no es pot desar o crear.<br>Les raons possibles són:<br>1. El fitxer és de només lectura. <br>2. El fitxer està sent editat per altres usuaris. <br>3. El disc està ple o corromput.",
   "DE.Controllers.Main.savePreparingText": "Preparant per guardar",
   "DE.Controllers.Main.savePreparingTitle": "Preparant per guardar. Si us plau, esperi",
   "DE.Controllers.Main.saveTextText": "Desant Document...",
@@ -504,15 +577,20 @@
   "DE.Controllers.Main.textContactUs": "Contacte de Vendes",
   "DE.Controllers.Main.textConvertEquation": "Aquesta equació es va crear amb una versió antiga de l'editor d'equacions que ja no és compatible. Per editar-la, converteix l’equació al format d’Office Math ML.<br>Converteix ara?",
   "DE.Controllers.Main.textCustomLoader": "Tingueu en compte que, segons els termes de la llicència, no teniu dret a canviar el carregador.<br>Consulteu el nostre departament de vendes per obtenir un pressupost.",
+  "DE.Controllers.Main.textGuest": "Convidat",
   "DE.Controllers.Main.textHasMacros": "El fitxer conté macros automàtiques.<br>Voleu executar macros?",
   "DE.Controllers.Main.textLearnMore": "Aprèn Més",
   "DE.Controllers.Main.textLoadingDocument": "Carregant document",
+  "DE.Controllers.Main.textLongName": "Introduïu un nom que sigui inferior a 128 caràcters.",
   "DE.Controllers.Main.textNoLicenseTitle": "Heu arribat al límit de la llicència",
   "DE.Controllers.Main.textPaidFeature": "Funció de pagament",
-  "DE.Controllers.Main.textRemember": "Recorda la meva elecció",
+  "DE.Controllers.Main.textRemember": "Recordar la meva elecció per a tots els fitxers",
+  "DE.Controllers.Main.textRenameError": "El nom d'usuari no pot estar buit.",
+  "DE.Controllers.Main.textRenameLabel": "Introduïu un nom per a la col·laboració",
   "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Mode estricte",
   "DE.Controllers.Main.textTryUndoRedo": "Les funcions Desfés / Rehabiliteu estan desactivades per al mode de coedició ràpida. Feu clic al botó \"Mode estricte\" per canviar al mode de coedició estricte per editar el fitxer sense que hi hagi interferències d'altres usuaris i enviar els canvis només després de desar-lo ells. Podeu canviar entre els modes de coedició mitjançant l'editor Paràmetres avançats.",
+  "DE.Controllers.Main.textTryUndoRedoWarn": "Les funcions Desfer/Refer estan desactivades per al mode de coedició ràpida.",
   "DE.Controllers.Main.titleLicenseExp": "Llicència Caducada",
   "DE.Controllers.Main.titleServerVersion": "S'ha actualitzat l'editor",
   "DE.Controllers.Main.titleUpdateVersion": "Versió canviada",
@@ -525,6 +603,7 @@
   "DE.Controllers.Main.txtCallouts": "Trucades",
   "DE.Controllers.Main.txtCharts": "Gràfics",
   "DE.Controllers.Main.txtChoose": "Tria un element",
+  "DE.Controllers.Main.txtClickToLoad": "Clicar per carregar la imatge",
   "DE.Controllers.Main.txtCurrentDocument": "Actual Document",
   "DE.Controllers.Main.txtDiagramTitle": "Gràfic Títol",
   "DE.Controllers.Main.txtEditingMode": "Establir el mode d'edició ...",
@@ -545,7 +624,9 @@
   "DE.Controllers.Main.txtMissArg": "Falta Argument",
   "DE.Controllers.Main.txtMissOperator": "Falta Operador",
   "DE.Controllers.Main.txtNeedSynchronize": "Teniu actualitzacions",
+  "DE.Controllers.Main.txtNone": "cap",
   "DE.Controllers.Main.txtNoTableOfContents": "No hi ha cap títol al document. Apliqueu un estil d’encapçalament al text perquè aparegui a la taula de continguts.",
+  "DE.Controllers.Main.txtNoTableOfFigures": "No s'ha trobat cap entrada a la taula de figures.",
   "DE.Controllers.Main.txtNoText": "Error! No hi ha cap text d'estil especificat al document.",
   "DE.Controllers.Main.txtNotInTable": "No està en la taula",
   "DE.Controllers.Main.txtNotValidBookmark": "Error! No és una autoreferenciació de favorit vàlid.",
@@ -671,7 +752,7 @@
   "DE.Controllers.Main.txtShape_mathNotEqual": "No igual",
   "DE.Controllers.Main.txtShape_mathPlus": "Més",
   "DE.Controllers.Main.txtShape_moon": "Lluna",
-  "DE.Controllers.Main.txtShape_noSmoking": "\"No\" Símbol",
+  "DE.Controllers.Main.txtShape_noSmoking": "Símbol \"No\"",
   "DE.Controllers.Main.txtShape_notchedRightArrow": "Fletxa a la dreta encaixada",
   "DE.Controllers.Main.txtShape_octagon": "Octagon",
   "DE.Controllers.Main.txtShape_parallelogram": "Paral·lelograma",
@@ -701,16 +782,16 @@
   "DE.Controllers.Main.txtShape_snip2SameRect": "Retallar Rectangle de la cantonada del mateix costat",
   "DE.Controllers.Main.txtShape_snipRoundRect": "Retallar i rondejar rectangle de cantonada senzilla",
   "DE.Controllers.Main.txtShape_spline": "Corba",
-  "DE.Controllers.Main.txtShape_star10": "10-Punt Principal",
-  "DE.Controllers.Main.txtShape_star12": "12-Punt Principal",
-  "DE.Controllers.Main.txtShape_star16": "16-Punt Principal",
-  "DE.Controllers.Main.txtShape_star24": "24-Punt Principal",
-  "DE.Controllers.Main.txtShape_star32": "32-Punt Principal",
-  "DE.Controllers.Main.txtShape_star4": "4-Punt Principal",
-  "DE.Controllers.Main.txtShape_star5": "5-Punt Principal",
-  "DE.Controllers.Main.txtShape_star6": "6-Punt Principal",
-  "DE.Controllers.Main.txtShape_star7": "7-Punt Principal",
-  "DE.Controllers.Main.txtShape_star8": "8-Punt Principal",
+  "DE.Controllers.Main.txtShape_star10": "Estrella de 10 puntes",
+  "DE.Controllers.Main.txtShape_star12": "Estrella de 12 puntes",
+  "DE.Controllers.Main.txtShape_star16": "Estrella de 16 puntes",
+  "DE.Controllers.Main.txtShape_star24": "Estrella de 24 puntes",
+  "DE.Controllers.Main.txtShape_star32": "Estrella de 32 puntes",
+  "DE.Controllers.Main.txtShape_star4": "Estrella de 4 puntes",
+  "DE.Controllers.Main.txtShape_star5": "Estrella de 5 puntes",
+  "DE.Controllers.Main.txtShape_star6": "Estrella de 6 puntes",
+  "DE.Controllers.Main.txtShape_star7": "Estrella de 7 puntes",
+  "DE.Controllers.Main.txtShape_star8": "Estrella de 8 puntes",
   "DE.Controllers.Main.txtShape_stripedRightArrow": "Fletxa a la dreta amb bandes",
   "DE.Controllers.Main.txtShape_sun": "Sol",
   "DE.Controllers.Main.txtShape_teardrop": "Llàgrima",
@@ -728,6 +809,7 @@
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Llibre rectangular de punt rodó",
   "DE.Controllers.Main.txtStarsRibbons": "Estrelles i Cintes",
   "DE.Controllers.Main.txtStyle_Caption": "Subtítol",
+  "DE.Controllers.Main.txtStyle_endnote_text": "Text de nota final",
   "DE.Controllers.Main.txtStyle_footnote_text": "Tex Peu de Pàgina",
   "DE.Controllers.Main.txtStyle_Heading_1": "Títol 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Títol 2",
@@ -748,6 +830,8 @@
   "DE.Controllers.Main.txtSyntaxError": "Error de Sintaxis",
   "DE.Controllers.Main.txtTableInd": "L'índex de la taula no pot ser zero",
   "DE.Controllers.Main.txtTableOfContents": "Taula de continguts",
+  "DE.Controllers.Main.txtTableOfFigures": "Taula de figures",
+  "DE.Controllers.Main.txtTOCHeading": "Capçalera de la taula",
   "DE.Controllers.Main.txtTooLarge": "El número es massa gran per donar-l'hi format",
   "DE.Controllers.Main.txtTypeEquation": "Escrivir una equació aquí.",
   "DE.Controllers.Main.txtUndefBookmark": "Marcador no definit",
@@ -769,6 +853,8 @@
   "DE.Controllers.Main.warnBrowserZoom": "La configuració del zoom actual del navegador no és totalment compatible. Restabliu el zoom per defecte prement Ctrl+0.",
   "DE.Controllers.Main.warnLicenseExceeded": "S'ha superat el nombre de connexions simultànies al servidor de documents i el document s'obrirà només per a la seva visualització.<br>Contacteu l'administrador per obtenir més informació.",
   "DE.Controllers.Main.warnLicenseExp": "La seva llicencia ha caducat.<br>Si us plau, actualitzi la llicencia i recarregui la pàgina.",
+  "DE.Controllers.Main.warnLicenseLimitedNoAccess": "La llicència ha caducat.<br>No teniu accés a la funcionalitat d'edició de documents.<br>Si us plau, contacteu amb l'administrador.",
+  "DE.Controllers.Main.warnLicenseLimitedRenewed": "Cal renovar la llicència.<br>Teniu un accés limitat a la funcionalitat d'edició de documents.<br>Contacteu amb l'administrador per obtenir accés complet",
   "DE.Controllers.Main.warnLicenseUsersExceeded": "S'ha superat el nombre d'usuaris concurrents i el document s'obrirà només per a la seva visualització.<br>Per més informació, poseu-vos en contacte amb l'administrador.",
   "DE.Controllers.Main.warnNoLicense": "Heu arribat al límit de connexions simultànies per als editors %1. Aquest document s'obrirà al mode de només lectura. Contacteu l'equip de vendes %1 per a les condicions personals de millora del servei.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Heu arribat al límit d'usuaris concurrents per a editors %1.<br> Contactau l'equip de vendes per als termes de millora personal dels vostres serveis.",
@@ -776,6 +862,7 @@
   "DE.Controllers.Navigation.txtBeginning": "Inici del document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Anar al començament del document",
   "DE.Controllers.Statusbar.textHasChanges": "S'han fet un seguiment de nous canvis",
+  "DE.Controllers.Statusbar.textSetTrackChanges": "Esteu en mode de seguiment de canvis",
   "DE.Controllers.Statusbar.textTrackChanges": "El document s'obre amb el mode Canvis de pista activat",
   "DE.Controllers.Statusbar.tipReview": "Control de Canvis",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -787,6 +874,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "El valor introduït és incorrecte.<br>Introduïu un valor numèric entre 1 i 300.",
   "DE.Controllers.Toolbar.textFraction": "Fraccions",
   "DE.Controllers.Toolbar.textFunction": "Funcions",
+  "DE.Controllers.Toolbar.textGroup": "Grup",
   "DE.Controllers.Toolbar.textInsert": "Inserta",
   "DE.Controllers.Toolbar.textIntegral": "Integrals",
   "DE.Controllers.Toolbar.textLargeOperator": "Operadors Grans",
@@ -796,6 +884,7 @@
   "DE.Controllers.Toolbar.textRadical": "Radicals",
   "DE.Controllers.Toolbar.textScript": "Lletres",
   "DE.Controllers.Toolbar.textSymbols": "Símbols",
+  "DE.Controllers.Toolbar.textTabForms": "Formularis",
   "DE.Controllers.Toolbar.textWarning": "Avis",
   "DE.Controllers.Toolbar.txtAccent_Accent": "Agut",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Fletxa dreta-esquerra superior",
@@ -810,7 +899,7 @@
   "DE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Clau Subjacent",
   "DE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Clau superposada",
   "DE.Controllers.Toolbar.txtAccent_Custom_1": "Vector A",
-  "DE.Controllers.Toolbar.txtAccent_Custom_2": "ABC amb barra",
+  "DE.Controllers.Toolbar.txtAccent_Custom_2": "ABC amb barra a sobre",
   "DE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR i amb barra sobreposada",
   "DE.Controllers.Toolbar.txtAccent_DDDot": "Tres punts",
   "DE.Controllers.Toolbar.txtAccent_DDot": "Doble punt",
@@ -981,9 +1070,9 @@
   "DE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Matriu buida amb claudàtors",
   "DE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Matriu buida amb claudàtors",
   "DE.Controllers.Toolbar.txtMatrix_2_3": "2x3 matriu buida",
-  "DE.Controllers.Toolbar.txtMatrix_3_1": "3x1 matriu buida",
-  "DE.Controllers.Toolbar.txtMatrix_3_2": "3x2 matriu buida",
-  "DE.Controllers.Toolbar.txtMatrix_3_3": "3s3 matriu buida",
+  "DE.Controllers.Toolbar.txtMatrix_3_1": "Matriu buida 3x1",
+  "DE.Controllers.Toolbar.txtMatrix_3_2": "Matriu buida 3x2",
+  "DE.Controllers.Toolbar.txtMatrix_3_3": "Matriu buida 3x3",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Punts Subíndexs",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Center": "Punts en línia mitja",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Punts en diagonal",
@@ -991,9 +1080,9 @@
   "DE.Controllers.Toolbar.txtMatrix_Flat_Round": "Matriu escassa",
   "DE.Controllers.Toolbar.txtMatrix_Flat_Square": "Matriu escassa",
   "DE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 matriu d’identitat",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "3x3 matriu d’identitat",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 matriu d’identitat",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 matriu d’identitat",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Matriu d’identitat 3x3",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "Matriu d’identitat 3x3",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Matriu d’identitat 3x3",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Fletxa dreta-esquerra inferior",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Fletxa dreta-esquerra superior",
   "DE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Fletxa inferior cap a esquerra",
@@ -1335,6 +1424,7 @@
   "DE.Views.DocumentHolder.textArrangeForward": "Portar Endavant",
   "DE.Views.DocumentHolder.textArrangeFront": "Porta a Primer pla",
   "DE.Views.DocumentHolder.textCells": "Cel·les",
+  "DE.Views.DocumentHolder.textCol": "Suprimeix tota la columna",
   "DE.Views.DocumentHolder.textContentControls": "Control de contingut",
   "DE.Views.DocumentHolder.textContinueNumbering": "Continua la numeració",
   "DE.Views.DocumentHolder.textCopy": "Copiar",
@@ -1353,18 +1443,26 @@
   "DE.Views.DocumentHolder.textFromStorage": "Des d'Emmagatzematge",
   "DE.Views.DocumentHolder.textFromUrl": "Des d'un Enllaç",
   "DE.Views.DocumentHolder.textJoinList": "Uniu-vos a la llista anterior",
+  "DE.Views.DocumentHolder.textLeft": "Desplaça les cel·les a l'esquerra",
   "DE.Views.DocumentHolder.textNest": "Taula niu",
   "DE.Views.DocumentHolder.textNextPage": "Pàgina Següent",
   "DE.Views.DocumentHolder.textNumberingValue": "Valor d'inici",
   "DE.Views.DocumentHolder.textPaste": "Pegar",
   "DE.Views.DocumentHolder.textPrevPage": "Pàgina anterior",
   "DE.Views.DocumentHolder.textRefreshField": "Actualitza el camp",
+  "DE.Views.DocumentHolder.textRemCheckBox": "Elimina la casella de selecció",
+  "DE.Views.DocumentHolder.textRemComboBox": "Elimina el quadre de combinació",
+  "DE.Views.DocumentHolder.textRemDropdown": "Elimina el desplegable",
+  "DE.Views.DocumentHolder.textRemField": "Eliminar camp de text",
   "DE.Views.DocumentHolder.textRemove": "Esborrar",
   "DE.Views.DocumentHolder.textRemoveControl": "Esborrar el control de contingut",
+  "DE.Views.DocumentHolder.textRemPicture": "Suprimir Imatge",
+  "DE.Views.DocumentHolder.textRemRadioBox": "Eliminar botó de selecció",
   "DE.Views.DocumentHolder.textReplace": "Canviar Imatge",
   "DE.Views.DocumentHolder.textRotate": "Girar",
   "DE.Views.DocumentHolder.textRotate270": "Girar 90° a l'esquerra",
   "DE.Views.DocumentHolder.textRotate90": "Girar 90° a la dreta",
+  "DE.Views.DocumentHolder.textRow": "Suprimeix tota la fila",
   "DE.Views.DocumentHolder.textSeparateList": "Separar llista",
   "DE.Views.DocumentHolder.textSettings": "Configuració",
   "DE.Views.DocumentHolder.textSeveral": "Diverses Files/Columnes",
@@ -1376,6 +1474,7 @@
   "DE.Views.DocumentHolder.textShapeAlignTop": "Alinear Superior",
   "DE.Views.DocumentHolder.textStartNewList": "Iniciar una llista nova",
   "DE.Views.DocumentHolder.textStartNumberingFrom": "Establir el valor de numeració",
+  "DE.Views.DocumentHolder.textTitleCellsRemove": "Suprimeix Cel·les",
   "DE.Views.DocumentHolder.textTOC": "Taula de continguts",
   "DE.Views.DocumentHolder.textTOCSettings": "Configuració de la taula de continguts",
   "DE.Views.DocumentHolder.textUndo": "Desfer",
@@ -1589,7 +1688,7 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Haureu d’acceptar canvis abans de poder-los veure",
   "DE.Views.FileMenuPanels.Settings.strFast": "Ràpid",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Font Suggerida",
-  "DE.Views.FileMenuPanels.Settings.strForcesave": "Deseu sempre al servidor (en cas contrari, deseu-lo al servidor quan el tanqueu)",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": "Afegeix una versió a l'emmagatzematge després de fer clic a Desa o Ctrl+S",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Activar els jeroglífics",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activa la visualització dels comentaris",
   "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Configuració de macros",
@@ -1599,6 +1698,7 @@
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Canvis de Col·laboració en temps real",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activar l’opció de correcció ortogràfica",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Estricte",
+  "DE.Views.FileMenuPanels.Settings.strTheme": "Tema de la interfície",
   "DE.Views.FileMenuPanels.Settings.strUnit": "Unitat de Mesura",
   "DE.Views.FileMenuPanels.Settings.strZoom": "Valor de Zoom Predeterminat",
   "DE.Views.FileMenuPanels.Settings.text10Minutes": "Cada 10 minuts",
@@ -1610,7 +1710,7 @@
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Guardar Automàticament",
   "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilitat",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Desactivat",
-  "DE.Views.FileMenuPanels.Settings.textForceSave": "Desar al Servidor",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Desant versions intermèdies",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Cada Minut",
   "DE.Views.FileMenuPanels.Settings.textOldVersions": "Feu que els fitxers siguin compatibles amb versions anteriors de MS Word quan els deseu com a DOCX",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Veure Tot",
@@ -1636,6 +1736,62 @@
   "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostra la Notificació",
   "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Desactiveu totes les macros amb una notificació",
   "DE.Views.FileMenuPanels.Settings.txtWin": "com Windows",
+  "DE.Views.FormSettings.textCheckbox": "\nCasella de selecció",
+  "DE.Views.FormSettings.textColor": "Color Vora",
+  "DE.Views.FormSettings.textComb": "Pinta de caràcters",
+  "DE.Views.FormSettings.textCombobox": "Quadre combinat",
+  "DE.Views.FormSettings.textConnected": "Camps connectats",
+  "DE.Views.FormSettings.textDelete": "Suprimeix",
+  "DE.Views.FormSettings.textDisconnect": "Desconnectar",
+  "DE.Views.FormSettings.textDropDown": "Desplegar",
+  "DE.Views.FormSettings.textField": "Camp de text",
+  "DE.Views.FormSettings.textFixed": "Camp de mida fixa",
+  "DE.Views.FormSettings.textFromFile": "Des d'un fitxer",
+  "DE.Views.FormSettings.textFromStorage": "Des de l'Emmagatzematge",
+  "DE.Views.FormSettings.textFromUrl": "Des de l'URL",
+  "DE.Views.FormSettings.textGroupKey": "Clau de grup",
+  "DE.Views.FormSettings.textImage": "Imatge",
+  "DE.Views.FormSettings.textKey": "Clau",
+  "DE.Views.FormSettings.textLock": "Bloqueja",
+  "DE.Views.FormSettings.textMaxChars": "Límit de caràcters",
+  "DE.Views.FormSettings.textNoBorder": "Sense vora",
+  "DE.Views.FormSettings.textPlaceholder": "Marcador de posició",
+  "DE.Views.FormSettings.textRadiobox": "Botó d'opció",
+  "DE.Views.FormSettings.textRequired": "Requerit",
+  "DE.Views.FormSettings.textSelectImage": "Seleccionar imatge",
+  "DE.Views.FormSettings.textTip": "Consell",
+  "DE.Views.FormSettings.textTipAdd": "Afegeir nou valor",
+  "DE.Views.FormSettings.textTipDelete": "Suprimeix el valor",
+  "DE.Views.FormSettings.textTipDown": "Mou avall",
+  "DE.Views.FormSettings.textTipUp": "Mou amunt",
+  "DE.Views.FormSettings.textUnlock": "Desbloquejar",
+  "DE.Views.FormSettings.textValue": "Opcions de valor",
+  "DE.Views.FormSettings.textWidth": "Ample de cel·la",
+  "DE.Views.FormsTab.capBtnCheckBox": "Casella de selecció",
+  "DE.Views.FormsTab.capBtnComboBox": "Quadre combinat",
+  "DE.Views.FormsTab.capBtnDropDown": "Desplegable",
+  "DE.Views.FormsTab.capBtnImage": "Imatge",
+  "DE.Views.FormsTab.capBtnNext": "Camp Següent",
+  "DE.Views.FormsTab.capBtnPrev": "Camp anterior",
+  "DE.Views.FormsTab.capBtnRadioBox": "Botó d'opció",
+  "DE.Views.FormsTab.capBtnSubmit": "Enviar",
+  "DE.Views.FormsTab.capBtnText": "Camp de text",
+  "DE.Views.FormsTab.capBtnView": "Visualitzar formulari",
+  "DE.Views.FormsTab.textClear": "Neteja els camps",
+  "DE.Views.FormsTab.textClearFields": "Esborrar tots els camps",
+  "DE.Views.FormsTab.textHighlight": "Paràmetres de ressaltat",
+  "DE.Views.FormsTab.textNoHighlight": "Sense ressaltat",
+  "DE.Views.FormsTab.textSubmited": "El formulari s'ha enviat correctament",
+  "DE.Views.FormsTab.tipCheckBox": "Insereix casella de selecció",
+  "DE.Views.FormsTab.tipComboBox": "Insereix casella de combinació",
+  "DE.Views.FormsTab.tipDropDown": "Insereix llista desplegable",
+  "DE.Views.FormsTab.tipImageField": "Insereix imatge",
+  "DE.Views.FormsTab.tipNextForm": "Vés al camp següent",
+  "DE.Views.FormsTab.tipPrevForm": "Vés al camp anterior",
+  "DE.Views.FormsTab.tipRadioBox": "Insereix botó d'opció",
+  "DE.Views.FormsTab.tipSubmit": "Enviar formulari",
+  "DE.Views.FormsTab.tipTextField": "Insereix camp de text",
+  "DE.Views.FormsTab.tipViewForm": "Visualitzar formulari",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Inferior centre",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Inferior esquerra",
   "DE.Views.HeaderFooterSettings.textBottomPage": "Al Peu de Pàgina",
@@ -1668,6 +1824,7 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Aquest camp és obligatori",
   "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Rúbriques",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Aquest camp hauria de ser una URL en el format \"http://www.example.com\"",
+  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Aquest camp està limitat a 2083 caràcters",
   "DE.Views.ImageSettings.textAdvanced": "Mostra la configuració avançada",
   "DE.Views.ImageSettings.textCrop": "Retallar",
   "DE.Views.ImageSettings.textCropFill": "Omplir",
@@ -1773,7 +1930,7 @@
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "A través",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Estret",
   "DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Superior e Inferior",
-  "DE.Views.LeftMenu.tipAbout": "Sobre el programa",
+  "DE.Views.LeftMenu.tipAbout": "Quant a...",
   "DE.Views.LeftMenu.tipChat": "Xat",
   "DE.Views.LeftMenu.tipComments": "Comentaris",
   "DE.Views.LeftMenu.tipNavigation": "Navegació",
@@ -1782,7 +1939,9 @@
   "DE.Views.LeftMenu.tipSupport": "Opinió & Suport",
   "DE.Views.LeftMenu.tipTitles": "Títols",
   "DE.Views.LeftMenu.txtDeveloper": "MODALITAT DE DESENVOLUPADOR",
+  "DE.Views.LeftMenu.txtLimit": "Limitar l'accés",
   "DE.Views.LeftMenu.txtTrial": "ESTAT DE PROVA",
+  "DE.Views.LeftMenu.txtTrialDev": "Mode de desenvolupador de prova",
   "DE.Views.LineNumbersDialog.textAddLineNumbering": "Afegir numeració de línies",
   "DE.Views.LineNumbersDialog.textApplyTo": "Aplicar els canvis a",
   "DE.Views.LineNumbersDialog.textContinuous": "Contínua",
@@ -1796,6 +1955,7 @@
   "DE.Views.LineNumbersDialog.textSection": "Secció actual",
   "DE.Views.LineNumbersDialog.textStartAt": "Començar a",
   "DE.Views.LineNumbersDialog.textTitle": "Números de Línies",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Automàtic",
   "DE.Views.Links.capBtnBookmarks": "Marcador",
   "DE.Views.Links.capBtnCaption": "Subtítol",
   "DE.Views.Links.capBtnContentsUpdate": "Actualitzar",
@@ -1803,9 +1963,11 @@
   "DE.Views.Links.capBtnInsContents": "Taula de continguts",
   "DE.Views.Links.capBtnInsFootnote": "Nota a peu de pàgina",
   "DE.Views.Links.capBtnInsLink": "Hiperenllaç",
+  "DE.Views.Links.capBtnTOF": "Taula de figures",
   "DE.Views.Links.confirmDeleteFootnotes": "Voleu suprimir totes les notes al peu de pàgina?",
+  "DE.Views.Links.confirmReplaceTOF": "Voleu substituir la taula de figures seleccionada?",
   "DE.Views.Links.mniConvertNote": "Converteix Totes les Notes",
-  "DE.Views.Links.mniDelFootnote": "Suprimeix totes les notes al peu de pàgina",
+  "DE.Views.Links.mniDelFootnote": "Suprimeix Totes les Notes",
   "DE.Views.Links.mniInsEndnote": "Inseriu Nota Final",
   "DE.Views.Links.mniInsFootnote": "Inserir Nota Peu Pàgina",
   "DE.Views.Links.mniNoteSettings": "Ajust de les notes a peu de pàgina",
@@ -1825,6 +1987,9 @@
   "DE.Views.Links.tipCrossRef": "Inseriu referència creuada",
   "DE.Views.Links.tipInsertHyperlink": "Afegir enllaç",
   "DE.Views.Links.tipNotes": "Inseriu o editeu notes a la pàgina de pàgina",
+  "DE.Views.Links.tipTableFigures": "Insereix taula de figures",
+  "DE.Views.Links.tipTableFiguresUpdate": "Actualitza la taula de figures",
+  "DE.Views.Links.titleUpdateTOF": "Actualitza la taula de figures",
   "DE.Views.ListSettingsDialog.textAuto": "Automàtic",
   "DE.Views.ListSettingsDialog.textCenter": "Centre",
   "DE.Views.ListSettingsDialog.textLeft": "Esquerra",
@@ -1883,7 +2048,7 @@
   "DE.Views.MailMergeSettings.textSendMsg": "Tots els missatges de correu electrònic estan preparats i seran enviats properament.<br>La velocitat de la publicació depèn del servei de correu.<br>Podeu continuar treballant amb el document o tancar-lo. Un cop finalitzada l’operació, la notificació s’enviarà a la vostra adreça de correu electrònic de registre.",
   "DE.Views.MailMergeSettings.textTo": "Per a",
   "DE.Views.MailMergeSettings.txtFirst": "Al Primer Camp",
-  "DE.Views.MailMergeSettings.txtFromToError": "El valor \"de\" ha de ser inferior al valor \"a\"",
+  "DE.Views.MailMergeSettings.txtFromToError": "El valor «De» ha de ser més petit que el valor «Fins»",
   "DE.Views.MailMergeSettings.txtLast": "A l'Últim camp",
   "DE.Views.MailMergeSettings.txtNext": "Al camp següent",
   "DE.Views.MailMergeSettings.txtPrev": "Al registre anterior",
@@ -1904,6 +2069,7 @@
   "DE.Views.NoteSettingsDialog.textApplyTo": "Aplicar els canvis a",
   "DE.Views.NoteSettingsDialog.textContinue": "Contínua",
   "DE.Views.NoteSettingsDialog.textCustom": "Personalitzar Marca",
+  "DE.Views.NoteSettingsDialog.textDocEnd": "Final del document",
   "DE.Views.NoteSettingsDialog.textDocument": "Tot el document",
   "DE.Views.NoteSettingsDialog.textEachPage": "Reinicieu cada pàgina",
   "DE.Views.NoteSettingsDialog.textEachSection": "Reinicieu cada secció",
@@ -1947,6 +2113,10 @@
   "DE.Views.PageSizeDialog.textTitle": "Mida de Pàgina",
   "DE.Views.PageSizeDialog.textWidth": "Amplada",
   "DE.Views.PageSizeDialog.txtCustom": "Personalitzat",
+  "DE.Views.ParagraphSettings.strIndent": "Sagnats",
+  "DE.Views.ParagraphSettings.strIndentsLeftText": "Esquerra",
+  "DE.Views.ParagraphSettings.strIndentsRightText": "Dreta",
+  "DE.Views.ParagraphSettings.strIndentsSpecial": "Especial",
   "DE.Views.ParagraphSettings.strLineHeight": "Espai entre Línies",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Espaiat de Paràgraf",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "No afegiu interval entre paràgrafs del mateix estil",
@@ -1958,6 +2128,9 @@
   "DE.Views.ParagraphSettings.textAuto": "multiplicador",
   "DE.Views.ParagraphSettings.textBackColor": "Color de Fons",
   "DE.Views.ParagraphSettings.textExact": "Exacte",
+  "DE.Views.ParagraphSettings.textFirstLine": "Primera línia",
+  "DE.Views.ParagraphSettings.textHanging": "Penjat",
+  "DE.Views.ParagraphSettings.textNoneSpecial": "(cap)",
   "DE.Views.ParagraphSettings.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Les pestanyes especificades apareixeran en aquest camp",
   "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Majúscules ",
@@ -2033,6 +2206,7 @@
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Sense vores",
   "DE.Views.RightMenu.txtChartSettings": "Gràfic Configuració",
+  "DE.Views.RightMenu.txtFormSettings": "Paràmetres del formulari",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Configuració de la capçalera i el peu de pàgina",
   "DE.Views.RightMenu.txtImageSettings": "Configuració Imatge",
   "DE.Views.RightMenu.txtMailMergeSettings": "Ajusts de fusió",
@@ -2049,7 +2223,7 @@
   "DE.Views.ShapeSettings.strPattern": "Patró",
   "DE.Views.ShapeSettings.strShadow": "Mostra ombra",
   "DE.Views.ShapeSettings.strSize": "Mida",
-  "DE.Views.ShapeSettings.strStroke": "Traça",
+  "DE.Views.ShapeSettings.strStroke": "Línia",
   "DE.Views.ShapeSettings.strTransparency": "Opacitat",
   "DE.Views.ShapeSettings.strType": "Tipus",
   "DE.Views.ShapeSettings.textAdvanced": "Mostra la configuració avançada",
@@ -2116,6 +2290,7 @@
   "DE.Views.SignatureSettings.strValid": "Signatures vàlides",
   "DE.Views.SignatureSettings.txtContinueEditing": "Edita de totes maneres",
   "DE.Views.SignatureSettings.txtEditWarning": "L’edició eliminarà les signatures del document.<br>Esteu segur que voleu continuar?",
+  "DE.Views.SignatureSettings.txtRemoveWarning": "Voleu eliminar aquesta signatura?<br>Això no es podrà desfer.",
   "DE.Views.SignatureSettings.txtRequestedSignatures": "Aquest document s'ha de signar.",
   "DE.Views.SignatureSettings.txtSigned": "S'han afegit signatures vàlides al document. El document està protegit de l'edició.",
   "DE.Views.SignatureSettings.txtSignedInvalid": "Algunes de les signatures digitals del document no són vàlides o no s’han pogut verificar. El document està protegit de l'edició.",
@@ -2140,20 +2315,32 @@
   "DE.Views.TableFormulaDialog.textInsertFunction": "Funció Pegar",
   "DE.Views.TableFormulaDialog.textTitle": "Configuració de Fórmula",
   "DE.Views.TableOfContentsSettings.strAlign": "Alineeu a la dreta els números de pàgina",
+  "DE.Views.TableOfContentsSettings.strFullCaption": "Inclou l'etiqueta i el número",
   "DE.Views.TableOfContentsSettings.strLinks": "Format de la taula de continguts com a enllaços",
+  "DE.Views.TableOfContentsSettings.strLinksOF": "Formatar la taula de figures com a enllaços",
   "DE.Views.TableOfContentsSettings.strShowPages": "Mostra els números de la pàgina",
   "DE.Views.TableOfContentsSettings.textBuildTable": "Crea la taula de continguts a partir de",
+  "DE.Views.TableOfContentsSettings.textBuildTableOF": "Construir una taula de figures a partir de",
+  "DE.Views.TableOfContentsSettings.textEquation": "Equació",
+  "DE.Views.TableOfContentsSettings.textFigure": "Figura",
   "DE.Views.TableOfContentsSettings.textLeader": "Director",
   "DE.Views.TableOfContentsSettings.textLevel": "Nivell",
   "DE.Views.TableOfContentsSettings.textLevels": "Nivells",
   "DE.Views.TableOfContentsSettings.textNone": "Cap",
+  "DE.Views.TableOfContentsSettings.textRadioCaption": "Llegenda",
   "DE.Views.TableOfContentsSettings.textRadioLevels": "Nivells de perfil",
+  "DE.Views.TableOfContentsSettings.textRadioStyle": "Estil",
   "DE.Views.TableOfContentsSettings.textRadioStyles": "Seleccionar estils",
   "DE.Views.TableOfContentsSettings.textStyle": "Estil",
   "DE.Views.TableOfContentsSettings.textStyles": "Estils",
+  "DE.Views.TableOfContentsSettings.textTable": "Taula",
   "DE.Views.TableOfContentsSettings.textTitle": "Taula de continguts",
+  "DE.Views.TableOfContentsSettings.textTitleTOF": "Taula de figures",
+  "DE.Views.TableOfContentsSettings.txtCentered": "Centrat",
   "DE.Views.TableOfContentsSettings.txtClassic": "Clàssic",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Actual",
+  "DE.Views.TableOfContentsSettings.txtDistinctive": "Distintiu",
+  "DE.Views.TableOfContentsSettings.txtFormal": "Formal",
   "DE.Views.TableOfContentsSettings.txtModern": "Moderna",
   "DE.Views.TableOfContentsSettings.txtOnline": "En línia",
   "DE.Views.TableOfContentsSettings.txtSimple": "Simple",
@@ -2181,6 +2368,7 @@
   "DE.Views.TableSettings.textBorders": "Estil de la Vora",
   "DE.Views.TableSettings.textCellSize": "Mida de Files i Columnes",
   "DE.Views.TableSettings.textColumns": "Columnes",
+  "DE.Views.TableSettings.textConvert": "Converteix la taula a text",
   "DE.Views.TableSettings.textDistributeCols": "Distribuïu les columnes",
   "DE.Views.TableSettings.textDistributeRows": "Distribuïu les files",
   "DE.Views.TableSettings.textEdit": "Files i Columnes",
@@ -2285,10 +2473,18 @@
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Sense vores",
   "DE.Views.TableSettingsAdvanced.txtPercent": "Percentatge",
   "DE.Views.TableSettingsAdvanced.txtPt": "Punt",
+  "DE.Views.TableToTextDialog.textEmpty": "Heu d'introduir un caràcter per al separador personalitzat.",
+  "DE.Views.TableToTextDialog.textNested": "Converteix les taules niuades",
+  "DE.Views.TableToTextDialog.textOther": "Altre",
+  "DE.Views.TableToTextDialog.textPara": "Marques de paràgraf",
+  "DE.Views.TableToTextDialog.textSemicolon": "Punts i coma",
+  "DE.Views.TableToTextDialog.textSeparator": "Separar el text amb",
+  "DE.Views.TableToTextDialog.textTab": "Pestanyes",
+  "DE.Views.TableToTextDialog.textTitle": "Converteix la taula a text",
   "DE.Views.TextArtSettings.strColor": "Color",
   "DE.Views.TextArtSettings.strFill": "Omplir",
   "DE.Views.TextArtSettings.strSize": "Mida",
-  "DE.Views.TextArtSettings.strStroke": "Traça",
+  "DE.Views.TextArtSettings.strStroke": "Línia",
   "DE.Views.TextArtSettings.strTransparency": "Opacitat",
   "DE.Views.TextArtSettings.strType": "Tipus",
   "DE.Views.TextArtSettings.textAngle": "Angle",
@@ -2308,6 +2504,21 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Afegir punt de degradat",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Elimina el punt de degradat",
   "DE.Views.TextArtSettings.txtNoBorders": "Sense Línia",
+  "DE.Views.TextToTableDialog.textAutofit": "Ajustament automàtic",
+  "DE.Views.TextToTableDialog.textColumns": "Columnes",
+  "DE.Views.TextToTableDialog.textContents": "Ajustar automàticament al contingut",
+  "DE.Views.TextToTableDialog.textEmpty": "Heu d'introduir un caràcter per al separador personalitzat.",
+  "DE.Views.TextToTableDialog.textFixed": "Amplada de columna fixa",
+  "DE.Views.TextToTableDialog.textOther": "Altre",
+  "DE.Views.TextToTableDialog.textPara": "Paràgrafs",
+  "DE.Views.TextToTableDialog.textRows": "Files",
+  "DE.Views.TextToTableDialog.textSemicolon": "Punts i coma",
+  "DE.Views.TextToTableDialog.textSeparator": "Separar el text a",
+  "DE.Views.TextToTableDialog.textTab": "Pestanyes",
+  "DE.Views.TextToTableDialog.textTableSize": "Mida de la taula",
+  "DE.Views.TextToTableDialog.textTitle": "Converteix el text a taula",
+  "DE.Views.TextToTableDialog.textWindow": "\nAjustar automàticament a la finestra",
+  "DE.Views.TextToTableDialog.txtAutoText": "Automàtic",
   "DE.Views.Toolbar.capBtnAddComment": "Afegir Comentari",
   "DE.Views.Toolbar.capBtnBlankPage": "Pàgina en Blanc",
   "DE.Views.Toolbar.capBtnColumns": "Columnes",
@@ -2335,6 +2546,7 @@
   "DE.Views.Toolbar.capImgForward": "Portar Endavant",
   "DE.Views.Toolbar.capImgGroup": "Agrupar",
   "DE.Views.Toolbar.capImgWrapping": "Ajustant",
+  "DE.Views.Toolbar.mniCapitalizeWords": "Posar en majúscules cada paraula",
   "DE.Views.Toolbar.mniCustomTable": "Inserir Taula Personalitzada",
   "DE.Views.Toolbar.mniDrawTable": "Taula de dibuix",
   "DE.Views.Toolbar.mniEditControls": "Configuració de control",
@@ -2348,10 +2560,16 @@
   "DE.Views.Toolbar.mniImageFromFile": "Imatge d'un Fitxer",
   "DE.Views.Toolbar.mniImageFromStorage": "Imatge d'un Magatzem",
   "DE.Views.Toolbar.mniImageFromUrl": "Imatge d'un Enllaç",
+  "DE.Views.Toolbar.mniLowerCase": "minúscules",
+  "DE.Views.Toolbar.mniSentenceCase": "Cas de frase",
+  "DE.Views.Toolbar.mniTextToTable": "Converteix el text a taula",
+  "DE.Views.Toolbar.mniToggleCase": "iNVERTIR mAJÚSCULES",
+  "DE.Views.Toolbar.mniUpperCase": "MAJÚSCULES",
   "DE.Views.Toolbar.strMenuNoFill": "Sense Omplir",
   "DE.Views.Toolbar.textAutoColor": "Automàtic",
   "DE.Views.Toolbar.textBold": "Negreta",
   "DE.Views.Toolbar.textBottom": "Inferior:",
+  "DE.Views.Toolbar.textChangeLevel": "Canvia el nivell de llista",
   "DE.Views.Toolbar.textCheckboxControl": "Casella de Selecció",
   "DE.Views.Toolbar.textColumnsCustom": "Personalitzar Columnes",
   "DE.Views.Toolbar.textColumnsLeft": "Esquerra",
@@ -2428,6 +2646,7 @@
   "DE.Views.Toolbar.tipAlignRight": "Alinear dreta",
   "DE.Views.Toolbar.tipBack": "Enrere",
   "DE.Views.Toolbar.tipBlankPage": "Inseriu pàgina en blanc",
+  "DE.Views.Toolbar.tipChangeCase": "Canvia el cas",
   "DE.Views.Toolbar.tipChangeChart": "Canviar el tipus de gràfic",
   "DE.Views.Toolbar.tipClearStyle": "Esborrar estil",
   "DE.Views.Toolbar.tipColorSchemas": "Canviar el esquema de color",

apps/documenteditor/main/locale/en.json

@@ -35,7 +35,7 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Indent right",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Inserted:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Italic",
-  "Common.Controllers.ReviewChanges.textJustify": "Align justify",
+  "Common.Controllers.ReviewChanges.textJustify": "Align justified",
   "Common.Controllers.ReviewChanges.textKeepLines": "Keep lines together",
   "Common.Controllers.ReviewChanges.textKeepNext": "Keep with next",
   "Common.Controllers.ReviewChanges.textLeft": "Align left",
@@ -124,6 +124,8 @@
   "Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.",
   "Common.Translation.warnFileLockedBtnEdit": "Create a copy",
   "Common.Translation.warnFileLockedBtnView": "Open for viewing",
+  "Common.UI.ButtonColored.textAutoColor": "Automatic",
+  "Common.UI.ButtonColored.textNewColor": "Add New Custom Color",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "August",
   "Common.UI.Calendar.textDecember": "December",
@@ -157,8 +159,8 @@
   "Common.UI.Calendar.textShortTuesday": "Tu",
   "Common.UI.Calendar.textShortWednesday": "We",
   "Common.UI.Calendar.textYears": "Years",
-  "Common.UI.ColorButton.textAutoColor": "Automatic",
-  "Common.UI.ColorButton.textNewColor": "Add New Custom Color",
+  "del_Common.UI.ColorButton.textAutoColor": "Automatic",
+  "del_Common.UI.ColorButton.textNewColor": "Add New Custom Color",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",
@@ -231,6 +233,12 @@
   "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?",
   "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?",
   "Common.Views.Chat.textSend": "Send",
+  "Common.Views.Comments.mniAuthorAsc": "Author A to Z",
+  "Common.Views.Comments.mniAuthorDesc": "Author Z to A",
+  "Common.Views.Comments.mniDateAsc": "Oldest",
+  "Common.Views.Comments.mniDateDesc": "Newest",
+  "Common.Views.Comments.mniPositionAsc": "From top",
+  "Common.Views.Comments.mniPositionDesc": "From bottom",
   "Common.Views.Comments.textAdd": "Add",
   "Common.Views.Comments.textAddComment": "Add Comment",
   "Common.Views.Comments.textAddCommentToDoc": "Add Comment to Document",
@@ -238,6 +246,7 @@
   "Common.Views.Comments.textAnonym": "Guest",
   "Common.Views.Comments.textCancel": "Cancel",
   "Common.Views.Comments.textClose": "Close",
+  "Common.Views.Comments.textClosePanel": "Close comments",
   "Common.Views.Comments.textComments": "Comments",
   "Common.Views.Comments.textEdit": "OK",
   "Common.Views.Comments.textEnterCommentHint": "Enter your comment here",
@@ -246,6 +255,7 @@
   "Common.Views.Comments.textReply": "Reply",
   "Common.Views.Comments.textResolve": "Resolve",
   "Common.Views.Comments.textResolved": "Resolved",
+  "Common.Views.Comments.textSort": "Sort comments",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
   "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",
@@ -578,6 +588,7 @@
   "DE.Controllers.Main.textContactUs": "Contact sales",
   "DE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.<br>Convert now?",
   "DE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.<br>Please contact our Sales Department to get a quote.",
+  "DE.Controllers.Main.textDisconnect": "Connection is lost",
   "DE.Controllers.Main.textGuest": "Guest",
   "DE.Controllers.Main.textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
   "DE.Controllers.Main.textLearnMore": "Learn More",
@@ -846,7 +857,7 @@
   "DE.Controllers.Main.uploadDocSizeMessage": "Maximum document size limit exceeded.",
   "DE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
-  "DE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.",
+  "DE.Controllers.Main.uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
   "DE.Controllers.Main.uploadImageTextText": "Uploading image...",
   "DE.Controllers.Main.uploadImageTitleText": "Uploading Image",
   "DE.Controllers.Main.waitText": "Please, wait...",
@@ -1781,7 +1792,7 @@
   "DE.Views.FormsTab.textClear": "Clear Fields",
   "DE.Views.FormsTab.textClearFields": "Clear All Fields",
   "DE.Views.FormsTab.textHighlight": "Highlight Settings",
-  "DE.Views.FormsTab.textNewColor": "Add New Custom Color",
+  "del_DE.Views.FormsTab.textNewColor": "Add New Custom Color",
   "DE.Views.FormsTab.textNoHighlight": "No highlighting",
   "DE.Views.FormsTab.textRequired": "Fill all required fields to send form.",
   "DE.Views.FormsTab.textSubmited": "Form submitted successfully",
@@ -2743,7 +2754,7 @@
   "DE.Views.WatermarkSettingsDialog.textItalic": "Italic",
   "DE.Views.WatermarkSettingsDialog.textLanguage": "Language",
   "DE.Views.WatermarkSettingsDialog.textLayout": "Layout",
-  "DE.Views.WatermarkSettingsDialog.textNewColor": "Add New Custom Color",
+  "del_DE.Views.WatermarkSettingsDialog.textNewColor": "Add New Custom Color",
   "DE.Views.WatermarkSettingsDialog.textNone": "None",
   "DE.Views.WatermarkSettingsDialog.textScale": "Scale",
   "DE.Views.WatermarkSettingsDialog.textSelect": "Select Image",

apps/documenteditor/main/locale/es.json

@@ -35,7 +35,7 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Sangría derecha",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Insertado:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Cursiva",
-  "Common.Controllers.ReviewChanges.textJustify": "Alinear justificar",
+  "Common.Controllers.ReviewChanges.textJustify": "Alinear justificado",
   "Common.Controllers.ReviewChanges.textKeepLines": "Mantener líneas juntas",
   "Common.Controllers.ReviewChanges.textKeepNext": "Conservar con el siguiente",
   "Common.Controllers.ReviewChanges.textLeft": "Alinear a la izquierda",
@@ -846,7 +846,7 @@
   "DE.Controllers.Main.uploadDocSizeMessage": "Límite de tamaño máximo del documento excedido.",
   "DE.Controllers.Main.uploadImageExtMessage": "Formato de imagen desconocido.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Ningunas imágenes cargadas.",
-  "DE.Controllers.Main.uploadImageSizeMessage": "Tamaño máximo de imagen está superado.",
+  "DE.Controllers.Main.uploadImageSizeMessage": "La imagen es demasiado grande. El tamaño máximo es de 25 MB.",
   "DE.Controllers.Main.uploadImageTextText": "Subiendo imagen...",
   "DE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
   "DE.Controllers.Main.waitText": "Por favor, espere...",

apps/documenteditor/main/locale/it.json

@@ -583,6 +583,7 @@
   "DE.Controllers.Main.textShape": "Forma",
   "DE.Controllers.Main.textStrict": "Modalità Rigorosa",
   "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.<br>Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.",
+  "DE.Controllers.Main.textTryUndoRedoWarn": "Le funzioni Annulla/Ripeti sono disattivate nella modalità rapida in modifica collaborativa.",
   "DE.Controllers.Main.titleLicenseExp": "La licenza è scaduta",
   "DE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato",
   "DE.Controllers.Main.titleUpdateVersion": "Versione Modificata",
@@ -616,6 +617,7 @@
   "DE.Controllers.Main.txtMissArg": "Argomento mancante",
   "DE.Controllers.Main.txtMissOperator": "Operatore mancante",
   "DE.Controllers.Main.txtNeedSynchronize": "Ci sono aggiornamenti disponibili",
+  "DE.Controllers.Main.txtNone": "Niente",
   "DE.Controllers.Main.txtNoTableOfContents": "Non ci sono titoli nel documento. Applicare uno stile di titolo al testo in modo che appaia nel sommario.",
   "DE.Controllers.Main.txtNoTableOfFigures": "Nessuna voce della tabella delle cifre trovata.",
   "DE.Controllers.Main.txtNoText": "Errore! Nessuno stile specificato per il testo nel documento.",
@@ -1747,6 +1749,7 @@
   "DE.Views.FormSettings.textNoBorder": "Senza bordo",
   "DE.Views.FormSettings.textPlaceholder": "Segnaposto",
   "DE.Views.FormSettings.textRadiobox": "Pulsante opzione",
+  "DE.Views.FormSettings.textRequired": "Richiesto",
   "DE.Views.FormSettings.textSelectImage": "Seleziona Immagine",
   "DE.Views.FormSettings.textTip": "Suggerimento",
   "DE.Views.FormSettings.textTipAdd": "Aggiungi un nuovo valore",
@@ -2462,6 +2465,9 @@
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Nessun bordo",
   "DE.Views.TableSettingsAdvanced.txtPercent": "Percento",
   "DE.Views.TableSettingsAdvanced.txtPt": "Punto",
+  "DE.Views.TableToTextDialog.textEmpty": "‎È necessario digitare un carattere per il separatore personalizzato.‎",
+  "DE.Views.TableToTextDialog.textOther": "Altro",
+  "DE.Views.TableToTextDialog.textSemicolon": "Virgole",
   "DE.Views.TextArtSettings.strColor": "Colore",
   "DE.Views.TextArtSettings.strFill": "Riempimento",
   "DE.Views.TextArtSettings.strSize": "Dimensione",
@@ -2486,6 +2492,10 @@
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Rimuovi punto sfumatura",
   "DE.Views.TextArtSettings.txtNoBorders": "Nessuna linea",
   "DE.Views.TextToTableDialog.textColumns": "Colonne",
+  "DE.Views.TextToTableDialog.textEmpty": "‎È necessario digitare un carattere per il separatore personalizzato.‎",
+  "DE.Views.TextToTableDialog.textOther": "Altro",
+  "DE.Views.TextToTableDialog.textRows": "Righe",
+  "DE.Views.TextToTableDialog.textSemicolon": "Virgole",
   "DE.Views.TextToTableDialog.txtAutoText": "Automatico",
   "DE.Views.Toolbar.capBtnAddComment": "Aggiungi commento",
   "DE.Views.Toolbar.capBtnBlankPage": "Pagina Vuota",

apps/documenteditor/main/locale/nl.json

@@ -182,6 +182,9 @@
   "Common.UI.SynchronizeTip.textSynchronize": "Het document is gewijzigd door een andere gebruiker.<br>Klik om uw wijzigingen op te slaan en de updates opnieuw te laden.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standaardkleuren",
   "Common.UI.ThemeColorPalette.textThemeColors": "Themakleuren",
+  "Common.UI.Themes.txtThemeClassicLight": "Klassiek Licht",
+  "Common.UI.Themes.txtThemeDark": "Donker",
+  "Common.UI.Themes.txtThemeLight": "Licht",
   "Common.UI.Window.cancelButtonText": "Annuleren",
   "Common.UI.Window.closeButtonText": "Sluiten",
   "Common.UI.Window.noButtonText": "Nee",
@@ -203,10 +206,12 @@
   "Common.Views.About.txtVersion": "Versie",
   "Common.Views.AutoCorrectDialog.textAdd": "Toevoegen",
   "Common.Views.AutoCorrectDialog.textApplyText": "Toepassen terwijl u typt",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Auto Correctie",
   "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoOpmaak terwijl u typt",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatische lijsten met opsommingstekens",
   "Common.Views.AutoCorrectDialog.textBy": "Door",
   "Common.Views.AutoCorrectDialog.textDelete": "Verwijderen",
+  "Common.Views.AutoCorrectDialog.textFLSentence": "Maak de eerste letter van zinnen hoofdletter",
   "Common.Views.AutoCorrectDialog.textHyphens": "Koppeltekens (--) met streepje (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Wiskundige autocorrectie",
   "Common.Views.AutoCorrectDialog.textNumbered": "Automatische genummerde lijsten",
@@ -343,6 +348,8 @@
   "Common.Views.ReviewChanges.tipCoAuthMode": "Zet samenwerkings modus",
   "Common.Views.ReviewChanges.tipCommentRem": "Alle opmerkingen verwijderen",
   "Common.Views.ReviewChanges.tipCommentRemCurrent": "Verwijder huidige opmerking",
+  "Common.Views.ReviewChanges.tipCommentResolve": "Oplossen van opmerkingen",
+  "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Oplossen van huidige opmerkingen",
   "Common.Views.ReviewChanges.tipCompare": "Vergelijk huidig document met een ander document.",
   "Common.Views.ReviewChanges.tipHistory": "Toon versie geschiedenis",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Huidige wijziging afwijzen",
@@ -363,6 +370,11 @@
   "Common.Views.ReviewChanges.txtCommentRemMy": "Verwijder al mijn commentaar",
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Verwijder mijn huidige opmerkingen",
   "Common.Views.ReviewChanges.txtCommentRemove": "Verwijderen",
+  "Common.Views.ReviewChanges.txtCommentResolve": "Oplossen",
+  "Common.Views.ReviewChanges.txtCommentResolveAll": "Alle opmerkingen oplossen",
+  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Oplossen van huidige opmerkingen",
+  "Common.Views.ReviewChanges.txtCommentResolveMy": "Los mijn opmerkingen op",
+  "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Mijn huidige opmerkingen oplossen",
   "Common.Views.ReviewChanges.txtCompare": "Vergelijken",
   "Common.Views.ReviewChanges.txtDocLang": "Taal",
   "Common.Views.ReviewChanges.txtFinal": "Alle veranderingen geaccepteerd (Voorbeeld)",
@@ -523,6 +535,7 @@
   "DE.Controllers.Main.errorUsersExceed": "Het onder het prijsplan toegestane aantal gebruikers is overschreden",
   "DE.Controllers.Main.errorViewerDisconnect": "Verbinding is verbroken. U kunt het document nog wel bekijken,<br>maar u kunt het pas downloaden of afdrukken als de verbinding is hersteld en de pagina opnieuw is geladen.",
   "DE.Controllers.Main.leavePageText": "Dit document bevat niet-opgeslagen wijzigingen. Klik op \"Op deze pagina blijven\" en dan op \"Opslaan\" om uw wijzigingen op te slaan. Klik op \"Pagina verlaten\" om alle niet-opgeslagen wijzigingen te negeren.",
+  "DE.Controllers.Main.leavePageTextOnClose": "Alle niet opgeslagen wijzigingen in dit document gaan verloren. <br> Klik op \"Annuleren\" en dan op \"Opslaan\" om ze op te slaan. Klik op \"OK\" om alle niet opgeslagen wijzigingen te verwijderen.",
   "DE.Controllers.Main.loadFontsTextText": "Gegevens worden geladen...",
   "DE.Controllers.Main.loadFontsTitleText": "Gegevens worden geladen",
   "DE.Controllers.Main.loadFontTextText": "Gegevens worden geladen...",
@@ -578,6 +591,7 @@
   "DE.Controllers.Main.textShape": "Vorm",
   "DE.Controllers.Main.textStrict": "Strikte modus",
   "DE.Controllers.Main.textTryUndoRedo": "De functies Ongedaan maken/Opnieuw worden uitgeschakeld in de modus Snel gezamenlijk bewerken.<br>Klik op de knop 'Strikte modus' om over te schakelen naar de strikte modus voor gezamenlijk bewerken. U kunt het bestand dan zonder interferentie van andere gebruikers bewerken en uw wijzigingen verzenden wanneer u die opslaat. U kunt schakelen tussen de modi voor gezamenlijke bewerking via Geavanceerde instellingen van de editor.",
+  "DE.Controllers.Main.textTryUndoRedoWarn": "De functies Ongedaan maken/Annuleren zijn uitgeschakeld in de modus Snel meewerken.",
   "DE.Controllers.Main.titleLicenseExp": "Licentie vervallen",
   "DE.Controllers.Main.titleServerVersion": "Editor bijgewerkt",
   "DE.Controllers.Main.titleUpdateVersion": "Versie gewijzigd",
@@ -590,6 +604,7 @@
   "DE.Controllers.Main.txtCallouts": "Legenda",
   "DE.Controllers.Main.txtCharts": "Grafieken",
   "DE.Controllers.Main.txtChoose": "Kies een item",
+  "DE.Controllers.Main.txtClickToLoad": "Klik om afbeelding te laden",
   "DE.Controllers.Main.txtCurrentDocument": "Huidig document",
   "DE.Controllers.Main.txtDiagramTitle": "Grafiektitel",
   "DE.Controllers.Main.txtEditingMode": "Bewerkmodus instellen...",
@@ -610,7 +625,9 @@
   "DE.Controllers.Main.txtMissArg": "Missende parameter",
   "DE.Controllers.Main.txtMissOperator": "Ontbrekende operator",
   "DE.Controllers.Main.txtNeedSynchronize": "U hebt updates",
+  "DE.Controllers.Main.txtNone": "Geen",
   "DE.Controllers.Main.txtNoTableOfContents": "Er zijn geen koppen in het document. Pas een kopstijl toe op de tekst zodat deze in de inhoudsopgave wordt weergegeven.",
+  "DE.Controllers.Main.txtNoTableOfFigures": "Geen tabel met cijfers gevonden.",
   "DE.Controllers.Main.txtNoText": "Fout! Geen gespecificeerde tekst in document",
   "DE.Controllers.Main.txtNotInTable": "Is niet in tabel",
   "DE.Controllers.Main.txtNotValidBookmark": "Fout! Geen geldige zelf referentie voor bladwijzers.",
@@ -793,6 +810,7 @@
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Afgeronde rechthoekige Legenda",
   "DE.Controllers.Main.txtStarsRibbons": "Sterren en linten",
   "DE.Controllers.Main.txtStyle_Caption": "Onderschrift",
+  "DE.Controllers.Main.txtStyle_endnote_text": "Eindnoot tekst",
   "DE.Controllers.Main.txtStyle_footnote_text": "Voetnoot tekst",
   "DE.Controllers.Main.txtStyle_Heading_1": "Kop 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Kop 2",
@@ -813,6 +831,8 @@
   "DE.Controllers.Main.txtSyntaxError": "Syntax error",
   "DE.Controllers.Main.txtTableInd": "Tabelindex mag niet nul zijn",
   "DE.Controllers.Main.txtTableOfContents": "Inhoudsopgave",
+  "DE.Controllers.Main.txtTableOfFigures": "Tabel met cijfers",
+  "DE.Controllers.Main.txtTOCHeading": "TOC rubriek",
   "DE.Controllers.Main.txtTooLarge": "te groot getal om te formatteren",
   "DE.Controllers.Main.txtTypeEquation": "Typ hier een vergelijking.",
   "DE.Controllers.Main.txtUndefBookmark": "Ongedefinieerde bladwijzer",
@@ -855,6 +875,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "De ingevoerde waarde is onjuist.<br>Voer een waarde tussen 1 en 300 in",
   "DE.Controllers.Toolbar.textFraction": "Breuken",
   "DE.Controllers.Toolbar.textFunction": "Functies",
+  "DE.Controllers.Toolbar.textGroup": "Groep",
   "DE.Controllers.Toolbar.textInsert": "Invoegen",
   "DE.Controllers.Toolbar.textIntegral": "Integralen",
   "DE.Controllers.Toolbar.textLargeOperator": "Grote operators",
@@ -1725,6 +1746,7 @@
   "DE.Views.FormSettings.textDisconnect": "Verbinding verbreken",
   "DE.Views.FormSettings.textDropDown": "Dropdown",
   "DE.Views.FormSettings.textField": "Tekstvak",
+  "DE.Views.FormSettings.textFixed": "Veld met vaste afmetingen",
   "DE.Views.FormSettings.textFromFile": "Van bestand",
   "DE.Views.FormSettings.textFromStorage": "Van Opslag",
   "DE.Views.FormSettings.textFromUrl": "Van URL",
@@ -1736,6 +1758,7 @@
   "DE.Views.FormSettings.textNoBorder": "Geen rand",
   "DE.Views.FormSettings.textPlaceholder": "Tijdelijke aanduiding",
   "DE.Views.FormSettings.textRadiobox": "Radial knop",
+  "DE.Views.FormSettings.textRequired": "Vereist",
   "DE.Views.FormSettings.textSelectImage": "Selecteer afbeelding",
   "DE.Views.FormSettings.textTip": "Tip",
   "DE.Views.FormSettings.textTipAdd": "Voeg nieuwe waarde toe",
@@ -1803,6 +1826,7 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Dit veld is vereist",
   "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Koppen",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dit veld moet een URL in de notatie \"http://www.voorbeeld.com\" bevatten",
+  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Dit veld is beperkt tot 2083 tekens",
   "DE.Views.ImageSettings.textAdvanced": "Geavanceerde instellingen tonen",
   "DE.Views.ImageSettings.textCrop": "Uitsnijden",
   "DE.Views.ImageSettings.textCropFill": "Vulling",
@@ -2346,6 +2370,7 @@
   "DE.Views.TableSettings.textBorders": "Randstijl",
   "DE.Views.TableSettings.textCellSize": "Rijen & Kolommen grootte",
   "DE.Views.TableSettings.textColumns": "Kolommen",
+  "DE.Views.TableSettings.textConvert": "Tabel omzetten naar tekst",
   "DE.Views.TableSettings.textDistributeCols": "Kolommen verdelen",
   "DE.Views.TableSettings.textDistributeRows": "Rijen verdelen",
   "DE.Views.TableSettings.textEdit": "Rijen en kolommen",
@@ -2450,6 +2475,14 @@
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Geen randen",
   "DE.Views.TableSettingsAdvanced.txtPercent": "Procent",
   "DE.Views.TableSettingsAdvanced.txtPt": "Punt",
+  "DE.Views.TableToTextDialog.textEmpty": "U moet een teken typen voor het aangepaste scheidingsteken.",
+  "DE.Views.TableToTextDialog.textNested": "Geneste tabellen converteren",
+  "DE.Views.TableToTextDialog.textOther": "Andere",
+  "DE.Views.TableToTextDialog.textPara": "Paragraaf tekens",
+  "DE.Views.TableToTextDialog.textSemicolon": "Puntkomma's",
+  "DE.Views.TableToTextDialog.textSeparator": "Scheid tekst met",
+  "DE.Views.TableToTextDialog.textTab": "Table size",
+  "DE.Views.TableToTextDialog.textTitle": "Tabel omzetten naar tekst",
   "DE.Views.TextArtSettings.strColor": "Kleur",
   "DE.Views.TextArtSettings.strFill": "Vulling",
   "DE.Views.TextArtSettings.strSize": "Grootte",
@@ -2473,6 +2506,21 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Kleurovergangpunt toevoegen",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Kleurovergangpunt verwijderen",
   "DE.Views.TextArtSettings.txtNoBorders": "Geen lijn",
+  "DE.Views.TextToTableDialog.textAutofit": "Automatisch passend gedrag",
+  "DE.Views.TextToTableDialog.textColumns": "Kolommen",
+  "DE.Views.TextToTableDialog.textContents": "Automatisch aanpassen aan de inhoud",
+  "DE.Views.TextToTableDialog.textEmpty": "U moet een teken typen voor het aangepaste scheidingsteken.",
+  "DE.Views.TextToTableDialog.textFixed": "Vaste kolombreedte",
+  "DE.Views.TextToTableDialog.textOther": "Andere",
+  "DE.Views.TextToTableDialog.textPara": "Paragrafen",
+  "DE.Views.TextToTableDialog.textRows": "Rijen",
+  "DE.Views.TextToTableDialog.textSemicolon": "Puntkomma's",
+  "DE.Views.TextToTableDialog.textSeparator": "Afzonderlijke tekst op",
+  "DE.Views.TextToTableDialog.textTab": "Tabs",
+  "DE.Views.TextToTableDialog.textTableSize": "Tabel Grootte",
+  "DE.Views.TextToTableDialog.textTitle": "Tekst omzetten naar tabel",
+  "DE.Views.TextToTableDialog.textWindow": "Automatische aanpassing aan het venster",
+  "DE.Views.TextToTableDialog.txtAutoText": "Auto",
   "DE.Views.Toolbar.capBtnAddComment": "Opmerking toevoegen",
   "DE.Views.Toolbar.capBtnBlankPage": "Lege pagina",
   "DE.Views.Toolbar.capBtnColumns": "Kolommen",
@@ -2516,6 +2564,7 @@
   "DE.Views.Toolbar.mniImageFromUrl": "Afbeelding van URL",
   "DE.Views.Toolbar.mniLowerCase": "kleine letters ",
   "DE.Views.Toolbar.mniSentenceCase": "Zin lettertype",
+  "DE.Views.Toolbar.mniTextToTable": "Tekst omzetten naar tabel",
   "DE.Views.Toolbar.mniToggleCase": "Schakel lettertype",
   "DE.Views.Toolbar.mniUpperCase": "HOOFDLETTERS",
   "DE.Views.Toolbar.strMenuNoFill": "Geen vulling",
@@ -2599,7 +2648,7 @@
   "DE.Views.Toolbar.tipAlignRight": "Rechts uitlijnen",
   "DE.Views.Toolbar.tipBack": "Terug",
   "DE.Views.Toolbar.tipBlankPage": "Invoegen nieuwe pagina",
-  "DE.Views.Toolbar.tipChangeCase": "Verander lettertype",
+  "DE.Views.Toolbar.tipChangeCase": "Verander geval",
   "DE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen",
   "DE.Views.Toolbar.tipClearStyle": "Stijl wissen",
   "DE.Views.Toolbar.tipColorSchemas": "Kleurenschema wijzigen",

apps/documenteditor/main/locale/pt.json

@@ -35,7 +35,7 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Indent right",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Inserted:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Italic",
-  "Common.Controllers.ReviewChanges.textJustify": "Align justify",
+  "Common.Controllers.ReviewChanges.textJustify": "Alinhamento justificado",
   "Common.Controllers.ReviewChanges.textKeepLines": "Keep lines together",
   "Common.Controllers.ReviewChanges.textKeepNext": "Keep with next",
   "Common.Controllers.ReviewChanges.textLeft": "Align left",

apps/documenteditor/main/locale/ru.json

@@ -846,7 +846,7 @@
   "DE.Controllers.Main.uploadDocSizeMessage": "Превышен максимальный размер документа.",
   "DE.Controllers.Main.uploadImageExtMessage": "Неизвестный формат изображения.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Ни одного изображения не загружено.",
-  "DE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
+  "DE.Controllers.Main.uploadImageSizeMessage": "Слишком большое изображение. Максимальный размер - 25 MB.",
   "DE.Controllers.Main.uploadImageTextText": "Загрузка изображения...",
   "DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
   "DE.Controllers.Main.waitText": "Пожалуйста, подождите...",

apps/documenteditor/main/locale/tr.json

@@ -60,17 +60,21 @@
   "Common.Controllers.ReviewChanges.textStrikeout": "Strikeout",
   "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
+  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Tablo Ayarladı Değiştirildi</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Tablo Satırı Silindi</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
   "Common.define.chartData.textArea": "Bölge Grafiği",
   "Common.define.chartData.textBar": "Çubuk grafik",
   "Common.define.chartData.textColumn": "Sütun grafik",
+  "Common.define.chartData.textComboCustom": "Özel kombinasyon",
   "Common.define.chartData.textLine": "Çizgi grafiği",
   "Common.define.chartData.textPie": "Dilim grafik",
   "Common.define.chartData.textPoint": "Nokta grafiği",
   "Common.define.chartData.textStock": "Stok Grafiği",
   "Common.define.chartData.textSurface": "Yüzey",
+  "Common.Translation.warnFileLockedBtnEdit": "Kopya oluştur",
   "Common.UI.Calendar.textApril": "Nisan",
   "Common.UI.Calendar.textAugust": "Ağustos",
   "Common.UI.Calendar.textDecember": "Aralık",
@@ -119,6 +123,9 @@
   "Common.Views.About.txtTel": "tel:",
   "Common.Views.About.txtVersion": "Versiyon",
   "Common.Views.AutoCorrectDialog.textAdd": "ekle",
+  "Common.Views.AutoCorrectDialog.textAutoCorrect": "Otomatik Düzeltme",
+  "Common.Views.AutoCorrectDialog.textDelete": "Sil",
+  "Common.Views.AutoCorrectDialog.textTitle": "Otomatik Düzeltme",
   "Common.Views.Chat.textSend": "Gönder",
   "Common.Views.Comments.textAdd": "Ekle",
   "Common.Views.Comments.textAddComment": "Yorum Ekle",
@@ -200,7 +207,9 @@
   "Common.Views.Plugins.textStart": "Başlat",
   "Common.Views.Plugins.textStop": "Bitir",
   "Common.Views.Protection.hintPwd": "Şifreyi değiştir veya sil",
+  "Common.Views.Protection.txtAddPwd": "Şifre ekle",
   "Common.Views.Protection.txtChangePwd": "Şifre Değiştir",
+  "Common.Views.Protection.txtDeletePwd": "Şifreyi sil",
   "Common.Views.Protection.txtInvisibleSignature": "Dijital imza ekle",
   "Common.Views.RenameDialog.textName": "Dosya adı",
   "Common.Views.RenameDialog.txtInvalidName": "Dosya adı aşağıdaki karakterlerden herhangi birini içeremez:",
@@ -255,6 +264,7 @@
   "Common.Views.ReviewChangesDialog.txtRejectAll": "Tüm Değişiklikleri Reddet",
   "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Mevcut Değişiklikleri Reddet",
   "Common.Views.ReviewPopover.textAdd": "Ekle",
+  "Common.Views.ReviewPopover.textAddReply": "Cevap ekle",
   "Common.Views.ReviewPopover.textCancel": "İptal",
   "Common.Views.ReviewPopover.textClose": "Kapat",
   "Common.Views.ReviewPopover.textEdit": "Tamam",
@@ -384,10 +394,13 @@
   "DE.Controllers.Main.titleUpdateVersion": "Versiyon değiştirildi",
   "DE.Controllers.Main.txtArt": "Your text here",
   "DE.Controllers.Main.txtBasicShapes": "Temel Şekiller",
+  "DE.Controllers.Main.txtBelow": "Altında",
   "DE.Controllers.Main.txtBookmarkError": "Hata! Yer imi tanımlı değil",
   "DE.Controllers.Main.txtButtons": "Tuşlar",
   "DE.Controllers.Main.txtCallouts": "Belirtme Çizgiler",
   "DE.Controllers.Main.txtCharts": "Grafikler",
+  "DE.Controllers.Main.txtChoose": "Bir öğe seçin",
+  "DE.Controllers.Main.txtCurrentDocument": "Mevcut belge",
   "DE.Controllers.Main.txtDiagramTitle": "Diagram Başlığı",
   "DE.Controllers.Main.txtEditingMode": "Düzenleme modunu belirle",
   "DE.Controllers.Main.txtEnterDate": "Bir tarih girin",
@@ -402,6 +415,11 @@
   "DE.Controllers.Main.txtSeries": "Seriler",
   "DE.Controllers.Main.txtShape_actionButtonHome": "Ev Tuşu",
   "DE.Controllers.Main.txtShape_cloud": "Bulut",
+  "DE.Controllers.Main.txtShape_corner": "Köşe",
+  "DE.Controllers.Main.txtShape_decagon": "Dekagon",
+  "DE.Controllers.Main.txtShape_diagStripe": "Çapraz Çizgi",
+  "DE.Controllers.Main.txtShape_diamond": "Elmas",
+  "DE.Controllers.Main.txtShape_downArrow": "Aşağı Oku",
   "DE.Controllers.Main.txtShape_leftArrow": "Sol Ok",
   "DE.Controllers.Main.txtShape_lineWithArrow": "Ok",
   "DE.Controllers.Main.txtShape_noSmoking": "Simge \"Yok\"",
@@ -830,6 +848,7 @@
   "DE.Views.CaptionDialog.textSeparator": "Ayraç",
   "DE.Views.CaptionDialog.textTable": "Tablo",
   "DE.Views.CaptionDialog.textTitle": "Resim yazısı ekle",
+  "DE.Views.CellsAddDialog.textCol": "Sütunlar",
   "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster",
   "DE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir",
   "DE.Views.ChartSettings.textEditData": "Veri düzenle",
@@ -849,13 +868,19 @@
   "DE.Views.ChartSettings.txtTitle": "Grafik",
   "DE.Views.ChartSettings.txtTopAndBottom": "Üst ve alt",
   "DE.Views.ControlSettingsDialog.textAdd": "ekle",
+  "DE.Views.ControlSettingsDialog.textApplyAll": "Tümüne Uygula",
   "DE.Views.ControlSettingsDialog.textColor": "Renk",
   "DE.Views.ControlSettingsDialog.textDate": "Tarih formatı",
+  "DE.Views.ControlSettingsDialog.textDelete": "Sil",
+  "DE.Views.ControlSettingsDialog.textDisplayName": "Görünen ad",
+  "DE.Views.ControlSettingsDialog.textDown": "Aşağı",
+  "DE.Views.ControlSettingsDialog.textDropDown": "Aşağı açılır liste",
   "DE.Views.ControlSettingsDialog.textFormat": "Tarihi böyle göster",
   "DE.Views.ControlSettingsDialog.textLang": "Dil",
   "DE.Views.ControlSettingsDialog.textName": "Başlık",
   "DE.Views.ControlSettingsDialog.textTag": "Etiket",
   "DE.Views.ControlSettingsDialog.tipChange": "Simge değiştir",
+  "DE.Views.CrossReferenceDialog.textAboveBelow": "Yukarı/aşağı",
   "DE.Views.CrossReferenceDialog.textBookmark": "Yer imi",
   "DE.Views.CrossReferenceDialog.textBookmarkText": "Yer imi metni",
   "DE.Views.CrossReferenceDialog.textCaption": "Resim yazısının tamamı",
@@ -949,6 +974,7 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Geri Taşı",
   "DE.Views.DocumentHolder.textArrangeForward": "İleri Taşı",
   "DE.Views.DocumentHolder.textArrangeFront": "Önplana Getir",
+  "DE.Views.DocumentHolder.textCol": "Tüm sütunu sil",
   "DE.Views.DocumentHolder.textCopy": "Kopyala",
   "DE.Views.DocumentHolder.textCut": "Kes",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Sargı Sınırı Düzenle",
@@ -959,12 +985,14 @@
   "DE.Views.DocumentHolder.textRotate": "Döndür",
   "DE.Views.DocumentHolder.textRotate270": "Döndür 90° Saatyönütersi",
   "DE.Views.DocumentHolder.textRotate90": "Döndür 90° Saatyönü",
+  "DE.Views.DocumentHolder.textRow": "Tüm diziyi sil",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Alta Hizala",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Ortaya Hizala",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Sola Hizala",
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Ortaya hizala",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Sağa Hizla",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Üste Hizala",
+  "DE.Views.DocumentHolder.textTitleCellsRemove": "Hücre Sil",
   "DE.Views.DocumentHolder.textUndo": "Geri Al",
   "DE.Views.DocumentHolder.textUpdateAll": "Tüm tabloyu güncelle",
   "DE.Views.DocumentHolder.textUpdatePages": "Sadece sayfa numaralarını güncelle",
@@ -1097,6 +1125,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Genişlik",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Yazı Tipi",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Sınır yok",
+  "DE.Views.EditListItemDialog.textDisplayName": "Görünen ad",
   "DE.Views.FileMenu.btnBackCaption": "Dökümanlara Git",
   "DE.Views.FileMenu.btnCloseMenuCaption": "Menüyü kapat",
   "DE.Views.FileMenu.btnCreateNewCaption": "Yeni oluştur",
@@ -1121,7 +1150,9 @@
   "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş metin dosyası oluşturun. Yada belli tipte yada amaçta dökümana başlamak için şablonlardan birini seçin, bu şablonlar önceden düzenlenmiştir.",
   "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Metin Dökümanı",
   "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Uygula",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Metin Ekle",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Erişim haklarını değiştir",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Yükleniyor...",
@@ -1168,6 +1199,7 @@
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Sunucuya Kaydet",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Her Dakika",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Tümünü göster",
+  "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Otomatik Düzeltme seçenekleri",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Santimetre",
   "DE.Views.FileMenuPanels.Settings.txtFitPage": "Sayfaya Sığdır",
   "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Genişliğe Sığdır",
@@ -1184,6 +1216,14 @@
   "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Bütün macroları uyarı vermeden devre dışı bırak",
   "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Bütün macroları uyarı vererek devre dışı bırak",
   "DE.Views.FileMenuPanels.Settings.txtWin": "Windows olarak",
+  "DE.Views.FormSettings.textDelete": "Sil",
+  "DE.Views.FormSettings.textDisconnect": "Bağlantıyı Kes",
+  "DE.Views.FormSettings.textDropDown": "Aşağı açılır",
+  "DE.Views.FormSettings.textMaxChars": "Karakter sınırı",
+  "DE.Views.FormSettings.textTipAdd": "Yeni değer ekle",
+  "DE.Views.FormSettings.textTipDelete": "Değeri sil",
+  "DE.Views.FormsTab.capBtnDropDown": "Aşağı açılır",
+  "DE.Views.FormsTab.tipDropDown": "Aşağı açılır liste ekle",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Alt Orta",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Alt Sol",
   "DE.Views.HeaderFooterSettings.textBottomRight": "Alt Sağ",
@@ -1244,6 +1284,7 @@
   "DE.Views.ImageSettingsAdvanced.textAngle": "Açı",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Oklar",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "En-boy oranını kilitle",
+  "DE.Views.ImageSettingsAdvanced.textAutofit": "Otomatik Sığdır",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Başlama Boyutu",
   "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Başlama Stili",
   "DE.Views.ImageSettingsAdvanced.textBelow": "altında",
@@ -1422,6 +1463,7 @@
   "DE.Views.NoteSettingsDialog.textTitle": "Not ayarları",
   "DE.Views.NotesRemoveDialog.textEnd": "Tüm Son Notları sil",
   "DE.Views.NotesRemoveDialog.textFoot": "Tüm dipnotları sil",
+  "DE.Views.NotesRemoveDialog.textTitle": "Notları sil",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.textBottom": "Bottom",
   "DE.Views.PageMarginsDialog.textLeft": "Left",
@@ -1433,6 +1475,7 @@
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
   "DE.Views.PageSizeDialog.textWidth": "Width",
+  "DE.Views.PageSizeDialog.txtCustom": "Özel",
   "DE.Views.ParagraphSettings.strLineHeight": "Satır Aralığı",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Aralık",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Aynı stildeki paragraflar arasına aralık ekleme",
@@ -1453,6 +1496,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Sol",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Sağ",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "sonra",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Önce",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Satırları birlikte tut",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Sonrakiyle tut",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Dolgu maddeleri",
@@ -1473,6 +1517,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Grafiğe tıklayın yada sınır seçmek için tuşları kullanın ve seçilen stili bunlara uygulayın",
   "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Sınır Boyutu",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Alt",
+  "DE.Views.ParagraphSettingsAdvanced.textCentered": "Ortalanmış",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Karakter aralığı",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Varsayılan Sekme",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efektler",
@@ -1578,6 +1623,7 @@
   "DE.Views.TableOfContentsSettings.textLeader": "Lider",
   "DE.Views.TableOfContentsSettings.textLevel": "Seviye",
   "DE.Views.TableOfContentsSettings.textLevels": "Seviyeler",
+  "DE.Views.TableOfContentsSettings.txtCurrent": "Mevcut",
   "DE.Views.TableOfContentsSettings.txtModern": "Modern",
   "DE.Views.TableSettings.deleteColumnText": "Sütunu Sil",
   "DE.Views.TableSettings.deleteRowText": "Satırı Sil",
@@ -1594,6 +1640,7 @@
   "DE.Views.TableSettings.splitCellsText": "Hücreyi Böl...",
   "DE.Views.TableSettings.splitCellTitleText": "Hücreyi Böl",
   "DE.Views.TableSettings.strRepeatRow": "Her sayfanın başında üst başlık sırası olarak tekrarla",
+  "DE.Views.TableSettings.textAddFormula": "Formül ekle",
   "DE.Views.TableSettings.textAdvanced": "Gelişmiş ayarları göster",
   "DE.Views.TableSettings.textBackColor": "Arka plan rengi",
   "DE.Views.TableSettings.textBanded": "Bağlı",
@@ -1622,6 +1669,8 @@
   "DE.Views.TableSettings.tipRight": "Sadece Dış Sağ Sınırı Belirle",
   "DE.Views.TableSettings.tipTop": "Sadece Dış Üst Sınırı Belirle",
   "DE.Views.TableSettings.txtNoBorders": "Sınır yok",
+  "DE.Views.TableSettings.txtTable_Accent": "Aksan",
+  "DE.Views.TableSettings.txtTable_Colorful": "Renkli",
   "DE.Views.TableSettingsAdvanced.textAlign": "Hiza",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Hiza",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Hücreler arası aralığa izin ver",
@@ -1700,6 +1749,7 @@
   "DE.Views.TextArtSettings.strStroke": "Stroke",
   "DE.Views.TextArtSettings.strTransparency": "Opacity",
   "DE.Views.TextArtSettings.strType": "Tip",
+  "DE.Views.TextArtSettings.textAngle": "Açı",
   "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",
@@ -1713,6 +1763,9 @@
   "DE.Views.TextArtSettings.textTemplate": "Template",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
+  "DE.Views.TextToTableDialog.textColumns": "Sütunlar",
+  "DE.Views.TextToTableDialog.textContents": "İçeriğe otomatik sığdır",
+  "DE.Views.TextToTableDialog.textWindow": "Pencereye otomatik sığdır",
   "DE.Views.Toolbar.capBtnAddComment": "Yorum ekle",
   "DE.Views.Toolbar.capBtnBlankPage": "Boş Sayfa",
   "DE.Views.Toolbar.capBtnColumns": "Sütunlar",
@@ -1763,6 +1816,7 @@
   "DE.Views.Toolbar.textContPage": "Devam Eden Sayfa",
   "DE.Views.Toolbar.textCustomLineNumbers": "Sayfa numaralandırma seçenekleri",
   "DE.Views.Toolbar.textDateControl": "Tarih",
+  "DE.Views.Toolbar.textDropdownControl": "Aşağı açılır liste",
   "DE.Views.Toolbar.textEditWatermark": "Özel Filigran",
   "DE.Views.Toolbar.textEvenPage": "Çift Sayfa",
   "DE.Views.Toolbar.textInMargin": "Kenar boşluğunda",
@@ -1872,6 +1926,7 @@
   "DE.Views.Toolbar.tipSynchronize": "Döküman başka bir kullanıcı tarafından değiştirildi. Lütfen değişikleri kaydetmek için tıklayın ve güncellemeleri yenileyin.",
   "DE.Views.Toolbar.tipUndo": "Geri Al",
   "DE.Views.Toolbar.tipWatermark": "Filigranı düzenle",
+  "DE.Views.Toolbar.txtObjectsAlign": "Seçili Objeleri Hizala",
   "DE.Views.Toolbar.txtScheme1": "Ofis",
   "DE.Views.Toolbar.txtScheme10": "Medyan",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/zh.json

@@ -169,6 +169,7 @@
   "Common.Views.AutoCorrectDialog.textBy": "依据",
   "Common.Views.AutoCorrectDialog.textDelete": "删除",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "数学自动修正",
+  "Common.Views.AutoCorrectDialog.textRecognizedDesc": "以下表达式被识别为数学公式。这些表达式不会被自动设为斜体。",
   "Common.Views.AutoCorrectDialog.textReplace": "替换",
   "Common.Views.AutoCorrectDialog.textReplaceText": "输入时自动替换",
   "Common.Views.AutoCorrectDialog.textReplaceType": "输入时自动替换文字",
@@ -289,6 +290,7 @@
   "Common.Views.ReviewChanges.strFastDesc": "实时共同编辑。所有更改将会自动保存。",
   "Common.Views.ReviewChanges.strStrict": "严格",
   "Common.Views.ReviewChanges.strStrictDesc": "使用“保存”按钮同步您和其他人所做的更改。",
+  "Common.Views.ReviewChanges.textWarnTrackChanges": "对全体有完整控制权的用户，“跟踪修改”功能将会启动。任何人下次打开该文档，“跟踪修改”功能都会保持在启动状态。",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "接受当前的变化",
   "Common.Views.ReviewChanges.tipCoAuthMode": "设置共同编辑模式",
   "Common.Views.ReviewChanges.tipCommentRem": "移除批注",
@@ -432,6 +434,7 @@
   "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。<br>请联系您的文档服务器管理员.",
   "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑",
+  "DE.Controllers.Main.errorComboSeries": "要创建联立图表，请选中至少两组数据。",
   "DE.Controllers.Main.errorCompare": "协作编辑状态下，无法使用文件比对功能。",
   "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。<br>当你点击“OK”按钮,系统将提示您下载文档。",
   "DE.Controllers.Main.errorDatabaseConnection": "外部错误。<br>数据库连接错误。如果错误仍然存​​在，请联系支持人员。",
@@ -454,6 +457,7 @@
   "DE.Controllers.Main.errorSessionAbsolute": "文档编辑会话已过期。请重新加载页面。",
   "DE.Controllers.Main.errorSessionIdle": "该文件尚未编辑相当长的时间。请重新加载页面。",
   "DE.Controllers.Main.errorSessionToken": "与服务器的连接已中断。请重新加载页面。",
+  "DE.Controllers.Main.errorSetPassword": "未能成功设置密码",
   "DE.Controllers.Main.errorStockChart": "行顺序不正确。建立股票图表将数据按照以下顺序放置在表格上：<br>开盘价，最高价格，最低价格，收盘价。",
   "DE.Controllers.Main.errorToken": "文档安全令牌未正确形成。<br>请与您的文件服务器管理员联系。",
   "DE.Controllers.Main.errorTokenExpire": "文档安全令牌已过期。<br>请与您的文档服务器管理员联系。",
@@ -514,6 +518,7 @@
   "DE.Controllers.Main.textShape": "形状",
   "DE.Controllers.Main.textStrict": "严格模式",
   "DE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。",
+  "DE.Controllers.Main.textTryUndoRedoWarn": "快速共同编辑模式下，撤销/重做功能被禁用。",
   "DE.Controllers.Main.titleLicenseExp": "许可证过期",
   "DE.Controllers.Main.titleServerVersion": "编辑器已更新",
   "DE.Controllers.Main.titleUpdateVersion": "版本已变化",
@@ -779,6 +784,7 @@
   "DE.Controllers.Navigation.txtBeginning": "文档开头",
   "DE.Controllers.Navigation.txtGotoBeginning": "转到文档开头",
   "DE.Controllers.Statusbar.textHasChanges": "已经跟踪了新的变化",
+  "DE.Controllers.Statusbar.textSetTrackChanges": "你现在处于了“跟踪变化”模式。",
   "DE.Controllers.Statusbar.textTrackChanges": "打开文档，并启用“跟踪更改”模式",
   "DE.Controllers.Statusbar.tipReview": "跟踪变化",
   "DE.Controllers.Statusbar.zoomText": "缩放％{0}",
@@ -1704,6 +1710,7 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "这是必填栏",
   "DE.Views.HyperlinkSettingsDialog.txtHeadings": "标题",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "该字段应该是“http://www.example.com”格式的URL",
+  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "该域字符限制为2803个。",
   "DE.Views.ImageSettings.textAdvanced": "显示高级设置",
   "DE.Views.ImageSettings.textCrop": "裁剪",
   "DE.Views.ImageSettings.textCropFill": "填满",
@@ -1820,6 +1827,7 @@
   "DE.Views.LeftMenu.txtDeveloper": "开发者模式",
   "DE.Views.LeftMenu.txtLimit": "限制访问",
   "DE.Views.LeftMenu.txtTrial": "试用模式",
+  "DE.Views.LeftMenu.txtTrialDev": "试用开发者模式",
   "DE.Views.LineNumbersDialog.textAddLineNumbering": "新增行号",
   "DE.Views.LineNumbersDialog.textApplyTo": "应用更改",
   "DE.Views.LineNumbersDialog.textContinuous": "连续",

apps/documenteditor/main/resources/help/de/UsageInstructions/SavePrintDownload.htm

@@ -28,7 +28,7 @@
 				<ol>
 					<li>Klicken Sie in der oberen Menüleiste auf die Registerkarte <b>Datei</b>.</li>
 					<li>Wählen Sie die Option <b>Speichern als...</b>.</li>
-					<li>Wählen Sie das gewünschte Format aus: DOCX, ODT, RTF, TXT, PDF, PDFA. Sie können die Option <b>Dokumentenvorlage</b> (DOTX oder OTT) auswählen.</li>
+					<li>Wählen Sie das gewünschte Format aus: DOCX, ODT, RTF, TXT, PDF, PDF/A. Sie können die Option <b>Dokumentenvorlage</b> (DOTX oder OTT) auswählen.</li>
 				</ol>
 			</div>
 			<div class="onlineDocumentFeatures">

apps/documenteditor/main/resources/help/de/editor.css

@@ -1,6 +1,6 @@
 body
 {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 font-size: 12px;
 color: #444;
 background: #fff;
@@ -180,7 +180,7 @@ text-decoration: none;
     font-style: italic;
 }
 #search-results a {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
     font-size: 1em;
     font-weight: bold;
     color: #444;

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

@@ -18,7 +18,7 @@
 			and edit documents<span class="onlineDocumentFeatures"> directly in your browser</span>.</p>
 			<p>Using the <b>Document Editor</b>, you can perform various editing operations like in any desktop editor, 
 			print the edited documents keeping all the formatting details or download them onto your computer hard disk drive of your computer as DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB files.</p>
-			<p><span class="onlineDocumentFeatures">To view the current software version and licensor details in the <em>online version</em>, click the <img alt="About icon" src="../images/about.png" /> icon on the left sidebar.</span> <span class="desktopDocumentFeatures"> To view the current software version and licensor details in the <em>desktop version</em>, select the <b>About</b> menu item on the left sidebar of the main program window.</span></p>
+			<p><span class="onlineDocumentFeatures">To view the current software version and licensor details in the <em>online version</em>, click the <img alt="About icon" src="../images/about.png" /> icon on the left sidebar.</span> <span class="desktopDocumentFeatures"> To view the current software version and licensor details in the <em>desktop version</em> for Windows, select the <b>About</b> menu item on the left sidebar of the main program window. In the <em>desktop version</em> for Mac OS, open the <b>ONLYOFFICE</b> menu at the top of the screen and select the <b>About ONLYOFFICE</b> menu item.</span></p>
 		</div>
 	</body>
 </html>

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

@@ -53,7 +53,7 @@
 					<td>FB2</td>
 					<td>An ebook extension that lets you read books on your computer or mobile devices</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td>+</td>
 				</tr>
 				<tr>
@@ -103,13 +103,13 @@
 					<td>HyperText Markup Language<br />The main markup language for web pages</td>
 					<td>+</td>
 					<td>+</td>
-					<td>in the online version</td>
+					<td>+</td>
 				</tr>
 				<tr>
 					<td>EPUB</td>
 					<td>Electronic Publication<br />Free and open e-book standard created by the International Digital Publishing Forum</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td>+</td>
 				</tr>
 				<tr>
@@ -130,7 +130,7 @@
 					<td>XML</td>
 					<td>Extensible Markup Language (XML).<br />A simple and flexible markup language that derived from SGML (ISO 8879) and is designed to store and transport data.</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td></td>
 				</tr>
 				<!--<tr>
@@ -148,7 +148,7 @@
 					<td></td>
 				</tr>-->
 			</table>
-			<p class="note"><b>Note</b>: the HTML/EPUB/MHT formats run without Chromium and are available on all platforms.</p>
+			<p class="note"><b>Note</b>: all formats run without Chromium and are available on all platforms.</p>
 		</div>
 	</body>
 </html>

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

@@ -43,7 +43,7 @@
             </ol>
             <p>If you select the <b>Square</b>, <b>Tight</b>, <b>Through</b>, or <b>Top and bottom</b> style, you will be able to set up some additional parameters - <b>Distance from Text</b> at all sides (top, bottom, left, right). To access these parameters, right-click the object, select the <b>Advanced Settings</b> option and switch to the <b>Text Wrapping</b> tab of the object <b>Advanced Settings</b> window. Set the required values and click <b>OK</b>.</p>
             <p>If you select a wrapping style other than <b>Inline</b>, the <b>Position</b> tab is also available in the object <b>Advanced Settings</b> window. To learn more on these parameters, please refer to the corresponding pages with the instructions on how to work with <a href="../UsageInstructions/InsertAutoshapes.htm#position" onclick="onhyperlinkclick(this)">shapes</a>, <a href="../UsageInstructions/InsertImages.htm#position" onclick="onhyperlinkclick(this)">images</a> or <a href="../UsageInstructions/InsertCharts.htm#position" onclick="onhyperlinkclick(this)">charts</a>.</p>
-            <p>If you select a wrapping style other than <b>Inline</b>, you can also edit the wrap boundary for <b>images</b> or <b>shapes</b>. Right-click the object, select the <b>Wrapping Style</b> option from the contextual menu and click the <b>Edit Wrap Boundary</b> option. Drag wrap points to customize the boundary. To create a new wrap point, click anywhere on the red line and drag it to the required position. <img alt="Editing Wrap Boundary" src="../images/wrap_boundary.png" /></p>
+            <p>If you select a wrapping style other than <b>Inline</b>, you can also edit the wrap boundary for <b>images</b> or <b>shapes</b>. Right-click the object, select the <b>Wrapping Style</b> option from the contextual menu and click the <b>Edit Wrap Boundary</b> option. You can also use the <b>Wrapping</b> -> <b>Edit Wrap Boundary</b> menu on the <b>Layout</b> tab of the top toolbar. Drag wrap points to customize the boundary. To create a new wrap point, click anywhere on the red line and drag it to the required position. <img alt="Editing Wrap Boundary" src="../images/wrap_boundary.png" /></p>
             <h3>Change text wrapping for tables</h3>
             <p>For <a href="../UsageInstructions/InsertTables.htm" onclick="onhyperlinkclick(this)">tables</a>, the following two wrapping styles are available: <b>Inline table</b> and <b>Flow table</b>.</p>
             <p>To change the currently selected wrapping style:</p>

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

@@ -32,7 +32,7 @@
             </ol>
             <p>The program also creates numbered lists automatically when you enter digit 1 with a dot or a bracket and a space after it: <b>1.</b>, <b>1)</b>. Bulleted lists can be created automatically when you enter the <b>-</b>, <b>*</b> characters and a space after them.</p>
             <p>You can also change the text indentation in the lists and their nesting by clicking the <b>Multilevel list</b> <img alt="Multilevel list icon" src="../images/outline.png" />, <b>Decrease indent</b> <img alt="Decrease indent icon" src="../images/decreaseindent.png" />, and <b>Increase indent</b> <img alt="Increase indent icon" src="../images/increaseindent.png" /> icons on the <b>Home</b> tab of the top toolbar.</p>
-            <p>To change the list level, click the <b>Numbering</b> <img alt="Ordered List icon" src="../images/numbering.png" /> or <b>Bullets</b> <img alt="Unordered List icon" src="../images/bullets.png" /> icon and choose the <b>Change list level</b> option, or place the cursor at the beginning of the line and press the <b>Tab</b> key on a keyboard to move to the next level of the list. Proceed with the list level needed.</p>
+            <p>To change the list level, click the <b>Numbering</b> <img alt="Ordered List icon" src="../images/numbering.png" />, <b>Bullets</b> <img alt="Unordered List icon" src="../images/bullets.png" />, or <b>Multilevel list</b> <img alt="Multilevel list icon" src="../images/outline.png" /> icon and choose the <b>Change List Level</b> option, or place the cursor at the beginning of the line and press the <b>Tab</b> key on a keyboard to move to the next level of the list. Proceed with the list level needed.</p>
             <p><img alt="change list level" src="../images/listlevel.png" /></p>
             <p class="note">The additional indentation and spacing parameters can be changed on the right sidebar and in the advanced settings window. To learn more about it, read the <a href="ParagraphIndents.htm" onclick="onhyperlinkclick(this)">Change paragraph indents</a> and <a href="LineSpacing.htm" onclick="onhyperlinkclick(this)">Set paragraph line spacing</a> section.</p>
 

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

@@ -15,7 +15,7 @@
         </div>
 			<h1>Set the font type, size, and color</h1>
             <p>In the <a href="https://www.onlyoffice.com/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a>, you can select the font type, its size and color using the corresponding icons on the <b>Home</b> tab of the top toolbar.</p>
-			<p class="note">In case you want to apply the formatting to the already existing text in the document, select it with the mouse or <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">use the keyboard</a> and apply the formatting.</p>
+			<p class="note">In case you want to apply the formatting to the already existing text in the document, select it with the mouse or <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">use the keyboard</a> and apply the formatting. You can also place the mouse cursor within the necessary word to apply the formatting to this word only.</p>
             <table>
 				<tr>
                     <td width="10%">Font</td>
@@ -40,7 +40,7 @@
 				<tr>
 					<td>Change case</td>
 					<td><img alt="Change case" src="../images/change_case.png" /></td>
-					<td>Used to change the font case. <em>Sentence case.</em> - the case matches that of a common sentence. <em>lowercase</em> - all letters are small. <em>UPPERCASE</em> - all letters are capital. <em>Capitalize Each Word</em> - each word starts with a capital letter. <em>tOGGLE cASE</em> - reverse the case of the selected text.</td>
+					<td>Used to change the font case. <em>Sentence case.</em> - the case matches that of a common sentence. <em>lowercase</em> - all letters are small. <em>UPPERCASE</em> - all letters are capital. <em>Capitalize Each Word</em> - each word starts with a capital letter. <em>tOGGLE cASE</em> - reverse the case of the selected text or the word where the mouse cursor is positioned.</td>
 				</tr>
 				<tr>
 					<td>Highlight color</td>

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

@@ -28,7 +28,7 @@
                 <ol>
                     <li>click the <b>File</b> tab of the top toolbar,</li>
                     <li>select the <b>Save as...</b> option,</li>
-                    <li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDFA. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
+                    <li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDF/A, HTML, FB2, EPUB. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
                 </ol>
             </div>
 			<div class="onlineDocumentFeatures">

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

@@ -15,9 +15,9 @@
         </div>
         <h1>Count words</h1>
         <p>To know the exact number of words and symbols both with and without spaces  in your document, as well as the number of paragraphs altogether, use the Word counter plugin.</p>
-        <ol>
+        <ol>            
+            <li>Open the <b>Plugins</b> tab and click <b>Count words and characters</b>.</li>
             <li>Select the text.</li>
-            <li>Open the <b>Plugins</b> tab and click <b>Word counter</b>.</li>
         </ol>
         <div class="note">Please note that the following elements are not included in the word count:
         <ul>

apps/documenteditor/main/resources/help/en/editor.css

@@ -1,6 +1,6 @@
 body
 {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 font-size: 12px;
 color: #444;
 background: #fff;
@@ -180,7 +180,7 @@ text-decoration: none;
     font-style: italic;
 }
 #search-results a {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
     font-size: 1em;
     font-weight: bold;
     color: #444;

apps/documenteditor/main/resources/help/es/UsageInstructions/OpenCreateNew.htm

@@ -14,7 +14,7 @@
             <input id="search" class="searchBar" placeholder="Buscar" type="text" onkeypress="doSearch(event)">
         </div>
 			<h1>Cree un documento nuevo o abra el documento existente</h1>
-			<h6>Para crear un nuevo documento</h6>
+			<h3>Para crear un nuevo documento</h3>
             <div class="onlineDocumentFeatures">
                 <p>En el <em>editor en línea</em></p>
                 <ol>
@@ -32,7 +32,7 @@
             </div>
 
             <div class="desktopDocumentFeatures">
-                <h6>Para abrir un documento existente</h6>
+                <h3>Para abrir un documento existente</h3>
                 <p>En el <em>editor de escritorio </em></p>
                 <ol>
                     <li>en la ventana principal del programa, seleccione la opción <b>Abrir archivo local</b> en la barra lateral izquierda,</li>
@@ -42,7 +42,7 @@
                 <p>Todos los directorios a los que ha accedido utilizando el editor de escritorio se mostrarán en la lista de <b>Carpetas recientes</b> para que posteriormente pueda acceder rápidamente a ellos. Haga clic en la carpeta correspondiente para seleccionar uno de los archivos almacenados en ella.</p>
             </div>
 
-                <h6>Para abrir un documento recientemente editado</h6>
+                <h3>Para abrir un documento recientemente editado</h3>
             <div class="onlineDocumentFeatures">
                 <p>En el <em>editor en línea</em></p>
                 <ol>

apps/documenteditor/main/resources/help/es/UsageInstructions/SavePrintDownload.htm

@@ -28,7 +28,7 @@
                 <ol>
                     <li>haga clic en la pestaña <b>Archivo</b> en la barra de herramientas superior,</li>
                     <li>seleccione la opción <b>Guardar como...</b>,</li>
-                    <li>elija uno de los formatos disponibles: DOCX, ODT, RTF, TXT, PDF, PDFA. También puede seleccionar la opción <b>Plantilla de documento</b> (DOTX o OTT).</li>
+                    <li>elija uno de los formatos disponibles: DOCX, ODT, RTF, TXT, PDF, PDF/A. También puede seleccionar la opción <b>Plantilla de documento</b> (DOTX o OTT).</li>
                 </ol>
             </div>
 			<div class="onlineDocumentFeatures">

apps/documenteditor/main/resources/help/es/editor.css

@@ -1,6 +1,6 @@
 body
 {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 font-size: 12px;
 color: #444;
 background: #fff;
@@ -180,7 +180,7 @@ text-decoration: none;
     font-style: italic;
 }
 #search-results a {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
     font-size: 1em;
     font-weight: bold;
     color: #444;

apps/documenteditor/main/resources/help/fr/HelpfulHints/About.htm

@@ -16,7 +16,7 @@
 		<h1>À propos de Document Editor</h1>
 			<p><a href="https://www.onlyoffice.com/fr/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a> est une application <span class="onlineDocumentFeatures">en ligne</span> qui vous permet de parcourir et de modifier des documents<span class="onlineDocumentFeatures"> dans votre navigateur</span>.</p>
 			<p>En utilisant<B> Document Editor</B>, vous pouvez effectuer différentes opérations d'édition comme avec n'importe quel éditeur de bureau, imprimer les documents modifiés en gardant la mise en forme ou les télécharger sur votre disque dur au format DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB.</p>
-			<p><span class="onlineDocumentFeatures">Pour afficher la version actuelle du logiciel et les informations de licence dans la <I>version en ligne</I>, cliquez sur l'icône <img alt="L'icône À propos" src="../images/about.png" /> dans la barre latérale gauche.</span> <span class="desktopDocumentFeatures"> Pour afficher la version actuelle du logiciel et les informations de licence dans la <I><I>version</I>de bureau</I>, cliquez sur l'icône <B>À propos</B> dans la barre latérale gauche de la fenêtre principale du programme.</span></p>
+			<p><span class="onlineDocumentFeatures">Pour afficher la version actuelle du logiciel et les informations de licence dans la <em>version en ligne</em>, cliquez sur l'icône <img alt="L'icône À propos" src="../images/about.png" /> dans la barre latérale gauche.</span> <span class="desktopDocumentFeatures"> Pour afficher la version actuelle du logiciel et les informations de licence dans la <em>version de bureau</em> pour Windows, cliquez sur l'icône <B>À propos</B> dans la barre latérale gauche de la fenêtre principale du programme. Dans la <em>version de bureau</em> pour Mac OS, accédez au menu <b>ONLYOFFICE</b> en haut de l'écran et sélectionnez l'élément de menu <b>À  propos d'ONLYOFFICE</b>.</span></p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/fr/HelpfulHints/SupportedFormats.htm

@@ -50,7 +50,7 @@
 					<td>FB2</td>
 					<td>Une extension de livres électroniques qui peut être lancé par votre ordinateur ou appareil mobile</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td>+</td>
 				</tr>
 				<tr>
@@ -100,13 +100,13 @@
 					<td>HyperText Markup Language<br />Le principale langage de balisage pour les pages web</td>
 					<td>+</td>
 					<td>+</td>
-					<td>dans la <I>version en ligne</I></td>
+					<td>+</td>
 				</tr>
 				<tr>
 					<td>EPUB</td>
 					<td>Electronic Publication<br />Le format ebook standardisé, gratuit et ouvert créé par l'International Digital Publishing Forum	</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td>+</td>
 				</tr>
 				<tr>
@@ -127,7 +127,7 @@
 					<td>XML</td>
 					<td>Extensible Markup Language (XML).<br />Le langage de balisage extensible est une forme restreinte d'application du langage de balisage généralisé standard SGM (ISO 8879) conçu pour stockage et traitement de données.</td>
 					<td>+</td>
-					<td></td>
+					<td>+</td>
 					<td></td>
 				</tr>
 				<!--<tr>
@@ -145,7 +145,7 @@
 					<td></td>
 				</tr>-->
 			</table>
-			<p class="note"><b>Remarque</b>: Les formats HTML/EPUB/MHT n'ont pas besoin de Chromium et sont disponibles sur toutes les plateformes.</p>
+			<p class="note"><b>Remarque</b>: tous les formats n'ont pas besoin de Chromium et sont disponibles sur toutes les plateformes.</p>
 		</div>
 	</body>
 </html>

apps/documenteditor/main/resources/help/fr/UsageInstructions/ChangeWrappingStyle.htm

@@ -43,7 +43,7 @@
             </ol>
             <p>Si vous avez choisi l'un des styles <b>Carré</b>, <b>Rapproché</b>, <b>Au travers</b>, <b>Haut et bas</b>, vous avez la possibilité de configurer des paramètres supplémentaires - <b>Distance du texte</b> de tous les côtés (haut, bas, droite, gauche). Pour accéder à ces paramètres, cliquez avec le bouton droit sur l'objet, sélectionnez l'option <b>Paramètres avancés</b> et passez à l'onglet <b>Style d'habillage</b> du texte de la fenêtre <b>Paramètres avancés</b> de l'objet. Définissez les valeurs voulues et cliquez sur <b>OK</b>.</p>
             <p>Si vous sélectionnez un style d'habillage autre que<b> En ligne</b>, l'onglet <b>Position</b> est également disponible dans la fenêtre <b>Paramètres avancés</b> de l'objet. Pour en savoir plus sur ces paramètres, reportez-vous aux pages correspondantes avec les instructions sur la façon de travailler avec <a href="../UsageInstructions/InsertAutoshapes.htm#position" onclick="onhyperlinkclick(this)">des formes</a>, <a href="../UsageInstructions/InsertImages.htm#position" onclick="onhyperlinkclick(this)">des images</a> ou <a href="../UsageInstructions/InsertCharts.htm#position" onclick="onhyperlinkclick(this)">des graphiques</a>.</p>
-            <p>Si vous sélectionnez un style d'habillage autre que <b>En ligne</b>, vous pouvez également modifier la limite d'habillage pour les <b>images</b> ou les <b>formes</b>. Cliquez avec le bouton droit sur l'objet, sélectionnez l'option <b>Style d'habillage</b> dans le menu contextuel et cliquez sur <b>Modifier les limites du renvoi à la ligne</b>. Faites glisser les points d'habillage pour personnaliser les limites. Pour créer un nouveau point d'habillage, cliquez sur la ligne rouge et faites-la glisser vers la position désirée. <img alt="Modifier les limites du renvoi à la ligne" src="../images/wrap_boundary.png" /></p>
+            <p>Si vous sélectionnez un style d'habillage autre que <b>En ligne</b>, vous pouvez également modifier la limite d'habillage pour les <b>images</b> ou les <b>formes</b>. Cliquez avec le bouton droit sur l'objet, sélectionnez l'option <b>Style d'habillage</b> dans le menu contextuel et cliquez sur <b>Modifier les limites du renvoi à la ligne</b>. Il est aussi possible d'utiliser le menu <b>Retour à la ligne</b> -> <b>Modifier les limites du renvoi à la ligne</b> sous l'onglet <b>Mise en page</b> de la barre d'outils supérieure. Faites glisser les points d'habillage pour personnaliser les limites. Pour créer un nouveau point d'habillage, cliquez sur la ligne rouge et faites-la glisser vers la position désirée. <img alt="Modifier les limites du renvoi à la ligne" src="../images/wrap_boundary.png" /></p>
             <h3>Modifier l'habillage de texte pour les tableaux</h3>
             <p>Pour les <a href="../UsageInstructions/InsertTables.htm" onclick="onhyperlinkclick(this)">tableaux</a>, les deux styles d'habillage suivants sont disponibles: <b>Tableau aligné</b> et <b>Tableau flottant</b>.</p>
             <p>Pour changer le style d'habillage actuellement sélectionné:</p>

apps/documenteditor/main/resources/help/fr/UsageInstructions/CreateLists.htm

@@ -32,7 +32,7 @@
             </ol>
             <p>L'éditeur commence automatiquement une liste numérotée lorsque vous tapez 1 et un point ou une parenthèse droite et un espace: <b>1.</b>, <b>1)</b>. La liste à puces commence automatiquement lorsque vous tapez  <b>-</b> ou <b>* </b> et un espace.</p>
             <p>Vous pouvez aussi changer le retrait du texte dans les listes et leur imbrication en utilisant les icônes <b>Liste multi-niveaux</b> <img alt="L'icône de la liste multi-niveaux" src="../images/outline.png" />, <b>Réduire le retrait</b> <img alt="L'icône Réduire le retrait" src="../images/decreaseindent.png" /> et <b>Augmenter le retrait</b> <img alt="L'icône Augmenter le retrait" src="../images/increaseindent.png" /> sous l'onglet <b>Accueil</b> de la barre d'outils supérieure.</p>
-            <p>Pour modifier le niveau de la liste, cliquez sur l'icône  <b>Numérotation </b> <img alt="L'icône de la liste ordonnée" src="../images/numbering.png" /> ou <b>Puces</b>  <img alt="L'icône de la liste non ordonnée" src="../images/bullets.png" /> et choisissez <b>Changer le niveau de liste</b>, ou placer le curseur au début de la ligne et appuyez sur la touche Tab du clavier pour augmenter le niveau de la liste. Procédez au niveau de liste approprié.</p>
+            <p>Pour modifier le niveau de la liste, cliquez sur l'icône  <b>Numérotation </b> <img alt="L'icône de la liste ordonnée" src="../images/numbering.png" />, <b>Puces</b>  <img alt="L'icône de la liste non ordonnée" src="../images/bullets.png" />, ou <b>Liste multi-niveaux</b> <img alt="L'icône de la liste multi-niveaux" src="../images/outline.png" /> et choisissez <b>Changer le niveau de liste</b>, ou placer le curseur au début de la ligne et appuyez sur la touche Tab du clavier pour augmenter le niveau de la liste. Procédez au niveau de liste approprié.</p>
             <p><img alt="Changer le niveau de liste" src="../images/listlevel.png" /></p>
             <p class="note">Vous pouvez configurez les paramètres supplémentaires du retrait et de l'espacement sur la barre latérale droite et dans la fenêtre de configuration de paramètres avancées.  Pour en savoir plus, consultez les pages  <a href="ParagraphIndents.htm" onclick="onhyperlinkclick(this)">Modifier le retrait des paragraphes</a> et <a href="LineSpacing.htm" onclick="onhyperlinkclick(this)">Régler l'interligne du paragraphe</a> .</p>
 

apps/documenteditor/main/resources/help/fr/UsageInstructions/FontTypeSizeColor.htm

@@ -15,7 +15,7 @@
         </div>
 			<h1>Définir le type de police, la taille et la couleur</h1>
             <p>Dans <a href="https://www.onlyoffice.com/fr/document-editor.aspx" target="_blank" onclick="onhyperlinkclick(this)"><b>Document Editor</b></a>, vous pouvez sélectionner le type, la taille et la couleur de police à l'aide des icônes correspondantes situées dans l'onglet <b>Accueil</b> de la barre d'outils supérieure.</p>
-			<p class="note">Si vous voulez appliquer la mise en forme au texte déjà saisi, sélectionnez-le avec la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">en utilisant le clavier</a> et appliquez la mise en forme appropriée.</p>
+			<p class="note">Si vous voulez appliquer la mise en forme au texte déjà saisi, sélectionnez-le avec la souris ou <a href="../HelpfulHints/KeyboardShortcuts.htm#textselection" onclick="onhyperlinkclick(this)">en utilisant le clavier</a> et appliquez la mise en forme appropriée. Vous pouvez aussi positionner le curseur de la souris sur le mot à mettre en forme.</p>
             <table>
 				<tr>
                     <td width="10%">Nom de la police</td>
@@ -40,7 +40,7 @@
 				<tr>
 					<td>Modifier la casse</td>
 					<td><img alt="Modifier la casse" src="../images/change_case.png" /></td>
-					<td>Sert à modifier la casse du texte. <em>Majuscule en début de phrase</em> - la casse à correspondre la casse de la proposition ordinaire. minuscule - mettre en minuscule toutes les lettres MAJUSCULES - mettre en majuscule toutes les lettres Mettre en majuscule chaque mot - mettre en majuscule la première lettre de chaque mot Inverser la casse - basculer entre d'affichages de la casse du texte.</td>
+					<td>Sert à modifier la casse du texte. <em>Majuscule en début de phrase</em> - la casse à correspondre la casse de la proposition ordinaire. <em>minuscule</em> - mettre en minuscule toutes les lettres. <em>MAJUSCULES</em> - mettre en majuscule toutes les lettres. <em>Mettre en majuscule chaque mot</em> - mettre en majuscule la première lettre de chaque mot. <em>Inverser la casse</em> - basculer entre d'affichages de la casse du texte ou le mot sur lequel le curseur de la souris est positionné.</td>
 				</tr>
 				<tr>
 					<td>Couleur de surlignage</td>

apps/documenteditor/main/resources/help/fr/UsageInstructions/SavePrintDownload.htm

@@ -28,7 +28,7 @@
                 <ol>
                     <li>cliquez sur l'onglet <b>Fichier</b> de la barre d'outils supérieure,</li>
                     <li>sélectionnez l'option <b>Enregistrer sous...</b>,</li>
-                    <li>sélectionnez l'un des formats disponibles selon vos besoins: DOCX, ODT, RTF, TXT, PDF, PDFA. Vous pouvez également choisir l'option <b>Modèle de document</b> (DOTX or OTT).</li>
+                    <li>sélectionnez l'un des formats disponibles selon vos besoins: DOCX, ODT, RTF, TXT, PDF, PDF/A, HTML, FB2, EPUB. Vous pouvez également choisir l'option <b>Modèle de document</b> (DOTX or OTT).</li>
                 </ol>
             </div>
 			<div class="onlineDocumentFeatures">

apps/documenteditor/main/resources/help/fr/editor.css

@@ -1,6 +1,6 @@
 body
 {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 font-size: 12px;
 color: #444;
 background: #fff;
@@ -180,7 +180,7 @@ text-decoration: none;
     font-style: italic;
 }
 #search-results a {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
     font-size: 1em;
     font-weight: bold;
     color: #444;

apps/documenteditor/main/resources/help/it/UsageInstructions/OpenCreateNew.htm

@@ -14,7 +14,7 @@
             <input id="search" class="searchBar" placeholder="Search" type="text" onkeypress="doSearch(event)">
         </div>
 			<h1>Create a new document or open an existing one</h1>
-			<h4>Per creare un nuovo documento</h4>
+			<h3>Per creare un nuovo documento</h3>
             <div class="onlineDocumentFeatures">
                 <p>Nell’Editor di <em>Documenti Online</em></p>
                 <ol>
@@ -32,7 +32,7 @@
             </div>
 
             <div class="desktopDocumentFeatures">
-                <h4>Per aprire un documento esistente</h4>
+                <h3>Per aprire un documento esistente</h3>
                 <p>Nell’Editor di <em>Documenti Desktop</em></p>
                 <ol>
                     <li>Nella finestra principale del programma,  seleziona nella barra a sinistra la voce di menù <b>Apri file locale</b>,</li>
@@ -42,7 +42,7 @@
                 <p>Tutte le directory a cui hai accesso usando l’editor per desktop verranno visualizzate nell’elenco delle <b>Cartelle recenti</b> in modo da poter avere un rapido accesso in seguito. Cliccando sulla cartella, verranno visualizzati i file in essa contenuti.</p>
             </div>
 
-                <h4>Per aprire un documento modificato recentemente</h4>
+                <h3>Per aprire un documento modificato recentemente</h3>
             <div class="onlineDocumentFeatures">
                 <p>Nell’Editor di <em>Documenti Online</em></p>
                 <ol>

apps/documenteditor/main/resources/help/it/UsageInstructions/SavePrintDownload.htm

@@ -28,7 +28,7 @@
                 <ol>
                     <li>click the <b>File</b> tab of the top toolbar,</li>
                     <li>select the <b>Save as...</b> option,</li>
-                    <li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDFA. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
+                    <li>choose one of the available formats depending on your needs: DOCX, ODT, RTF, TXT, PDF, PDF/A. You can also choose the <b>Document template</b> (DOTX or OTT) option.</li>
                 </ol>
             </div>
 			<div class="onlineDocumentFeatures">

apps/documenteditor/main/resources/help/it/editor.css

@@ -1,6 +1,6 @@
 body
 {
-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 font-size: 12px;
 color: #444;
 background: #fff;
@@ -158,7 +158,7 @@ text-decoration: none;
     font-style: italic;
 }
 #search-results a {
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
     font-size: 1em;
     font-weight: bold;
     color: #444;

apps/documenteditor/main/resources/help/ru/HelpfulHints/About.htm

@@ -23,7 +23,7 @@
     распечатывать отредактированные документы, сохраняя все детали форматирования, или сохранять документы на жесткий диск компьютера
     как файлы в формате DOCX, PDF, ODT, TXT, DOTX, PDF/A, OTT, RTF, HTML, FB2, EPUB.
 </p>
-      <p> <span class="onlineDocumentFeatures">Для просмотра текущей версии программы и информации о владельце лицензии в <em>онлайн-версии</em> щелкните по значку <img alt="Значок О программе" src="../images/about.png" /> на левой боковой панели инструментов.</span> <span class="desktopDocumentFeatures"> Для просмотра текущей версии программы и информации о владельце лицензии в <em>десктопной версии</em> выберите пункт меню <b>О программе</b> на левой боковой панели в главном окне приложения.</span></p>
+      <p> <span class="onlineDocumentFeatures">Для просмотра текущей версии программы и информации о владельце лицензии в <em>онлайн-версии</em> щелкните по значку <img alt="Значок О программе" src="../images/about.png" /> на левой боковой панели инструментов.</span> <span class="desktopDocumentFeatures"> Для просмотра текущей версии программы и информации о владельце лицензии в <em>десктопной версии</em> для Windows выберите пункт меню <b>О программе</b> на левой боковой панели в главном окне приложения. В <em>десктопной версии</em> для Mac OS откройте меню <b>ONLYOFFICE</b> в верхней части и выберите пункт меню <b>О программе ONLYOFFICE</b>.</span></p>
     </div>
 	</body>
 </html>