Merge pull request #109 from ONLYOFFICE/develop

Develop

CHANGELOG.md

@@ -2,6 +2,8 @@
 ## 5.1.1
 ### All Editors
 * Customize initial zoom for the embedded editors
+* Replace image from context menu (bug #11493)
+* Customize availability of help in the editor
 
 ### Document Editor
 * Create and manage bookmarks
@@ -10,7 +12,8 @@
 
 ### Spreadsheet Editor
 * Add Spanish, French formula translations
-* Set options for saving in PDF format
+* Set options for saving in PDF format (bug #34914)
+* Change cell format from context menu (bug #16272)
 
 ### Presentation Editor
-* 
+* Add hints to presentation themes (bug #21362)

apps/api/documents/api.js

@@ -119,7 +119,8 @@
                     autosave: true,
                     forcesave: false,
                     commentAuthorOnly: false,
-                    showReviewChanges: false
+                    showReviewChanges: false,
+                    help: true
                 },
                 plugins: {
                     autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -191,6 +192,7 @@
         _config.editorConfig.canSendEmailAddresses = _config.events && !!_config.events.onRequestEmailAddresses;
         _config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights;
         _config.editorConfig.canRequestClose = _config.events && !!_config.events.onRequestClose;
+        _config.editorConfig.canRename = _config.events && !!_config.events.onRequestRename;
         _config.frameEditorId = placeholderId;
 
         _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead.");

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

@@ -164,11 +164,14 @@ define([
             var result = Array.prototype.slice.call(this);
 
             args.forEach(function(sub){
-                Array.prototype.push.apply(result, sub);
+                if (sub instanceof Array )
+                    Array.prototype.push.apply(result, sub);
+                else if (sub)
+                    result.push(sub);
             });
 
             return result;
-        }
+        };
 
         var _out_array = Object.create(ButtonsArray.prototype);
         for ( var i in arguments ) {

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

@@ -193,6 +193,15 @@ define([
                         if (modalParents.length > 0) {
                             el.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
                         }
+
+                        el.find('.dropdown-menu').on('mouseenter', function(){ // hide tooltip when mouse is over menu
+                            var tip = el.data('bs.tooltip');
+                            if (tip) {
+                                if (tip.dontShow===undefined)
+                                    tip.dontShow = true;
+                                tip.hide();
+                            }
+                        });
                     }
 
                     el.on('show.bs.dropdown',             _.bind(me.onBeforeShowMenu, me));

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

@@ -71,7 +71,7 @@ define([
 
         function onClickDocument(e) {
             if ( this.isFolded ) {
-                if ( $(e.target).parents('.toolbar').length ){
+                if ( $(e.target).parents('.toolbar, #file-menu-panel').length ){
                 } else {
                     this.collapse();
                 }
@@ -86,15 +86,30 @@ define([
             initialize : function(options) {
                 Common.UI.BaseView.prototype.initialize.call(this, options);
 
+                var _template_tabs =
+                    '<section class="tabs">' +
+                        '<a class="scroll left"><i class="icon">&lt;</i></a>' +
+                        '<ul>' +
+                            '<% for(var i in items) { %>' +
+                                '<li class="ribtab' +
+                                        '<% if (items[i].haspanel===false) print(" x-lone") %>' +
+                                        '<% if (items[i].extcls) print(\' \' + items[i].extcls) %>">' +
+                                    '<a data-tab="<%= items[i].action %>" data-title="<%= items[i].caption %>"><%= items[i].caption %></a>' +
+                                '</li>' +
+                            '<% } %>' +
+                        '</ul>' +
+                        '<a class="scroll right"><i class="icon">&gt;</i></a>' +
+                    '</section>';
+
                 this.$layout = $(options.template({
-                    tabs: options.tabs
+                    tabsmarkup: _.template(_template_tabs)({items: options.tabs})
                 }));
 
                 config.tabs = options.tabs;
                 $(document.body).on('click', onClickDocument.bind(this));
 
                 Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){
-                    this.setVisible(action, visible)
+                    this.setVisible(action, visible);
                 }, this));
             },
 
@@ -127,8 +142,12 @@ define([
                 if ( this.isFolded ) {
                     if (!optsFold.$box) optsFold.$box = me.$el.find('.box-controls');
 
-                    optsFold.$bar.addClass('folded').toggleClass('expanded', false);
+                    optsFold.$bar.addClass('folded z-clear').toggleClass('expanded', false);
                     optsFold.$bar.find('.tabs .ribtab').removeClass('active');
+                    optsFold.$bar.on($.support.transition.end, function (e) {
+                        if ( optsFold.$bar.hasClass('folded') && !optsFold.$bar.hasClass('expanded') )
+                            optsFold.$bar.toggleClass('z-clear', true);
+                    });
                     optsFold.$box.on({
                         mouseleave: function (e) {
                             // optsFold.timer = setTimeout( function(e) {
@@ -167,13 +186,16 @@ define([
 
                 } else {
                     // clearTimeout(optsFold.timer);
-                    optsFold.$bar.removeClass('folded');
+                    optsFold.$bar.removeClass('folded z-clear');
                     optsFold.$box.off();
 
                     var active_panel = optsFold.$box.find('.panel.active');
                     if ( active_panel.length ) {
                         var tab = active_panel.data('tab');
                         me.$tabs.find('> a[data-tab=' + tab + ']').parent().toggleClass('active', true);
+                    } else {
+                        tab = me.$tabs.siblings(':not(.x-lone)').first().find('> a[data-tab]').data('tab');
+                        me.setTab(tab);
                     }
                 }
             },
@@ -191,6 +213,7 @@ define([
             expand: function() {
                 // clearTimeout(optsFold.timer);
 
+                optsFold.$bar.removeClass('z-clear');
                 optsFold.$bar.addClass('expanded');
                 // optsFold.timer = setTimeout(this.collapse, optsFold.timeout);
             },
@@ -206,28 +229,40 @@ define([
             },
 
             onTabClick: function (e) {
-                var _is_active = $(e.currentTarget).hasClass('active');
-                if ( _is_active ) {
-                    if ( this.isFolded ) {
-                        // this.collapse();
+                var me = this;
+
+                var $target = $(e.currentTarget);
+                var tab = $target.find('> a[data-tab]').data('tab');
+                var islone = $target.hasClass('x-lone');
+                if ( me.isFolded ) {
+                    if ( $target.hasClass('x-lone') ) {
+                        me.collapse();
+                        // me.fireEvent('')
+                    } else
+                    if ( $target.hasClass('active') ) {
+                        me.collapse();
+                    } else {
+                        me.setTab(tab);
                     }
                 } else {
-                    var tab = $(e.target).data('tab');
-                    this.setTab(tab);
+                    if ( !$target.hasClass('active') && !islone ) {
+                        me.setTab(tab);
+                    }
                 }
             },
 
             setTab: function (tab) {
+                var me = this;
                 if ( !tab ) {
-                    onShowFullviewPanel.call(this, false);
+                    // onShowFullviewPanel.call(this, false);
 
                     if ( this.isFolded ) { this.collapse(); }
                     else tab = this.lastPanel;
                 }
 
                 if ( tab ) {
-                    this.$tabs.removeClass('active');
-                    this.$panels.removeClass('active');
+                    me.$tabs.removeClass('active');
+                    me.$panels.removeClass('active');
 
                     var panel = this.$panels.filter('[data-tab=' + tab + ']');
                     if ( panel.length ) {
@@ -236,10 +271,10 @@ define([
                     }
 
                     if ( panel.length ) {
-                        if ( this.isFolded ) this.expand();
+                        if ( me.isFolded ) me.expand();
                     } else {
-                        onShowFullviewPanel.call(this, true);
-                        if ( this.isFolded ) this.collapse();
+                        // onShowFullviewPanel.call(this, true);
+                        if ( me.isFolded ) me.collapse();
                     }
 
                     var $tp = this.$tabs.find('> a[data-tab=' + tab + ']').parent();
@@ -273,6 +308,8 @@ define([
 
                         if ($target.length) {
                             $target.after(panel);
+                        } else {
+                            panel.appendTo(this.$layout.find('.box-panels'));
                         }
                     }
 

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

@@ -48,7 +48,7 @@ define([
             },
 
             template: _.template([
-                '<div class="synch-tip-root <%= scope.placement %>">',
+                '<div class="synch-tip-root <% if (!!scope.options.extCls) {print(scope.options.extCls + \" \");} %><%= scope.placement %>">',
                     '<div class="asc-synchronizetip">',
                         '<div class="tip-arrow <%= scope.placement %>"></div>',
                         '<div>',

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

@@ -760,6 +760,7 @@ define([
                     user = usersStore.findWhere({id: userId});
                     if (user) {
                         this.getPopover() && this.getPopover().saveText();
+                        this.view.saveText();
                         cur.set('lock', true);
                         cur.set('lockuserid', this.view.getUserName(user.get('username')));
                     }
@@ -771,6 +772,7 @@ define([
             if (cur) {
                 cur.set('lock', false);
                 this.getPopover() && this.getPopover().loadText();
+                this.view.loadText();
             }
         },
         onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {

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

@@ -50,21 +50,26 @@ define([
                 _.extend(config, opts);
 
                 if ( config.isDesktopApp ) {
-                    Common.NotificationCenter.on('app:ready', function (config) {
+                    Common.NotificationCenter.on('app:ready', function (opts) {
+                        _.extend(config, opts);
                         !!app && app.execCommand('doc:onready', '');
                     });
                 }
             },
             process: function (opts) {
-                if ( opts == 'goback' ) {
-                    if ( config.isDesktopApp && !!app ) {
+                if ( config.isDesktopApp && !!app ) {
+                    if ( opts == 'goback' ) {
                         app.execCommand('go:folder',
                             config.isOffline ? 'offline' : config.customization.goback.url);
                         return true;
+                    } else
+                    if ( opts == 'preloader:hide' ) {
+                        app.execCommand('editor:onready', '');
+                        return true;
                     }
-
-                    return false;
                 }
+
+                return false;
             }
         };
     };

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

@@ -159,7 +159,6 @@ define([
         onSetHistoryData: function(opts) {
             if (opts.data.error) {
                  var config = {
-                    closable: false,
                     title: this.notcriticalErrorTitle,
                     msg: opts.data.error,
                     iconCls: 'warn',

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

@@ -59,7 +59,7 @@ define([
                     'render:before' : function (toolbar) {
                         var appOptions = me.getApplication().getController('Main').appOptions;
 
-                        if ( appOptions.isEdit && !appOptions.isEditMailMerge && !appOptions.isEditDiagram ) {
+                        if ( !appOptions.isEditMailMerge && !appOptions.isEditDiagram ) {
                             var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption};
                             me.$toolbarPanelPlugins = me.panelPlugins.getPanel();
 
@@ -195,19 +195,22 @@ define([
                 me.$toolbarPanelPlugins.empty();
 
                 var _group = $('<div class="group"></div>'),
-                    rank = -1;
+                    rank = -1,
+                    rank_plugins = 0;
                 collection.each(function (model) {
                     var new_rank = model.get('groupRank');
-                    if (new_rank!==rank && rank>-1) {
+                    if (new_rank!==rank && rank>-1 && rank_plugins>0) {
                         _group.appendTo(me.$toolbarPanelPlugins);
                         $('<div class="separator long"></div>').appendTo(me.$toolbarPanelPlugins);
                         _group = $('<div class="group"></div>');
+                        rank_plugins = 0;
                     }
 
                     var btn = me.panelPlugins.createPluginButton(model);
                     if (btn) {
                         var $slot = $('<span class="slot"></span>').appendTo(_group);
                         btn.render($slot);
+                        rank_plugins++;
                     }
                     rank = new_rank;
                 });

apps/common/main/lib/mods/perfect-scrollbar.js

@@ -317,7 +317,7 @@
           var deltaX = e.deltaX * e.deltaFactor || deprecatedDeltaX,
               deltaY = e.deltaY * e.deltaFactor || deprecatedDeltaY;
 
-            if (e && e.target && (e.target.type === 'textarea' && !e.target.hasAttribute('readonly') || e.target.type === 'input')) {
+            if (e && e.target && (e.target.type === 'textarea' || e.target.type === 'input')) {
                 e.stopImmediatePropagation();
                 e.preventDefault();
 

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

@@ -5,7 +5,7 @@
     <div class="user-name"><%=scope.getUserName(username)%></div>
     <div class="user-date"><%=date%></div>
     <% if (!editTextInPopover || hint) { %>
-        <textarea readonly class="user-message user-select" style="overflow: hidden;" maxlength="maxCommLength"><%=scope.pickLink(comment)%></textarea>
+        <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(comment)%></div>
     <% } else { %>
         <div class="inner-edit-ct">
             <textarea class="msg-reply user-select" maxlength="maxCommLength"><%=comment%></textarea>
@@ -27,7 +27,7 @@
                 <div class="user-name"><%=scope.getUserName(item.get("username"))%></div>
                 <div class="user-date"><%=item.get("date")%></div>
                 <% if (!item.get("editTextInPopover")) { %>
-                    <textarea readonly class="user-message user-select" maxlength="maxCommLength" style="overflow: hidden;"><%=scope.pickLink(item.get("reply"))%></textarea>
+                    <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div>
                     <% if (!hint) { %>
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>

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

@@ -152,11 +152,11 @@ define([
                     },
 
                     getTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text : undefined;
                     },
                     setFocusToTextBox: function (blur) {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         if (blur) {
                             text.blur();
                         } else {
@@ -169,35 +169,34 @@ define([
                         }
                     },
                     getActiveTextBoxVal: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text.val().trim() : '';
                     },
                     autoHeightTextBox: function () {
                         var view = this,
                             textBox = this.$el.find('textarea'),
                             domTextBox = null,
-                            $domTextBox = null,
-                            lineHeight = 0,
                             minHeight = 50,
+                            lineHeight = 0,
                             scrollPos = 0,
                             oldHeight = 0,
                             newHeight = 0;
 
                         function updateTextBoxHeight() {
-                            scrollPos = $(view.scroller.el).scrollTop();
+                            scrollPos = view.scroller.getScrollTop();
 
                             if (domTextBox.scrollHeight > domTextBox.clientHeight) {
-                                $domTextBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
+                                textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
 
                                 parentView.calculateSizeOfContent();
                             } else {
                                 oldHeight = domTextBox.clientHeight;
                                 if (oldHeight >= minHeight) {
-                                    $domTextBox.css({height: minHeight + 'px'});
+                                    textBox.css({height: minHeight + 'px'});
 
                                     if (domTextBox.scrollHeight > domTextBox.clientHeight) {
                                         newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight);
-                                        $domTextBox.css({height: newHeight + 'px'});
+                                        textBox.css({height: newHeight + 'px'});
                                     }
 
                                     parentView.calculateSizeOfContent();
@@ -210,23 +209,17 @@ define([
                             view.autoScrollToEditButtons();
                         }
 
-                        this.textBox = undefined;
                         if (textBox && textBox.length) {
-                            textBox.each(function(idx, item){
-                                if (item) {
-                                    domTextBox = item;
-                                    $domTextBox = $(item);
-                                    var isEdited = !$domTextBox.hasClass('user-message');
-                                    lineHeight = isEdited ? parseInt($domTextBox.css('lineHeight'), 10) * 0.25 : 0;
-                                    minHeight = isEdited ? 50 : 24;
-                                    updateTextBoxHeight();
-                                    if (isEdited) {
-                                        $domTextBox.bind('input propertychange', updateTextBoxHeight);
-                                        view.textBox = $domTextBox;
-                                    }
-                                }
-                            });
+                            domTextBox = textBox.get(0);
+
+                            if (domTextBox) {
+                                lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
+                                updateTextBoxHeight();
+                                textBox.bind('input propertychange', updateTextBoxHeight)
+                            }
                         }
+
+                        this.textBox = textBox;
                     },
                     clearTextBoxBind: function () {
                         if (this.textBox) {
@@ -383,7 +376,6 @@ define([
                                 t.fireEvent('comment:closeEditing');
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('user-reply')) {
                                 t.fireEvent('comment:closeEditing');
@@ -408,7 +400,6 @@ define([
                                     t.fireEvent('comment:closeEditing');
 
                                     readdresolves();
-                                    this.autoHeightTextBox();
                                 }
                             } else if (btn.hasClass('btn-close', false)) {
                                 t.fireEvent('comment:closeEditing', [commentId]);
@@ -416,7 +407,6 @@ define([
                                 t.fireEvent('comment:show', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-inner-edit', false)) {
 
@@ -447,7 +437,6 @@ define([
                                 }
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-inner-close', false)) {
                                 if (record.get('dummy')) {
@@ -459,8 +448,11 @@ define([
                                     me.saveText();
                                     record.set('hideAddReply', false);
                                     this.getTextBox().val(me.textVal);
+                                    this.autoHeightTextBox();
                                 } else {
+
                                     this.clearTextBoxBind();
+
                                     t.fireEvent('comment:closeEditing', [commentId]);
                                 }
 
@@ -471,7 +463,6 @@ define([
                                 me.calculateSizeOfContent();
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-resolve', false)) {
                                 var tip = btn.data('bs.tooltip');
@@ -480,7 +471,6 @@ define([
                                 t.fireEvent('comment:resolve', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
                             } else if (btn.hasClass('btn-resolve-check', false)) {
                                 var tip = btn.data('bs.tooltip');
                                 if (tip) tip.dontShow = true;
@@ -488,21 +478,20 @@ define([
                                 t.fireEvent('comment:resolve', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
                             }
                         }
                     });
                     me.on({
                         'show': function () {
-                            me.$window.find('textarea:not(.user-message)').keydown(function (event) {
+                            me.commentsView.autoHeightTextBox();
+                            me.$window.find('textarea').keydown(function (event) {
                                 if (event.keyCode == Common.UI.Keys.ESC) {
                                     me.hide();
                                 }
                             });
                         },
                         'animate:before': function () {
-                            me.commentsView.autoHeightTextBox();
-                            var text = me.$window.find('textarea:not(.user-message)');
+                            var text = me.$window.find('textarea');
                             if (text && text.length)
                                 text.focus();
                         }
@@ -852,50 +841,51 @@ define([
         render: function () {
             var me = this;
 
-            this.$el.html(this.template({
-                textAddCommentToDoc: me.textAddCommentToDoc,
-                textAddComment: me.textAddComment,
-                textCancel: me.textCancel,
-                textEnterCommentHint: me.textEnterCommentHint,
-                maxCommLength: Asc.c_oAscMaxCellOrCommentLength
-            }));
+            if (!this.rendered) {
+                this.$el.html(this.template({
+                    textAddCommentToDoc: me.textAddCommentToDoc,
+                    textAddComment: me.textAddComment,
+                    textCancel: me.textCancel,
+                    textEnterCommentHint: me.textEnterCommentHint,
+                    maxCommLength: Asc.c_oAscMaxCellOrCommentLength
+                }));
 
-            this.buttonAddCommentToDoc = new Common.UI.Button({
-                el: $('.btn.new',this.$el),
-                enableToggle: false
-            });
-            this.buttonAdd = new Common.UI.Button({
-                action: 'add',
-                el: $('.btn.add', this.$el),
-                enableToggle: false
-            });
-            this.buttonCancel = new Common.UI.Button({
-                el: $('.btn.cancel', this.$el),
-                enableToggle: false
-            });
+                this.buttonAddCommentToDoc = new Common.UI.Button({
+                    el: $('.btn.new', this.$el),
+                    enableToggle: false
+                });
+                this.buttonAdd = new Common.UI.Button({
+                    action: 'add',
+                    el: $('.btn.add', this.$el),
+                    enableToggle: false
+                });
+                this.buttonCancel = new Common.UI.Button({
+                    el: $('.btn.cancel', this.$el),
+                    enableToggle: false
+                });
 
-            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.buttonAddCommentToDoc.on('click', _.bind(this.onClickShowBoxDocumentComment, this));
+                this.buttonAdd.on('click', _.bind(this.onClickAddDocumentComment, this));
+                this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
 
-            this.txtComment = $('#comment-msg-new', this.el);
-            this.txtComment.keydown(function (event) {
-                if ((event.ctrlKey || event.metaKey) && !event.altKey && event.keyCode == Common.UI.Keys.RETURN) {
-                    me.onClickAddDocumentComment();
-                    event.stopImmediatePropagation();
-                } else if (event.keyCode === Common.UI.Keys.TAB) {
-                    var $this, end, start;
-                    start = this.selectionStart;
-                    end = this.selectionEnd;
-                    $this = $(this);
-                    $this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
-                    this.selectionStart = this.selectionEnd = start + 1;
-
-                    event.stopImmediatePropagation();
-                    event.preventDefault();
-                }
-            });
+                this.txtComment = $('#comment-msg-new', this.el);
+                this.txtComment.keydown(function (event) {
+                    if ((event.ctrlKey || event.metaKey) && !event.altKey && event.keyCode == Common.UI.Keys.RETURN) {
+                        me.onClickAddDocumentComment();
+                        event.stopImmediatePropagation();
+                    } else if (event.keyCode === Common.UI.Keys.TAB) {
+                        var $this, end, start;
+                        start = this.selectionStart;
+                        end = this.selectionEnd;
+                        $this = $(this);
+                        $this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
+                        this.selectionStart = this.selectionEnd = start + 1;
 
+                        event.stopImmediatePropagation();
+                        event.preventDefault();
+                    }
+                });
+            }
             var CommentsPanelDataView = Common.UI.DataView.extend((function() {
 
                 var parentView = me;
@@ -910,11 +900,11 @@ define([
                     },
 
                     getTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text : undefined;
                     },
                     setFocusToTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         if (text && text.length) {
                             var val = text.val();
                             text.focus();
@@ -923,7 +913,7 @@ define([
                         }
                     },
                     getActiveTextBoxVal: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text.val().trim() : '';
                     },
                     autoHeightTextBox: function () {
@@ -994,7 +984,6 @@ define([
             })());
             if (CommentsPanelDataView) {
                 if (this.commentsView) {
-                    this.commentsView.render($('.messages-ct',me.el));
                     this.commentsView.onResetItems();
                 } else {
                     this.commentsView = new CommentsPanelDataView({
@@ -1150,8 +1139,9 @@ define([
                 }
             }
 
-            this.setupLayout();
+            if (!this.rendered) this.setupLayout();
             this.update();
+            this.rendered = true;
 
             return this;
         },
@@ -1215,6 +1205,23 @@ define([
             this.showEditContainer(false);
         },
 
+        saveText: function (clear) {
+            if (this.commentsView && this.commentsView.cmpEl.find('.lock-area').length<1) {
+                this.textVal = undefined;
+                if (!clear) {
+                    this.textVal = this.commentsView.getActiveTextBoxVal();
+                } else {
+                    this.commentsView.clearTextBoxBind();
+                }
+            }
+        },
+        loadText: function () {
+            if (this.textVal && this.commentsView) {
+                var textBox = this.commentsView.getTextBox();
+                textBox && textBox.val(this.textVal);
+            }
+        },
+
         hookTextBox: function () {
             var me = this,
                 textBox = this.commentsView.getTextBox();

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

@@ -119,10 +119,11 @@ define([
         },
 
         _onMessage: function(msg) {
-            if (msg && msg.needUpdate) {
-                this.trigger('accessrights', this, msg.sharingSettings);
+            if (msg && msg.Referer == "onlyoffice") {
+                if (msg.needUpdate)
+                    this.trigger('accessrights', this, msg.sharingSettings);
+                Common.NotificationCenter.trigger('window:close', this);
             }
-            Common.NotificationCenter.trigger('window:close', this);
         },
 
         _onLoad: function() {

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

@@ -150,7 +150,7 @@ define([
         function onResetUsers(collection, opts) {
             var usercount = collection.getEditingCount();
             if ( $userList ) {
-                if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit) {
+                if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit && !appConfig.canComments) {
                     $userList.html(templateUserList({
                         users: collection.models,
                         usertpl: _.template(templateUserItem),
@@ -172,7 +172,8 @@ define([
         };
 
         function applyUsers(count) {
-            if ( count > 1 || count > 0 && appConfig && !appConfig.isEdit) {
+            var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.canComments; // has other user(s) who edit document
+            if ( has_edit_users ) {
                 $btnUsers
                     .attr('data-toggle', 'dropdown')
                     .addClass('dropdown-toggle')
@@ -189,13 +190,13 @@ define([
             }
 
             $btnUsers.find('.caption')
-                .css({'font-size': ((count > 1  || count > 0 && appConfig && !appConfig.isEdit) ? '12px' : '14px'),
-                    'margin-top': ((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? '0' : '-1px')})
-                .html((count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? count : '+');
+                .css({'font-size': ((has_edit_users) ? '12px' : '14px'),
+                    'margin-top': ((has_edit_users) ? '0' : '-1px')})
+                .html((has_edit_users) ? count : '+');
 
             var usertip = $btnUsers.data('bs.tooltip');
             if ( usertip ) {
-                usertip.options.title = (count > 1 || count > 0 && appConfig && !appConfig.isEdit) ? usertip.options.titleExt : usertip.options.titleNorm;
+                usertip.options.title = (has_edit_users) ? usertip.options.titleExt : usertip.options.titleNorm;
                 usertip.setContent();
             }
         }
@@ -247,7 +248,7 @@ define([
 
             var editingUsers = storeUsers.getEditingCount();
             $btnUsers.tooltip({
-                title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit) ? me.tipViewUsers : me.tipAccessRights,
+                title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit && !appConfig.canComments) ? me.tipViewUsers : me.tipAccessRights,
                 titleNorm: me.tipAccessRights,
                 titleExt: me.tipViewUsers,
                 placement: 'bottom',
@@ -263,7 +264,7 @@ define([
             });
 
             $labelChangeRights[(!mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length)?'show':'hide']();
-            $panelUsers[(editingUsers > 1  || editingUsers > 0 && !appConfig.isEdit || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide']();
+            $panelUsers[(editingUsers > 1  || editingUsers > 0 && !appConfig.isEdit && !appConfig.canComments || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide']();
 
             if ( $saveStatus ) {
                 $saveStatus.attr('data-width', me.textSaveExpander);
@@ -483,9 +484,8 @@ define([
 
                         if ( config.canEdit && config.canRequestEditRights )
                             this.btnEdit = createTitleButton('svg-btn-edit', $html.find('#slot-hbtn-edit'));
-                    } else {
-                        me.btnOptions.render($html.find('#slot-btn-options'));
                     }
+                    me.btnOptions.render($html.find('#slot-btn-options'));
 
                     $userList = $html.find('.cousers-list');
                     $panelUsers = $html.find('.box-cousers');
@@ -674,7 +674,7 @@ define([
                                 };
                                 btn.setDisabled( true );
                             } else {
-                                btn.setDisabled( btn.keepState.disabled );
+                                btn.setDisabled( btn.keepState && btn.keepState.disabled || lock);
                                 delete btn.keepState;
                             }
                         }

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

@@ -48,23 +48,23 @@ define([
     Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 230,
-            height: 170,
-            header: false,
+            height: 156,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
             split: false
         },
 
         initialize : function(options) {
-            _.extend(this.options, options || {});
+            _.extend(this.options, {
+                title: (options.split) ? this.txtTitleSplit : this.txtTitle
+            }, options || {});
 
             this.template = [
                 '<div class="box">',
-                    '<h4>' + ((options.split) ? this.txtTitleSplit : this.txtTitle) + '</h4>',
-                    '<div class="input-row" style="margin: 10px 0;">',
+                    '<div class="input-row">',
                         '<label class="text columns-text" style="width: 130px;">' + this.txtColumns + '</label><div class="columns-val" style="float: right;"></div>',
                     '</div>',
-                    '<div class="input-row" style="margin: 10px 0;">',
+                    '<div class="input-row" style="margin-top: 10px;">',
                         '<label class="text rows-text" style="width: 130px;">' + this.txtRows + '</label><div class="rows-val" style="float: right;"></div>',
                     '</div>',
                 '</div>',

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

@@ -55,10 +55,11 @@ define([
 
             _.extend(_options,  {
                 closable        : false,
-                width           : (options.preview) ? 414 : 262,
-                height          : (options.preview) ? 291 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 205 : 155),
-                header          : true,
                 preview         : options.preview,
+                warning         : options.warning,
+                width           : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM && options.warning) ? 370 : 262),
+                height          : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : (options.warning ? 187 : 147)),
+                header          : true,
                 cls             : 'open-dlg',
                 contentTemplate : '',
                 title           : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT'),
@@ -70,8 +71,19 @@ define([
                 '<div class="box" style="height:' + (_options.height - 85) + 'px;">',
                     '<div class="content-panel" >',
                     '<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>',
-                        '<label class="header">' + t.txtPassword + '</label>',
-                        '<div id="id-password-txt" style="margin-bottom:15px;"></div>',
+                        '<% if (warning) { %>',
+                        '<div>',
+                            '<div class="icon img-commonctrl warn"/>',
+                            '<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
+                                '<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
+                                '<div id="id-password-txt" style="width: 240px;"></div></div>',
+                        '</div>',
+                        '<% } else { %>',
+                        '<div>',
+                            '<label class="header">' + t.txtPassword + '</label>',
+                            '<div id="id-password-txt"></div>',
+                        '</div>',
+                        '<% } %>',
                     '<% } else { %>',
                         '<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">',
                             '<label class="header">' + t.txtEncoding + '</label>',
@@ -105,11 +117,10 @@ define([
                     '<% } %>',
                     '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
                 '<div class="footer center">',
-                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right:10px;">' + t.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
                     '<% if (closable) { %>',
-                    '<button class="btn normal dlg-btn" result="cancel">' + t.closeButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
                     '<% } %>',
                 '</div>'
             ].join('');
@@ -117,6 +128,7 @@ define([
             this.handler        =   _options.handler;
             this.type           =   _options.type;
             this.preview        =   _options.preview;
+            this.warning        =   _options.warning || false;
             this.closable       =   _options.closable;
             this.codepages      =   _options.codepages;
             this.settings       =   _options.settings;
@@ -154,11 +166,11 @@ define([
                 } else {
                     this.initCodePages();
                     this.updatePreview();
+                    this.onPrimary = function() {
+                        me._handleInput('ok');
+                        return false;
+                    };
                 }
-                this.onPrimary = function() {
-                    me._handleInput('ok');
-                    return false;
-                };
             }
         },
 
@@ -193,10 +205,12 @@ define([
         _handleInput: function(state) {
             if (this.handler) {
                 if (this.cmbEncoding) {
-                    var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
+                    var encoding = (!this.cmbEncoding.isDisabled()) ? this.cmbEncoding.getValue() :
+                        ((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : 0),
+                        delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
                         delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
                     (delimiter == -1) && (delimiter = null);
-                    this.handler.call(this, this.cmbEncoding.getValue(), delimiter, delimiterChar);
+                    this.handler.call(this, encoding, delimiter, delimiterChar);
                 } else {
                     this.handler.call(this, state, this.inputPwd.getValue());
                 }
@@ -206,7 +220,7 @@ define([
         },
 
         initCodePages: function () {
-            var i, c, codepage, encodedata = [], listItems = [], length = 0;
+            var i, c, codepage, encodedata = [], listItems = [], length = 0, lcid_width = 0;
 
             if (this.codepages) {
                 encodedata = [];
@@ -215,218 +229,99 @@ define([
                     c = [];
                     c[0] = codepage.asc_getCodePage();
                     c[1] = codepage.asc_getCodePageName();
+                    c[2] = codepage.asc_getLcid();
 
                     encodedata.push(c);
                 }
-            } else {
-                encodedata = [
-                    [37, 'IBM EBCDIC (US-Canada)'],
-                    [437, 'OEM United States'],
-                    [500, 'IBM EBCDIC (International)'],
-                    [708, 'Arabic (ASMO 708)'],
-                    [720, 'Arabic (DOS)'],
-                    [737, 'Greek (DOS)'],
-                    [775, 'Baltic (DOS)'],
-                    [850, 'Western European (DOS)'],
-                    [852, 'Central European (DOS)'],
-                    [855, 'OEM Cyrillic'],
-                    [857, 'Turkish (DOS)'],
-                    [858, 'OEM Multilingual Latin I'],
-                    [860, 'Portuguese (DOS)'],
-                    [861, 'Icelandic (DOS)'],
-                    [862, 'Hebrew (DOS)'],
-                    [863, 'French Canadian (DOS)'],
-                    [864, 'Arabic (864) '],
-                    [865, 'Nordic (DOS)'],
-                    [866, 'Cyrillic (DOS)'],
-                    [869, 'Greek, Modern (DOS)'],
-                    [870, 'IBM EBCDIC (Multilingual Latin-2)'],
-                    [874, 'Thai (Windows)'],
-                    [875, 'IBM EBCDIC (Greek Modern)'],
-                    [932, 'Japanese (Shift-JIS)'],
-                    [936, 'Chinese Simplified (GB2312)'],
-                    [949, 'Korean'],
-                    [950, 'Chinese Traditional (Big5)'],
-                    [1026, 'IBM EBCDIC (Turkish Latin-5)'],
-                    [1047, 'IBM Latin-1'],
-                    [1140, 'IBM EBCDIC (US-Canada-Euro)'],
-                    [1141, 'IBM EBCDIC (Germany-Euro)'],
-                    [1142, 'IBM EBCDIC (Denmark-Norway-Euro)'],
-                    [1143, 'IBM EBCDIC (Finland-Sweden-Euro)'],
-                    [1144, 'IBM EBCDIC (Italy-Euro)'],
-                    [1145, 'IBM EBCDIC (Spain-Euro)'],
-                    [1146, 'IBM EBCDIC (UK-Euro)'],
-                    [1147, 'IBM EBCDIC (France-Euro)'],
-                    [1148, 'IBM EBCDIC (International-Euro)'],
-                    [1149, 'IBM EBCDIC (Icelandic-Euro)'],
-                    [1200, 'Unicode'],
-                    [1201, 'Unicode (Big-Endian)'],
-                    [1250, 'Central European (Windows)'],
-                    [1251, 'Cyrillic (Windows)'],
-                    [1252, 'Western European (Windows)'],
-                    [1253, 'Greek (Windows)'],
-                    [1254, 'Turkish (Windows)'],
-                    [1255, 'Hebrew (Windows) '],
-                    [1256, 'Arabic (Windows) '],
-                    [1257, 'Baltic (Windows)'],
-                    [1258, 'Vietnamese (Windows)'],
-                    [1361, 'Korean (Johab)'],
-                    [10000, 'Western European (Mac)'],
-                    [10001, 'Japanese (Mac)'],
-                    [10002, 'Chinese Traditional (Mac)'],
-                    [10003, 'Korean (Mac)'],
-                    [10004, 'Arabic (Mac) '],
-                    [10005, 'Hebrew (Mac)'],
-                    [10006, 'Greek (Mac) '],
-                    [10007, 'Cyrillic (Mac)'],
-                    [10008, 'Chinese Simplified (Mac)'],
-                    [10010, 'Romanian (Mac)'],
-                    [10017, 'Ukrainian (Mac)'],
-                    [10021, 'Thai (Mac)'],
-                    [10029, 'Central European (Mac) '],
-                    [10079, 'Icelandic (Mac)'],
-                    [10081, 'Turkish (Mac)'],
-                    [10082, 'Croatian (Mac)'],
-                    [12000, 'Unicode (UTF-32)'],
-                    [12001, 'Unicode (UTF-32 Big-Endian)'],
-                    [20000, 'Chinese Traditional (CNS)'],
-                    [20001, 'TCA Taiwan'],
-                    [20002, 'Chinese Traditional (Eten)'],
-                    [20003, 'IBM5550 Taiwan'],
-                    [20004, 'TeleText Taiwan'],
-                    [20005, 'Wang Taiwan'],
-                    [20105, 'Western European (IA5)'],
-                    [20106, 'German (IA5)'],
-                    [20107, 'Swedish (IA5) '],
-                    [20108, 'Norwegian (IA5) '],
-                    [20127, 'US-ASCII'],
-                    [20261, 'T.61 '],
-                    [20269, 'ISO-6937'],
-                    [20273, 'IBM EBCDIC (Germany)'],
-                    [20277, 'IBM EBCDIC (Denmark-Norway) '],
-                    [20278, 'IBM EBCDIC (Finland-Sweden)'],
-                    [20280, 'IBM EBCDIC (Italy)'],
-                    [20284, 'IBM EBCDIC (Spain)'],
-                    [20285, 'IBM EBCDIC (UK)'],
-                    [20290, 'IBM EBCDIC (Japanese katakana)'],
-                    [20297, 'IBM EBCDIC (France)'],
-                    [20420, 'IBM EBCDIC (Arabic)'],
-                    [20423, 'IBM EBCDIC (Greek)'],
-                    [20424, 'IBM EBCDIC (Hebrew)'],
-                    [20833, 'IBM EBCDIC (Korean Extended)'],
-                    [20838, 'IBM EBCDIC (Thai)'],
-                    [20866, 'Cyrillic (KOI8-R)'],
-                    [20871, 'IBM EBCDIC (Icelandic) '],
-                    [20880, 'IBM EBCDIC (Cyrillic Russian)'],
-                    [20905, 'IBM EBCDIC (Turkish)'],
-                    [20924, 'IBM Latin-1 '],
-                    [20932, 'Japanese (JIS 0208-1990 and 0212-1990)'],
-                    [20936, 'Chinese Simplified (GB2312-80) '],
-                    [20949, 'Korean Wansung '],
-                    [21025, 'IBM EBCDIC (Cyrillic Serbian-Bulgarian)'],
-                    [21866, 'Cyrillic (KOI8-U)'],
-                    [28591, 'Western European (ISO) '],
-                    [28592, 'Central European (ISO)'],
-                    [28593, 'Latin 3 (ISO)'],
-                    [28594, 'Baltic (ISO)'],
-                    [28595, 'Cyrillic (ISO) '],
-                    [28596, 'Arabic (ISO)'],
-                    [28597, 'Greek (ISO) '],
-                    [28598, 'Hebrew (ISO-Visual)'],
-                    [28599, 'Turkish (ISO)'],
-                    [28603, 'Estonian (ISO)'],
-                    [28605, 'Latin 9 (ISO)'],
-                    [29001, 'Europa'],
-                    [38598, 'Hebrew (ISO-Logical)'],
-                    [50220, 'Japanese (JIS)'],
-                    [50221, 'Japanese (JIS-Allow 1 byte Kana) '],
-                    [50222, 'Japanese (JIS-Allow 1 byte Kana - SO/SI)'],
-                    [50225, 'Korean (ISO)'],
-                    [50227, 'Chinese Simplified (ISO-2022)'],
-                    [51932, 'Japanese (EUC)'],
-                    [51936, 'Chinese Simplified (EUC) '],
-                    [51949, 'Korean (EUC)'],
-                    [52936, 'Chinese Simplified (HZ)'],
-                    [54936, 'Chinese Simplified (GB18030)'],
-                    [57002, 'ISCII Devanagari '],
-                    [57003, 'ISCII Bengali '],
-                    [57004, 'ISCII Tamil'],
-                    [57005, 'ISCII Telugu '],
-                    [57006, 'ISCII Assamese '],
-                    [57007, 'ISCII Oriya'],
-                    [57008, 'ISCII Kannada'],
-                    [57009, 'ISCII Malayalam '],
-                    [57010, 'ISCII Gujarati'],
-                    [57011, 'ISCII Punjabi'],
-                    [65000, 'Unicode (UTF-7)'],
-                    [65001, 'Unicode (UTF-8)']
-                ];
+                lcid_width = 50;
             }
-
             length = encodedata.length;
 
-            if (length) {
-                for (i = 0; i < length; ++i) {
-                    listItems.push({
-                        value: encodedata[i][0],
-                        displayValue: encodedata[i][1] // Common.Utils.String.ellipsis(..., 37)
-                    });
-                }
-
-                this.cmbEncoding = new Common.UI.ComboBox({
-                    el: $('#id-codepages-combo', this.$window),
-                    style: 'width: 230px;',
-                    menuStyle: 'min-width: 230px; max-height: 200px;',
-                    cls: 'input-group-nr',
-                    menuCls: 'scrollable-menu',
-                    data: listItems,
-                    editable: false
+            for (i = 0; i < length; ++i) {
+                listItems.push({
+                    value: encodedata[i][0],
+                    displayValue: Common.Utils.String.htmlEncode(encodedata[i][1]),
+                    lcid: encodedata[i][2] || ''
                 });
-                this.cmbEncoding.setValue( (this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]);
+            }
+
+            var itemsTemplate =
+                _.template([
+                    '<% _.each(items, function(item) { %>',
+                    '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
+                    '<div style="display: inline-block;"><%= item.displayValue %></div>',
+                    '<label style="text-align: right;width:' + lcid_width + 'px;"><%= item.lcid %></label>',
+                    '</a></li>',
+                    '<% }); %>'
+                ].join(''));
+
+            this.cmbEncoding = new Common.UI.ComboBox({
+                el: $('#id-codepages-combo', this.$window),
+                style: 'width: 230px;',
+                menuStyle: 'min-width: 230px; max-height: 200px;',
+                cls: 'input-group-nr',
+                menuCls: 'scrollable-menu',
+                data: listItems,
+                editable: false,
+                disabled: true,
+                itemsTemplate: itemsTemplate
+            });
+
+            if (length) {
+                this.cmbEncoding.setDisabled(false);
+                this.cmbEncoding.setValue((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]);
                 if (this.preview)
                     this.cmbEncoding.on('selected', _.bind(this.onCmbEncodingSelect, this));
 
-                if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
-                    this.cmbDelimiter = new Common.UI.ComboBox({
-                        el: $('#id-delimiters-combo', this.$window),
-                        style: 'width: 100px;',
-                        menuStyle: 'min-width: 100px;',
-                        cls: 'input-group-nr',
-                        data: [
-                            {value: 4, displayValue: this.txtComma},
-                            {value: 2, displayValue: this.txtSemicolon},
-                            {value: 3, displayValue: this.txtColon},
-                            {value: 1, displayValue: this.txtTab},
-                            {value: 5, displayValue: this.txtSpace},
-                            {value: -1, displayValue: this.txtOther}],
-                        editable: false
-                    });
-                    this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
-                    this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
+                var ul = this.cmbEncoding.cmpEl.find('ul'),
+                    a = ul.find('li:nth(0) a'),
+                    width = ul.width() - parseInt(a.css('padding-left')) - parseInt(a.css('padding-right')) - 50;
+                ul.find('li div').width(width + 10);
+            }
 
-                    this.inputDelimiter = new Common.UI.InputField({
-                        el          : $('#id-delimiter-other'),
-                        style       : 'width: 30px;',
-                        maxLength: 1,
-                        validateOnChange: true,
-                        validateOnBlur: false,
-                        value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
-                    });
-                    this.inputDelimiter.setVisible(false);
-                    if (this.preview)
-                        this.inputDelimiter.on ('changing', _.bind(this.updatePreview, this));
-                }
+            if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
+                this.cmbDelimiter = new Common.UI.ComboBox({
+                    el: $('#id-delimiters-combo', this.$window),
+                    style: 'width: 100px;',
+                    menuStyle: 'min-width: 100px;',
+                    cls: 'input-group-nr',
+                    data: [
+                        {value: 4, displayValue: this.txtComma},
+                        {value: 2, displayValue: this.txtSemicolon},
+                        {value: 3, displayValue: this.txtColon},
+                        {value: 1, displayValue: this.txtTab},
+                        {value: 5, displayValue: this.txtSpace},
+                        {value: -1, displayValue: this.txtOther}],
+                    editable: false
+                });
+                this.cmbDelimiter.setValue( (this.settings && this.settings.asc_getDelimiter()) ? this.settings.asc_getDelimiter() : 4);
+                this.cmbDelimiter.on('selected', _.bind(this.onCmbDelimiterSelect, this));
+
+                this.inputDelimiter = new Common.UI.InputField({
+                    el          : $('#id-delimiter-other'),
+                    style       : 'width: 30px;',
+                    maxLength: 1,
+                    validateOnChange: true,
+                    validateOnBlur: false,
+                    value: (this.settings && this.settings.asc_getDelimiterChar()) ? this.settings.asc_getDelimiterChar() : ''
+                });
+                this.inputDelimiter.setVisible(false);
+                if (this.preview)
+                    this.inputDelimiter.on ('changing', _.bind(this.updatePreview, this));
             }
         },
 
         updatePreview: function() {
+            var encoding = (!this.cmbEncoding.isDisabled()) ? this.cmbEncoding.getValue() :
+                ((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : 0);
+
             if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {
                 var delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
                     delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
                 (delimiter == -1) && (delimiter = null);
-                this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(this.cmbEncoding.getValue(), delimiter, delimiterChar), _.bind(this.previewCallback, this));
+                this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this));
             } else {
-                this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(this.cmbEncoding.getValue()), _.bind(this.previewCallback, this));
+                this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(encoding), _.bind(this.previewCallback, this));
             }
         },
 
@@ -441,6 +336,7 @@ define([
                 el: this.previewScrolled,
                 minScrollbarLength  : 20,
                 alwaysVisibleY: true,
+                alwaysVisibleX: true,
                 onChange: _.bind(function(){
                     if (this.scrollerY) {
                         var startPos = this.scrollerY.getScrollTop(),
@@ -527,7 +423,8 @@ define([
         txtPreview: 'Preview',
         txtComma: 'Comma',
         txtColon: 'Colon',
-        txtSemicolon: 'Semicolon'
+        txtSemicolon: 'Semicolon',
+        txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset.'
 
     }, Common.Views.OpenDialog || {}));
 });

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

@@ -308,7 +308,7 @@ define([
             txtDeletePwd: 'Delete password',
             txtAddPwd: 'Add password',
             txtInvisibleSignature: 'Add digital signature',
-            txtSignatureLine: 'Signature line'
+            txtSignatureLine: 'Add Signature line'
         }
     }()), Common.Views.Protection || {}));
 });

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

@@ -969,7 +969,7 @@ define([
 
     Common.Views.ReviewChangesDialog = Common.UI.Window.extend(_.extend({
         options: {
-            width       : 283,
+            width       : 330,
             height      : 90,
             title       : 'Review Changes',
             modal       : false,
@@ -978,7 +978,9 @@ define([
         },
 
         initialize : function(options) {
-            _.extend(this.options, options || {});
+            _.extend(this.options, {
+                title    : this.textTitle
+            },  options || {});
 
             this.template = [
                 '<div class="box">',

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

@@ -51,7 +51,7 @@ define([
 
     Common.Views.SignDialog = Common.UI.Window.extend(_.extend({
         options: {
-            width: 350,
+            width: 370,
             style: 'min-width: 350px;',
             cls: 'modal-dlg'
         },
@@ -90,10 +90,10 @@ define([
                         '<div id="id-dlg-sign-fonts" class="input-row" style="display: inline-block;"></div>',
                         '<div id="id-dlg-sign-font-size" class="input-row" style="display: inline-block;margin-left: 3px;"></div>',
                         '<div id="id-dlg-sign-bold" style="display: inline-block;margin-left: 3px;"></div>','<div id="id-dlg-sign-italic" style="display: inline-block;margin-left: 3px;"></div>',
-                        '<div class="input-row" style="margin-top: 10px;">',
+                        '<div style="margin: 10px 0 5px 0;">',
                             '<label>' + this.textUseImage + '</label>',
                         '</div>',
-                        '<button id="id-dlg-sign-image" class="btn btn-text-default" style="">' + this.textSelectImage + '</button>',
+                        '<button id="id-dlg-sign-image" class="btn btn-text-default auto">' + this.textSelectImage + '</button>',
                         '<div class="input-row" style="margin-top: 10px;">',
                             '<label style="font-weight: bold;">' + this.textSignature + '</label>',
                         '</div>',
@@ -102,7 +102,7 @@ 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.textChange + '</button></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>',
                         '</tr>',
                         '<tr><td><div id="id-dlg-sign-certificate" class="hidden" style="max-width: 212px;overflow: hidden;"></td></tr>',
                     '</table>',
@@ -143,7 +143,7 @@ define([
             me.cmbFonts = new Common.UI.ComboBoxFonts({
                 el          : $('#id-dlg-sign-fonts'),
                 cls         : 'input-group-nr',
-                style       : 'width: 214px;',
+                style       : 'width: 234px;',
                 menuCls     : 'scrollable-menu',
                 menuStyle   : 'min-width: 55px;max-height: 270px;',
                 store       : new Common.Collections.Fonts(),
@@ -265,9 +265,9 @@ define([
 
         afterRender: function () {
             if (this.api) {
-                this.binding = {
-                    certificateChanged: _.bind(this.onCertificateChanged, this)
-                };
+                if (!this.binding)
+                    this.binding = {};
+                this.binding.certificateChanged = _.bind(this.onCertificateChanged, this);
                 this.api.asc_registerCallback('on_signature_defaultcertificate_ret', this.binding.certificateChanged);
                 this.api.asc_registerCallback('on_signature_selectsertificate_ret', this.binding.certificateChanged);
                 this.api.asc_GetDefaultCertificate();
@@ -324,6 +324,7 @@ define([
                 arr_date = (typeof date == 'string') ? date.split(' - ') : ['', ''];
             this.cntCertificate.html(this.templateCertificate({name: certificate.name, valid: this.textValid.replace('%1', arr_date[0]).replace('%2', arr_date[1])}));
             this.cntCertificate.toggleClass('hidden', _.isEmpty(this.certificateId) || this.certificateId<0);
+            this.btnChangeCertificate.setCaption((_.isEmpty(this.certificateId) || this.certificateId<0) ? this.textSelect : this.textChange);
             this.btnOk.setDisabled(_.isEmpty(this.certificateId) || this.certificateId<0);
         },
 
@@ -352,7 +353,8 @@ define([
         tipFontName: 'Font Name',
         tipFontSize: 'Font Size',
         textBold:           'Bold',
-        textItalic:         'Italic'
+        textItalic:         'Italic',
+        textSelect: 'Select'
 
     }, Common.Views.SignDialog || {}))
 });

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

@@ -208,6 +208,6 @@ define([
         txtEmpty:           'This field is required',
         textAllowComment:   'Allow signer to add comment in the signature dialog',
         textShowDate:       'Show sign date in signature line',
-        textTitle:          'Signature Settings'
+        textTitle:          'Signature Setup'
     }, Common.Views.SignSettingsDialog || {}))
 });

apps/common/main/resources/img/doc-formats/blank.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2-1{opacity:0.2;}</style></defs><symbol id="svg-format-blank"><path fill="#fff" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2-1" d="M77,5H8A3,3,0,0,0,5,8V119a3,3,0,0,0,3,3H92a3,3,0,0,0,3-3V23ZM94,119a2,2,0,0,1-2,2H8a2,2,0,0,1-2-2V8A2,2,0,0,1,8,6H76.59l.41.41V20a3,3,0,0,0,3,3H93.59l.41.41Z"/><g class="cls-2-1"><rect x="50" y="86" width="25" height="2"/><rect x="25" y="80" width="50" height="2"/><rect x="25" y="74" width="50" height="2"/><rect x="25" y="68" width="50" height="2"/><rect x="25" y="62" width="50" height="2"/><rect x="25" y="43" width="24" height="2"/><rect x="25" y="37" width="19" height="2"/></g></symbol></svg>

apps/common/main/resources/img/doc-formats/csv.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-csv"><path fill="#646464" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(38.97 113)">CSV</text><rect class="cls-4" x="21" y="90" width="17" height="2"/><rect class="cls-4" x="21" y="83" width="17" height="2"/><rect class="cls-4" x="21" y="76" width="17" height="2"/><rect class="cls-4" x="21" y="69" width="17" height="2"/><rect class="cls-4" x="21" y="62" width="17" height="2"/><rect class="cls-4" x="21" y="55" width="17" height="2"/><rect class="cls-4" x="21" y="48" width="17" height="2"/><rect class="cls-4" x="21" y="41" width="17" height="2"/><rect class="cls-4" x="21" y="34" width="17" height="2"/><rect class="cls-4" x="42" y="90" width="17" height="2"/><rect class="cls-4" x="42" y="83" width="17" height="2"/><rect class="cls-4" x="42" y="76" width="17" height="2"/><rect class="cls-4" x="42" y="69" width="17" height="2"/><rect class="cls-4" x="42" y="62" width="17" height="2"/><rect class="cls-4" x="42" y="55" width="17" height="2"/><rect class="cls-4" x="42" y="48" width="17" height="2"/><rect class="cls-4" x="42" y="41" width="17" height="2"/><rect class="cls-4" x="42" y="34" width="17" height="2"/><rect class="cls-4" x="63" y="90" width="17" height="2"/><rect class="cls-4" x="63" y="83" width="17" height="2"/><rect class="cls-4" x="63" y="76" width="17" height="2"/><rect class="cls-4" x="63" y="69" width="17" height="2"/><rect class="cls-4" x="63" y="62" width="17" height="2"/><rect class="cls-4" x="63" y="55" width="17" height="2"/><rect class="cls-4" x="63" y="48" width="17" height="2"/><rect class="cls-4" x="63" y="41" width="17" height="2"/><rect class="cls-4" x="63" y="34" width="17" height="2"/></symbol></svg>

apps/common/main/resources/img/doc-formats/docx.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-docx"><path fill="#214479" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(32.96 113)">DOCX</text><polygon class="cls-4" points="67.8 48 61.5 75 54.5 48 51.5 48 48.5 48 41.5 75 35.2 48 29.4 48 37.9 82 44.3 82 51.5 54.1 58.7 82 65.1 82 73.6 48 67.8 48"/></symbol></svg>

apps/common/main/resources/img/doc-formats/epub.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-epub"><path fill="#5892b6" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(34.31 113)">EPUB</text><path class="cls-4" d="M49,84V49s-9-6-24-7V75S42,76,49,84Z"/><path class="cls-4" d="M75,75V42c-15,1-24,7-24,7V84C58,76,75,75,75,75Z"/><path class="cls-4" d="M77,47V79s-15,0-27,8.3C38,79,23,79,23,79V47H20V82s13-2,30,6c17-8,30-6,30-6V47Z"/></symbol></svg>

apps/common/main/resources/img/doc-formats/html.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-html"><path fill="#7c9a34" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(32.89 113)">HTML</text><polygon class="cls-4" points="62 53 62 57.8 75.5 62.5 62 67.2 62 72 80 64.2 80 60.8 62 53"/><polygon class="cls-4" points="40 75 45.5 75 59.5 50 54 50 40 75"/><polygon class="cls-4" points="19 64.2 37 72 37 67.2 23.5 62.5 37 57.8 37 53 19 60.8 19 64.2"/></symbol></svg>

apps/common/main/resources/img/doc-formats/odp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-odp"><path fill="#dd9426" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.02 113)">ODP</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>

apps/common/main/resources/img/doc-formats/ods.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-ods"><path fill="#237453" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.48 113)">ODS</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>

apps/common/main/resources/img/doc-formats/odt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-odt"><path fill="#3c6d88" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(37.31 113)">ODT</text><path class="cls-4" d="M78,52.74h0l-.29-.15a15,15,0,0,0-14,.53,14.93,14.93,0,0,0-14.3-.24l-.08,0a.25.25,0,0,0-.1.2.26.26,0,0,0,.26.26h.06a14.62,14.62,0,0,1,4.14-.18c4,.37,7.43,1.6,9.86,4.36.13.13.24.12.37,0C67,54,71.68,52.6,76.72,53.07c.28,0,.56.06.83.11l.33,0a.23.23,0,0,0,.26-.25A.25.25,0,0,0,78,52.74Z"/><path class="cls-4" d="M72.16,65.21l0,0A26,26,0,0,0,47.19,68,26,26,0,0,0,22.1,70.19l-.05,0a.41.41,0,0,0-.14.3.39.39,0,0,0,.38.39h.08l0,0a26.09,26.09,0,0,1,7.49-1.1c6.93,0,13.1,1.64,17.74,6l0,0a.38.38,0,0,0,.25.09.37.37,0,0,0,.3-.14l.22-.31c4.72-6.45,12.5-9.63,21.16-9.63.62,0,1.23,0,1.84.06l.55,0a.4.4,0,0,0,.39-.39A.38.38,0,0,0,72.16,65.21Z"/></symbol></svg>

apps/common/main/resources/img/doc-formats/pdf.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-pdf"><path fill="#ba4c3f" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(38.5 113)">PDF</text><path id="path4463" class="cls-4" d="M40.42,66.69C42,63.55,43.84,60,45.3,56.46h0l.58-1.4c-1.9-7.25-3.05-13.07-2-16.83h0a2.59,2.59,0,0,1,2.62-1.57h.88c1.66,0,2.44,2.09,2.53,2.91h0a13.12,13.12,0,0,1-.48,3.68h0a9.11,9.11,0,0,0-.56-3.75h0C48.16,38,47.5,37.1,46.91,37h0a1.82,1.82,0,0,0-.68,1.4h0A19.67,19.67,0,0,0,46,41.59h0A36,36,0,0,0,47.45,51h0c.18-.54.34-1,.48-1.54h0c.2-.76,1.49-5.81,1.49-5.81h0s-.33,6.72-.78,8.76h0c-.1.43-.21.86-.32,1.29h0a29.59,29.59,0,0,0,7.37,11.52h0A23.75,23.75,0,0,0,60,68.12h0a57.72,57.72,0,0,1,8.65-.65h0c3.28,0,5.69.53,6.66,1.49h0A2.55,2.55,0,0,1,76,70.62h0a5.92,5.92,0,0,1-.14,1h0c0-.18,0-1-2.6-1.88h0c-2.07-.66-6-.64-10.61-.15h0c5.39,2.64,10.64,4,12.3,3.16h0a3.48,3.48,0,0,0,.9-.87h0a9.45,9.45,0,0,1-.51,1.66h0a2.54,2.54,0,0,1-1.29.88h0c-2.63.71-9.46-.92-15.42-4.32h0A125,125,0,0,0,38.8,74.79h0C33,84.88,28.71,89.51,25.19,87.75h0L23.9,87.1a1.5,1.5,0,0,1-.49-1.63h0c.41-2,2.93-5,8-8.06h0c.55-.33,3-1.61,3-1.61h0s-1.79,1.74-2.21,2.08h0c-4,3.31-7,7.47-6.95,9.09h0l0,.14c3.43-.49,8.57-7.48,15.19-20.42m2.1,1.07c-1.11,2.08-2.19,4-3.19,5.79h0a84.6,84.6,0,0,1,17.1-4.84h0c-.76-.53-1.49-1.08-2.19-1.67h0A29.28,29.28,0,0,1,47,57.66h0a81,81,0,0,1-4.52,10.1"/></symbol></svg>

apps/common/main/resources/img/doc-formats/pptx.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-pptx"><path fill="#dd682b" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(34.99 113)">PPTX</text><path class="cls-4" d="M50,69A16,16,0,0,0,66,53H50V37a16,16,0,0,0,0,32Z"/><path class="cls-4" d="M53,34V50H69A16,16,0,0,0,53,34Z"/><rect class="cls-4" x="25" y="89" width="50" height="2"/><rect class="cls-4" x="25" y="83" width="50" height="2"/><rect class="cls-4" x="25" y="77" width="50" height="2"/></symbol></svg>

apps/common/main/resources/img/doc-formats/rtf.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-rtf"><path fill="#7c7c7d" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.27 113)">RTF</text><rect class="cls-4" x="49" y="38" width="25" height="2"/><rect class="cls-4" x="49" y="44" width="25" height="2"/><rect class="cls-4" x="49" y="50" width="25" height="2"/><rect class="cls-4" x="49" y="56" width="25" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/><rect class="cls-4" x="25" y="38" width="20" height="20"/></symbol></svg>

apps/common/main/resources/img/doc-formats/txt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-txt"><path fill="#7c7c7d" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.05 113)">TXT</text><rect class="cls-4" x="25" y="38" width="49" height="2"/><rect class="cls-4" x="25" y="44" width="49" height="2"/><rect class="cls-4" x="25" y="50" width="49" height="2"/><rect class="cls-4" x="25" y="56" width="49" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/></symbol></svg>

apps/common/main/resources/img/doc-formats/xlsx.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-xlsx"><path fill="#1f7244" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(35.3 113)">XLSX</text><polygon class="cls-4" points="52.75 61.63 64 45 58.5 45 50 57.56 41.5 45 36 45 47.25 61.63 35.5 79 41 79 50 65.7 59 79 64.5 79 52.75 61.63"/></symbol></svg>

apps/common/main/resources/img/header/buttons.svg

@@ -63,8 +63,8 @@
         c-0.845-1.277-2.313-2.215-3.989-2.215c-2.461,0-5.405,1.78-5.694,4.119C4.399,10.291,7.034,7.625,10.645,7.625z"/>
     </symbol>
     <symbol id="svg-btn-options" viewBox="0 0 20 20">
-        <rect x="4" y="6" width="12" height="1"/>
-        <rect x="4" y="9" width="12" height="1"/>
-        <rect x="4" y="12" width="12" height="1"/>
+        <rect x="3" y="6" width="14" height="1"/>
+        <rect x="3" y="10" width="14" height="1"/>
+        <rect x="3" y="14" width="14" height="1"/>
     </symbol>
 </svg>

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

@@ -78,7 +78,7 @@
     overflow: hidden;
     color: @gray-darker;
 
-    textarea:not(.user-message) {
+    textarea {
         width: 100%;
         height: 50px;
         resize: none;
@@ -169,14 +169,10 @@
             text-overflow: ellipsis;
             cursor: default;
         }
-    }
-
-    textarea.user-message {
-        border: none;
-        resize: none;
-        width: 100%;
-        line-height: 15px;
-        cursor: text;
+        
+        &.user-select {
+            cursor: text;
+        }
     }
 
     .user-reply {

apps/common/main/resources/less/header.less

@@ -134,13 +134,14 @@
     #header-logo {
         max-width: 200px;
         height: 100%;
-        padding: 7px 24px 7px 12px;
+        padding: 6px 24px 6px 12px;
 
         i {
             cursor: pointer;
             width: 86px;
             height: 20px;
-            display: block;
+            display: inline-block;
+            vertical-align: middle;
             .background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px);
         }
 

apps/common/main/resources/less/opendialog.less

@@ -15,7 +15,7 @@
 
     .content-panel {
       vertical-align: top;
-      padding: 15px;
+      padding: 15px 15px 0;
       width: 100%;
 
       .inner-content {
@@ -74,6 +74,17 @@
           padding-bottom: 8px;
         }
       }
+
+      .icon {
+        float: left;
+        width: 35px;
+        height: 35px;
+
+        &.warn {
+          height: 32px;
+          background-position: @alerts-offset-x @alerts-offset-y - 105px;
+        }
+      }
     }
   }
   .footer {

apps/common/main/resources/less/synchronize-tip.less

@@ -1,8 +1,12 @@
 .synch-tip-root {
     position: absolute;
-    z-index: @zindex-tooltip + 5;
+    z-index: @zindex-navbar + 2;
     width: 300px;
 
+    &.inc-index {
+        z-index: @zindex-navbar + 4;
+    }
+
     .tip-arrow {
         position: absolute;
         overflow: hidden;

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

@@ -242,15 +242,19 @@
     position: absolute;
     bottom: 0;
     width: 100%;
-    z-index: 1041;
+    z-index: @zindex-navbar + 3;
 }
 
 .toolbar {
     &.cover {
         ul {
-            z-index: 1042;
+            z-index: @zindex-navbar + 4;
         }
     }
+
+    &:not(.cover):not(.z-clear) {
+        z-index: @zindex-navbar + 1;
+    }
 }
 
 .btn-toolbar {

apps/common/mobile/resources/less/material/_container.less

@@ -50,10 +50,10 @@
     }
 
     .popover-view {
-      border-radius: 3px;
+      border-radius: 2px;
 
       > .pages {
-        border-radius: 3px;
+        border-radius: 2px;
       }
     }
   }

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

@@ -286,11 +286,11 @@ define([
 
         clickSaveAsFormat: function(menu, format) {
             if (menu) {
-                if (format == Asc.c_oAscFileType.TXT) {
+                if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) {
                     Common.UI.warning({
                         closable: false,
                         title: this.notcriticalErrorTitle,
-                        msg: this.warnDownloadAs,
+                        msg: (format == Asc.c_oAscFileType.TXT) ? this.warnDownloadAs : this.warnDownloadAsRTF,
                         buttons: ['ok', 'cancel'],
                         callback: _.bind(function(btn){
                             if (btn == 'ok') {
@@ -321,19 +321,19 @@ define([
                 this.api.asc_SetFastCollaborative(fast_coauth);
 
                 value = Common.localStorage.getItem((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict");
+                Common.Utils.InternalSettings.set((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", value);
                 switch(value) {
                 case 'all': value = Asc.c_oAscCollaborativeMarksShowType.All; break;
                 case 'none': value = Asc.c_oAscCollaborativeMarksShowType.None; break;
                 case 'last': value = Asc.c_oAscCollaborativeMarksShowType.LastChanges; break;
                 default: value = (fast_coauth) ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges;
                 }
-                Common.Utils.InternalSettings.set((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", value);
                 this.api.SetCollaborativeMarksShowType(value);
             }
 
             value = Common.localStorage.getBool("de-settings-livecomment", true);
             Common.Utils.InternalSettings.set("de-settings-livecomment", value);
-            var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+            var resolved = Common.localStorage.getBool("de-settings-resolvedcomment");
             Common.Utils.InternalSettings.set("de-settings-resolvedcomment", resolved);
             if (this.mode.canComments && this.leftMenu.panelComments.isVisible())
                 value = resolved = true;
@@ -634,7 +634,7 @@ define([
                     }
                     return false;
                 case 'help':
-                    if ( this.mode.isEdit ) {                   // TODO: unlock 'help' for 'view' mode
+                    if ( this.mode.isEdit && this.mode.canHelp ) {                   // TODO: unlock 'help' for 'view' mode
                         Common.UI.Menu.Manager.hideAll();
                         this.leftMenu.showMenu('file:help');
                     }
@@ -731,6 +731,7 @@ define([
         textLoadHistory         : 'Loading versions history...',
         notcriticalErrorTitle: 'Warning',
         leavePageText: 'All unsaved changes in this document will be lost.<br> Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.',
-        warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?' 
+        warnDownloadAs          : 'If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?',
+        warnDownloadAsRTF       : 'If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?'
     }, DE.Controllers.LeftMenu || {}));
 });

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

@@ -163,6 +163,7 @@ define([
                 });
 
                 if (this.api){
+                    this.api.SetDrawingFreeze(true);
                     switch (value) {
                         case '0': this.api.SetFontRenderingMode(3); break;
                         case '1': this.api.SetFontRenderingMode(1); break;
@@ -444,7 +445,6 @@ define([
                         });
                     }
                     Common.UI.alert({
-                        closable: false,
                         title: this.notcriticalErrorTitle,
                         msg: (opts.data.error) ? opts.data.error : this.txtErrorLoadHistory,
                         iconCls: 'warn',
@@ -622,10 +622,10 @@ define([
                 }
                 application.getController('DocumentHolder').getView().focus();
 
-                if (this.api && !toolbarView._state.previewmode) {
+                if (this.api && this.appOptions.isEdit && !toolbarView._state.previewmode) {
                     var cansave = this.api.asc_isDocumentCanSave(),
                         forcesave = this.appOptions.forcesave,
-                        isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.$icon.hasClass('btn-synch') : false,
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
                 }
@@ -815,7 +815,7 @@ define([
                 /** coauthoring begin **/
                 this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
                 Common.Utils.InternalSettings.set("de-settings-livecomment", this.isLiveCommenting);
-                value = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+                value = Common.localStorage.getBool("de-settings-resolvedcomment");
                 Common.Utils.InternalSettings.set("de-settings-resolvedcomment", value);
                 this.isLiveCommenting ? this.api.asc_showComments(value) : this.api.asc_hideComments();
                 /** coauthoring end **/
@@ -1082,13 +1082,14 @@ define([
                 this.appOptions.canChat        = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
                 this.appOptions.canEditStyles  = this.appOptions.canLicense && this.appOptions.canEdit;
                 this.appOptions.canPrint       = (this.permissions.print !== false);
-                this.appOptions.canRename      = !!this.permissions.rename;
+                this.appOptions.canRename      = this.editorConfig.canRename && !!this.permissions.rename;
                 this.appOptions.buildVersion   = params.asc_getBuildVersion();
                 this.appOptions.canForcesave   = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
                 this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
                 this.appOptions.trialMode      = params.asc_getLicenseMode();
                 this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
+                this.appOptions.canHelp        = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
 
                 if ( this.appOptions.isLightVersion ) {
                     this.appOptions.canUseHistory =
@@ -1139,7 +1140,8 @@ define([
                     viewport        = app.getController('Viewport').getView('Viewport'),
                     // headerView      = app.getController('Viewport').getView('Common.Views.Header'),
                     statusbarView   = app.getController('Statusbar').getView('Statusbar'),
-                    documentHolder  = app.getController('DocumentHolder').getView();
+                    documentHolder  = app.getController('DocumentHolder').getView(),
+                    toolbarController   = app.getController('Toolbar');
 
                 // if (headerView) {
                     // headerView.setHeaderCaption(this.appOptions.isEdit ? 'Document Editor' : 'Document Viewer');
@@ -1148,7 +1150,7 @@ define([
 
                 viewport && viewport.setMode(this.appOptions);
                 statusbarView && statusbarView.setMode(this.appOptions);
-
+                toolbarController.setMode(this.appOptions);
                 documentHolder.setMode(this.appOptions);
 
                 this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
@@ -1186,20 +1188,17 @@ define([
 
                     viewport.applyEditorMode();
 
+                    var rightmenuView = rightmenuController.getView('RightMenu');
+                    if (rightmenuView) {
+                        rightmenuView.setApi(me.api);
+                        rightmenuView.on('editcomplete', _.bind(me.onEditComplete, me));
+                        rightmenuView.setMode(me.appOptions);
+                    }
+
                     var toolbarView = (toolbarController) ? toolbarController.getView() : null;
-
-                    _.each([
-                        toolbarView,
-                        rightmenuController.getView('RightMenu')
-                    ], function(view) {
-                        if (view) {
-                            view.setApi(me.api);
-                            view.on('editcomplete', _.bind(me.onEditComplete, me));
-                            view.setMode(me.appOptions);
-                        }
-                    });
-
                     if (toolbarView) {
+                        toolbarView.setApi(me.api);
+                        toolbarView.on('editcomplete', _.bind(me.onEditComplete, me));
                         toolbarView.on('insertimage', _.bind(me.onInsertImage, me));
                         toolbarView.on('inserttable', _.bind(me.onInsertTable, me));
                         toolbarView.on('insertshape', _.bind(me.onInsertShape, me));
@@ -1251,7 +1250,7 @@ define([
                 this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
                 var config = {
-                    closable: false
+                    closable: true
                 };
 
                 switch (id)
@@ -1351,6 +1350,7 @@ define([
 
                     case Asc.c_oAscError.ID.Warning:
                         config.msg = this.errorConnectToServer;
+                        config.closable = false;
                         break;
 
                     case Asc.c_oAscError.ID.SessionAbsolute:
@@ -1394,6 +1394,7 @@ define([
 
                     config.title = this.criticalErrorTitle;
                     config.iconCls = 'error';
+                    config.closable = false;
 
                     if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
                         config.msg += '<br/><br/>' + this.criticalErrorExtText;
@@ -1518,7 +1519,7 @@ define([
                 var toolbarView = this.getApplication().getController('Toolbar').getView();
 
                 if (toolbarView && !toolbarView._state.previewmode) {
-                    var isSyncButton = toolbarView.btnSave.$icon.hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1534,7 +1535,7 @@ define([
                 var toolbarView = this.getApplication().getController('Toolbar').getView();
 
                 if (toolbarView && this.api && !toolbarView._state.previewmode) {
-                    var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1589,6 +1590,8 @@ define([
 
                 Common.NotificationCenter.trigger('layout:changed', 'main');
                 $('#loading-mask').hide().remove();
+
+                Common.Controllers.Desktop.process('preloader:hide');
             },
 
             onDownloadUrl: function(url) {
@@ -1854,6 +1857,7 @@ define([
                     me._state.openDlg = new Common.Views.OpenDialog({
                         closable: me.appOptions.canRequestClose,
                         type: type,
+                        warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
                         validatePwd: !!me._state.isDRM,
                         handler: function (result, value) {
                             me.isShowOpenDialog = false;
@@ -2143,7 +2147,7 @@ define([
             errorKeyExpire: 'Key descriptor expired',
             errorUsersExceed: 'Count of users was exceed',
             errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.',
-            errorFilePassProtect: 'The document is password protected.',
+            errorFilePassProtect: 'The file is password protected and cannot be opened.',
             txtBasicShapes: 'Basic Shapes',
             txtFiguredArrows: 'Figured Arrows',
             txtMath: 'Math',

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

@@ -205,6 +205,7 @@ define([
         onSelectItem: function(picker, item, record, e){
             if (!this._navigationObject) return;
             this._navigationObject.goto(record.get('index'));
+            Common.NotificationCenter.trigger('edit:complete', this.panelNavigation);
         },
 
         onMenuItemClick: function (menu, item) {

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

@@ -226,6 +226,11 @@ define([
             Common.NotificationCenter.on('app:face', me.onAppShowed.bind(me));
         },
 
+        setMode: function(mode) {
+            this.mode = mode;
+            this.toolbar.applyLayout(mode);
+        },
+
         attachUIEvents: function(toolbar) {
             /**
              * UI Events
@@ -1837,11 +1842,12 @@ define([
             menu.items[3].setDisabled(isAllDefailtNotModifaed);
             menu.items[4].setDisabled(isAllCustomDeleted);
 
-            var top = e.clientY*Common.Utils.zoom();
+            var parentOffset = this.toolbar.$el.offset(),
+                top = e.clientY*Common.Utils.zoom();
             if ($('#header-container').is(":visible")) {
                 top -= $('#header-container').height()
             }
-            showPoint = [e.clientX*Common.Utils.zoom(), top];
+            showPoint = [e.clientX*Common.Utils.zoom(), top - parentOffset.top];
 
             if (record != undefined) {
                 //itemMenu
@@ -2699,6 +2705,8 @@ define([
             me.toolbar.render(_.extend({isCompactView: compactview}, config));
 
             if ( config.isEdit ) {
+                me.toolbar.setMode(config);
+
                 var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
                 var $panel = this.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
 
@@ -2733,6 +2741,7 @@ define([
 
         onAppReady: function (config) {
             var me = this;
+            me.appOptions = config;
 
             if ( config.canCoAuthoring && config.canComments ) {
                 this.btnsComment = createButtonSet();
@@ -2783,7 +2792,13 @@ define([
         },
 
         onFileMenu: function (opts) {
-            this.toolbar.setTab( opts == 'show' ? 'file' : undefined );
+            if ( opts == 'show' ) {
+                if ( !this.toolbar.isTabActive('file') )
+                    this.toolbar.setTab('file');
+            } else {
+                if ( this.toolbar.isTabActive('file') )
+                    this.toolbar.setTab();
+            }
         },
 
         textEmptyImgUrl                            : 'You need to specify image URL.',

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

@@ -107,6 +107,8 @@ define([
         setApi: function(api) {
             this.api = api;
             this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this));
+            this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',this.onApiCoAuthoringDisconnect.bind(this));
+            Common.NotificationCenter.on('api:disconnect',              this.onApiCoAuthoringDisconnect.bind(this));
         },
 
 
@@ -193,6 +195,14 @@ define([
                     checkable: true,
                     value: 'toolbar'
                 });
+                if (!config.isEdit) {
+                    me.header.mnuitemCompactToolbar.hide();
+                    Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){
+                        if (action=='plugins' && visible) {
+                            me.header.mnuitemCompactToolbar.show();
+                        }
+                    }, this));
+                }
 
                 var mnuitemHideStatusBar = new Common.UI.MenuItem({
                     caption: me.header.textHideStatusBar,
@@ -364,6 +374,17 @@ define([
             }
         },
 
+        onApiCoAuthoringDisconnect: function() {
+            if (this.header) {
+                if (this.header.btnDownload)
+                    this.header.btnDownload.hide();
+                if (this.header.btnPrint)
+                    this.header.btnPrint.hide();
+                if (this.header.btnEdit)
+                    this.header.btnEdit.hide();
+            }
+        },
+
         textFitPage: 'Fit to Page',
         textFitWidth: 'Fit to Width'
     }, DE.Controllers.Viewport));

apps/documenteditor/main/app/template/Toolbar.template

@@ -1,23 +1,8 @@
 <div class="toolbar">
     <div class="box-tabs">
         <div class="extra left"></div>
-        <section class="tabs">
-            <a class="scroll left">
-                <i class="icon">&lt;</i>
-            </a>
-            <ul>
-                <% for(var i in tabs) { %>
-                    <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                        <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
-                    </li>
-                <% } %>
-            </ul>
-            <a class="scroll right">
-                <i class="icon">&gt;</i>
-            </a>
-        </section>
-        <div class="extra right">
-        </div>
+        <%= tabsmarkup %>
+        <div class="extra right"></div>
     </div>
     <section class="box-controls">
         <section class="panel static">

apps/documenteditor/main/app/template/ToolbarView.template

@@ -0,0 +1,12 @@
+<div class="toolbar">
+    <div class="box-tabs">
+        <div class="extra left"></div>
+        <%= tabsmarkup %>
+        <div class="extra right">
+        </div>
+    </div>
+    <section class="box-controls">
+        <section class="box-panels">
+        </section>
+    </section>
+</div>

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

@@ -2280,7 +2280,6 @@ define([
                         new Common.UI.MenuItem({
                             caption     : this.textFromUrl
                         }).on('click', function(item) {
-                            var me = this;
                             (new Common.Views.ImageFromUrlDialog({
                                 handler: function(result, value) {
                                     if (result == 'ok') {

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

@@ -161,6 +161,13 @@ define([
                 canFocused: false
             });
 
+            this.miHelp = new Common.UI.MenuItem({
+                el      : $('#fm-btn-help',this.el),
+                action  : 'help',
+                caption : this.btnHelpCaption,
+                canFocused: false
+            });
+
             this.items = [];
             this.items.push(
                 new Common.UI.MenuItem({
@@ -192,12 +199,7 @@ define([
                     caption : this.btnSettingsCaption,
                     canFocused: false
                 }),
-                new Common.UI.MenuItem({
-                    el      : $('#fm-btn-help',this.el),
-                    action  : 'help',
-                    caption : this.btnHelpCaption,
-                    canFocused: false
-                }),
+                this.miHelp,
                 new Common.UI.MenuItem({
                     el      : $('#fm-btn-back',this.el),
                     action  : 'exit',
@@ -211,8 +213,7 @@ define([
 //                    'saveas'    : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
                 'opts'      : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
                 'info'      : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
-                'rights'    : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
-                'help'      : (new DE.Views.FileMenuPanels.Help({menu:me})).render()
+                'rights'    : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render()
             };
 
             me.$el.find('.content-box').hide();
@@ -260,6 +261,9 @@ define([
                           (this.document.info.sharingSettings&&this.document.info.sharingSettings.length>0 ||
                           this.mode.sharingSettingsUrl&&this.mode.sharingSettingsUrl.length))?'show':'hide']();
 
+            this.miHelp[this.mode.canHelp ?'show':'hide']();
+            this.miHelp.$el.prev()[this.mode.canHelp ?'show':'hide']();
+
             this.mode.canBack ? this.$el.find('#fm-btn-back').show().prev().show() :
                                     this.$el.find('#fm-btn-back').hide().prev().hide();
 
@@ -291,7 +295,10 @@ define([
             } else if (this.mode.canDownloadOrigin)
                 $('a',this.miDownload.$el).text(this.textDownload);
 
-            this.panels['help'].setLangConfig(this.mode.lang);
+            if (this.mode.canHelp) {
+                this.panels['help'] = ((new DE.Views.FileMenuPanels.Help({menu: this})).render());
+                this.panels['help'].setLangConfig(this.mode.lang);
+            }
 
             this.miHistory[this.mode.canUseHistory&&!this.mode.isDisconnected?'show':'hide']();
         },
@@ -325,7 +332,7 @@ define([
             if ( menu ) {
                 var item = this._getMenuItem(menu),
                     panel   = this.panels[menu];
-                if ( item.isDisabled() ) {
+                if ( item.isDisabled() || !item.isVisible()) {
                     item = this._getMenuItem(defMenu);
                     panel   = this.panels[defMenu];
                 }

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

@@ -69,7 +69,9 @@ define([
                 '<% _.each(rows, function(row) { %>',
                     '<tr>',
                         '<% _.each(row, function(item) { %>',
-                            '<td><span class="btn-doc-format img-doc-format <%= item.imgCls %>" format="<%= item.type %>"/></td>',
+                            '<td><div><svg class="btn-doc-format" format="<%= item.type %>">',
+                                '<use xlink:href="#svg-format-<%= item.imgCls %>"></use>',
+                            '</svg></div></td>',
                         '<% }) %>',
                     '</tr>',
                 '<% }) %>',
@@ -530,7 +532,11 @@ define([
         template: _.template([
             '<h3 style="margin-top: 20px;"><%= scope.fromBlankText %></h3><hr noshade />',
             '<div class="blank-document">',
-                '<div class="blank-document-btn img-doc-format"></div>',
+                '<div class="blank-document-btn">',
+                    '<svg class="btn-doc-format">',
+                        '<use xlink:href="#svg-format-docx"></use>',
+                    '</svg>',
+                '</div>',
                 '<div class="blank-document-info">',
                     '<h3><%= scope.newDocumentText %></h3>',
                     '<%= scope.newDescriptionText %>',
@@ -540,7 +546,13 @@ define([
             '<div class="thumb-list">',
                 '<% _.each(docs, function(item) { %>',
                     '<div class="thumb-wrap" template="<%= item.url %>">',
-                        '<div class="thumb"<% if (!_.isEmpty(item.icon)) { %> style="background-image: url(<%= item.icon %>);" <% } %> />',
+                        '<div class="thumb"',
+                        '<% if (!_.isEmpty(item.icon)) { ' +
+                            'print(\" style=\'background-image: url(item.icon);\'>\")' +
+                        ' } else { ' +
+                            'print(\"><svg class=\'btn-doc-format\'><use xlink:href=\'#svg-format-blank\'></use></svg>\")' +
+                        ' } %>',
+                        '</div>',
                         '<div class="title"><%= item.name %></div>',
                     '</div>',
                 '<% }) %>',
@@ -1115,7 +1127,7 @@ define([
                 '<div id="fms-btn-add-pwd" style="width:190px;"></div>',
                 '<table id="id-fms-view-pwd" cols="2" width="300">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@@ -1139,7 +1151,7 @@ define([
             this.templateSignature = _.template([
                 '<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

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

@@ -318,7 +318,7 @@ define([
             if (this.api) {
                 var section = this.api.asc_GetSectionProps(),
                     ratio = (this._state.Height>0) ? this._state.Width/this._state.Height : 1,
-                    pagew = this.api.asc_GetCurrentColumnWidth(),
+                    pagew = (this.api.asc_GetCurrentColumnWidth) ? this.api.asc_GetCurrentColumnWidth() : (section.get_W() - section.get_LeftMargin() - section.get_RightMargin()),
                     pageh = section.get_H() - section.get_TopMargin() - section.get_BottomMargin(),
                     pageratio = pagew/pageh,
                     w, h;

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

@@ -183,7 +183,7 @@ define([
             } else {
                 btn.panel['hide']();
             }
-            if (this.mode.isEdit) DE.getController('Toolbar').DisableToolbar(state==true);
+            DE.getController('Toolbar').DisableToolbar(state==true);
             if (!this.supressEvents)
                 Common.NotificationCenter.trigger('layout:changed', 'leftmenu');
         },

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

@@ -169,7 +169,7 @@ define([    'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
         },
 
         _onMessage: function(msg) {
-            if (msg) {
+            if (msg && msg.Referer == "onlyoffice") {
 //                if ( !_.isEmpty(msg.folder) ) {
 //                    this.trigger('mailmergefolder', this, msg.folder); // save last folder url
 //                }

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

@@ -116,7 +116,7 @@ define([
         },
 
         _onMessage: function(msg) {
-            if (msg && msg.file !== undefined) {
+            if (msg && msg.Referer == "onlyoffice" && msg.file !== undefined) {
                 Common.NotificationCenter.trigger('window:close', this);
                 var me = this;
                 setTimeout(function() {

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

@@ -120,7 +120,7 @@ define([
         },
 
         _onMessage: function(msg) {
-            if (msg) {
+            if (msg && msg.Referer == "onlyoffice") {
                 if ( !_.isEmpty(msg.error) ) {
                     this.trigger('mailmergeerror', this, msg.error);
                 }

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

@@ -58,14 +58,20 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 40px;">',
-                    '<table cols="2" style="width: 100%;margin-bottom: 10px;">',
+                '<div class="box" style="height: 85px;">',
+                    '<table cols="2" style="width: 100%;">',
                         '<tr>',
-                            '<td class="padding-small" style="padding-right: 10px;">',
+                            '<td colspan="2">',
+                                '<label class="input-label">' + this.textPreset + '</label>',
+                                '<div id="page-size-combo-preset" class="input-group-nr" style="margin-bottom: 10px;"></div>',
+                            '</td>',
+                        '</tr>',
+                        '<tr>',
+                            '<td style="padding-right: 10px;">',
                                 '<label class="input-label">' + this.textWidth + '</label>',
                                 '<div id="page-size-spin-width"></div>',
                             '</td>',
-                            '<td class="padding-small">',
+                            '<td>',
                                 '<label class="input-label">' + this.textHeight + '</label>',
                                 '<div id="page-size-spin-height"></div>',
                             '</td>',
@@ -83,6 +89,7 @@ define([
 
             this.spinners = [];
             this._noApply = false;
+            this.isOrientPortrait = true;
 
             Common.UI.Window.prototype.initialize.call(this, this.options);
         },
@@ -100,6 +107,10 @@ define([
                 minValue: 0
             });
             this.spinners.push(this.spnWidth);
+            this.spnWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                if (!this._noApply && this.cmbPreset.getValue() >-1)
+                    this.cmbPreset.setValue(-1);
+            }, this));
 
             this.spnHeight = new Common.UI.MetricSpinner({
                 el: $('#page-size-spin-height'),
@@ -111,6 +122,48 @@ define([
                 minValue: 0
             });
             this.spinners.push(this.spnHeight);
+            this.spnHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){
+                if (!this._noApply && this.cmbPreset.getValue() >-1)
+                    this.cmbPreset.setValue(-1);
+            }, this));
+
+            this.cmbPreset = new Common.UI.ComboBox({
+                el: $('#page-size-combo-preset'),
+                cls: 'input-group-nr',
+                menuStyle: 'min-width: 183px;max-height: 208px;',
+                editable: false,
+                scrollAlwaysVisible: true,
+                data: [
+                    { value: 0, displayValue: 'US Letter', size: [215.9, 279.4]},
+                    { value: 1, displayValue: 'US Legal', size: [215.9, 355.6]},
+                    { value: 2, displayValue: 'A4', size: [210, 297]},
+                    { value: 3, displayValue: 'A5', size: [148, 210]},
+                    { value: 4, displayValue: 'B5', size: [176, 250]},
+                    { value: 5, displayValue: 'Envelope #10', size: [104.8, 241.3]},
+                    { value: 6, displayValue: 'Envelope DL', size: [110, 220]},
+                    { value: 7, displayValue: 'Tabloid', size: [279.4, 431.8]},
+                    { value: 8, displayValue: 'A3', size: [297, 420]},
+                    { value: 9, displayValue: 'Tabloid Oversize', size: [304.8, 457.1]},
+                    { value: 10, displayValue: 'ROC 16K', size: [196.8, 273]},
+                    { value: 11, displayValue: 'Envelope Choukei 3', size: [119.9, 234.9]},
+                    { value: 12, displayValue: 'Super B/A3', size: [330.2, 482.5]},
+                    { value: 13, displayValue: 'A0', size: [841, 1189]},
+                    { value: 14, displayValue: 'A1', size: [594, 841]},
+                    { value: 16, displayValue: 'A2', size: [420, 594]},
+                    { value: 17, displayValue: 'A6', size: [105, 148]},
+                    { value: -1, displayValue: this.txtCustom, size: []}
+                ]
+            });
+            this.cmbPreset.setValue(-1);
+            this.cmbPreset.on('selected', _.bind(function(combo, record) {
+                this._noApply = true;
+                if (record.value<0) {
+                } else {
+                    this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[0] : record.size[1]), true);
+                    this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[1] : record.size[0]), true);
+                }
+                this._noApply = false;
+            }, this));
 
             var $window = this.getChild();
             $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
@@ -139,10 +192,18 @@ define([
 
         setSettings: function (props) {
             if (props) {
+                this.isOrientPortrait = (props.get_W() < props.get_H());
                 this.spnWidth.setMinValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin() + props.get_RightMargin() + 12.7));
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_W()), true);
                 this.spnHeight.setMinValue(Common.Utils.Metric.fnRecalcFromMM(props.get_TopMargin() + props.get_BottomMargin() + 2.6));
                 this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_H()), true);
+                var width = this.isOrientPortrait ? props.get_W() : props.get_H(),
+                    height = this.isOrientPortrait ? props.get_H() : props.get_W();
+                var rec = this.cmbPreset.store.find(function(item){
+                    var size = item.get('size');
+                    return (Math.abs(size[0] - width) < 0.01 && Math.abs(size[1] - height) < 0.01);
+                });
+                this.cmbPreset.setValue((rec) ? rec.get('value') : -1);
             }
         },
 
@@ -165,6 +226,8 @@ define([
         textWidth: 'Width',
         textHeight: 'Height',
         cancelButtonText:   'Cancel',
-        okButtonText:       'Ok'
+        okButtonText:       'Ok',
+        textPreset: 'Preset',
+        txtCustom: 'Custom'
     }, DE.Views.PageSizeDialog || {}))
 });

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

@@ -122,6 +122,9 @@ define([
             this.viewRequestedList.on('item:click', _.bind(this.onSelectSignature, this));
             this.viewValidList.on('item:click', _.bind(this.onSelectSignature, this));
             this.viewInvalidList.on('item:click', _.bind(this.onSelectSignature, this));
+            this.viewRequestedList.on('item:contextmenu', _.bind(this.onItemContextMenu, this));
+            this.viewValidList.on('item:contextmenu', _.bind(this.onItemContextMenu, this));
+            this.viewInvalidList.on('item:contextmenu', _.bind(this.onItemContextMenu, this));
 
             this.signatureMenu = new Common.UI.Menu({
                 menuAlign   : 'tr-br',
@@ -200,6 +203,26 @@ define([
             me.disableEditing(me._state.hasValid || me._state.hasInvalid);
         },
 
+        onItemContextMenu: function(picker, item, record, e){
+            var menu = this.signatureMenu;
+            if (menu.isVisible()) {
+                menu.hide();
+            }
+
+            var offsetParent = $(this.el).offset(),
+                showPoint = [e.clientX*Common.Utils.zoom() - offsetParent.left + 5, e.clientY*Common.Utils.zoom() - offsetParent.top + 5];
+
+            this.showSignatureMenu(record, showPoint);
+
+            menu.menuAlign = 'tl-bl';
+            menu.menuAlignEl = null;
+            menu.setOffset(15, 5);
+            menu.show();
+            _.delay(function() {
+                menu.cmpEl.focus();
+            }, 10);
+        },
+
         onSelectSignature: function(picker, item, record, e){
             if (!record) return;
 
@@ -211,50 +234,14 @@ define([
                     return;
                 }
 
-                var showPoint, me = this,
-                    currentTarget = $(e.currentTarget),
-                    parent = $(this.el),
+                var currentTarget = $(e.currentTarget),
                     offset = currentTarget.offset(),
-                    offsetParent = parent.offset();
+                    offsetParent = $(this.el).offset(),
+                    showPoint = [offset.left - offsetParent.left + currentTarget.width(), offset.top - offsetParent.top + currentTarget.height()/2];
 
-                showPoint = [offset.left - offsetParent.left + currentTarget.width(), offset.top - offsetParent.top + currentTarget.height()/2];
-
-                var menuContainer = parent.find('#menu-signature-container');
-                if (!menu.rendered) {
-                    if (menuContainer.length < 1) {
-                        menuContainer = $('<div id="menu-signature-container" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id);
-                        parent.append(menuContainer);
-                    }
-                    menu.render(menuContainer);
-                    menu.cmpEl.attr({tabindex: "-1"});
-
-                    menu.on({
-                        'show:after': function(cmp) {
-                            if (cmp && cmp.menuAlignEl)
-                                cmp.menuAlignEl.toggleClass('over', true);
-                        },
-                        'hide:after': function(cmp) {
-                            if (cmp && cmp.menuAlignEl)
-                                cmp.menuAlignEl.toggleClass('over', false);
-                        }
-                    });
-                }
-                var requested = record.get('requested'),
-                    signed = (this._state.hasValid || this._state.hasInvalid);
-                menu.items[0].setVisible(requested);
-                menu.items[1].setVisible(!requested);
-                menu.items[2].setVisible(requested || !record.get('invisible'));
-                menu.items[3].setVisible(!requested);
-
-                menu.items[0].setDisabled(this._locked);
-                menu.items[3].setDisabled(this._locked);
-
-                menu.items[1].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
-                menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings
-                menu.cmpEl.attr('data-value', record.get('guid'));
-
-                menuContainer.css({left: showPoint[0], top: showPoint[1]});
+                this.showSignatureMenu(record, showPoint);
 
+                menu.menuAlign = 'tr-br';
                 menu.menuAlignEl = currentTarget;
                 menu.setOffset(-20, -currentTarget.height()/2 + 3);
                 menu.show();
@@ -268,6 +255,46 @@ define([
             }
         },
 
+        showSignatureMenu: function(record, showPoint) {
+            var menu = this.signatureMenu,
+                parent = $(this.el),
+                menuContainer = parent.find('#menu-signature-container');
+            if (!menu.rendered) {
+                if (menuContainer.length < 1) {
+                    menuContainer = $('<div id="menu-signature-container" style="position: absolute; z-index: 10000;"><div class="dropdown-toggle" data-toggle="dropdown"></div></div>', menu.id);
+                    parent.append(menuContainer);
+                }
+                menu.render(menuContainer);
+                menu.cmpEl.attr({tabindex: "-1"});
+
+                menu.on({
+                    'show:after': function(cmp) {
+                        if (cmp && cmp.menuAlignEl)
+                            cmp.menuAlignEl.toggleClass('over', true);
+                    },
+                    'hide:after': function(cmp) {
+                        if (cmp && cmp.menuAlignEl)
+                            cmp.menuAlignEl.toggleClass('over', false);
+                    }
+                });
+            }
+            var requested = record.get('requested'),
+                signed = (this._state.hasValid || this._state.hasInvalid);
+            menu.items[0].setVisible(requested);
+            menu.items[1].setVisible(!requested);
+            menu.items[2].setVisible(requested || !record.get('invisible'));
+            menu.items[3].setVisible(!requested);
+
+            menu.items[0].setDisabled(this._locked);
+            menu.items[3].setDisabled(this._locked);
+
+            menu.items[1].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
+            menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings
+            menu.cmpEl.attr('data-value', record.get('guid'));
+
+            menuContainer.css({left: showPoint[0], top: showPoint[1]});
+        },
+
         onMenuSignatureClick:  function(menu, item) {
             var guid = menu.cmpEl.attr('data-value');
             switch (item.value) {

apps/documenteditor/main/index.html

@@ -262,6 +262,13 @@
 
     <script src="../../../vendor/svg-injector/svg-injector.min.js"></script>
     <img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/docx.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdf.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/txt.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/odt.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/rtf.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/html.svg">
+    <img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">
     <script>
         var svgpoints = document.querySelectorAll('img.inline-svg');
         SVGInjector(svgpoints);

apps/documenteditor/main/index.html.deploy

@@ -283,6 +283,13 @@
     </script>
 
     <inline src="resources/img/header/buttons.svg" />
+    <inline src="resources/img/doc-formats/docx.svg" />
+    <inline src="resources/img/doc-formats/pdf.svg" />
+    <inline src="resources/img/doc-formats/txt.svg" />
+    <inline src="resources/img/doc-formats/odt.svg" />
+    <inline src="resources/img/doc-formats/rtf.svg" />
+    <inline src="resources/img/doc-formats/html.svg" />
+    <inline src="resources/img/doc-formats/blank.svg" />
 
     <div id="viewport"></div>
     <script data-main="app" src="../../../vendor/requirejs/require.js"></script>

apps/documenteditor/main/locale/cs.json

@@ -1547,14 +1547,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Zobrazit kompaktní lištu nástrojů",
   "DE.Views.Toolbar.textContPage": "Souvislá stránka",
   "DE.Views.Toolbar.textEvenPage": "Sudá stránka",
-  "DE.Views.Toolbar.textFitPage": "Přízpůsobit stránce",
-  "DE.Views.Toolbar.textFitWidth": "Přizpůsobit šířce",
-  "DE.Views.Toolbar.textHideLines": "Schovat pravítka",
-  "DE.Views.Toolbar.textHideStatusBar": "Schovat stavový řádek",
-  "DE.Views.Toolbar.textHideTitleBar": "Schovat lištu nadpisu",
   "DE.Views.Toolbar.textInMargin": "V okraji",
   "DE.Views.Toolbar.textInsColumnBreak": "Vložit sloupcový rozdělovač",
   "DE.Views.Toolbar.textInsertPageCount": "Vložit počet stran",
@@ -1602,8 +1596,6 @@
   "DE.Views.Toolbar.textToCurrent": "Na součásnou pozici",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Podtržené",
-  "DE.Views.Toolbar.textZoom": "Přiblížit",
-  "DE.Views.Toolbar.tipAdvSettings": "Pokročilé nastavení",
   "DE.Views.Toolbar.tipAlignCenter": "Zarovnat na střed",
   "DE.Views.Toolbar.tipAlignJust": "Do bloku",
   "DE.Views.Toolbar.tipAlignLeft": "Zarovnat vlevo",
@@ -1658,7 +1650,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Netisknutelné znaky",
   "DE.Views.Toolbar.tipSynchronize": "Dokument byl pozměněn jiným uživatelem. Kliněte prosím pro uložení vašich změn a načtení úprav.",
   "DE.Views.Toolbar.tipUndo": "Krok zpět",
-  "DE.Views.Toolbar.tipViewSettings": "Zobrazit nastavení",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/de.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Speichern und beenden",
   "Common.Views.ExternalMergeEditor.textTitle": "Seriendruckempfänger",
   "Common.Views.Header.labelCoUsersDescr": "Das Dokument wird gerade von mehreren Benutzern bearbeitet.",
+  "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen",
   "Common.Views.Header.textBack": "Zu Dokumenten übergehen",
+  "Common.Views.Header.textCompactView": "Symbolleiste ausblenden",
+  "Common.Views.Header.textHideLines": "Lineale verbergen",
+  "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen",
   "Common.Views.Header.textSaveBegin": "Speicherung...",
   "Common.Views.Header.textSaveChanged": "Verändert",
   "Common.Views.Header.textSaveEnd": "Alle Änderungen sind gespeichert",
   "Common.Views.Header.textSaveExpander": "Alle Änderungen sind gespeichert",
+  "Common.Views.Header.textZoom": "Zoom",
   "Common.Views.Header.tipAccessRights": "Zugriffsrechte für das Dokument verwalten",
   "Common.Views.Header.tipDownload": "Datei herunterladen",
   "Common.Views.Header.tipGoEdit": "Aktuelle Datei bearbeiten",
   "Common.Views.Header.tipPrint": "Datei drucken",
+  "Common.Views.Header.tipRedo": "Wiederholen",
+  "Common.Views.Header.tipSave": "Speichern",
+  "Common.Views.Header.tipUndo": "Rückgängig machen",
+  "Common.Views.Header.tipViewSettings": "Ansichts-Einstellungen",
   "Common.Views.Header.tipViewUsers": "Benutzer ansehen und Zugriffsrechte für das Dokument verwalten",
   "Common.Views.Header.txtAccessRights": "Zugriffsrechte ändern",
   "Common.Views.Header.txtRename": "Umbenennen",
@@ -183,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
   "Common.Views.OpenDialog.txtPassword": "Kennwort",
   "Common.Views.OpenDialog.txtPreview": "Vorschau",
+  "Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.",
   "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
   "Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei",
   "Common.Views.PasswordDialog.cancelButtonText": "Abbrechen",
@@ -269,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Name des Signaturgebers eingeben",
   "Common.Views.SignDialog.textItalic": "Kursiv",
   "Common.Views.SignDialog.textPurpose": "Zweck der Signierung dieses Dokuments",
+  "Common.Views.SignDialog.textSelect": "Wählen",
   "Common.Views.SignDialog.textSelectImage": "Bild auswählen",
   "Common.Views.SignDialog.textSignature": "Wie sieht Signatur aus:",
   "Common.Views.SignDialog.textTitle": "Dokument signieren",
@@ -296,6 +307,7 @@
   "DE.Controllers.LeftMenu.textReplaceSkipped": "Der Ersatzvorgang wurde durchgeführt. {0} Vorkommen wurden ausgelassen.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "Der Suchvorgang wurde durchgeführt. Vorkommen wurden ersetzt:{0}",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Wenn Sie mit dem Speichern in diesem Format fortsetzen, werden alle Objekte außer Text verloren gehen.<br>Möchten Sie wirklich fortsetzen?",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Wenn Sie mit dem Speichern in diesem Format fortsetzen, kann die Formatierung teilweise verloren gehen.<br>Möchten Sie wirklich fortsetzen?",
   "DE.Controllers.Main.applyChangesTextText": "Die Änderungen werden geladen...",
   "DE.Controllers.Main.applyChangesTitleText": "Laden von Änderungen",
   "DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
@@ -779,6 +791,18 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertikale Ellipse",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "Seite anpassen",
+  "DE.Controllers.Viewport.textFitWidth": "Breite anpassen",
+  "DE.Views.BookmarksDialog.textAdd": "Hinzufügen",
+  "DE.Views.BookmarksDialog.textBookmarkName": "Lesezeichenname",
+  "DE.Views.BookmarksDialog.textClose": "Schließen",
+  "DE.Views.BookmarksDialog.textDelete": "Löschen",
+  "DE.Views.BookmarksDialog.textGoto": "Wechseln zu",
+  "DE.Views.BookmarksDialog.textHidden": "Ausgeblendete Lesezeichen",
+  "DE.Views.BookmarksDialog.textLocation": "Standort",
+  "DE.Views.BookmarksDialog.textName": "Name",
+  "DE.Views.BookmarksDialog.textSort": "Sortieren nach",
+  "DE.Views.BookmarksDialog.textTitle": "Lesezeichen",
   "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.ChartSettings.textArea": "Fläche",
   "DE.Views.ChartSettings.textBar": "Balken",
@@ -898,6 +922,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Zeilen verteilen",
   "DE.Views.DocumentHolder.textEditControls": "Einstellungen des Inhaltssteuerelements",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Umbruchsgrenze bearbeiten",
+  "DE.Views.DocumentHolder.textFromFile": "Aus Datei",
+  "DE.Views.DocumentHolder.textFromUrl": "Aus URL",
   "DE.Views.DocumentHolder.textNest": "Tabelle schachteln",
   "DE.Views.DocumentHolder.textNextPage": "Nächste Seite",
   "DE.Views.DocumentHolder.textPaste": "Einfügen",
@@ -905,6 +931,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Feld aktualisieren",
   "DE.Views.DocumentHolder.textRemove": "Entfernen",
   "DE.Views.DocumentHolder.textRemoveControl": "Inhaltssteuerelement entfernen",
+  "DE.Views.DocumentHolder.textReplace": "Bild ersetzen",
   "DE.Views.DocumentHolder.textSettings": "Einstellungen",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Unten ausrichten",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Zentriert ausrichten",
@@ -1164,10 +1191,15 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Gewählter Textabschnitt",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Anzeigen",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Externer Link",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Stelle im Dokument",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink-Einstellungen",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "QuickInfo-Text",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Verknüpfen mit",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Anfang des Dokuments",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Lesezeichen",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Dieses Feld ist erforderlich",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Überschriften",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" sein",
   "DE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.ImageSettings.textEdit": "Bearbeiten",
@@ -1260,12 +1292,14 @@
   "DE.Views.LeftMenu.tipAbout": "Über das Produkt",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Kommentare",
+  "DE.Views.LeftMenu.tipNavigation": "Navigation",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Suchen",
   "DE.Views.LeftMenu.tipSupport": "Feedback und Support",
   "DE.Views.LeftMenu.tipTitles": "Titel",
   "DE.Views.LeftMenu.txtDeveloper": "ENTWICKLERMODUS",
   "DE.Views.LeftMenu.txtTrial": "Trial-Modus",
+  "DE.Views.Links.capBtnBookmarks": "Lesezeichen",
   "DE.Views.Links.capBtnContentsUpdate": "Aktualisierung",
   "DE.Views.Links.capBtnInsContents": "Inhaltsverzeichnis",
   "DE.Views.Links.capBtnInsFootnote": "Fußnote",
@@ -1279,6 +1313,7 @@
   "DE.Views.Links.textGotoFootnote": "Zu Fußnoten übergehen",
   "DE.Views.Links.textUpdateAll": "Gesamtes Verzeichnis aktualisieren",
   "DE.Views.Links.textUpdatePages": "Nur Seitenzahlen aktualisieren",
+  "DE.Views.Links.tipBookmarks": "Lesezeichen erstellen",
   "DE.Views.Links.tipContents": "Inhaltsverzeichnis einfügen",
   "DE.Views.Links.tipContentsUpdate": "Inhaltsverzeichnis aktualisieren",
   "DE.Views.Links.tipInsertHyperlink": "Hyperlink hinzufügen",
@@ -1340,7 +1375,7 @@
   "DE.Views.Navigation.txtEmpty": "Dieses Dokument enthält keine Überschriften",
   "DE.Views.Navigation.txtEmptyItem": "Leere Überschrift",
   "DE.Views.Navigation.txtExpand": "Alle ausklappen",
-  "DE.Views.Navigation.txtExpandToLevel": "Auf Ebene erweitern...",
+  "DE.Views.Navigation.txtExpandToLevel": "Auf Ebene erweitern",
   "DE.Views.Navigation.txtHeadingAfter": "Neue Überschrift nach",
   "DE.Views.Navigation.txtHeadingBefore": "Neue Überschrift vor",
   "DE.Views.Navigation.txtNewHeading": "Neue Unterüberschrift",
@@ -1745,14 +1780,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Rechts",
   "DE.Views.Toolbar.textColumnsThree": "Drei",
   "DE.Views.Toolbar.textColumnsTwo": "Zwei",
-  "DE.Views.Toolbar.textCompactView": "Kompaktsymbolleiste anzeigen",
   "DE.Views.Toolbar.textContPage": "Fortlaufende Seite",
   "DE.Views.Toolbar.textEvenPage": "Gerade Seite",
-  "DE.Views.Toolbar.textFitPage": "Seite anpassen",
-  "DE.Views.Toolbar.textFitWidth": "Breite anpassen",
-  "DE.Views.Toolbar.textHideLines": "Lineale verbergen",
-  "DE.Views.Toolbar.textHideStatusBar": "Statusleiste verbergen",
-  "DE.Views.Toolbar.textHideTitleBar": "Titelleiste verbergen",
   "DE.Views.Toolbar.textInMargin": "Im Rand",
   "DE.Views.Toolbar.textInsColumnBreak": "Spaltenumbruch einfügen",
   "DE.Views.Toolbar.textInsertPageCount": "Anzahl der Seiten einfügen",
@@ -1806,8 +1835,6 @@
   "DE.Views.Toolbar.textToCurrent": "An aktueller Position",
   "DE.Views.Toolbar.textTop": "Oben: ",
   "DE.Views.Toolbar.textUnderline": "Unterstrichen",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Erweiterte Einstellungen",
   "DE.Views.Toolbar.tipAlignCenter": "Zentriert ausrichten",
   "DE.Views.Toolbar.tipAlignJust": "Blocksatz",
   "DE.Views.Toolbar.tipAlignLeft": "Linksbündig ausrichten",
@@ -1863,7 +1890,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Formatierungszeichen",
   "DE.Views.Toolbar.tipSynchronize": "Das Dokument wurde von einem anderen Benutzer geändert. Bitte speichern Sie Ihre Änderungen und aktualisieren Sie Ihre Seite.",
   "DE.Views.Toolbar.tipUndo": "Rückgängig machen",
-  "DE.Views.Toolbar.tipViewSettings": "Ansichts-Einstellungen",
   "DE.Views.Toolbar.txtScheme1": "Larissa",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/en.json

@@ -141,24 +141,27 @@
   "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.labelCoUsersDescr": "Document is currently being edited by several users.",
+  "Common.Views.Header.textAdvSettings": "Advanced settings",
   "Common.Views.Header.textBack": "Go to Documents",
+  "Common.Views.Header.textCompactView": "Hide Toolbar",
+  "Common.Views.Header.textHideLines": "Hide Rulers",
+  "Common.Views.Header.textHideStatusBar": "Hide Status Bar",
   "Common.Views.Header.textSaveBegin": "Saving...",
   "Common.Views.Header.textSaveChanged": "Modified",
   "Common.Views.Header.textSaveEnd": "All changes saved",
   "Common.Views.Header.textSaveExpander": "All changes saved",
+  "Common.Views.Header.textZoom": "Zoom",
   "Common.Views.Header.tipAccessRights": "Manage document access rights",
   "Common.Views.Header.tipDownload": "Download file",
   "Common.Views.Header.tipGoEdit": "Edit current file",
   "Common.Views.Header.tipPrint": "Print file",
+  "Common.Views.Header.tipRedo": "Redo",
+  "Common.Views.Header.tipSave": "Save",
+  "Common.Views.Header.tipUndo": "Undo",
+  "Common.Views.Header.tipViewSettings": "View settings",
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
-  "Common.Views.Header.textAdvSettings": "Advanced settings",
-  "Common.Views.Header.textCompactView": "Hide Toolbar",
-  "Common.Views.Header.textHideStatusBar": "Hide Status Bar",
-  "Common.Views.Header.textZoom": "Zoom",
-  "Common.Views.Header.tipViewSettings": "View settings",
-  "Common.Views.Header.textHideLines": "Hide Rulers",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
@@ -189,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
   "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtPreview": "Preview",
+  "Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
   "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
@@ -275,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Input signer name",
   "Common.Views.SignDialog.textItalic": "Italic",
   "Common.Views.SignDialog.textPurpose": "Purpose for signing this document",
+  "Common.Views.SignDialog.textSelect": "Select",
   "Common.Views.SignDialog.textSelectImage": "Select Image",
   "Common.Views.SignDialog.textSignature": "Signature looks as",
   "Common.Views.SignDialog.textTitle": "Sign Document",
@@ -291,7 +296,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer",
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
-  "Common.Views.SignSettingsDialog.textTitle": "Signature Settings",
+  "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
@@ -302,6 +307,7 @@
   "DE.Controllers.LeftMenu.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.Main.applyChangesTextText": "Loading the changes...",
   "DE.Controllers.Main.applyChangesTitleText": "Loading the Changes",
   "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
@@ -320,7 +326,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
@@ -787,16 +793,16 @@
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "DE.Controllers.Viewport.textFitPage": "Fit to Page",
   "DE.Controllers.Viewport.textFitWidth": "Fit to Width",
-  "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
-  "DE.Views.BookmarksDialog.textLocation": "Location",
-  "DE.Views.BookmarksDialog.textBookmarkName": "Bookmark name",
-  "DE.Views.BookmarksDialog.textSort": "Sort by",
-  "DE.Views.BookmarksDialog.textName": "Name",
   "DE.Views.BookmarksDialog.textAdd": "Add",
-  "DE.Views.BookmarksDialog.textGoto": "Go to",
-  "DE.Views.BookmarksDialog.textDelete": "Delete",
+  "DE.Views.BookmarksDialog.textBookmarkName": "Bookmark name",
   "DE.Views.BookmarksDialog.textClose": "Close",
+  "DE.Views.BookmarksDialog.textDelete": "Delete",
+  "DE.Views.BookmarksDialog.textGoto": "Go to",
   "DE.Views.BookmarksDialog.textHidden": "Hidden bookmarks",
+  "DE.Views.BookmarksDialog.textLocation": "Location",
+  "DE.Views.BookmarksDialog.textName": "Name",
+  "DE.Views.BookmarksDialog.textSort": "Sort by",
+  "DE.Views.BookmarksDialog.textTitle": "Bookmarks",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ChartSettings.textArea": "Area",
   "DE.Views.ChartSettings.textBar": "Bar",
@@ -916,6 +922,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribute rows",
   "DE.Views.DocumentHolder.textEditControls": "Content control settings",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Edit Wrap Boundary",
+  "DE.Views.DocumentHolder.textFromFile": "From File",
+  "DE.Views.DocumentHolder.textFromUrl": "From URL",
   "DE.Views.DocumentHolder.textNest": "Nest table",
   "DE.Views.DocumentHolder.textNextPage": "Next Page",
   "DE.Views.DocumentHolder.textPaste": "Paste",
@@ -923,6 +931,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Refresh field",
   "DE.Views.DocumentHolder.textRemove": "Remove",
   "DE.Views.DocumentHolder.textRemoveControl": "Remove content control",
+  "DE.Views.DocumentHolder.textReplace": "Replace image",
   "DE.Views.DocumentHolder.textSettings": "Settings",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Align Bottom",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Align Center",
@@ -1023,9 +1032,6 @@
   "DE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
-  "DE.Views.DocumentHolder.textReplace": "Replace image",
-  "DE.Views.DocumentHolder.textFromUrl": "From URL",
-  "DE.Views.DocumentHolder.textFromFile": "From File",
   "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
   "DE.Views.DropcapSettingsAdvanced.okButtonText": "Ok",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
@@ -1185,16 +1191,16 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Selected text fragment",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Display",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "External Link",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Place in Document",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "ScreenTip text",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Link to",
-  "DE.Views.HyperlinkSettingsDialog.txtEmpty": "This field is required",
-  "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
-  "DE.Views.HyperlinkSettingsDialog.textExternal": "External Link",
-  "DE.Views.HyperlinkSettingsDialog.textInternal": "Place in Document",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Beginning of document",
-  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Headings",
   "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Bookmarks",
+  "DE.Views.HyperlinkSettingsDialog.txtEmpty": "This field is required",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Headings",
+  "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
   "DE.Views.ImageSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ImageSettings.textEdit": "Edit",
   "DE.Views.ImageSettings.textEditObject": "Edit Object",
@@ -1286,12 +1292,14 @@
   "DE.Views.LeftMenu.tipAbout": "About",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comments",
+  "DE.Views.LeftMenu.tipNavigation": "Navigation",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Search",
   "DE.Views.LeftMenu.tipSupport": "Feedback & Support",
   "DE.Views.LeftMenu.tipTitles": "Titles",
   "DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
   "DE.Views.LeftMenu.txtTrial": "TRIAL MODE",
+  "DE.Views.Links.capBtnBookmarks": "Bookmark",
   "DE.Views.Links.capBtnContentsUpdate": "Refresh",
   "DE.Views.Links.capBtnInsContents": "Table of Contents",
   "DE.Views.Links.capBtnInsFootnote": "Footnote",
@@ -1305,12 +1313,11 @@
   "DE.Views.Links.textGotoFootnote": "Go to Footnotes",
   "DE.Views.Links.textUpdateAll": "Refresh entire table",
   "DE.Views.Links.textUpdatePages": "Refresh page numbers only",
+  "DE.Views.Links.tipBookmarks": "Create a bookmark",
   "DE.Views.Links.tipContents": "Insert table of contents",
   "DE.Views.Links.tipContentsUpdate": "Refresh table of contents",
   "DE.Views.Links.tipInsertHyperlink": "Add hyperlink",
   "DE.Views.Links.tipNotes": "Insert or edit footnotes",
-  "DE.Views.Links.capBtnBookmarks": "Bookmark",
-  "DE.Views.Links.tipBookmarks": "Create a bookmark",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
@@ -1368,7 +1375,7 @@
   "DE.Views.Navigation.txtEmpty": "This document doesn't contain headings",
   "DE.Views.Navigation.txtEmptyItem": "Empty Heading",
   "DE.Views.Navigation.txtExpand": "Expand all",
-  "DE.Views.Navigation.txtExpandToLevel": "Expand to level...",
+  "DE.Views.Navigation.txtExpandToLevel": "Expand to level",
   "DE.Views.Navigation.txtHeadingAfter": "New heading after",
   "DE.Views.Navigation.txtHeadingBefore": "New heading before",
   "DE.Views.Navigation.txtNewHeading": "New subheading",
@@ -1408,6 +1415,8 @@
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
   "DE.Views.PageSizeDialog.textWidth": "Width",
+  "DE.Views.PageSizeDialog.textPreset": "Preset",
+  "DE.Views.PageSizeDialog.txtCustom": "Custom",
   "DE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style",
@@ -1773,14 +1782,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "del_DE.Views.Toolbar.textCompactView": "Hide Toolbar",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
-  "del_DE.Views.Toolbar.textFitPage": "Fit to Page",
-  "del_DE.Views.Toolbar.textFitWidth": "Fit to Width",
-  "del_DE.Views.Toolbar.textHideLines": "Hide Rulers",
-  "del_DE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
-  "del_DE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
   "DE.Views.Toolbar.textInMargin": "In Margin",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageCount": "Insert number of pages",
@@ -1834,8 +1837,6 @@
   "DE.Views.Toolbar.textToCurrent": "To current position",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Underline",
-  "del_DE.Views.Toolbar.textZoom": "Zoom",
-  "del_DE.Views.Toolbar.tipAdvSettings": "Advanced settings",
   "DE.Views.Toolbar.tipAlignCenter": "Align center",
   "DE.Views.Toolbar.tipAlignJust": "Justified",
   "DE.Views.Toolbar.tipAlignLeft": "Align left",
@@ -1891,7 +1892,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting characters",
   "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
   "DE.Views.Toolbar.tipUndo": "Undo",
-  "del_DE.Views.Toolbar.tipViewSettings": "View settings",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/es.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Guardar y salir",
   "Common.Views.ExternalMergeEditor.textTitle": "Receptores de Fusión de Correo",
   "Common.Views.Header.labelCoUsersDescr": "El documento está siendo editado por múltiples usuarios.",
+  "Common.Views.Header.textAdvSettings": "Ajustes avanzados",
   "Common.Views.Header.textBack": "Ir a Documentos",
+  "Common.Views.Header.textCompactView": "Esconder barra de herramientas",
+  "Common.Views.Header.textHideLines": "Ocultar reglas",
+  "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado",
   "Common.Views.Header.textSaveBegin": "Guardando...",
   "Common.Views.Header.textSaveChanged": "Modificado",
   "Common.Views.Header.textSaveEnd": "Se guardaron todos los cambios",
   "Common.Views.Header.textSaveExpander": "Se guardaron todos los cambios",
+  "Common.Views.Header.textZoom": "Ampliación",
   "Common.Views.Header.tipAccessRights": "Gestionar derechos de acceso al documento",
   "Common.Views.Header.tipDownload": "Descargar archivo",
   "Common.Views.Header.tipGoEdit": "Editar archivo actual",
   "Common.Views.Header.tipPrint": "Imprimir archivo",
+  "Common.Views.Header.tipRedo": "Rehacer",
+  "Common.Views.Header.tipSave": "Guardar",
+  "Common.Views.Header.tipUndo": "Deshacer",
+  "Common.Views.Header.tipViewSettings": "Mostrar ajustes",
   "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento",
   "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso",
   "Common.Views.Header.txtRename": "Renombrar",
@@ -269,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Ingresar nombre de quien firma",
   "Common.Views.SignDialog.textItalic": "Itálica",
   "Common.Views.SignDialog.textPurpose": "Propósito al firmar este documento",
+  "Common.Views.SignDialog.textSelect": "Seleccionar",
   "Common.Views.SignDialog.textSelectImage": "Seleccionar Imagen",
   "Common.Views.SignDialog.textSignature": "La firma se ve como",
   "Common.Views.SignDialog.textTitle": "Firmar documento",
@@ -285,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Título de quien firma",
   "Common.Views.SignSettingsDialog.textInstructions": "Instrucciones para quien firma",
   "Common.Views.SignSettingsDialog.textShowDate": "Presentar fecha de la firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Configuración de firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Preparación de la firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "DE.Controllers.LeftMenu.leavePageText": "Todos los cambios no guardados de este documento se perderán.<br> Pulse \"Cancelar\" después \"Guardar\" para guardarlos. Pulse \"OK\" para deshacer todos los cambios no guardados.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento sin título",
@@ -314,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "El documento está protegido por una contraseña y no puede ser abierto.",
+  "DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.Controllers.Main.errorForceSave": "Ha ocurrido un error mientras",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",
@@ -779,6 +789,15 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Elipsis vertical",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Csi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Dseda",
+  "DE.Controllers.Viewport.textFitPage": "Ajustar a la página",
+  "DE.Controllers.Viewport.textFitWidth": "Ajustar al ancho",
+  "DE.Views.BookmarksDialog.textAdd": "Añadir",
+  "DE.Views.BookmarksDialog.textClose": "Cerrar",
+  "DE.Views.BookmarksDialog.textDelete": "Borrar",
+  "DE.Views.BookmarksDialog.textLocation": "Ubicación",
+  "DE.Views.BookmarksDialog.textName": "Nombre",
+  "DE.Views.BookmarksDialog.textSort": "Ordenar por",
+  "DE.Views.BookmarksDialog.textTitle": "Marcadores",
   "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
   "DE.Views.ChartSettings.textArea": "Área",
   "DE.Views.ChartSettings.textBar": "Barra",
@@ -898,6 +917,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribuir filas",
   "DE.Views.DocumentHolder.textEditControls": "Los ajustes del control de contenido",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Editar límite de ajuste",
+  "DE.Views.DocumentHolder.textFromFile": "De archivo",
+  "DE.Views.DocumentHolder.textFromUrl": "De URL",
   "DE.Views.DocumentHolder.textNest": "Tabla nido",
   "DE.Views.DocumentHolder.textNextPage": "Página siguiente",
   "DE.Views.DocumentHolder.textPaste": "Pegar",
@@ -905,6 +926,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Actualize el campo",
   "DE.Views.DocumentHolder.textRemove": "Eliminar",
   "DE.Views.DocumentHolder.textRemoveControl": "Elimine el control de contenido",
+  "DE.Views.DocumentHolder.textReplace": "Reemplazar imagen",
   "DE.Views.DocumentHolder.textSettings": "Ajustes",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Alinear en la parte inferior",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Alinear al centro",
@@ -1164,9 +1186,12 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "Aceptar",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto seleccionado",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Mostrar",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Enlace externo",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Configuración de hiperenlace",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Información en pantalla",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Enlace a",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Principio del documento",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Marcadores",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Este campo debe ser URL en el formato \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Mostrar ajustes avanzados",
@@ -1266,6 +1291,7 @@
   "DE.Views.LeftMenu.tipTitles": "Títulos",
   "DE.Views.LeftMenu.txtDeveloper": "MODO DE DESARROLLO",
   "DE.Views.LeftMenu.txtTrial": "MODO DE PRUEBA",
+  "DE.Views.Links.capBtnBookmarks": "Marcador",
   "DE.Views.Links.capBtnContentsUpdate": "Actualizar",
   "DE.Views.Links.capBtnInsContents": "Tabla de contenidos",
   "DE.Views.Links.capBtnInsFootnote": "Nota a pie de página",
@@ -1340,7 +1366,7 @@
   "DE.Views.Navigation.txtEmpty": "Este documento no",
   "DE.Views.Navigation.txtEmptyItem": "Encabezado vacío",
   "DE.Views.Navigation.txtExpand": "Expandir todo",
-  "DE.Views.Navigation.txtExpandToLevel": "Expandir a nivel...",
+  "DE.Views.Navigation.txtExpandToLevel": "Expandir a nivel",
   "DE.Views.Navigation.txtHeadingAfter": "Título nuevo después ",
   "DE.Views.Navigation.txtHeadingBefore": "Título nuevo antes",
   "DE.Views.Navigation.txtNewHeading": "Subtítulo nuevo",
@@ -1745,14 +1771,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Derecho",
   "DE.Views.Toolbar.textColumnsThree": "Tres",
   "DE.Views.Toolbar.textColumnsTwo": "Dos",
-  "DE.Views.Toolbar.textCompactView": "Ver Barra de herramientas compacta",
   "DE.Views.Toolbar.textContPage": "Página continua",
   "DE.Views.Toolbar.textEvenPage": "Página par",
-  "DE.Views.Toolbar.textFitPage": "Ajustar a la página",
-  "DE.Views.Toolbar.textFitWidth": "Ajustar a ancho",
-  "DE.Views.Toolbar.textHideLines": "Ocultar reglas",
-  "DE.Views.Toolbar.textHideStatusBar": "Ocultar barra de estado",
-  "DE.Views.Toolbar.textHideTitleBar": "Ocultar barra de título",
   "DE.Views.Toolbar.textInMargin": "En margen",
   "DE.Views.Toolbar.textInsColumnBreak": "Insertar Grieta de Columna",
   "DE.Views.Toolbar.textInsertPageCount": "Insertar el número de páginas",
@@ -1806,8 +1826,6 @@
   "DE.Views.Toolbar.textToCurrent": "A la posición actual",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Subrayado",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Ajustes avanzados",
   "DE.Views.Toolbar.tipAlignCenter": "Alinear al centro",
   "DE.Views.Toolbar.tipAlignJust": "Alineado",
   "DE.Views.Toolbar.tipAlignLeft": "Alinear a la izquierda",
@@ -1863,7 +1881,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caracteres no imprimibles",
   "DE.Views.Toolbar.tipSynchronize": "El documento ha sido cambiado por otro usuario. Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
   "DE.Views.Toolbar.tipUndo": "Deshacer",
-  "DE.Views.Toolbar.tipViewSettings": "Mostrar ajustes",
   "DE.Views.Toolbar.txtScheme1": "Oficina",
   "DE.Views.Toolbar.txtScheme10": "Intermedio",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/fr.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Enregistrer et quitter",
   "Common.Views.ExternalMergeEditor.textTitle": "Destinataires de fusion et publipostage",
   "Common.Views.Header.labelCoUsersDescr": "Le document est en cours de modification par plusieurs utilisateurs.",
+  "Common.Views.Header.textAdvSettings": "Paramètres avancés",
   "Common.Views.Header.textBack": "Aller aux Documents",
+  "Common.Views.Header.textCompactView": "Masquer la barre d'outils",
+  "Common.Views.Header.textHideLines": "Masquer les règles",
+  "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état",
   "Common.Views.Header.textSaveBegin": "Enregistrement en cours...",
   "Common.Views.Header.textSaveChanged": "Modifié",
   "Common.Views.Header.textSaveEnd": "Toutes les modifications ont été enregistrées",
   "Common.Views.Header.textSaveExpander": "Toutes les modifications ont été enregistrées",
+  "Common.Views.Header.textZoom": "Grossissement",
   "Common.Views.Header.tipAccessRights": "Gérer les droits d'accès au document",
   "Common.Views.Header.tipDownload": "Télécharger le fichier",
   "Common.Views.Header.tipGoEdit": "Modifier le fichier courant",
   "Common.Views.Header.tipPrint": "Imprimer le fichier",
+  "Common.Views.Header.tipRedo": "Rétablir",
+  "Common.Views.Header.tipSave": "Enregistrer",
+  "Common.Views.Header.tipUndo": "Annuler",
+  "Common.Views.Header.tipViewSettings": "Paramètres d'affichage",
   "Common.Views.Header.tipViewUsers": "Afficher les utilisateurs et gérer les droits d'accès aux documents",
   "Common.Views.Header.txtAccessRights": "Modifier les droits d'accès",
   "Common.Views.Header.txtRename": "Renommer",
@@ -187,7 +196,7 @@
   "Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé",
   "Common.Views.PasswordDialog.cancelButtonText": "Annuler",
   "Common.Views.PasswordDialog.okButtonText": "OK",
-  "Common.Views.PasswordDialog.txtDescription": "Un mot de passe est requis pour ouvrir ce document",
+  "Common.Views.PasswordDialog.txtDescription": "Indiquez un mot de passe pour protéger ce document",
   "Common.Views.PasswordDialog.txtIncorrectPwd": "Le mot de passe de confirmation n'est pas identique",
   "Common.Views.PasswordDialog.txtPassword": "Mot de passe",
   "Common.Views.PasswordDialog.txtRepeat": "Confirmer le mot de passe",
@@ -269,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Nom du signataire d'entrée",
   "Common.Views.SignDialog.textItalic": "Italique",
   "Common.Views.SignDialog.textPurpose": "But de la signature du document",
+  "Common.Views.SignDialog.textSelect": "Sélectionner",
   "Common.Views.SignDialog.textSelectImage": "Sélectionner une image",
   "Common.Views.SignDialog.textSignature": "La signature ressemble à",
   "Common.Views.SignDialog.textTitle": "Signer le document",
@@ -285,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titre du signataire",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions pour les signataires",
   "Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
-  "Common.Views.SignSettingsDialog.textTitle": "Paramètre de signature",
+  "Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
   "Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire.",
   "DE.Controllers.LeftMenu.leavePageText": "Toutes les modifications non enregistrées dans ce document seront perdus.<br> Cliquez sur \"Annuler\", puis \"Enregistrer\" pour les sauver. Cliquez sur \"OK\" pour annuler toutes les modifications non enregistrées.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Document sans nom",
@@ -314,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Le document est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
@@ -438,6 +448,8 @@
   "DE.Controllers.Main.warnNoLicense": "Cette version de ONLYOFFICE Editors a certaines limitations pour les connexions simultanées au serveur de documents.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
   "DE.Controllers.Main.warnNoLicenseUsers": "Cette version de ONLYOFFICE Editors a certaines limitations pour les utilisateurs simultanés.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
   "DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
+  "DE.Controllers.Navigation.txtBeginning": "Début du document",
+  "DE.Controllers.Navigation.txtGotoBeginning": "Aller au début du document",
   "DE.Controllers.Statusbar.textHasChanges": "Nouveaux changements ont été suivis",
   "DE.Controllers.Statusbar.textTrackChanges": "Le document est ouvert avec le mode Suivi des modifications activé",
   "DE.Controllers.Statusbar.tipReview": "Suivi des modifications",
@@ -777,6 +789,15 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Trois points verticaux",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zêta",
+  "DE.Controllers.Viewport.textFitPage": "Ajuster à la page",
+  "DE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur",
+  "DE.Views.BookmarksDialog.textAdd": "Ajouter",
+  "DE.Views.BookmarksDialog.textClose": "Fermer",
+  "DE.Views.BookmarksDialog.textDelete": "Supprimer",
+  "DE.Views.BookmarksDialog.textLocation": "Emplacement",
+  "DE.Views.BookmarksDialog.textName": "Nom",
+  "DE.Views.BookmarksDialog.textSort": "Trier par",
+  "DE.Views.BookmarksDialog.textTitle": "Signets",
   "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.ChartSettings.textArea": "En aires",
   "DE.Views.ChartSettings.textBar": "En barre",
@@ -896,6 +917,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribuer les lignes",
   "DE.Views.DocumentHolder.textEditControls": "Paramètres de contrôle du contenu",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Modifier les limites du renvoi à la ligne",
+  "DE.Views.DocumentHolder.textFromFile": "D'un fichier",
+  "DE.Views.DocumentHolder.textFromUrl": "D'une URL",
   "DE.Views.DocumentHolder.textNest": "Tableau imbriqué",
   "DE.Views.DocumentHolder.textNextPage": "Page suivante",
   "DE.Views.DocumentHolder.textPaste": "Coller",
@@ -903,6 +926,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Actualiser le champ",
   "DE.Views.DocumentHolder.textRemove": "Supprimer",
   "DE.Views.DocumentHolder.textRemoveControl": "Supprimer le contrôle du contenu",
+  "DE.Views.DocumentHolder.textReplace": "Remplacer l’image",
   "DE.Views.DocumentHolder.textSettings": "Paramètres",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Aligner en bas",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Aligner au centre",
@@ -1162,10 +1186,15 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "Ok",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragment du texte sélectionné",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Afficher",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Lien externe",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Endroit dans le document",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Paramètres du lien hypertexte",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Texte de l'info-bulle ",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Lien vers",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Début du document",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Signets",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "En-têtes",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.ImageSettings.textEdit": "Modifier",
@@ -1264,6 +1293,7 @@
   "DE.Views.LeftMenu.tipTitles": "Titres",
   "DE.Views.LeftMenu.txtDeveloper": "MODE DEVELOPPEUR",
   "DE.Views.LeftMenu.txtTrial": "MODE DEMO",
+  "DE.Views.Links.capBtnBookmarks": "Signet",
   "DE.Views.Links.capBtnContentsUpdate": "Actualiser",
   "DE.Views.Links.capBtnInsContents": "Table des matières",
   "DE.Views.Links.capBtnInsFootnote": "Note de bas de page",
@@ -1334,7 +1364,15 @@
   "DE.Views.MailMergeSettings.txtUntitled": "Sans titre",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Fusion a échoué",
   "DE.Views.Navigation.txtCollapse": "Réduire tout",
+  "DE.Views.Navigation.txtDemote": "Dégrader",
+  "DE.Views.Navigation.txtEmpty": "Ce document ne contient pas d'en-têtes",
+  "DE.Views.Navigation.txtEmptyItem": "En-tête vide",
   "DE.Views.Navigation.txtExpand": "Développer tout",
+  "DE.Views.Navigation.txtHeadingAfter": "Nouvel en-tête après",
+  "DE.Views.Navigation.txtHeadingBefore": "Nouvel en-tête avant",
+  "DE.Views.Navigation.txtNewHeading": "Nouveau sous-titre",
+  "DE.Views.Navigation.txtPromote": "Promouvoir",
+  "DE.Views.Navigation.txtSelect": "Sélectionner le contenu",
   "DE.Views.NoteSettingsDialog.textApply": "Appliquer",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Appliquer les modifications",
   "DE.Views.NoteSettingsDialog.textCancel": "Annuler",
@@ -1734,14 +1772,8 @@
   "DE.Views.Toolbar.textColumnsRight": "A droite",
   "DE.Views.Toolbar.textColumnsThree": "Trois",
   "DE.Views.Toolbar.textColumnsTwo": "Deux",
-  "DE.Views.Toolbar.textCompactView": "Afficher la barre d'outils compacte",
   "DE.Views.Toolbar.textContPage": "Page continue",
   "DE.Views.Toolbar.textEvenPage": "Page paire",
-  "DE.Views.Toolbar.textFitPage": "Ajuster à la page",
-  "DE.Views.Toolbar.textFitWidth": "Ajuster à la largeur",
-  "DE.Views.Toolbar.textHideLines": "Masquer les règles",
-  "DE.Views.Toolbar.textHideStatusBar": "Masquer la barre d'état",
-  "DE.Views.Toolbar.textHideTitleBar": "Masquer la barre de titres",
   "DE.Views.Toolbar.textInMargin": "Dans la Marge",
   "DE.Views.Toolbar.textInsColumnBreak": "Insérer un saut de colonne",
   "DE.Views.Toolbar.textInsertPageCount": "Insérer le nombre de pages",
@@ -1795,8 +1827,6 @@
   "DE.Views.Toolbar.textToCurrent": "À la position actuelle",
   "DE.Views.Toolbar.textTop": "En haut: ",
   "DE.Views.Toolbar.textUnderline": "Souligné",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Paramètres avancés",
   "DE.Views.Toolbar.tipAlignCenter": "Aligner au centre",
   "DE.Views.Toolbar.tipAlignJust": "Justifié",
   "DE.Views.Toolbar.tipAlignLeft": "Aligner à gauche",
@@ -1852,7 +1882,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caractères non imprimables",
   "DE.Views.Toolbar.tipSynchronize": "Le document a été modifié par un autre utilisateur. Cliquez pour enregistrer vos modifications et recharger des mises à jour.",
   "DE.Views.Toolbar.tipUndo": "Annuler",
-  "DE.Views.Toolbar.tipViewSettings": "Voir paramètres d'affichage",
   "DE.Views.Toolbar.txtScheme1": "Bureau",
   "DE.Views.Toolbar.txtScheme10": "Médian",
   "DE.Views.Toolbar.txtScheme11": "Métro",

apps/documenteditor/main/locale/it.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.labelCoUsersDescr": "È in corso la modifica del documento da parte di più utenti.",
+  "Common.Views.Header.textAdvSettings": "Impostazioni avanzate",
   "Common.Views.Header.textBack": "Va' ai Documenti",
+  "Common.Views.Header.textCompactView": "Mostra barra degli strumenti compatta",
+  "Common.Views.Header.textHideLines": "Nascondi righelli",
+  "Common.Views.Header.textHideStatusBar": "Nascondi barra di stato",
   "Common.Views.Header.textSaveBegin": "Salvataggio in corso...",
   "Common.Views.Header.textSaveChanged": "Modificato",
   "Common.Views.Header.textSaveEnd": "Tutte le modifiche sono state salvate",
   "Common.Views.Header.textSaveExpander": "Tutte le modifiche sono state salvate",
+  "Common.Views.Header.textZoom": "Ingrandimento",
   "Common.Views.Header.tipAccessRights": "Gestisci i diritti di accesso al documento",
   "Common.Views.Header.tipDownload": "Scarica file",
   "Common.Views.Header.tipGoEdit": "Modifica il file corrente",
   "Common.Views.Header.tipPrint": "Stampa file",
+  "Common.Views.Header.tipRedo": "Ripristina",
+  "Common.Views.Header.tipSave": "Salva",
+  "Common.Views.Header.tipUndo": "Annulla",
+  "Common.Views.Header.tipViewSettings": "Mostra impostazioni",
   "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento",
   "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso",
   "Common.Views.Header.txtRename": "Rinomina",
@@ -269,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Inserisci nome firmatario",
   "Common.Views.SignDialog.textItalic": "Corsivo",
   "Common.Views.SignDialog.textPurpose": "Motivo della firma del documento",
+  "Common.Views.SignDialog.textSelect": "Seleziona",
   "Common.Views.SignDialog.textSelectImage": "Seleziona Immagine",
   "Common.Views.SignDialog.textSignature": "La firma appare come",
   "Common.Views.SignDialog.textTitle": "Firma Documento",
@@ -285,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titolo del Firmatario",
   "Common.Views.SignSettingsDialog.textInstructions": "Istruzioni per i Firmatari",
   "Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni della Firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
   "DE.Controllers.LeftMenu.leavePageText": "Tutte le modifiche non salvate nel documento verranno perse.<br> Clicca \"Annulla\" e poi \"Salva\" per salvarle. Clicca \"OK\" per annullare tutte le modifiche non salvate.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome",
@@ -314,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Il documento è protetto da una password. Impossibile aprirlo.",
+  "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.Controllers.Main.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
@@ -777,6 +787,15 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "Adatta alla pagina",
+  "DE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza",
+  "DE.Views.BookmarksDialog.textAdd": "Aggiungi",
+  "DE.Views.BookmarksDialog.textClose": "Chiudi",
+  "DE.Views.BookmarksDialog.textDelete": "Elimina",
+  "DE.Views.BookmarksDialog.textLocation": "Percorso",
+  "DE.Views.BookmarksDialog.textName": "Nome",
+  "DE.Views.BookmarksDialog.textSort": "Ordina per",
+  "DE.Views.BookmarksDialog.textTitle": "Segnalibri",
   "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
   "DE.Views.ChartSettings.textArea": "Aerogramma",
   "DE.Views.ChartSettings.textBar": "A barre",
@@ -896,12 +915,15 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribuisci righe",
   "DE.Views.DocumentHolder.textEditControls": "Impostazioni di controllo del contenuto",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Modifica bordi disposizione testo",
+  "DE.Views.DocumentHolder.textFromFile": "Da file",
+  "DE.Views.DocumentHolder.textFromUrl": "Da URL",
   "DE.Views.DocumentHolder.textNest": "Tabella nidificata",
   "DE.Views.DocumentHolder.textNextPage": "Pagina successiva",
   "DE.Views.DocumentHolder.textPaste": "Incolla",
   "DE.Views.DocumentHolder.textPrevPage": "Pagina precedente",
   "DE.Views.DocumentHolder.textRemove": "Elimina",
   "DE.Views.DocumentHolder.textRemoveControl": "Rimuovi il controllo del contenuto",
+  "DE.Views.DocumentHolder.textReplace": "Sostituisci immagine",
   "DE.Views.DocumentHolder.textSettings": "Impostazioni",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Allinea in basso",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Allinea al centro",
@@ -1160,9 +1182,11 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Testo selezionato",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Visualizza",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Collegamento esterno",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Impostazioni collegamento ipertestuale",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Testo del suggerimento",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Collega a",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Segnalibri",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Questo campo è richiesto",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Il formato URL richiesto è \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Mostra impostazioni avanzate",
@@ -1262,6 +1286,7 @@
   "DE.Views.LeftMenu.tipTitles": "Titoli",
   "DE.Views.LeftMenu.txtDeveloper": "MODALITÀ SVILUPPATORE",
   "DE.Views.LeftMenu.txtTrial": "Modalità di prova",
+  "DE.Views.Links.capBtnBookmarks": "Segnalibro",
   "DE.Views.Links.capBtnContentsUpdate": "Aggiorna",
   "DE.Views.Links.capBtnInsContents": "Sommario",
   "DE.Views.Links.capBtnInsFootnote": "Nota a piè di pagina",
@@ -1732,14 +1757,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Mostra barra degli strumenti compatta",
   "DE.Views.Toolbar.textContPage": "Pagina continua",
   "DE.Views.Toolbar.textEvenPage": "Pagina pari",
-  "DE.Views.Toolbar.textFitPage": "Adatta alla pagina",
-  "DE.Views.Toolbar.textFitWidth": "Adatta alla larghezza",
-  "DE.Views.Toolbar.textHideLines": "Nascondi righelli",
-  "DE.Views.Toolbar.textHideStatusBar": "Nascondi barra di stato",
-  "DE.Views.Toolbar.textHideTitleBar": "Nascondi barra di titolo",
   "DE.Views.Toolbar.textInMargin": "Nel margine",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageCount": "Inserisci numero delle pagine",
@@ -1792,8 +1811,6 @@
   "DE.Views.Toolbar.textToCurrent": "Alla posizione corrente",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Sottolineato",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Impostazioni avanzate",
   "DE.Views.Toolbar.tipAlignCenter": "Allinea al centro",
   "DE.Views.Toolbar.tipAlignJust": "Giustifica",
   "DE.Views.Toolbar.tipAlignLeft": "Allinea a sinistra",
@@ -1849,7 +1866,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caratteri non stampabili",
   "DE.Views.Toolbar.tipSynchronize": "Il documento è stato modificato da un altro utente. Clicca per salvare le modifiche e ricaricare gli aggiornamenti.",
   "DE.Views.Toolbar.tipUndo": "Annulla",
-  "DE.Views.Toolbar.tipViewSettings": "Mostra impostazioni",
   "DE.Views.Toolbar.txtScheme1": "Ufficio",
   "DE.Views.Toolbar.txtScheme10": "Luna",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/ja.json

@@ -1373,14 +1373,8 @@
   "DE.Views.Toolbar.textColumnsRight": "右に",
   "DE.Views.Toolbar.textColumnsThree": "三",
   "DE.Views.Toolbar.textColumnsTwo": "二",
-  "DE.Views.Toolbar.textCompactView": "コンパクトのツールバー",
   "DE.Views.Toolbar.textContPage": "連続ページ表示",
   "DE.Views.Toolbar.textEvenPage": "偶数ページから開始",
-  "DE.Views.Toolbar.textFitPage": "ページに合わせる",
-  "DE.Views.Toolbar.textFitWidth": "幅を合わせる",
-  "DE.Views.Toolbar.textHideLines": "ルーラーを表示しない",
-  "DE.Views.Toolbar.textHideStatusBar": "ステータスバーを表示しない",
-  "DE.Views.Toolbar.textHideTitleBar": "タイトルバーを表示しない",
   "DE.Views.Toolbar.textInMargin": "余白",
   "DE.Views.Toolbar.textInsColumnBreak": "段区切りの挿入",
   "DE.Views.Toolbar.textInsertPageNumber": "ページ番号の挿入",
@@ -1419,8 +1413,6 @@
   "DE.Views.Toolbar.textToCurrent": "現在の場所",
   "DE.Views.Toolbar.textTop": "トップ：",
   "DE.Views.Toolbar.textUnderline": "下線",
-  "DE.Views.Toolbar.textZoom": "ズーム",
-  "DE.Views.Toolbar.tipAdvSettings": "詳細設定",
   "DE.Views.Toolbar.tipAlignCenter": "中央揃え",
   "DE.Views.Toolbar.tipAlignJust": "両端揃え",
   "DE.Views.Toolbar.tipAlignLeft": "左揃え",
@@ -1468,7 +1460,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "編集記号の表示",
   "DE.Views.Toolbar.tipSynchronize": "ドキュメントは他のユーザーによって変更されました。変更を保存するためにここでクリックし、アップデートを再ロードしてください。",
   "DE.Views.Toolbar.tipUndo": "元に戻す",
-  "DE.Views.Toolbar.tipViewSettings": "設定の表示",
   "DE.Views.Toolbar.txtScheme1": "オフィス",
   "DE.Views.Toolbar.txtScheme10": "デザート",
   "DE.Views.Toolbar.txtScheme11": "メトロ",

apps/documenteditor/main/locale/ko.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "저장 및 종료",
   "Common.Views.ExternalMergeEditor.textTitle": "편지 병합받는 사람",
   "Common.Views.Header.labelCoUsersDescr": "문서는 현재 여러 사용자가 편집하고 있습니다.",
+  "Common.Views.Header.textAdvSettings": "고급 설정",
   "Common.Views.Header.textBack": "문서로 이동",
+  "Common.Views.Header.textCompactView": "보기 컴팩트 도구 모음",
+  "Common.Views.Header.textHideLines": "눈금자 숨기기",
+  "Common.Views.Header.textHideStatusBar": "상태 표시 줄 숨기기",
   "Common.Views.Header.textSaveBegin": "저장 중 ...",
   "Common.Views.Header.textSaveChanged": "수정된",
   "Common.Views.Header.textSaveEnd": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.textSaveExpander": "모든 변경 사항이 저장되었습니다",
+  "Common.Views.Header.textZoom": "확대 / 축소",
   "Common.Views.Header.tipAccessRights": "문서 액세스 권한 관리",
   "Common.Views.Header.tipDownload": "파일을 다운로드",
   "Common.Views.Header.tipGoEdit": "현재 파일 편집",
   "Common.Views.Header.tipPrint": "파일 출력",
+  "Common.Views.Header.tipRedo": "다시 실행",
+  "Common.Views.Header.tipSave": "저장",
+  "Common.Views.Header.tipUndo": "실행 취소",
+  "Common.Views.Header.tipViewSettings": "보기 설정",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
   "Common.Views.Header.txtRename": "이름 바꾸기",
@@ -269,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
   "Common.Views.SignDialog.textItalic": "이탈릭",
   "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelect": "선택",
   "Common.Views.SignDialog.textSelectImage": "이미지 선택",
   "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
   "Common.Views.SignDialog.textTitle": "서명문서",
@@ -285,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
   "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
   "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
-  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 셋업",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "DE.Controllers.LeftMenu.leavePageText": "이 문서의 모든 저장되지 않은 변경 사항이 손실됩니다. <br>취소 를 클릭 한 다음저장 \"을 클릭하여 저장하십시오. 저장되지 않은 변경 사항. ",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
@@ -314,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
-  "DE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "DE.Controllers.Main.errorFilePassProtect": "문서가 암호로 보호되어 있습니다.",
   "DE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "DE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "DE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",
@@ -779,6 +789,15 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "세로 줄임표",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "페이지에 맞춤",
+  "DE.Controllers.Viewport.textFitWidth": "너비에 맞춤",
+  "DE.Views.BookmarksDialog.textAdd": "추가",
+  "DE.Views.BookmarksDialog.textClose": "닫기",
+  "DE.Views.BookmarksDialog.textDelete": "삭제",
+  "DE.Views.BookmarksDialog.textLocation": "위치",
+  "DE.Views.BookmarksDialog.textName": "이름",
+  "DE.Views.BookmarksDialog.textSort": "정렬",
+  "DE.Views.BookmarksDialog.textTitle": "책갈피",
   "DE.Views.ChartSettings.textAdvanced": "고급 설정 표시",
   "DE.Views.ChartSettings.textArea": "영역",
   "DE.Views.ChartSettings.textBar": "Bar",
@@ -898,6 +917,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "행 배포",
   "DE.Views.DocumentHolder.textEditControls": "콘텐트 제어 세팅",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "둘러싸 기 경계 편집",
+  "DE.Views.DocumentHolder.textFromFile": "파일로부터",
+  "DE.Views.DocumentHolder.textFromUrl": "URL로부터",
   "DE.Views.DocumentHolder.textNest": "네스트 테이블",
   "DE.Views.DocumentHolder.textNextPage": "다음 페이지",
   "DE.Views.DocumentHolder.textPaste": "붙여 넣기",
@@ -905,6 +926,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "필드 새로고침",
   "DE.Views.DocumentHolder.textRemove": "삭제",
   "DE.Views.DocumentHolder.textRemoveControl": "콘텐트 제어 삭제",
+  "DE.Views.DocumentHolder.textReplace": "이미지 바꾸기",
   "DE.Views.DocumentHolder.textSettings": "설정",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "아래쪽 정렬",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "정렬 중심",
@@ -1164,9 +1186,12 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "선택한 텍스트 조각",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "표시",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "외부 링크",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "하이퍼 링크 설정",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "스크린 팁 텍스트",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "링크 대상",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "문서의 시작",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "책갈피",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "이 입력란은 필수 항목입니다.",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다.",
   "DE.Views.ImageSettings.textAdvanced": "고급 설정 표시",
@@ -1266,6 +1291,7 @@
   "DE.Views.LeftMenu.tipTitles": "제목",
   "DE.Views.LeftMenu.txtDeveloper": "개발자 모드",
   "DE.Views.LeftMenu.txtTrial": "시험 모드",
+  "DE.Views.Links.capBtnBookmarks": "책갈피",
   "DE.Views.Links.capBtnContentsUpdate": "재실행",
   "DE.Views.Links.capBtnInsContents": "콘텍츠 테이블",
   "DE.Views.Links.capBtnInsFootnote": "각주",
@@ -1340,7 +1366,7 @@
   "DE.Views.Navigation.txtEmpty": "이 문서는 헤딩을 포함하지 않음",
   "DE.Views.Navigation.txtEmptyItem": "머리말 없슴",
   "DE.Views.Navigation.txtExpand": "모두 확장",
-  "DE.Views.Navigation.txtExpandToLevel": "레벨로 확장하기...",
+  "DE.Views.Navigation.txtExpandToLevel": "레벨로 확장하기",
   "DE.Views.Navigation.txtHeadingAfter": "뒤에 신규 머리글 ",
   "DE.Views.Navigation.txtHeadingBefore": "전에 신규 머리글 ",
   "DE.Views.Navigation.txtNewHeading": "신규 서브헤딩",
@@ -1745,14 +1771,8 @@
   "DE.Views.Toolbar.textColumnsRight": "오른쪽",
   "DE.Views.Toolbar.textColumnsThree": "3",
   "DE.Views.Toolbar.textColumnsTwo": "2",
-  "DE.Views.Toolbar.textCompactView": "보기 컴팩트 도구 모음",
   "DE.Views.Toolbar.textContPage": "연속 페이지",
   "DE.Views.Toolbar.textEvenPage": "짝수 페이지",
-  "DE.Views.Toolbar.textFitPage": "페이지에 맞춤",
-  "DE.Views.Toolbar.textFitWidth": "너비에 맞춤",
-  "DE.Views.Toolbar.textHideLines": "눈금자 숨기기",
-  "DE.Views.Toolbar.textHideStatusBar": "상태 표시 줄 숨기기",
-  "DE.Views.Toolbar.textHideTitleBar": "제목 표시 줄 숨기기",
   "DE.Views.Toolbar.textInMargin": "여백 있음",
   "DE.Views.Toolbar.textInsColumnBreak": "열 구분 삽입",
   "DE.Views.Toolbar.textInsertPageCount": "페이지 수 삽입",
@@ -1806,8 +1826,6 @@
   "DE.Views.Toolbar.textToCurrent": "현재 위치로",
   "DE.Views.Toolbar.textTop": "Top :",
   "DE.Views.Toolbar.textUnderline": "밑줄",
-  "DE.Views.Toolbar.textZoom": "확대 / 축소",
-  "DE.Views.Toolbar.tipAdvSettings": "고급 설정",
   "DE.Views.Toolbar.tipAlignCenter": "Align Center",
   "DE.Views.Toolbar.tipAlignJust": "Justified",
   "DE.Views.Toolbar.tipAlignLeft": "왼쪽 정렬",
@@ -1863,7 +1881,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "인쇄되지 않는 문자",
   "DE.Views.Toolbar.tipSynchronize": "다른 사용자가 문서를 변경했습니다. 변경 사항을 저장하고 업데이트를 다시로드하려면 클릭하십시오.",
   "DE.Views.Toolbar.tipUndo": "실행 취소",
-  "DE.Views.Toolbar.tipViewSettings": "보기 설정",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "중앙값",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/lv.json

@@ -141,15 +141,21 @@
   "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.labelCoUsersDescr": "Šobrīd dokumentu rediģē vairāki lietotāji.",
+  "Common.Views.Header.textAdvSettings": "Papildu iestatījumi",
   "Common.Views.Header.textBack": "Iet uz Dokumenti",
+  "Common.Views.Header.textCompactView": "Slēpt rīkjoslu",
   "Common.Views.Header.textSaveBegin": "Saglabā ...",
   "Common.Views.Header.textSaveChanged": "Pārveidots",
   "Common.Views.Header.textSaveEnd": "Visas izmaiņas saglabātas",
   "Common.Views.Header.textSaveExpander": "Visas izmaiņas saglabātas",
+  "Common.Views.Header.textZoom": "Palielināšana",
   "Common.Views.Header.tipAccessRights": "Pārvaldīt dokumenta piekļuves tiesības",
   "Common.Views.Header.tipDownload": "Lejupielādēt failu",
   "Common.Views.Header.tipGoEdit": "Rediģēt šībrīža failu",
   "Common.Views.Header.tipPrint": "Drukāt failu",
+  "Common.Views.Header.tipRedo": "Pārtaisīt",
+  "Common.Views.Header.tipSave": "Saglabāt",
+  "Common.Views.Header.tipUndo": "Atsaukt",
   "Common.Views.Header.tipViewUsers": "Apskatīt lietotājus un pārvaldīt dokumentu piekļuves tiesības",
   "Common.Views.Header.txtAccessRights": "Izmainīt pieejas tiesības",
   "Common.Views.Header.txtRename": "Pārdēvēt",
@@ -269,6 +275,7 @@
   "Common.Views.SignDialog.textInputName": "Ievadiet parakstītāja vārdu",
   "Common.Views.SignDialog.textItalic": "Kursīvs",
   "Common.Views.SignDialog.textPurpose": "Šī dokumenta parakstīšanas mērķis",
+  "Common.Views.SignDialog.textSelect": "Izvēlēties",
   "Common.Views.SignDialog.textSelectImage": "Izvēlēties attēlu",
   "Common.Views.SignDialog.textSignature": "Kā izskatās paraksts",
   "Common.Views.SignDialog.textTitle": "Parakstīt dokumentu",
@@ -285,7 +292,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Parakstītāja amats",
   "Common.Views.SignSettingsDialog.textInstructions": "Norādījumi parakstītājam",
   "Common.Views.SignSettingsDialog.textShowDate": "Rādīt datumu paraksta līnijā",
-  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādījumi",
+  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādīšana",
   "Common.Views.SignSettingsDialog.txtEmpty": "Šis lauks ir jāaizpilda",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Dokuments bez nosaukuma",
@@ -314,7 +321,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "DE.Controllers.Main.errorFilePassProtect": "Fails ir aizsargāts ar paroli un to nevar atvērt.",
   "DE.Controllers.Main.errorForceSave": "Faila noglabāšanas laikā radās kļūda. Lūdzu, izmantojiet iespēju \"Lejupielādēt kā\", lai noglabātu failu datora cietajā diskā, vai mēģiniet vēlāk vēlreiz.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
@@ -779,6 +786,15 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "Saskaņot ar lapu",
+  "DE.Controllers.Viewport.textFitWidth": "Saskaņot ar platumu",
+  "DE.Views.BookmarksDialog.textAdd": "Pievienot",
+  "DE.Views.BookmarksDialog.textClose": "Aizvērt",
+  "DE.Views.BookmarksDialog.textDelete": "Izdzēst",
+  "DE.Views.BookmarksDialog.textLocation": "Novietojums",
+  "DE.Views.BookmarksDialog.textName": "Nosaukums",
+  "DE.Views.BookmarksDialog.textSort": "Šķirot pēc",
+  "DE.Views.BookmarksDialog.textTitle": "Grāmatzīmes",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ChartSettings.textArea": "Area Chart",
   "DE.Views.ChartSettings.textBar": "Bar Chart",
@@ -898,6 +914,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Izplatīt rindas",
   "DE.Views.DocumentHolder.textEditControls": "Satura kontroles uzstādījumi",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Edit Wrap Boundary",
+  "DE.Views.DocumentHolder.textFromFile": "No faila",
+  "DE.Views.DocumentHolder.textFromUrl": "No URL",
   "DE.Views.DocumentHolder.textNest": "Tabula tabulā",
   "DE.Views.DocumentHolder.textNextPage": "Next Page",
   "DE.Views.DocumentHolder.textPaste": "Paste",
@@ -905,6 +923,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Atsvaidzināt lauku",
   "DE.Views.DocumentHolder.textRemove": "Dzēst",
   "DE.Views.DocumentHolder.textRemoveControl": "Noņemt satura kontroles elementu",
+  "DE.Views.DocumentHolder.textReplace": "Aizvietot attēlu",
   "DE.Views.DocumentHolder.textSettings": "Iestatījumi",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Align Bottom",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Align Center",
@@ -1164,9 +1183,12 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "Ok",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Atlasīts teksta fragments",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Radīt",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Ārējā saite",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Ekrāna padomu teksts",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Saistīt ar",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Dokumenta sākums",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Grāmatzīmes",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Šis lauks ir nepieciešams",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Šis lauks jābūt URL formātā \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Radīt papildu iestatījumus",
@@ -1266,6 +1288,7 @@
   "DE.Views.LeftMenu.tipTitles": "Nosaukumi",
   "DE.Views.LeftMenu.txtDeveloper": "IZSTRĀDĀTĀJA REŽĪMS",
   "DE.Views.LeftMenu.txtTrial": "IZMĒĢINĀJUMA REŽĪMS",
+  "DE.Views.Links.capBtnBookmarks": "Grāmatzīme",
   "DE.Views.Links.capBtnContentsUpdate": "Atsvaidzināt",
   "DE.Views.Links.capBtnInsContents": "Satura rādītājs",
   "DE.Views.Links.capBtnInsFootnote": "Apakšējā piezīme",
@@ -1340,7 +1363,7 @@
   "DE.Views.Navigation.txtEmpty": "Šajā dokumentā nav virsrakstu",
   "DE.Views.Navigation.txtEmptyItem": "Tukšs virsraksts",
   "DE.Views.Navigation.txtExpand": "Parādīt visas",
-  "DE.Views.Navigation.txtExpandToLevel": "Parādīt līdz līmenim...",
+  "DE.Views.Navigation.txtExpandToLevel": "Parādīt līdz līmenim",
   "DE.Views.Navigation.txtHeadingAfter": "Jauns virsraksts pēc",
   "DE.Views.Navigation.txtHeadingBefore": "Jauns virsraksts pirms",
   "DE.Views.Navigation.txtNewHeading": "Jauns apakšvirsraksts",
@@ -1745,14 +1768,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "View Compact Toolbar",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
-  "DE.Views.Toolbar.textFitPage": "Fit Page",
-  "DE.Views.Toolbar.textFitWidth": "Fit Width",
-  "DE.Views.Toolbar.textHideLines": "Hide Lines",
-  "DE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
-  "DE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
   "DE.Views.Toolbar.textInMargin": "In Margin",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageCount": "Ievietot lappušu skaitu",
@@ -1806,8 +1823,6 @@
   "DE.Views.Toolbar.textToCurrent": "Uz šo poziciju",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Pasvītrots",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Advanced Settings",
   "DE.Views.Toolbar.tipAlignCenter": "Līdzināt pa centru",
   "DE.Views.Toolbar.tipAlignJust": "Pamatoti",
   "DE.Views.Toolbar.tipAlignLeft": "Līdzināt pa kreisi",
@@ -1863,7 +1878,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Nedrukājamās rakstzīmes",
   "DE.Views.Toolbar.tipSynchronize": "Dokumentu mainīja cits lietotājs. Lūdzu, noklikšķiniet, lai saglabātu izmaiņas un pārlādēt atjauninājumus.",
   "DE.Views.Toolbar.tipUndo": "Undo",
-  "DE.Views.Toolbar.tipViewSettings": "View Settings",
   "DE.Views.Toolbar.txtScheme1": "Jewels",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/nl.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Opslaan en afsluiten",
   "Common.Views.ExternalMergeEditor.textTitle": "Geadresseerden voor Afdruk samenvoegen",
   "Common.Views.Header.labelCoUsersDescr": "Document wordt op dit moment bewerkt door verschillende gebruikers.",
+  "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen",
   "Common.Views.Header.textBack": "Naar documenten",
+  "Common.Views.Header.textCompactView": "Werkbalk Verbergen",
+  "Common.Views.Header.textHideLines": "Linialen verbergen",
+  "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen",
   "Common.Views.Header.textSaveBegin": "Opslaan...",
   "Common.Views.Header.textSaveChanged": "Gewijzigd",
   "Common.Views.Header.textSaveEnd": "Alle wijzigingen zijn opgeslagen",
   "Common.Views.Header.textSaveExpander": "Alle wijzigingen zijn opgeslagen",
+  "Common.Views.Header.textZoom": "Zoomen",
   "Common.Views.Header.tipAccessRights": "Toegangsrechten van documenten beheren",
   "Common.Views.Header.tipDownload": "Bestand downloaden",
   "Common.Views.Header.tipGoEdit": "Huidig bestand bewerken",
   "Common.Views.Header.tipPrint": "Bestand afdrukken",
+  "Common.Views.Header.tipRedo": "Opnieuw",
+  "Common.Views.Header.tipSave": "Opslaan",
+  "Common.Views.Header.tipUndo": "Ongedaan maken",
+  "Common.Views.Header.tipViewSettings": "Weergave-instellingen",
   "Common.Views.Header.tipViewUsers": "Gebruikers weergeven en toegangsrechten voor documenten beheren",
   "Common.Views.Header.txtAccessRights": "Toegangsrechten wijzigen",
   "Common.Views.Header.txtRename": "Hernoemen",
@@ -269,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Naam ondertekenaar invoeren",
   "Common.Views.SignDialog.textItalic": "Cursief",
   "Common.Views.SignDialog.textPurpose": "Doel voor het ondertekenen van dit document",
+  "Common.Views.SignDialog.textSelect": "Selecteren",
   "Common.Views.SignDialog.textSelectImage": "Selecteer afbeelding",
   "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
   "Common.Views.SignDialog.textTitle": "Onderteken document",
@@ -285,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Ondertekenaar titel",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructies voor ondertekenaar",
   "Common.Views.SignSettingsDialog.textShowDate": "Toon signeer datum in handtekening regel",
-  "Common.Views.SignSettingsDialog.textTitle": "Handtekening instellingen",
+  "Common.Views.SignSettingsDialog.textTitle": "Handtekening opzet",
   "Common.Views.SignSettingsDialog.txtEmpty": "Dit veld is vereist",
   "DE.Controllers.LeftMenu.leavePageText": "Alle niet-opgeslagen wijzigingen in dit document zullen verloren gaan.<br/> Klik op \"Annuleren\" en dan op \"Opslaan\" om de wijzigingen op te slaan. Klik \"OK\" om de wijzigingen te negeren.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Naamloos document",
@@ -314,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Het document is beschermd met een wachtwoord en kan niet worden geopend.",
+  "DE.Controllers.Main.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.",
   "DE.Controllers.Main.errorForceSave": "Er is een fout ontstaan bij het opslaan van het bestand. Gebruik de 'Download als' knop om het bestand op te slaan op uw computer of probeer het later nog eens.",
   "DE.Controllers.Main.errorKeyEncrypt": "Onbekende sleuteldescriptor",
   "DE.Controllers.Main.errorKeyExpire": "Sleuteldescriptor vervallen",
@@ -779,6 +789,18 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Verticale ellips",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "Aan pagina aanpassen",
+  "DE.Controllers.Viewport.textFitWidth": "Aan breedte aanpassen",
+  "DE.Views.BookmarksDialog.textAdd": "Toevoegen",
+  "DE.Views.BookmarksDialog.textBookmarkName": "Bladwijzer naam",
+  "DE.Views.BookmarksDialog.textClose": "Sluiten",
+  "DE.Views.BookmarksDialog.textDelete": "Verwijder",
+  "DE.Views.BookmarksDialog.textGoto": "Ga naar",
+  "DE.Views.BookmarksDialog.textHidden": "Verborgen bladwijzers",
+  "DE.Views.BookmarksDialog.textLocation": "Locatie",
+  "DE.Views.BookmarksDialog.textName": "Naam",
+  "DE.Views.BookmarksDialog.textSort": "Sorteren op",
+  "DE.Views.BookmarksDialog.textTitle": "Bladwijzers",
   "DE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen",
   "DE.Views.ChartSettings.textArea": "Vlak",
   "DE.Views.ChartSettings.textBar": "Staaf",
@@ -898,6 +920,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Rijen verdelen",
   "DE.Views.DocumentHolder.textEditControls": "Inhoud beheer instellingen",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Rand tekstterugloop bewerken",
+  "DE.Views.DocumentHolder.textFromFile": "Van bestand",
+  "DE.Views.DocumentHolder.textFromUrl": "Van URL",
   "DE.Views.DocumentHolder.textNest": "Geneste tabel",
   "DE.Views.DocumentHolder.textNextPage": "Volgende pagina",
   "DE.Views.DocumentHolder.textPaste": "Plakken",
@@ -905,6 +929,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Ververs veld",
   "DE.Views.DocumentHolder.textRemove": "Verwijderen",
   "DE.Views.DocumentHolder.textRemoveControl": "Inhoud beheer verwijderen",
+  "DE.Views.DocumentHolder.textReplace": "Afbeelding vervangen",
   "DE.Views.DocumentHolder.textSettings": "Instellingen",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Onder uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Midden uitlijnen",
@@ -1164,10 +1189,15 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Geselecteerd tekstfragment",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Weergeven",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Externe koppeling",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Plaast in document",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Instellingen hyperlink",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Tekst van Scherminfo",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Koppelen aan",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Begin van het document",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Bladwijzers",
   "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.ImageSettings.textAdvanced": "Geavanceerde instellingen tonen",
   "DE.Views.ImageSettings.textEdit": "Bewerken",
@@ -1266,6 +1296,7 @@
   "DE.Views.LeftMenu.tipTitles": "Titels",
   "DE.Views.LeftMenu.txtDeveloper": "ONTWIKKELAARSMODUS",
   "DE.Views.LeftMenu.txtTrial": "TEST MODUS",
+  "DE.Views.Links.capBtnBookmarks": "Bladwijzer",
   "DE.Views.Links.capBtnContentsUpdate": "Verversen",
   "DE.Views.Links.capBtnInsContents": "Inhoudsopgave",
   "DE.Views.Links.capBtnInsFootnote": "Voetnoot",
@@ -1279,6 +1310,7 @@
   "DE.Views.Links.textGotoFootnote": "Naar voetnoten",
   "DE.Views.Links.textUpdateAll": "Volledige tabel verversen",
   "DE.Views.Links.textUpdatePages": "Alleen paginanummers verversen",
+  "DE.Views.Links.tipBookmarks": "Maak een bladwijzer",
   "DE.Views.Links.tipContents": "Inhoudsopgave toevoegen",
   "DE.Views.Links.tipContentsUpdate": "Inhoudsopgave verversen",
   "DE.Views.Links.tipInsertHyperlink": "Hyperlink toevoegen",
@@ -1340,7 +1372,7 @@
   "DE.Views.Navigation.txtEmpty": "Dit document bevat geen koppen",
   "DE.Views.Navigation.txtEmptyItem": "Lege koptekst",
   "DE.Views.Navigation.txtExpand": "Alle uitbreiden",
-  "DE.Views.Navigation.txtExpandToLevel": "Uitbreiden tot niveau...",
+  "DE.Views.Navigation.txtExpandToLevel": "Uitbreiden tot niveau",
   "DE.Views.Navigation.txtHeadingAfter": "Nieuwe kop na",
   "DE.Views.Navigation.txtHeadingBefore": "Nieuwe kop voor",
   "DE.Views.Navigation.txtNewHeading": "Nieuwe subkop",
@@ -1745,14 +1777,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Rechts",
   "DE.Views.Toolbar.textColumnsThree": "Drie",
   "DE.Views.Toolbar.textColumnsTwo": "Twee",
-  "DE.Views.Toolbar.textCompactView": "Compacte werkbalk weergeven",
   "DE.Views.Toolbar.textContPage": "Doorlopende pagina",
   "DE.Views.Toolbar.textEvenPage": "Even pagina",
-  "DE.Views.Toolbar.textFitPage": "Aan pagina aanpassen",
-  "DE.Views.Toolbar.textFitWidth": "Aan breedte aanpassen",
-  "DE.Views.Toolbar.textHideLines": "Linialen verbergen",
-  "DE.Views.Toolbar.textHideStatusBar": "Statusbalk verbergen",
-  "DE.Views.Toolbar.textHideTitleBar": "Titelbalk verbergen",
   "DE.Views.Toolbar.textInMargin": "In marge",
   "DE.Views.Toolbar.textInsColumnBreak": "Invoegen kolomeinde",
   "DE.Views.Toolbar.textInsertPageCount": "Aantal pagina's invoegen",
@@ -1806,8 +1832,6 @@
   "DE.Views.Toolbar.textToCurrent": "Naar huidige positie",
   "DE.Views.Toolbar.textTop": "Boven:",
   "DE.Views.Toolbar.textUnderline": "Onderstrepen",
-  "DE.Views.Toolbar.textZoom": "Zoomen",
-  "DE.Views.Toolbar.tipAdvSettings": "Geavanceerde instellingen",
   "DE.Views.Toolbar.tipAlignCenter": "Midden uitlijnen",
   "DE.Views.Toolbar.tipAlignJust": "Uitgevuld",
   "DE.Views.Toolbar.tipAlignLeft": "Links uitlijnen",
@@ -1863,7 +1887,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Niet-afdrukbare tekens",
   "DE.Views.Toolbar.tipSynchronize": "Het document is gewijzigd door een andere gebruiker. Klik om uw wijzigingen op te slaan en de updates opnieuw te laden.",
   "DE.Views.Toolbar.tipUndo": "Ongedaan maken",
-  "DE.Views.Toolbar.tipViewSettings": "Weergave-instellingen",
   "DE.Views.Toolbar.txtScheme1": "Kantoor",
   "DE.Views.Toolbar.txtScheme10": "Mediaan",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/pl.json

@@ -1547,14 +1547,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Prawy",
   "DE.Views.Toolbar.textColumnsThree": "Trzy",
   "DE.Views.Toolbar.textColumnsTwo": "Dwa",
-  "DE.Views.Toolbar.textCompactView": "Wyświetl kompaktowy pasek narzędzi",
   "DE.Views.Toolbar.textContPage": "Ciągła strona",
   "DE.Views.Toolbar.textEvenPage": "Z parzystej strony",
-  "DE.Views.Toolbar.textFitPage": "Dopasuj do strony",
-  "DE.Views.Toolbar.textFitWidth": "Dopasuj do szerokości",
-  "DE.Views.Toolbar.textHideLines": "Ukryj linijki",
-  "DE.Views.Toolbar.textHideStatusBar": "Ukryj pasek stanu",
-  "DE.Views.Toolbar.textHideTitleBar": "Ukryj pasek tytułowy",
   "DE.Views.Toolbar.textInMargin": "W marginesie",
   "DE.Views.Toolbar.textInsColumnBreak": "Wstaw podział kolumny",
   "DE.Views.Toolbar.textInsertPageCount": "Wstaw liczbę stron",
@@ -1602,8 +1596,6 @@
   "DE.Views.Toolbar.textToCurrent": "Do aktualnej pozycji",
   "DE.Views.Toolbar.textTop": "Góra:",
   "DE.Views.Toolbar.textUnderline": "Podkreśl",
-  "DE.Views.Toolbar.textZoom": "Powiększenie",
-  "DE.Views.Toolbar.tipAdvSettings": "Zaawansowane ustawienia",
   "DE.Views.Toolbar.tipAlignCenter": "Wyrównaj do środka",
   "DE.Views.Toolbar.tipAlignJust": "Wyjustowany",
   "DE.Views.Toolbar.tipAlignLeft": "Wyrównaj do lewej",
@@ -1658,7 +1650,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Znaki niedrukowane",
   "DE.Views.Toolbar.tipSynchronize": "Dokument został zmieniony przez innego użytkownika. Kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.",
   "DE.Views.Toolbar.tipUndo": "Cofnij",
-  "DE.Views.Toolbar.tipViewSettings": "Wyświetl ustawienia",
   "DE.Views.Toolbar.txtScheme1": "Biuro",
   "DE.Views.Toolbar.txtScheme10": "Mediana",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/pt.json

@@ -22,7 +22,7 @@
   "Common.Controllers.ReviewChanges.textColor": "Font color",
   "Common.Controllers.ReviewChanges.textContextual": "Don't add interval between paragraphs of the same style",
   "Common.Controllers.ReviewChanges.textDeleted": "<b>Deleted:</b>",
-  "Common.Controllers.ReviewChanges.textDStrikeout": "Double strikeout",
+  "Common.Controllers.ReviewChanges.textDStrikeout": "Tachado duplo",
   "Common.Controllers.ReviewChanges.textEquation": "Equação",
   "Common.Controllers.ReviewChanges.textExact": "exactly",
   "Common.Controllers.ReviewChanges.textFirstLine": "First line",
@@ -51,14 +51,14 @@
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraph Inserted</b> ",
   "Common.Controllers.ReviewChanges.textPosition": "Position",
-  "Common.Controllers.ReviewChanges.textRight": "Align right",
+  "Common.Controllers.ReviewChanges.textRight": "Alinhar à direita",
   "Common.Controllers.ReviewChanges.textShape": "Shape",
   "Common.Controllers.ReviewChanges.textShd": "Background color",
   "Common.Controllers.ReviewChanges.textSmallCaps": "Small caps",
   "Common.Controllers.ReviewChanges.textSpacing": "Spacing",
   "Common.Controllers.ReviewChanges.textSpacingAfter": "Spacing after",
   "Common.Controllers.ReviewChanges.textSpacingBefore": "Spacing before",
-  "Common.Controllers.ReviewChanges.textStrikeout": "Strikeout",
+  "Common.Controllers.ReviewChanges.textStrikeout": "Taxado",
   "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
@@ -150,6 +150,7 @@
   "Common.Views.Header.tipDownload": "Baixar arquivo",
   "Common.Views.Header.tipGoEdit": "Editar arquivo atual",
   "Common.Views.Header.tipPrint": "Imprimir arquivo",
+  "Common.Views.Header.tipViewSettings": "Visualizar configurações",
   "Common.Views.Header.tipViewUsers": "Ver usuários e gerenciar direitos de acesso ao documento",
   "Common.Views.Header.txtAccessRights": "Alterar direitos de acesso",
   "Common.Views.Header.txtRename": "Renomear",
@@ -177,37 +178,60 @@
   "Common.Views.LanguageDialog.btnOk": "OK",
   "Common.Views.LanguageDialog.labelSelect": "Selecionar idioma do documento",
   "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
+  "Common.Views.OpenDialog.closeButtonText": "Fechar Arquivo",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Senha incorreta.",
   "Common.Views.OpenDialog.txtPassword": "Senha",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Arquivo protegido",
+  "Common.Views.PasswordDialog.txtDescription": "Defina uma senha para proteger o documento",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "A confirmação da senha não é idêntica",
+  "Common.Views.PasswordDialog.txtRepeat": "Repetir a senha",
+  "Common.Views.PasswordDialog.txtTitle": "Definir senha",
   "Common.Views.PluginDlg.textLoading": "Carregamento",
   "Common.Views.Plugins.groupCaption": "Plugins",
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Carregamento",
   "Common.Views.Plugins.textStart": "Iniciar",
   "Common.Views.Plugins.textStop": "Parar",
+  "Common.Views.Protection.hintAddPwd": "Criptografar com senha",
+  "Common.Views.Protection.hintSignature": "Inserir assinatura digital ou linha de assinatura",
+  "Common.Views.Protection.txtAddPwd": "Inserir a senha",
+  "Common.Views.Protection.txtEncrypt": "Criptografar",
+  "Common.Views.Protection.txtInvisibleSignature": "Inserir assinatura digital",
+  "Common.Views.Protection.txtSignature": "Assinatura",
+  "Common.Views.Protection.txtSignatureLine": "Linha de assinatura",
   "Common.Views.RenameDialog.cancelButtonText": "Cancelar",
   "Common.Views.RenameDialog.okButtonText": "Aceitar",
   "Common.Views.RenameDialog.textName": "Nome de arquivo",
   "Common.Views.RenameDialog.txtInvalidName": "Nome de arquivo não pode conter os seguintes caracteres:",
   "Common.Views.ReviewChanges.hintNext": "Para a próxima alteração",
   "Common.Views.ReviewChanges.hintPrev": "Para a alteração anterior",
+  "Common.Views.ReviewChanges.strFast": "Rápido",
+  "Common.Views.ReviewChanges.strFastDesc": "Coedição em tempo real. Todas as alterações são salvas automaticamente.",
+  "Common.Views.ReviewChanges.strStrict": "Estrito",
+  "Common.Views.ReviewChanges.strStrictDesc": "Use o botão 'Salvar' para sincronizar as alterações que você e outros realizaram.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Aceitar a alteração atual",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "Definir modo de coedição",
+  "Common.Views.ReviewChanges.tipHistory": "Exibir histórico de versão",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Rejeitar alterações atuais",
   "Common.Views.ReviewChanges.tipReview": "Track Changes",
   "Common.Views.ReviewChanges.tipReviewView": "Selecione o modo que você quiser que as alterações sejam exibidas",
   "Common.Views.ReviewChanges.tipSetDocLang": "Definir idioma do documento",
   "Common.Views.ReviewChanges.tipSetSpelling": "Verificação ortográfica",
+  "Common.Views.ReviewChanges.tipSharing": "Gerenciar os direitos de acesso ao documento",
   "Common.Views.ReviewChanges.txtAccept": "Accept",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Aceitar as alterações",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Changes",
   "Common.Views.ReviewChanges.txtClose": "Close",
+  "Common.Views.ReviewChanges.txtCoAuthMode": "Modo de Coedição",
   "Common.Views.ReviewChanges.txtDocLang": "Idioma",
   "Common.Views.ReviewChanges.txtFinal": "Todas as alterações aceitas (Visualizar)",
+  "Common.Views.ReviewChanges.txtHistory": "Histórico de Versão",
   "Common.Views.ReviewChanges.txtMarkup": "Todas as alterações (Editar)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Marcação",
   "Common.Views.ReviewChanges.txtNext": "To Next Change",
   "Common.Views.ReviewChanges.txtOriginal": "Todas as alterações rejeitadas (Visualizar)",
   "Common.Views.ReviewChanges.txtPrev": "To Previous Change",
@@ -215,6 +239,7 @@
   "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
   "Common.Views.ReviewChanges.txtRejectChanges": "Rejeitar alterações",
   "Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Changes",
+  "Common.Views.ReviewChanges.txtSharing": "Compartilhar",
   "Common.Views.ReviewChanges.txtSpelling": "Verificação ortográfica",
   "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
   "Common.Views.ReviewChanges.txtView": "Modo de exibição",
@@ -227,15 +252,30 @@
   "Common.Views.ReviewChangesDialog.txtReject": "Rejeitar",
   "Common.Views.ReviewChangesDialog.txtRejectAll": "Rejeitar todas as alterações",
   "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Rejeitar alterações atuais",
+  "Common.Views.SignDialog.textCertificate": "Certificado",
+  "Common.Views.SignDialog.textPurpose": "Objetivo para assinar o documento",
+  "Common.Views.SignDialog.textSelectImage": "Selecionar Imagem",
+  "Common.Views.SignDialog.textTitle": "Assinar o Documento",
+  "Common.Views.SignDialog.textUseImage": "ou clique 'Selecionar Imagem' para usar uma figura como assinatura",
+  "Common.Views.SignDialog.textValid": "Válido de %1 até %2",
+  "Common.Views.SignDialog.tipFontName": "Nome da Fonte",
+  "Common.Views.SignDialog.tipFontSize": "Tamanho da fonte",
+  "Common.Views.SignSettingsDialog.textAllowComment": "Permitir ao signatário inserir comentários no diálogo de assinatura",
+  "Common.Views.SignSettingsDialog.textInfo": "Dados do signatário",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "Título do Signatário",
+  "Common.Views.SignSettingsDialog.textShowDate": "Exibir a data da assinatura na linha da assinatura",
+  "Common.Views.SignSettingsDialog.textTitle": "Configurações da Assinatura",
+  "Common.Views.SignSettingsDialog.txtEmpty": "O campo é obrigatório",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento sem nome",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
   "DE.Controllers.LeftMenu.requestEditRightsText": "Solicitando direitos de edição...",
-  "DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
+  "DE.Controllers.LeftMenu.textLoadHistory": "Carregando o histórico de versões...",
   "DE.Controllers.LeftMenu.textNoTextFound": "Os dados que você tem estado procurando não podem ser encontrados. Ajuste suas opções de pesquisa.",
   "DE.Controllers.LeftMenu.textReplaceSkipped": "A substituição foi realizada. {0} ocorrências foram ignoradas.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "A pesquisa foi realizada. Ocorrências substituídas: {0}",
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se você continuar salvando neste formato algumas formatações podem ser perdidas.<br>Você tem certeza que deseja continuar?",
   "DE.Controllers.Main.applyChangesTextText": "Carregando as alterações...",
   "DE.Controllers.Main.applyChangesTitleText": "Carregando as alterações",
   "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.",
@@ -250,11 +290,12 @@
   "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
-  "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
+  "DE.Controllers.Main.errorConnectToServer": "O documento não pode ser salvo. Verifique as configurações de conexão ou entre em contato com o seu administrador.<br>Quando você clicar no botão \"OK\", poderá baixar o documento.<br><br>Encontre mais informações sobre conexão com o Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aqui</a>",
   "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.<br>Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.",
   "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código do erro: %1",
   "DE.Controllers.Main.errorFilePassProtect": "O documento é protegido por senha e não pode ser aberto.",
+  "DE.Controllers.Main.errorForceSave": "Ocorreu um erro enquanto o arquivo estava sendo gravado. Favor utilizar a opção 'Baixar como' para salvar o arquivo em seu computador ou tente novamente mais tarde.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descritor de chave desconhecido",
   "DE.Controllers.Main.errorKeyExpire": "Descritor de chave expirado",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
@@ -311,13 +352,14 @@
   "DE.Controllers.Main.textLoadingDocument": "Carregando documento",
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE versão open source",
   "DE.Controllers.Main.textShape": "Forma",
-  "DE.Controllers.Main.textStrict": "Strict mode",
-  "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
+  "DE.Controllers.Main.textStrict": "Modo estrito",
+  "DE.Controllers.Main.textTryUndoRedo": "As funções Desfazer/Refazer ficam desabilitadas no modo de Coedição Rápida.<br>Selecione o modo 'Estrito' para editar o aquivo sem que outros usuários interfiram e envie suas mudanças somente ao salvar o documento. Você pode alternar entre os modos de coedição usando as Configurações Avançadas.\",",
   "DE.Controllers.Main.titleLicenseExp": "A licença expirou",
   "DE.Controllers.Main.titleServerVersion": "Editor atualizado",
   "DE.Controllers.Main.titleUpdateVersion": "Versão alterada",
   "DE.Controllers.Main.txtArt": "Your text here",
   "DE.Controllers.Main.txtBasicShapes": "Formas básicas",
+  "DE.Controllers.Main.txtBookmarkError": "Erro! Bookmark não definido",
   "DE.Controllers.Main.txtButtons": "Botões",
   "DE.Controllers.Main.txtCallouts": "Textos explicativos",
   "DE.Controllers.Main.txtCharts": "Gráficos",
@@ -325,12 +367,18 @@
   "DE.Controllers.Main.txtEditingMode": "Definir modo de edição...",
   "DE.Controllers.Main.txtErrorLoadHistory": "O carregamento de histórico falhou",
   "DE.Controllers.Main.txtFiguredArrows": "Setas figuradas",
+  "DE.Controllers.Main.txtFirstPage": "Primeira Página",
   "DE.Controllers.Main.txtLines": "Linhas",
   "DE.Controllers.Main.txtMath": "Matemática",
   "DE.Controllers.Main.txtNeedSynchronize": "Você tem atualizações",
+  "DE.Controllers.Main.txtNoTableOfContents": "Nenhuma entrada de tabela de conteúdo foi encontrada.",
+  "DE.Controllers.Main.txtOnPage": "na página",
   "DE.Controllers.Main.txtRectangles": "Retângulos",
+  "DE.Controllers.Main.txtSameAsPrev": "Mesmo da Anterior",
+  "DE.Controllers.Main.txtSection": "-Seção",
   "DE.Controllers.Main.txtSeries": "Série",
   "DE.Controllers.Main.txtStarsRibbons": "Estrelas e arco-íris",
+  "DE.Controllers.Main.txtStyle_footnote_text": "Texto de notas de rodapé",
   "DE.Controllers.Main.txtStyle_Heading_1": "Cabeçalho 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Cabeçalho 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "Cabeçalho 3",
@@ -347,6 +395,7 @@
   "DE.Controllers.Main.txtStyle_Quote": "Citar",
   "DE.Controllers.Main.txtStyle_Subtitle": "Legenda",
   "DE.Controllers.Main.txtStyle_Title": "Titulo",
+  "DE.Controllers.Main.txtTableOfContents": "Tabela de Conteúdo",
   "DE.Controllers.Main.txtXAxis": "Eixo X",
   "DE.Controllers.Main.txtYAxis": "Eixo Y",
   "DE.Controllers.Main.unknownErrorText": "Erro desconhecido.",
@@ -360,7 +409,10 @@
   "DE.Controllers.Main.warnBrowserZoom": "A configuração de zoom atual de seu navegador não é completamente suportada. Redefina para o zoom padrão pressionando Ctrl+0.",
   "DE.Controllers.Main.warnLicenseExp": "Sua licença expirou.<br>Atualize sua licença e refresque a página.",
   "DE.Controllers.Main.warnNoLicense": "Você está usando uma versão de código aberto de ONLYOFFICE. A versão tem limitações para conexões simultâneas com servidor de documentos (20 conexões por vez). <br> Se você precisar de mais, por favor considere a compra de uma licença comercial.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Você está usando uma versão de código aberto de ONLYOFFICE. A versão tem limitações para conexões simultâneas com servidor de documentos (20 conexões por vez). <br> Se você precisar de mais, por favor considere a compra de uma licença comercial.",
   "DE.Controllers.Main.warnProcessRightsChange": "Foi negado a você o direito de editar o arquivo.",
+  "DE.Controllers.Navigation.txtBeginning": "Início do documento",
+  "DE.Controllers.Navigation.txtGotoBeginning": "Ir para o início do documento",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.tipReview": "Track Changes",
@@ -700,6 +752,12 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Reticências verticais",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Views.BookmarksDialog.textBookmarkName": "Nome do favorito",
+  "DE.Views.BookmarksDialog.textClose": "Fechar",
+  "DE.Views.BookmarksDialog.textDelete": "Excluir",
+  "DE.Views.BookmarksDialog.textGoto": "Ir para",
+  "DE.Views.BookmarksDialog.textHidden": "Favoritos ocultos",
+  "DE.Views.BookmarksDialog.textTitle": "Favoritos",
   "DE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas",
   "DE.Views.ChartSettings.textArea": "Área",
   "DE.Views.ChartSettings.textBar": "Barra",
@@ -726,6 +784,12 @@
   "DE.Views.ChartSettings.txtTight": "Justo",
   "DE.Views.ChartSettings.txtTitle": "Gráfico",
   "DE.Views.ChartSettings.txtTopAndBottom": "Parte superior e inferior",
+  "DE.Views.ControlSettingsDialog.textLock": "Travar",
+  "DE.Views.ControlSettingsDialog.textName": "Título",
+  "DE.Views.ControlSettingsDialog.textTag": "Etiqueta",
+  "DE.Views.ControlSettingsDialog.textTitle": "Propriedades do controle de conteúdo",
+  "DE.Views.ControlSettingsDialog.txtLockDelete": "Controle de Conteúdo não pode ser excluído",
+  "DE.Views.ControlSettingsDialog.txtLockEdit": "Conteúdo não pode ser editado",
   "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancelar",
   "DE.Views.CustomColumnsDialog.okButtonText": "OK",
   "DE.Views.CustomColumnsDialog.textColumns": "Número de colunas",
@@ -792,6 +856,9 @@
   "DE.Views.DocumentHolder.spellcheckText": "Verificação ortográfica",
   "DE.Views.DocumentHolder.splitCellsText": "Dividir célula...",
   "DE.Views.DocumentHolder.splitCellTitleText": "Dividir célula",
+  "DE.Views.DocumentHolder.strDelete": "Remover assinatura",
+  "DE.Views.DocumentHolder.strDetails": "Detalhes da Assinatura",
+  "DE.Views.DocumentHolder.strSetup": "Configuração da Assinatura",
   "DE.Views.DocumentHolder.styleText": "Formatting as Style",
   "DE.Views.DocumentHolder.tableText": "Tabela",
   "DE.Views.DocumentHolder.textAlign": "Alinhar",
@@ -800,19 +867,27 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Enviar para trás",
   "DE.Views.DocumentHolder.textArrangeForward": "Trazer para frente",
   "DE.Views.DocumentHolder.textArrangeFront": "Trazer para primeiro plano",
+  "DE.Views.DocumentHolder.textContentControls": "Controle de conteúdo",
   "DE.Views.DocumentHolder.textCopy": "Copiar",
   "DE.Views.DocumentHolder.textCut": "Cortar",
+  "DE.Views.DocumentHolder.textEditControls": "Propriedades do controle de conteúdo",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Editar limite de disposição",
+  "DE.Views.DocumentHolder.textNest": "Tabela aninhada",
   "DE.Views.DocumentHolder.textNextPage": "Próxima página",
   "DE.Views.DocumentHolder.textPaste": "Colar",
   "DE.Views.DocumentHolder.textPrevPage": "Página anterior",
+  "DE.Views.DocumentHolder.textRefreshField": "Atualizar o campo",
+  "DE.Views.DocumentHolder.textRemoveControl": "Remover Controle de Conteúdo",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Alinhar à parte inferior",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Alinhar ao centro",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Alinhar à esquerda",
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinhar ao meio",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Alinhar à direita",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Alinhar à parte superior",
+  "DE.Views.DocumentHolder.textTOC": "Tabela de Conteúdo",
+  "DE.Views.DocumentHolder.textTOCSettings": "Definições da tabela de conteúdo",
   "DE.Views.DocumentHolder.textUndo": "Desfazer",
+  "DE.Views.DocumentHolder.textUpdateTOC": "Atualizar a tabela de conteúdo",
   "DE.Views.DocumentHolder.textWrap": "Estilo da quebra automática",
   "DE.Views.DocumentHolder.tipIsLocked": "Este elemento está sendo atualmente editado por outro usuário.",
   "DE.Views.DocumentHolder.txtAddBottom": "Adicionar borda inferior",
@@ -872,6 +947,8 @@
   "DE.Views.DocumentHolder.txtMatchBrackets": "Combinar parênteses com a altura do argumento",
   "DE.Views.DocumentHolder.txtMatrixAlign": "Alinhamento de matriz",
   "DE.Views.DocumentHolder.txtOverbar": "Barra sobre texto",
+  "DE.Views.DocumentHolder.txtOverwriteCells": "Sobrescrever células",
+  "DE.Views.DocumentHolder.txtPasteSourceFormat": "Manter formatação da origem",
   "DE.Views.DocumentHolder.txtPressLink": "Pressione CTRL e clique no link",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Remover barra de fração",
   "DE.Views.DocumentHolder.txtRemLimit": "Remover limite",
@@ -947,9 +1024,10 @@
   "DE.Views.FileMenu.btnCreateNewCaption": "Criar novo",
   "DE.Views.FileMenu.btnDownloadCaption": "Baixar como...",
   "DE.Views.FileMenu.btnHelpCaption": "Ajuda...",
-  "DE.Views.FileMenu.btnHistoryCaption": "Version History",
+  "DE.Views.FileMenu.btnHistoryCaption": "Histórico de Versão",
   "DE.Views.FileMenu.btnInfoCaption": "Informações do documento...",
   "DE.Views.FileMenu.btnPrintCaption": "Imprimir",
+  "DE.Views.FileMenu.btnProtectCaption": "Proteger",
   "DE.Views.FileMenu.btnRecentFilesCaption": "Abrir recente...",
   "DE.Views.FileMenu.btnRenameCaption": "Renomear...",
   "DE.Views.FileMenu.btnReturnCaption": "Voltar para documento",
@@ -979,14 +1057,23 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palavras",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Alterar direitos de acesso",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Pessoas que têm direitos",
+  "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Aviso",
+  "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Com senha",
+  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Proteger o Documento",
+  "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Com assinatura",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Este documento foi protegido com senha.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "O documento deve ser assinado.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Assinaturas válidas foram adicionadas ao documento. O documento está protegido para edição.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Algumas das assinaturas digitais no documento estão inválidas ou não puderam ser verificadas. O documento está protegido para edição.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtView": "Visualizar assinaturas",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Aplicar",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Ativar guias de alinhamento",
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Ativar recuperação automática",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Ativar salvamento automático",
-  "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode",
+  "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Modo de Coedição",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
-  "DE.Views.FileMenuPanels.Settings.strFast": "Fast",
+  "DE.Views.FileMenuPanels.Settings.strFast": "Rápido",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Dicas de fonte",
   "DE.Views.FileMenuPanels.Settings.strForcesave": "Sempre salvar para o servidor (caso contrário, salvar para servidor no documento fechado)",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Ativar hieróglifos",
@@ -994,7 +1081,7 @@
   "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Ativar exibição dos comentários resolvidos",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Alterações de colaboração em tempo real",
   "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Ativar a opção de verificação ortográfica",
-  "DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
+  "DE.Views.FileMenuPanels.Settings.strStrict": "Estrito",
   "DE.Views.FileMenuPanels.Settings.strUnit": "Unidade de medida",
   "DE.Views.FileMenuPanels.Settings.strZoom": "Valor de zoom padrão",
   "DE.Views.FileMenuPanels.Settings.text10Minutes": "Cada 10 minutos",
@@ -1028,21 +1115,28 @@
   "DE.Views.HeaderFooterSettings.textDiffOdd": "Páginas pares e ímpares diferentes",
   "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "Rodapé abaixo",
   "DE.Views.HeaderFooterSettings.textHeaderFromTop": "Cabeçalho no início",
+  "DE.Views.HeaderFooterSettings.textInsertCurrent": "Inserir na Posição Atual ",
   "DE.Views.HeaderFooterSettings.textOptions": "Opções",
   "DE.Views.HeaderFooterSettings.textPageNum": "Inserir número da página",
+  "DE.Views.HeaderFooterSettings.textPageNumbering": "Numeração da página",
   "DE.Views.HeaderFooterSettings.textPosition": "Posição",
+  "DE.Views.HeaderFooterSettings.textPrev": "Continuar da seção anterior",
   "DE.Views.HeaderFooterSettings.textSameAs": "Vincular a Anterior",
   "DE.Views.HeaderFooterSettings.textTopCenter": "Superior central",
   "DE.Views.HeaderFooterSettings.textTopLeft": "Superior esquerdo",
+  "DE.Views.HeaderFooterSettings.textTopPage": "Topo da Página",
   "DE.Views.HeaderFooterSettings.textTopRight": "Superior direito",
   "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar",
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto selecionado",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Exibir",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Colocar no Documento",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Configurações de hiperlink",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Texto de dica de tela:",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Vincular a",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Favoritos",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo é obrigatório",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Títulos",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Este campo deve ser uma URL no formato \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Exibir configurações avançadas",
   "DE.Views.ImageSettings.textEdit": "Editar",
@@ -1140,6 +1234,16 @@
   "DE.Views.LeftMenu.tipSupport": "Feedback e Suporte",
   "DE.Views.LeftMenu.tipTitles": "Títulos",
   "DE.Views.LeftMenu.txtDeveloper": "MODO DE DESENVOLVEDOR",
+  "DE.Views.Links.capBtnBookmarks": "Favorito",
+  "DE.Views.Links.capBtnContentsUpdate": "Atualizar",
+  "DE.Views.Links.capBtnInsContents": "Tabela de Conteúdo",
+  "DE.Views.Links.mniDelFootnote": "Excluir todas as notas de rodapé",
+  "DE.Views.Links.textContentsRemove": "Remover tabela de conteúdo",
+  "DE.Views.Links.textUpdateAll": "Atualizar toda a tabela",
+  "DE.Views.Links.textUpdatePages": "Atualizar somente os números de páginas",
+  "DE.Views.Links.tipBookmarks": "Criar Favorito",
+  "DE.Views.Links.tipContents": "Inserir tabela de conteúdo",
+  "DE.Views.Links.tipContentsUpdate": "Atualizar a tabela de conteúdo",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
@@ -1192,6 +1296,15 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
+  "DE.Views.Navigation.txtDemote": "Rebaixar",
+  "DE.Views.Navigation.txtEmpty": "Este documento não possuí títulos.",
+  "DE.Views.Navigation.txtEmptyItem": "Título Vazio",
+  "DE.Views.Navigation.txtExpandToLevel": "Expandir ao nível",
+  "DE.Views.Navigation.txtHeadingAfter": "Novo título após",
+  "DE.Views.Navigation.txtHeadingBefore": "Novo título antes de",
+  "DE.Views.Navigation.txtNewHeading": "Novo subtítulo",
+  "DE.Views.Navigation.txtPromote": "Promover",
+  "DE.Views.Navigation.txtSelect": "Selecionar conteúdo",
   "DE.Views.NoteSettingsDialog.textApply": "Aplicar",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Aplicar alterações a",
   "DE.Views.NoteSettingsDialog.textCancel": "Cancelar",
@@ -1270,6 +1383,7 @@
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Espaçamento entre caracteres",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Aba padrão",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efeitos",
+  "DE.Views.ParagraphSettingsAdvanced.textLeader": "Guia",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Esquerda",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Adicionar nova cor personalizada",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Posição",
@@ -1300,7 +1414,7 @@
   "DE.Views.RightMenu.txtParagraphSettings": "Configurações do parágrafo",
   "DE.Views.RightMenu.txtShapeSettings": "Configurações da forma",
   "DE.Views.RightMenu.txtTableSettings": "Configurações da tabela",
-  "DE.Views.RightMenu.txtTextArtSettings": "Text Art Settings",
+  "DE.Views.RightMenu.txtTextArtSettings": "Configurações de Arte de Texto",
   "DE.Views.ShapeSettings.strBackground": "Cor do plano de fundo",
   "DE.Views.ShapeSettings.strChange": "Alterar forma automática",
   "DE.Views.ShapeSettings.strColor": "Cor",
@@ -1351,6 +1465,14 @@
   "DE.Views.ShapeSettings.txtTight": "Justo",
   "DE.Views.ShapeSettings.txtTopAndBottom": "Parte superior e inferior",
   "DE.Views.ShapeSettings.txtWood": "Madeira",
+  "DE.Views.SignatureSettings.notcriticalErrorTitle": "Aviso",
+  "DE.Views.SignatureSettings.strRequested": "Assinaturas solicitadas",
+  "DE.Views.SignatureSettings.strSign": "Assinar",
+  "DE.Views.SignatureSettings.strSigner": "Signatário",
+  "DE.Views.SignatureSettings.strValid": "Assinaturas válidas",
+  "DE.Views.SignatureSettings.txtContinueEditing": "Editar de qualquer maneira",
+  "DE.Views.SignatureSettings.txtRequestedSignatures": "O documento deve ser assinado.",
+  "DE.Views.SignatureSettings.txtSigned": "Assinaturas válidas foram adicionadas ao documento. O documento está protegido para edição.",
   "DE.Views.Statusbar.goToPageText": "Ir para a Página",
   "DE.Views.Statusbar.pageIndexText": "Página {0} de {1}",
   "DE.Views.Statusbar.tipFitPage": "Ajustar página",
@@ -1365,6 +1487,22 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancelar",
+  "DE.Views.TableOfContentsSettings.strAlign": "Números de página alinhados à direita",
+  "DE.Views.TableOfContentsSettings.strLinks": "Formatar tabela de conteúdo como links",
+  "DE.Views.TableOfContentsSettings.strShowPages": "Mostrar números de páginas",
+  "DE.Views.TableOfContentsSettings.textBuildTable": "Construir tabela de conteúdo de",
+  "DE.Views.TableOfContentsSettings.textLevel": "Nível",
+  "DE.Views.TableOfContentsSettings.textLevels": "Níveis",
+  "DE.Views.TableOfContentsSettings.textRadioLevels": "Níveis do marcador",
+  "DE.Views.TableOfContentsSettings.textRadioStyles": "Estilos selecionados",
+  "DE.Views.TableOfContentsSettings.textStyle": "Estilo",
+  "DE.Views.TableOfContentsSettings.textStyles": "Estilos",
+  "DE.Views.TableOfContentsSettings.textTitle": "Tabela de Conteúdo",
+  "DE.Views.TableOfContentsSettings.txtClassic": "Clássico",
+  "DE.Views.TableOfContentsSettings.txtModern": "Moderno",
+  "DE.Views.TableOfContentsSettings.txtSimple": "Simples",
+  "DE.Views.TableOfContentsSettings.txtStandard": "Padrão",
   "DE.Views.TableSettings.deleteColumnText": "Excluir coluna",
   "DE.Views.TableSettings.deleteRowText": "Excluir linha",
   "DE.Views.TableSettings.deleteTableText": "Excluir tabela",
@@ -1387,6 +1525,8 @@
   "DE.Views.TableSettings.textBorders": "Estilo de bordas",
   "DE.Views.TableSettings.textCancel": "Cancelar",
   "DE.Views.TableSettings.textColumns": "Colunas",
+  "DE.Views.TableSettings.textDistributeCols": "Colunas distribuídas",
+  "DE.Views.TableSettings.textDistributeRows": "Linhas distribuídas",
   "DE.Views.TableSettings.textEdit": "Linhas e Colunas",
   "DE.Views.TableSettings.textEmptyTemplate": "Sem modelos",
   "DE.Views.TableSettings.textFirst": "Primeiro",
@@ -1507,6 +1647,7 @@
   "DE.Views.Toolbar.capBtnColumns": "Colunas",
   "DE.Views.Toolbar.capBtnComment": "Comentário",
   "DE.Views.Toolbar.capBtnInsChart": "Gráfico",
+  "DE.Views.Toolbar.capBtnInsControls": "Controles de Conteúdo",
   "DE.Views.Toolbar.capBtnInsDropcap": "Letra capitular",
   "DE.Views.Toolbar.capBtnInsEquation": "Equação",
   "DE.Views.Toolbar.capBtnInsHeader": "Cabeçalho/rodapé",
@@ -1525,6 +1666,7 @@
   "DE.Views.Toolbar.capImgGroup": "Grupo",
   "DE.Views.Toolbar.capImgWrapping": "Quebra Automática",
   "DE.Views.Toolbar.mniCustomTable": "Inserir tabela personalizada",
+  "DE.Views.Toolbar.mniEditControls": "Propriedades de Controle",
   "DE.Views.Toolbar.mniEditDropCap": "Configurações avançadas de Letra capitular",
   "DE.Views.Toolbar.mniEditFooter": "Editar rodapé",
   "DE.Views.Toolbar.mniEditHeader": "Editar cabeçalho",
@@ -1546,14 +1688,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Direita",
   "DE.Views.Toolbar.textColumnsThree": "Três",
   "DE.Views.Toolbar.textColumnsTwo": "Duas",
-  "DE.Views.Toolbar.textCompactView": "Visualizar barra de ferramentas compacta",
   "DE.Views.Toolbar.textContPage": "Página contínua",
   "DE.Views.Toolbar.textEvenPage": "Página par",
-  "DE.Views.Toolbar.textFitPage": "Ajustar página",
-  "DE.Views.Toolbar.textFitWidth": "Ajustar largura",
-  "DE.Views.Toolbar.textHideLines": "Ocultar réguas",
-  "DE.Views.Toolbar.textHideStatusBar": "Ocultar barra de status",
-  "DE.Views.Toolbar.textHideTitleBar": "Ocultar barra de título",
   "DE.Views.Toolbar.textInMargin": "Na margem",
   "DE.Views.Toolbar.textInsColumnBreak": "Inserir quebra de coluna",
   "DE.Views.Toolbar.textInsertPageCount": "Inserir número de páginas",
@@ -1578,11 +1714,14 @@
   "DE.Views.Toolbar.textPageMarginsCustom": "Margens personalizadas",
   "DE.Views.Toolbar.textPageSizeCustom": "Tamanho de página personalizado",
   "DE.Views.Toolbar.textPie": "Gráfico de pizza",
+  "DE.Views.Toolbar.textPlainControl": "Adicionar Controle de Conteúdo de Texto sem formatação",
   "DE.Views.Toolbar.textPoint": "Gráfico de pontos",
   "DE.Views.Toolbar.textPortrait": "Retrato ",
+  "DE.Views.Toolbar.textRemoveControl": "Remover Controle de Conteúdo",
+  "DE.Views.Toolbar.textRichControl": "Adicionar Controle de Conteúdo de Rich Text",
   "DE.Views.Toolbar.textRight": "Direita:",
   "DE.Views.Toolbar.textStock": "Gráfico de ações",
-  "DE.Views.Toolbar.textStrikeout": "Riscado",
+  "DE.Views.Toolbar.textStrikeout": "Taxado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
   "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
   "DE.Views.Toolbar.textStyleMenuNew": "New style from selection",
@@ -1592,17 +1731,18 @@
   "DE.Views.Toolbar.textSubscript": "Subscrito",
   "DE.Views.Toolbar.textSuperscript": "Sobrescrito",
   "DE.Views.Toolbar.textSurface": "Superfície",
+  "DE.Views.Toolbar.textTabCollaboration": "Colaboração",
   "DE.Views.Toolbar.textTabFile": "Arquivo",
   "DE.Views.Toolbar.textTabHome": "Página Inicial",
   "DE.Views.Toolbar.textTabInsert": "Inserir",
   "DE.Views.Toolbar.textTabLayout": "Layout",
+  "DE.Views.Toolbar.textTabLinks": "Referências",
+  "DE.Views.Toolbar.textTabProtect": "Proteção",
   "DE.Views.Toolbar.textTabReview": "Revisar",
   "DE.Views.Toolbar.textTitleError": "Erro",
   "DE.Views.Toolbar.textToCurrent": "Para posição atual",
   "DE.Views.Toolbar.textTop": "Parte superior: ",
   "DE.Views.Toolbar.textUnderline": "Sublinhado",
-  "DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Configurações avançadas",
   "DE.Views.Toolbar.tipAlignCenter": "Alinhar ao centro",
   "DE.Views.Toolbar.tipAlignJust": "Justificado",
   "DE.Views.Toolbar.tipAlignLeft": "Alinhar à esquerda",
@@ -1612,6 +1752,7 @@
   "DE.Views.Toolbar.tipClearStyle": "Limpar estilo",
   "DE.Views.Toolbar.tipColorSchemas": "Alterar esquema de cor",
   "DE.Views.Toolbar.tipColumns": "Inserir colunas",
+  "DE.Views.Toolbar.tipControls": "Adicionar controles de conteúdo",
   "DE.Views.Toolbar.tipCopy": "Copiar",
   "DE.Views.Toolbar.tipCopyStyle": "Copiar estilo",
   "DE.Views.Toolbar.tipDecFont": "Diminuir tamanho da fonte",
@@ -1657,7 +1798,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Caracteres não imprimíveis",
   "DE.Views.Toolbar.tipSynchronize": "O documento foi alterado por outro usuário. Clique para salvar suas alterações e recarregar as atualizações.",
   "DE.Views.Toolbar.tipUndo": "Desfazer",
-  "DE.Views.Toolbar.tipViewSettings": "Visualizar configurações",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "Mediana",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/ru.json

@@ -141,15 +141,24 @@
   "Common.Views.ExternalMergeEditor.textSave": "Сохранить и выйти",
   "Common.Views.ExternalMergeEditor.textTitle": "Получатели слияния",
   "Common.Views.Header.labelCoUsersDescr": "Документ редактируется несколькими пользователями.",
+  "Common.Views.Header.textAdvSettings": "Дополнительные параметры",
   "Common.Views.Header.textBack": "Перейти к Документам",
+  "Common.Views.Header.textCompactView": "Скрыть панель инструментов",
+  "Common.Views.Header.textHideLines": "Скрыть линейки",
+  "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния",
   "Common.Views.Header.textSaveBegin": "Сохранение...",
   "Common.Views.Header.textSaveChanged": "Изменен",
   "Common.Views.Header.textSaveEnd": "Все изменения сохранены",
   "Common.Views.Header.textSaveExpander": "Все изменения сохранены",
+  "Common.Views.Header.textZoom": "Масштаб",
   "Common.Views.Header.tipAccessRights": "Управление правами доступа к документу",
   "Common.Views.Header.tipDownload": "Скачать файл",
   "Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
   "Common.Views.Header.tipPrint": "Напечатать файл",
+  "Common.Views.Header.tipRedo": "Повторить",
+  "Common.Views.Header.tipSave": "Сохранить",
+  "Common.Views.Header.tipUndo": "Отменить",
+  "Common.Views.Header.tipViewSettings": "Параметры представления",
   "Common.Views.Header.tipViewUsers": "Просмотр пользователей и управление правами доступа к документу",
   "Common.Views.Header.txtAccessRights": "Изменить права доступа",
   "Common.Views.Header.txtRename": "Переименовать",
@@ -183,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.",
   "Common.Views.OpenDialog.txtPassword": "Пароль",
   "Common.Views.OpenDialog.txtPreview": "Просмотр",
+  "Common.Views.OpenDialog.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен.",
   "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл",
   "Common.Views.PasswordDialog.cancelButtonText": "Отмена",
@@ -269,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Введите имя подписывающего",
   "Common.Views.SignDialog.textItalic": "Курсив",
   "Common.Views.SignDialog.textPurpose": "Цель подписания документа",
+  "Common.Views.SignDialog.textSelect": "Выбрать",
   "Common.Views.SignDialog.textSelectImage": "Выбрать изображение",
   "Common.Views.SignDialog.textSignature": "Как выглядит подпись:",
   "Common.Views.SignDialog.textTitle": "Подписание документа",
@@ -296,6 +307,7 @@
   "DE.Controllers.LeftMenu.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "Поиск выполнен. Заменено вхождений: {0}",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Если Вы продолжите сохранение в этот формат, весь функционал, кроме текста, будет потерян.<br>Вы действительно хотите продолжить?",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Если вы продолжите сохранение в этот формат, часть форматирования может быть потеряна.<br>Вы действительно хотите продолжить?",
   "DE.Controllers.Main.applyChangesTextText": "Загрузка изменений...",
   "DE.Controllers.Main.applyChangesTitleText": "Загрузка изменений",
   "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
@@ -314,7 +326,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
@@ -779,6 +791,18 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Вертикальное многоточие",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Кси",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Дзета",
+  "DE.Controllers.Viewport.textFitPage": "По размеру страницы",
+  "DE.Controllers.Viewport.textFitWidth": "По ширине",
+  "DE.Views.BookmarksDialog.textAdd": "Добавить",
+  "DE.Views.BookmarksDialog.textBookmarkName": "Имя закладки",
+  "DE.Views.BookmarksDialog.textClose": "Закрыть",
+  "DE.Views.BookmarksDialog.textDelete": "Удалить",
+  "DE.Views.BookmarksDialog.textGoto": "Перейти",
+  "DE.Views.BookmarksDialog.textHidden": "Скрытые закладки",
+  "DE.Views.BookmarksDialog.textLocation": "Положение",
+  "DE.Views.BookmarksDialog.textName": "Имя",
+  "DE.Views.BookmarksDialog.textSort": "Порядок",
+  "DE.Views.BookmarksDialog.textTitle": "Закладки",
   "DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры",
   "DE.Views.ChartSettings.textArea": "С областями",
   "DE.Views.ChartSettings.textBar": "Линейчатая",
@@ -898,6 +922,8 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Выровнять высоту строк",
   "DE.Views.DocumentHolder.textEditControls": "Параметры элемента управления содержимым",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Изменить границу обтекания",
+  "DE.Views.DocumentHolder.textFromFile": "Из файла",
+  "DE.Views.DocumentHolder.textFromUrl": "По URL",
   "DE.Views.DocumentHolder.textNest": "Вставить как вложенную таблицу",
   "DE.Views.DocumentHolder.textNextPage": "Следующая страница",
   "DE.Views.DocumentHolder.textPaste": "Вставить",
@@ -905,6 +931,7 @@
   "DE.Views.DocumentHolder.textRefreshField": "Обновить поле",
   "DE.Views.DocumentHolder.textRemove": "Удалить",
   "DE.Views.DocumentHolder.textRemoveControl": "Удалить элемент управления содержимым",
+  "DE.Views.DocumentHolder.textReplace": "Заменить изображение",
   "DE.Views.DocumentHolder.textSettings": "Настройки",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Выровнять по нижнему краю",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Выровнять по центру",
@@ -1164,10 +1191,15 @@
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Выделенный фрагмент текста",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Отображать",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Внешняя ссылка",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Место в документе",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Параметры гиперссылки",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Текст подсказки",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Связать с",
+  "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Начало документа",
+  "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Закладки",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Это поле обязательно для заполнения",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Заголовки",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Дополнительные параметры",
   "DE.Views.ImageSettings.textEdit": "Редактировать",
@@ -1260,13 +1292,15 @@
   "DE.Views.LeftMenu.tipAbout": "О программе",
   "DE.Views.LeftMenu.tipChat": "Чат",
   "DE.Views.LeftMenu.tipComments": "Комментарии",
+  "DE.Views.LeftMenu.tipNavigation": "Навигация",
   "DE.Views.LeftMenu.tipPlugins": "Плагины",
   "DE.Views.LeftMenu.tipSearch": "Поиск",
   "DE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",
   "DE.Views.LeftMenu.tipTitles": "Заголовки",
   "DE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА",
   "DE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ",
-  "DE.Views.Links.capBtnContentsUpdate": "Обновление",
+  "DE.Views.Links.capBtnBookmarks": "Закладка",
+  "DE.Views.Links.capBtnContentsUpdate": "Обновить",
   "DE.Views.Links.capBtnInsContents": "Оглавление",
   "DE.Views.Links.capBtnInsFootnote": "Сноска",
   "DE.Views.Links.capBtnInsLink": "Гиперссылка",
@@ -1279,6 +1313,7 @@
   "DE.Views.Links.textGotoFootnote": "Перейти к сноскам",
   "DE.Views.Links.textUpdateAll": "Обновить целиком",
   "DE.Views.Links.textUpdatePages": "Обновить только номера страниц",
+  "DE.Views.Links.tipBookmarks": "Создать закладку",
   "DE.Views.Links.tipContents": "Вставить оглавление",
   "DE.Views.Links.tipContentsUpdate": "Обновить оглавление",
   "DE.Views.Links.tipInsertHyperlink": "Добавить гиперссылку",
@@ -1340,7 +1375,7 @@
   "DE.Views.Navigation.txtEmpty": "Этот документ не содержит заголовков",
   "DE.Views.Navigation.txtEmptyItem": "Пустой заголовок",
   "DE.Views.Navigation.txtExpand": "Развернуть все",
-  "DE.Views.Navigation.txtExpandToLevel": "Развернуть до уровня...",
+  "DE.Views.Navigation.txtExpandToLevel": "Развернуть до уровня",
   "DE.Views.Navigation.txtHeadingAfter": "Новый заголовок после",
   "DE.Views.Navigation.txtHeadingBefore": "Новый заголовок перед",
   "DE.Views.Navigation.txtNewHeading": "Новый подзаголовок",
@@ -1745,14 +1780,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Справа",
   "DE.Views.Toolbar.textColumnsThree": "Три",
   "DE.Views.Toolbar.textColumnsTwo": "Две",
-  "DE.Views.Toolbar.textCompactView": "Скрыть панель инструментов",
   "DE.Views.Toolbar.textContPage": "На текущей странице",
   "DE.Views.Toolbar.textEvenPage": "С четной страницы",
-  "DE.Views.Toolbar.textFitPage": "По размеру страницы",
-  "DE.Views.Toolbar.textFitWidth": "По ширине",
-  "DE.Views.Toolbar.textHideLines": "Скрыть линейки",
-  "DE.Views.Toolbar.textHideStatusBar": "Скрыть строку состояния",
-  "DE.Views.Toolbar.textHideTitleBar": "Скрыть строку заголовка",
   "DE.Views.Toolbar.textInMargin": "На поле",
   "DE.Views.Toolbar.textInsColumnBreak": "Вставить разрыв колонки",
   "DE.Views.Toolbar.textInsertPageCount": "Вставить число страниц",
@@ -1806,8 +1835,6 @@
   "DE.Views.Toolbar.textToCurrent": "В текущей позиции",
   "DE.Views.Toolbar.textTop": "Верхнее: ",
   "DE.Views.Toolbar.textUnderline": "Подчеркнутый",
-  "DE.Views.Toolbar.textZoom": "Масштаб",
-  "DE.Views.Toolbar.tipAdvSettings": "Дополнительные параметры",
   "DE.Views.Toolbar.tipAlignCenter": "Выравнивание по центру",
   "DE.Views.Toolbar.tipAlignJust": "Выравнивание по ширине",
   "DE.Views.Toolbar.tipAlignLeft": "Выравнивание по левому краю",
@@ -1863,7 +1890,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Непечатаемые символы",
   "DE.Views.Toolbar.tipSynchronize": "Документ изменен другим пользователем. Нажмите, чтобы сохранить свои изменения и загрузить обновления.",
   "DE.Views.Toolbar.tipUndo": "Отменить",
-  "DE.Views.Toolbar.tipViewSettings": "Параметры представления",
   "DE.Views.Toolbar.txtScheme1": "Стандартная",
   "DE.Views.Toolbar.txtScheme10": "Обычная",
   "DE.Views.Toolbar.txtScheme11": "Метро",

apps/documenteditor/main/locale/sk.json

@@ -1565,7 +1565,7 @@
   "DE.Views.Toolbar.capBtnInsChart": "Graf",
   "DE.Views.Toolbar.capBtnInsDropcap": "Iniciála",
   "DE.Views.Toolbar.capBtnInsEquation": "Rovnica",
-  "DE.Views.Toolbar.capBtnInsHeader": "Záhlavie/päta ",
+  "DE.Views.Toolbar.capBtnInsHeader": "Záhlavie/päta",
   "DE.Views.Toolbar.capBtnInsImage": "Obrázok",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Oddeľovač stránky/zlom strany",
   "DE.Views.Toolbar.capBtnInsShape": "Tvar",
@@ -1602,14 +1602,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Vpravo",
   "DE.Views.Toolbar.textColumnsThree": "Tri",
   "DE.Views.Toolbar.textColumnsTwo": "Dva",
-  "DE.Views.Toolbar.textCompactView": "Zobraziť kompaktnú lištu nástrojov",
   "DE.Views.Toolbar.textContPage": "Súvislá/neprerušovaná strana",
   "DE.Views.Toolbar.textEvenPage": "Párna stránka",
-  "DE.Views.Toolbar.textFitPage": "Prispôsobiť na stranu",
-  "DE.Views.Toolbar.textFitWidth": "Prispôsobiť na šírku",
-  "DE.Views.Toolbar.textHideLines": "Skryť pravítka",
-  "DE.Views.Toolbar.textHideStatusBar": "Schovať stavový riadok",
-  "DE.Views.Toolbar.textHideTitleBar": "Skryť lištu nadpisu",
   "DE.Views.Toolbar.textInMargin": "V okraji",
   "DE.Views.Toolbar.textInsColumnBreak": "Vložiť stĺpcové zalomenie ",
   "DE.Views.Toolbar.textInsertPageCount": "Zadajte počet strán",
@@ -1657,8 +1651,6 @@
   "DE.Views.Toolbar.textToCurrent": "Na aktuálnu pozíciu",
   "DE.Views.Toolbar.textTop": "Hore:",
   "DE.Views.Toolbar.textUnderline": "Podčiarknuť",
-  "DE.Views.Toolbar.textZoom": "Priblíženie",
-  "DE.Views.Toolbar.tipAdvSettings": "Pokročilé nastavenia",
   "DE.Views.Toolbar.tipAlignCenter": "Centrovať",
   "DE.Views.Toolbar.tipAlignJust": "Podľa okrajov",
   "DE.Views.Toolbar.tipAlignLeft": "Zarovnať doľava",
@@ -1713,7 +1705,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Formátovacie značky",
   "DE.Views.Toolbar.tipSynchronize": "Dokument bol zmenený ďalším používateľom. Prosím, kliknite na uloženie zmien a opätovne načítajte aktualizácie.",
   "DE.Views.Toolbar.tipUndo": "Krok späť",
-  "DE.Views.Toolbar.tipViewSettings": "Zobraziť nastavenia",
   "DE.Views.Toolbar.txtScheme1": "Kancelária",
   "DE.Views.Toolbar.txtScheme10": "Medián",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/sl.json

@@ -1350,14 +1350,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Poglej kompaktno orodno vrstico",
   "DE.Views.Toolbar.textContPage": "Neprekinjena stran",
   "DE.Views.Toolbar.textEvenPage": "Tudi stran",
-  "DE.Views.Toolbar.textFitPage": "Prilagodi stran",
-  "DE.Views.Toolbar.textFitWidth": "Prilagodi širino",
-  "DE.Views.Toolbar.textHideLines": "Skrij pravila",
-  "DE.Views.Toolbar.textHideStatusBar": "Skrij statusno vrstico",
-  "DE.Views.Toolbar.textHideTitleBar": "Skrij naslovno vrstico",
   "DE.Views.Toolbar.textInMargin": "v Meji",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageNumber": "Vstavi številko strani",
@@ -1395,8 +1389,6 @@
   "DE.Views.Toolbar.textToCurrent": "Do trenutnega položaja",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Podčrtaj",
-  "DE.Views.Toolbar.textZoom": "Povečava",
-  "DE.Views.Toolbar.tipAdvSettings": "Napredne nastavitve",
   "DE.Views.Toolbar.tipAlignCenter": "Poravnaj središče",
   "DE.Views.Toolbar.tipAlignJust": "Upravičena",
   "DE.Views.Toolbar.tipAlignLeft": "Poravnaj levo",
@@ -1444,7 +1436,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Nenatisljivi znaki",
   "DE.Views.Toolbar.tipSynchronize": "Dokument je spremenil drug uporabnik. Prosim pritisnite za shranjevanje svojih sprememb in osvežitev posodobitev.",
   "DE.Views.Toolbar.tipUndo": "Razveljavi",
-  "DE.Views.Toolbar.tipViewSettings": "Poglej nastavitve",
   "DE.Views.Toolbar.txtScheme1": "Pisarna",
   "DE.Views.Toolbar.txtScheme10": "Mediana",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/tr.json

@@ -1547,14 +1547,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Kompakt Aletçantasını göster",
   "DE.Views.Toolbar.textContPage": "Devam Eden Sayfa",
   "DE.Views.Toolbar.textEvenPage": "Çift Sayfa",
-  "DE.Views.Toolbar.textFitPage": "Sayfaya Sığdır",
-  "DE.Views.Toolbar.textFitWidth": "Genişliğe Sığdır",
-  "DE.Views.Toolbar.textHideLines": "Cetvelleri Gizle",
-  "DE.Views.Toolbar.textHideStatusBar": "Durum Çubuğunu Gizle",
-  "DE.Views.Toolbar.textHideTitleBar": "Başlık Çubuğunu Gizle",
   "DE.Views.Toolbar.textInMargin": "Kenar boşluğunda",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageCount": "Sayfa sayısı ekle",
@@ -1602,8 +1596,6 @@
   "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Altı çizili",
-  "DE.Views.Toolbar.textZoom": "Zum",
-  "DE.Views.Toolbar.tipAdvSettings": "Gelişmiş Ayarlar",
   "DE.Views.Toolbar.tipAlignCenter": "Ortaya Hizala",
   "DE.Views.Toolbar.tipAlignJust": "İki yana yaslı",
   "DE.Views.Toolbar.tipAlignLeft": "Sola Hizala",
@@ -1658,7 +1650,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Basılmaz Karakterler",
   "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.tipViewSettings": "Ayarları Göster",
   "DE.Views.Toolbar.txtScheme1": "Ofis",
   "DE.Views.Toolbar.txtScheme10": "Medyan",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/uk.json

@@ -1546,14 +1546,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Право",
   "DE.Views.Toolbar.textColumnsThree": "Три",
   "DE.Views.Toolbar.textColumnsTwo": "Два",
-  "DE.Views.Toolbar.textCompactView": "Сховати панель інструментів",
   "DE.Views.Toolbar.textContPage": "Неперервна Сторінка",
   "DE.Views.Toolbar.textEvenPage": "Навіть сторінка",
-  "DE.Views.Toolbar.textFitPage": "За розміром сторінки",
-  "DE.Views.Toolbar.textFitWidth": "Придатний до ширини",
-  "DE.Views.Toolbar.textHideLines": "Сховати лінійки",
-  "DE.Views.Toolbar.textHideStatusBar": "Сховати панель стану",
-  "DE.Views.Toolbar.textHideTitleBar": "Сховати заголовний рядок",
   "DE.Views.Toolbar.textInMargin": "на полях",
   "DE.Views.Toolbar.textInsColumnBreak": "Вставити розрив стовпчика",
   "DE.Views.Toolbar.textInsertPageCount": "Вставити кількість сторінок",
@@ -1601,8 +1595,6 @@
   "DE.Views.Toolbar.textToCurrent": "До поточної позиції",
   "DE.Views.Toolbar.textTop": "Верх:",
   "DE.Views.Toolbar.textUnderline": "Підкреслений",
-  "DE.Views.Toolbar.textZoom": "Збільшити",
-  "DE.Views.Toolbar.tipAdvSettings": "Розширені налаштування",
   "DE.Views.Toolbar.tipAlignCenter": "Вирівняти центр",
   "DE.Views.Toolbar.tipAlignJust": "Обгрунтовано",
   "DE.Views.Toolbar.tipAlignLeft": "Вирівняти зліва",
@@ -1657,7 +1649,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "недруковані символи",
   "DE.Views.Toolbar.tipSynchronize": "Документ був змінений іншим користувачем. Будь ласка, натисніть, щоб зберегти зміни та перезавантажити оновлення.",
   "DE.Views.Toolbar.tipUndo": "Скасувати",
-  "DE.Views.Toolbar.tipViewSettings": "Налаштування перегляду",
   "DE.Views.Toolbar.txtScheme1": "Офіс",
   "DE.Views.Toolbar.txtScheme10": "Медіана",
   "DE.Views.Toolbar.txtScheme11": "Метро",

apps/documenteditor/main/locale/vi.json

@@ -1547,14 +1547,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Bên phải",
   "DE.Views.Toolbar.textColumnsThree": "Ba",
   "DE.Views.Toolbar.textColumnsTwo": "Hai",
-  "DE.Views.Toolbar.textCompactView": "Xem thanh công cụ nhỏ gọn",
   "DE.Views.Toolbar.textContPage": "Trang liên tục",
   "DE.Views.Toolbar.textEvenPage": "Trang chẵn",
-  "DE.Views.Toolbar.textFitPage": "Vừa với trang",
-  "DE.Views.Toolbar.textFitWidth": "Vừa với Chiều rộng",
-  "DE.Views.Toolbar.textHideLines": "Ẩn Thước",
-  "DE.Views.Toolbar.textHideStatusBar": "Ẩn thanh trạng thái",
-  "DE.Views.Toolbar.textHideTitleBar": "Ẩn thanh Tiêu đề",
   "DE.Views.Toolbar.textInMargin": "Trong lề",
   "DE.Views.Toolbar.textInsColumnBreak": "Chèn ngắt cột",
   "DE.Views.Toolbar.textInsertPageCount": "Chèn số trang",
@@ -1602,8 +1596,6 @@
   "DE.Views.Toolbar.textToCurrent": "Đến vị trí hiện tại",
   "DE.Views.Toolbar.textTop": "Trên cùng:",
   "DE.Views.Toolbar.textUnderline": "Gạch chân",
-  "DE.Views.Toolbar.textZoom": "Thu phóng",
-  "DE.Views.Toolbar.tipAdvSettings": "Cài đặt nâng cao",
   "DE.Views.Toolbar.tipAlignCenter": "Căn giữa",
   "DE.Views.Toolbar.tipAlignJust": "Canh đều",
   "DE.Views.Toolbar.tipAlignLeft": "Căn trái",
@@ -1658,7 +1650,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Ký tự không in",
   "DE.Views.Toolbar.tipSynchronize": "Tài liệu đã được thay đổi bởi một người dùng khác. Vui lòng nhấp để lưu thay đổi của bạn và tải lại các cập nhật.",
   "DE.Views.Toolbar.tipUndo": "Hoàn tác",
-  "DE.Views.Toolbar.tipViewSettings": "Xem Cài đặt",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/zh.json

@@ -1458,14 +1458,8 @@
   "DE.Views.Toolbar.textColumnsRight": "右",
   "DE.Views.Toolbar.textColumnsThree": "三",
   "DE.Views.Toolbar.textColumnsTwo": "二",
-  "DE.Views.Toolbar.textCompactView": "查看紧凑工具栏",
   "DE.Views.Toolbar.textContPage": "连续页",
   "DE.Views.Toolbar.textEvenPage": "偶数页",
-  "DE.Views.Toolbar.textFitPage": "适合页面",
-  "DE.Views.Toolbar.textFitWidth": "适合宽度",
-  "DE.Views.Toolbar.textHideLines": "隐藏标尺",
-  "DE.Views.Toolbar.textHideStatusBar": "隐藏状态栏",
-  "DE.Views.Toolbar.textHideTitleBar": "隐藏标题栏",
   "DE.Views.Toolbar.textInMargin": "在边际",
   "DE.Views.Toolbar.textInsColumnBreak": "插入列中断",
   "DE.Views.Toolbar.textInsertPageCount": "插入页数",
@@ -1507,8 +1501,6 @@
   "DE.Views.Toolbar.textToCurrent": "到当前位置",
   "DE.Views.Toolbar.textTop": "顶边：",
   "DE.Views.Toolbar.textUnderline": "下划线",
-  "DE.Views.Toolbar.textZoom": "放大",
-  "DE.Views.Toolbar.tipAdvSettings": "高级设置",
   "DE.Views.Toolbar.tipAlignCenter": "居中对齐",
   "DE.Views.Toolbar.tipAlignJust": "正当",
   "DE.Views.Toolbar.tipAlignLeft": "左对齐",
@@ -1557,7 +1549,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "不打印字符",
   "DE.Views.Toolbar.tipSynchronize": "该文档已被另一个用户更改。请点击保存更改并重新加载更新",
   "DE.Views.Toolbar.tipUndo": "复原",
-  "DE.Views.Toolbar.tipViewSettings": "视图设置",
   "DE.Views.Toolbar.txtScheme1": "办公室",
   "DE.Views.Toolbar.txtScheme10": "中位数",
   "DE.Views.Toolbar.txtScheme11": "组件",

apps/documenteditor/main/resources/less/filemenu.less

@@ -98,32 +98,15 @@
   }
 }
 
-.img-doc-format {
-  .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 1020px);
-}
-
 .btn-doc-format {
   display: block;
   width: 98px;
   height: 125px;
   cursor: pointer;
 
-  .icon-document-format(@shift-x, @shift-y: 0) {
-    background-position: @shift-x @shift-y;
-
-    &:hover {
-      background-position: @shift-x+102 @shift-y;
-    }
+  svg&:hover {
+    opacity:0.85;
   }
-
-  &.docx  {.icon-document-format(-306px);}
-  &.doc   {.icon-document-format(-102px);}
-  &.odt   {.icon-document-format(-102px,-128px);}
-  &.rtf   {.icon-document-format(-510px,-128px);}
-  &.txt   {.icon-document-format(-714px,-128px);}
-  &.html  {.icon-document-format(-714px);}
-  &.epub  {.icon-document-format(-510px);}
-  &.pdf   {.icon-document-format(-306px,-128px);}
 }
 
 #panel-settings {
@@ -190,15 +173,10 @@
   .blank-document-btn {
     display: inline-block;
     margin: 25px 20px 65px;
-    background-position: -816px 0;
 
     width: 102px;
     height: 128px;
     cursor: pointer;
-
-    &:hover {
-      background-position: -918px 0;
-    }
   }
 
   hr {
@@ -218,9 +196,6 @@
       .thumb {
         width: 102px;
         height: 128px;
-        //                .background-ximage('@{app-image-path}/docformat.png', '@{app-image-path}/docformat@2x.png', 1020px);
-        //                background-repeat: no-repeat;
-        //                background-position: -816px -129px;
       }
 
       .title {
@@ -373,7 +348,7 @@
 }
 
 #panel-protect {
-  label, span {
+  label {
     font-size: 12px;
   }
 

apps/documenteditor/main/resources/less/rightmenu.less

@@ -291,6 +291,10 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
         &:hover,
         &.over {
             background-color: @secondary;
+
+            .caret {
+                display: inline-block;
+            }
         }
     }
 
@@ -314,7 +318,7 @@ button:active:not(.disabled) .btn-change-shape    {background-position: -56px  -
             border: 0;
             background-position: -43px -150px;
             margin: 8px 15px;
-            display: inline-block;
+            display: none;
             position: absolute;
             right: 0;
 

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

@@ -2,10 +2,6 @@
 @tabs-bg-color: #446995;
 
 .toolbar {
-    &:not(.cover) {
-        z-index: 1001;
-    }
-
     &.masked {
         button.disabled .icon:not(.no-mask) {
             background-position-x: 0px !important;
@@ -30,11 +26,11 @@
     position: absolute;
     top: 32px;
     left: 48px;
-    right: 45px;
+    right: 0;
     bottom: 0;
     opacity: 0;
     background-color: @gray-light;
-    z-index: @zindex-tooltip + 1;
+    /* z-index: @zindex-tooltip + 1; */
 }
 
 .toolbar-group-mask {
@@ -128,8 +124,9 @@
 
 // menu zoom
 .menu-zoom {
+    line-height: @line-height-base;
     .title {
-        padding: 5px 0 5px 20px;
+        padding: 5px 5px 5px 20px;
         float: left;
         //max-width: 95px;
         overflow: hidden;

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

@@ -89,6 +89,7 @@ define([
                 me.api.asc_registerCallback('asc_onConnectionStateChanged', _.bind(me.onApiUserConnection, me));
                 me.api.asc_registerCallback('asc_onDocumentContentReady',   _.bind(me.onApiDocumentContentReady, me));
                 Common.NotificationCenter.on('api:disconnect',              _.bind(me.onCoAuthoringDisconnect, me));
+                me.api.asc_registerCallback('asc_onCoAuthoringDisconnect',  _.bind(me.onCoAuthoringDisconnect,me));
                 me.api.asc_coAuthoringGetUsers();
             },
 

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

@@ -278,6 +278,7 @@ define([
                         old_rights = this._state.lostEditingRights;
                     this._state.lostEditingRights = !this._state.lostEditingRights;
                     this.api.asc_coAuthoringDisconnect();
+                    Common.NotificationCenter.trigger('api:disconnect');
 
                     if (!old_rights) {
                         uiApp.alert(
@@ -1093,7 +1094,7 @@ define([
 
                     me._state.openDlg = uiApp.modal({
                         title: me.advDRMOptions,
-                        text: me.advDRMEnterPassword,
+                        text: me.txtProtected,
                         afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
                         buttons: [
                             {
@@ -1221,7 +1222,7 @@ define([
             errorKeyExpire: 'Key descriptor expired',
             errorUsersExceed: 'Count of users was exceed',
             errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.',
-            errorFilePassProtect: 'The document is password protected.',
+            errorFilePassProtect: 'The file is password protected and could not be opened.',
             txtEditingMode: 'Set editing mode...',
             textAnonymous: 'Anonymous',
             loadingDocumentTitleText: 'Loading document',
@@ -1292,7 +1293,8 @@ define([
             txtStyle_footnote_text: 'Footnote Text',
             txtHeader: "Header",
             txtFooter: "Footer",
-            warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
+            warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
+            txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -193,7 +193,6 @@ define([
                     $('#settings-readermode input:checkbox').attr('checked', Common.SharedSettings.get('readerMode'));
                     $('#settings-search').single('click',                       _.bind(me.onSearch, me));
                     $('#settings-readermode input:checkbox').single('change',   _.bind(me.onReaderMode, me));
-                    $('#settings-edit-document').single('click',                _.bind(me.onEditDocumet, me));
                     $('#settings-help').single('click',                         _.bind(me.onShowHelp, me));
                     $('#settings-download').single('click',                     _.bind(me.onDownloadOrigin, me));
                 }
@@ -267,10 +266,6 @@ define([
 
             // Handlers
 
-            onEditDocumet: function() {
-                Common.Gateway.requestEditRights();
-            },
-
             onSearch: function (e) {
                 var toolbarView = DE.getController('Toolbar').getView('Toolbar');
 

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

@@ -79,6 +79,7 @@ define([
                 this.api.asc_registerCallback('asc_onCanUndo',      _.bind(this.onApiCanRevert, this, 'undo'));
                 this.api.asc_registerCallback('asc_onCanRedo',      _.bind(this.onApiCanRevert, this, 'redo'));
                 this.api.asc_registerCallback('asc_onFocusObject',  _.bind(this.onApiFocusObject, this));
+                this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this));
                 Common.NotificationCenter.on('api:disconnect',      _.bind(this.onCoAuthoringDisconnect, this));
             },
 
@@ -163,7 +164,7 @@ define([
             },
 
             activateControls: function() {
-                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
             },
 
             activateViewControls: function() {
@@ -176,6 +177,12 @@ define([
 
             onCoAuthoringDisconnect: function() {
                 this.isDisconnected = true;
+                this.deactivateEditControls();
+                $('#toolbar-undo').toggleClass('disabled', true);
+                $('#toolbar-redo').toggleClass('disabled', true);
+                DE.getController('AddContainer').hideModal();
+                DE.getController('EditContainer').hideModal();
+                DE.getController('Settings').hideModal();
             },
 
             dlgLeaveTitleText   : 'You leave the application',

apps/documenteditor/mobile/app/template/Settings.template

@@ -25,18 +25,6 @@
                             </a>
                         </li>
                         <% } %>
-                        <li>
-                            <a id="settings-edit-document" class="item-link no-indicator">
-                                <div class="item-content">
-                                    <div class="item-media">
-                                        <i class="icon icon-edit"></i>
-                                    </div>
-                                    <div class="item-inner">
-                                        <div class="item-title"><%= scope.textEditDoc %></div>
-                                    </div>
-                                </div>
-                            </a>
-                        </li>
                         <li>
                             <div id="settings-readermode" class="item-content">
                                 <div class="item-media">

apps/documenteditor/mobile/app/template/Toolbar.template

@@ -34,6 +34,9 @@
             <a href="#" id="toolbar-add" class="link icon-only" style="display: none;">
                 <i class="icon icon-plus"></i>
             </a>
+            <a href="#" id="toolbar-edit-document" class="link icon-only" style="display: none;">
+                <i class="icon icon-edit"></i>
+            </a>
             <% if (!phone) { %>
             <a href="#" id="toolbar-search" class="link icon-only">
                 <i class="icon icon-search"></i>

apps/documenteditor/mobile/app/view/Settings.js

@@ -55,7 +55,8 @@ define([
             _canDownload = false,
             _canDownloadOrigin = false,
             _canReader = false,
-            _canAbout = true;
+            _canAbout = true,
+            _canHelp = true;
 
         return {
             // el: '.view-main',
@@ -100,6 +101,10 @@ define([
                 if (mode.customization && mode.canBrandingExt) {
                     _canAbout = (mode.customization.about!==false);
                 }
+
+                if (mode.customization) {
+                    _canHelp = (mode.customization.help!==false);
+                }
             },
 
             rootLayout: function () {
@@ -108,10 +113,8 @@ define([
                         isPhone = Common.SharedSettings.get('phone');
 
                     if (_isEdit) {
-                        $layour.find('#settings-edit-document').hide();
                         $layour.find('#settings-search .item-title').text(this.textFindAndReplace)
                     } else {
-                        if (!_canEdit) $layour.find('#settings-edit-document').hide();
                         $layour.find('#settings-document').hide();
                     }
                     if (!_canReader)
@@ -123,6 +126,7 @@ define([
                     if (!_canDownload) $layour.find('#settings-download-as').hide();
                     if (!_canDownloadOrigin) $layour.find('#settings-download').hide();
                     if (!_canAbout) $layour.find('#settings-about').hide();
+                    if (!_canHelp) $layour.find('#settings-help').hide();
 
                     return $layour.html();
                 }
@@ -213,7 +217,6 @@ define([
                     permissions = _.extend(permissions, data.doc.permissions);
 
                     if (permissions.edit === false) {
-                        $('#settings-edit-document').hide();
                     }
                 }
             },

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

@@ -62,7 +62,8 @@ define([
                 "click #toolbar-search"     : "searchToggle",
                 "click #toolbar-edit"       : "showEdition",
                 "click #toolbar-add"        : "showInserts",
-                "click #toolbar-settings"   : "showSettings"
+                "click #toolbar-settings"   : "showSettings",
+                "click #toolbar-edit-document": "editDocument"
             },
 
             // Set innerHTML and get the references to the DOM elements
@@ -92,7 +93,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
-                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').addClass('disabled');
 
                 return me;
             },
@@ -100,6 +101,8 @@ define([
             setMode: function (mode) {
                 if (mode.isEdit) {
                     $('#toolbar-edit, #toolbar-add, #toolbar-undo, #toolbar-redo').show();
+                } else if (mode.canEdit && mode.canRequestEditRights){
+                    $('#toolbar-edit-document').show();
                 }
             },
 
@@ -147,6 +150,10 @@ define([
                 DE.getController('Settings').showModal();
             },
 
+            editDocument: function () {
+                Common.Gateway.requestEditRights();
+            },
+
             textBack: 'Back'
         }
     })(), DE.Views.Toolbar || {}))

apps/documenteditor/mobile/locale/de.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
   "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
   "DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt.",
+  "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
   "DE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden",
@@ -121,6 +121,7 @@
   "DE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...",
   "DE.Controllers.Main.txtFooter": "Fußzeile",
   "DE.Controllers.Main.txtHeader": "Kopfzeile",
+  "DE.Controllers.Main.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt",
   "DE.Controllers.Main.txtSeries": "Reihen",
   "DE.Controllers.Main.txtStyle_footnote_text": "Fußnotentext",
   "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",

apps/documenteditor/mobile/locale/en.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "The document is password protected.",
+  "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed",
@@ -121,6 +121,7 @@
   "DE.Controllers.Main.txtEditingMode": "Set editing mode...",
   "DE.Controllers.Main.txtFooter": "Footer",
   "DE.Controllers.Main.txtHeader": "Header",
+  "DE.Controllers.Main.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
   "DE.Controllers.Main.txtSeries": "Series",
   "DE.Controllers.Main.txtStyle_footnote_text": "Footnote Text",
   "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",

apps/documenteditor/mobile/locale/es.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "El documento es protegido por contraseña.",
+  "DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Error de carga",

apps/documenteditor/mobile/locale/fr.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Le document est protégé par mot de passe.",
+  "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Échec du chargement",

apps/documenteditor/mobile/locale/it.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Il documento è protetto da password",
+  "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Caricamento non riuscito",
@@ -121,6 +121,7 @@
   "DE.Controllers.Main.txtEditingMode": "Imposta metodo di modifica",
   "DE.Controllers.Main.txtFooter": "Piè di pagina",
   "DE.Controllers.Main.txtHeader": "Intestazione",
+  "DE.Controllers.Main.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file",
   "DE.Controllers.Main.txtSeries": "Serie",
   "DE.Controllers.Main.txtStyle_footnote_text": "Nota a piè di pagina",
   "DE.Controllers.Main.txtStyle_Heading_1": "Titolo 1",

apps/documenteditor/mobile/locale/ko.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다. <br> 데이터베이스 연결 오류입니다. 지원팀에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
-  "DE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어 있습니다.",
+  "DE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
   "DE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "DE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",
   "DE.Controllers.Main.errorMailMergeLoadFile": "로드 실패",

apps/documenteditor/mobile/locale/lv.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Ārējā kļūda.<br>Datubāzes piekļuves kļūda. Lūdzu, sazinieties ar atbalsta daļu.",
   "DE.Controllers.Main.errorDataRange": "Nepareizs datu diapazons",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Dokumenta parole ir aizsargāta",
+  "DE.Controllers.Main.errorFilePassProtect": "Fails ir aizsargāts ar paroli un to nevar atvērt.",
   "DE.Controllers.Main.errorKeyEncrypt": "Nezināms atslēgas deskriptors",
   "DE.Controllers.Main.errorKeyExpire": "Atslēgas deskriptora termiņš beidzies",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Ielāde neizdevās",