Merge pull request #87 from ONLYOFFICE/feature/desktop-hotfix-5.1.3

Feature/desktop hotfix 5.1.3

.travis.yml

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

CHANGELOG.md

@@ -1,13 +1,18 @@
 # Change log
 ## 5.1.1
 ### All Editors
-* 
+* Customize initial zoom for the embedded editors
+* Replace image from context menu (bug #11493)
 
 ### Document Editor
-* 
+* Create and manage bookmarks
+* Create internal hyperlinks to bookmarks and headings
+* Export to RTF format
 
 ### Spreadsheet Editor
-* Support Spanish in formulas
+* Add Spanish, French formula translations
+* 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

@@ -362,10 +362,11 @@
             if (!!result && result.length) {
                 if (result[1] == 'desktop') {
                     _config.editorConfig.targetApp = result[1];
-                    _config.editorConfig.canBackToFolder = false;
+                    // _config.editorConfig.canBackToFolder = false;
-                    _config.editorConfig.canUseHistory = false;
                     if (!_config.editorConfig.customization) _config.editorConfig.customization = {};
                     _config.editorConfig.customization.about = false;
+
+                    if ( window.AscDesktopEditor ) window.AscDesktopEditor.execCommand('webapps:events', 'loading');
                 }
             }
         })();

apps/api/documents/index.html.desktop

@@ -55,7 +55,10 @@
                 height: '100%',
                 documentType: urlParams['doctype'] || 'text',
                 document: doc,
-                editorConfig: cfg
+                editorConfig: cfg,
+                events: {
+                    onInternalMessage: onInternalMessage,
+                }
             });
 
 
@@ -91,6 +94,9 @@
 
             function getEditorConfig(urlParams) {
                 return {
+                    customization   : {
+                        goback: { url: "onlyoffice.com" }
+                    },
                     mode            : urlParams["mode"] || 'edit',
                     lang            : urlParams["lang"] || 'en',
                     user: {
@@ -144,6 +150,21 @@
                 }
             };
 
+            function onInternalMessage(event) {
+                let info = event.data;
+                if ( info.type == 'goback' ) {
+                    if ( window.AscDesktopEditor ) {
+                        window.AscDesktopEditor.execCommand('go:folder', info.data.status);
+                    }
+                }
+            };
+
+            function onDocumentReady() {
+                if ( window.AscDesktopEditor ) {
+                    window.AscDesktopEditor.execCommand('doc:onready', '');
+                }
+            }
+
             if (isMobile()){
                 window.addEventListener('load', fixSize);
                 window.addEventListener('resize', fixSize);

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

@@ -119,6 +119,65 @@ define([
 ], function () {
     'use strict';
 
+    window.createButtonSet = function() {
+        function ButtonsArray(args) {};
+        ButtonsArray.prototype = new Array;
+        ButtonsArray.prototype.constructor = ButtonsArray;
+
+        var _disabled = false;
+
+        ButtonsArray.prototype.add = function(button) {
+            button.setDisabled(_disabled);
+            this.push(button);
+        };
+
+        ButtonsArray.prototype.setDisabled = function(disable) {
+            if ( _disabled != disable ) {
+                _disabled = disable;
+
+                this.forEach( function(button) {
+                    button.setDisabled(disable);
+                });
+            }
+        };
+
+        ButtonsArray.prototype.toggle = function(state, suppress) {
+            this.forEach(function(button) {
+                button.toggle(state, suppress);
+            });
+        };
+
+        ButtonsArray.prototype.pressed = function() {
+            return this.some(function(button) {
+                return button.pressed;
+            });
+        };
+
+        ButtonsArray.prototype.contains = function(id) {
+            return this.some(function(button) {
+                return button.id == id;
+            });
+        };
+
+        ButtonsArray.prototype.concat = function () {
+            var args = Array.prototype.slice.call(arguments);
+            var result = Array.prototype.slice.call(this);
+
+            args.forEach(function(sub){
+                Array.prototype.push.apply(result, sub);
+            });
+
+            return result;
+        }
+
+        var _out_array = Object.create(ButtonsArray.prototype);
+        for ( var i in arguments ) {
+            _out_array.add(arguments[i]);
+        }
+
+        return _out_array;
+    };
+
     var templateBtnIcon =
             '<% if ( iconImg ) { %>' +
                 '<img src="<%= iconImg %>">' +
@@ -291,6 +350,7 @@ define([
                         me.menu.render(me.cmpEl);
 
                     parentEl.html(me.cmpEl);
+                    me.$icon = me.$el.find('.icon');
                 }
             }
 
@@ -536,6 +596,13 @@ define([
                         }
                     }
                 }
+
+                if ( !!me.options.signals ) {
+                    var opts = me.options.signals;
+                    if ( !(opts.indexOf('disabled') < 0) ) {
+                        me.trigger('disabled', me, disabled);
+                    }
+                }
             }
 
             this.disabled = disabled;

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

@@ -213,6 +213,8 @@ define([
                         }, 10);
                     } else
                         me._skipInputChange = false;
+                } else if (e.keyCode == Common.UI.Keys.RETURN && this._input.val() === me.lastValue){
+                    this._input.trigger('change', { reapply: true });
                 }
             },
 
@@ -233,7 +235,7 @@ define([
                 var val = $(e.target).val(),
                     record = {};
 
-                if (this.lastValue === val) {
+                if (this.lastValue === val && !(extra && extra.reapply)) {
                     if (extra && extra.onkeydown)
                         this.trigger('combo:blur', this, e);
                     return;

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

@@ -140,9 +140,10 @@ define([
             el.html(this.template(this.model.toJSON()));
             el.addClass('item');
             el.toggleClass('selected', this.model.get('selected') && this.model.get('allowSelected'));
-            el.off('click').on('click', _.bind(this.onClick, this));
+            el.off('click dblclick contextmenu');
-            el.off('dblclick').on('dblclick', _.bind(this.onDblClick, this));
+            el.on({ 'click': _.bind(this.onClick, this),
-            el.off('contextmenu').on('contextmenu', _.bind(this.onContextMenu, this));
+                'dblclick': _.bind(this.onDblClick, this),
+                'contextmenu': _.bind(this.onContextMenu, this) });
             el.toggleClass('disabled', !!this.model.get('disabled'));
 
             if (!_.isUndefined(this.model.get('cls')))
@@ -277,6 +278,13 @@ define([
                 }));
             }
 
+            var modalParents = this.cmpEl.closest('.asc-window');
+            if (modalParents.length < 1)
+                modalParents = this.cmpEl.closest('[id^="menu-container-"]'); // context menu
+            if (modalParents.length > 0) {
+                this.tipZIndex = parseInt(modalParents.css('z-index')) + 10;
+            }
+
             if (!this.rendered) {
                 if (this.listenStoreEvents) {
                     this.listenTo(this.store, 'add',    this.onAddItem);
@@ -315,11 +323,6 @@ define([
                 });
             }
 
-            var modalParents = this.cmpEl.closest('.asc-window');
-            if (modalParents.length > 0) {
-                this.tipZIndex = parseInt(modalParents.css('z-index')) + 10;
-            }
-
             this.rendered = true;
 
             this.cmpEl.on('click', function(e){

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

@@ -187,6 +187,13 @@ define([
             return parseInt(el.css('width'));
         },
 
+        getItem: function (alias) {
+            for (var p in this.panels) {
+                var panel = this.panels[p];
+                if ( panel.alias == alias ) return panel;
+            }
+        },
+
         onSelectStart: function(e) {
             if (e.preventDefault) e.preventDefault();
             return false;

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

@@ -257,7 +257,7 @@ define([
                     return config.tabs[index].action;
                 }
 
-                var _tabTemplate = _.template('<li class="ribtab" style="display: none;"><div class="tab-bg" /><a href="#" data-tab="<%= action %>" data-title="<%= caption %>"><%= caption %></a></li>');
+                var _tabTemplate = _.template('<li class="ribtab" style="display: none;"><a href="#" data-tab="<%= action %>" data-title="<%= caption %>"><%= caption %></a></li>');
 
                 config.tabs[after + 1] = tab;
                 var _after_action = _get_tab_action(after);

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

@@ -103,13 +103,20 @@ define([
             },
 
             applyPlacement: function () {
-                var showxy = this.target.offset();
+                var showxy = this.target.offset(),
+                    innerHeight = Common.Utils.innerHeight();
                 if (this.placement == 'top')
-                    this.cmpEl.css({bottom : Common.Utils.innerHeight() - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'});
+                    this.cmpEl.css({bottom : innerHeight - showxy.top + 'px', right: Common.Utils.innerWidth() - showxy.left - this.target.width()/2 + 'px'});
-                else if (this.placement == 'left')
+                else {// left or right
-                    this.cmpEl.css({top : showxy.top + this.target.height()/2 + 'px', right: Common.Utils.innerWidth() - showxy.left - 5 + 'px'});
+                    var top = showxy.top + this.target.height()/2,
-                else // right
+                        height = this.cmpEl.height();
-                    this.cmpEl.css({top : showxy.top + this.target.height()/2 + 'px', left: showxy.left + this.target.width() + 'px'});
+                    if (top+height>innerHeight)
+                        top = innerHeight - height;
+                    if (this.placement == 'left')
+                        this.cmpEl.css({top : top + 'px', right: Common.Utils.innerWidth() - showxy.left - 5 + 'px'});
+                    else
+                        this.cmpEl.css({top : top + 'px', left: showxy.left + this.target.width() + 'px'});
+                }
             },
 
             isVisible: function() {

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

@@ -785,7 +785,7 @@ define([
 
             isLocked: function() {
                 return this.$window.hasClass('dethrone') ||
-                            (!this.options.modal && this.$window.parent().find('.asc-window.modal:visible').length);
+                            (!this.initConfig.modal && this.$window.parent().find('.asc-window.modal:visible').length);
             },
 
             getChild: function(selector) {

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

@@ -0,0 +1,73 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ * Controller wraps up interaction with desktop app
+ *
+ * Created by Maxim.Kadushkin on 2/16/2018.
+ */
+
+define([
+    'core'
+], function () {
+    'use strict';
+
+    var Desktop = function () {
+        var config = {};
+        var app = window.AscDesktopEditor;
+
+        return {
+            init: function (opts) {
+                _.extend(config, opts);
+
+                if ( config.isDesktopApp ) {
+                    Common.NotificationCenter.on('app:ready', function (config) {
+                        !!app && app.execCommand('doc:onready', '');
+                    });
+                }
+            },
+            process: function (opts) {
+                if ( opts == 'goback' ) {
+                    if ( config.isDesktopApp && !!app ) {
+                        app.execCommand('go:folder',
+                            config.isOffline ? 'offline' : config.customization.goback.url);
+                        return true;
+                    }
+
+                    return false;
+                }
+            }
+        };
+    };
+
+    Common.Controllers.Desktop = new Desktop();
+});

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

@@ -141,7 +141,12 @@ define([
             handler: function(result, value) {
                 if (this.isHandlerCalled) return;
                 this.isHandlerCalled = true;
-                externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
+                if (this.diagramEditorView._isExternalDocReady)
+                    externalEditor && externalEditor.serviceCommand('queryClose',{mr:result});
+                else {
+                    this.diagramEditorView.hide();
+                    this.isHandlerCalled = false;
+                }
             },
 
             setChartData: function() {

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

@@ -758,14 +758,22 @@ Common.Utils.InternalSettings = new(function() {
     var settings = {};
 
     var _get = function(name) {
-        return settings[name];
+            return settings[name];
-    },
+        },
-    _set = function(name, value) {
+        _set = function(name, value) {
-        settings[name] = value;
+            settings[name] = value;
-    };
+        };
 
     return {
         get: _get,
         set: _set
     }
-});
+});
+
+Common.Utils.InternalSettings.set('toolbar-height-tabs', 32);
+Common.Utils.InternalSettings.set('toolbar-height-tabs-top-title', 28);
+Common.Utils.InternalSettings.set('toolbar-height-controls', 67);
+Common.Utils.InternalSettings.set('document-title-height', 28);
+
+Common.Utils.InternalSettings.set('toolbar-height-compact', Common.Utils.InternalSettings.get('toolbar-height-tabs'));
+Common.Utils.InternalSettings.set('toolbar-height-normal', Common.Utils.InternalSettings.get('toolbar-height-tabs') + Common.Utils.InternalSettings.get('toolbar-height-controls'));

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

@@ -119,10 +119,11 @@ define([
         },
 
         _onMessage: function(msg) {
-            if (msg && msg.needUpdate) {
+            if (msg && msg.Referer == "onlyoffice") {
-                this.trigger('accessrights', this, msg.sharingSettings);
+                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/ExternalDiagramEditor.js

@@ -82,11 +82,9 @@ define([
                 disabled: true
             });
             this.btnCancel = new Common.UI.Button({
-                el: $('#id-btn-diagram-editor-cancel'),
+                el: $('#id-btn-diagram-editor-cancel')
-                disabled: true
             });
 
-            this.$window.find('.tool.close').addClass('disabled');
             this.$window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this));
         },
 

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

@@ -71,7 +71,7 @@ define([
 
         var templateRightBox = '<section>' +
                             '<section id="box-doc-name">' +
-                                '<input type="text" id="rib-doc-name" spellcheck="false" data-can-copy="false"></input>' +
+                                '<input type="text" id="rib-doc-name" spellcheck="false" data-can-copy="false" style="pointer-events: none;">' +
                             '</section>' +
                             '<a id="rib-save-status" class="status-label locked"><%= textSaveEnd %></a>' +
                             '<div class="hedset">' +
@@ -95,6 +95,7 @@ define([
                             '</div>' +
                             '<div class="hedset">' +
                                 '<div class="btn-slot" id="slot-btn-back"></div>' +
+                                '<div class="btn-slot" id="slot-btn-options"></div>' +
                             '</div>' +
                         '</section>';
 
@@ -102,6 +103,18 @@ define([
                                 '<div id="header-logo"><i /></div>' +
                             '</section>';
 
+        var templateTitleBox = '<section id="box-document-title">' +
+                                '<div class="hedset">' +
+                                    '<div class="btn-slot" id="slot-btn-dt-save"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-dt-print"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-dt-undo"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-dt-redo"></div>' +
+                                '</div>' +
+                                '<div class="lr-separator"></div>' +
+                                '<input type="text" id="title-doc-name" spellcheck="false" data-can-copy="false" style="pointer-events: none;">' +
+                                '<label id="title-user-name" style="pointer-events: none;"></label>' +
+                            '</section>';
+
         function onAddUser(model, collection, opts) {
             if ( $userList ) {
                 var $ul = $userList.find('ul');
@@ -204,6 +217,8 @@ define([
             }
         }
 
+        function onAppShowed(config) {}
+
         function onAppReady(mode) {
             appConfig = mode;
 
@@ -261,6 +276,34 @@ define([
                 }
             }
 
+            if ( me.btnPrint ) {
+                me.btnPrint.updateHint(me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'));
+                me.btnPrint.on('click', function (e) {
+                    me.fireEvent('print', me);
+                });
+            }
+
+            if ( me.btnSave ) {
+                me.btnSave.updateHint(me.tipSave + Common.Utils.String.platformKey('Ctrl+S'));
+                me.btnSave.on('click', function (e) {
+                    me.fireEvent('save', me);
+                });
+            }
+
+            if ( me.btnUndo ) {
+                me.btnUndo.updateHint(me.tipUndo + Common.Utils.String.platformKey('Ctrl+Z'));
+                me.btnUndo.on('click', function (e) {
+                    me.fireEvent('undo', me);
+                });
+            }
+
+            if ( me.btnRedo ) {
+                me.btnRedo.updateHint(me.tipRedo + Common.Utils.String.platformKey('Ctrl+Y'));
+                me.btnRedo.on('click', function (e) {
+                    me.fireEvent('redo', me);
+                });
+            }
+
             if ( !mode.isEdit ) {
                 if ( me.btnDownload ) {
                     me.btnDownload.updateHint(me.tipDownload);
@@ -269,13 +312,6 @@ define([
                     });
                 }
 
-                if ( me.btnPrint ) {
-                    me.btnPrint.updateHint(me.tipPrint + Common.Utils.String.platformKey('Ctrl+P'));
-                    me.btnPrint.on('click', function (e) {
-                        me.fireEvent('print', me);
-                    });
-                }
-
                 if ( me.btnEdit ) {
                     me.btnEdit.updateHint(me.tipGoEdit);
                     me.btnEdit.on('click', function (e) {
@@ -283,6 +319,9 @@ define([
                     });
                 }
             }
+
+            if ( me.btnOptions )
+                me.btnOptions.updateHint(me.tipViewSettings);
         }
 
         function onDocNameKeyDown(e) {
@@ -322,7 +361,6 @@ define([
         return {
             options: {
                 branding: {},
-                headerCaption: 'Default Caption',
                 documentCaption: '',
                 canBack: false
             },
@@ -339,11 +377,9 @@ define([
 
             initialize: function (options) {
                 var me = this;
-                this.options = this.options ? _({}).extend(this.options, options) : options;
+                this.options = this.options ? _.extend(this.options, options) : options;
 
-                this.headerCaption = this.options.headerCaption;
                 this.documentCaption = this.options.documentCaption;
-                this.canBack = this.options.canBack;
                 this.branding = this.options.customization;
                 this.isModified = false;
 
@@ -361,9 +397,20 @@ define([
                     reset   : onResetUsers
                 });
 
+                me.btnOptions = new Common.UI.Button({
+                    cls: 'btn-header no-caret',
+                    iconCls: 'svgicon svg-btn-options',
+                    menu: true
+                });
+
+                me.mnuZoom = {options: {value: 100}};
+
                 Common.NotificationCenter.on('app:ready', function(mode) {
                     Common.Utils.asyncCall(onAppReady, me, mode);
                 });
+                Common.NotificationCenter.on('app:face', function(mode) {
+                    Common.Utils.asyncCall(onAppShowed, me, mode);
+                });
             },
 
             render: function (el, role) {
@@ -373,6 +420,16 @@ define([
             },
 
             getPanel: function (role, config) {
+                var me = this;
+
+                function createTitleButton(iconid, slot, disabled) {
+                    return (new Common.UI.Button({
+                        cls: 'btn-header',
+                        iconCls: 'svgicon ' + iconid,
+                        disabled: disabled === true
+                    })).render(slot);
+                }
+
                 if ( role == 'left' && (!config || !config.isDesktopApp)) {
                     $html = $(templateLeftBox);
                     this.logo = $html.find('#header-logo');
@@ -391,64 +448,43 @@ define([
                         textSaveEnd: this.textSaveEnd
                     }));
 
-                    if ( this.labelDocName ) this.labelDocName.off();
+                    if ( !me.labelDocName ) {
-                    this.labelDocName = $html.find('#rib-doc-name');
+                        me.labelDocName = $html.find('#rib-doc-name');
-                    // this.labelDocName.attr('maxlength', 50);
+                        // this.labelDocName.attr('maxlength', 50);
-                    this.labelDocName.text = function (text) {
+                        me.labelDocName.text = function (text) {
-                        this.val(text).attr('size', text.length);
+                            this.val(text).attr('size', text.length);
-                    }
+                        }
 
-                    if ( this.documentCaption ) {
+                        if ( me.documentCaption ) {
-                        this.labelDocName.text( this.documentCaption );
+                            me.labelDocName.text(me.documentCaption);
+                        }
                     }
 
                     if ( !_.isUndefined(this.options.canRename) ) {
                         this.setCanRename(this.options.canRename);
                     }
 
-                    $saveStatus = $html.find('#rib-save-status');
+                    // $saveStatus = $html.find('#rib-save-status');
-                    $saveStatus.hide();
+                    $html.find('#rib-save-status').hide();
+                    // if ( config.isOffline ) $saveStatus = false;
 
-                    if ( config && config.isDesktopApp ) {
+                    if ( this.options.canBack === true ) {
-                        $html.addClass('desktop');
+                        me.btnGoBack.render($html.find('#slot-btn-back'));
-                        $html.find('#slot-btn-back').hide();
-                        this.labelDocName.hide();
-
-                        if ( config.isOffline )
-                            $saveStatus = false;
                     } else {
-                        if ( this.canBack === true ) {
+                        $html.find('#slot-btn-back').hide();
-                            this.btnGoBack.render($html.find('#slot-btn-back'));
-                        } else {
-                            $html.find('#slot-btn-back').hide();
-                        }
                     }
 
                     if ( !config.isEdit ) {
-                        if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline  ) {
+                        if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline  )
-                            this.btnDownload = new Common.UI.Button({
+                            this.btnDownload = createTitleButton('svg-btn-download', $html.find('#slot-hbtn-download'));
-                                cls: 'btn-header',
-                                iconCls: 'svgicon svg-btn-download'
-                            });
 
-                            this.btnDownload.render($html.find('#slot-hbtn-download'));
+                        if ( config.canPrint )
-                        }
+                            this.btnPrint = createTitleButton('svg-btn-print', $html.find('#slot-hbtn-print'));
 
-                        if ( config.canPrint ) {
+                        if ( config.canEdit && config.canRequestEditRights )
-                            this.btnPrint = new Common.UI.Button({
+                            this.btnEdit = createTitleButton('svg-btn-edit', $html.find('#slot-hbtn-edit'));
-                                cls: 'btn-header',
+                    } else {
-                                iconCls: 'svgicon svg-btn-print'
+                        me.btnOptions.render($html.find('#slot-btn-options'));
-                            });
-
-                            this.btnPrint.render($html.find('#slot-hbtn-print'));
-                        }
-
-                        if ( config.canEdit && config.canRequestEditRights ) {
-                            (this.btnEdit = new Common.UI.Button({
-                                cls: 'btn-header',
-                                iconCls: 'svgicon svg-btn-edit'
-                            })).render($html.find('#slot-hbtn-edit'));
-                        }
                     }
 
                     $userList = $html.find('.cousers-list');
@@ -457,6 +493,40 @@ define([
 
                     $panelUsers.hide();
 
+                    return $html;
+                } else
+                if ( role == 'title' ) {
+                    var $html = $(_.template(templateTitleBox)());
+
+                    !!me.labelDocName && me.labelDocName.hide().off();                  // hide document title if it was created in right box
+                    me.labelDocName = $html.find('> #title-doc-name');
+                    me.labelDocName.text = function (str) {this.val(str);};             // redefine text function to lock temporaly rename docuemnt option
+                    me.labelDocName.text( me.documentCaption );
+
+                    me.labelUserName = $('> #title-user-name', $html);
+                    me.setUserName(me.options.userName);
+
+                    if ( config.canPrint && config.isEdit ) {
+                        me.btnPrint = createTitleButton('svg-btn-print', $('#slot-btn-dt-print', $html));
+                    }
+
+                    me.btnSave = createTitleButton('svg-btn-save', $('#slot-btn-dt-save', $html), true);
+                    me.btnUndo = createTitleButton('svg-btn-undo', $('#slot-btn-dt-undo', $html), true);
+                    me.btnRedo = createTitleButton('svg-btn-redo', $('#slot-btn-dt-redo', $html), true);
+
+                    if ( me.btnSave.$icon.is('svg') ) {
+                        me.btnSave.$icon.addClass('icon-save');
+                        var _create_use = function (extid, intid) {
+                            var _use = document.createElementNS('http://www.w3.org/2000/svg', 'use');
+                            _use.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', extid);
+                            _use.setAttribute('id', intid);
+
+                            return $(_use);
+                        };
+
+                        _create_use('#svg-btn-save-coauth', 'coauth').appendTo(me.btnSave.$icon);
+                        _create_use('#svg-btn-save-sync', 'sync').appendTo(me.btnSave.$icon);
+                    }
                     return $html;
                 }
             },
@@ -483,16 +553,6 @@ define([
                 }
             },
 
-            setHeaderCaption: function (value) {
-                this.headerCaption = value;
-
-                return value;
-            },
-
-            getHeaderCaption: function () {
-                return this.headerCaption;
-            },
-
             setDocumentCaption: function(value) {
                 !value && (value = '');
 
@@ -522,15 +582,16 @@ define([
             },
 
             setCanBack: function (value, text) {
-                this.canBack = value;
+                this.options.canBack = value;
-
                 this.btnGoBack[value ? 'show' : 'hide']();
                 if (value)
                     this.btnGoBack.updateHint((text && typeof text == 'string') ? text : this.textBack);
+
+                return this;
             },
 
             getCanBack: function () {
-                return this.canBack;
+                return this.options.canBack;
             },
 
             setCanRename: function (rename) {
@@ -581,6 +642,61 @@ define([
                 }
             },
 
+            setUserName: function(name) {
+                if ( !!this.labelUserName ) {
+                    if ( !!name ) {
+                        this.labelUserName.text(name).show();
+                    } else this.labelUserName.hide();
+                } else {
+                    this.options.userName = name;
+                }
+
+                return this;
+            },
+
+            getButton: function(type) {
+                if (type == 'save')
+                    return this.btnSave;
+            },
+
+            lockHeaderBtns: function (alias, lock) {
+                var me = this;
+                if ( alias == 'users' ) {
+                    if ( lock )
+                        $btnUsers.addClass('disabled').attr('disabled', 'disabled'); else
+                        $btnUsers.removeClass('disabled').attr('disabled', '');
+                } else {
+                    function _lockButton(btn) {
+                        if ( btn ) {
+                            if ( lock ) {
+                                btn.keepState = {
+                                    disabled: btn.isDisabled()
+                                };
+                                btn.setDisabled( true );
+                            } else {
+                                btn.setDisabled( btn.keepState.disabled );
+                                delete btn.keepState;
+                            }
+                        }
+                    }
+
+                    switch ( alias ) {
+                    case 'undo': _lockButton(me.btnUndo); break;
+                    case 'redo': _lockButton(me.btnRedo); break;
+                    case 'opts': _lockButton(me.btnOptions); break;
+                    default: break;
+                    }
+                }
+            },
+
+            fakeMenuItem: function() {
+                return {
+                    conf: {checked: false},
+                    setChecked: function (val) { this.conf.checked = val; },
+                    isChecked: function () { return this.conf.checked; }
+                };
+            },
+
             textBack: 'Go to Documents',
             txtRename: 'Rename',
             textSaveBegin: 'Saving...',
@@ -593,7 +709,16 @@ define([
             tipViewUsers: 'View users and manage document access rights',
             tipDownload: 'Download file',
             tipPrint: 'Print file',
-            tipGoEdit: 'Edit current file'
+            tipGoEdit: 'Edit current file',
+            tipSave: 'Save',
+            tipUndo: 'Undo',
+            tipRedo: 'Redo',
+            textCompactView: 'Hide Toolbar',
+            textHideStatusBar: 'Hide Status Bar',
+            textHideLines: 'Hide Rulers',
+            textZoom: 'Zoom',
+            textAdvSettings: 'Advanced Settings',
+            tipViewSettings: 'View Settings'
         }
     }(), Common.Views.Header || {}))
 });

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

@@ -393,9 +393,9 @@ define([
                         menuStyle: 'min-width: 100px;',
                         cls: 'input-group-nr',
                         data: [
-                            {value: 4, displayValue: ','},
+                            {value: 4, displayValue: this.txtComma},
-                            {value: 2, displayValue: ';'},
+                            {value: 2, displayValue: this.txtSemicolon},
-                            {value: 3, displayValue: ':'},
+                            {value: 3, displayValue: this.txtColon},
                             {value: 1, displayValue: this.txtTab},
                             {value: 5, displayValue: this.txtSpace},
                             {value: -1, displayValue: this.txtOther}],
@@ -524,7 +524,10 @@ define([
         txtOther: 'Other',
         txtIncorrectPwd: 'Password is incorrect.',
         closeButtonText: 'Close File',
-        txtPreview: 'Preview'
+        txtPreview: 'Preview',
+        txtComma: 'Comma',
+        txtColon: 'Colon',
+        txtSemicolon: 'Semicolon'
 
     }, Common.Views.OpenDialog || {}));
 });

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

@@ -11,10 +11,10 @@
         <polygon points="13,31 10,28 10,30 6,30 6,32 10,32 10,34 	"/>
     </symbol>
     <symbol id="svg-btn-users" viewBox="0 0 20 20">
-   		<path fill="#FFFFFF" d="M7,3.999c1.103,0,2,0.897,2,2C9,7.103,8.103,8,7,8C5.897,8,5,7.103,5,5.999C5,4.896,5.897,3.999,7,3.999 M7,2.999c-1.657,0-3,1.344-3,3S5.343,9,7,9c1.657,0,3-1.345,3-3.001S8.657,2.999,7,2.999L7,2.999z"/>
+		<path d="M7,3.999c1.103,0,2,0.897,2,2C9,7.103,8.103,8,7,8C5.897,8,5,7.103,5,5.999C5,4.896,5.897,3.999,7,3.999 M7,2.999c-1.657,0-3,1.344-3,3S5.343,9,7,9c1.657,0,3-1.345,3-3.001S8.657,2.999,7,2.999L7,2.999z"/>
-		<path fill="#FFFFFF" d="M7,11.666c4.185,0,4.909,2.268,5,2.642V16H2v-1.688C2.1,13.905,2.841,11.666,7,11.666 M7,10.666 c-5.477,0-6,3.545-6,3.545V17h12v-2.789C13,14.211,12.477,10.666,7,10.666L7,10.666z"/>
+		<path d="M7,11.666c4.185,0,4.909,2.268,5,2.642V16H2v-1.688C2.1,13.905,2.841,11.666,7,11.666 M7,10.666 c-5.477,0-6,3.545-6,3.545V17h12v-2.789C13,14.211,12.477,10.666,7,10.666L7,10.666z"/>
-		<circle fill="#FFFFFF" cx="14.5" cy="8.001" r="2.5"/>
+		<circle cx="14.5" cy="8.001" r="2.5"/>
-		<path fill="#FFFFFF" d="M14.5,11.863c-0.566,0-1.056,0.059-1.49,0.152c0.599,0.726,0.895,1.481,0.979,2.049L14,14.138V17h5v-2.263 C19,14.737,18.607,11.863,14.5,11.863z"/>
+		<path d="M14.5,11.863c-0.566,0-1.056,0.059-1.49,0.152c0.599,0.726,0.895,1.481,0.979,2.049L14,14.138V17h5v-2.263 C19,14.737,18.607,11.863,14.5,11.863z"/>
     </symbol>
     <symbol id="svg-btn-download" viewBox="0 0 20 20">
         <rect x="4" y="16" width="12" height="1"/>
@@ -32,4 +32,39 @@
 	<path d="M15.273,8.598l-2.121-2.121l1.414-1.414c0.391-0.391,1.023-0.391,1.414,0l0.707,0.707
 		c0.391,0.391,0.391,1.023,0,1.414L15.273,8.598z"/>
     </symbol>
+    <symbol id="svg-btn-save" viewBox="0 0 20 20">
+        <rect x="7" y="13" width="6" height="1"/>
+	    <rect x="7" y="11" width="6" height="1"/>
+	    <path d="M13,4H5C4.447,4,4,4.447,4,5v10c0,0.553,0.447,1,1,1h10c0.553,0,1-0.447,1-1V7L13,4z M11,5v2h-1V5H11z
+		 M15,15H5V5h2v3h5V5h0.5L15,7.5V15z"/>
+    </symbol>
+    <symbol id="svg-btn-save-coauth" viewBox="0 0 20 20">
+        <path d="M14,9c-2.209,0-4,1.791-4,4c0,0.348,0.059,0.679,0.142,1h1.043C11.072,13.686,11,13.353,11,13
+            c0-1.654,1.346-3,3-3s3,1.346,3,3s-1.346,3-3,3v-1l-2,1.5l2,1.5v-1c2.209,0,4-1.791,4-4S16.209,9,14,9z"/>
+        <rect x="6" y="13" width="3" height="1"/>
+        <rect x="6" y="11" width="3" height="1"/>
+        <path d="M9,15H4V5h2v3h3h2V5h0.5L14,7.5V8h1V7l-3-3H4C3.447,4,3,4.447,3,5v10c0,0.553,0.447,1,1,1h5V15z M9,5h1v2H9 V5z"/>
+    </symbol>
+    <symbol id="svg-btn-save-sync" viewBox="0 0 20 20">
+        <path fill="#FFD112" d="M18,16c0.553,0,1-0.447,1-1v-5c0-0.553-0.447-1-1-1h-7c-0.553,0-1,0.447-1,1v5c0,0.553,0.447,1,1,1h1
+                l1.5,2l1.5-2H18z"/>
+        <rect x="12" y="11" fill="#444444" width="5" height="1"/>
+        <rect x="12" y="13" fill="#444444" width="5" height="1"/>
+        <rect x="6" y="13" width="3" height="1"/>
+        <rect x="6" y="11" width="3" height="1"/>
+        <path d="M9,15H4V5h2v3h3h2V5h0.5L14,7.5V8h1V7l-3-3H4C3.447,4,3,4.447,3,5v10c0,0.553,0.447,1,1,1h5V15z M9,5h1v2H9 V5z"/>
+    </symbol>
+    <symbol id="svg-btn-undo" viewBox="0 0 20 20">
+        <path d="M11.355,7.625c-1.965,0-3.864,0.777-5.151,2.033L4,7.625V14h6.407l-2.091-2.219
+		c0.845-1.277,2.313-2.215,3.99-2.215c2.461,0,5.405,1.78,5.694,4.119C17.601,10.291,14.966,7.625,11.355,7.625z"/>
+    </symbol>
+    <symbol id="svg-btn-redo" viewBox="0 0 20 20">
+        <path d="M10.645,7.625c1.965,0,3.863,0.777,5.15,2.033L18,7.625V14h-6.406l2.09-2.219
+        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"/>
+    </symbol>
 </svg>

apps/common/main/resources/less/advanced-settings-window.less

@@ -36,12 +36,16 @@
     }
 
     .footer {
-        padding-top: 15px;
+        padding: 15px 15px 0;
 
         &.center {
             text-align: center;
         }
 
+        &.right {
+            text-align: right;
+        }
+
         &.justify {
             padding-left: 30px;
             padding-right: 30px;

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

@@ -512,6 +512,12 @@
     border: 1px solid @input-border;
     .border-radius(@border-radius-small);
 
+    &.auto {
+        width: auto;
+        padding-left: 10px;
+        padding-right: 10px;
+    }
+
     &:hover:not(.disabled),
     .over:not(.disabled) {
         background-color: @secondary !important;
@@ -520,6 +526,7 @@
     &:active:not(.disabled),
     &.active:not(.disabled) {
         background-color: @primary !important;
+        border-color: @primary;
         color: white;
     }
 

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

@@ -43,7 +43,6 @@
         line-height: 20px;
         height: 100%;
         display: flex;
-        align-items: center;
     }
 
     &.left {
@@ -53,11 +52,6 @@
     &.right {
         flex-grow: 1;
         min-width: 100px;
-
-        .desktop {
-            padding: 10px 0;
-            text-align: right;
-        }
     }
 
     .status-label {
@@ -68,6 +62,12 @@
         color: #fff;
     }
 
+    .dropdown-menu {
+        label {
+            color: @gray-deep;
+        }
+    }
+
     .btn-users,
     .btn-header {
         &:hover {
@@ -76,7 +76,7 @@
             }
         }
 
-        &:active {
+        &:active, &.active {
             &:not(.disabled) {
                 background-color: rgba(0,0,0,0.2);
             }
@@ -85,7 +85,7 @@
 
     #box-doc-name {
         flex-grow: 1;
-        text-align: center;
+        display: flex;
     }
 
     #rib-doc-name {
@@ -151,7 +151,6 @@
 }
 
 #tlb-box-users {
-    height: @height-tabs;
 }
 
 #tlb-change-rights {
@@ -159,9 +158,11 @@
 }
 
 .btn-users {
-    display: inline-flex;
+    display: flex;
+    align-items: center;
     cursor: pointer;
-    padding: 6px 12px;
+    padding: 0 12px;
+    height: 100%;
 
     .icon {
         display: inline-block;
@@ -173,6 +174,11 @@
         cursor: pointer;
         font-size: 14px;
     }
+
+    &.disabled {
+        opacity: 0.65;
+        pointer-events: none;
+    }
 }
 
 .cousers-menu {
@@ -185,6 +191,12 @@
     width: 285px;
     font-size: 12px;
 
+    z-index: 1042;
+
+    .top-title & {
+        top: @height-title + @height-tabs - 8px;
+    }
+
     > label {
         white-space: normal;
     }
@@ -235,16 +247,113 @@
 
 .hedset {
     font-size: 0;
+    display: flex;
+
+    .btn-group {
+        height: 100%;
+    }
+
 }
 
 .btn-header {
-    border: 0 none;
+    height: 100%;
-    height: @height-tabs;
     background-color: transparent;
-    padding: 6px 12px;
+    width: 40px;
 
     .icon {
         width: 20px;
         height: 20px;
     }
-}
+
+    svg.icon {
+        display: inline-block;
+        vertical-align: middle;
+    }
+
+    .btn&[disabled],
+    &.disabled {
+        opacity: 0.65;
+    }
+
+    &:hover {
+        &:not(.disabled) {
+            background-color: rgba(255,255,255,0.2);
+        }
+    }
+
+    &:active {
+        &:not(.disabled) {
+            background-color: rgba(0,0,0,0.2);
+        }
+    }
+
+    &.no-caret {
+        .inner-box-caret {
+            display: none;
+        }
+    }
+}
+
+#box-document-title {
+    background-color: @tabs-bg-color;
+    display: flex;
+    height: 100%;
+    color:#fff;
+    position: relative;
+
+    .btn-slot {
+        display: inline-block;
+    }
+
+    svg.icon {
+        fill: #fff;
+
+        &.icon-save {
+            &.btn-save-coauth, &.btn-synch {
+                use:first-child {
+                    display: none;
+                }
+            }
+
+            &:not(.btn-save-coauth) {
+                use#coauth {
+                    display: none;
+                }
+            }
+            &:not(.btn-synch) {
+                use#sync {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    #title-doc-name {
+        position: absolute;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        text-align: center;
+        font-size: 12px;
+        height: 100%;
+        width: 100%;
+        background-color: transparent;
+        border: 0 none;
+        cursor: default;
+   }
+    #title-user-name {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        text-align: right;
+        font-size: 11px;
+        max-width: 50%;
+        height: 100%;
+        padding: 0 12px;
+        line-height: @height-title;
+   }
+
+    .lr-separator {
+        flex-grow: 1;
+    }
+}

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

@@ -9,46 +9,54 @@
     }
 
     &.right {
-        margin: -32px 0 0 15px;
+        margin: 0 0 0 15px;
 
         .tip-arrow {
             left: -15px;
-            top: 20px;
+            top: 0;
-            width: 15px;
+            width: 16px;
-            height: 30px;
+            height: 15px;
+            .box-shadow(0 -5px 8px -5px rgba(0, 0, 0, 0.2));
+
             &:after {
-                top: 5px;
+                top: -7px;
-                left: 8px;
+                left: 7px;
+                width: 16px;
             }
         }
     }
 
     &.left {
-        margin: -32px 15px 0 0;
+        margin: 0 15px 0 0;
 
         .tip-arrow {
             right: -15px;
-            top: 20px;
+            top: 0;
-            width: 15px;
+            width: 16px;
-            height: 30px;
+            height: 15px;
+            .box-shadow(0 -5px 8px -5px rgba(0, 0, 0, 0.2));
+
             &:after {
-                top: 5px;
+                top: -7px;
-                left: -8px;
+                left: -7px;
+                width: 15px;
             }
         }
     }
 
     &.top {
-        margin: 0 -32px 15px 0;
+        margin: 0 0 15px 0;
 
         .tip-arrow {
-            right: 15px;
+            right: 0;
             bottom: -15px;
-            width: 30px;
+            width: 15px;
             height: 15px;
+            .box-shadow(5px 0 8px -5px rgba(0, 0, 0, 0.2));
+
             &:after {
                 top: -8px;
-                left: 5px;
+                left: 8px;
             }
         }
     }
@@ -60,6 +68,18 @@
     background-color: #fcfed7;
     overflow: visible;
 
+    .right & {
+        border-top-left-radius: 0;
+    }
+
+    .left & {
+        border-top-right-radius: 0;
+    }
+
+    .top & {
+        border-bottom-right-radius: 0;
+    }
+
     .box-shadow(0 4px 15px -2px rgba(0, 0, 0, 0.5));
     font-size: 11px;
 }

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

@@ -1,3 +1,4 @@
+@height-title: 28px;
 @height-tabs: 32px;
 @height-controls: 67px;
 
@@ -21,11 +22,11 @@
         }
 
         &:not(.expanded):not(.cover){
-          .ribtab.active {
+            .ribtab.active {
-            > a {
+                > a {
-              font-weight: normal;
+                    font-weight: normal;
+                }
             }
-          }
         }
     }
 
@@ -58,90 +59,73 @@
         overflow: hidden;
         display: flex;
 
-    > ul {
+        > ul {
-      padding: 0;
+            padding: 4px 0 0;
-      margin: 0;
+            margin: 0;
-      white-space: nowrap;
+            white-space: nowrap;
-      overflow: hidden;
+            overflow: hidden;
-      list-style: none;
+            list-style: none;
-      font-size: 0;
+            font-size: 0;
-    }
-
-    li {
-      display: inline-block;
-      height: 100%;
-      //background-color: #a6c995;
-
-        position: relative;
-        .tab-bg {
-            position: absolute;
-            height: 28px;
-            width: 100%;
-            top: 4px;
-            background-color: @tabs-bg-color;
         }
 
-        &:hover {
+        li {
-            .tab-bg {
+            display: inline-flex;
+            align-items: center;
+            height: 100%;
+
+            &:hover {
                 background-color: rgba(255,255,255,0.2);
             }
-        }
 
-        &.active {
+            &.active {
-            .tab-bg {
                 background-color: @gray-light;
             }
+
+
+            > a {
+                display: inline-block;
+                padding: 0 12px;
+                text-decoration: none;
+                cursor: default;
+                font-size: 12px;
+                text-align: center;
+                color: #fff;
+            }
+
+            &.active {
+                > a {
+                    color: #444;
+                }
+            }
         }
 
-
+        &:not(.short) {
-      > a {
+            .scroll {
-        display: inline-block;
+                display: none;
-        line-height: @height-tabs;
+            }
-        height: 100%;
+        }
-        padding: 1px 12px;
+
-        text-decoration: none;
+        .scroll {
-        cursor: default;
+            line-height: @height-tabs;
-        font-size: 12px;
+            min-width: 20px;
-        text-align: center;
+            text-align: center;
-        color: #fff;
+            z-index: 1;
-
+            cursor: pointer;
-          position: relative;
+            color: #fff;
-      }
+
-
+            &:hover {
-      &.active {
+                text-decoration: none;
-        > a {
+            }
-            color: #444;
+
+            &.left{
+                box-shadow: 5px 0 20px 5px @tabs-bg-color
+            }
+            &.right{
+                box-shadow: -5px 0 20px 5px @tabs-bg-color
+            }
         }
-      }
     }
 
-    &:not(.short) {
-      .scroll {
-        display: none;
-      }
-    }
-
-    .scroll {
-      line-height: @height-tabs;
-      min-width: 20px;
-      text-align: center;
-      z-index: 1;
-      cursor: pointer;
-      color: #fff;
-
-      &:hover {
-        text-decoration: none;
-      }
-
-      &.left{
-        box-shadow: 5px 0 20px 5px @tabs-bg-color
-      }
-      &.right{
-        box-shadow: -5px 0 20px 5px @tabs-bg-color
-      }
-    }
-  }
-
     .box-controls {
         //height: @height-controls;         // button has strange offset in IE when odd height
         padding: 10px 0;
@@ -229,11 +213,33 @@
             margin-top: 3px;
         }
     }
+
+    .top-title > & {
+        &:not(.folded) {
+            height: 28 + @height-controls;
+        }
+
+        &.folded {
+            height: 28px;
+
+            &.expanded {
+                height: 28 + @height-controls;
+            }
+        }
+
+        .tabs > ul {
+            padding-top: 0;
+        }
+
+        .box-tabs {
+            height: 28px;
+        }
+    }
+
 }
 
 .toolbar-fullview-panel {
     position: absolute;
-    top: @height-tabs;
     bottom: 0;
     width: 100%;
     z-index: 1041;
@@ -311,3 +317,4 @@
 .button-normal-icon(~'x-huge .btn-contents', 53, @toolbar-big-icon-size);
 .button-normal-icon(btn-controls,         54, @toolbar-big-icon-size);
 .button-normal-icon(~'x-huge .btn-select-pivot', 55, @toolbar-big-icon-size);
+.button-normal-icon(~'x-huge .btn-bookmarks', 56, @toolbar-big-icon-size);

apps/documenteditor/embed/js/ApplicationController.js

@@ -220,6 +220,9 @@ var ApplicationController = new(function(){
 
         hidePreloader();
 
+        var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -2);
+        (zf == -1) ? api.zoomFitToPage() : ((zf == -2) ? api.zoomFitToWidth() : api.zoom(zf>0 ? zf : 100));
+
         if ( !embedConfig.shareUrl )
             $('#idt-share').hide();
 
@@ -338,7 +341,6 @@ var ApplicationController = new(function(){
         api.asc_setViewMode(true);
         api.asc_LoadDocument();
         api.Resize();
-        api.zoomFitToWidth();
     }
 
     function showMask() {

apps/documenteditor/main/app.js

@@ -203,6 +203,7 @@ require([
         ,'common/main/lib/controller/ExternalMergeEditor'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         app.start();
     });

apps/documenteditor/main/app/collection/ShapeGroups.js

@@ -46,6 +46,7 @@ define([
         var Common = {};
 
     Common.Collections = Common.Collections || {};
+    DE.Collections = DE.Collections || {};
 
     DE.Collections.ShapeGroups = Backbone.Collection.extend({
         model: DE.Models.ShapeGroup

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

@@ -62,6 +62,7 @@ define([
                 },
                 'Common.Views.Header': {
                     'click:users': _.bind(this.clickStatusbarUsers, this),
+                    'file:settings': _.bind(this.clickToolbarSettings,this),
                     'history:show': function () {
                         if ( !this.leftMenu.panelHistory.isVisible() )
                             this.clickMenuFileItem('header', 'history');
@@ -91,7 +92,8 @@ define([
                 'Toolbar': {
                     'file:settings': _.bind(this.clickToolbarSettings,this),
                     'file:open': this.clickToolbarTab.bind(this, 'file'),
-                    'file:close': this.clickToolbarTab.bind(this, 'other')
+                    'file:close': this.clickToolbarTab.bind(this, 'other'),
+                    'save:disabled': this.changeToolbarSaveState.bind(this)
                 },
                 'SearchDialog': {
                     'hide': _.bind(this.onSearchDlgHide, this),
@@ -392,6 +394,10 @@ define([
                 this.leftMenu.menuFile.hide();
         },
 
+        changeToolbarSaveState: function (state) {
+            this.leftMenu.menuFile.getButton('save').setDisabled(state);
+        },
+
         /** coauthoring begin **/
         clickStatusbarUsers: function() {
             this.leftMenu.menuFile.panels['rights'].changeAccessRights();

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

@@ -44,7 +44,8 @@ define([
     'documenteditor/main/app/view/Links',
     'documenteditor/main/app/view/NoteSettingsDialog',
     'documenteditor/main/app/view/HyperlinkSettingsDialog',
-    'documenteditor/main/app/view/TableOfContentsSettings'
+    'documenteditor/main/app/view/TableOfContentsSettings',
+    'documenteditor/main/app/view/BookmarksDialog'
 ], function () {
     'use strict';
 
@@ -64,7 +65,8 @@ define([
                     'links:contents': this.onTableContents,
                     'links:update': this.onTableContentsUpdate,
                     'links:notes': this.onNotesClick,
-                    'links:hyperlink': this.onHyperlinkClick
+                    'links:hyperlink': this.onHyperlinkClick,
+                    'links:bookmarks': this.onBookmarksClick
                 },
                 'DocumentHolder': {
                     'links:contents': this.onTableContents,
@@ -311,6 +313,19 @@ define([
             }
         },
 
+        onBookmarksClick: function(btn) {
+            var me = this;
+            (new DE.Views.BookmarksDialog({
+                api: me.api,
+                props: me.api.asc_GetBookmarksManager(),
+                handler: function (result, settings) {
+                    if (settings) {
+                    }
+                    Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+                }
+            })).show();
+        },
+
         onShowContentControlsActions: function(action, x, y) {
             var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu,
                 documentHolderView  = this.getApplication().getController('DocumentHolder').documentHolder,

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

@@ -313,13 +313,16 @@ define([
                 this.plugins                    = this.editorConfig.plugins;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
-                appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '');
+                appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
+                            .setUserName(this.appOptions.user.fullname);
 
                 if (this.editorConfig.lang)
                     this.api.asc_setLocale(this.editorConfig.lang);
 
                 if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
                     Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
+
+                Common.Controllers.Desktop.init(this.appOptions);
             },
 
             loadDocument: function(data) {
@@ -588,11 +591,13 @@ define([
             },
 
             goBack: function() {
-                var href = this.appOptions.customization.goback.url;
+                if ( !Common.Controllers.Desktop.process('goback') ) {
-                if (this.appOptions.customization.goback.blank!==false) {
+                    var href = this.appOptions.customization.goback.url;
-                    window.open(href, "_blank");
+                    if (this.appOptions.customization.goback.blank!==false) {
-                } else {
+                        window.open(href, "_blank");
-                    parent.location.href = href;
+                    } else {
+                        parent.location.href = href;
+                    }
                 }
             },
 
@@ -622,12 +627,7 @@ define([
                         forcesave = this.appOptions.forcesave,
                         isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 
@@ -1072,7 +1072,7 @@ define([
                                                  (!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
                 this.appOptions.isEdit         = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
                 this.appOptions.canReview      = this.permissions.review === true && this.appOptions.canLicense && this.appOptions.isEdit;
-                this.appOptions.canUseHistory  = this.appOptions.canLicense && this.editorConfig.canUseHistory && this.appOptions.canCoAuthoring && !this.appOptions.isDesktopApp;
+                this.appOptions.canUseHistory  = this.appOptions.canLicense && this.editorConfig.canUseHistory && this.appOptions.canCoAuthoring && !this.appOptions.isOffline;
                 this.appOptions.canHistoryClose  = this.editorConfig.canHistoryClose;
                 this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore && !!this.permissions.changeHistory;
                 this.appOptions.canUseMailMerge= this.appOptions.canLicense && this.appOptions.canEdit && !this.appOptions.isOffline;
@@ -1518,15 +1518,10 @@ define([
                 var toolbarView = this.getApplication().getController('Toolbar').getView();
 
                 if (toolbarView && !toolbarView._state.previewmode) {
-                    var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnSave.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
 
                 /** coauthoring begin **/
@@ -1536,20 +1531,13 @@ define([
                 /** coauthoring end **/
             },
             onDocumentCanSaveChanged: function (isCanSave) {
-                var application = this.getApplication(),
+                var toolbarView = this.getApplication().getController('Toolbar').getView();
-                    toolbarController = application.getController('Toolbar'),
-                    toolbarView = toolbarController.getView();
 
                 if (toolbarView && this.api && !toolbarView._state.previewmode) {
                     var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 

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

@@ -55,6 +55,7 @@ define([
         ],
 
         initialize: function() {
+            var me = this;
             this.addListeners({
                 'Statusbar': {
                     'langchanged': this.onLangMenu,
@@ -62,6 +63,15 @@ define([
                         this.api.zoom(value);
                         Common.NotificationCenter.trigger('edit:complete', this.statusbar);
                     }.bind(this)
+                },
+                'Common.Views.Header': {
+                    'statusbar:hide': function (view, status) {
+                        me.statusbar.setVisible(!status);
+                        Common.localStorage.setBool('de-hidden-status', status);
+
+                        Common.NotificationCenter.trigger('layout:changed', 'status');
+                        Common.NotificationCenter.trigger('edit:complete', this.statusbar);
+                    }
                 }
             });
         },

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

@@ -114,10 +114,16 @@ define([
                     'menu:show': this.onFileMenu.bind(this, 'show')
                 },
                 'Common.Views.Header': {
+                    'toolbar:setcompact': this.onChangeCompactView.bind(this),
                     'print': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'save': function (opts) {
+                        this.api.asc_Save();
+                    },
+                    'undo': this.onUndo,
+                    'redo': this.onRedo,
                     'downloadas': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         var _file_type = _main.document.fileType,
@@ -228,7 +234,9 @@ define([
             toolbar.btnPrint.on('click',                                _.bind(this.onPrint, this));
             toolbar.btnSave.on('click',                                 _.bind(this.onSave, this));
             toolbar.btnUndo.on('click',                                 _.bind(this.onUndo, this));
+            toolbar.btnUndo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'undo:disabled'));
             toolbar.btnRedo.on('click',                                 _.bind(this.onRedo, this));
+            toolbar.btnRedo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'redo:disabled'));
             toolbar.btnCopy.on('click',                                 _.bind(this.onCopyPaste, this, true));
             toolbar.btnPaste.on('click',                                _.bind(this.onCopyPaste, this, false));
             toolbar.btnIncFontSize.on('click',                          _.bind(this.onIncrease, this));
@@ -289,7 +297,6 @@ define([
             toolbar.btnPageMargins.menu.on('item:click',                _.bind(this.onPageMarginsSelect, this));
             toolbar.btnClearStyle.on('click',                           _.bind(this.onClearStyleClick, this));
             toolbar.btnCopyStyle.on('toggle',                           _.bind(this.onCopyStyleToggle, this));
-            toolbar.btnAdvSettings.on('click',                          _.bind(this.onAdvSettingsClick, this));
             toolbar.mnuPageSize.on('item:click',                        _.bind(this.onPageSizeClick, this));
             toolbar.mnuColorSchema.on('item:click',                     _.bind(this.onColorSchemaClick, this));
             toolbar.btnMailRecepients.on('click',                       _.bind(this.onSelectRecepientsClick, this));
@@ -301,13 +308,6 @@ define([
             toolbar.listStyles.on('click',                              _.bind(this.onListStyleSelect, this));
             toolbar.listStyles.on('contextmenu',                        _.bind(this.onListStyleContextMenu, this));
             toolbar.styleMenu.on('hide:before',                         _.bind(this.onListStyleBeforeHide, this));
-            toolbar.mnuitemHideStatusBar.on('toggle',                   _.bind(this.onHideStatusBar, this));
-            toolbar.mnuitemHideRulers.on('toggle',                      _.bind(this.onHideRulers, this));
-            toolbar.mnuitemCompactToolbar.on('toggle',                  _.bind(this.onChangeCompactView, this));
-            toolbar.btnFitPage.on('toggle',                             _.bind(this.onZoomToPageToggle, this));
-            toolbar.btnFitWidth.on('toggle',                            _.bind(this.onZoomToWidthToggle, this));
-            toolbar.mnuZoomIn.on('click',                               _.bind(this.onZoomInClick, this));
-            toolbar.mnuZoomOut.on('click',                              _.bind(this.onZoomOutClick, this));
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
 
             $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this));
@@ -355,6 +355,7 @@ define([
             this.api.asc_registerCallback('asc_onColumnsProps',         _.bind(this.onColumnsProps, this));
             this.api.asc_registerCallback('asc_onSectionProps',         _.bind(this.onSectionProps, this));
             this.api.asc_registerCallback('asc_onContextMenu',          _.bind(this.onContextMenu, this));
+            this.api.asc_registerCallback('asc_onShowParaMarks',        _.bind(this.onShowParaMarks, this));
         },
 
         onChangeCompactView: function(view, compact) {
@@ -371,7 +372,6 @@ define([
                 var me = this;
                 setTimeout(function () {
                     me.onChangeCompactView(null, !me.toolbar.isCompact());
-                    me.toolbar.mnuitemCompactToolbar.setChecked(me.toolbar.isCompact(), true);
                 }, 0);
             }
         },
@@ -517,14 +517,9 @@ define([
 
                 var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
 
-                if (btnHorizontalAlign.rendered) {
+                if ( btnHorizontalAlign.rendered && btnHorizontalAlign.$icon ) {
-                    var iconEl = $('.icon', btnHorizontalAlign.cmpEl);
+                    btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align);
-
+                    btnHorizontalAlign.options.icls = align;
-                    if (iconEl) {
-                        iconEl.removeClass(btnHorizontalAlign.options.icls);
-                        btnHorizontalAlign.options.icls = align;
-                        iconEl.addClass(btnHorizontalAlign.options.icls);
-                    }
                 }
 
                 if (v === null || v===undefined) {
@@ -614,6 +609,12 @@ define([
             }
         },
 
+        onShowParaMarks: function(v) {
+            this.toolbar.mnuNonPrinting.items[0].setChecked(v, true);
+            this.toolbar.btnShowHidenChars.toggle(v, true);
+            Common.localStorage.setItem("de-show-hiddenchars", v);
+        },
+
         onApiFocusObject: function(selectedObjects) {
             if (!this.editMode) return;
 
@@ -733,7 +734,7 @@ define([
 
             var in_footnote = this.api.asc_IsCursorInFootnote();
             need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control;
-            toolbar.btnsPageBreak.disable(need_disable);
+            toolbar.btnsPageBreak.setDisabled(need_disable);
 
             need_disable = paragraph_locked || header_locked || !can_add_image || in_equation || control_plain;
             toolbar.btnInsertImage.setDisabled(need_disable);
@@ -766,10 +767,8 @@ define([
                 toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
 
             need_disable = (paragraph_locked || header_locked) && this.api.can_AddQuotedComment() || image_locked;
-            if (this.btnsComment && this.btnsComment.length>0 && need_disable != this.btnsComment[0].isDisabled())
+            if ( this.btnsComment && this.btnsComment.length > 0 )
-                _.each (this.btnsComment, function(item){
+                this.btnsComment.setDisabled(need_disable);
-                    item.setDisabled(need_disable);
-                }, this);
 
             this._state.in_equation = in_equation;
         },
@@ -838,12 +837,7 @@ define([
             this.toolbar.mnuInsertPageNum.setDisabled(false);
         },
 
-        onApiZoomChange: function(percent, type) {
+        onApiZoomChange: function(percent, type) {},
-            this.toolbar.btnFitPage.setChecked(type == 2, true);
-            this.toolbar.btnFitWidth.setChecked(type == 1, true);
-            this.toolbar.mnuZoom.options.value = percent;
-            $('.menu-zoom .zoom', this.toolbar.el).html(percent + '%');
-        },
 
         onApiStartHighlight: function(pressed) {
             this.toolbar.btnHighlightColor.toggle(pressed, true);
@@ -914,18 +908,14 @@ define([
             var toolbar = this.toolbar;
             if (this.api) {
                 var isModified = this.api.asc_isDocumentCanSave();
-                var isSyncButton = $('.icon', toolbar.btnSave.cmpEl).hasClass('btn-synch');
+                var isSyncButton = toolbar.btnCollabChanges.$icon.hasClass('btn-synch');
                 if (!isModified && !isSyncButton && !toolbar.mode.forcesave)
                     return;
 
                 this.api.asc_Save();
             }
 
-            toolbar.btnsSave.forEach(function(button) {
+            toolbar.btnSave.setDisabled(!toolbar.mode.forcesave);
-                if ( button ) {
-                    button.setDisabled(!toolbar.mode.forcesave);
-                }
-            });
 
             Common.NotificationCenter.trigger('edit:complete', toolbar);
 
@@ -933,6 +923,13 @@ define([
             Common.component.Analytics.trackEvent('ToolBar', 'Save');
         },
 
+        onBtnChangeState: function(prop) {
+            if ( /\:disabled$/.test(prop) ) {
+                var _is_disabled = arguments[2];
+                this.toolbar.fireEvent(prop, [_is_disabled]);
+            }
+        },
+
         onUndo: function(btn, e) {
             if (this.api)
                 this.api.Undo();
@@ -1071,14 +1068,11 @@ define([
 
         onMenuHorizontalAlignSelect: function(menu, item) {
             this._state.pralign = undefined;
-            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign,
+            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
-                iconEl = $('.icon', btnHorizontalAlign.cmpEl);
 
-            if (iconEl) {
+            btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls);
-                iconEl.removeClass(btnHorizontalAlign.options.icls);
+            btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
-                btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
+            btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls);
-                iconEl.addClass(btnHorizontalAlign.options.icls);
-            }
 
             if (this.api && item.checked)
                 this.api.put_PrAlign(item.value);
@@ -1408,11 +1402,6 @@ define([
             this.modeAlwaysSetStyle = state;
         },
 
-        onAdvSettingsClick: function(btn, e) {
-            this.toolbar.fireEvent('file:settings', this);
-            btn.cmpEl.blur();
-        },
-
         onPageSizeClick: function(menu, item, state) {
             if (this.api && state) {
                 this._state.pgsize = [0, 0];
@@ -1986,61 +1975,6 @@ define([
         //     Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         // },
 
-        onHideStatusBar: function(item, checked) {
-            var headerView  = this.getApplication().getController('Statusbar').getView('Statusbar');
-            headerView  && headerView.setVisible(!checked);
-
-            Common.localStorage.setBool('de-hidden-status', checked);
-
-            Common.NotificationCenter.trigger('layout:changed', 'status');
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onHideRulers: function(item, checked) {
-            if (this.api) {
-                this.api.asc_SetViewRulers(!checked);
-            }
-
-            Common.localStorage.setBool('de-hidden-rulers', checked);
-
-            Common.NotificationCenter.trigger('layout:changed', 'rulers');
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomToPageToggle: function(item, state) {
-            if (this.api) {
-                if (state)
-                    this.api.zoomFitToPage();
-                else
-                    this.api.zoomCustomMode();
-            }
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomToWidthToggle: function(item, state) {
-            if (this.api) {
-                if (state)
-                    this.api.zoomFitToWidth();
-                else
-                    this.api.zoomCustomMode();
-            }
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomInClick: function(btn) {
-            if (this.api)
-                this.api.zoomIn();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomOutClick: function(btn) {
-            if (this.api)
-                this.api.zoomOut();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
         _clearBullets: function() {
             this.toolbar.btnMarkers.toggle(false, true);
             this.toolbar.btnNumbers.toggle(false, true);
@@ -2709,17 +2643,12 @@ define([
 
             disable = disable || (reviewmode ? toolbar_mask.length>0 : group_mask.length>0);
             toolbar.$el.find('.toolbar').toggleClass('masked', disable);
-            toolbar.btnHide.setDisabled(disable);
             if ( toolbar.synchTooltip )
                 toolbar.synchTooltip.hide();
 
             toolbar._state.previewmode = reviewmode && disable;
             if (reviewmode) {
-                toolbar._state.previewmode && toolbar.btnsSave.forEach(function(button) {
+                toolbar._state.previewmode && toolbar.btnSave.setDisabled(true);
-                    if ( button ) {
-                        button.setDisabled(true);
-                    }
-                });
 
                 if (toolbar.needShowSynchTip) {
                     toolbar.needShowSynchTip = false;
@@ -2776,12 +2705,24 @@ define([
                 if ( $panel )
                     me.toolbar.addTab(tab, $panel, 4);
 
-                if (config.isDesktopApp && config.isOffline) {
+                me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
-                    tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                if ( config.isDesktopApp ) {
-                    $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                    // hide 'print' and 'save' buttons group and next separator
+                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                    if ( $panel )
+                    // hide 'undo' and 'redo' buttons and retrieve parent container
-                        me.toolbar.addTab(tab, $panel, 5);
+                    var $box =  me.toolbar.btnUndo.$el.hide().next().hide().parent();
+
+                    // move 'paste' button to the container instead of 'undo' and 'redo'
+                    me.toolbar.btnPaste.$el.detach().appendTo($box);
+                    me.toolbar.btnCopy.$el.removeClass('split');
+
+                    if ( config.isOffline ) {
+                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+
+                        if ($panel) me.toolbar.addTab(tab, $panel, 5);
+                    }
                 }
 
                 var links = me.getApplication().getController('Links');
@@ -2794,7 +2735,7 @@ define([
             var me = this;
 
             if ( config.canCoAuthoring && config.canComments ) {
-                this.btnsComment = [];
+                this.btnsComment = createButtonSet();
                 var slots = me.toolbar.$el.find('.slot-comment');
                 slots.each(function(index, el) {
                     var _cls = 'btn-toolbar';
@@ -2807,7 +2748,7 @@ define([
                         caption: me.toolbar.capBtnComment
                     }).render( slots.eq(index) );
 
-                    me.btnsComment.push(button);
+                    me.btnsComment.add(button);
                 });
 
                 if ( this.btnsComment.length ) {

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

@@ -49,7 +49,7 @@ define([
 ], function (Viewport) {
     'use strict';
 
-    DE.Controllers.Viewport = Backbone.Controller.extend({
+    DE.Controllers.Viewport = Backbone.Controller.extend(_.assign({
         // Specifying a Viewport model
         models: [],
 
@@ -68,6 +68,10 @@ define([
 
             var me = this;
             this.addListeners({
+                'FileMenu': {
+                    'menu:hide': me.onFileMenu.bind(me, 'hide'),
+                    'menu:show': me.onFileMenu.bind(me, 'show')
+                },
                 'Toolbar': {
                     'render:before' : function (toolbar) {
                         var config = DE.getController('Main').appOptions;
@@ -75,7 +79,26 @@ define([
                         toolbar.setExtra('left', me.header.getPanel('left', config));
                     },
                     'view:compact'  : function (toolbar, state) {
-                        me.viewport.vlayout.panels[0].height = state ? 32 : 32+67;
+                        me.header.mnuitemCompactToolbar.setChecked(state, true);
+                        me.viewport.vlayout.getItem('toolbar').height = state ?
+                                Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal');
+                    },
+                    'undo:disabled' : function (state) {
+                        if ( me.header.btnUndo ) {
+                            if ( me.header.btnUndo.keepState )
+                                me.header.btnUndo.keepState.disabled = state;
+                            else me.header.btnUndo.setDisabled(state);
+                        }
+                    },
+                    'redo:disabled' : function (state) {
+                        if ( me.header.btnRedo )
+                            if ( me.header.btnRedo.keepState )
+                                me.header.btnRedo.keepState.disabled = state;
+                            else me.header.btnRedo.setDisabled(state);
+                    },
+                    'save:disabled' : function (state) {
+                        if ( me.header.btnSave )
+                            me.header.btnSave.setDisabled(state);
                     }
                 }
             });
@@ -83,6 +106,7 @@ define([
 
         setApi: function(api) {
             this.api = api;
+            this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this));
         },
 
 
@@ -108,16 +132,151 @@ define([
             this.boxSdk = $('#editor_sdk');
             this.boxSdk.css('border-left', 'none');
 
+            this.header.mnuitemFitPage = this.header.fakeMenuItem();
+            this.header.mnuitemFitWidth = this.header.fakeMenuItem();
+
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
         },
 
         onAppShowed: function (config) {
             var me = this;
+            me.appConfig = config;
+
+            var _intvars = Common.Utils.InternalSettings;
+            var $filemenu = $('.toolbar-fullview-panel');
+            $filemenu.css('top', _intvars.get('toolbar-height-tabs'));
 
             if ( !config.isEdit ||
                 ( !Common.localStorage.itemExists("de-compact-toolbar") &&
                 config.customization && config.customization.compactToolbar )) {
-                me.viewport.vlayout.panels[0].height = 32;
+
+                var panel = me.viewport.vlayout.getItem('toolbar');
+                if ( panel ) panel.height = _intvars.get('toolbar-height-tabs');
+            }
+
+            if ( config.isDesktopApp && config.isEdit ) {
+                var $title = me.viewport.vlayout.getItem('title').el;
+                $title.html(me.header.getPanel('title', config)).show();
+
+                var toolbar = me.viewport.vlayout.getItem('toolbar');
+                toolbar.el.addClass('top-title');
+                toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
+
+                var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
+                _intvars.set('toolbar-height-tabs', _tabs_new_height);
+                _intvars.set('toolbar-height-compact', _tabs_new_height);
+                _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
+
+                $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
+
+                toolbar = me.getApplication().getController('Toolbar').getView();
+                toolbar.btnCollabChanges = me.header.btnSave;
+            }
+        },
+
+        onAppReady: function (config) {
+            var me = this;
+            if ( me.header.btnOptions ) {
+                var compactview = !config.isEdit;
+                if ( config.isEdit ) {
+                    if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
+                        compactview = Common.localStorage.getBool("de-compact-toolbar");
+                    } else
+                    if ( config.customization && config.customization.compactToolbar )
+                        compactview = true;
+                }
+
+                me.header.mnuitemCompactToolbar = new Common.UI.MenuItem({
+                    caption: me.header.textCompactView,
+                    checked: compactview,
+                    checkable: true,
+                    value: 'toolbar'
+                });
+
+                var mnuitemHideStatusBar = new Common.UI.MenuItem({
+                    caption: me.header.textHideStatusBar,
+                    checked: Common.localStorage.getBool("de-hidden-status"),
+                    checkable: true,
+                    value: 'statusbar'
+                });
+
+                if ( config.canBrandingExt && config.customization && config.customization.statusBar === false )
+                    mnuitemHideStatusBar.hide();
+
+                var mnuitemHideRulers = new Common.UI.MenuItem({
+                    caption: me.header.textHideLines,
+                    checked: Common.localStorage.getBool("de-hidden-rulers"),
+                    checkable: true,
+                    value: 'rulers'
+                });
+
+                me.header.mnuitemFitPage = new Common.UI.MenuItem({
+                    caption: me.textFitPage,
+                    checkable: true,
+                    checked: me.header.mnuitemFitPage.isChecked(),
+                    value: 'zoom:page'
+                });
+
+                me.header.mnuitemFitWidth = new Common.UI.MenuItem({
+                    caption: me.textFitWidth,
+                    checkable: true,
+                    checked: me.header.mnuitemFitWidth.isChecked(),
+                    value: 'zoom:width'
+                });
+
+                me.header.mnuZoom = new Common.UI.MenuItem({
+                    template: _.template([
+                        '<div id="hdr-menu-zoom" class="menu-zoom" style="height: 25px;" ',
+                            '<% if(!_.isUndefined(options.stopPropagation)) { %>',
+                                'data-stopPropagation="true"',
+                            '<% } %>', '>',
+                            '<label class="title">' + me.header.textZoom + '</label>',
+                            '<button id="hdr-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomup">&nbsp;</i></button>',
+                            '<label class="zoom"><%= options.value %>%</label>',
+                            '<button id="hdr-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomdown">&nbsp;</i></button>',
+                        '</div>'
+                    ].join('')),
+                    stopPropagation: true,
+                    value: me.header.mnuZoom.options.value
+                });
+
+                me.header.btnOptions.setMenu(new Common.UI.Menu({
+                        cls: 'pull-right',
+                        style: 'min-width: 180px;',
+                        items: [
+                            me.header.mnuitemCompactToolbar,
+                            mnuitemHideStatusBar,
+                            mnuitemHideRulers,
+                            {caption:'--'},
+                            me.header.mnuitemFitPage,
+                            me.header.mnuitemFitWidth,
+                            me.header.mnuZoom,
+                            {caption:'--'},
+                            new Common.UI.MenuItem({
+                                caption: me.header.textAdvSettings,
+                                value: 'advanced'
+                            })
+                        ]
+                    })
+                );
+
+                var _on_btn_zoom = function (btn) {
+                    btn == 'up' ? me.api.zoomIn() : me.api.zoomOut();
+                    Common.NotificationCenter.trigger('edit:complete', me.header);
+                };
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-out', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'down'));
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-in', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'up'));
+
+                me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
             }
         },
 
@@ -161,6 +320,51 @@ define([
         onWindowResize: function(e) {
             this.onLayoutChanged('window');
             Common.NotificationCenter.trigger('window:resize');
-        }
+        },
-    });
+
+        onFileMenu: function (opts) {
+            var me = this;
+            var _need_disable =  opts == 'show';
+
+            me.header.lockHeaderBtns( 'undo', _need_disable );
+            me.header.lockHeaderBtns( 'redo', _need_disable );
+            me.header.lockHeaderBtns( 'opts', _need_disable );
+        },
+
+        onApiZoomChange: function(percent, type) {
+            this.header.mnuitemFitPage.setChecked(type == 2, true);
+            this.header.mnuitemFitWidth.setChecked(type == 1, true);
+            this.header.mnuZoom.options.value = percent;
+
+            if ( this.header.mnuZoom.$el )
+                $('.menu-zoom label.zoom', this.header.mnuZoom.$el).html(percent + '%');
+        },
+
+        onOptionsItemClick: function (menu, item, e) {
+            var me = this;
+
+            switch ( item.value ) {
+            case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break;
+            case 'statusbar': me.header.fireEvent('statusbar:hide', [item, item.isChecked()]); break;
+            case 'rulers':
+                me.api.asc_SetViewRulers(!item.isChecked());
+                Common.localStorage.setBool('de-hidden-rulers', item.isChecked());
+                Common.NotificationCenter.trigger('layout:changed', 'rulers');
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'zoom:page':
+                item.isChecked() ? me.api.zoomFitToPage() : me.api.zoomCustomMode();
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'zoom:width':
+                item.isChecked() ? me.api.zoomFitToWidth() : me.api.zoomCustomMode();
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'advanced': me.header.fireEvent('file:settings', me.header); break;
+            }
+        },
+
+        textFitPage: 'Fit to Page',
+        textFitWidth: 'Fit to Width'
+    }, DE.Controllers.Viewport));
 });

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

@@ -8,7 +8,6 @@
             <ul>
                 <% for(var i in tabs) { %>
                     <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                        <div class="tab-bg" />
                         <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
                     </li>
                 <% } %>
@@ -93,16 +92,7 @@
                         <span class="btn-slot" id="slot-btn-mailrecepients"></span>
                     </div>
                 </div>
-                <div class="group" id="slot-field-styles">
+                <div class="group" id="slot-field-styles"></div>
-                </div>
-                <div class="group no-mask">
-                    <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-hidebars"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot" id="slot-btn-settings"></span>
-                    </div>
-                </div>
             </section>
             <section class="panel" data-tab="ins">
                 <div class="group">
@@ -171,6 +161,7 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <span class="btn-slot text x-huge slot-inshyperlink"></span>
+                    <!--<span class="btn-slot text x-huge" id="slot-btn-bookmarks"></span>-->
                 </div>
             </section>
         </section>

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

@@ -3,6 +3,7 @@
         <section class="layout-ct">
             <div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
         </section>
+        <section id="app-title" class="layout-item"></section>
         <div id="toolbar" class="layout-item"></div>
         <div class="layout-item middle">
             <div id="viewport-hbox-layout" class="layout-ct hbox">

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

@@ -0,0 +1,303 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+/**
+ *  BookmarksDialog.js.js
+ *
+ *  Created by Julia Radzhabova on 15.02.2018
+ *  Copyright (c) 2017 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+    'common/main/lib/util/utils',
+    'common/main/lib/component/ListView',
+    'common/main/lib/component/InputField',
+    'common/main/lib/component/Button',
+    'common/main/lib/component/RadioBox',
+    'common/main/lib/view/AdvancedSettingsWindow'
+], function () { 'use strict';
+
+    DE.Views.BookmarksDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
+        options: {
+            contentWidth: 300,
+            height: 360
+        },
+
+        initialize : function(options) {
+            var me = this;
+
+            _.extend(this.options, {
+                title: this.textTitle,
+                template: [
+                    '<div class="box" style="height:' + (me.options.height - 85) + 'px;">',
+                        '<div class="content-panel" style="padding: 0 5px;"><div class="inner-content">',
+                            '<div class="settings-panel active">',
+                                '<table cols="1" style="width: 100%;">',
+                                    '<tr>',
+                                        '<td class="padding-extra-small">',
+                                        '<label class="input-label">', me.textBookmarkName, '</label>',
+                                        '</td>',
+                                    '</tr>',
+                                    '<tr>',
+                                        '<td class="padding-large">',
+                                            '<div id="bookmarks-txt-name" style="display:inline-block;vertical-align: top;margin-right: 10px;"></div>',
+                                            '<button type="button" result="add" class="btn btn-text-default" id="bookmarks-btn-add" style="vertical-align: top;">', me.textAdd,'</button>',
+                                        '</td>',
+                                    '</tr>',
+                                    '<tr>',
+                                        '<td class="padding-extra-small">',
+                                            '<label class="header" style="margin-right: 10px;">', me.textSort,'</label>',
+                                            '<div id="bookmarks-radio-name" style="display: inline-block; margin-right: 10px;"></div>',
+                                            '<div id="bookmarks-radio-location" style="display: inline-block;"></div>',
+                                        '</td>',
+                                    '</tr>',
+                                    '<tr>',
+                                        '<td class="padding-small">',
+                                        '<div id="bookmarks-list" style="width:100%; height: 130px;"></div>',
+                                        '</td>',
+                                    '</tr>',
+                                    '<tr>',
+                                        '<td class="padding-large">',
+                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-goto" style="margin-right: 10px;">', me.textGoto,'</button>',
+                                            '<button type="button" class="btn btn-text-default" id="bookmarks-btn-delete" style="">', me.textDelete,'</button>',
+                                        '</td>',
+                                    '</tr>',
+                                    '<tr>',
+                                        '<td>',
+                                            '<div id="bookmarks-checkbox-hidden"></div>',
+                                        '</td>',
+                                    '</tr>',
+                                '</table>',
+                            '</div></div>',
+                        '</div>',
+                    '</div>',
+                    '<div class="footer right">',
+                    '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + me.textClose + '</button>',
+                    '</div>'
+                ].join('')
+            }, options);
+
+            this.api        = options.api;
+            this.handler    = options.handler;
+            this.props      = options.props;
+
+            Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
+        },
+
+        render: function() {
+            Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
+            var me = this;
+
+            this.txtName = new Common.UI.InputField({
+                el          : $('#bookmarks-txt-name'),
+                allowBlank  : true,
+                validateOnChange: true,
+                validateOnBlur: false,
+                style       : 'width: 195px;',
+                value       : '',
+                maxLength: 40
+            }).on('changing', _.bind(this.onNameChanging, this));
+
+            this.radioName = new Common.UI.RadioBox({
+                el: $('#bookmarks-radio-name'),
+                labelText: this.textName,
+                name: 'asc-radio-bookmark-sort',
+                checked: true
+            });
+            this.radioName.on('change', _.bind(this.onRadioSort, this));
+
+            this.radioLocation = new Common.UI.RadioBox({
+                el: $('#bookmarks-radio-location'),
+                labelText: this.textLocation,
+                name: 'asc-radio-bookmark-sort'
+            });
+            this.radioLocation.on('change', _.bind(this.onRadioSort, this));
+
+            this.bookmarksList = new Common.UI.ListView({
+                el: $('#bookmarks-list', this.$window),
+                store: new Common.UI.DataViewStore(),
+                itemTemplate: _.template('<div id="<%= id %>" class="list-item" style="pointer-events:none;"><%= value %></div>')
+            });
+            this.bookmarksList.store.comparator = function(rec) {
+                return (me.radioName.getValue() ? rec.get("value") : rec.get("location"));
+            };
+            this.bookmarksList.on('item:dblclick', _.bind(this.onDblClickBookmark, this));
+            this.bookmarksList.on('entervalue', _.bind(this.onPrimary, this));
+            this.bookmarksList.on('item:select', _.bind(this.onSelectBookmark, this));
+
+            this.btnAdd = new Common.UI.Button({
+                el: $('#bookmarks-btn-add'),
+                disabled: true
+            });
+            this.$window.find('#bookmarks-btn-add').on('click', _.bind(this.onDlgBtnClick, this));
+
+            this.btnGoto = new Common.UI.Button({
+                el: $('#bookmarks-btn-goto'),
+                disabled: true
+            });
+            this.btnGoto.on('click', _.bind(this.gotoBookmark, this));
+
+            this.btnDelete = new Common.UI.Button({
+                el: $('#bookmarks-btn-delete'),
+                disabled: true
+            });
+            this.btnDelete.on('click', _.bind(this.deleteBookmark, this));
+
+            this.chHidden = new Common.UI.CheckBox({
+                el: $('#bookmarks-checkbox-hidden'),
+                labelText: this.textHidden,
+                value: Common.Utils.InternalSettings.get("de-bookmarks-hidden") || false
+            });
+            this.chHidden.on('change', _.bind(this.onChangeHidden, this));
+
+            this.afterRender();
+        },
+
+        afterRender: function() {
+            this._setDefaults(this.props);
+        },
+
+        show: function() {
+            Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments);
+        },
+
+        close: function() {
+            Common.Views.AdvancedSettingsWindow.prototype.close.apply(this, arguments);
+            Common.Utils.InternalSettings.set("de-bookmarks-hidden", this.chHidden.getValue()=='checked');
+        },
+
+        _setDefaults: function (props) {
+            this.refreshBookmarks();
+            this.bookmarksList.scrollToRecord(this.bookmarksList.selectByIndex(0));
+        },
+
+        getSettings: function () {
+            return {};
+        },
+
+        onDlgBtnClick: function(event) {
+            var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event;
+            if (state == 'add') {
+                this.props.asc_AddBookmark(this.txtName.getValue());
+            }
+
+            this.close();
+        },
+
+        onPrimary: function() {
+            return true;
+        },
+
+        refreshBookmarks: function() {
+            if (this.props) {
+                var store = this.bookmarksList.store,
+                    count = this.props.asc_GetCount(),
+                    showHidden = this.chHidden.getValue()=='checked',
+                    arr = [];
+                for (var i=0; i<count; i++) {
+                    var name = this.props.asc_GetName(i);
+                    if (!this.props.asc_IsInternalUseBookmark(name) && (showHidden || !this.props.asc_IsHiddenBookmark(name))) {
+                        var rec = new Common.UI.DataViewModel();
+                        rec.set({
+                            value: name,
+                            location: i
+                        });
+                        arr.push(rec);
+                    }
+                }
+                store.reset(arr, {silent: false});
+            }
+        },
+
+        onSelectBookmark: function(listView, itemView, record) {
+            var value = record.get('value');
+            this.txtName.setValue(value);
+            this.btnAdd.setDisabled(false);
+            this.btnGoto.setDisabled(false);
+            this.btnDelete.setDisabled(false);
+        },
+
+        gotoBookmark: function(btn, eOpts){
+            var rec = this.bookmarksList.getSelectedRec();
+            if (rec.length>0) {
+                this.props.asc_GoToBookmark(rec[0].get('value'));
+            }
+        },
+
+        onDblClickBookmark: function(listView, itemView, record) {
+            this.props.asc_GoToBookmark(record.get('value'));
+        },
+
+        deleteBookmark: function(btn, eOpts){
+            var rec = this.bookmarksList.getSelectedRec();
+            if (rec.length>0) {
+                this.props.asc_RemoveBookmark(rec[0].get('value'));
+                var store = this.bookmarksList.store;
+                var idx = _.indexOf(store.models, rec[0]);
+                store.remove(rec[0]);
+            }
+        },
+
+        onRadioSort: function(field, newValue, eOpts) {
+            if (newValue) {
+                this.bookmarksList.store.sort();
+                this.bookmarksList.onResetItems();
+            }
+        },
+
+        onChangeHidden: function(field, newValue, oldValue, eOpts){
+            this.refreshBookmarks();
+        },
+
+        onNameChanging: function (input, value) {
+            var exist = this.props.asc_HaveBookmark(value);
+            this.bookmarksList.deselectAll();
+            this.btnAdd.setDisabled(!this.props.asc_CheckNewBookmarkName(value) && !exist);
+            this.btnGoto.setDisabled(!exist);
+            this.btnDelete.setDisabled(!exist);
+        },
+
+        textTitle:    'Bookmarks',
+        textLocation: 'Location',
+        textBookmarkName: 'Bookmark name',
+        textSort: 'Sort by',
+        textName: 'Name',
+        textAdd: 'Add',
+        textGoto: 'Go to',
+        textDelete: 'Delete',
+        textClose: 'Close',
+        textHidden: 'Hidden bookmarks'
+
+    }, DE.Views.BookmarksDialog || {}))
+});

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

@@ -556,12 +556,13 @@ define([
                         ToolTip = getUserName(moveData.get_UserId());
 
                         showPoint = [moveData.get_X()+me._XY[0], moveData.get_Y()+me._XY[1]];
+                        var maxwidth = showPoint[0];
                         showPoint[0] = me._BodyWidth - showPoint[0];
                         showPoint[1] -= ((moveData.get_LockedObjectType()==2) ? me._TtHeight : 0);
 
                         if (showPoint[1] > me._XY[1] && showPoint[1]+me._TtHeight < me._XY[1]+me._Height)  {
                             src.text(ToolTip);
-                            src.css({visibility: 'visible', top: showPoint[1] + 'px', right: showPoint[0] + 'px'});
+                            src.css({visibility: 'visible', top: showPoint[1] + 'px', right: showPoint[0] + 'px', 'max-width': maxwidth + 'px'});
                         } else {
                             src.css({visibility: 'hidden'});
                         }
@@ -2263,6 +2264,43 @@ define([
                 }
             });
 
+            var menuImgReplace = new Common.UI.MenuItem({
+                caption     : me.textReplace,
+                menu        : new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        new Common.UI.MenuItem({
+                            caption     : this.textFromFile
+                        }).on('click', function(item) {
+                            setTimeout(function(){
+                                if (me.api) me.api.ChangeImageFromFile();
+                                me.fireEvent('editcomplete', me);
+                            }, 10);
+                        }),
+                        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') {
+                                        if (me.api) {
+                                            var checkUrl = value.replace(/ /g, '');
+                                            if (!_.isEmpty(checkUrl)) {
+                                                var props = new Asc.asc_CImgProperty();
+                                                props.put_ImageUrl(checkUrl);
+                                                me.api.ImgApply(props);
+                                            }
+                                        }
+                                    }
+                                    me.fireEvent('editcomplete', me);
+                                }
+                            })).show();
+                        })
+                    ]
+                })
+            });
+
             var menuImgCopy = new Common.UI.MenuItem({
                 caption : me.textCopy,
                 value : 'copy'
@@ -2340,13 +2378,19 @@ define([
 
                     menuChartEdit.setVisible(!_.isNull(value.imgProps.value.get_ChartProperties()) && !onlyCommonProps);
 
-                    me.menuOriginalSize.setVisible(value.imgProps.isOnlyImg);
+                    me.menuOriginalSize.setVisible(value.imgProps.isOnlyImg || !value.imgProps.isChart && !value.imgProps.isShape);
-                    me.pictureMenu.items[10].setVisible(menuChartEdit.isVisible() || me.menuOriginalSize.isVisible());
+
+                    var pluginGuid = value.imgProps.value.asc_getPluginGuid();
+                    menuImgReplace.setVisible(value.imgProps.isOnlyImg && (pluginGuid===null || pluginGuid===undefined));
+                    if (menuImgReplace.isVisible())
+                        menuImgReplace.setDisabled(islocked || pluginGuid===null);
 
                     var islocked = value.imgProps.locked || (value.headerProps!==undefined && value.headerProps.locked);
                     if (menuChartEdit.isVisible())
                         menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts());
 
+                    me.pictureMenu.items[14].setVisible(menuChartEdit.isVisible());
+
                     me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined);
                     menuImageAdvanced.setDisabled(islocked);
                     menuImageAlign.setDisabled( islocked || (wrapping == Asc.c_oAscWrapStyle2.Inline) );
@@ -2389,6 +2433,7 @@ define([
                     me.menuImageWrap,
                     { caption: '--' },
                     me.menuOriginalSize,
+                    menuImgReplace,
                     menuChartEdit,
                     { caption: '--' },
                     menuImageAdvanced
@@ -3728,7 +3773,10 @@ define([
         textTOCSettings: 'Table of contents settings',
         textTOC: 'Table of contents',
         textRefreshField: 'Refresh field',
-        txtPasteSourceFormat: 'Keep source formatting'
+        txtPasteSourceFormat: 'Keep source formatting',
+        textReplace:    'Replace image',
+        textFromUrl:    'From URL',
+        textFromFile:   'From File'
 
     }, DE.Views.DocumentHolder || {}));
 });

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

@@ -58,7 +58,7 @@ define([
         ],[
 //            {name: 'DOC',            imgCls: 'doc-format btn-doc',   type: Asc.c_oAscFileType.DOC},
             {name: 'ODT',   imgCls: 'odt',   type: Asc.c_oAscFileType.ODT},
-//            {name: 'RTF',   imgCls: 'doc-format btn-rtf',   type: Asc.c_oAscFileType.RTF},
+            {name: 'RTF',   imgCls: 'rtf',   type: Asc.c_oAscFileType.RTF},
             {name: 'HTML (Zipped)',  imgCls: 'html',  type: Asc.c_oAscFileType.HTML}
 //            {name: 'EPUB',  imgCls: 'doc-format btn-epub',  type: Asc.c_oAscFileType.EPUB}
         ]],

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

@@ -42,6 +42,11 @@
 if (Common === undefined)
     var Common = {};
 
+var c_oHyperlinkType = {
+    InternalLink:0,
+    WebLink: 1
+};
+
 define([
     'common/main/lib/util/utils',
     'common/main/lib/component/InputField',
@@ -61,11 +66,20 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box">',
+                '<div class="box" style="height: 150px;">',
-                    '<div class="input-row">',
+                    '<div class="input-row hidden" style="margin-bottom: 10px;">',
-                        '<label>' + this.textUrl + ' *</label>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternal,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternal,'</button>',
+                    '</div>',
+                    '<div id="id-external-link">',
+                        '<div class="input-row">',
+                            '<label>' + this.textUrl + ' *</label>',
+                        '</div>',
+                        '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
+                    '</div>',
+                    '<div id="id-internal-link">',
+                        '<div id="id-dlg-hyperlink-list" style="width:100%; height: 130px;border: 1px solid #cfcfcf;"></div>',
                     '</div>',
-                    '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '<div class="input-row">',
                         '<label>' + this.textDisplay + '</label>',
                     '</div>',
@@ -94,6 +108,23 @@ define([
             var me = this,
                 $window = this.getChild();
 
+            me.btnExternal = new Common.UI.Button({
+                el: $('#id-dlg-hyperlink-external'),
+                enableToggle: true,
+                toggleGroup: 'hyperlink-type',
+                allowDepress: false,
+                pressed: true
+            });
+            me.btnExternal.on('click', _.bind(me.onLinkTypeClick, me, c_oHyperlinkType.WebLink));
+
+            me.btnInternal = new Common.UI.Button({
+                el: $('#id-dlg-hyperlink-internal'),
+                enableToggle: true,
+                toggleGroup: 'hyperlink-type',
+                allowDepress: false
+            });
+            me.btnInternal.on('click', _.bind(me.onLinkTypeClick, me, c_oHyperlinkType.InternalLink));
+
             me.inputUrl = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-url'),
                 allowBlank  : false,
@@ -122,8 +153,117 @@ define([
                 maxLength   : Asc.c_oAscMaxTooltipLength
             });
 
+            me.internalList = new Common.UI.TreeView({
+                el: $('#id-dlg-hyperlink-list'),
+                store: new Common.UI.TreeViewStore(),
+                enableKeyEvents: true
+            });
+            me.internalList.on('item:select', _.bind(this.onSelectItem, this));
+
+            me.btnOk = new Common.UI.Button({
+                el: $window.find('.primary')
+            });
+
             $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
             $window.find('input').on('keypress', _.bind(this.onKeyPress, this));
+            me.externalPanel = $window.find('#id-external-link');
+            me.internalPanel = $window.find('#id-internal-link');
+        },
+
+        ShowHideElem: function(value) {
+            this.externalPanel.toggleClass('hidden', value !== c_oHyperlinkType.WebLink);
+            this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink);
+            var store = this.internalList.store;
+            if (value==c_oHyperlinkType.InternalLink) {
+                if (store.length<1) {
+                    var anchors = this.api.asc_GetHyperlinkAnchors(),
+                        count = anchors.length,
+                        prev_level = 0,
+                        header_level = 0,
+                        arr = [];
+                    arr.push(new Common.UI.TreeViewModel({
+                        name : this.txtBeginning,
+                        level: 0,
+                        index: 0,
+                        hasParent: false,
+                        isEmptyItem: false,
+                        isNotHeader: true,
+                        hasSubItems: false
+                    }));
+                    arr.push(new Common.UI.TreeViewModel({
+                        name : this.txtHeadings,
+                        level: 0,
+                        index: 1,
+                        hasParent: false,
+                        isEmptyItem: false,
+                        isNotHeader: false,
+                        hasSubItems: false
+                    }));
+
+                    for (var i=0; i<count; i++) {
+                        var anchor = anchors[i],
+                            level = anchors[i].asc_GetHeadingLevel(),
+                            hasParent = true;
+                        if (anchor.asc_GetType()== Asc.c_oAscHyperlinkAnchor.Heading){
+                            if (level>prev_level)
+                                arr[arr.length-1].set('hasSubItems', true);
+                            if (level<=header_level) {
+                                header_level = level;
+                                hasParent = false;
+                            }
+                            arr.push(new Common.UI.TreeViewModel({
+                                name : anchor.asc_GetHeadingText(),
+                                level: level,
+                                index: i+2,
+                                hasParent: hasParent,
+                                type: Asc.c_oAscHyperlinkAnchor.Heading,
+                                headingParagraph: anchor.asc_GetHeadingParagraph()
+                            }));
+                            prev_level = level;
+                        }
+                    }
+                    arr.push(new Common.UI.TreeViewModel({
+                        name : this.txtBookmarks,
+                        level: 0,
+                        index: arr.length,
+                        hasParent: false,
+                        isEmptyItem: false,
+                        isNotHeader: false,
+                        hasSubItems: false
+                    }));
+
+                    prev_level = 0;
+                    for (var i=0; i<count; i++) {
+                        var anchor = anchors[i],
+                            hasParent = true;
+                        if (anchor.asc_GetType()== Asc.c_oAscHyperlinkAnchor.Bookmark){
+                            if (prev_level<1)
+                                arr[arr.length-1].set('hasSubItems', true);
+                            arr.push(new Common.UI.TreeViewModel({
+                                name : anchor.asc_GetBookmarkName(),
+                                level: 1,
+                                index: arr.length,
+                                hasParent: false,
+                                type: Asc.c_oAscHyperlinkAnchor.Bookmark
+                            }));
+                            prev_level = 1;
+                        }
+                    }
+                    store.reset(arr);
+                }
+                var rec = this.internalList.getSelectedRec();
+                this.btnOk.setDisabled(rec.length<1 || rec[0].get('level')==0 && rec[0].get('index')>0);
+
+            } else
+                this.btnOk.setDisabled(false);
+        },
+
+        onLinkTypeClick: function(type, btn, event) {
+            this.ShowHideElem(type);
+        },
+
+        onSelectItem: function(picker, item, record, e){
+            this.btnOk.setDisabled(record.get('level')==0 && record.get('index')>0);
         },
 
         show: function() {
@@ -139,10 +279,32 @@ define([
             if (props) {
                 var me = this;
 
-                if (props.get_Value()) {
+                // var bookmark = props.get_Bookmark(),
-                    me.inputUrl.setValue(props.get_Value().replace(new RegExp(" ",'g'), "%20"));
+                //     type = (bookmark === null || bookmark=='') ? c_oHyperlinkType.WebLink : c_oHyperlinkType.InternalLink;
+
+                var type = c_oHyperlinkType.WebLink;
+                (type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
+                me.ShowHideElem(type);
+
+                if (type == c_oHyperlinkType.WebLink) {
+                    if (props.get_Value()) {
+                        me.inputUrl.setValue(props.get_Value().replace(new RegExp(" ",'g'), "%20"));
+                    } else {
+                        me.inputUrl.setValue('');
+                    }
                 } else {
-                    me.inputUrl.setValue('');
+                    if (props.is_TopOfDocument())
+                        this.internalList.selectByIndex(0);
+                    else if (props.is_Heading()) {
+                        var heading = props.get_Heading(),
+                            rec = this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Heading, headingParagraph: heading });
+                        if (rec)
+                            this.internalList.scrollToRecord(this.internalList.selectRecord(rec));
+                    } else {
+                        var rec = this.internalList.store.findWhere({type: Asc.c_oAscHyperlinkAnchor.Bookmark, name: bookmark});
+                        if (rec)
+                            this.internalList.scrollToRecord(this.internalList.selectRecord(rec));
+                    }
                 }
 
                 if (props.get_Text() !== null) {
@@ -163,17 +325,34 @@ define([
         getSettings: function () {
             var me      = this,
                 props   = new Asc.CHyperlinkProperty(),
-                url     = $.trim(me.inputUrl.getValue());
+                display = '';
 
-            if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
+            if (this.btnExternal.isActive()) {//WebLink
-                url = ( (me.isEmail) ? 'mailto:' : 'http://' ) + url;
+                var url     = $.trim(me.inputUrl.getValue());
 
-            url = url.replace(new RegExp("%20",'g')," ");
+                if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
-            props.put_Value(url);
+                    url = ( (me.isEmail) ? 'mailto:' : 'http://' ) + url;
+
+                url = url.replace(new RegExp("%20",'g')," ");
+                props.put_Value(url);
+                // props.put_Bookmark(null);
+                display = url;
+            } else {
+                var rec = this.internalList.getSelectedRec();
+                if (rec.length>0) {
+                    props.put_Bookmark(rec[0].get('name'));
+                    if (rec[0].get('index')==0)
+                        props.put_TopOfDocument();
+                    var para = rec[0].get('headingParagraph');
+                    if (para)
+                        props.put_Heading(para);
+                    display = rec[0].get('name');
+                }
+            }
 
             if (!me.inputDisplay.isDisabled() && ( this.isTextChanged || _.isEmpty(me.inputDisplay.getValue()))) {
                 if (_.isEmpty(me.inputDisplay.getValue()))
-                    me.inputDisplay.setValue(url);
+                    me.inputDisplay.setValue(display);
                 props.put_Text(me.inputDisplay.getValue());
             } else {
                 props.put_Text(null);
@@ -199,13 +378,17 @@ define([
         _handleInput: function(state) {
             if (this.options.handler) {
                 if (state == 'ok') {
-                    var checkurl = this.inputUrl.checkValidate(),
+                    if (this.btnExternal.isActive()) {//WebLink
-                        checkdisp = this.inputDisplay.checkValidate();
+                        if (this.inputUrl.checkValidate() !== true)  {
-                    if (checkurl !== true)  {
+                            this.inputUrl.cmpEl.find('input').focus();
-                        this.inputUrl.cmpEl.find('input').focus();
+                            return;
-                        return;
+                        }
+                    } else {
+                        var rec = this.internalList.getSelectedRec();
+                        if (rec.length<1 || rec[0].get('level')==0 && rec[0].get('index')>0)
+                            return;
                     }
-                    if (checkdisp !== true) {
+                    if (this.inputDisplay.checkValidate() !== true) {
                         this.inputDisplay.cmpEl.find('input').focus();
                         return;
                     }
@@ -225,6 +408,11 @@ define([
         txtNotUrl:          'This field should be a URL in the format \"http://www.example.com\"',
         textTooltip:        'ScreenTip text',
         textDefault:        'Selected text',
-        textTitle:          'Hyperlink Settings'
+        textTitle:          'Hyperlink Settings',
+        textExternal:       'External Link',
+        textInternal:       'Place in Document',
+        txtBeginning: 'Beginning of document',
+        txtHeadings: 'Headings',
+        txtBookmarks: 'Bookmarks'
     }, DE.Views.HyperlinkSettingsDialog || {}))
 });

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 = section.get_W() - section.get_LeftMargin() - section.get_RightMargin(),
+                    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/Links.js

@@ -101,6 +101,10 @@ define([
                     me.fireEvent('links:hyperlink');
                 });
             });
+
+            this.btnBookmarks.on('click', function (b, e) {
+                me.fireEvent('links:bookmarks');
+            });
         }
 
         return {
@@ -161,6 +165,15 @@ define([
                 _injectComponent('#slot-btn-contents-update', this.btnContentsUpdate);
                 this.paragraphControls.push(this.btnContentsUpdate);
 
+                this.btnBookmarks = new Common.UI.Button({
+                    cls: 'btn-toolbar x-huge icon-top',
+                    iconCls: 'btn-bookmarks',
+                    caption: this.capBtnBookmarks,
+                    disabled: true
+                });
+                _injectComponent('#slot-btn-bookmarks', this.btnBookmarks);
+                this.paragraphControls.push(this.btnBookmarks);
+
                 this._state = {disabled: false};
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
@@ -255,6 +268,8 @@ define([
                         btn.updateHint(me.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
                     });
 
+                    me.btnBookmarks.updateHint(me.tipBookmarks);
+
                     setEvents.call(me);
                 });
             },
@@ -293,7 +308,9 @@ define([
             capBtnInsFootnote: 'Footnotes',
             confirmDeleteFootnotes: 'Do you want to delete all footnotes?',
             capBtnInsLink: 'Hyperlink',
-            tipInsertHyperlink: 'Add Hyperlink'
+            tipInsertHyperlink: 'Add Hyperlink',
+            capBtnBookmarks: 'Bookmark',
+            tipBookmarks: 'Create a bookmark'
         }
     }()), DE.Views.Links || {}));
 });

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

@@ -120,22 +120,25 @@ define([
                 this.btnSave = new Common.UI.Button({
                     id: 'id-toolbar-btn-save',
                     cls: 'btn-toolbar',
-                    iconCls: 'no-mask ' + this.btnSaveCls
+                    iconCls: 'no-mask ' + this.btnSaveCls,
+                    signals: ['disabled']
                 });
                 this.toolbarControls.push(this.btnSave);
-                this.btnsSave = [this.btnSave];
+                this.btnCollabChanges = this.btnSave;
 
                 this.btnUndo = new Common.UI.Button({
                     id: 'id-toolbar-btn-undo',
                     cls: 'btn-toolbar',
-                    iconCls: 'btn-undo'
+                    iconCls: 'btn-undo',
+                    signals: ['disabled']
                 });
                 this.toolbarControls.push(this.btnUndo);
 
                 this.btnRedo = new Common.UI.Button({
                     id: 'id-toolbar-btn-redo',
                     cls: 'btn-toolbar',
-                    iconCls: 'btn-redo'
+                    iconCls: 'btn-redo',
+                    signals: ['disabled']
                 });
                 this.toolbarControls.push(this.btnRedo);
 
@@ -941,33 +944,6 @@ define([
                     iconCls: 'btn-mailrecepients'
                 });
 
-                this.btnHide = new Common.UI.Button({
-                    id: 'id-toolbar-btn-hidebars',
-                    cls: 'btn-toolbar',
-                    iconCls: 'btn-hidebars no-mask',
-                    menu: true
-                });
-                this.toolbarControls.push(this.btnHide);
-
-                this.btnFitPage = {
-                    conf: {checked: false},
-                    setChecked: function (val) {
-                        this.conf.checked = val;
-                    },
-                    isChecked: function () {
-                        return this.conf.checked;
-                    }
-                };
-                this.btnFitWidth = clone(this.btnFitPage);
-                this.mnuZoom = {options: {value: 100}};
-
-                this.btnAdvSettings = new Common.UI.Button({
-                    id: 'id-toolbar-btn-settings',
-                    cls: 'btn-toolbar',
-                    iconCls: 'btn-settings no-mask'
-                });
-                this.toolbarControls.push(this.btnAdvSettings);
-
                 me.btnImgAlign = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
                     iconCls: 'btn-img-align',
@@ -1195,9 +1171,9 @@ define([
                     }
                 });
 
+                me.setTab('home');
                 if ( me.isCompactView )
-                    me.setFolded(true); else
+                    me.setFolded(true);
-                    me.setTab('home');
 
                 var top = Common.localStorage.getItem("de-pgmargins-top"),
                     left = Common.localStorage.getItem("de-pgmargins-left"),
@@ -1288,8 +1264,6 @@ define([
                 _injectComponent('#slot-btn-clearstyle', this.btnClearStyle);
                 _injectComponent('#slot-btn-copystyle', this.btnCopyStyle);
                 _injectComponent('#slot-btn-colorschemas', this.btnColorSchemas);
-                _injectComponent('#slot-btn-hidebars', this.btnHide);
-                _injectComponent('#slot-btn-settings', this.btnAdvSettings);
                 _injectComponent('#slot-btn-paracolor', this.btnParagraphColor);
                 _injectComponent('#slot-field-styles', this.listStyles);
                 _injectComponent('#slot-btn-halign', this.btnHorizontalAlign);
@@ -1303,12 +1277,7 @@ define([
                 +function injectBreakButtons() {
                     var me = this;
 
-                    me.btnsPageBreak = [];
+                    me.btnsPageBreak = createButtonSet();
-                    me.btnsPageBreak.disable = function(status) {
-                        this.forEach(function(btn) {
-                            btn.setDisabled(status);
-                        });
-                    };
 
                     var $slots = $host.find('.btn-slot.btn-pagebreak');
                     $slots.each(function(index, el) {
@@ -1323,7 +1292,7 @@ define([
                             menu: true
                         }).render( $slots.eq(index) );
 
-                        me.btnsPageBreak.push(button);
+                        me.btnsPageBreak.add(button);
                     });
 
                     Array.prototype.push.apply(me.paragraphControls, me.btnsPageBreak);
@@ -1519,7 +1488,7 @@ define([
                 this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M'));
                 this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M'));
                 this.btnLineSpace.updateHint(this.tipLineSpace);
-                this.btnShowHidenChars.updateHint(this.tipShowHiddenChars);
+                this.btnShowHidenChars.updateHint(this.tipShowHiddenChars + Common.Utils.String.platformKey('Ctrl+*'));
                 this.btnMarkers.updateHint(this.tipMarkers);
                 this.btnNumbers.updateHint(this.tipNumbers);
                 this.btnMultilevels.updateHint(this.tipMultilevels);
@@ -1541,67 +1510,14 @@ define([
                 this.btnCopyStyle.updateHint(this.tipCopyStyle + Common.Utils.String.platformKey('Ctrl+Shift+C'));
                 this.btnColorSchemas.updateHint(this.tipColorSchemas);
                 this.btnMailRecepients.updateHint(this.tipMailRecepients);
-                this.btnHide.updateHint(this.tipViewSettings);
-                this.btnAdvSettings.updateHint(this.tipAdvSettings);
 
                 // set menus
 
                 var me = this;
 
-                this.btnHide.setMenu(new Common.UI.Menu({
-                        cls: 'pull-right',
-                        style: 'min-width: 180px;',
-                        items: [
-                            this.mnuitemCompactToolbar = new Common.UI.MenuItem({
-                                caption: this.textCompactView,
-                                checked: me.isCompactView,
-                                checkable: true
-                            }),
-                            this.mnuitemHideStatusBar = new Common.UI.MenuItem({
-                                caption: this.textHideStatusBar,
-                                checked: Common.localStorage.getBool("de-hidden-status"),
-                                checkable: true
-                            }),
-                            this.mnuitemHideRulers = new Common.UI.MenuItem({
-                                caption: this.textHideLines,
-                                checked: Common.localStorage.getBool("de-hidden-rulers"),
-                                checkable: true
-                            }),
-                            {caption: '--'},
-                            this.btnFitPage = new Common.UI.MenuItem({
-                                caption: this.textFitPage,
-                                checkable: true,
-                                checked: this.btnFitPage.isChecked()
-                            }),
-                            this.btnFitWidth = new Common.UI.MenuItem({
-                                caption: this.textFitWidth,
-                                checkable: true,
-                                checked: this.btnFitWidth.isChecked()
-                            }),
-                            this.mnuZoom = new Common.UI.MenuItem({
-                                template: _.template([
-                                    '<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25px;" ',
-                                    '<% if(!_.isUndefined(options.stopPropagation)) { %>',
-                                    'data-stopPropagation="true"',
-                                    '<% } %>', '>',
-                                    '<label class="title">' + this.textZoom + '</label>',
-                                    '<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomup">&nbsp;</i></button>',
-                                    '<label class="zoom"><%= options.value %>%</label>',
-                                    '<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomdown">&nbsp;</i></button>',
-                                    '</div>'
-                                ].join('')),
-                                stopPropagation: true,
-                                value: this.mnuZoom.options.value
-                            })
-                        ]
-                    })
-                );
                 // if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header === false)
                 //     this.mnuitemHideTitleBar.hide();
 
-                if (this.mode.canBrandingExt && this.mode.customization && this.mode.customization.statusBar===false)
-                    this.mnuitemHideStatusBar.hide();
-
                 this.btnMarkers.setMenu(
                     new Common.UI.Menu({
                         style: 'min-width: 139px',
@@ -1659,15 +1575,6 @@ define([
                 this.paragraphControls.push(this.mnuPageNumCurrentPos);
                 this.paragraphControls.push(this.mnuInsertPageCount);
 
-                this.mnuZoomOut = new Common.UI.Button({
-                    el: $('#id-menu-zoom-out'),
-                    cls: 'btn-toolbar'
-                });
-                this.mnuZoomIn = new Common.UI.Button({
-                    el: $('#id-menu-zoom-in'),
-                    cls: 'btn-toolbar'
-                });
-
                 // set dataviews
 
                 var _conf = this.mnuMarkersPicker.conf;
@@ -1967,13 +1874,6 @@ define([
                     maxRows: 8,
                     maxColumns: 10
                 });
-
-                var btnsave = DE.getController('LeftMenu').getView('LeftMenu').getMenu('file').getButton('save');
-                if (btnsave && this.btnsSave) {
-                    this.btnsSave.push(btnsave);
-                    this.toolbarControls.push(btnsave);
-                    btnsave.setDisabled(this.btnsSave[0].isDisabled());
-                }
             },
 
             onToolbarAfterRender: function(toolbar) {
@@ -2057,11 +1957,7 @@ define([
 
             setMode: function (mode) {
                 if (mode.isDisconnected) {
-                    this.btnsSave.forEach(function(button) {
+                    this.btnSave.setDisabled(true);
-                        if ( button ) {
-                            button.setDisabled(true);
-                        }
-                    });
                     if (mode.disableDownload)
                         this.btnPrint.setDisabled(true);
                 }
@@ -2133,65 +2029,54 @@ define([
             /** coauthoring begin **/
             onCollaborativeChanges: function () {
                 if (this._state.hasCollaborativeChanges) return;
-                if (!this.btnSave.rendered || this._state.previewmode) {
+                if (!this.btnCollabChanges.rendered || this._state.previewmode) {
                     this.needShowSynchTip = true;
                     return;
                 }
 
                 this._state.hasCollaborativeChanges = true;
-                var iconEl = $('.icon', this.btnSave.cmpEl);
+                this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch');
-                iconEl.removeClass(this.btnSaveCls);
-                iconEl.addClass('btn-synch');
                 if (this.showSynchTip) {
-                    this.btnSave.updateHint('');
+                    this.btnCollabChanges.updateHint('');
                     if (this.synchTooltip === undefined)
                         this.createSynchTip();
 
                     this.synchTooltip.show();
                 } else {
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                 }
 
-                this.btnsSave.forEach(function(button) {
+                this.btnSave.setDisabled(false);
-                    if ( button ) {
-                        button.setDisabled(false);
-                    }
-                });
                 Common.Gateway.collaborativeChanges();
             },
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
-                    target: $('#id-toolbar-btn-save')
+                    target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {
                     this.showSynchTip = false;
                     this.synchTooltip.hide();
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                     Common.localStorage.setItem("de-hide-synch", 1);
                 }, this);
                 this.synchTooltip.on('closeclick', function () {
                     this.synchTooltip.hide();
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                 }, this);
             },
 
             synchronizeChanges: function () {
-                if (!this._state.previewmode && this.btnSave.rendered) {
+                if ( !this._state.previewmode && this.btnCollabChanges.rendered ) {
-                    var iconEl = $('.icon', this.btnSave.cmpEl),
+                    var me = this;
-                        me = this;
 
-                    if (iconEl.hasClass('btn-synch')) {
+                    if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) {
-                        iconEl.removeClass('btn-synch');
+                        me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(me.btnSaveCls);
-                        iconEl.addClass(this.btnSaveCls);
                         if (this.synchTooltip)
                             this.synchTooltip.hide();
-                        this.btnSave.updateHint(this.btnSaveTip);
+                        this.btnCollabChanges.updateHint(this.btnSaveTip);
-                        this.btnsSave.forEach(function(button) {
+
-                            if ( button ) {
+                        this.btnSave.setDisabled(!me.mode.forcesave);
-                                button.setDisabled(!me.mode.forcesave);
-                            }
-                        });
                         this._state.hasCollaborativeChanges = false;
                     }
                 }
@@ -2204,18 +2089,18 @@ define([
                         editusers.push(item);
                 });
 
+                var me = this;
                 var length = _.size(editusers);
                 var cls = (length > 1) ? 'btn-save-coauth' : 'btn-save';
-                if (cls !== this.btnSaveCls && this.btnSave.rendered) {
+                if ( cls !== me.btnSaveCls && me.btnCollabChanges.rendered ) {
-                    this.btnSaveTip = ((length > 1) ? this.tipSaveCoauth : this.tipSave ) + Common.Utils.String.platformKey('Ctrl+S');
+                    me.btnSaveTip = ((length > 1) ? me.tipSaveCoauth : me.tipSave ) + Common.Utils.String.platformKey('Ctrl+S');
+
+                    if ( !me.btnCollabChanges.$icon.hasClass('btn-synch') ) {
+                        me.btnCollabChanges.$icon.removeClass(me.btnSaveCls).addClass(cls);
+                        me.btnCollabChanges.updateHint(me.btnSaveTip);
 
-                    var iconEl = $('.icon', this.btnSave.cmpEl);
-                    if (!iconEl.hasClass('btn-synch')) {
-                        iconEl.removeClass(this.btnSaveCls);
-                        iconEl.addClass(cls);
-                        this.btnSave.updateHint(this.btnSaveTip);
                     }
-                    this.btnSaveCls = cls;
+                    me.btnSaveCls = cls;
                 }
             },
 
@@ -2329,15 +2214,6 @@ define([
             tipInsertText: 'Insert Text',
             tipInsertTextArt: 'Insert Text Art',
             tipHAligh: 'Horizontal Align',
-            tipViewSettings: 'View Settings',
-            tipAdvSettings: 'Advanced Settings',
-            textCompactView: 'Hide Toolbar',
-            textHideTitleBar: 'Hide Title Bar',
-            textHideStatusBar: 'Hide Status Bar',
-            textHideLines: 'Hide Rulers',
-            textFitPage: 'Fit to Page',
-            textFitWidth: 'Fit to Width',
-            textZoom: 'Zoom',
             mniEditDropCap: 'Drop Cap Settings',
             textNone: 'None',
             textInText: 'In Text',

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

@@ -83,9 +83,15 @@ define([
             this.vlayout = new Common.UI.VBoxLayout({
                 box: $container,
                 items: [{
+                        el: $container.find('> .layout-item#app-title').hide(),
+                        alias: 'title',
+                        height: Common.Utils.InternalSettings.get('document-title-height')
+                    }, {
                         el: $container.find(' > .layout-item#toolbar'),
+                        alias: 'toolbar',
                         // rely: true
-                        height: Common.localStorage.getBool('de-compact-toolbar') ? 32 : 32+67
+                        height: Common.localStorage.getBool('de-compact-toolbar') ?
+                            Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal')
                     }, {
                         el: $container.find(' > .layout-item.middle'),
                         stretch: true

apps/documenteditor/main/app_dev.js

@@ -193,6 +193,7 @@ require([
         ,'common/main/lib/controller/ExternalMergeEditor'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         window.compareVersions = true;
         app.start();

apps/documenteditor/main/locale/en.json

@@ -153,6 +153,12 @@
   "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",
@@ -779,6 +785,18 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "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.textClose": "Close",
+  "DE.Views.BookmarksDialog.textHidden": "Hidden bookmarks",
   "DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ChartSettings.textArea": "Area",
   "DE.Views.ChartSettings.textBar": "Bar",
@@ -1005,6 +1023,9 @@
   "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",
@@ -1169,6 +1190,11 @@
   "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.ImageSettings.textAdvanced": "Show advanced settings",
   "DE.Views.ImageSettings.textEdit": "Edit",
   "DE.Views.ImageSettings.textEditObject": "Edit Object",
@@ -1283,6 +1309,8 @@
   "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",
@@ -1745,14 +1773,14 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Hide Toolbar",
+  "del_DE.Views.Toolbar.textCompactView": "Hide Toolbar",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
-  "DE.Views.Toolbar.textFitPage": "Fit to Page",
+  "del_DE.Views.Toolbar.textFitPage": "Fit to Page",
-  "DE.Views.Toolbar.textFitWidth": "Fit to Width",
+  "del_DE.Views.Toolbar.textFitWidth": "Fit to Width",
-  "DE.Views.Toolbar.textHideLines": "Hide Rulers",
+  "del_DE.Views.Toolbar.textHideLines": "Hide Rulers",
-  "DE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
+  "del_DE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
-  "DE.Views.Toolbar.textHideTitleBar": "Hide Title 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",
@@ -1806,8 +1834,8 @@
   "DE.Views.Toolbar.textToCurrent": "To current position",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Underline",
-  "DE.Views.Toolbar.textZoom": "Zoom",
+  "del_DE.Views.Toolbar.textZoom": "Zoom",
-  "DE.Views.Toolbar.tipAdvSettings": "Advanced settings",
+  "del_DE.Views.Toolbar.tipAdvSettings": "Advanced settings",
   "DE.Views.Toolbar.tipAlignCenter": "Align center",
   "DE.Views.Toolbar.tipAlignJust": "Justified",
   "DE.Views.Toolbar.tipAlignLeft": "Align left",
@@ -1863,7 +1891,7 @@
   "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",
-  "DE.Views.Toolbar.tipViewSettings": "View settings",
+  "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/ko.json

@@ -115,6 +115,7 @@
   "Common.Views.Comments.textAddComment": "덧글 추가",
   "Common.Views.Comments.textAddCommentToDoc": "문서에 설명 추가",
   "Common.Views.Comments.textAddReply": "답장 추가",
+  "Common.Views.Comments.textAnonym": "손님",
   "Common.Views.Comments.textCancel": "취소",
   "Common.Views.Comments.textClose": "닫기",
   "Common.Views.Comments.textComments": "Comments",
@@ -142,10 +143,13 @@
   "Common.Views.Header.labelCoUsersDescr": "문서는 현재 여러 사용자가 편집하고 있습니다.",
   "Common.Views.Header.textBack": "문서로 이동",
   "Common.Views.Header.textSaveBegin": "저장 중 ...",
+  "Common.Views.Header.textSaveChanged": "수정된",
   "Common.Views.Header.textSaveEnd": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.textSaveExpander": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.tipAccessRights": "문서 액세스 권한 관리",
   "Common.Views.Header.tipDownload": "파일을 다운로드",
+  "Common.Views.Header.tipGoEdit": "현재 파일 편집",
+  "Common.Views.Header.tipPrint": "파일 출력",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
   "Common.Views.Header.txtRename": "이름 바꾸기",
@@ -173,46 +177,82 @@
   "Common.Views.LanguageDialog.btnOk": "Ok",
   "Common.Views.LanguageDialog.labelSelect": "문서 언어 선택",
   "Common.Views.OpenDialog.cancelButtonText": "취소",
+  "Common.Views.OpenDialog.closeButtonText": "파일 닫기",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "인코딩",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "비밀번호가 맞지 않음",
   "Common.Views.OpenDialog.txtPassword": "비밀번호",
+  "Common.Views.OpenDialog.txtPreview": "미리보기",
   "Common.Views.OpenDialog.txtTitle": "% 1 옵션 선택",
   "Common.Views.OpenDialog.txtTitleProtected": "보호 된 파일",
   "Common.Views.PasswordDialog.cancelButtonText": "취소",
   "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "문서 보호용 비밀번호를 세팅하세요",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "확인 비밀번호가 같지 않음",
   "Common.Views.PasswordDialog.txtPassword": "암호",
+  "Common.Views.PasswordDialog.txtRepeat": "비밀번호 반복",
+  "Common.Views.PasswordDialog.txtTitle": "비밀번호 설정",
   "Common.Views.PluginDlg.textLoading": "로드 중",
   "Common.Views.Plugins.groupCaption": "플러그인",
   "Common.Views.Plugins.strPlugins": "플러그인",
   "Common.Views.Plugins.textLoading": "로드 중",
   "Common.Views.Plugins.textStart": "시작",
+  "Common.Views.Plugins.textStop": "정지",
+  "Common.Views.Protection.hintAddPwd": "비밀번호로 암호화",
+  "Common.Views.Protection.hintPwd": "비밀번호 변경 또는 삭제",
+  "Common.Views.Protection.hintSignature": "디지털 서명 또는 서명 라인을 추가 ",
+  "Common.Views.Protection.txtAddPwd": "비밀번호 추가",
   "Common.Views.Protection.txtChangePwd": "비밀번호를 변경",
+  "Common.Views.Protection.txtDeletePwd": "비밀번호 삭제",
+  "Common.Views.Protection.txtEncrypt": "암호화",
+  "Common.Views.Protection.txtInvisibleSignature": "디지털 서명을 추가",
+  "Common.Views.Protection.txtSignature": "서명",
+  "Common.Views.Protection.txtSignatureLine": "서명 라인",
   "Common.Views.RenameDialog.cancelButtonText": "취소",
   "Common.Views.RenameDialog.okButtonText": "Ok",
   "Common.Views.RenameDialog.textName": "파일 이름",
   "Common.Views.RenameDialog.txtInvalidName": "파일 이름에 다음 문자를 포함 할 수 없습니다 :",
   "Common.Views.ReviewChanges.hintNext": "다음 변경 사항",
   "Common.Views.ReviewChanges.hintPrev": "이전 변경으로",
+  "Common.Views.ReviewChanges.strFast": "빠르게",
+  "Common.Views.ReviewChanges.strFastDesc": "실시간 협력 편집. 모든 변경사항들은 자동적으로 저장됨.",
+  "Common.Views.ReviewChanges.strStrict": "엄격한",
+  "Common.Views.ReviewChanges.strStrictDesc": "귀하와 다른 사람이 변경사항을 동기화 하려면 '저장'버튼을 사용하세요.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "협력 편집 모드 세팅",
   "Common.Views.ReviewChanges.tipHistory": "버전 표시",
   "Common.Views.ReviewChanges.tipRejectCurrent": "현재 변경 거부",
   "Common.Views.ReviewChanges.tipReview": "변경 내용 추적",
+  "Common.Views.ReviewChanges.tipReviewView": "변경사항이 표시될 모드 선택",
   "Common.Views.ReviewChanges.tipSetDocLang": "문서 언어 설정",
   "Common.Views.ReviewChanges.tipSetSpelling": "맞춤법 검사",
+  "Common.Views.ReviewChanges.tipSharing": "문서 액세스 권한 관리",
   "Common.Views.ReviewChanges.txtAccept": "수락",
   "Common.Views.ReviewChanges.txtAcceptAll": "모든 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtAcceptChanges": "변경 접수",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtChat": "채팅",
   "Common.Views.ReviewChanges.txtClose": "닫기",
   "Common.Views.ReviewChanges.txtCoAuthMode": "공동 편집 모드",
   "Common.Views.ReviewChanges.txtDocLang": "언어",
+  "Common.Views.ReviewChanges.txtFinal": "모든 변경 접수됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtFinalCap": "최종",
   "Common.Views.ReviewChanges.txtHistory": "버전 기록",
+  "Common.Views.ReviewChanges.txtMarkup": "모든 변경 (편집)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "마크업",
   "Common.Views.ReviewChanges.txtNext": "다음 변경 사항",
+  "Common.Views.ReviewChanges.txtOriginal": "모든 변경 거부됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "오리지널",
   "Common.Views.ReviewChanges.txtPrev": "이전 변경으로",
   "Common.Views.ReviewChanges.txtReject": "거부",
   "Common.Views.ReviewChanges.txtRejectAll": "모든 변경 사항 거부",
+  "Common.Views.ReviewChanges.txtRejectChanges": "변경 거부",
   "Common.Views.ReviewChanges.txtRejectCurrent": "현재 변경 거부",
+  "Common.Views.ReviewChanges.txtSharing": "공유",
   "Common.Views.ReviewChanges.txtSpelling": "맞춤법 검사",
   "Common.Views.ReviewChanges.txtTurnon": "변경 내용 추적",
+  "Common.Views.ReviewChanges.txtView": "디스플레이 모드",
+  "Common.Views.ReviewChangesDialog.textTitle": "변경사항 다시보기",
   "Common.Views.ReviewChangesDialog.txtAccept": "수락",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "모든 변경 내용 적용",
   "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "현재 변경 내용 적용",
@@ -224,11 +264,28 @@
   "Common.Views.SignDialog.cancelButtonText": "취소",
   "Common.Views.SignDialog.okButtonText": "OK",
   "Common.Views.SignDialog.textBold": "볼드체",
+  "Common.Views.SignDialog.textCertificate": "인증",
   "Common.Views.SignDialog.textChange": "변경",
+  "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
+  "Common.Views.SignDialog.textItalic": "이탈릭",
+  "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelectImage": "이미지 선택",
+  "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
+  "Common.Views.SignDialog.textTitle": "서명문서",
+  "Common.Views.SignDialog.textUseImage": "또는 서명으로 그림을 사용하려면 '이미지 선택'을 클릭",
+  "Common.Views.SignDialog.textValid": "%1에서 %2까지 유효",
+  "Common.Views.SignDialog.tipFontName": "폰트명",
   "Common.Views.SignDialog.tipFontSize": "글꼴 크기",
   "Common.Views.SignSettingsDialog.cancelButtonText": "취소",
   "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "서명 대화창에 서명자의 코멘트 추가 허용",
+  "Common.Views.SignSettingsDialog.textInfo": "서명자 정보",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "이메일",
   "Common.Views.SignSettingsDialog.textInfoName": "이름",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
+  "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
+  "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "DE.Controllers.LeftMenu.leavePageText": "이 문서의 모든 저장되지 않은 변경 사항이 손실됩니다. <br>취소 를 클릭 한 다음저장 \"을 클릭하여 저장하십시오. 저장되지 않은 변경 사항. ",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
@@ -258,6 +315,7 @@
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
   "DE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "DE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "DE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "DE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",
   "DE.Controllers.Main.errorMailMergeLoadFile": "로드 실패",
@@ -323,22 +381,31 @@
   "DE.Controllers.Main.txtArt": "여기에 귀하의 텍스트",
   "DE.Controllers.Main.txtBasicShapes": "기본 도형",
   "DE.Controllers.Main.txtBelow": "아래",
+  "DE.Controllers.Main.txtBookmarkError": "문제발생! 북마크가 정의되지 않음",
   "DE.Controllers.Main.txtButtons": "Buttons",
   "DE.Controllers.Main.txtCallouts": "콜 아웃",
   "DE.Controllers.Main.txtCharts": "Charts",
+  "DE.Controllers.Main.txtCurrentDocument": "현재 문서",
   "DE.Controllers.Main.txtDiagramTitle": "차트 제목",
   "DE.Controllers.Main.txtEditingMode": "편집 모드 설정 ...",
   "DE.Controllers.Main.txtErrorLoadHistory": "기록로드 실패",
   "DE.Controllers.Main.txtEvenPage": "짝수 페이지",
   "DE.Controllers.Main.txtFiguredArrows": "그림 화살표",
+  "DE.Controllers.Main.txtFirstPage": "첫 페이지",
+  "DE.Controllers.Main.txtFooter": "꼬리말",
   "DE.Controllers.Main.txtHeader": "머리글",
   "DE.Controllers.Main.txtLines": "Lines",
   "DE.Controllers.Main.txtMath": "수학",
   "DE.Controllers.Main.txtNeedSynchronize": "업데이트가 있습니다.",
+  "DE.Controllers.Main.txtNoTableOfContents": "테이블 콘텐츠 항목 없슴",
   "DE.Controllers.Main.txtOddPage": "홀수 페이지",
+  "DE.Controllers.Main.txtOnPage": "페이지상",
   "DE.Controllers.Main.txtRectangles": "직사각형",
+  "DE.Controllers.Main.txtSameAsPrev": "이전과 동일",
+  "DE.Controllers.Main.txtSection": "섹션",
   "DE.Controllers.Main.txtSeries": "Series",
   "DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
+  "DE.Controllers.Main.txtStyle_footnote_text": "꼬리말 글",
   "DE.Controllers.Main.txtStyle_Heading_1": "제목 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "제목 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "제목 3",
@@ -355,6 +422,7 @@
   "DE.Controllers.Main.txtStyle_Quote": "Quote",
   "DE.Controllers.Main.txtStyle_Subtitle": "자막",
   "DE.Controllers.Main.txtStyle_Title": "제목",
+  "DE.Controllers.Main.txtTableOfContents": "콘텐츠 테이블",
   "DE.Controllers.Main.txtXAxis": "X 축",
   "DE.Controllers.Main.txtYAxis": "Y 축",
   "DE.Controllers.Main.unknownErrorText": "알 수없는 오류.",
@@ -370,6 +438,8 @@
   "DE.Controllers.Main.warnNoLicense": "이 버전의 ONLYOFFICE 편집자는 문서 서버에 대한 동시 연결에 특정 제한 사항이 있습니다. <br> 더 많은 정보가 필요하면 현재 라이센스를 업그레이드하거나 상업용 라이센스를 구입하십시오.",
   "DE.Controllers.Main.warnNoLicenseUsers": "ONLYOFFICE 편집자의이 버전은 동시 사용자에게 일정한 제한이 있습니다. <br> 더 필요한 것이 있으면 현재 라이센스를 업그레이드하거나 상용 라이센스를 구입하십시오.",
   "DE.Controllers.Main.warnProcessRightsChange": "파일 편집 권한이 거부되었습니다.",
+  "DE.Controllers.Navigation.txtBeginning": "문서의 시작",
+  "DE.Controllers.Navigation.txtGotoBeginning": "문서의 시작점으로 이동",
   "DE.Controllers.Statusbar.textHasChanges": "새로운 변경 사항이 추적되었습니다",
   "DE.Controllers.Statusbar.textTrackChanges": "변경 내용 추적 모드를 사용하여 문서가 열립니다.",
   "DE.Controllers.Statusbar.tipReview": "변경 내용 추적",
@@ -737,8 +807,12 @@
   "DE.Views.ChartSettings.txtTopAndBottom": "상단 및 하단",
   "DE.Views.ControlSettingsDialog.cancelButtonText": "취소",
   "DE.Views.ControlSettingsDialog.okButtonText": "OK",
+  "DE.Views.ControlSettingsDialog.textLock": "잠그기",
   "DE.Views.ControlSettingsDialog.textName": "제목",
   "DE.Views.ControlSettingsDialog.textTag": "꼬리표",
+  "DE.Views.ControlSettingsDialog.textTitle": "콘텐트 제어 세팅",
+  "DE.Views.ControlSettingsDialog.txtLockDelete": "콘텐트 제어가 삭제될 수 없슴",
+  "DE.Views.ControlSettingsDialog.txtLockEdit": "콘텐트가 편집될 수 없슴",
   "DE.Views.CustomColumnsDialog.cancelButtonText": "취소",
   "DE.Views.CustomColumnsDialog.okButtonText": "Ok",
   "DE.Views.CustomColumnsDialog.textColumns": "열 수",
@@ -805,6 +879,10 @@
   "DE.Views.DocumentHolder.spellcheckText": "맞춤법 검사",
   "DE.Views.DocumentHolder.splitCellsText": "셀 분할 ...",
   "DE.Views.DocumentHolder.splitCellTitleText": "셀 분할",
+  "DE.Views.DocumentHolder.strDelete": "서명 삭제",
+  "DE.Views.DocumentHolder.strDetails": "서명 상세",
+  "DE.Views.DocumentHolder.strSetup": "서명 셋업",
+  "DE.Views.DocumentHolder.strSign": "서명",
   "DE.Views.DocumentHolder.styleText": "스타일로 서식 지정",
   "DE.Views.DocumentHolder.tableText": "테이블",
   "DE.Views.DocumentHolder.textAlign": "정렬",
@@ -813,13 +891,20 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "뒤로 이동",
   "DE.Views.DocumentHolder.textArrangeForward": "앞으로 이동",
   "DE.Views.DocumentHolder.textArrangeFront": "포 그라운드로 가져 오기",
+  "DE.Views.DocumentHolder.textContentControls": "콘텐트 제어",
   "DE.Views.DocumentHolder.textCopy": "복사",
   "DE.Views.DocumentHolder.textCut": "잘라 내기",
+  "DE.Views.DocumentHolder.textDistributeCols": "컬럼 배포",
+  "DE.Views.DocumentHolder.textDistributeRows": "행 배포",
+  "DE.Views.DocumentHolder.textEditControls": "콘텐트 제어 세팅",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "둘러싸 기 경계 편집",
+  "DE.Views.DocumentHolder.textNest": "네스트 테이블",
   "DE.Views.DocumentHolder.textNextPage": "다음 페이지",
   "DE.Views.DocumentHolder.textPaste": "붙여 넣기",
   "DE.Views.DocumentHolder.textPrevPage": "이전 페이지",
+  "DE.Views.DocumentHolder.textRefreshField": "필드 새로고침",
   "DE.Views.DocumentHolder.textRemove": "삭제",
+  "DE.Views.DocumentHolder.textRemoveControl": "콘텐트 제어 삭제",
   "DE.Views.DocumentHolder.textSettings": "설정",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "아래쪽 정렬",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "정렬 중심",
@@ -827,7 +912,12 @@
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "가운데 정렬",
   "DE.Views.DocumentHolder.textShapeAlignRight": "오른쪽 정렬",
   "DE.Views.DocumentHolder.textShapeAlignTop": "정렬",
+  "DE.Views.DocumentHolder.textTOC": "콘텍츠 테이블",
+  "DE.Views.DocumentHolder.textTOCSettings": "콘텐츠 테이블 세팅",
   "DE.Views.DocumentHolder.textUndo": "실행 취소",
+  "DE.Views.DocumentHolder.textUpdateAll": "전체 테이블을 새로고침하세요",
+  "DE.Views.DocumentHolder.textUpdatePages": "페이지 번호만 새로고침하세요",
+  "DE.Views.DocumentHolder.textUpdateTOC": "콘텐트 테이블 새로고침",
   "DE.Views.DocumentHolder.textWrap": "배치 스타일",
   "DE.Views.DocumentHolder.tipIsLocked": "이 요소는 현재 다른 사용자가 편집 중입니다.",
   "DE.Views.DocumentHolder.txtAddBottom": "아래쪽 테두리 추가",
@@ -887,6 +977,8 @@
   "DE.Views.DocumentHolder.txtMatchBrackets": "대괄호를 인수 높이에 대응",
   "DE.Views.DocumentHolder.txtMatrixAlign": "매트릭스 정렬",
   "DE.Views.DocumentHolder.txtOverbar": "텍스트 위에 가로 막기",
+  "DE.Views.DocumentHolder.txtOverwriteCells": "셀에 덮어쓰기",
+  "DE.Views.DocumentHolder.txtPasteSourceFormat": "소스 포맷을 유지하세요",
   "DE.Views.DocumentHolder.txtPressLink": "CTRL 키를 누른 상태에서 링크 클릭",
   "DE.Views.DocumentHolder.txtRemFractionBar": "분수 막대 제거",
   "DE.Views.DocumentHolder.txtRemLimit": "제한 제거",
@@ -965,6 +1057,7 @@
   "DE.Views.FileMenu.btnHistoryCaption": "버전 기록",
   "DE.Views.FileMenu.btnInfoCaption": "문서 정보 ...",
   "DE.Views.FileMenu.btnPrintCaption": "인쇄",
+  "DE.Views.FileMenu.btnProtectCaption": "보호",
   "DE.Views.FileMenu.btnRecentFilesCaption": "최근 열기 ...",
   "DE.Views.FileMenu.btnRenameCaption": "Rename ...",
   "DE.Views.FileMenu.btnReturnCaption": "문서로 돌아 가기",
@@ -995,7 +1088,16 @@
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "액세스 권한 변경",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "권한이있는 사람",
   "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "경고",
+  "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "비밀번호로",
+  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "문서 보호",
+  "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "서명으로",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "문서 편집",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "편집은 문서에서 서명을 지울것입니다. <br> 계속 진행하시겠습니까?",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "이 문서는 비밀번호로 보호된 적이 있슴",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "이 문서는 서명되어야 합니다.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "유효한 서명이 당 문서에 추가되었슴. 이 문서는 편집할 수 없도록 보호됨.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "문서에 있는 몇 가지 디지털 서명 이 맞지 않거나 확인되지 않음. 이 문서는 편집할 수 없도록 보호됨.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtView": "서명 보기",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "적용",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "정렬 안내선 켜기",
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "자동 검색 켜기",
@@ -1040,17 +1142,23 @@
   "DE.Views.FileMenuPanels.Settings.txtWin": "Windows로",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "하단 중앙",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "왼쪽 하단",
+  "DE.Views.HeaderFooterSettings.textBottomPage": "페이지 끝",
   "DE.Views.HeaderFooterSettings.textBottomRight": "오른쪽 하단",
   "DE.Views.HeaderFooterSettings.textDiffFirst": "다른 첫 페이지",
   "DE.Views.HeaderFooterSettings.textDiffOdd": "다른 홀수 및 짝수 페이지",
+  "DE.Views.HeaderFooterSettings.textFrom": "시작 시간",
   "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "하단에서 바닥 글",
   "DE.Views.HeaderFooterSettings.textHeaderFromTop": "머리글을 맨 위부터",
+  "DE.Views.HeaderFooterSettings.textInsertCurrent": "현재 위치로 삽입",
   "DE.Views.HeaderFooterSettings.textOptions": "옵션",
   "DE.Views.HeaderFooterSettings.textPageNum": "페이지 번호 삽입",
+  "DE.Views.HeaderFooterSettings.textPageNumbering": "페이지 넘버링",
   "DE.Views.HeaderFooterSettings.textPosition": "위치",
+  "DE.Views.HeaderFooterSettings.textPrev": "이전 섹션에서 계속하기",
   "DE.Views.HeaderFooterSettings.textSameAs": "이전 링크",
   "DE.Views.HeaderFooterSettings.textTopCenter": "Top Center",
   "DE.Views.HeaderFooterSettings.textTopLeft": "왼쪽 상단",
+  "DE.Views.HeaderFooterSettings.textTopPage": "페이지 시작",
   "DE.Views.HeaderFooterSettings.textTopRight": "오른쪽 상단",
   "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "취소",
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
@@ -1064,6 +1172,7 @@
   "DE.Views.ImageSettings.textAdvanced": "고급 설정 표시",
   "DE.Views.ImageSettings.textEdit": "편집",
   "DE.Views.ImageSettings.textEditObject": "개체 편집",
+  "DE.Views.ImageSettings.textFitMargins": "여백에 맞추기",
   "DE.Views.ImageSettings.textFromFile": "파일로부터",
   "DE.Views.ImageSettings.textFromUrl": "From URL",
   "DE.Views.ImageSettings.textHeight": "높이",
@@ -1157,6 +1266,23 @@
   "DE.Views.LeftMenu.tipTitles": "제목",
   "DE.Views.LeftMenu.txtDeveloper": "개발자 모드",
   "DE.Views.LeftMenu.txtTrial": "시험 모드",
+  "DE.Views.Links.capBtnContentsUpdate": "재실행",
+  "DE.Views.Links.capBtnInsContents": "콘텍츠 테이블",
+  "DE.Views.Links.capBtnInsFootnote": "각주",
+  "DE.Views.Links.capBtnInsLink": "하이퍼 링크",
+  "DE.Views.Links.confirmDeleteFootnotes": "모든 각주를 삭제 하시겠습니까?",
+  "DE.Views.Links.mniDelFootnote": "모든 각주 삭제",
+  "DE.Views.Links.mniInsFootnote": "각주 삽입",
+  "DE.Views.Links.mniNoteSettings": "메모 설정",
+  "DE.Views.Links.textContentsRemove": "콘텐츠 테이블을 지우세요",
+  "DE.Views.Links.textContentsSettings": "세팅",
+  "DE.Views.Links.textGotoFootnote": "각주로 이동",
+  "DE.Views.Links.textUpdateAll": "전체 테이블을 새로고침하세요",
+  "DE.Views.Links.textUpdatePages": "페이지 번호만 새로고침하세요",
+  "DE.Views.Links.tipContents": "콘텐트 테이블 삽입",
+  "DE.Views.Links.tipContentsUpdate": "콘텐트 테이블 새로고침",
+  "DE.Views.Links.tipInsertHyperlink": "하이퍼 링크 추가",
+  "DE.Views.Links.tipNotes": "각주 삽입 또는 편집",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "취소",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "보내기",
@@ -1207,7 +1333,19 @@
   "DE.Views.MailMergeSettings.txtLast": "마지막 기록",
   "DE.Views.MailMergeSettings.txtNext": "다음 레코드로",
   "DE.Views.MailMergeSettings.txtPrev": "이전 레코드로",
+  "DE.Views.MailMergeSettings.txtUntitled": "제목미정",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "병합 시작 실패",
+  "DE.Views.Navigation.txtCollapse": "모두 접기",
+  "DE.Views.Navigation.txtDemote": "강등",
+  "DE.Views.Navigation.txtEmpty": "이 문서는 헤딩을 포함하지 않음",
+  "DE.Views.Navigation.txtEmptyItem": "머리말 없슴",
+  "DE.Views.Navigation.txtExpand": "모두 확장",
+  "DE.Views.Navigation.txtExpandToLevel": "레벨로 확장하기...",
+  "DE.Views.Navigation.txtHeadingAfter": "뒤에 신규 머리글 ",
+  "DE.Views.Navigation.txtHeadingBefore": "전에 신규 머리글 ",
+  "DE.Views.Navigation.txtNewHeading": "신규 서브헤딩",
+  "DE.Views.Navigation.txtPromote": "승급",
+  "DE.Views.Navigation.txtSelect": "콘텐트 선택",
   "DE.Views.NoteSettingsDialog.textApply": "적용",
   "DE.Views.NoteSettingsDialog.textApplyTo": "변경 사항 적용",
   "DE.Views.NoteSettingsDialog.textCancel": "취소",
@@ -1286,8 +1424,10 @@
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "문자 간격",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "기본 탭",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "효과",
+  "DE.Views.ParagraphSettingsAdvanced.textLeader": "리더",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "왼쪽",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "새 맞춤 색상 추가",
+  "DE.Views.ParagraphSettingsAdvanced.textNone": "없음",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "위치",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "제거",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "모두 제거",
@@ -1315,6 +1455,7 @@
   "DE.Views.RightMenu.txtMailMergeSettings": "편지 병합 설정",
   "DE.Views.RightMenu.txtParagraphSettings": "단락 설정",
   "DE.Views.RightMenu.txtShapeSettings": "도형 설정",
+  "DE.Views.RightMenu.txtSignatureSettings": "서명 세팅",
   "DE.Views.RightMenu.txtTableSettings": "표 설정",
   "DE.Views.RightMenu.txtTextArtSettings": "텍스트 아트 설정",
   "DE.Views.ShapeSettings.strBackground": "배경색",
@@ -1368,6 +1509,20 @@
   "DE.Views.ShapeSettings.txtTopAndBottom": "상단 및 하단",
   "DE.Views.ShapeSettings.txtWood": "Wood",
   "DE.Views.SignatureSettings.notcriticalErrorTitle": "경고",
+  "DE.Views.SignatureSettings.strDelete": "서명 삭제",
+  "DE.Views.SignatureSettings.strDetails": "서명 상세",
+  "DE.Views.SignatureSettings.strInvalid": "잘못된 서명",
+  "DE.Views.SignatureSettings.strRequested": "요청 서명",
+  "DE.Views.SignatureSettings.strSetup": "서명 셋업",
+  "DE.Views.SignatureSettings.strSign": "서명",
+  "DE.Views.SignatureSettings.strSignature": "서명",
+  "DE.Views.SignatureSettings.strSigner": "서명자",
+  "DE.Views.SignatureSettings.strValid": "유효 서명",
+  "DE.Views.SignatureSettings.txtContinueEditing": "무조건 편집",
+  "DE.Views.SignatureSettings.txtEditWarning": "편집은 문서에서 서명을 지울것입니다. <br> 계속 진행하시겠습니까?",
+  "DE.Views.SignatureSettings.txtRequestedSignatures": "이 문서는 서명되어야 합니다.",
+  "DE.Views.SignatureSettings.txtSigned": "유효한 서명이 당 문서에 추가되었슴. 이 문서는 편집할 수 없도록 보호됨.",
+  "DE.Views.SignatureSettings.txtSignedInvalid": "문서에 있는 몇 가지 디지털 서명 이 맞지 않거나 확인되지 않음. 이 문서는 편집할 수 없도록 보호됨.",
   "DE.Views.Statusbar.goToPageText": "페이지로 이동",
   "DE.Views.Statusbar.pageIndexText": "{1}의 페이지 {0}",
   "DE.Views.Statusbar.tipFitPage": "페이지에 맞춤",
@@ -1382,6 +1537,26 @@
   "DE.Views.StyleTitleDialog.textTitle": "제목",
   "DE.Views.StyleTitleDialog.txtEmpty": "이 입력란은 필수 항목",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "필드가 비어 있어서는 안됩니다.",
+  "DE.Views.TableOfContentsSettings.cancelButtonText": "취소",
+  "DE.Views.TableOfContentsSettings.okButtonText    ": "확인",
+  "DE.Views.TableOfContentsSettings.strAlign": "오른쪽 정렬 페이지 번호",
+  "DE.Views.TableOfContentsSettings.strLinks": "콘텐츠 테이블을 포맷하세요",
+  "DE.Views.TableOfContentsSettings.strShowPages": "페이지 번호를 보여주세요",
+  "DE.Views.TableOfContentsSettings.textBuildTable": "콘텐츠 테이블을 작성하세요",
+  "DE.Views.TableOfContentsSettings.textLeader": "리더",
+  "DE.Views.TableOfContentsSettings.textLevel": "레벨",
+  "DE.Views.TableOfContentsSettings.textLevels": "레벨들",
+  "DE.Views.TableOfContentsSettings.textNone": "없음",
+  "DE.Views.TableOfContentsSettings.textRadioLevels": "레벨을 간략하게 서술하세요",
+  "DE.Views.TableOfContentsSettings.textRadioStyles": "선택 스타일",
+  "DE.Views.TableOfContentsSettings.textStyle": "스타일",
+  "DE.Views.TableOfContentsSettings.textStyles": "스타일들",
+  "DE.Views.TableOfContentsSettings.textTitle": "콘텍츠 테이블",
+  "DE.Views.TableOfContentsSettings.txtClassic": "클래식",
+  "DE.Views.TableOfContentsSettings.txtCurrent": "현재",
+  "DE.Views.TableOfContentsSettings.txtModern": "모던",
+  "DE.Views.TableOfContentsSettings.txtSimple": "간단한",
+  "DE.Views.TableOfContentsSettings.txtStandard": "기준",
   "DE.Views.TableSettings.deleteColumnText": "열 삭제",
   "DE.Views.TableSettings.deleteRowText": "행 삭제",
   "DE.Views.TableSettings.deleteTableText": "테이블 삭제",
@@ -1403,11 +1578,15 @@
   "DE.Views.TableSettings.textBorderColor": "Color",
   "DE.Views.TableSettings.textBorders": "테두리 스타일",
   "DE.Views.TableSettings.textCancel": "취소",
+  "DE.Views.TableSettings.textCellSize": "셀 크기",
   "DE.Views.TableSettings.textColumns": "열",
+  "DE.Views.TableSettings.textDistributeCols": "컬럼 배포",
+  "DE.Views.TableSettings.textDistributeRows": "행 배포",
   "DE.Views.TableSettings.textEdit": "행 및 열",
   "DE.Views.TableSettings.textEmptyTemplate": "템플릿 없음",
   "DE.Views.TableSettings.textFirst": "First",
   "DE.Views.TableSettings.textHeader": "머리글",
+  "DE.Views.TableSettings.textHeight": "높이",
   "DE.Views.TableSettings.textLast": "Last",
   "DE.Views.TableSettings.textNewColor": "새 사용자 지정 색 추가",
   "DE.Views.TableSettings.textOK": "OK",
@@ -1415,6 +1594,7 @@
   "DE.Views.TableSettings.textSelectBorders": "위에서 선택한 스타일 적용을 변경하려는 테두리 선택",
   "DE.Views.TableSettings.textTemplate": "템플릿에서 선택",
   "DE.Views.TableSettings.textTotal": "Total",
+  "DE.Views.TableSettings.textWidth": "너비",
   "DE.Views.TableSettings.tipAll": "바깥 쪽 테두리 및 모든 안쪽 선 설정",
   "DE.Views.TableSettings.tipBottom": "바깥 쪽 테두리 만 설정",
   "DE.Views.TableSettings.tipInner": "내부 라인 만 설정",
@@ -1524,10 +1704,16 @@
   "DE.Views.Toolbar.capBtnColumns": "열",
   "DE.Views.Toolbar.capBtnComment": "댓글",
   "DE.Views.Toolbar.capBtnInsChart": "차트",
+  "DE.Views.Toolbar.capBtnInsControls": "콘텐트 제어",
   "DE.Views.Toolbar.capBtnInsDropcap": "드롭 캡",
   "DE.Views.Toolbar.capBtnInsEquation": "수식",
+  "DE.Views.Toolbar.capBtnInsHeader": "머리말/꼬리말",
   "DE.Views.Toolbar.capBtnInsImage": "그림",
+  "DE.Views.Toolbar.capBtnInsPagebreak": "나누기",
+  "DE.Views.Toolbar.capBtnInsShape": "쉐이프",
   "DE.Views.Toolbar.capBtnInsTable": "테이블",
+  "DE.Views.Toolbar.capBtnInsTextart": "텍스트 아트",
+  "DE.Views.Toolbar.capBtnInsTextbox": "텍스트 박스",
   "DE.Views.Toolbar.capBtnMargins": "여백",
   "DE.Views.Toolbar.capBtnPageOrient": "오리엔테이션",
   "DE.Views.Toolbar.capBtnPageSize": "크기",
@@ -1535,7 +1721,9 @@
   "DE.Views.Toolbar.capImgBackward": "뒤로 이동",
   "DE.Views.Toolbar.capImgForward": "앞으로 이동",
   "DE.Views.Toolbar.capImgGroup": "그룹",
+  "DE.Views.Toolbar.capImgWrapping": "포장",
   "DE.Views.Toolbar.mniCustomTable": "사용자 정의 테이블 삽입",
+  "DE.Views.Toolbar.mniEditControls": "제어 세팅",
   "DE.Views.Toolbar.mniEditDropCap": "드롭 캡 설정",
   "DE.Views.Toolbar.mniEditFooter": "바닥 글 편집",
   "DE.Views.Toolbar.mniEditHeader": "머리글 편집",
@@ -1589,8 +1777,11 @@
   "DE.Views.Toolbar.textPageMarginsCustom": "사용자 정의 여백",
   "DE.Views.Toolbar.textPageSizeCustom": "사용자 정의 페이지 크기",
   "DE.Views.Toolbar.textPie": "파이",
+  "DE.Views.Toolbar.textPlainControl": "일반 텍스트 콘텐트 제어 삽입",
   "DE.Views.Toolbar.textPoint": "XY (Scatter)",
   "DE.Views.Toolbar.textPortrait": "Portrait",
+  "DE.Views.Toolbar.textRemoveControl": "콘텐트 제어 삭제",
+  "DE.Views.Toolbar.textRichControl": "리치 텍스트 콘텐트 제어 삽입",
   "DE.Views.Toolbar.textRight": "오른쪽 :",
   "DE.Views.Toolbar.textStock": "Stock",
   "DE.Views.Toolbar.textStrikeout": "Strikeout",
@@ -1603,10 +1794,14 @@
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
   "DE.Views.Toolbar.textSurface": "Surface",
+  "DE.Views.Toolbar.textTabCollaboration": "합치기",
   "DE.Views.Toolbar.textTabFile": "파일",
   "DE.Views.Toolbar.textTabHome": "집",
   "DE.Views.Toolbar.textTabInsert": "삽입",
   "DE.Views.Toolbar.textTabLayout": "레이아웃",
+  "DE.Views.Toolbar.textTabLinks": "레퍼런스",
+  "DE.Views.Toolbar.textTabProtect": "보호",
+  "DE.Views.Toolbar.textTabReview": "다시보기",
   "DE.Views.Toolbar.textTitleError": "오류",
   "DE.Views.Toolbar.textToCurrent": "현재 위치로",
   "DE.Views.Toolbar.textTop": "Top :",
@@ -1622,6 +1817,7 @@
   "DE.Views.Toolbar.tipClearStyle": "스타일 지우기",
   "DE.Views.Toolbar.tipColorSchemas": "Change Color Scheme",
   "DE.Views.Toolbar.tipColumns": "열 삽입",
+  "DE.Views.Toolbar.tipControls": "콘텐트 제어를 삽입",
   "DE.Views.Toolbar.tipCopy": "복사",
   "DE.Views.Toolbar.tipCopyStyle": "스타일 복사",
   "DE.Views.Toolbar.tipDecFont": "글꼴 크기 줄이기",
@@ -1633,6 +1829,8 @@
   "DE.Views.Toolbar.tipFontSize": "글꼴 크기",
   "DE.Views.Toolbar.tipHAligh": "수평 정렬",
   "DE.Views.Toolbar.tipHighlightColor": "Highlight Color",
+  "DE.Views.Toolbar.tipImgAlign": "오브젝트 정렬",
+  "DE.Views.Toolbar.tipImgGroup": "그룹 오브젝트",
   "DE.Views.Toolbar.tipImgWrapping": "텍스트 줄 바꾸기",
   "DE.Views.Toolbar.tipIncFont": "증가 글꼴 크기",
   "DE.Views.Toolbar.tipIncPrLeft": "들여 쓰기 늘리기",
@@ -1642,7 +1840,7 @@
   "DE.Views.Toolbar.tipInsertNum": "페이지 번호 삽입",
   "DE.Views.Toolbar.tipInsertShape": "도형 삽입",
   "DE.Views.Toolbar.tipInsertTable": "표 삽입",
-  "DE.Views.Toolbar.tipInsertText": "텍스트 삽입",
+  "DE.Views.Toolbar.tipInsertText": "텍스트 상자 삽입",
   "DE.Views.Toolbar.tipInsertTextArt": "텍스트 아트 삽입",
   "DE.Views.Toolbar.tipLineSpace": "단락 줄 간격",
   "DE.Views.Toolbar.tipMailRecepients": "편지 병합",

apps/documenteditor/main/locale/nl.json

@@ -177,44 +177,78 @@
   "Common.Views.LanguageDialog.btnOk": "OK",
   "Common.Views.LanguageDialog.labelSelect": "Taal van document selecteren",
   "Common.Views.OpenDialog.cancelButtonText": "Annuleren",
+  "Common.Views.OpenDialog.closeButtonText": "Bestand sluiten",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Versleuteling",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Wachtwoord is niet juist",
   "Common.Views.OpenDialog.txtPassword": "Wachtwoord",
+  "Common.Views.OpenDialog.txtPreview": "Voorbeeld",
   "Common.Views.OpenDialog.txtTitle": "Opties voor %1 kiezen",
   "Common.Views.OpenDialog.txtTitleProtected": "Beschermd bestand",
+  "Common.Views.PasswordDialog.cancelButtonText": "Annuleren",
+  "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "Pas een wachtwoord toe om dit document te beveiligen",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "Bevestig wachtwoord is niet identiek",
+  "Common.Views.PasswordDialog.txtPassword": "Wachtwoord",
+  "Common.Views.PasswordDialog.txtRepeat": "Herhaal wachtwoord",
+  "Common.Views.PasswordDialog.txtTitle": "Wachtwoord instellen",
   "Common.Views.PluginDlg.textLoading": "Laden",
   "Common.Views.Plugins.groupCaption": "Plug-ins",
   "Common.Views.Plugins.strPlugins": "Plug-ins",
   "Common.Views.Plugins.textLoading": "Laden",
   "Common.Views.Plugins.textStart": "Starten",
   "Common.Views.Plugins.textStop": "Stoppen",
+  "Common.Views.Protection.hintAddPwd": "Versleutelen met wachtwoord",
+  "Common.Views.Protection.hintPwd": "Verander of verwijder wachtwoord",
+  "Common.Views.Protection.hintSignature": "Digitale handtekening toevoegen of handtekening lijn",
+  "Common.Views.Protection.txtAddPwd": "Wachtwoord toevoegen",
+  "Common.Views.Protection.txtChangePwd": "Verander wachtwoord",
+  "Common.Views.Protection.txtDeletePwd": "Wachtwoord verwijderen",
+  "Common.Views.Protection.txtEncrypt": "Versleutelen",
+  "Common.Views.Protection.txtInvisibleSignature": "Digitale handtekening toevoegen",
+  "Common.Views.Protection.txtSignature": "Handtekening",
+  "Common.Views.Protection.txtSignatureLine": "Handtekening lijn",
   "Common.Views.RenameDialog.cancelButtonText": "Annuleren",
   "Common.Views.RenameDialog.okButtonText": "OK",
   "Common.Views.RenameDialog.textName": "Bestandsnaam",
   "Common.Views.RenameDialog.txtInvalidName": "De bestandsnaam mag geen van de volgende tekens bevatten:",
   "Common.Views.ReviewChanges.hintNext": "Naar Volgende Wijziging",
   "Common.Views.ReviewChanges.hintPrev": "Naar Vorige Wijziging",
+  "Common.Views.ReviewChanges.strFast": "Snel",
+  "Common.Views.ReviewChanges.strFastDesc": "Real-time samenwerken. Alle wijzigingen worden automatisch opgeslagen.",
+  "Common.Views.ReviewChanges.strStrict": "Strikt",
+  "Common.Views.ReviewChanges.strStrictDesc": "Gebruik de 'Opslaan' knop om de wijzigingen van u en andere te synchroniseren.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "Zet samenwerkings modus",
+  "Common.Views.ReviewChanges.tipHistory": "Toon versie geschiedenis",
   "Common.Views.ReviewChanges.tipRejectCurrent": "Huidige wijziging afwijzen",
   "Common.Views.ReviewChanges.tipReview": "Wijzigingen Bijhouden",
   "Common.Views.ReviewChanges.tipReviewView": "Selecteer de modus waarin u de veranderingen weer wilt laten geven",
   "Common.Views.ReviewChanges.tipSetDocLang": "Taal van Document Instellen",
   "Common.Views.ReviewChanges.tipSetSpelling": "Spellingcontrole",
+  "Common.Views.ReviewChanges.tipSharing": "Toegangsrechten documenten beheren",
   "Common.Views.ReviewChanges.txtAccept": "Accepteren",
   "Common.Views.ReviewChanges.txtAcceptAll": "Alle wijzigingen accepteren",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Wijzigingen Accepteren",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Sluiten",
+  "Common.Views.ReviewChanges.txtCoAuthMode": "Modus Gezamenlijk bewerken",
   "Common.Views.ReviewChanges.txtDocLang": "Taal",
   "Common.Views.ReviewChanges.txtFinal": "Alle veranderingen geaccepteerd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtFinalCap": "Einde",
+  "Common.Views.ReviewChanges.txtHistory": "Versie geschiedenis",
   "Common.Views.ReviewChanges.txtMarkup": "Alle veranderingen (Bewerken)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
   "Common.Views.ReviewChanges.txtNext": "Naar volgende wijziging",
   "Common.Views.ReviewChanges.txtOriginal": "Alle veranderingen afgekeurd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "Origineel",
   "Common.Views.ReviewChanges.txtPrev": "Naar vorige wijziging",
   "Common.Views.ReviewChanges.txtReject": "Afwijzen",
   "Common.Views.ReviewChanges.txtRejectAll": "Alle wijzigingen afwijzen",
   "Common.Views.ReviewChanges.txtRejectChanges": "Wijzigingen Afwijzen",
   "Common.Views.ReviewChanges.txtRejectCurrent": "Huidige wijziging afwijzen",
+  "Common.Views.ReviewChanges.txtSharing": "Delen",
   "Common.Views.ReviewChanges.txtSpelling": "Spellingcontrole",
   "Common.Views.ReviewChanges.txtTurnon": "Wijzigingen Bijhouden",
   "Common.Views.ReviewChanges.txtView": "Weergavemodus",
@@ -227,6 +261,32 @@
   "Common.Views.ReviewChangesDialog.txtReject": "Afkeuren",
   "Common.Views.ReviewChangesDialog.txtRejectAll": "Alle Wijzigingen Afwijzen",
   "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Huidige Wijziging Afwijzen",
+  "Common.Views.SignDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignDialog.okButtonText": "OK",
+  "Common.Views.SignDialog.textBold": "Vet",
+  "Common.Views.SignDialog.textCertificate": "Certificaat",
+  "Common.Views.SignDialog.textChange": "Wijzigen",
+  "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.textSelectImage": "Selecteer afbeelding",
+  "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
+  "Common.Views.SignDialog.textTitle": "Onderteken document",
+  "Common.Views.SignDialog.textUseImage": "of click 'Selecteer afbeelding' om een afbeelding als handtekening te gebruiken",
+  "Common.Views.SignDialog.textValid": "Geldig van %1 tot %2",
+  "Common.Views.SignDialog.tipFontName": "Lettertype",
+  "Common.Views.SignDialog.tipFontSize": "Tekengrootte",
+  "Common.Views.SignSettingsDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "Sta ondertekenaar toe commentaar toe te voegen in het handtekening venster.",
+  "Common.Views.SignSettingsDialog.textInfo": "Ondertekenaar info",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
+  "Common.Views.SignSettingsDialog.textInfoName": "Naam",
+  "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.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",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Waarschuwing",
@@ -255,6 +315,7 @@
   "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.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",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Laden mislukt",
@@ -309,28 +370,42 @@
   "DE.Controllers.Main.textCloseTip": "Klik om de tip te sluiten",
   "DE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
   "DE.Controllers.Main.textLoadingDocument": "Document wordt geladen",
-  "DE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",
   "DE.Controllers.Main.textShape": "Vorm",
   "DE.Controllers.Main.textStrict": "Strikte modus",
   "DE.Controllers.Main.textTryUndoRedo": "De functies Ongedaan maken/Opnieuw worden uitgeschakeld in de modus Snel gezamenlijk bewerken.<br>Klik op de knop 'Strikte modus' om over te schakelen naar de strikte modus voor gezamenlijk bewerken. U kunt het bestand dan zonder interferentie van andere gebruikers bewerken en uw wijzigingen verzenden wanneer u die opslaat. U kunt schakelen tussen de modi voor gezamenlijke bewerking via Geavanceerde instellingen van de editor.",
   "DE.Controllers.Main.titleLicenseExp": "Licentie vervallen",
   "DE.Controllers.Main.titleServerVersion": "Editor bijgewerkt",
   "DE.Controllers.Main.titleUpdateVersion": "Versie gewijzigd",
+  "DE.Controllers.Main.txtAbove": "Boven",
   "DE.Controllers.Main.txtArt": "Hier tekst invoeren",
   "DE.Controllers.Main.txtBasicShapes": "Basisvormen",
+  "DE.Controllers.Main.txtBelow": "Onder",
+  "DE.Controllers.Main.txtBookmarkError": "Fout! Bladwijzer is niet gedefinieerd.",
   "DE.Controllers.Main.txtButtons": "Knoppen",
   "DE.Controllers.Main.txtCallouts": "Callouts",
   "DE.Controllers.Main.txtCharts": "Grafieken",
+  "DE.Controllers.Main.txtCurrentDocument": "Huidig document",
   "DE.Controllers.Main.txtDiagramTitle": "Grafiektitel",
   "DE.Controllers.Main.txtEditingMode": "Bewerkmodus instellen...",
   "DE.Controllers.Main.txtErrorLoadHistory": "Laden historie mislukt",
+  "DE.Controllers.Main.txtEvenPage": "Even pagina",
   "DE.Controllers.Main.txtFiguredArrows": "Pijlvormen",
+  "DE.Controllers.Main.txtFirstPage": "Eerste pagina",
+  "DE.Controllers.Main.txtFooter": "Voettekst",
+  "DE.Controllers.Main.txtHeader": "Koptekst",
   "DE.Controllers.Main.txtLines": "Lijnen",
   "DE.Controllers.Main.txtMath": "Wiskunde",
   "DE.Controllers.Main.txtNeedSynchronize": "U hebt updates",
+  "DE.Controllers.Main.txtNoTableOfContents": "Geen regels voor de inhoudsopgave gevonden",
+  "DE.Controllers.Main.txtOddPage": "Oneven pagina",
+  "DE.Controllers.Main.txtOnPage": "op pagina",
   "DE.Controllers.Main.txtRectangles": "Rechthoeken",
+  "DE.Controllers.Main.txtSameAsPrev": "Zelfde als vorige",
+  "DE.Controllers.Main.txtSection": "-Sectie",
   "DE.Controllers.Main.txtSeries": "Serie",
   "DE.Controllers.Main.txtStarsRibbons": "Sterren en linten",
+  "DE.Controllers.Main.txtStyle_footnote_text": "Voetnoot tekst",
   "DE.Controllers.Main.txtStyle_Heading_1": "Kop 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Kop 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "Kop 3",
@@ -347,6 +422,7 @@
   "DE.Controllers.Main.txtStyle_Quote": "Citaat",
   "DE.Controllers.Main.txtStyle_Subtitle": "Subtitel",
   "DE.Controllers.Main.txtStyle_Title": "Titel",
+  "DE.Controllers.Main.txtTableOfContents": "Inhoudsopgave",
   "DE.Controllers.Main.txtXAxis": "X-as",
   "DE.Controllers.Main.txtYAxis": "Y-as",
   "DE.Controllers.Main.unknownErrorText": "Onbekende fout.",
@@ -359,8 +435,11 @@
   "DE.Controllers.Main.warnBrowserIE9": "Met IE9 heeft de toepassing beperkte mogelijkheden. Gebruik IE10 of hoger.",
   "DE.Controllers.Main.warnBrowserZoom": "De huidige zoominstelling van uw browser wordt niet ondersteund. Zet de zoominstelling terug op de standaardwaarde door op Ctrl+0 te drukken.",
   "DE.Controllers.Main.warnLicenseExp": "Uw licentie is vervallen.<br>Werk uw licentie bij en vernieuw de pagina.",
-  "DE.Controllers.Main.warnNoLicense": "U gebruikt een Open source-versie van ONLYOFFICE. In die versie geldt voor het aantal gelijktijdige verbindingen met de documentserver een limiet van 20 verbindingen.<br>Als u er meer nodig hebt, kunt u overwegen een commerciële licentie aan te schaffen.",
+  "DE.Controllers.Main.warnNoLicense": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
   "DE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
+  "DE.Controllers.Navigation.txtBeginning": "Begin van het document",
+  "DE.Controllers.Navigation.txtGotoBeginning": "Ga naar het begin van het document",
   "DE.Controllers.Statusbar.textHasChanges": "Er zijn nieuwe wijzigingen bijgehouden",
   "DE.Controllers.Statusbar.textTrackChanges": "Het document is geopend met de modus 'Wijzigingen bijhouden' geactiveerd",
   "DE.Controllers.Statusbar.tipReview": "Wijzigingen Bijhouden",
@@ -726,6 +805,14 @@
   "DE.Views.ChartSettings.txtTight": "Strak",
   "DE.Views.ChartSettings.txtTitle": "Grafiek",
   "DE.Views.ChartSettings.txtTopAndBottom": "Boven en onder",
+  "DE.Views.ControlSettingsDialog.cancelButtonText": "Annuleren",
+  "DE.Views.ControlSettingsDialog.okButtonText": "OK",
+  "DE.Views.ControlSettingsDialog.textLock": "Vergrendeling",
+  "DE.Views.ControlSettingsDialog.textName": "Titel",
+  "DE.Views.ControlSettingsDialog.textTag": "Tag",
+  "DE.Views.ControlSettingsDialog.textTitle": "Inhoud beheer instellingen",
+  "DE.Views.ControlSettingsDialog.txtLockDelete": "Inhoud beheer kan niet verwijderd worden",
+  "DE.Views.ControlSettingsDialog.txtLockEdit": "Inhoud kan niet aangepast worden",
   "DE.Views.CustomColumnsDialog.cancelButtonText": "Annuleren",
   "DE.Views.CustomColumnsDialog.okButtonText": "OK",
   "DE.Views.CustomColumnsDialog.textColumns": "Aantal kolommen",
@@ -792,6 +879,10 @@
   "DE.Views.DocumentHolder.spellcheckText": "Spellingcontrole",
   "DE.Views.DocumentHolder.splitCellsText": "Cel splitsen...",
   "DE.Views.DocumentHolder.splitCellTitleText": "Cel splitsen",
+  "DE.Views.DocumentHolder.strDelete": "Handtekening verwijderen",
+  "DE.Views.DocumentHolder.strDetails": "Handtekening details",
+  "DE.Views.DocumentHolder.strSetup": "Handtekening opzet",
+  "DE.Views.DocumentHolder.strSign": "Onderteken",
   "DE.Views.DocumentHolder.styleText": "Opmaak als stijl",
   "DE.Views.DocumentHolder.tableText": "Tabel",
   "DE.Views.DocumentHolder.textAlign": "Uitlijnen",
@@ -800,19 +891,33 @@
   "DE.Views.DocumentHolder.textArrangeBackward": "Naar Achteren Verplaatsen",
   "DE.Views.DocumentHolder.textArrangeForward": "Naar Voren Verplaatsen",
   "DE.Views.DocumentHolder.textArrangeFront": "Naar voorgrond brengen",
+  "DE.Views.DocumentHolder.textContentControls": "Inhoud beheer",
   "DE.Views.DocumentHolder.textCopy": "Kopiëren",
   "DE.Views.DocumentHolder.textCut": "Knippen",
+  "DE.Views.DocumentHolder.textDistributeCols": "Kolommen verdelen",
+  "DE.Views.DocumentHolder.textDistributeRows": "Rijen verdelen",
+  "DE.Views.DocumentHolder.textEditControls": "Inhoud beheer instellingen",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Rand tekstterugloop bewerken",
+  "DE.Views.DocumentHolder.textNest": "Geneste tabel",
   "DE.Views.DocumentHolder.textNextPage": "Volgende pagina",
   "DE.Views.DocumentHolder.textPaste": "Plakken",
   "DE.Views.DocumentHolder.textPrevPage": "Vorige pagina",
+  "DE.Views.DocumentHolder.textRefreshField": "Ververs veld",
+  "DE.Views.DocumentHolder.textRemove": "Verwijderen",
+  "DE.Views.DocumentHolder.textRemoveControl": "Inhoud beheer verwijderen",
+  "DE.Views.DocumentHolder.textSettings": "Instellingen",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Onder uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Midden uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignLeft": "Links uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignMiddle": "Midden uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignRight": "Rechts uitlijnen",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Boven uitlijnen",
+  "DE.Views.DocumentHolder.textTOC": "Inhoudsopgave",
+  "DE.Views.DocumentHolder.textTOCSettings": "Inhoudsopgave instellingen",
   "DE.Views.DocumentHolder.textUndo": "Ongedaan maken",
+  "DE.Views.DocumentHolder.textUpdateAll": "Volledige tabel verversen",
+  "DE.Views.DocumentHolder.textUpdatePages": "Alleen paginanummers verversen",
+  "DE.Views.DocumentHolder.textUpdateTOC": "Inhoudsopgave verversen",
   "DE.Views.DocumentHolder.textWrap": "Terugloopstijl",
   "DE.Views.DocumentHolder.tipIsLocked": "Dit element wordt op dit moment bewerkt door een andere gebruiker.",
   "DE.Views.DocumentHolder.txtAddBottom": "Onderrand toevoegen",
@@ -872,6 +977,8 @@
   "DE.Views.DocumentHolder.txtMatchBrackets": "Haakjes aanpassen aan hoogte argumenten",
   "DE.Views.DocumentHolder.txtMatrixAlign": "Matrixuitlijning",
   "DE.Views.DocumentHolder.txtOverbar": "Streep boven tekst",
+  "DE.Views.DocumentHolder.txtOverwriteCells": "Cellen overschrijven",
+  "DE.Views.DocumentHolder.txtPasteSourceFormat": "Behoud bronopmaak",
   "DE.Views.DocumentHolder.txtPressLink": "Druk op Ctrl en klik op koppeling",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Deelteken verwijderen",
   "DE.Views.DocumentHolder.txtRemLimit": "Limiet verwijderen",
@@ -950,6 +1057,7 @@
   "DE.Views.FileMenu.btnHistoryCaption": "Versiehistorie",
   "DE.Views.FileMenu.btnInfoCaption": "Documentinfo...",
   "DE.Views.FileMenu.btnPrintCaption": "Afdrukken",
+  "DE.Views.FileMenu.btnProtectCaption": "Beveilig",
   "DE.Views.FileMenu.btnRecentFilesCaption": "Recente openen...",
   "DE.Views.FileMenu.btnRenameCaption": "Hernoemen...",
   "DE.Views.FileMenu.btnReturnCaption": "Terug naar document",
@@ -979,6 +1087,17 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Woorden",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Toegangsrechten wijzigen",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Personen met rechten",
+  "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Waarschuwing",
+  "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Met wachtwoord",
+  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Beveilig document",
+  "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Met handtekening",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Document bewerken",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekeningen verwijderd worden.<br>Weet u zeker dat u door wilt gaan?",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Dit document is beveiligd met een wachtwoord",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Dit document moet ondertekend worden",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Geldige handtekeningen zijn toegevoegd aan dit document. Dit document is beveiligd tegen aanpassingen.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Een of meer digitale handtekeningen in dit document zijn niet geldig of konden niet worden geverifieerd. Dit document is beveiligd tegen aanpassingen.",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtView": "Toon handtekeningen",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Toepassen",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Uitlijningshulplijnen inschakelen",
   "DE.Views.FileMenuPanels.Settings.strAutoRecover": "AutoHerstel inschakelen",
@@ -1023,17 +1142,23 @@
   "DE.Views.FileMenuPanels.Settings.txtWin": "als Windows",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Middenonder",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Linksonder",
+  "DE.Views.HeaderFooterSettings.textBottomPage": "Onderkant pagina",
   "DE.Views.HeaderFooterSettings.textBottomRight": "Rechtsonder",
   "DE.Views.HeaderFooterSettings.textDiffFirst": "Eerste pagina afwijkend",
   "DE.Views.HeaderFooterSettings.textDiffOdd": "Even en oneven pagina's afwijkend",
+  "DE.Views.HeaderFooterSettings.textFrom": "Beginnen bij",
   "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "Voettekst vanaf onder",
   "DE.Views.HeaderFooterSettings.textHeaderFromTop": "Koptekst vanaf boven",
+  "DE.Views.HeaderFooterSettings.textInsertCurrent": "Invoegen op huidige positie",
   "DE.Views.HeaderFooterSettings.textOptions": "Opties",
   "DE.Views.HeaderFooterSettings.textPageNum": "Paginanummer invoegen",
+  "DE.Views.HeaderFooterSettings.textPageNumbering": "Paginanummering",
   "DE.Views.HeaderFooterSettings.textPosition": "Positie",
+  "DE.Views.HeaderFooterSettings.textPrev": "Doorgaan vanuit volgende sectie",
   "DE.Views.HeaderFooterSettings.textSameAs": "Koppelen aan vorige",
   "DE.Views.HeaderFooterSettings.textTopCenter": "Middenboven",
   "DE.Views.HeaderFooterSettings.textTopLeft": "Linksboven",
+  "DE.Views.HeaderFooterSettings.textTopPage": "Bovenaan de pagina",
   "DE.Views.HeaderFooterSettings.textTopRight": "Rechtsboven",
   "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuleren",
   "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
@@ -1140,6 +1265,24 @@
   "DE.Views.LeftMenu.tipSupport": "Feedback en Support",
   "DE.Views.LeftMenu.tipTitles": "Titels",
   "DE.Views.LeftMenu.txtDeveloper": "ONTWIKKELAARSMODUS",
+  "DE.Views.LeftMenu.txtTrial": "TEST MODUS",
+  "DE.Views.Links.capBtnContentsUpdate": "Verversen",
+  "DE.Views.Links.capBtnInsContents": "Inhoudsopgave",
+  "DE.Views.Links.capBtnInsFootnote": "Voetnoot",
+  "DE.Views.Links.capBtnInsLink": "Hyperlink",
+  "DE.Views.Links.confirmDeleteFootnotes": "Wilt u alle voetnoten verwijderen?",
+  "DE.Views.Links.mniDelFootnote": "Alle voetnoten verwijderen",
+  "DE.Views.Links.mniInsFootnote": "Voetnoot invoegen",
+  "DE.Views.Links.mniNoteSettings": "Instellingen voor notities",
+  "DE.Views.Links.textContentsRemove": "Inhoudsopgave verwijderen",
+  "DE.Views.Links.textContentsSettings": "Instellingen",
+  "DE.Views.Links.textGotoFootnote": "Naar voetnoten",
+  "DE.Views.Links.textUpdateAll": "Volledige tabel verversen",
+  "DE.Views.Links.textUpdatePages": "Alleen paginanummers verversen",
+  "DE.Views.Links.tipContents": "Inhoudsopgave toevoegen",
+  "DE.Views.Links.tipContentsUpdate": "Inhoudsopgave verversen",
+  "DE.Views.Links.tipInsertHyperlink": "Hyperlink toevoegen",
+  "DE.Views.Links.tipNotes": "Voetnoten invoegen of bewerken",
   "DE.Views.MailMergeEmailDlg.cancelButtonText": "Annuleren",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Verzenden",
@@ -1192,6 +1335,17 @@
   "DE.Views.MailMergeSettings.txtPrev": "Naar vorige record",
   "DE.Views.MailMergeSettings.txtUntitled": "Naamloos",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starten samenvoeging mislukt",
+  "DE.Views.Navigation.txtCollapse": "Alles inklappen",
+  "DE.Views.Navigation.txtDemote": "Degraderen",
+  "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.txtHeadingAfter": "Nieuwe kop na",
+  "DE.Views.Navigation.txtHeadingBefore": "Nieuwe kop voor",
+  "DE.Views.Navigation.txtNewHeading": "Nieuwe subkop",
+  "DE.Views.Navigation.txtPromote": "Promoveren",
+  "DE.Views.Navigation.txtSelect": "Selecteer inhoud",
   "DE.Views.NoteSettingsDialog.textApply": "Toepassen",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Wijzigingen toepassen op",
   "DE.Views.NoteSettingsDialog.textCancel": "Annuleren",
@@ -1270,8 +1424,10 @@
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Tekenafstand",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Standaardtabblad",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effecten",
+  "DE.Views.ParagraphSettingsAdvanced.textLeader": "Leader",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Links",
   "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Nieuwe aangepaste kleur toevoegen",
+  "DE.Views.ParagraphSettingsAdvanced.textNone": "Geen",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Positie",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Verwijderen",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Alles verwijderen",
@@ -1299,6 +1455,7 @@
   "DE.Views.RightMenu.txtMailMergeSettings": "Instellingen voor Afdruk samenvoegen",
   "DE.Views.RightMenu.txtParagraphSettings": "Alinea-instellingen",
   "DE.Views.RightMenu.txtShapeSettings": "Vorminstellingen",
+  "DE.Views.RightMenu.txtSignatureSettings": "Handtekening instellingen",
   "DE.Views.RightMenu.txtTableSettings": "Tabelinstellingen",
   "DE.Views.RightMenu.txtTextArtSettings": "TextArt-instellingen",
   "DE.Views.ShapeSettings.strBackground": "Achtergrondkleur",
@@ -1351,6 +1508,21 @@
   "DE.Views.ShapeSettings.txtTight": "Strak",
   "DE.Views.ShapeSettings.txtTopAndBottom": "Boven en onder",
   "DE.Views.ShapeSettings.txtWood": "Hout",
+  "DE.Views.SignatureSettings.notcriticalErrorTitle": "Waarschuwing",
+  "DE.Views.SignatureSettings.strDelete": "Handtekening verwijderen",
+  "DE.Views.SignatureSettings.strDetails": "Handtekening details",
+  "DE.Views.SignatureSettings.strInvalid": "Ongeldige handtekeningen",
+  "DE.Views.SignatureSettings.strRequested": "Gevraagde handtekeningen",
+  "DE.Views.SignatureSettings.strSetup": "Handtekening opzet",
+  "DE.Views.SignatureSettings.strSign": "Onderteken",
+  "DE.Views.SignatureSettings.strSignature": "Handtekening",
+  "DE.Views.SignatureSettings.strSigner": "Ondertekenaar",
+  "DE.Views.SignatureSettings.strValid": "Geldige handtekeningen",
+  "DE.Views.SignatureSettings.txtContinueEditing": "Hoe dan ook bewerken",
+  "DE.Views.SignatureSettings.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekeningen verwijderd worden.<br>Weet u zeker dat u door wilt gaan?",
+  "DE.Views.SignatureSettings.txtRequestedSignatures": "Dit document moet ondertekend worden",
+  "DE.Views.SignatureSettings.txtSigned": "Geldige handtekeningen zijn toegevoegd aan dit document. Dit document is beveiligd tegen aanpassingen.",
+  "DE.Views.SignatureSettings.txtSignedInvalid": "Een of meer digitale handtekeningen in dit document zijn niet geldig of konden niet worden geverifieerd. Dit document is beveiligd tegen aanpassingen.",
   "DE.Views.Statusbar.goToPageText": "Naar pagina",
   "DE.Views.Statusbar.pageIndexText": "Pagina {0} van {1}",
   "DE.Views.Statusbar.tipFitPage": "Aan pagina aanpassen",
@@ -1365,6 +1537,26 @@
   "DE.Views.StyleTitleDialog.textTitle": "Titel",
   "DE.Views.StyleTitleDialog.txtEmpty": "Dit veld is vereist",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Veld mag niet leeg zijn",
+  "DE.Views.TableOfContentsSettings.cancelButtonText": "Annuleren",
+  "DE.Views.TableOfContentsSettings.okButtonText    ": "OK",
+  "DE.Views.TableOfContentsSettings.strAlign": "Paginanummers rechts uitlijnen",
+  "DE.Views.TableOfContentsSettings.strLinks": "Inhoudsopgave als link gebruiken",
+  "DE.Views.TableOfContentsSettings.strShowPages": "Toon paginanummers",
+  "DE.Views.TableOfContentsSettings.textBuildTable": "Maak inhoudsopgave van",
+  "DE.Views.TableOfContentsSettings.textLeader": "Leader",
+  "DE.Views.TableOfContentsSettings.textLevel": "Niveau",
+  "DE.Views.TableOfContentsSettings.textLevels": "Niveaus",
+  "DE.Views.TableOfContentsSettings.textNone": "Geen",
+  "DE.Views.TableOfContentsSettings.textRadioLevels": "Overzicht niveaus",
+  "DE.Views.TableOfContentsSettings.textRadioStyles": "Geselecteerde stijlen",
+  "DE.Views.TableOfContentsSettings.textStyle": "Stijl",
+  "DE.Views.TableOfContentsSettings.textStyles": "Stijlen",
+  "DE.Views.TableOfContentsSettings.textTitle": "Inhoudsopgave",
+  "DE.Views.TableOfContentsSettings.txtClassic": "Klassiek",
+  "DE.Views.TableOfContentsSettings.txtCurrent": "Huidig",
+  "DE.Views.TableOfContentsSettings.txtModern": "Modern",
+  "DE.Views.TableOfContentsSettings.txtSimple": "Simpel",
+  "DE.Views.TableOfContentsSettings.txtStandard": "Standaard",
   "DE.Views.TableSettings.deleteColumnText": "Kolom verwijderen",
   "DE.Views.TableSettings.deleteRowText": "Rij verwijderen",
   "DE.Views.TableSettings.deleteTableText": "Tabel verwijderen",
@@ -1386,11 +1578,15 @@
   "DE.Views.TableSettings.textBorderColor": "Kleur",
   "DE.Views.TableSettings.textBorders": "Randstijl",
   "DE.Views.TableSettings.textCancel": "Annuleren",
+  "DE.Views.TableSettings.textCellSize": "Celgrootte",
   "DE.Views.TableSettings.textColumns": "Kolommen",
+  "DE.Views.TableSettings.textDistributeCols": "Kolommen verdelen",
+  "DE.Views.TableSettings.textDistributeRows": "Rijen verdelen",
   "DE.Views.TableSettings.textEdit": "Rijen en kolommen",
   "DE.Views.TableSettings.textEmptyTemplate": "Geen sjablonen",
   "DE.Views.TableSettings.textFirst": "Eerste",
   "DE.Views.TableSettings.textHeader": "Koptekst",
+  "DE.Views.TableSettings.textHeight": "Hoogte",
   "DE.Views.TableSettings.textLast": "Laatste",
   "DE.Views.TableSettings.textNewColor": "Nieuwe aangepaste kleur toevoegen",
   "DE.Views.TableSettings.textOK": "OK",
@@ -1398,6 +1594,7 @@
   "DE.Views.TableSettings.textSelectBorders": "Selecteer de randen die u wilt wijzigen door de hierboven gekozen stijl toe te passen",
   "DE.Views.TableSettings.textTemplate": "Selecteren uit sjabloon",
   "DE.Views.TableSettings.textTotal": "Totaal",
+  "DE.Views.TableSettings.textWidth": "Breedte",
   "DE.Views.TableSettings.tipAll": "Buitenrand en alle binnenlijnen instellen",
   "DE.Views.TableSettings.tipBottom": "Alleen buitenrand onder instellen",
   "DE.Views.TableSettings.tipInner": "Alleen binnenlijnen instellen",
@@ -1507,6 +1704,7 @@
   "DE.Views.Toolbar.capBtnColumns": "Kolommen",
   "DE.Views.Toolbar.capBtnComment": "Opmerking",
   "DE.Views.Toolbar.capBtnInsChart": "Grafiek",
+  "DE.Views.Toolbar.capBtnInsControls": "Inhoud beheer",
   "DE.Views.Toolbar.capBtnInsDropcap": "Initiaal",
   "DE.Views.Toolbar.capBtnInsEquation": "Vergelijking",
   "DE.Views.Toolbar.capBtnInsHeader": "Kopteksten/voetteksten",
@@ -1515,7 +1713,7 @@
   "DE.Views.Toolbar.capBtnInsShape": "Vorm",
   "DE.Views.Toolbar.capBtnInsTable": "Tabel",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
-  "DE.Views.Toolbar.capBtnInsTextbox": "Tekst",
+  "DE.Views.Toolbar.capBtnInsTextbox": "Tekstvak",
   "DE.Views.Toolbar.capBtnMargins": "Marges",
   "DE.Views.Toolbar.capBtnPageOrient": "Oriëntatie ",
   "DE.Views.Toolbar.capBtnPageSize": "Grootte",
@@ -1525,6 +1723,7 @@
   "DE.Views.Toolbar.capImgGroup": "Groep",
   "DE.Views.Toolbar.capImgWrapping": "Tekstterugloop",
   "DE.Views.Toolbar.mniCustomTable": "Aangepaste tabel invoegen",
+  "DE.Views.Toolbar.mniEditControls": "Beheer instellingen",
   "DE.Views.Toolbar.mniEditDropCap": "Instellingen decoratieve initiaal",
   "DE.Views.Toolbar.mniEditFooter": "Voettekst bewerken",
   "DE.Views.Toolbar.mniEditHeader": "Koptekst bewerken",
@@ -1578,8 +1777,11 @@
   "DE.Views.Toolbar.textPageMarginsCustom": "Aangepaste marges",
   "DE.Views.Toolbar.textPageSizeCustom": "Aangepast paginaformaat",
   "DE.Views.Toolbar.textPie": "Cirkel",
+  "DE.Views.Toolbar.textPlainControl": "Platte tekst inhoud beheer toevoegen",
   "DE.Views.Toolbar.textPoint": "Spreiding",
   "DE.Views.Toolbar.textPortrait": "Staand",
+  "DE.Views.Toolbar.textRemoveControl": "Inhoud beheer verwijderen",
+  "DE.Views.Toolbar.textRichControl": "Uitgebreide tekst inhoud beheer toevoegen",
   "DE.Views.Toolbar.textRight": "Rechts:",
   "DE.Views.Toolbar.textStock": "Voorraad",
   "DE.Views.Toolbar.textStrikeout": "Doorhalen",
@@ -1592,10 +1794,13 @@
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
   "DE.Views.Toolbar.textSurface": "Oppervlak",
+  "DE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "DE.Views.Toolbar.textTabFile": "Bestand",
   "DE.Views.Toolbar.textTabHome": "Home",
   "DE.Views.Toolbar.textTabInsert": "Invoegen",
   "DE.Views.Toolbar.textTabLayout": "Pagina-indeling",
+  "DE.Views.Toolbar.textTabLinks": "Verwijzingen",
+  "DE.Views.Toolbar.textTabProtect": "Beveiliging",
   "DE.Views.Toolbar.textTabReview": "Beoordelen",
   "DE.Views.Toolbar.textTitleError": "Fout",
   "DE.Views.Toolbar.textToCurrent": "Naar huidige positie",
@@ -1612,6 +1817,7 @@
   "DE.Views.Toolbar.tipClearStyle": "Stijl wissen",
   "DE.Views.Toolbar.tipColorSchemas": "Kleurenschema wijzigen",
   "DE.Views.Toolbar.tipColumns": "Kolommen invoegen",
+  "DE.Views.Toolbar.tipControls": "Inhoud beheer toevoegen",
   "DE.Views.Toolbar.tipCopy": "Kopiëren",
   "DE.Views.Toolbar.tipCopyStyle": "Stijl kopiëren",
   "DE.Views.Toolbar.tipDecFont": "Tekengrootte verminderen",
@@ -1634,7 +1840,7 @@
   "DE.Views.Toolbar.tipInsertNum": "Paginanummer invoegen",
   "DE.Views.Toolbar.tipInsertShape": "AutoVorm invoegen",
   "DE.Views.Toolbar.tipInsertTable": "Tabel invoegen",
-  "DE.Views.Toolbar.tipInsertText": "Tekst invoegen",
+  "DE.Views.Toolbar.tipInsertText": "Tekstvak invoegen",
   "DE.Views.Toolbar.tipInsertTextArt": "Text Art Invoegen",
   "DE.Views.Toolbar.tipLineSpace": "Regelafstand alinea",
   "DE.Views.Toolbar.tipMailRecepients": "Afdruk samenvoegen",

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

@@ -31,6 +31,10 @@
         display: block;
     }
 
+    .padding-extra-small {
+        padding-bottom: 2px;
+    }
+
     .padding-small {
         padding-bottom: 8px;
     }

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

@@ -401,6 +401,8 @@
     font: 11px arial;
     white-space: nowrap;
     letter-spacing: 1px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 #id-toolbar-menu-auto-fontcolor > a.selected {

apps/documenteditor/mobile/locale/ko.json

@@ -119,7 +119,10 @@
   "DE.Controllers.Main.txtArt": "여기에 귀하의 텍스트",
   "DE.Controllers.Main.txtDiagramTitle": "차트 제목",
   "DE.Controllers.Main.txtEditingMode": "편집 모드 설정 ...",
+  "DE.Controllers.Main.txtFooter": "Footer",
+  "DE.Controllers.Main.txtHeader": "머리글",
   "DE.Controllers.Main.txtSeries": "Series",
+  "DE.Controllers.Main.txtStyle_footnote_text": "꼬리말 글",
   "DE.Controllers.Main.txtStyle_Heading_1": "제목 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "제목 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "제목 3",

apps/documenteditor/mobile/locale/nl.json

@@ -107,7 +107,7 @@
   "DE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
   "DE.Controllers.Main.textDone": "Klaar",
   "DE.Controllers.Main.textLoadingDocument": "Document wordt geladen",
-  "DE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE",
+  "DE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",
   "DE.Controllers.Main.textOK": "OK",
   "DE.Controllers.Main.textPassword": "Wachtwoord",
   "DE.Controllers.Main.textPreloader": "Laden...",
@@ -119,7 +119,10 @@
   "DE.Controllers.Main.txtArt": "Hier tekst invoeren",
   "DE.Controllers.Main.txtDiagramTitle": "Grafiektitel",
   "DE.Controllers.Main.txtEditingMode": "Bewerkmodus instellen...",
+  "DE.Controllers.Main.txtFooter": "Voettekst",
+  "DE.Controllers.Main.txtHeader": "Koptekst",
   "DE.Controllers.Main.txtSeries": "Serie",
+  "DE.Controllers.Main.txtStyle_footnote_text": "Voetnoot tekst",
   "DE.Controllers.Main.txtStyle_Heading_1": "Kop 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Kop 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "Kop 3",
@@ -146,7 +149,8 @@
   "DE.Controllers.Main.uploadImageTextText": "Afbeelding wordt geüpload...",
   "DE.Controllers.Main.uploadImageTitleText": "Afbeelding wordt geüpload",
   "DE.Controllers.Main.warnLicenseExp": "Uw licentie is vervallen.<br>Werk uw licentie bij en vernieuw de pagina.",
-  "DE.Controllers.Main.warnNoLicense": "U gebruikt een Open source-versie van ONLYOFFICE. In die versie geldt voor het aantal gelijktijdige verbindingen met de documentserver een limiet van 20 verbindingen.<br>Als u er meer nodig hebt, kunt u overwegen een commerciële licentie aan te schaffen.",
+  "DE.Controllers.Main.warnNoLicense": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
   "DE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
   "DE.Controllers.Search.textNoTextFound": "Tekst niet gevonden",
   "DE.Controllers.Search.textReplaceAll": "Alles vervangen",

apps/presentationeditor/embed/js/ApplicationController.js

@@ -224,6 +224,9 @@ var ApplicationController = new(function(){
         }
         hidePreloader();
 
+        var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -1);
+        (zf == -1) ? api.zoomFitToPage() : ((zf == -2) ? api.zoomFitToWidth() : api.zoom(zf>0 ? zf : 100));
+
         if ( !embedConfig.shareUrl )
             $('#idt-share').hide();
 
@@ -411,7 +414,6 @@ var ApplicationController = new(function(){
         api.asc_setViewMode(true);
         api.asc_LoadDocument();
         api.Resize();
-        api.zoomFitToPage();
     }
 
     function onOpenDocument(progress) {
@@ -545,7 +547,6 @@ var ApplicationController = new(function(){
     function onDocumentResize() {
         if (api) {
             api.Resize();
-            api.zoomFitToPage();
         }
     }
 

apps/presentationeditor/main/app.js

@@ -190,6 +190,7 @@ require([
         'common/main/lib/controller/ExternalDiagramEditor'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         app.start();
     });

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

@@ -61,6 +61,7 @@ define([
                     'hide': _.bind(this.onHideChat, this)
                 },
                 'Common.Views.Header': {
+                    'file:settings': _.bind(this.clickToolbarSettings,this),
                     'click:users': _.bind(this.clickStatusbarUsers, this)
                 },
                 'Common.Views.Plugins': {
@@ -89,7 +90,8 @@ define([
                 'Toolbar': {
                     'file:settings': _.bind(this.clickToolbarSettings,this),
                     'file:open': this.clickToolbarTab.bind(this, 'file'),
-                    'file:close': this.clickToolbarTab.bind(this, 'other')
+                    'file:close': this.clickToolbarTab.bind(this, 'other'),
+                    'save:disabled' : this.changeToolbarSaveState.bind(this)
                 },
                 'SearchDialog': {
                     'hide': _.bind(this.onSearchDlgHide, this),
@@ -305,6 +307,10 @@ define([
                 this.leftMenu.menuFile.hide();
         },
 
+        changeToolbarSaveState: function (state) {
+            this.leftMenu.menuFile.getButton('save').setDisabled(state);
+        },
+
         /** coauthoring begin **/
         clickStatusbarUsers: function() {
             this.leftMenu.menuFile.panels['rights'].changeAccessRights();

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

@@ -104,6 +104,7 @@ define([
 
                 this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
                 this.languages = null;
+                this.translationTable = [];
 
                 window.storagename = 'presentation';
 
@@ -123,6 +124,7 @@ define([
                 // Initialize api
 
                 window["flat_desine"] = true;
+
                 this.api = new Asc.asc_docs_api({
                     'id-view'  : 'editor_sdk',
                     'translate': {
@@ -151,6 +153,11 @@ define([
                     }
                 });
 
+                var themeNames = ['blank', 'pixel', 'classic', 'official', 'green', 'lines', 'office', 'safari', 'dotted', 'corner', 'turtle'];
+                themeNames.forEach(function(item){
+                    me.translationTable[item] = me['txtTheme_' + item.replace(/ /g, '_')] || item;
+                });
+
                 if (this.api){
                     this.api.SetDrawingFreeze(true);
                     this.api.SetThemesPath("../../../../sdkjs/slide/themes/");
@@ -292,13 +299,16 @@ define([
                 this.plugins                    = this.editorConfig.plugins;
 
                 appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
-                appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '');
+                appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
+                            .setUserName(this.appOptions.user.fullname);
 
                 if (this.editorConfig.lang)
                     this.api.asc_setLocale(this.editorConfig.lang);
 
                 if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
                     Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
+
+                Common.Controllers.Desktop.init(this.appOptions);
             },
 
             loadDocument: function(data) {
@@ -397,18 +407,20 @@ define([
             },
 
             goBack: function() {
-                 var href = this.appOptions.customization.goback.url;
+                var me = this;
-                 if (this.appOptions.customization.goback.blank!==false) {
+                if ( !Common.Controllers.Desktop.process('goback') ) {
-                     window.open(href, "_blank");
+                    var href = me.appOptions.customization.goback.url;
-                 } else {
+                    if (me.appOptions.customization.goback.blank!==false) {
-                     parent.location.href = href;
+                        window.open(href, "_blank");
-                 }
+                    } else {
+                        parent.location.href = href;
+                    }
+                }
              },
 
             onEditComplete: function(cmp) {
                 var application = this.getApplication(),
-                    toolbarController = application.getController('Toolbar'),
+                    toolbarView = application.getController('Toolbar').getView('Toolbar');
-                    toolbarView = toolbarController.getView('Toolbar');
 
                 application.getController('DocumentHolder').getView('DocumentHolder').focus();
                 if (this.api && this.api.asc_isDocumentCanSave) {
@@ -416,12 +428,7 @@ define([
                         forcesave = this.appOptions.forcesave,
                         isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 
@@ -1264,28 +1271,16 @@ define([
                     var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
             onDocumentCanSaveChanged: function (isCanSave) {
-                var application = this.getApplication(),
+                var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar');
-                    toolbarController = application.getController('Toolbar'),
+                if ( toolbarView ) {
-                    toolbarView = toolbarController.getView('Toolbar');
-                if (toolbarView) {
                     var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (toolbarView.btnSave.isDisabled() !== isDisabled)
+                        toolbarView.btnSave.setDisabled(isDisabled);
-                        toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 
@@ -2013,7 +2008,18 @@ define([
             txtAddNotes: 'Click to add notes',
             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.',
             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.",
-            txtAddFirstSlide: 'Click to add first slide'
+            txtAddFirstSlide: 'Click to add first slide',
+            txtTheme_blank: 'Blank',
+            txtTheme_pixel: 'Pixel',
+            txtTheme_classic: 'Classic',
+            txtTheme_official: 'Official',
+            txtTheme_green: 'Green',
+            txtTheme_lines: 'Lines',
+            txtTheme_office: 'Office',
+            txtTheme_safari: 'Safari',
+            txtTheme_dotted: 'Dotted',
+            txtTheme_corner: 'Corner',
+            txtTheme_turtle: 'Turtle'
         }
     })(), PE.Controllers.Main || {}))
 });

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

@@ -56,12 +56,22 @@ define([
         ],
 
         initialize: function() {
+            var me = this;
             this.addListeners({
                 'FileMenu': {
                     'settings:apply': _.bind(this.applySettings, this)
                 },
                 'Statusbar': {
                     'langchanged': this.onLangMenu
+                },
+                'Common.Views.Header': {
+                    'statusbar:hide': function (view, status) {
+                        me.statusbar.setVisible(!status);
+                        Common.localStorage.setBool('pe-hidden-status', status);
+
+                        Common.NotificationCenter.trigger('layout:changed', 'status');
+                        Common.NotificationCenter.trigger('edit:complete', this.statusbar);
+                    }
                 }
             });
             this._state = {

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

@@ -129,10 +129,16 @@ define([
                     'menu:show': this.onFileMenu.bind(this, 'show')
                 },
                 'Common.Views.Header': {
+                    'toolbar:setcompact': this.onChangeCompactView.bind(this),
                     'print': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'save': function (opts) {
+                        this.api.asc_Save();
+                    },
+                    'undo': this.onUndo,
+                    'redo': this.onRedo,
                     'downloadas': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         var _file_type = _main.document.fileType,
@@ -212,10 +218,14 @@ define([
         },
 
         onLaunch: function() {
-            // Create toolbar view
-            this.toolbar = this.createView('Toolbar');
-
             var me = this;
+
+            // Create toolbar view
+            me.toolbar = me.createView('Toolbar');
+            me.toolbar.btnSave.on('disabled', _.bind(this.onBtnChangeState, this, 'save:disabled'));
+            me.toolbar.btnUndo.on('disabled', _.bind(this.onBtnChangeState, this, 'undo:disabled'));
+            me.toolbar.btnRedo.on('disabled', _.bind(this.onBtnChangeState, this, 'redo:disabled'));
+
             Common.NotificationCenter.on('app:ready', me.onAppReady.bind(me));
             Common.NotificationCenter.on('app:face', me.onAppShowed.bind(me));
 
@@ -284,18 +294,10 @@ define([
             toolbar.btnInsertTable.menu.on('item:click',                _.bind(this.onInsertTableClick, this));
             toolbar.btnClearStyle.on('click',                           _.bind(this.onClearStyleClick, this));
             toolbar.btnCopyStyle.on('toggle',                           _.bind(this.onCopyStyleToggle, this));
-            toolbar.btnAdvSettings.on('click',                          _.bind(this.onAdvSettingsClick, this));
             toolbar.btnColorSchemas.menu.on('item:click',               _.bind(this.onColorSchemaClick, this));
             toolbar.btnSlideSize.menu.on('item:click',                  _.bind(this.onSlideSize, this));
             toolbar.mnuInsertChartPicker.on('item:click',               _.bind(this.onSelectChart, this));
             toolbar.listTheme.on('click',                               _.bind(this.onListThemeSelect, this));
-            toolbar.mnuitemHideStatusBar.on('toggle',                   _.bind(this.onHideStatusBar, this));
-            toolbar.mnuitemHideRulers.on('toggle',                      _.bind(this.onHideRulers, this));
-            toolbar.mnuitemCompactToolbar.on('toggle',                  _.bind(this.onChangeCompactView, this));
-            toolbar.btnFitPage.on('toggle',                             _.bind(this.onZoomToPageToggle, this));
-            toolbar.btnFitWidth.on('toggle',                            _.bind(this.onZoomToWidthToggle, this));
-            toolbar.mnuZoomIn.on('click',                               _.bind(this.onZoomInClick, this));
-            toolbar.mnuZoomOut.on('click',                              _.bind(this.onZoomOutClick, this));
             toolbar.btnInsertEquation.on('click',                       _.bind(this.onInsertEquationClick, this));
         },
 
@@ -360,7 +362,6 @@ define([
                 var me = this;
                 Common.Utils.asyncCall(function () {
                     me.onChangeCompactView(null, !me.toolbar.isCompact());
-                    me.toolbar.mnuitemCompactToolbar.setChecked(me.toolbar.isCompact(), true);
                 });
             }
         },
@@ -505,14 +506,9 @@ define([
                     btnHorizontalAlign.menu.clearAll();
                 }
 
-                if (btnHorizontalAlign.rendered) {
+                if ( btnHorizontalAlign.rendered && btnHorizontalAlign.$icon ) {
-                    var iconEl = $('.icon', btnHorizontalAlign.cmpEl);
+                    btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align);
-
+                    btnHorizontalAlign.options.icls = align;
-                    if (iconEl) {
-                        iconEl.removeClass(btnHorizontalAlign.options.icls);
-                        btnHorizontalAlign.options.icls = align;
-                        iconEl.addClass(btnHorizontalAlign.options.icls);
-                    }
                 }
             }
         },
@@ -538,14 +534,9 @@ define([
                     btnVerticalAlign.menu.clearAll();
                 }
 
-                if (btnVerticalAlign.rendered) {
+                if ( btnVerticalAlign.rendered && btnVerticalAlign.$icon ) {
-                    var iconEl = $('.icon', btnVerticalAlign.cmpEl);
+                    btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls).addClass(align);
-
+                    btnVerticalAlign.options.icls = align;
-                    if (iconEl) {
-                        iconEl.removeClass(btnVerticalAlign.options.icls);
-                        btnVerticalAlign.options.icls = align;
-                        iconEl.addClass(btnVerticalAlign.options.icls);
-                    }
                 }
             }
         },
@@ -776,18 +767,7 @@ define([
             this.editMode = false;
         },
 
-        onApiZoomChange: function(percent, type) {
+        onApiZoomChange: function(percent, type) {},
-            if (this._state.zoom_type !== type) {
-                this.toolbar.btnFitPage.setChecked(type == 2, true);
-                this.toolbar.btnFitWidth.setChecked(type == 1, true);
-                this._state.zoom_type = type;
-            }
-            if (this._state.zoom_percent !== percent) {
-                $('.menu-zoom .zoom', this.toolbar.el).html(percent + '%');
-                this._state.zoom_percent = percent;
-            }
-            this.toolbar.mnuZoom.options.value = percent;
-        },
 
         onApiInitEditorStyles: function(themes) {
             if (themes) {
@@ -903,24 +883,27 @@ define([
             var toolbar = this.toolbar;
             if (this.api && this.api.asc_isDocumentCanSave) {
                 var isModified = this.api.asc_isDocumentCanSave();
-                var isSyncButton = $('.icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch');
+                var isSyncButton = this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch');
                 if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave)
                     return;
 
                 this.api.asc_Save();
             }
 
-            toolbar.btnsSave.forEach(function(button) {
+            toolbar.btnsSave.setDisabled(!toolbar.mode.forcesave);
-                if ( button ) {
-                    button.setDisabled(!toolbar.mode.forcesave);
-                }
-            });
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
             Common.component.Analytics.trackEvent('Save');
             Common.component.Analytics.trackEvent('ToolBar', 'Save');
         },
 
+        onBtnChangeState: function(prop) {
+            if ( /\:disabled$/.test(prop) ) {
+                var _is_disabled = arguments[2];
+                this.toolbar.fireEvent(prop, [_is_disabled]);
+            }
+        },
+
         onUndo: function(btn, e) {
             if (this.api) {
                 this.api.Undo();
@@ -1034,14 +1017,11 @@ define([
 
         onMenuHorizontalAlignSelect: function(menu, item) {
             this._state.pralign = undefined;
-            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign,
+            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
-                iconEl = $('.icon', btnHorizontalAlign.cmpEl);
 
-            if (iconEl) {
+            btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls);
-                iconEl.removeClass(btnHorizontalAlign.options.icls);
+            btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
-                btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
+            btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls);
-                iconEl.addClass(btnHorizontalAlign.options.icls);
-            }
 
             if (this.api && item.checked)
                 this.api.put_PrAlign(item.value);
@@ -1051,14 +1031,11 @@ define([
         },
 
         onMenuVerticalAlignSelect: function(menu, item) {
-            var btnVerticalAlign = this.toolbar.btnVerticalAlign,
+            var btnVerticalAlign = this.toolbar.btnVerticalAlign;
-                iconEl = $('.icon', btnVerticalAlign.cmpEl);
 
-            if (iconEl) {
+            btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls);
-                iconEl.removeClass(btnVerticalAlign.options.icls);
+            btnVerticalAlign.options.icls = !item.checked ? 'btn-align-middle' : item.options.icls;
-                btnVerticalAlign.options.icls = !item.checked ? 'btn-align-middle' : item.options.icls;
+            btnVerticalAlign.$icon.addClass(btnVerticalAlign.options.icls);
-                iconEl.addClass(btnVerticalAlign.options.icls);
-            }
 
             this._state.vtextalign = undefined;
             if (this.api && item.checked)
@@ -1445,11 +1422,6 @@ define([
             this.modeAlwaysSetStyle = state;
         },
 
-        onAdvSettingsClick: function(btn, e) {
-            this.toolbar.fireEvent('file:settings', this);
-            btn.cmpEl.blur();
-        },
-
         onColorSchemaClick: function(menu, item) {
             if (this.api) {
                 this.api.ChangeColorScheme(item.value);
@@ -1563,69 +1535,6 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
         },
 
-        onHideStatusBar: function(item, checked) {
-            var headerView  = this.getApplication().getController('Statusbar').getView('Statusbar');
-            headerView  && headerView.setVisible(!checked);
-
-            Common.localStorage.setBool('pe-hidden-status', checked);
-
-            Common.NotificationCenter.trigger('layout:changed', 'status');
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onHideRulers: function(item, checked) {
-            if (this.api) {
-                this.api.asc_SetViewRulers(!checked);
-            }
-
-            Common.localStorage.setBool('pe-hidden-rulers', checked);
-
-            Common.NotificationCenter.trigger('layout:changed', 'rulers');
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomToPageToggle: function(item, state) {
-            if (this.api) {
-                this._state.zoom_type = undefined;
-                this._state.zoom_percent = undefined;
-                if (state)
-                    this.api.zoomFitToPage();
-                else
-                    this.api.zoomCustomMode();
-            }
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomToWidthToggle: function(item, state) {
-            if (this.api) {
-                this._state.zoom_type = undefined;
-                this._state.zoom_percent = undefined;
-                if (state)
-                    this.api.zoomFitToWidth();
-                else
-                    this.api.zoomCustomMode();
-            }
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomInClick: function(btn) {
-            this._state.zoom_type = undefined;
-            this._state.zoom_percent = undefined;
-            if (this.api)
-                this.api.zoomIn();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomOutClick: function(btn) {
-            this._state.zoom_type = undefined;
-            this._state.zoom_percent = undefined;
-            if (this.api)
-                this.api.zoomOut();
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
         _clearBullets: function() {
             this.toolbar.btnMarkers.toggle(false, true);
             this.toolbar.btnNumbers.toggle(false, true);
@@ -1972,7 +1881,8 @@ define([
 
             me.toolbar.listTheme.menuPicker.store.reset([]); // remove all
 
-            var themeStore = this.getCollection('SlideThemes');
+            var themeStore = this.getCollection('SlideThemes'),
+                mainController = this.getApplication().getController('Main');
             if (themeStore) {
                 var arr = [];
                 _.each(defaultThemes.concat(docThemes), function(theme) {
@@ -1980,13 +1890,15 @@ define([
                         imageUrl: theme.get_Image(),
                         uid     : Common.UI.getId(),
                         themeId : theme.get_Index(),
+                        tip     : mainController.translationTable[theme.get_Name()] || theme.get_Name(),
                         itemWidth   : 85,
                         itemHeight  : 38
                     }));
                     me.toolbar.listTheme.menuPicker.store.add({
                         imageUrl: theme.get_Image(),
                         uid     : Common.UI.getId(),
-                        themeId : theme.get_Index()
+                        themeId : theme.get_Index(),
+                        tip     : mainController.translationTable[theme.get_Name()] || theme.get_Name()
                     });
                 });
                 themeStore.reset(arr);
@@ -2086,11 +1998,23 @@ define([
                 if ( $panel )
                     me.toolbar.addTab(tab, $panel, 3);
 
-                if (config.isDesktopApp && config.isOffline) {
+                if ( config.isDesktopApp ) {
-                    tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                    // hide 'print' and 'save' buttons group and next separator
-                    $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
-                    if ( $panel )
+
-                        me.toolbar.addTab(tab, $panel, 4);
+                    // hide 'undo' and 'redo' buttons and get container
+                    var $box =  me.toolbar.btnUndo.$el.hide().next().hide().parent();
+
+                    // move 'paste' button to the container instead of 'undo' and 'redo'
+                    me.toolbar.btnPaste.$el.detach().appendTo($box);
+                    me.toolbar.btnCopy.$el.removeClass('split');
+
+                    if ( config.isOffline ) {
+                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                        if ($panel)
+                            me.toolbar.addTab(tab, $panel, 4);
+                    }
                 }
             }
         },

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

@@ -49,7 +49,7 @@ define([
 ], function (Viewport) {
     'use strict';
 
-    PE.Controllers.Viewport = Backbone.Controller.extend({
+    PE.Controllers.Viewport = Backbone.Controller.extend(_.assign({
         // Specifying a Viewport model
         models: [],
 
@@ -69,6 +69,10 @@ define([
 
             // This most important part when we will tell our controller what events should be handled
             this.addListeners({
+                'FileMenu': {
+                    'menu:hide': me.onFileMenu.bind(me, 'hide'),
+                    'menu:show': me.onFileMenu.bind(me, 'show')
+                },
                 'Toolbar': {
                     'render:before' : function (toolbar) {
                         var config = PE.getController('Main').appOptions;
@@ -76,7 +80,26 @@ define([
                         toolbar.setExtra('left', me.header.getPanel('left', config));
                     },
                     'view:compact'  : function (toolbar, state) {
-                        me.viewport.vlayout.panels[0].height = state ? 32 : 32+67;
+                        me.viewport.vlayout.getItem('toolbar').height = state ?
+                            Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal');
+                    },
+                    'undo:disabled' : function (state) {
+                        if ( me.header.btnUndo ) {
+                            if ( me.header.btnUndo.keepState )
+                                me.header.btnUndo.keepState.disabled = state;
+                            else me.header.btnUndo.setDisabled(state);
+                        }
+                    },
+                    'redo:disabled' : function (state) {
+                        if ( me.header.btnRedo ) {
+                            if ( me.header.btnRedo.keepState )
+                                me.header.btnRedo.keepState.disabled = state;
+                            else me.header.btnRedo.setDisabled(state);
+                        }
+                    },
+                    'save:disabled' : function (state) {
+                        if ( me.header.btnSave )
+                            me.header.btnSave.setDisabled(state);
                     }
                 },
                 // Events generated by main view
@@ -89,6 +112,7 @@ define([
 
         setApi: function(api) {
             this.api = api;
+            this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this));
         },
 
 
@@ -111,20 +135,152 @@ define([
                 Common.localStorage.setItem('pe-mainmenu-width',leftPanel.width());
             }, this);
 
+            this.header.mnuitemFitPage = this.header.fakeMenuItem();
+            this.header.mnuitemFitWidth = this.header.fakeMenuItem();
+
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
         },
 
         onAppShowed: function (config) {
             var me = this;
+            me.appConfig = config;
+
+            var _intvars = Common.Utils.InternalSettings;
+            var $filemenu = $('.toolbar-fullview-panel');
+            $filemenu.css('top', _intvars.get('toolbar-height-tabs'));
 
             if ( !config.isEdit ||
                 ( !Common.localStorage.itemExists("pe-compact-toolbar") &&
                     config.customization && config.customization.compactToolbar ))
             {
-                me.viewport.vlayout.panels[0].height = 32;
+                me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
+            }
+
+            if ( config.isDesktopApp && config.isEdit ) {
+                var $title = me.viewport.vlayout.getItem('title').el;
+                $title.html(me.header.getPanel('title', config)).show();
+
+                var toolbar = me.viewport.vlayout.getItem('toolbar');
+                toolbar.el.addClass('top-title');
+                toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
+
+                var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
+                _intvars.set('toolbar-height-tabs', _tabs_new_height);
+                _intvars.set('toolbar-height-compact', _tabs_new_height);
+                _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
+
+                $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
+
+                toolbar = me.getApplication().getController('Toolbar').getView('Toolbar');
+                toolbar.btnCollabChanges = me.header.btnSave;
             }
         },
 
+        onAppReady: function (config) {
+            var me = this;
+            if ( me.header.btnOptions ) {
+                var compactview = !config.isEdit;
+                if ( config.isEdit ) {
+                    if ( Common.localStorage.itemExists("pe-compact-toolbar") ) {
+                        compactview = Common.localStorage.getBool("pe-compact-toolbar");
+                    } else
+                    if ( config.customization && config.customization.compactToolbar )
+                        compactview = true;
+                }
+
+                me.header.mnuitemCompactToolbar = new Common.UI.MenuItem({
+                    caption: me.header.textCompactView,
+                    checked: compactview,
+                    checkable: true,
+                    value: 'toolbar'
+                });
+
+                var mnuitemHideStatusBar = new Common.UI.MenuItem({
+                    caption: me.header.textHideStatusBar,
+                    checked: Common.localStorage.getBool("pe-hidden-status"),
+                    checkable: true,
+                    value: 'statusbar'
+                });
+
+                if ( config.canBrandingExt && config.customization && config.customization.statusBar === false )
+                    mnuitemHideStatusBar.hide();
+
+                var mnuitemHideRulers = new Common.UI.MenuItem({
+                    caption: me.header.textHideLines,
+                    checked: Common.localStorage.getBool("pe-hidden-rulers"),
+                    checkable: true,
+                    value: 'rulers'
+                });
+
+                me.header.mnuitemFitPage = new Common.UI.MenuItem({
+                    caption: me.textFitPage,
+                    checkable: true,
+                    checked: me.header.mnuitemFitPage.isChecked(),
+                    value: 'zoom:page'
+                });
+
+                me.header.mnuitemFitWidth = new Common.UI.MenuItem({
+                    caption: me.textFitWidth,
+                    checkable: true,
+                    checked: me.header.mnuitemFitWidth.isChecked(),
+                    value: 'zoom:width'
+                });
+
+                me.header.mnuZoom = new Common.UI.MenuItem({
+                    template: _.template([
+                        '<div id="hdr-menu-zoom" class="menu-zoom" style="height: 25px;" ',
+                            '<% if(!_.isUndefined(options.stopPropagation)) { %>',
+                                'data-stopPropagation="true"',
+                            '<% } %>', '>',
+                            '<label class="title">' + me.header.textZoom + '</label>',
+                            '<button id="hdr-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomin">&nbsp;</i></button>',
+                            '<label class="zoom"><%= options.value %>%</label>',
+                            '<button id="hdr-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomout">&nbsp;</i></button>',
+                        '</div>'
+                    ].join('')),
+                    stopPropagation: true,
+                    value: me.header.mnuZoom.options.value
+                });
+
+                me.header.btnOptions.setMenu(new Common.UI.Menu({
+                        cls: 'pull-right',
+                        style: 'min-width: 180px;',
+                        items: [
+                            me.header.mnuitemCompactToolbar,
+                            mnuitemHideStatusBar,
+                            mnuitemHideRulers,
+                            {caption:'--'},
+                            me.header.mnuitemFitPage,
+                            me.header.mnuitemFitWidth,
+                            me.header.mnuZoom,
+                            {caption:'--'},
+                            new Common.UI.MenuItem({
+                                caption: me.header.textAdvSettings,
+                                value: 'advanced'
+                            })
+                        ]
+                    })
+                );
+
+                var _on_btn_zoom = function (btn) {
+                    btn == 'up' ? me.api.zoomIn() : me.api.zoomOut();
+                    Common.NotificationCenter.trigger('edit:complete', me.header);
+                };
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-out', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'down'));
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-in', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'up'));
+
+                me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
+            }
+        },
 
         onLayoutChanged: function(area) {
             switch (area) {
@@ -201,6 +357,51 @@ define([
                     element.msRequestFullscreen();
                 }
             }
-        }
+        },
-    });
+
+        onFileMenu: function (opts) {
+            var me = this;
+            var _need_disable =  opts == 'show';
+
+            me.header.lockHeaderBtns( 'undo', _need_disable );
+            me.header.lockHeaderBtns( 'redo', _need_disable );
+            me.header.lockHeaderBtns( 'opts', _need_disable );
+        },
+
+        onApiZoomChange: function(percent, type) {
+            this.header.mnuitemFitPage.setChecked(type == 2, true);
+            this.header.mnuitemFitWidth.setChecked(type == 1, true);
+            this.header.mnuZoom.options.value = percent;
+
+            if ( this.header.mnuZoom.$el )
+                $('.menu-zoom label.zoom', this.header.mnuZoom.$el).html(percent + '%');
+        },
+
+        onOptionsItemClick: function (menu, item, e) {
+            var me = this;
+
+            switch ( item.value ) {
+            case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break;
+            case 'statusbar': me.header.fireEvent('statusbar:hide', [item, item.isChecked()]); break;
+            case 'rulers':
+                me.api.asc_SetViewRulers(!item.isChecked());
+                Common.localStorage.setBool('pe-hidden-rulers', item.isChecked());
+                Common.NotificationCenter.trigger('layout:changed', 'rulers');
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'zoom:page':
+                item.isChecked() ? me.api.zoomFitToPage() : me.api.zoomCustomMode();
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'zoom:width':
+                item.isChecked() ? me.api.zoomFitToWidth() : me.api.zoomCustomMode();
+                Common.NotificationCenter.trigger('edit:complete', me.header);
+                break;
+            case 'advanced': me.header.fireEvent('file:settings', me.header); break;
+            }
+        },
+
+        textFitPage: 'Fit to Page',
+        textFitWidth: 'Fit to Width'
+    }, PE.Controllers.Viewport));
 });

apps/presentationeditor/main/app/template/Toolbar.template

@@ -8,7 +8,6 @@
             <ul>
                 <% for(var i in tabs) { %>
                     <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                        <div class="tab-bg" />
                         <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
                     </li>
                 <% } %>
@@ -111,16 +110,7 @@
                         <span class="btn-slot split" id="slot-btn-slidesize"></span>
                     </div>
                 </div>
-                <div class="group" id="slot-field-styles" style="width: 100%; min-width: 140px;">
+                <div class="group" id="slot-field-styles" style="width: 100%; min-width: 140px;"></div>
-                </div>
-                <div class="group no-mask">
-                    <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-hidebars"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot" id="slot-btn-settings"></span>
-                    </div>
-                </div>
             </section>
             <section class="panel" data-tab="ins">
                 <div class="group">

apps/presentationeditor/main/app/template/Viewport.template

@@ -4,6 +4,7 @@
         <div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
     </section>
     <div id="viewport-vbox-layout" class="layout-ct vbox">
+        <section id="app-title" class="layout-item"></section>
         <div id="toolbar" class="layout-item"></div>
         <div class="layout-item middle">
             <div id="viewport-hbox-layout" class="layout-ct hbox">

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

@@ -530,12 +530,13 @@ define([
                         ToolTip = getUserName(moveData.get_UserId());
 
                         showPoint = [moveData.get_X()+me._XY[0], moveData.get_Y()+me._XY[1]];
+                        var maxwidth = showPoint[0];
                         showPoint[0] = me._BodyWidth - showPoint[0];
                         showPoint[1] -= ((moveData.get_LockedObjectType()==2) ? me._TtHeight : 0);
 
                         if (showPoint[1] > me._XY[1] && showPoint[1]+me._TtHeight < me._XY[1]+me._Height)  {
                             src.text(ToolTip);
-                            src.css({visibility: 'visible', top: showPoint[1] + 'px', right: showPoint[0] + 'px'});
+                            src.css({visibility: 'visible', top: showPoint[1] + 'px', right: showPoint[0] + 'px', 'max-width': maxwidth + 'px'});
                         }
                     }
                     /** coauthoring end **/
@@ -2722,6 +2723,43 @@ define([
                 }
             });
 
+            var menuImgReplace = new Common.UI.MenuItem({
+                caption     : me.textReplace,
+                menu        : new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        new Common.UI.MenuItem({
+                            caption     : this.textFromFile
+                        }).on('click', function(item) {
+                            setTimeout(function(){
+                                if (me.api) me.api.ChangeImageFromFile();
+                                me.fireEvent('editcomplete', me);
+                            }, 10);
+                        }),
+                        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') {
+                                        if (me.api) {
+                                            var checkUrl = value.replace(/ /g, '');
+                                            if (!_.isEmpty(checkUrl)) {
+                                                var props = new Asc.asc_CImgProperty();
+                                                props.put_ImageUrl(checkUrl);
+                                                me.api.ImgApply(props);
+                                            }
+                                        }
+                                    }
+                                    me.fireEvent('editcomplete', me);
+                                }
+                            })).show();
+                        })
+                    ]
+                })
+            });
+
             /** coauthoring begin **/
             var menuAddCommentPara = new Common.UI.MenuItem({
                 caption     : me.addCommentText
@@ -3116,18 +3154,23 @@ define([
                         mnuGroupImg.setDisabled(!me.api.canGroup());
                     }
 
-                    var imgdisabled = (value.imgProps!==undefined && value.imgProps.locked),
+                    var isimage = (_.isUndefined(value.shapeProps) || value.shapeProps.value.get_FromImage()) && _.isUndefined(value.chartProps),
+                        imgdisabled = (value.imgProps!==undefined && value.imgProps.locked),
                         shapedisabled = (value.shapeProps!==undefined && value.shapeProps.locked),
                         chartdisabled = (value.chartProps!==undefined && value.chartProps.locked),
-                        disabled = imgdisabled || shapedisabled || chartdisabled || (value.slideProps!==undefined && value.slideProps.locked);
+                        disabled = imgdisabled || shapedisabled || chartdisabled || (value.slideProps!==undefined && value.slideProps.locked),
+                        pluginGuid = (value.imgProps) ? value.imgProps.value.asc_getPluginGuid() : null;
 
                     // image properties
-                    menuImgOriginalSize.setVisible((_.isUndefined(value.shapeProps) || value.shapeProps.value.get_FromImage()) && _.isUndefined(value.chartProps));
+                    menuImgOriginalSize.setVisible(isimage);
-
                     if (menuImgOriginalSize.isVisible())
                         menuImgOriginalSize.setDisabled(disabled || _.isNull(value.imgProps.value.get_ImageUrl()) || _.isUndefined(value.imgProps.value.get_ImageUrl()));
 
-                    menuImageAdvanced.setVisible((_.isUndefined(value.shapeProps) || value.shapeProps.value.get_FromImage()) && _.isUndefined(value.chartProps));
+                    menuImgReplace.setVisible(isimage && (pluginGuid===null || pluginGuid===undefined));
+                    if (menuImgReplace.isVisible())
+                        menuImgReplace.setDisabled(disabled || pluginGuid===null);
+
+                    menuImageAdvanced.setVisible(isimage);
                     menuShapeAdvanced.setVisible(_.isUndefined(value.imgProps)   && _.isUndefined(value.chartProps));
                     menuChartEdit.setVisible(_.isUndefined(value.imgProps) && !_.isUndefined(value.chartProps) && (_.isUndefined(value.shapeProps) || value.shapeProps.isChart));
                     menuImgShapeSeparator.setVisible(menuImageAdvanced.isVisible() || menuShapeAdvanced.isVisible() || menuChartEdit.isVisible());
@@ -3154,6 +3197,7 @@ define([
                     menuImgShapeAlign,
                     menuImgShapeSeparator,
                     menuImgOriginalSize,
+                    menuImgReplace,
                     menuImageAdvanced,
                     menuShapeAdvanced
                     ,menuChartEdit
@@ -3398,7 +3442,10 @@ define([
         txtPasteSourceFormat: 'Keep source formatting',
         txtPasteDestFormat: 'Use destination theme',
         textDistributeRows: 'Distribute rows',
-        textDistributeCols: 'Distribute columns'
+        textDistributeCols: 'Distribute columns',
+        textReplace:    'Replace image',
+        textFromUrl:    'From URL',
+        textFromFile:   'From File'
 
     }, PE.Views.DocumentHolder || {}));
 });

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

@@ -294,8 +294,13 @@ define([
                             me.previewControls.css('display', 'none');
                             me.$el.css('cursor', 'none');
                         }, 3000);
-
                 });
+                if (!me.previewControls.hasClass('over')) {
+                    me.timerMove = setTimeout(function () {
+                        me.previewControls.css('display', 'none');
+                        me.$el.css('cursor', 'none');
+                    }, 3000);
+                }
             }, 1000);
             $('#viewport-vbox-layout').css('z-index','0');
             this.fireEvent('editcomplete', this);

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

@@ -69,14 +69,14 @@ define([
             }, options || {});
 
             this.template = [
-                '<div class="box" style="height: 270px;">',
+                '<div class="box" style="height: 250px;">',
-                    '<div class="input-row">',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
-                        '<label style="font-weight: bold;">' + this.textLinkType + '</label>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternalLink,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternalLink,'</button>',
                     '</div>',
-                    '<div id="id-dlg-hyperlink-type" class="input-row" style="margin-bottom: 5px;"></div>',
                     '<div id="id-external-link">',
                         '<div class="input-row">',
-                            '<label style="font-weight: bold;">' + this.strLinkTo + ' *</label>',
+                            '<label>' + this.strLinkTo + ' *</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
@@ -89,11 +89,11 @@ define([
                         '<div id="id-dlg-hyperlink-slide" style="display: inline-block;margin-bottom: 10px;"></div>',
                     '</div>',
                     '<div class="input-row">',
-                        '<label style="font-weight: bold;">' + this.strDisplay + '</label>',
+                        '<label>' + this.strDisplay + '</label>',
                     '</div>',
                     '<div id="id-dlg-hyperlink-display" class="input-row" style="margin-bottom: 5px;"></div>',
                     '<div class="input-row">',
-                        '<label style="font-weight: bold;">' + this.textTipText + '</label>',
+                        '<label>' + this.textTipText + '</label>',
                     '</div>',
                         '<div id="id-dlg-hyperlink-tip" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
@@ -116,23 +116,22 @@ define([
             var me = this,
                 $window = this.getChild();
 
-            me._arrTypeSrc = [
+            me.btnExternal = new Common.UI.Button({
-                {displayValue: me.textInternalLink,   value: c_oHyperlinkType.InternalLink},
+                el: $('#id-dlg-hyperlink-external'),
-                {displayValue: me.textExternalLink,   value: c_oHyperlinkType.WebLink}
+                enableToggle: true,
-            ];
+                toggleGroup: 'hyperlink-type',
-
+                allowDepress: false,
-            me.cmbLinkType = new Common.UI.ComboBox({
+                pressed: true
-                el: $('#id-dlg-hyperlink-type'),
-                cls: 'input-group-nr',
-                style: 'width: 100%;',
-                menuStyle: 'min-width: 318px;',
-                editable: false,
-                data: this._arrTypeSrc
             });
-            me.cmbLinkType.setValue(me._arrTypeSrc[1].value);
+            me.btnExternal.on('click', _.bind(me.onLinkTypeClick, me, c_oHyperlinkType.WebLink));
-            me.cmbLinkType.on('selected', _.bind(function(combo, record) {
+
-                this.ShowHideElem(record.value);
+            me.btnInternal = new Common.UI.Button({
-            }, me));
+                el: $('#id-dlg-hyperlink-internal'),
+                enableToggle: true,
+                toggleGroup: 'hyperlink-type',
+                allowDepress: false
+            });
+            me.btnInternal.on('click', _.bind(me.onLinkTypeClick, me, c_oHyperlinkType.InternalLink));
 
             me.inputUrl = new Common.UI.InputField({
                 el          : $('#id-dlg-hyperlink-url'),
@@ -217,7 +216,7 @@ define([
                 var me = this;
 
                 var type = me.parseUrl(props.get_Value());
-                me.cmbLinkType.setValue(type);
+                (type == c_oHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
                 me.ShowHideElem(type);
                 
                 if (props.get_Text()!==null) {
@@ -239,7 +238,7 @@ define([
             var me      = this,
                 props   = new Asc.CHyperlinkProperty();
             var def_display = '';
-            if (me.cmbLinkType.getValue() == c_oHyperlinkType.InternalLink) {
+            if (this.btnInternal.isActive()) {//InternalLink
                 var url = "ppaction://hlink";
                 var tip = '';
                 var txttip = me.inputTip.getValue();
@@ -298,7 +297,7 @@ define([
         _handleInput: function(state) {
             if (this.options.handler) {
                 if (state == 'ok') {
-                    var checkurl = (this.cmbLinkType.getValue() == c_oHyperlinkType.WebLink) ? this.inputUrl.checkValidate() : true,
+                    var checkurl = (this.btnExternal.isActive()) ? this.inputUrl.checkValidate() : true,
                         checkdisp = this.inputDisplay.checkValidate();
                     if (checkurl !== true)  {
                         this.inputUrl.cmpEl.find('input').focus();
@@ -321,6 +320,10 @@ define([
             this.internalPanel.toggleClass('hidden', value !== c_oHyperlinkType.InternalLink);
         },
 
+        onLinkTypeClick: function(type, btn, event) {
+            this.ShowHideElem(type);
+        },
+
         parseUrl: function(url) {
             if (url===null || url===undefined || url=='' )
                 return c_oHyperlinkType.WebLink;
@@ -364,13 +367,12 @@ define([
         },
 
         textTitle:          'Hyperlink Settings',
-        textInternalLink:   'Place In This Document',
+        textInternalLink:   'Slide In This Presentation',
-        textExternalLink:   'File or Web Page',
+        textExternalLink:   'External Link',
         textEmptyLink:      'Enter link here',
         textEmptyDesc:      'Enter caption here',
         textEmptyTooltip:   'Enter tooltip here',
         txtSlide:           'Slide',
-        textLinkType:       'Link Type',
         strDisplay:         'Display',
         textTipText:        'Screen Tip Text',
         strLinkTo:          'Link To',

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

@@ -174,7 +174,7 @@ define([
                 this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined || this._locked);
 
                 var pluginGuid = props.asc_getPluginGuid();
-                value = (pluginGuid !== null && pluginGuid !== undefined);
+                value = (pluginGuid !== null && pluginGuid !== undefined); // undefined - only images are selected, null - selected images and ole-objects
                 if (this._state.isOleObject!==value) {
                     this.btnInsertFromUrl.setVisible(!value);
                     this.btnInsertFromFile.setVisible(!value);

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

@@ -83,45 +83,6 @@ define([
         commentLock: 'can-comment'
     };
 
-    var buttonsArray = function (opts) {
-        var arr = [];
-        arr.push.apply(arr, arguments);
-        arr.__proto__ = buttonsArray.prototype;
-        return arr;
-    };
-
-    buttonsArray.prototype = new Array;
-
-    buttonsArray.prototype.disable = function (state) {
-        this.forEach(function(btn) {
-            btn.setDisabled(state);
-        });
-    };
-
-    buttonsArray.prototype.toggle = function (state, suppress) {
-        this.forEach(function(btn) {
-            btn.toggle(state, suppress);
-        });
-    };
-
-    buttonsArray.prototype.pressed = function () {
-        return this.some(function(btn) {
-            return btn.pressed;
-        });
-    };
-
-    buttonsArray.prototype.on = function (event, func) {
-        this.forEach(function(btn) {
-            btn.on.apply(btn, arguments);
-        });
-    };
-
-    buttonsArray.prototype.contains = function (id) {
-        return this.some(function(btn) {
-            return btn.id == id;
-        });
-    };
-
     PE.Views.Toolbar =  Common.UI.Mixtbar.extend(_.extend((function(){
 
         return {
@@ -209,15 +170,17 @@ define([
                     id          : 'id-toolbar-btn-save',
                     cls         : 'btn-toolbar',
                     iconCls     : 'no-mask ' + me.btnSaveCls,
-                    lock        : [_set.lostConnect]
+                    lock        : [_set.lostConnect],
+                    signals     : ['disabled']
                 });
-                me.btnsSave = [me.btnSave];
+                me.btnCollabChanges = me.btnSave;
 
                 me.btnUndo = new Common.UI.Button({
                     id          : 'id-toolbar-btn-undo',
                     cls         : 'btn-toolbar',
                     iconCls     : 'btn-undo',
-                    lock        : [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart]
+                    lock        : [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
+                    signals     : ['disabled']
                 });
                 me.slideOnlyControls.push(me.btnUndo);
 
@@ -225,7 +188,8 @@ define([
                     id          : 'id-toolbar-btn-redo',
                     cls         : 'btn-toolbar',
                     iconCls     : 'btn-redo',
-                    lock        : [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart]
+                    lock        : [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
+                    signals     : ['disabled']
                 });
                 me.slideOnlyControls.push(me.btnRedo);
 
@@ -612,31 +576,6 @@ define([
                 });
                 me.slideOnlyControls.push(me.btnColorSchemas);
 
-                me.btnHide = new Common.UI.Button({
-                    id          : 'id-toolbar-btn-hidebars',
-                    cls         : 'btn-toolbar',
-                    iconCls     : 'btn-hidebars no-mask',
-                    lock        : [_set.menuFileOpen, _set.slideDeleted, _set.disableOnStart],
-                    menu        : true
-                });
-                me.slideOnlyControls.push(me.btnHide);
-
-                this.btnFitPage = {
-                    conf: {checked:false},
-                    setChecked: function(val) { this.conf.checked = val;},
-                    isChecked: function () { return this.conf.checked; }
-                };
-                this.btnFitWidth = clone(this.btnFitPage);
-                this.mnuZoom = {options: {value: 100}};
-
-                me.btnAdvSettings = new Common.UI.Button({
-                    id          : 'id-toolbar-btn-settings',
-                    cls         : 'btn-toolbar',
-                    iconCls     : 'btn-settings no-mask',
-                    lock        : [_set.slideDeleted, _set.disableOnStart]
-                });
-                me.slideOnlyControls.push(me.btnAdvSettings);
-
                 me.btnShapeAlign = new Common.UI.Button({
                     id          : 'id-toolbar-btn-shape-align',
                     cls         : 'btn-toolbar',
@@ -768,7 +707,6 @@ define([
                     itemWidth   : 85,
                     enableKeyEvents: true,
                     itemHeight  : 38,
-                    hint: this.tipSlideTheme,
                     lock: [_set.themeLock, _set.lostConnect, _set.noSlides],
                     beforeOpenHandler: function(e) {
                         var cmp = this,
@@ -911,9 +849,9 @@ define([
                     }
                 });
 
+                me.setTab('home');
                 if ( me.isCompactView )
-                    me.setFolded(true); else
+                    me.setFolded(true);
-                    me.setTab('home');
 
                 return this;
             },
@@ -979,11 +917,9 @@ define([
                 _injectComponent('#slot-btn-colorschemas', this.btnColorSchemas);
                 _injectComponent('#slot-btn-slidesize', this.btnSlideSize);
                 _injectComponent('#slot-field-styles', this.listTheme);
-                _injectComponent('#slot-btn-hidebars', this.btnHide);
-                _injectComponent('#slot-btn-settings', this.btnAdvSettings);
 
                 function _injectBtns(opts) {
-                    var array = new buttonsArray;
+                    var array = createButtonSet();
                     var $slots = $host.find(opts.slot);
                     var id = opts.btnconfig.id;
                     $slots.each(function(index, el) {
@@ -992,7 +928,7 @@ define([
                         var button = new Common.UI.Button(opts.btnconfig);
                         button.render( $slots.eq(index) );
 
-                        array.push(button);
+                        array.add(button);
                     });
 
                     return array;
@@ -1141,8 +1077,6 @@ define([
                 this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
                 this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
                 this.btnColorSchemas.updateHint(this.tipColorSchemas);
-                this.btnHide.updateHint(this.tipViewSettings);
-                this.btnAdvSettings.updateHint(this.tipAdvSettings);
                 this.btnShapeAlign.updateHint(this.tipShapeAlign);
                 this.btnShapeArrange.updateHint(this.tipShapeArrange);
                 this.btnSlideSize.updateHint(this.tipSlideSize);
@@ -1151,66 +1085,6 @@ define([
 
                 var me = this;
 
-                this.btnHide.setMenu(
-                    new Common.UI.Menu({
-                        cls: 'pull-right',
-                        style: 'min-width: 180px;',
-                        items: [
-                            this.mnuitemCompactToolbar = new Common.UI.MenuItem({
-                                caption: this.textCompactView,
-                                checkable: true,
-                                checked: me.isCompactView
-                            }),
-                            this.mnuitemHideStatusBar = new Common.UI.MenuItem({
-                                caption: this.textHideStatusBar,
-                                checkable: true
-                            }),
-                            this.mnuitemHideRulers = new Common.UI.MenuItem({
-                                caption: this.textHideLines,
-                                checkable: true
-                            }),
-                            {caption: '--'},
-                            this.btnFitPage = new Common.UI.MenuItem({
-                                caption: this.textFitPage,
-                                checkable: true,
-                                checked: this.btnFitPage.isChecked()
-                            }),
-                            this.btnFitWidth = new Common.UI.MenuItem({
-                                caption: this.textFitWidth,
-                                checkable: true,
-                                checked: this.btnFitWidth.isChecked()
-                            }),
-                            this.mnuZoom = new Common.UI.MenuItem({
-                                template: _.template([
-                                    '<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25px;" ',
-                                    '<% if(!_.isUndefined(options.stopPropagation)) { %>',
-                                    'data-stopPropagation="true"',
-                                    '<% } %>',
-                                    '>',
-                                    '<label class="title">' + this.textZoom + '</label>',
-                                    '<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomin"></i></button>',
-                                    '<label class="zoom"><%= options.value %>%</label>',
-                                    '<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomout"></i></button>',
-                                    '</div>'
-                                ].join('')),
-                                stopPropagation: true,
-                                value: this.mnuZoom.options.value
-                            })
-                        ]
-                    })
-                );
-                if (this.mode.canBrandingExt && this.mode.customization && this.mode.customization.statusBar === false)
-                    this.mnuitemHideStatusBar.hide();
-
-                this.mnuZoomOut = new Common.UI.Button({
-                    el: $('#id-menu-zoom-out'),
-                    cls: 'btn-toolbar'
-                });
-                this.mnuZoomIn = new Common.UI.Button({
-                    el: $('#id-menu-zoom-in'),
-                    cls: 'btn-toolbar'
-                });
-
                 this.btnMarkers.setMenu(
                     new Common.UI.Menu({
                         style: 'min-width: 139px',
@@ -1375,19 +1249,9 @@ define([
                         me.mnuChangeSlidePicker._needRecalcSlideLayout = true;
                 });
 
-                this.mnuitemHideStatusBar.setChecked(Common.localStorage.getBool('pe-hidden-status'), true);
-                this.mnuitemHideRulers.setChecked(Common.localStorage.getBool("pe-hidden-rulers", true), true);
-
 //            // Enable none paragraph components
                 this.lockToolbar(PE.enumLock.disableOnStart, false, {array: this.slideOnlyControls.concat(this.shapeControls)});
 
-                var btnsave = PE.getController('LeftMenu').getView('LeftMenu').getMenu('file').getButton('save');
-                if (btnsave && this.btnsSave) {
-                    this.btnsSave.push(btnsave);
-                    this.lockControls.push(btnsave);
-                    btnsave.setDisabled(this.btnsSave[0].isDisabled());
-                }
-
                 /** coauthoring begin **/
                 this.showSynchTip = !Common.localStorage.getBool('pe-hide-synch');
                 this.needShowSynchTip = false;
@@ -1511,7 +1375,7 @@ define([
             /** coauthoring begin **/
             onCollaborativeChanges: function () {
                 if (this._state.hasCollaborativeChanges) return;
-                if (!this.btnSave.rendered) {
+                if (!this.btnCollabChanges.rendered) {
                     this.needShowSynchTip = true;
                     return;
                 }
@@ -1523,59 +1387,47 @@ define([
                 }
 
                 this._state.hasCollaborativeChanges = true;
-                var iconEl = $('.icon', this.btnSave.cmpEl);
+                this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch');
-                iconEl.removeClass(this.btnSaveCls);
-                iconEl.addClass('btn-synch');
                 if (this.showSynchTip) {
-                    this.btnSave.updateHint('');
+                    this.btnCollabChanges.updateHint('');
                     if (this.synchTooltip === undefined)
                         this.createSynchTip();
 
                     this.synchTooltip.show();
                 } else {
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                 }
 
-                this.btnsSave.forEach(function(button) {
+                this.btnSave.setDisabled(false);
-                    if ( button ) {
-                        button.setDisabled(false);
-                    }
-                });
                 Common.Gateway.collaborativeChanges();
             },
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
-                    target: $('#id-toolbar-btn-save')
+                    target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {
                     this.showSynchTip = false;
                     this.synchTooltip.hide();
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                     Common.localStorage.setItem("pe-hide-synch", 1);
                 }, this);
                 this.synchTooltip.on('closeclick', function () {
                     this.synchTooltip.hide();
-                    this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                    this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                 }, this);
             },
 
             synchronizeChanges: function () {
-                if (this.btnSave.rendered) {
+                if (this.btnCollabChanges.rendered) {
-                    var iconEl = $('.icon', this.btnSave.cmpEl),
+                    var me = this;
-                        me = this;
 
-                    if (iconEl.hasClass('btn-synch')) {
+                    if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) {
-                        iconEl.removeClass('btn-synch');
+                        me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(this.btnSaveCls);
-                        iconEl.addClass(this.btnSaveCls);
                         if (this.synchTooltip)
                             this.synchTooltip.hide();
-                        this.btnSave.updateHint(this.btnSaveTip);
+                        this.btnCollabChanges.updateHint(this.btnSaveTip);
-                        this.btnsSave.forEach(function(button) {
+                        this.btnSave.setDisabled(!me.mode.forcesave);
-                            if ( button ) {
-                                button.setDisabled(!me.mode.forcesave);
-                            }
-                        });
 
                         this._state.hasCollaborativeChanges = false;
                     }
@@ -1591,14 +1443,12 @@ define([
 
                 var length = _.size(editusers);
                 var cls = (length > 1) ? 'btn-save-coauth' : 'btn-save';
-                if (cls !== this.btnSaveCls && this.btnSave.rendered) {
+                if (cls !== this.btnSaveCls && this.btnCollabChanges.rendered) {
                     this.btnSaveTip = ((length > 1) ? this.tipSaveCoauth : this.tipSave ) + Common.Utils.String.platformKey('Ctrl+S');
 
-                    var iconEl = $('.icon', this.btnSave.cmpEl);
+                    if ( !this.btnCollabChanges.$icon.hasClass('btn-synch') ) {
-                    if (!iconEl.hasClass('btn-synch')) {
+                        this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls);
-                        iconEl.removeClass(this.btnSaveCls);
+                        this.btnCollabChanges.updateHint(this.btnSaveTip);
-                        iconEl.addClass(cls);
-                        this.btnSave.updateHint(this.btnSaveTip);
                     }
                     this.btnSaveCls = cls;
                 }
@@ -1804,15 +1654,6 @@ define([
             mniSlideWide: 'Widescreen (16:9)',
             mniSlideAdvanced: 'Advanced Settings',
             tipSlideSize: 'Select Slide Size',
-            tipViewSettings: 'View Settings',
-            tipAdvSettings: 'Advanced Settings',
-            textCompactView: 'Hide Toolbar',
-            textHideTitleBar: 'Hide Title Bar',
-            textHideStatusBar: 'Hide Status Bar',
-            textHideLines: 'Hide Rulers',
-            textFitPage: 'Fit to Slide',
-            textFitWidth: 'Fit to Width',
-            textZoom: 'Zoom',
             tipInsertChart: 'Insert Chart',
             textLine: 'Line',
             textColumn: 'Column',

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

@@ -86,13 +86,19 @@ define([
             this.vlayout = new Common.UI.VBoxLayout({
                 box: $container,
                 items: [{
-                    el: items[0],
+                    el: $container.find('> .layout-item#app-title').hide(),
-                    height: Common.localStorage.getBool('pe-compact-toolbar') ? 32 : 32+67
+                    alias: 'title',
+                    height: Common.Utils.InternalSettings.get('document-title-height')
                 }, {
                     el: items[1],
-                    stretch: true
+                    alias: 'toolbar',
+                    height: Common.localStorage.getBool('pe-compact-toolbar') ?
+                        Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal')
                 }, {
                     el: items[2],
+                    stretch: true
+                }, {
+                    el: items[3],
                     height: 25
                 }]
             });

apps/presentationeditor/main/app_dev.js

@@ -181,6 +181,7 @@ require([
         'common/main/lib/controller/ExternalDiagramEditor'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         window.compareVersions = true;
         app.start();

apps/presentationeditor/main/locale/en.json

@@ -92,6 +92,12 @@
   "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.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@@ -354,6 +360,17 @@
   "PE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
   "PE.Controllers.Main.txtXAxis": "X Axis",
   "PE.Controllers.Main.txtYAxis": "Y Axis",
+  "PE.Controllers.Main.txtTheme_blank": "Blank",
+  "PE.Controllers.Main.txtTheme_pixel": "Pixel",
+  "PE.Controllers.Main.txtTheme_classic": "Classic",
+  "PE.Controllers.Main.txtTheme_official": "Official",
+  "PE.Controllers.Main.txtTheme_green": "Green",
+  "PE.Controllers.Main.txtTheme_lines": "Lines",
+  "PE.Controllers.Main.txtTheme_office": "Office",
+  "PE.Controllers.Main.txtTheme_safari": "Safari",
+  "PE.Controllers.Main.txtTheme_dotted": "Dotted",
+  "PE.Controllers.Main.txtTheme_corner": "Corner",
+  "PE.Controllers.Main.txtTheme_turtle": "Turtle",
   "PE.Controllers.Main.unknownErrorText": "Unknown error.",
   "PE.Controllers.Main.unsupportedBrowserErrorText": "Your browser is not supported.",
   "PE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
@@ -700,6 +717,8 @@
   "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis",
   "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "PE.Controllers.Viewport.textFitPage": "Fit to Slide",
+  "PE.Controllers.Viewport.textFitWidth": "Fit to Width",
   "PE.Views.ChartSettings.textAdvanced": "Show advanced settings",
   "PE.Views.ChartSettings.textArea": "Area",
   "PE.Views.ChartSettings.textBar": "Bar",
@@ -882,6 +901,9 @@
   "PE.Views.DocumentHolder.txtUnderbar": "Bar under text",
   "PE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "PE.Views.DocumentHolder.textReplace": "Replace image",
+  "PE.Views.DocumentHolder.textFromUrl": "From URL",
+  "PE.Views.DocumentHolder.textFromFile": "From File",
   "PE.Views.DocumentPreview.goToSlideText": "Go to Slide",
   "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}",
   "PE.Views.DocumentPreview.txtClose": "Close slideshow",
@@ -980,7 +1002,7 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Enter tooltip here",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "External Link",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Slide In This Presentation",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Link Type",
+  "del_PE.Views.HyperlinkSettingsDialog.textLinkType": "Link Type",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "ScreenTip Text",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "This field is required",
@@ -1405,12 +1427,12 @@
   "PE.Views.Toolbar.textCancel": "Cancel",
   "PE.Views.Toolbar.textCharts": "Charts",
   "PE.Views.Toolbar.textColumn": "Column",
-  "PE.Views.Toolbar.textCompactView": "Hide Toolbar",
+  "del_PE.Views.Toolbar.textCompactView": "Hide Toolbar",
-  "PE.Views.Toolbar.textFitPage": "Fit to Slide",
+  "del_PE.Views.Toolbar.textFitPage": "Fit to Slide",
-  "PE.Views.Toolbar.textFitWidth": "Fit to Width",
+  "del_PE.Views.Toolbar.textFitWidth": "Fit to Width",
-  "PE.Views.Toolbar.textHideLines": "Hide Rulers",
+  "del_PE.Views.Toolbar.textHideLines": "Hide Rulers",
-  "PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
+  "del_PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
-  "PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
+  "del_PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
   "PE.Views.Toolbar.textItalic": "Italic",
   "PE.Views.Toolbar.textLine": "Line",
   "PE.Views.Toolbar.textNewColor": "Custom Color",
@@ -1439,9 +1461,9 @@
   "PE.Views.Toolbar.textTabProtect": "Protection",
   "PE.Views.Toolbar.textTitleError": "Error",
   "PE.Views.Toolbar.textUnderline": "Underline",
-  "PE.Views.Toolbar.textZoom": "Zoom",
+  "del_PE.Views.Toolbar.textZoom": "Zoom",
   "PE.Views.Toolbar.tipAddSlide": "Add slide",
-  "PE.Views.Toolbar.tipAdvSettings": "Advanced settings",
+  "del_PE.Views.Toolbar.tipAdvSettings": "Advanced settings",
   "PE.Views.Toolbar.tipBack": "Back",
   "PE.Views.Toolbar.tipChangeChart": "Change chart type",
   "PE.Views.Toolbar.tipChangeSlide": "Change slide layout",
@@ -1454,7 +1476,7 @@
   "PE.Views.Toolbar.tipFontName": "Font",
   "PE.Views.Toolbar.tipFontSize": "Font size",
   "PE.Views.Toolbar.tipHAligh": "Horizontal align",
-  "PE.Views.Toolbar.tipHideBars": "Hide Title bar & Status bar",
+  "del_PE.Views.Toolbar.tipHideBars": "Hide Title bar & Status bar",
   "PE.Views.Toolbar.tipIncPrLeft": "Increase indent",
   "PE.Views.Toolbar.tipInsertChart": "Insert chart",
   "PE.Views.Toolbar.tipInsertEquation": "Insert equation",

apps/presentationeditor/main/locale/ko.json

@@ -57,6 +57,7 @@
   "Common.Views.Comments.textAddComment": "덧글 추가",
   "Common.Views.Comments.textAddCommentToDoc": "문서에 설명 추가",
   "Common.Views.Comments.textAddReply": "답장 추가",
+  "Common.Views.Comments.textAnonym": "손님",
   "Common.Views.Comments.textCancel": "취소",
   "Common.Views.Comments.textClose": "닫기",
   "Common.Views.Comments.textComments": "Comments",
@@ -81,10 +82,13 @@
   "Common.Views.Header.labelCoUsersDescr": "문서는 현재 여러 사용자가 편집하고 있습니다.",
   "Common.Views.Header.textBack": "문서로 이동",
   "Common.Views.Header.textSaveBegin": "저장 중 ...",
+  "Common.Views.Header.textSaveChanged": "수정된",
   "Common.Views.Header.textSaveEnd": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.textSaveExpander": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.tipAccessRights": "문서 액세스 권한 관리",
   "Common.Views.Header.tipDownload": "파일을 다운로드",
+  "Common.Views.Header.tipGoEdit": "현재 파일 편집",
+  "Common.Views.Header.tipPrint": "파일 출력",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
   "Common.Views.Header.txtRename": "이름 바꾸기",
@@ -106,55 +110,105 @@
   "Common.Views.LanguageDialog.btnOk": "Ok",
   "Common.Views.LanguageDialog.labelSelect": "문서 언어 선택",
   "Common.Views.OpenDialog.cancelButtonText": "취소",
+  "Common.Views.OpenDialog.closeButtonText": "파일 닫기",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "인코딩",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "비밀번호가 맞지 않음",
   "Common.Views.OpenDialog.txtPassword": "비밀번호",
   "Common.Views.OpenDialog.txtTitle": "% 1 옵션 선택",
   "Common.Views.OpenDialog.txtTitleProtected": "보호 된 파일",
   "Common.Views.PasswordDialog.cancelButtonText": "취소",
   "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "문서 보호용 비밀번호를 세팅하세요",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "확인 비밀번호가 같지 않음",
   "Common.Views.PasswordDialog.txtPassword": "암호",
+  "Common.Views.PasswordDialog.txtRepeat": "비밀번호 반복",
+  "Common.Views.PasswordDialog.txtTitle": "비밀번호 설정",
   "Common.Views.PluginDlg.textLoading": "로드 중",
   "Common.Views.Plugins.groupCaption": "플러그인",
   "Common.Views.Plugins.strPlugins": "플러그인",
   "Common.Views.Plugins.textLoading": "로드 중",
   "Common.Views.Plugins.textStart": "시작",
+  "Common.Views.Plugins.textStop": "정지",
+  "Common.Views.Protection.hintAddPwd": "비밀번호로 암호화",
+  "Common.Views.Protection.hintPwd": "비밀번호 변경 또는 삭제",
+  "Common.Views.Protection.hintSignature": "디지털 서명 또는 서명 라인을 추가 ",
+  "Common.Views.Protection.txtAddPwd": "비밀번호 추가",
   "Common.Views.Protection.txtChangePwd": "비밀번호를 변경",
+  "Common.Views.Protection.txtDeletePwd": "비밀번호 삭제",
+  "Common.Views.Protection.txtEncrypt": "암호화",
+  "Common.Views.Protection.txtInvisibleSignature": "디지털 서명을 추가",
+  "Common.Views.Protection.txtSignature": "서명",
+  "Common.Views.Protection.txtSignatureLine": "서명 라인",
   "Common.Views.RenameDialog.cancelButtonText": "취소",
   "Common.Views.RenameDialog.okButtonText": "Ok",
   "Common.Views.RenameDialog.textName": "파일 이름",
   "Common.Views.RenameDialog.txtInvalidName": "파일 이름에 다음 문자를 포함 할 수 없습니다 :",
   "Common.Views.ReviewChanges.hintNext": "다음 변경 사항",
   "Common.Views.ReviewChanges.hintPrev": "이전 변경으로",
+  "Common.Views.ReviewChanges.strFast": "빠르게",
+  "Common.Views.ReviewChanges.strFastDesc": "실시간 협력 편집. 모든 변경사항들은 자동적으로 저장됨.",
+  "Common.Views.ReviewChanges.strStrict": "엄격한",
+  "Common.Views.ReviewChanges.strStrictDesc": "귀하와 다른 사람이 변경사항을 동기화 하려면 '저장'버튼을 사용하세요.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "협력 편집 모드 세팅",
   "Common.Views.ReviewChanges.tipHistory": "버전 표시",
   "Common.Views.ReviewChanges.tipRejectCurrent": "현재 변경 거부",
   "Common.Views.ReviewChanges.tipReview": "변경 내용 추적",
+  "Common.Views.ReviewChanges.tipReviewView": "변경사항이 표시될 모드 선택",
   "Common.Views.ReviewChanges.tipSetDocLang": "문서 언어 설정",
   "Common.Views.ReviewChanges.tipSetSpelling": "맞춤법 검사",
   "Common.Views.ReviewChanges.tipSharing": "문서 액세스 권한 관리",
   "Common.Views.ReviewChanges.txtAccept": "수락",
   "Common.Views.ReviewChanges.txtAcceptAll": "모든 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtAcceptChanges": "변경 접수",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtChat": "채팅",
   "Common.Views.ReviewChanges.txtClose": "완료",
   "Common.Views.ReviewChanges.txtCoAuthMode": "공동 편집 모드",
   "Common.Views.ReviewChanges.txtDocLang": "언어",
+  "Common.Views.ReviewChanges.txtFinal": "모든 변경 접수됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtFinalCap": "최종",
   "Common.Views.ReviewChanges.txtHistory": "버전 기록",
+  "Common.Views.ReviewChanges.txtMarkup": "모든 변경 (편집)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "마크업",
   "Common.Views.ReviewChanges.txtNext": "다음",
+  "Common.Views.ReviewChanges.txtOriginal": "모든 변경 거부됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "오리지널",
   "Common.Views.ReviewChanges.txtPrev": "이전",
   "Common.Views.ReviewChanges.txtReject": "거부",
   "Common.Views.ReviewChanges.txtRejectAll": "모든 변경 사항 거부",
+  "Common.Views.ReviewChanges.txtRejectChanges": "변경 거부",
   "Common.Views.ReviewChanges.txtRejectCurrent": "현재 변경 거부",
+  "Common.Views.ReviewChanges.txtSharing": "공유",
   "Common.Views.ReviewChanges.txtSpelling": "맞춤법 검사",
   "Common.Views.ReviewChanges.txtTurnon": "변경 내용 추적",
+  "Common.Views.ReviewChanges.txtView": "디스플레이 모드",
   "Common.Views.SignDialog.cancelButtonText": "취소",
   "Common.Views.SignDialog.okButtonText": "OK",
   "Common.Views.SignDialog.textBold": "볼드체",
+  "Common.Views.SignDialog.textCertificate": "인증",
   "Common.Views.SignDialog.textChange": "변경",
+  "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
+  "Common.Views.SignDialog.textItalic": "이탤릭",
+  "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelectImage": "이미지 선택",
+  "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
+  "Common.Views.SignDialog.textTitle": "서명문서",
+  "Common.Views.SignDialog.textUseImage": "또는 서명으로 그림을 사용하려면 '이미지 선택'을 클릭",
+  "Common.Views.SignDialog.textValid": "%1에서 %2까지 유효",
+  "Common.Views.SignDialog.tipFontName": "폰트명",
   "Common.Views.SignDialog.tipFontSize": "글꼴 크기",
   "Common.Views.SignSettingsDialog.cancelButtonText": "취소",
   "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "서명 대화창에 서명자의 코멘트 추가 허용",
+  "Common.Views.SignSettingsDialog.textInfo": "서명자 정보",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "이메일",
   "Common.Views.SignSettingsDialog.textInfoName": "이름",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
+  "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
+  "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "PE.Controllers.LeftMenu.newDocumentTitle": "명명되지 않은 프레젠테이션",
   "PE.Controllers.LeftMenu.requestEditRightsText": "편집 권한 요청 중 ...",
@@ -176,6 +230,7 @@
   "PE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "PE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
   "PE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "PE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "PE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "PE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",
   "PE.Controllers.Main.errorProcessSaveResult": "저장하지 못했습니다.",
@@ -232,6 +287,8 @@
   "PE.Controllers.Main.textTryUndoRedo": "빠른 편집 편집 모드에서는 실행 취소 / 다시 실행 기능이 비활성화됩니다. <br>\"엄격 모드 \"버튼을 클릭하면 Strict 동시 편집 모드로 전환되어 파일을 편집 할 수 있습니다. 다른 사용자가 방해를해서 저장 한 후에 만 ​​변경 사항을 보내십시오. 편집자 고급 설정을 사용하여 공동 편집 모드간에 전환 할 수 있습니다. ",
   "PE.Controllers.Main.titleLicenseExp": "라이센스 만료",
   "PE.Controllers.Main.titleServerVersion": "편집기가 업데이트되었습니다",
+  "PE.Controllers.Main.txtAddFirstSlide": "첫번째 슬라이드를 추가하려면 클릭",
+  "PE.Controllers.Main.txtAddNotes": "노트를 추가하려면 클릭",
   "PE.Controllers.Main.txtArt": "여기에 귀하의 텍스트",
   "PE.Controllers.Main.txtBasicShapes": "기본 도형",
   "PE.Controllers.Main.txtButtons": "버튼",
@@ -719,6 +776,8 @@
   "PE.Views.DocumentHolder.textArrangeFront": "전경으로 가져 오기",
   "PE.Views.DocumentHolder.textCopy": "복사",
   "PE.Views.DocumentHolder.textCut": "잘라 내기",
+  "PE.Views.DocumentHolder.textDistributeCols": "컬럼 배포",
+  "PE.Views.DocumentHolder.textDistributeRows": "행 배포",
   "PE.Views.DocumentHolder.textNextPage": "다음 슬라이드",
   "PE.Views.DocumentHolder.textPaste": "붙여 넣기",
   "PE.Views.DocumentHolder.textPrevPage": "이전 슬라이드",
@@ -747,6 +806,7 @@
   "PE.Views.DocumentHolder.txtBorderProps": "테두리 속성",
   "PE.Views.DocumentHolder.txtBottom": "Bottom",
   "PE.Views.DocumentHolder.txtChangeLayout": "레이아웃 변경",
+  "PE.Views.DocumentHolder.txtChangeTheme": "테마 변경",
   "PE.Views.DocumentHolder.txtColumnAlign": "열 정렬",
   "PE.Views.DocumentHolder.txtDecreaseArg": "인수 크기 감소",
   "PE.Views.DocumentHolder.txtDeleteArg": "인수 삭제",
@@ -794,7 +854,9 @@
   "PE.Views.DocumentHolder.txtMatrixAlign": "매트릭스 정렬",
   "PE.Views.DocumentHolder.txtNewSlide": "새 슬라이드",
   "PE.Views.DocumentHolder.txtOverbar": "텍스트 위에 가로 막기",
+  "PE.Views.DocumentHolder.txtPasteDestFormat": "목적 테마를 사용하기",
   "PE.Views.DocumentHolder.txtPastePicture": "그림",
+  "PE.Views.DocumentHolder.txtPasteSourceFormat": "소스 포맷을 유지하세요",
   "PE.Views.DocumentHolder.txtPressLink": "CTRL 키를 누른 상태에서 링크 클릭",
   "PE.Views.DocumentHolder.txtPreview": "슬라이드 쇼 시작",
   "PE.Views.DocumentHolder.txtRemFractionBar": "분수 막대 제거",
@@ -814,6 +876,7 @@
   "PE.Views.DocumentHolder.txtShowPlaceholder": "자리 표시 자 표시",
   "PE.Views.DocumentHolder.txtShowTopLimit": "상한 표시",
   "PE.Views.DocumentHolder.txtSlide": "슬라이드",
+  "PE.Views.DocumentHolder.txtSlideHide": "슬라이드 감추기",
   "PE.Views.DocumentHolder.txtStretchBrackets": "스트레치 괄호",
   "PE.Views.DocumentHolder.txtTop": "Top",
   "PE.Views.DocumentHolder.txtUnderbar": "텍스트 아래에 바",
@@ -822,6 +885,7 @@
   "PE.Views.DocumentPreview.goToSlideText": "슬라이드로 이동",
   "PE.Views.DocumentPreview.slideIndexText": "{1} 중 {0} 슬라이드",
   "PE.Views.DocumentPreview.txtClose": "슬라이드 쇼 닫기",
+  "PE.Views.DocumentPreview.txtEndSlideshow": "슬라이드쇼 끝",
   "PE.Views.DocumentPreview.txtExitFullScreen": "전체 화면 나가기",
   "PE.Views.DocumentPreview.txtFinalMessage": "슬라이드 미리보기의 끝입니다. 끝내려면 클릭하십시오.",
   "PE.Views.DocumentPreview.txtFullScreen": "전체 화면",
@@ -839,6 +903,7 @@
   "PE.Views.FileMenu.btnHelpCaption": "Help ...",
   "PE.Views.FileMenu.btnInfoCaption": "프레젠테이션 정보 ...",
   "PE.Views.FileMenu.btnPrintCaption": "인쇄",
+  "PE.Views.FileMenu.btnProtectCaption": "보호",
   "PE.Views.FileMenu.btnRecentFilesCaption": "최근 열기 ...",
   "PE.Views.FileMenu.btnRenameCaption": "Rename ...",
   "PE.Views.FileMenu.btnReturnCaption": "프레젠테이션으로 돌아 가기",
@@ -861,7 +926,15 @@
   "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "액세스 권한 변경",
   "PE.Views.FileMenuPanels.DocumentRights.txtRights": "권한이있는 사람",
   "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "경고",
+  "PE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "비밀번호로",
+  "PE.Views.FileMenuPanels.ProtectDoc.strProtect": "프리젠테이션 보호",
+  "PE.Views.FileMenuPanels.ProtectDoc.strSignature": "서명으로",
   "PE.Views.FileMenuPanels.ProtectDoc.txtEdit": "프리젠 테이션 편집",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "편집은 프리젠테이션에서 서명을 삭제할 것입니다.<br>계속하시겠습니까?",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "이 프리젠테이션은 비밀번호로 보호되었슴.",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtSigned": "유효 서명자가 프리젠테이션에 추가되었슴. 이 프리젠테이션은 편집할 수 없도록 보호됨.",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "프리젠테이션내 몇가지 디지털 서명이 유효하지 않거나 확인되지 않음. 이 프리젠테이션은 편집할 수 없도록 보호됨.",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtView": "서명 보기",
   "PE.Views.FileMenuPanels.Settings.okButtonText": "적용",
   "PE.Views.FileMenuPanels.Settings.strAlignGuides": "정렬 안내선 켜기",
   "PE.Views.FileMenuPanels.Settings.strAutoRecover": "자동 검색 켜기",
@@ -992,6 +1065,7 @@
   "PE.Views.RightMenu.txtImageSettings": "이미지 설정",
   "PE.Views.RightMenu.txtParagraphSettings": "텍스트 설정",
   "PE.Views.RightMenu.txtShapeSettings": "도형 설정",
+  "PE.Views.RightMenu.txtSignatureSettings": "서명 세팅",
   "PE.Views.RightMenu.txtSlideSettings": "슬라이드 설정",
   "PE.Views.RightMenu.txtTableSettings": "표 설정",
   "PE.Views.RightMenu.txtTextArtSettings": "텍스트 아트 설정",
@@ -1072,6 +1146,16 @@
   "PE.Views.ShapeSettingsAdvanced.textWidth": "너비",
   "PE.Views.ShapeSettingsAdvanced.txtNone": "없음",
   "PE.Views.SignatureSettings.notcriticalErrorTitle": "경고",
+  "PE.Views.SignatureSettings.strDelete": "서명 삭제",
+  "PE.Views.SignatureSettings.strDetails": "서명 상세",
+  "PE.Views.SignatureSettings.strInvalid": "잘못된 서명",
+  "PE.Views.SignatureSettings.strSign": "서명",
+  "PE.Views.SignatureSettings.strSignature": "서명",
+  "PE.Views.SignatureSettings.strValid": "유효 서명",
+  "PE.Views.SignatureSettings.txtContinueEditing": "무조건 편집",
+  "PE.Views.SignatureSettings.txtEditWarning": "편집은 프리젠테이션에서 서명을 삭제할 것입니다.<br>계속하시겠습니까?",
+  "PE.Views.SignatureSettings.txtSigned": "유효 서명자가 프리젠테이션에 추가되었슴. 이 프리젠테이션은 편집할 수 없도록 보호됨.",
+  "PE.Views.SignatureSettings.txtSignedInvalid": "프리젠테이션내 몇가지 디지털 서명이 유효하지 않거나 확인되지 않음. 이 프리젠테이션은 편집할 수 없도록 보호됨.",
   "PE.Views.SlideSettings.strBackground": "배경색",
   "PE.Views.SlideSettings.strColor": "Color",
   "PE.Views.SlideSettings.strDelay": "지연",
@@ -1202,17 +1286,22 @@
   "PE.Views.TableSettings.textBanded": "줄무늬",
   "PE.Views.TableSettings.textBorderColor": "Color",
   "PE.Views.TableSettings.textBorders": "테두리 스타일",
+  "PE.Views.TableSettings.textCellSize": "셀 크기",
   "PE.Views.TableSettings.textColumns": "열",
+  "PE.Views.TableSettings.textDistributeCols": "컬럼 배포",
+  "PE.Views.TableSettings.textDistributeRows": "행 배포",
   "PE.Views.TableSettings.textEdit": "행 및 열",
   "PE.Views.TableSettings.textEmptyTemplate": "템플릿 없음",
   "PE.Views.TableSettings.textFirst": "First",
   "PE.Views.TableSettings.textHeader": "머리글",
+  "PE.Views.TableSettings.textHeight": "높이",
   "PE.Views.TableSettings.textLast": "마지막",
   "PE.Views.TableSettings.textNewColor": "사용자 정의 색상",
   "PE.Views.TableSettings.textRows": "행",
   "PE.Views.TableSettings.textSelectBorders": "위에서 선택한 스타일 적용을 변경하려는 테두리 선택",
   "PE.Views.TableSettings.textTemplate": "템플릿에서 선택",
   "PE.Views.TableSettings.textTotal": "합계",
+  "PE.Views.TableSettings.textWidth": "너비",
   "PE.Views.TableSettings.tipAll": "바깥 쪽 테두리 및 모든 안쪽 선 설정",
   "PE.Views.TableSettings.tipBottom": "바깥 쪽 테두리 만 설정",
   "PE.Views.TableSettings.tipInner": "내부 라인 만 설정",
@@ -1287,7 +1376,9 @@
   "PE.Views.Toolbar.capInsertEquation": "수식",
   "PE.Views.Toolbar.capInsertHyperlink": "하이퍼 링크",
   "PE.Views.Toolbar.capInsertImage": "그림",
+  "PE.Views.Toolbar.capInsertShape": "쉐이프",
   "PE.Views.Toolbar.capInsertTable": "테이블",
+  "PE.Views.Toolbar.capInsertText": "텍스트 박스",
   "PE.Views.Toolbar.capTabFile": "파일",
   "PE.Views.Toolbar.capTabHome": "집",
   "PE.Views.Toolbar.capTabInsert": "삽입",
@@ -1334,15 +1425,18 @@
   "PE.Views.Toolbar.textShapeAlignTop": "정렬",
   "PE.Views.Toolbar.textShowBegin": "처음부터 보여주기",
   "PE.Views.Toolbar.textShowCurrent": "현재 슬라이드에서보기",
+  "PE.Views.Toolbar.textShowPresenterView": "프리젠터뷰를 보기",
   "PE.Views.Toolbar.textShowSettings": "설정 표시",
   "PE.Views.Toolbar.textStock": "Stock",
   "PE.Views.Toolbar.textStrikeout": "Strikeout",
   "PE.Views.Toolbar.textSubscript": "아래 첨자",
   "PE.Views.Toolbar.textSuperscript": "위첨자",
   "PE.Views.Toolbar.textSurface": "Surface",
+  "PE.Views.Toolbar.textTabCollaboration": "합치기",
   "PE.Views.Toolbar.textTabFile": "파일",
   "PE.Views.Toolbar.textTabHome": "집",
   "PE.Views.Toolbar.textTabInsert": "삽입",
+  "PE.Views.Toolbar.textTabProtect": "보호",
   "PE.Views.Toolbar.textTitleError": "오류",
   "PE.Views.Toolbar.textUnderline": "밑줄",
   "PE.Views.Toolbar.textZoom": "확대 / 축소",
@@ -1368,7 +1462,7 @@
   "PE.Views.Toolbar.tipInsertImage": "그림 삽입",
   "PE.Views.Toolbar.tipInsertShape": "도형 삽입",
   "PE.Views.Toolbar.tipInsertTable": "표 삽입",
-  "PE.Views.Toolbar.tipInsertText": "텍스트 삽입",
+  "PE.Views.Toolbar.tipInsertText": "텍스트 상자 삽입",
   "PE.Views.Toolbar.tipInsertTextArt": "텍스트 아트 삽입",
   "PE.Views.Toolbar.tipLineSpace": "줄 간격",
   "PE.Views.Toolbar.tipMarkers": "글 머리 기호",

apps/presentationeditor/main/locale/nl.json

@@ -110,21 +110,106 @@
   "Common.Views.LanguageDialog.btnOk": "OK",
   "Common.Views.LanguageDialog.labelSelect": "Taal van document selecteren",
   "Common.Views.OpenDialog.cancelButtonText": "Annuleren",
+  "Common.Views.OpenDialog.closeButtonText": "Bestand sluiten",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Versleuteling",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Wachtwoord is niet juist",
   "Common.Views.OpenDialog.txtPassword": "Wachtwoord",
   "Common.Views.OpenDialog.txtTitle": "Opties voor %1 kiezen",
   "Common.Views.OpenDialog.txtTitleProtected": "Beschermd bestand",
+  "Common.Views.PasswordDialog.cancelButtonText": "Annuleren",
+  "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "Pas een wachtwoord toe om dit document te beveiligen",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "Bevestig wachtwoord is niet identiek",
+  "Common.Views.PasswordDialog.txtPassword": "Wachtwoord",
+  "Common.Views.PasswordDialog.txtRepeat": "Herhaal wachtwoord",
+  "Common.Views.PasswordDialog.txtTitle": "Wachtwoord instellen",
   "Common.Views.PluginDlg.textLoading": "Laden",
   "Common.Views.Plugins.groupCaption": "Plug-ins",
   "Common.Views.Plugins.strPlugins": "Plug-ins",
   "Common.Views.Plugins.textLoading": "Laden",
   "Common.Views.Plugins.textStart": "Starten",
   "Common.Views.Plugins.textStop": "Stoppen",
+  "Common.Views.Protection.hintAddPwd": "Versleutelen met wachtwoord",
+  "Common.Views.Protection.hintPwd": "Verander of verwijder wachtwoord",
+  "Common.Views.Protection.hintSignature": "Digitale handtekening toevoegen of handtekening lijn",
+  "Common.Views.Protection.txtAddPwd": "Wachtwoord toevoegen",
+  "Common.Views.Protection.txtChangePwd": "Verander wachtwoord",
+  "Common.Views.Protection.txtDeletePwd": "Wachtwoord verwijderen",
+  "Common.Views.Protection.txtEncrypt": "Versleutelen",
+  "Common.Views.Protection.txtInvisibleSignature": "Digitale handtekening toevoegen",
+  "Common.Views.Protection.txtSignature": "Handtekening",
+  "Common.Views.Protection.txtSignatureLine": "Handtekening lijn",
   "Common.Views.RenameDialog.cancelButtonText": "Annuleren",
   "Common.Views.RenameDialog.okButtonText": "OK",
   "Common.Views.RenameDialog.textName": "Bestandsnaam",
   "Common.Views.RenameDialog.txtInvalidName": "De bestandsnaam mag geen van de volgende tekens bevatten:",
+  "Common.Views.ReviewChanges.hintNext": "Naar volgende wijziging",
+  "Common.Views.ReviewChanges.hintPrev": "Naar vorige wijziging",
+  "Common.Views.ReviewChanges.strFast": "Snel",
+  "Common.Views.ReviewChanges.strFastDesc": "Real-time samenwerken. Alle wijzigingen worden automatisch opgeslagen.",
+  "Common.Views.ReviewChanges.strStrict": "Strikt",
+  "Common.Views.ReviewChanges.strStrictDesc": "Gebruik de 'Opslaan' knop om de wijzigingen van u en andere te synchroniseren.",
+  "Common.Views.ReviewChanges.tipAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "Zet samenwerkings modus",
+  "Common.Views.ReviewChanges.tipHistory": "Toon versie geschiedenis",
+  "Common.Views.ReviewChanges.tipRejectCurrent": "Huidige wijziging afwijzen",
+  "Common.Views.ReviewChanges.tipReview": "Wijzigingen bijhouden",
+  "Common.Views.ReviewChanges.tipReviewView": "Selecteer de modus waarin u de veranderingen weer wilt laten geven",
+  "Common.Views.ReviewChanges.tipSetDocLang": "Taal van document instellen",
+  "Common.Views.ReviewChanges.tipSetSpelling": "Spellingcontrole",
+  "Common.Views.ReviewChanges.tipSharing": "Toegangsrechten documenten beheren",
+  "Common.Views.ReviewChanges.txtAccept": "Accepteren",
+  "Common.Views.ReviewChanges.txtAcceptAll": "Alle wijzigingen accepteren",
+  "Common.Views.ReviewChanges.txtAcceptChanges": "Wijzigingen Accepteren",
+  "Common.Views.ReviewChanges.txtAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.txtChat": "Chat",
+  "Common.Views.ReviewChanges.txtClose": "Sluiten",
+  "Common.Views.ReviewChanges.txtCoAuthMode": "Modus Gezamenlijk bewerken",
+  "Common.Views.ReviewChanges.txtDocLang": "Taal",
+  "Common.Views.ReviewChanges.txtFinal": "Alle veranderingen geaccepteerd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtFinalCap": "Einde",
+  "Common.Views.ReviewChanges.txtHistory": "Versie geschiedenis",
+  "Common.Views.ReviewChanges.txtMarkup": "Alle veranderingen (Bewerken)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
+  "Common.Views.ReviewChanges.txtNext": "Volgende",
+  "Common.Views.ReviewChanges.txtOriginal": "Alle veranderingen afgekeurd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "Origineel",
+  "Common.Views.ReviewChanges.txtPrev": "Vorige",
+  "Common.Views.ReviewChanges.txtReject": "Afwijzen",
+  "Common.Views.ReviewChanges.txtRejectAll": "Alle wijzigingen afwijzen",
+  "Common.Views.ReviewChanges.txtRejectChanges": "Wijzigingen Afwijzen",
+  "Common.Views.ReviewChanges.txtRejectCurrent": "Huidige wijziging afwijzen",
+  "Common.Views.ReviewChanges.txtSharing": "Delen",
+  "Common.Views.ReviewChanges.txtSpelling": "Spellingcontrole",
+  "Common.Views.ReviewChanges.txtTurnon": "Wijzigingen bijhouden",
+  "Common.Views.ReviewChanges.txtView": "Weergavemodus",
+  "Common.Views.SignDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignDialog.okButtonText": "OK",
+  "Common.Views.SignDialog.textBold": "Vet",
+  "Common.Views.SignDialog.textCertificate": "Certificaat",
+  "Common.Views.SignDialog.textChange": "Wijzigen",
+  "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.textSelectImage": "Selecteer afbeelding",
+  "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
+  "Common.Views.SignDialog.textTitle": "Onderteken document",
+  "Common.Views.SignDialog.textUseImage": "of klik 'Selecteer afbeelding' om een afbeelding als handtekening te gebruiken",
+  "Common.Views.SignDialog.textValid": "Geldig van %1 tot %2",
+  "Common.Views.SignDialog.tipFontName": "Lettertype",
+  "Common.Views.SignDialog.tipFontSize": "Tekengrootte",
+  "Common.Views.SignSettingsDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "Sta ondertekenaar toe commentaar toe te voegen in het handtekening venster.",
+  "Common.Views.SignSettingsDialog.textInfo": "Ondertekenaar info",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
+  "Common.Views.SignSettingsDialog.textInfoName": "Naam",
+  "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.txtEmpty": "Dit veld is vereist",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentatie zonder naam",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Bewerkrechten worden aangevraagd...",
   "PE.Controllers.LeftMenu.textNoTextFound": "De gegevens waarnaar u zoekt, zijn niet gevonden. Pas uw zoekopties aan.",
@@ -145,6 +230,7 @@
   "PE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "PE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
   "PE.Controllers.Main.errorFilePassProtect": "Het document is beschermd met een wachtwoord en kan niet worden geopend.",
+  "PE.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.",
   "PE.Controllers.Main.errorKeyEncrypt": "Onbekende sleuteldescriptor",
   "PE.Controllers.Main.errorKeyExpire": "Sleuteldescriptor vervallen",
   "PE.Controllers.Main.errorProcessSaveResult": "Opslaan mislukt.",
@@ -195,12 +281,14 @@
   "PE.Controllers.Main.textCloseTip": "Klik om de tip te sluiten",
   "PE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
   "PE.Controllers.Main.textLoadingDocument": "Presentatie wordt geladen",
-  "PE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE",
+  "PE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",
   "PE.Controllers.Main.textShape": "Vorm",
   "PE.Controllers.Main.textStrict": "Strikte modus",
   "PE.Controllers.Main.textTryUndoRedo": "De functies Ongedaan maken/Opnieuw worden uitgeschakeld in de modus Snel gezamenlijk bewerken.<br>Klik op de knop 'Strikte modus' om over te schakelen naar de strikte modus voor gezamenlijk bewerken. U kunt het bestand dan zonder interferentie van andere gebruikers bewerken en uw wijzigingen verzenden wanneer u die opslaat. U kunt schakelen tussen de modi voor gezamenlijke bewerking via Geavanceerde instellingen van de editor.",
   "PE.Controllers.Main.titleLicenseExp": "Licentie vervallen",
   "PE.Controllers.Main.titleServerVersion": "Editor bijgewerkt",
+  "PE.Controllers.Main.txtAddFirstSlide": "Klik om de eerste slide te maken",
+  "PE.Controllers.Main.txtAddNotes": "Klik om notities toe te voegen",
   "PE.Controllers.Main.txtArt": "Hier tekst invoeren",
   "PE.Controllers.Main.txtBasicShapes": "Basisvormen",
   "PE.Controllers.Main.txtButtons": "Knoppen",
@@ -216,7 +304,7 @@
   "PE.Controllers.Main.txtHeader": "Koptekst",
   "PE.Controllers.Main.txtImage": "Afbeelding",
   "PE.Controllers.Main.txtLines": "Lijnen",
-  "PE.Controllers.Main.txtLoading": "Aan het laden...",
+  "PE.Controllers.Main.txtLoading": "Bezig met laden...",
   "PE.Controllers.Main.txtMath": "Wiskunde",
   "PE.Controllers.Main.txtMedia": "Media",
   "PE.Controllers.Main.txtNeedSynchronize": "U hebt updates",
@@ -276,7 +364,8 @@
   "PE.Controllers.Main.warnBrowserIE9": "Met IE9 heeft de toepassing beperkte mogelijkheden. Gebruik IE10 of hoger.",
   "PE.Controllers.Main.warnBrowserZoom": "De huidige zoominstelling van uw browser wordt niet ondersteund. Zet de zoominstelling terug op de standaardwaarde door op Ctrl+0 te drukken.",
   "PE.Controllers.Main.warnLicenseExp": "Uw licentie is vervallen.<br>Werk uw licentie bij en vernieuw de pagina.",
-  "PE.Controllers.Main.warnNoLicense": "U gebruikt een Open source-versie van ONLYOFFICE. In die versie geldt voor het aantal gelijktijdige verbindingen met de documentserver een limiet van 20 verbindingen.<br>Als u er meer nodig hebt, kunt u overwegen een commerciële licentie aan te schaffen.",
+  "PE.Controllers.Main.warnNoLicense": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
+  "PE.Controllers.Main.warnNoLicenseUsers": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
   "PE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
   "PE.Controllers.Statusbar.zoomText": "Zoomen {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "Het lettertype dat u probeert op te slaan, is niet beschikbaar op het huidige apparaat.<br>De tekststijl wordt weergegeven met een van de systeemlettertypen. Het opgeslagen lettertype wordt gebruikt wanneer het beschikbaar is.<br>Wilt u doorgaan?",
@@ -682,11 +771,13 @@
   "PE.Views.DocumentHolder.splitCellTitleText": "Cel splitsen",
   "PE.Views.DocumentHolder.tableText": "Tabel",
   "PE.Views.DocumentHolder.textArrangeBack": "Naar achtergrond sturen",
-  "PE.Views.DocumentHolder.textArrangeBackward": "Naar achter verplaatsen",
+  "PE.Views.DocumentHolder.textArrangeBackward": "Naar achteren",
   "PE.Views.DocumentHolder.textArrangeForward": "Naar Voren Verplaatsen",
   "PE.Views.DocumentHolder.textArrangeFront": "Naar voorgrond brengen",
   "PE.Views.DocumentHolder.textCopy": "Kopiëren",
   "PE.Views.DocumentHolder.textCut": "Knippen",
+  "PE.Views.DocumentHolder.textDistributeCols": "Kolommen verdelen",
+  "PE.Views.DocumentHolder.textDistributeRows": "Rijen verdelen",
   "PE.Views.DocumentHolder.textNextPage": "Volgende dia",
   "PE.Views.DocumentHolder.textPaste": "Plakken",
   "PE.Views.DocumentHolder.textPrevPage": "Vorige dia",
@@ -755,6 +846,7 @@
   "PE.Views.DocumentHolder.txtInsertBreak": "Handmatig einde invoegen",
   "PE.Views.DocumentHolder.txtInsertEqAfter": "Vergelijking invoegen na",
   "PE.Views.DocumentHolder.txtInsertEqBefore": "Vergelijking invoegen vóór",
+  "PE.Views.DocumentHolder.txtKeepTextOnly": "Alleen tekst behouden",
   "PE.Views.DocumentHolder.txtLimitChange": "Locatie limieten wijzigen",
   "PE.Views.DocumentHolder.txtLimitOver": "Limiet over tekst",
   "PE.Views.DocumentHolder.txtLimitUnder": "Limiet onder tekst",
@@ -762,6 +854,9 @@
   "PE.Views.DocumentHolder.txtMatrixAlign": "Matrixuitlijning",
   "PE.Views.DocumentHolder.txtNewSlide": "Nieuwe dia",
   "PE.Views.DocumentHolder.txtOverbar": "Streep boven tekst",
+  "PE.Views.DocumentHolder.txtPasteDestFormat": "Gebruik doel thema",
+  "PE.Views.DocumentHolder.txtPastePicture": "Afbeelding",
+  "PE.Views.DocumentHolder.txtPasteSourceFormat": "Behoud bronopmaak",
   "PE.Views.DocumentHolder.txtPressLink": "Druk op Ctrl en klik op koppeling",
   "PE.Views.DocumentHolder.txtPreview": "Diavoorstelling starten",
   "PE.Views.DocumentHolder.txtRemFractionBar": "Deelteken verwijderen",
@@ -808,6 +903,7 @@
   "PE.Views.FileMenu.btnHelpCaption": "Help...",
   "PE.Views.FileMenu.btnInfoCaption": "Info over presentatie...",
   "PE.Views.FileMenu.btnPrintCaption": "Afdrukken",
+  "PE.Views.FileMenu.btnProtectCaption": "Beveilig",
   "PE.Views.FileMenu.btnRecentFilesCaption": "Recente openen...",
   "PE.Views.FileMenu.btnRenameCaption": "Hernoemen...",
   "PE.Views.FileMenu.btnReturnCaption": "Terug naar presentatie",
@@ -829,6 +925,16 @@
   "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Presentatietitel",
   "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Toegangsrechten wijzigen",
   "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Personen met rechten",
+  "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Waarschuwing",
+  "PE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Met wachtwoord",
+  "PE.Views.FileMenuPanels.ProtectDoc.strProtect": "Beveilig presentatie",
+  "PE.Views.FileMenuPanels.ProtectDoc.strSignature": "Met handtekening",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Presentatie bewerken",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekening van deze presentatie verwijderd worden.<br>Weet u zeker dat u door wilt gaan?",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Deze presentatie is beveiligd met een wachtwoord",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Geldige hantekeningen zijn toegevoegd aan de presentatie. Deze presentatie is beveiligd tegen aanpassingen.",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Een of meer digitale handtekeningen in deze presentatie zijn ongeldig of konden niet geverifieerd worden. Deze presentatie is beveiligd tegen aanpassingen.",
+  "PE.Views.FileMenuPanels.ProtectDoc.txtView": "Toon handtekeningen",
   "PE.Views.FileMenuPanels.Settings.okButtonText": "Toepassen",
   "PE.Views.FileMenuPanels.Settings.strAlignGuides": "Uitlijningshulplijnen inschakelen",
   "PE.Views.FileMenuPanels.Settings.strAutoRecover": "AutoHerstel inschakelen",
@@ -917,6 +1023,7 @@
   "PE.Views.LeftMenu.tipSupport": "Feedback en Support",
   "PE.Views.LeftMenu.tipTitles": "Titels",
   "PE.Views.LeftMenu.txtDeveloper": "ONTWIKKELAARSMODUS",
+  "PE.Views.LeftMenu.txtTrial": "TEST MODUS",
   "PE.Views.ParagraphSettings.strLineHeight": "Regelafstand",
   "PE.Views.ParagraphSettings.strParagraphSpacing": "Afstand tussen alinea's",
   "PE.Views.ParagraphSettings.strSpacingAfter": "Na",
@@ -958,6 +1065,7 @@
   "PE.Views.RightMenu.txtImageSettings": "Afbeeldingsinstellingen",
   "PE.Views.RightMenu.txtParagraphSettings": "Tekstinstellingen",
   "PE.Views.RightMenu.txtShapeSettings": "Vorminstellingen",
+  "PE.Views.RightMenu.txtSignatureSettings": "Handtekening instellingen",
   "PE.Views.RightMenu.txtSlideSettings": "Dia-instellingen",
   "PE.Views.RightMenu.txtTableSettings": "Tabelinstellingen",
   "PE.Views.RightMenu.txtTextArtSettings": "TextArt-instellingen",
@@ -1037,6 +1145,17 @@
   "PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Gewichten & pijlen",
   "PE.Views.ShapeSettingsAdvanced.textWidth": "Breedte",
   "PE.Views.ShapeSettingsAdvanced.txtNone": "Geen",
+  "PE.Views.SignatureSettings.notcriticalErrorTitle": "Waarschuwing",
+  "PE.Views.SignatureSettings.strDelete": "Handtekening verwijderen",
+  "PE.Views.SignatureSettings.strDetails": "Handtekening details",
+  "PE.Views.SignatureSettings.strInvalid": "Ongeldige handtekeningen",
+  "PE.Views.SignatureSettings.strSign": "Onderteken",
+  "PE.Views.SignatureSettings.strSignature": "Handtekening",
+  "PE.Views.SignatureSettings.strValid": "Geldige handtekeningen",
+  "PE.Views.SignatureSettings.txtContinueEditing": "Hoe dan ook bewerken",
+  "PE.Views.SignatureSettings.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekening van deze presentatie verwijderd worden.<br>Weet u zeker dat u door wilt gaan?",
+  "PE.Views.SignatureSettings.txtSigned": "Geldige hantekeningen zijn toegevoegd aan de presentatie. Deze presentatie is beveiligd tegen aanpassingen.",
+  "PE.Views.SignatureSettings.txtSignedInvalid": "Een of meer digitale handtekeningen in deze presentatie zijn ongeldig of konden niet geverifieerd worden. Deze presentatie is beveiligd tegen aanpassingen.",
   "PE.Views.SlideSettings.strBackground": "Achtergrondkleur",
   "PE.Views.SlideSettings.strColor": "Kleur",
   "PE.Views.SlideSettings.strDelay": "Vertragen",
@@ -1167,17 +1286,22 @@
   "PE.Views.TableSettings.textBanded": "Gestreept",
   "PE.Views.TableSettings.textBorderColor": "Kleur",
   "PE.Views.TableSettings.textBorders": "Randstijl",
+  "PE.Views.TableSettings.textCellSize": "Celgrootte",
   "PE.Views.TableSettings.textColumns": "Kolommen",
+  "PE.Views.TableSettings.textDistributeCols": "Kolommen verdelen",
+  "PE.Views.TableSettings.textDistributeRows": "Rijen verdelen",
   "PE.Views.TableSettings.textEdit": "Rijen en kolommen",
   "PE.Views.TableSettings.textEmptyTemplate": "Geen sjablonen",
   "PE.Views.TableSettings.textFirst": "Eerste",
   "PE.Views.TableSettings.textHeader": "Koptekst",
+  "PE.Views.TableSettings.textHeight": "Hoogte",
   "PE.Views.TableSettings.textLast": "Laatste",
   "PE.Views.TableSettings.textNewColor": "Aangepaste kleur",
   "PE.Views.TableSettings.textRows": "Rijen",
   "PE.Views.TableSettings.textSelectBorders": "Selecteer de randen die u wilt wijzigen door de hierboven gekozen stijl toe te passen",
   "PE.Views.TableSettings.textTemplate": "Selecteren uit sjabloon",
   "PE.Views.TableSettings.textTotal": "Totaal",
+  "PE.Views.TableSettings.textWidth": "Breedte",
   "PE.Views.TableSettings.tipAll": "Buitenrand en alle binnenlijnen instellen",
   "PE.Views.TableSettings.tipBottom": "Alleen buitenrand onder instellen",
   "PE.Views.TableSettings.tipInner": "Alleen binnenlijnen instellen",
@@ -1273,7 +1397,7 @@
   "PE.Views.Toolbar.textAlignTop": "Tekst bovenaan uitlijnen",
   "PE.Views.Toolbar.textArea": "Vlak",
   "PE.Views.Toolbar.textArrangeBack": "Naar achtergrond sturen",
-  "PE.Views.Toolbar.textArrangeBackward": "Naar achter verplaatsen",
+  "PE.Views.Toolbar.textArrangeBackward": "Naar achteren",
   "PE.Views.Toolbar.textArrangeForward": "Naar Voren Verplaatsen",
   "PE.Views.Toolbar.textArrangeFront": "Naar voorgrond brengen",
   "PE.Views.Toolbar.textBar": "Staaf",
@@ -1308,9 +1432,11 @@
   "PE.Views.Toolbar.textSubscript": "Subscript",
   "PE.Views.Toolbar.textSuperscript": "Superscript",
   "PE.Views.Toolbar.textSurface": "Oppervlak",
+  "PE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "PE.Views.Toolbar.textTabFile": "Bestand",
   "PE.Views.Toolbar.textTabHome": "Home",
   "PE.Views.Toolbar.textTabInsert": "Invoegen",
+  "PE.Views.Toolbar.textTabProtect": "Beveiliging",
   "PE.Views.Toolbar.textTitleError": "Fout",
   "PE.Views.Toolbar.textUnderline": "Onderstrepen",
   "PE.Views.Toolbar.textZoom": "Zoomen",
@@ -1336,7 +1462,7 @@
   "PE.Views.Toolbar.tipInsertImage": "Afbeelding invoegen",
   "PE.Views.Toolbar.tipInsertShape": "AutoVorm invoegen",
   "PE.Views.Toolbar.tipInsertTable": "Tabel invoegen",
-  "PE.Views.Toolbar.tipInsertText": "Tekst invoegen",
+  "PE.Views.Toolbar.tipInsertText": "Tekstvak invoegen",
   "PE.Views.Toolbar.tipInsertTextArt": "Text Art Invoegen",
   "PE.Views.Toolbar.tipLineSpace": "Regelafstand",
   "PE.Views.Toolbar.tipMarkers": "Opsommingstekens",

apps/presentationeditor/main/resources/less/toolbar.less

@@ -341,6 +341,8 @@
     font: 11px arial;
     white-space: nowrap;
     letter-spacing: 1px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .item-equation {

apps/presentationeditor/mobile/locale/nl.json

@@ -122,7 +122,7 @@
   "PE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
   "PE.Controllers.Main.textDone": "Klaar",
   "PE.Controllers.Main.textLoadingDocument": "Presentatie wordt geladen",
-  "PE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE",
+  "PE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",
   "PE.Controllers.Main.textOK": "OK",
   "PE.Controllers.Main.textPassword": "Wachtwoord",
   "PE.Controllers.Main.textPreloader": "Bezig met laden...",
@@ -204,6 +204,7 @@
   "PE.Controllers.Main.uploadImageTitleText": "Afbeelding wordt geüpload",
   "PE.Controllers.Main.warnLicenseExp": "Uw licentie is vervallen.<br>Werk uw licentie bij en vernieuw de pagina.",
   "PE.Controllers.Main.warnNoLicense": "U gebruikt een Open source-versie van ONLYOFFICE. In die versie geldt voor het aantal gelijktijdige verbindingen met de documentserver een limiet van 20 verbindingen.<br>Als u er meer nodig hebt, kunt u overwegen een commerciële licentie aan te schaffen.",
+  "PE.Controllers.Main.warnNoLicenseUsers": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
   "PE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
   "PE.Controllers.Search.textNoTextFound": "Tekst niet gevonden",
   "PE.Controllers.Settings.notcriticalErrorTitle": "Waarschuwing",

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -353,6 +353,8 @@ var ApplicationController = new(function(){
                 case Asc.c_oAscAsyncAction.Open:
                     if (api) {
                         api.asc_Resize();
+                        var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom)/100 : 1);
+                        api.asc_setZoom(zf>0 ? zf : 1);
                     }
 
                     onDocumentContentReady();

apps/spreadsheeteditor/main/app.js

@@ -196,6 +196,7 @@ require([
         'common/main/lib/controller/Plugins'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         app.start();
     });

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

@@ -67,6 +67,13 @@ define([
                 'CellEditor': {},
                 'Viewport': {
                     'layout:resizedrag': _.bind(this.onLayoutResize, this)
+                },
+                'Common.Views.Header': {
+                    'formulabar:hide': function (state) {
+                        this.editor.setVisible(!state);
+                        Common.localStorage.setBool('sse-hidden-formula', state);
+                        Common.NotificationCenter.trigger('layout:changed', 'celleditor', state?'hidden':'showed');
+                    }.bind(this)
                 }
             });
         },

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

@@ -82,7 +82,7 @@ define([
             me._currentMathObj = undefined;
             me._currentParaObjDisabled = false;
             me._isDisabled = false;
-
+            me._state = {};
             /** coauthoring begin **/
             this.wrapEvents = {
                 apiHideComment: _.bind(this.onApiHideComment, this)
@@ -194,6 +194,12 @@ define([
                 view.textInShapeMenu.on('render:after',             _.bind(me.onTextInShapeAfterRender, me));
                 view.menuSignatureEditSign.on('click',              _.bind(me.onSignatureClick, me));
                 view.menuSignatureEditSetup.on('click',             _.bind(me.onSignatureClick, me));
+                view.menuImgOriginalSize.on('click',                _.bind(me.onOriginalSizeClick, me));
+                view.menuImgReplace.menu.on('item:click',           _.bind(me.onImgReplace, me));
+                view.pmiNumFormat.menu.on('item:click',             _.bind(me.onNumberFormatSelect, me));
+                view.pmiNumFormat.menu.on('show:after',             _.bind(me.onNumberFormatOpenAfter, me));
+                view.pmiAdvancedNumFormat.on('click',               _.bind(me.onCustomNumberFormat, me));
+
             } else {
                 view.menuViewCopy.on('click',                       _.bind(me.onCopyPaste, me));
                 view.menuViewUndo.on('click',                       _.bind(me.onUndo, me));
@@ -1314,6 +1320,15 @@ define([
                 documentHolder.pmiImgPaste.setDisabled(isObjLocked);
                 documentHolder.mnuImgAdvanced.setVisible(isimagemenu && (!isshapemenu || isimageonly) && !ischartmenu);
                 documentHolder.mnuImgAdvanced.setDisabled(isObjLocked);
+                documentHolder.menuImgOriginalSize.setVisible(isimagemenu && (!isshapemenu || isimageonly) && !ischartmenu);
+                if (documentHolder.mnuImgAdvanced.imageInfo)
+                    documentHolder.menuImgOriginalSize.setDisabled(isObjLocked || documentHolder.mnuImgAdvanced.imageInfo.get_ImageUrl()===null || documentHolder.mnuImgAdvanced.imageInfo.get_ImageUrl()===undefined);
+
+                var pluginGuid = (documentHolder.mnuImgAdvanced.imageInfo) ? documentHolder.mnuImgAdvanced.imageInfo.asc_getPluginGuid() : null;
+                documentHolder.menuImgReplace.setVisible(isimageonly && (pluginGuid===null || pluginGuid===undefined));
+                documentHolder.menuImgReplace.setDisabled(isObjLocked || pluginGuid===null);
+
+
 
                 var isInSign = !!signGuid;
                 documentHolder.menuSignatureEditSign.setVisible(isInSign);
@@ -1471,6 +1486,10 @@ define([
 
                 documentHolder.pmiEntriesList.setVisible(!iscelledit && !inPivot);
 
+                documentHolder.pmiNumFormat.setVisible(!iscelledit);
+                documentHolder.pmiAdvancedNumFormat.options.numformatinfo = documentHolder.pmiNumFormat.menu.options.numformatinfo = cellinfo.asc_getNumFormatInfo();
+                documentHolder.pmiAdvancedNumFormat.options.numformat = cellinfo.asc_getNumFormat();
+
                 _.each(documentHolder.ssMenu.items, function(item) {
                     item.setDisabled(isCellLocked);
                 });
@@ -2598,6 +2617,105 @@ define([
             }
         },
 
+        onOriginalSizeClick: function(item) {
+            if (this.api){
+                var imgsize = this.api.asc_getOriginalImageSize();
+                var w = imgsize.asc_getImageWidth();
+                var h = imgsize.asc_getImageHeight();
+
+                var properties = new Asc.asc_CImgProperty();
+                properties.asc_putWidth(w);
+                properties.asc_putHeight(h);
+                this.api.asc_setGraphicObjectProps(properties);
+
+                Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
+                Common.component.Analytics.trackEvent('DocumentHolder', 'Set Image Original Size');
+            }
+        },
+
+        onImgReplace: function(menu, item) {
+            var me = this;
+            if (this.api) {
+                if (item.value == 'file') {
+                    setTimeout(function(){
+                        if (me.api) me.api.asc_changeImageFromFile();
+                        Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
+                    }, 10);
+                } else {
+                    (new Common.Views.ImageFromUrlDialog({
+                        handler: function(result, value) {
+                            if (result == 'ok') {
+                                if (me.api) {
+                                    var checkUrl = value.replace(/ /g, '');
+                                    if (!_.isEmpty(checkUrl)) {
+                                        var props = new Asc.asc_CImgProperty();
+                                        props.asc_putImageUrl(checkUrl);
+                                        me.api.asc_setGraphicObjectProps(props);
+                                    }
+                                }
+                            }
+                            Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
+                        }
+                    })).show();
+                }
+            }
+        },
+
+        onNumberFormatSelect: function(menu, item) {
+            if (item.value !== undefined && item.value !== 'advanced') {
+                if (this.api)
+                    this.api.asc_setCellFormat(item.options.format);
+            }
+            Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
+        },
+
+        onCustomNumberFormat: function(item) {
+            var me = this,
+                value = me.api.asc_getLocale();
+            (!value) && (value = ((me.permissions.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(me.permissions.lang)) : 0x0409));
+
+            (new SSE.Views.FormatSettingsDialog({
+                api: me.api,
+                handler: function(result, settings) {
+                    if (settings) {
+                        me.api.asc_setCellFormat(settings.format);
+                    }
+                    Common.NotificationCenter.trigger('edit:complete', me.documentHolder);
+                },
+                props   : {format: item.options.numformat, formatInfo: item.options.numformatinfo, langId: value}
+            })).show();
+            Common.NotificationCenter.trigger('edit:complete', this.documentHolder);
+        },
+
+        onNumberFormatOpenAfter: function(menu) {
+            if (this.api) {
+                var me = this,
+                    value = me.api.asc_getLocale();
+                (!value) && (value = ((me.permissions.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(me.permissions.lang)) : 0x0409));
+
+                if (this._state.langId !== value) {
+                    this._state.langId = value;
+
+                    var info = new Asc.asc_CFormatCellsInfo();
+                    info.asc_setType(Asc.c_oAscNumFormatType.None);
+                    info.asc_setSymbol(this._state.langId);
+                    var arr = this.api.asc_getFormatCells(info); // all formats
+                    for (var i=0; i<menu.items.length-2; i++) {
+                        menu.items[i].options.format = arr[i];
+                    }
+                }
+
+                var val = menu.options.numformatinfo;
+                val = (val) ? val.asc_getType() : -1;
+                for (var i=0; i<menu.items.length-2; i++) {
+                    var mnu = menu.items[i];
+                    mnu.options.exampleval = me.api.asc_getLocaleExample(mnu.options.format);
+                    $(mnu.el).find('label').text(mnu.options.exampleval);
+                    mnu.setChecked(val == mnu.value);
+                }
+            }
+        },
+
         SetDisabled: function(state, canProtect) {
             this._isDisabled = state;
             this._canProtect = canProtect;

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

@@ -55,6 +55,7 @@ define([
                     'hide':        _.bind(this.onHidePlugins, this)
                 },
                 'Common.Views.Header': {
+                    'file:settings': _.bind(this.clickToolbarSettings,this),
                     'click:users': _.bind(this.clickStatusbarUsers, this)
                 },
                 'LeftMenu': {
@@ -79,7 +80,8 @@ define([
                 'Toolbar': {
                     'file:settings': _.bind(this.clickToolbarSettings,this),
                     'file:open': this.clickToolbarTab.bind(this, 'file'),
-                    'file:close': this.clickToolbarTab.bind(this, 'other')
+                    'file:close': this.clickToolbarTab.bind(this, 'other'),
+                    'save:disabled' : this.changeToolbarSaveState.bind(this)
                 },
                 'SearchDialog': {
                     'hide': _.bind(this.onSearchDlgHide, this),
@@ -260,6 +262,9 @@ define([
                         }
                     }, this)
                 });
+            // } else if (format == Asc.c_oAscFileType.PDF) {
+            //     menu.hide();
+            //     Common.NotificationCenter.trigger('download:settings', this.leftMenu);
             } else {
                 this.api.asc_DownloadAs(format);
                 menu.hide();
@@ -342,6 +347,10 @@ define([
                 this.leftMenu.menuFile.hide();
         },
 
+        changeToolbarSaveState: function (state) {
+            this.leftMenu.menuFile.getButton('save').setDisabled(state);
+        },
+
         /** coauthoring begin **/
         clickStatusbarUsers: function() {
             this.leftMenu.menuFile.panels['rights'].changeAccessRights();

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

@@ -307,7 +307,8 @@ define([
                 this.plugins                    = this.editorConfig.plugins;
 
                 this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
-                this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '');
+                this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')
+                                .setUserName(this.appOptions.user.fullname);
 
                 var value = Common.localStorage.getItem("sse-settings-reg-settings");
                 if (value!==null)
@@ -332,6 +333,7 @@ define([
                     Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
 
                 this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
+                Common.Controllers.Desktop.init(this.appOptions);
             },
 
             loadDocument: function(data) {
@@ -410,7 +412,10 @@ define([
 
                 if ( !_format || _supported.indexOf(_format) < 0 )
                     _format = Asc.c_oAscFileType.XLSX;
-                this.api.asc_DownloadAs(_format, true);
+                // if (_format == Asc.c_oAscFileType.PDF)
+                //     Common.NotificationCenter.trigger('download:settings', this, true);
+                // else
+                    this.api.asc_DownloadAs(_format, true);
             },
 
             onProcessMouse: function(data) {
@@ -425,11 +430,14 @@ define([
             },
 
             goBack: function() {
-                var href = this.appOptions.customization.goback.url;
+                var me = this;
-                if (this.appOptions.customization.goback.blank!==false) {
+                if ( !Common.Controllers.Desktop.process('goback') ) {
-                    window.open(href, "_blank");
+                    var href = me.appOptions.customization.goback.url;
-                } else {
+                    if (me.appOptions.customization.goback.blank!==false) {
-                    parent.location.href = href;
+                        window.open(href, "_blank");
+                    } else {
+                        parent.location.href = href;
+                    }
                 }
             },
 
@@ -908,16 +916,12 @@ define([
             applyModeCommonElements: function() {
                 window.editor_elements_prepared = true;
 
-                var value = Common.localStorage.getItem("sse-hidden-title");
-                value = this.appOptions.isEdit && (value!==null && parseInt(value) == 1);
-
                 var app             = this.getApplication(),
                     viewport        = app.getController('Viewport').getView('Viewport'),
                     statusbarView   = app.getController('Statusbar').getView('Statusbar');
 
                 if (this.headerView) {
-                    this.headerView.setHeaderCaption(this.appOptions.isEdit ? 'Spreadsheet Editor' : 'Spreadsheet Viewer');
+                    this.headerView.setVisible(!this.appOptions.nativeApp && !this.appOptions.isEditMailMerge &&
-                    this.headerView.setVisible(!this.appOptions.nativeApp && !value && !this.appOptions.isEditMailMerge && 
                             !this.appOptions.isDesktopApp && !this.appOptions.isEditDiagram);
                 }
 
@@ -1413,12 +1417,7 @@ define([
                         forcesave = this.appOptions.forcesave,
                         cansave = this.api.asc_isDocumentCanSave(),
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (this.toolbarView.btnSave.isDisabled() !== isDisabled)
+                        this.toolbarView.btnSave.setDisabled(isDisabled);
-                        this.toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 
@@ -1427,12 +1426,7 @@ define([
                     var isSyncButton = $('.icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
-                    if (this.toolbarView.btnSave.isDisabled() !== isDisabled)
+                    this.toolbarView.btnSave.setDisabled(isDisabled);
-                        this.toolbarView.btnsSave.forEach(function(button) {
-                            if ( button ) {
-                                button.setDisabled(isDisabled);
-                            }
-                        });
                 }
             },
 

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

@@ -69,7 +69,8 @@ define([
         onAfterRender: function(view) {
             this.printSettings.cmbSheet.on('selected', _.bind(this.comboSheetsChange, this, this.printSettings));
             this.printSettings.btnOk.on('click', _.bind(this.querySavePrintSettings, this));
-            Common.NotificationCenter.on('print', _.bind(this.openPrintSettings, this));
+            Common.NotificationCenter.on('print', _.bind(this.openPrintSettings, this, 'print'));
+            Common.NotificationCenter.on('download:settings', _.bind(this.openPrintSettings, this, 'download'));
             this.registerControlEvents(this.printSettings);
         },
 
@@ -219,9 +220,11 @@ define([
             }
         },
 
-        openPrintSettings: function(btn) {
+        openPrintSettings: function(type, cmp, asUrl) {
             if (this.api) {
+                this.asUrl = asUrl;
                 this.printSettingsDlg = (new SSE.Views.PrintSettings({
+                    type: type,
                     handler: _.bind(this.resultPrintSettings,this),
                     afterrender: _.bind(function() {
                         this._changedProps = [];
@@ -245,10 +248,12 @@ define([
                     this.adjPrintParams.asc_setPrintType(printtype);
                     Common.localStorage.setItem("sse-print-settings-range", printtype);
 
-                    this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera);
+                    if ( this.printSettingsDlg.type=='print' )
-
+                        this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera);
-                    Common.component.Analytics.trackEvent('Print');
+                    else
-                    Common.component.Analytics.trackEvent('ToolBar', 'Print');
+                        this.api.asc_DownloadAs(Asc.c_oAscFileType.PDF, this.asUrl, this.adjPrintParams);
+                    Common.component.Analytics.trackEvent((this.printSettingsDlg.type=='print') ? 'Print' : 'DownloadAs');
+                    Common.component.Analytics.trackEvent('ToolBar', (this.printSettingsDlg.type=='print') ? 'Print' : 'DownloadAs');
                     Common.NotificationCenter.trigger('edit:complete', view);
                 } else
                     return true;

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

@@ -80,10 +80,16 @@ define([
                     'settings:apply': _.bind(this.applyFormulaSettings, this)
                 },
                 'Common.Views.Header': {
+                    'toolbar:setcompact': this.onChangeViewMode.bind(this),
                     'print': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'save': function (opts) {
+                        this.api.asc_Save();
+                    },
+                    'undo': this.onUndo,
+                    'redo': this.onRedo,
                     'downloadas': function (opts) {
                         var _main = this.getApplication().getController('Main');
                         var _file_type = _main.appOptions.spreadsheet.fileType,
@@ -101,7 +107,10 @@ define([
                         if ( !_format || _supported.indexOf(_format) < 0 )
                             _format = Asc.c_oAscFileType.PDF;
 
-                        _main.api.asc_DownloadAs(_format);
+                        // if (_format == Asc.c_oAscFileType.PDF)
+                        //     Common.NotificationCenter.trigger('download:settings', this.toolbar);
+                        // else
+                            _main.api.asc_DownloadAs(_format);
                     },
                     'go:editor': function() {
                         Common.Gateway.requestEditRights();
@@ -242,8 +251,11 @@ define([
             } else {
                 toolbar.btnPrint.on('click',                                _.bind(this.onPrint, this));
                 toolbar.btnSave.on('click',                                 _.bind(this.onSave, this));
+                toolbar.btnSave.on('disabled',                              _.bind(this.onBtnChangeState, this, 'save:disabled'));
                 toolbar.btnUndo.on('click',                                 _.bind(this.onUndo, this));
+                toolbar.btnUndo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'undo:disabled'));
                 toolbar.btnRedo.on('click',                                 _.bind(this.onRedo, this));
+                toolbar.btnRedo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'redo:disabled'));
                 toolbar.btnCopy.on('click',                                 _.bind(this.onCopyPaste, this, true));
                 toolbar.btnPaste.on('click',                                _.bind(this.onCopyPaste, this, false));
                 toolbar.btnIncFontSize.on('click',                          _.bind(this.onIncreaseFontSize, this));
@@ -297,7 +309,6 @@ define([
                 toolbar.btnDecDecimal.on('click',                           _.bind(this.onDecrement, this));
                 toolbar.btnIncDecimal.on('click',                           _.bind(this.onIncrement, this));
                 toolbar.btnInsertFormula.on('click',                        _.bind(this.onInsertFormulaMenu, this));
-                toolbar.btnSettings.on('click',                             _.bind(this.onAdvSettingsClick, this));
                 toolbar.btnInsertFormula.menu.on('item:click',              _.bind(this.onInsertFormulaMenu, this));
                 toolbar.btnNamedRange.menu.on('item:click',                 _.bind(this.onNamedRangeMenu, this));
                 toolbar.btnNamedRange.menu.on('show:after',                 _.bind(this.onNamedRangeMenuOpen, this));
@@ -318,16 +329,12 @@ define([
                 toolbar.cmbFontSize.on('hide:after',                        _.bind(this.onHideMenus, this));
                 toolbar.cmbFontSize.on('combo:blur',                        _.bind(this.onComboBlur, this));
                 toolbar.cmbFontSize.on('combo:focusin',                     _.bind(this.onComboOpen, this, false));
-                if (toolbar.mnuZoomIn)  toolbar.mnuZoomIn.on('click',       _.bind(this.onZoomInClick, this));
-                if (toolbar.mnuZoomOut) toolbar.mnuZoomOut.on('click',      _.bind(this.onZoomOutClick, this));
-                if (toolbar.btnShowMode.rendered) toolbar.btnShowMode.menu.on('item:click', _.bind(this.onHideMenu, this));
                 toolbar.listStyles.on('click',                              _.bind(this.onListStyleSelect, this));
                 toolbar.cmbNumberFormat.on('selected',                      _.bind(this.onNumberFormatSelect, this));
                 toolbar.cmbNumberFormat.on('show:before',                   _.bind(this.onNumberFormatOpenBefore, this, true));
                 if (toolbar.cmbNumberFormat.cmpEl)
                     toolbar.cmbNumberFormat.cmpEl.on('click', '#id-toolbar-mnu-item-more-formats a', _.bind(this.onNumberFormatSelect, this));
                 toolbar.btnCurrencyStyle.menu.on('item:click',              _.bind(this.onNumberFormatMenu, this));
-                if (toolbar.mnuitemCompactToolbar) toolbar.mnuitemCompactToolbar.on('toggle', _.bind(this.onChangeViewMode, this));
                 $('#id-toolbar-menu-new-fontcolor').on('click',             _.bind(this.onNewTextColor, this));
                 $('#id-toolbar-menu-new-paracolor').on('click',             _.bind(this.onNewBackColor, this));
                 $('#id-toolbar-menu-new-bordercolor').on('click',           _.bind(this.onNewBorderColor, this));
@@ -378,7 +385,7 @@ define([
         onSave: function(e) {
             if (this.api) {
                 var isModified = this.api.asc_isDocumentCanSave();
-                var isSyncButton = $('.icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch');
+                var isSyncButton = this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch');
                 if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave)
                     return;
 
@@ -391,6 +398,13 @@ define([
             Common.component.Analytics.trackEvent('ToolBar', 'Save');
         },
 
+        onBtnChangeState: function(prop) {
+            if ( /\:disabled$/.test(prop) ) {
+                var _is_disabled = arguments[2];
+                this.toolbar.fireEvent(prop, [_is_disabled]);
+            }
+        },
+
         onUndo: function(btn, e) {
             if (this.api)
                 this.api.asc_Undo();
@@ -480,8 +494,7 @@ define([
         },
 
         onSubscriptMenu: function(menu, item) {
-            var btnSubscript = this.toolbar.btnSubscript,
+            var btnSubscript = this.toolbar.btnSubscript;
-                iconEl = $('.icon', btnSubscript.cmpEl);
 
             if (item.value == 'sub') {
                 this._state.subscript = undefined;
@@ -491,9 +504,8 @@ define([
                 this.api.asc_setCellSuperscript(item.checked);
             }
             if (item.checked) {
-                iconEl.removeClass(btnSubscript.options.icls);
+                btnSubscript.$icon.removeClass(btnSubscript.options.icls).addClass(item.options.icls);
                 btnSubscript.options.icls = item.options.icls;
-                iconEl.addClass(btnSubscript.options.icls);
             }
 
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@@ -597,14 +609,9 @@ define([
                     bordersWidth = btnBorders.options.borderswidth,
                     bordersColor = btnBorders.options.borderscolor;
 
-                if (btnBorders.rendered) {
+                if ( btnBorders.rendered ) {
-                    var iconEl = $('.icon', btnBorders.cmpEl);
+                    btnBorders.$icon.removeClass(btnBorders.options.icls).addClass(item.options.icls);
-
+                    btnBorders.options.icls = item.options.icls;
-                    if (iconEl) {
-                        iconEl.removeClass(btnBorders.options.icls);
-                        btnBorders.options.icls = item.options.icls;
-                        iconEl.addClass(btnBorders.options.icls);
-                    }
                 }
 
                 btnBorders.options.borderId = item.options.borderId;
@@ -666,14 +673,11 @@ define([
         },
 
         onHorizontalAlignMenu: function(menu, item) {
-            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign,
+            var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
-                iconEl = $('.icon', btnHorizontalAlign.cmpEl);
 
-            if (iconEl) {
+            btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls);
-                iconEl.removeClass(btnHorizontalAlign.options.icls);
+            btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
-                btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
+            btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls);
-                iconEl.addClass(btnHorizontalAlign.options.icls);
-            }
 
             this._state.pralign = undefined;
             if (this.api)
@@ -686,14 +690,11 @@ define([
         },
 
         onVerticalAlignMenu: function(menu, item) {
-            var btnVerticalAlign = this.toolbar.btnVerticalAlign,
+            var btnVerticalAlign = this.toolbar.btnVerticalAlign;
-                iconEl = $('.icon', btnVerticalAlign.cmpEl);
 
-            if (iconEl) {
+            btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls);
-                iconEl.removeClass(btnVerticalAlign.options.icls);
+            btnVerticalAlign.options.icls = !item.checked ? 'btn-valign-bottom' : item.options.icls;
-                btnVerticalAlign.options.icls = !item.checked ? 'btn-valign-bottom' : item.options.icls;
+            btnVerticalAlign.$icon.addClass(btnVerticalAlign.options.icls);
-                iconEl.addClass(btnVerticalAlign.options.icls);
-            }
 
             this._state.valign = undefined;
             if (this.api)
@@ -1359,53 +1360,6 @@ define([
             }
         },
 
-        onAdvSettingsClick: function(btn, e) {
-            this.toolbar.fireEvent('file:settings', this);
-            btn.cmpEl.blur();
-        },
-
-        onZoomInClick: function(btn) {
-            if (this.api) {
-                var f = Math.floor(this.api.asc_getZoom() * 10)/10;
-                f += .1;
-                if (f > 0 && !(f > 2.)) {
-                    this.api.asc_setZoom(f);
-                }
-            }
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onZoomOutClick: function(btn) {
-            if (this.api) {
-                var f = Math.ceil(this.api.asc_getZoom() * 10)/10;
-                f -= .1;
-                if (!(f < .5)) {
-                    this.api.asc_setZoom(f);
-                }
-            }
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
-        onHideMenu: function(menu, item) {
-            var params = {},
-                option;
-
-            switch(item.value) {
-                case 'title':       params.title = item.checked;      option = 'sse-hidden-title';      break;
-                case 'formula':     params.formula = item.checked;    option = 'sse-hidden-formula';    break;
-                case 'headings':    params.headings = item.checked;   break;
-                case 'gridlines':   params.gridlines = item.checked;  break;
-                case 'freezepanes': params.freezepanes = item.checked;  break;
-            }
-
-            this.hideElements(params);
-            option && Common.localStorage.setBool(option, item.checked);
-
-            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-        },
-
         onListStyleSelect: function(combo, record) {
             this._state.prstyle = undefined;
             if (this.api) {
@@ -1511,7 +1465,6 @@ define([
             if ( from != 'file' ) {
                 Common.Utils.asyncCall(function () {
                     this.onChangeViewMode(null, !this.toolbar.isCompact());
-                    this.toolbar.mnuitemCompactToolbar.setChecked(this.toolbar.isCompact(), true);
                 }, this);
             }
         },
@@ -1709,26 +1662,9 @@ define([
             this.checkInsertAutoshape({action:'cancel'});
         },
 
-        onApiZoomChange: function(zf, type){
+        onApiZoomChange: function(zf, type){},
-            switch (type) {
-                case 1: // FitWidth
-                case 2: // FitPage
-                case 0:
-                default: {
-                    this.toolbar.mnuZoom.options.value = Math.floor((zf + .005) * 100);
-                    $('.menu-zoom .zoom', this.toolbar.el).html(Math.floor((zf + .005) * 100) + '%');
-                }
-            }
-        },
 
-        onApiSheetChanged: function() {
+        onApiSheetChanged: function() {},
-            if ( this.api && !this.appConfig.isEditDiagram && !this.appConfig.isEditMailMerge ) {
-                var params  = this.api.asc_getSheetViewSettings();
-                this.toolbar.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders());
-                this.toolbar.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines());
-                this.toolbar.mnuitemFreezePanes.setChecked(params.asc_getIsFreezePane());
-            }
-        },
 
         onApiEditorSelectionChanged: function(fontobj) {
             if (!this.editMode) return;
@@ -1777,13 +1713,10 @@ define([
                         btnSubscript.menu.clearAll();
                     } else {
                         btnSubscript.menu.items[index].setChecked(true);
-                        if (btnSubscript.rendered) {
+                        if ( btnSubscript.rendered && btnSubscript.$icon ) {
-                            var iconEl = $('.icon', btnSubscript.cmpEl);
+                            btnSubscript.$icon.removeClass(btnSubscript.options.icls);
-                            if (iconEl) {
+                            btnSubscript.options.icls = btnSubscript.menu.items[index].options.icls;
-                                iconEl.removeClass(btnSubscript.options.icls);
+                            btnSubscript.$icon.addClass(btnSubscript.options.icls);
-                                btnSubscript.options.icls = btnSubscript.menu.items[index].options.icls;
-                                iconEl.addClass(btnSubscript.options.icls);
-                            }
                         }
                     }
 
@@ -1918,13 +1851,10 @@ define([
                         btnSubscript.menu.clearAll();
                     } else {
                         btnSubscript.menu.items[index].setChecked(true);
-                        if (btnSubscript.rendered) {
+                        if ( btnSubscript.rendered ) {
-                            var iconEl = $('.icon', btnSubscript.cmpEl);
+                            btnSubscript.$icon.removeClass(btnSubscript.options.icls);
-                            if (iconEl) {
+                            btnSubscript.options.icls = btnSubscript.menu.items[index].options.icls;
-                                iconEl.removeClass(btnSubscript.options.icls);
+                            btnSubscript.$icon.addClass(btnSubscript.options.icls);
-                                btnSubscript.options.icls = btnSubscript.menu.items[index].options.icls;
-                                iconEl.addClass(btnSubscript.options.icls);
-                            }
                         }
                     }
 
@@ -2053,14 +1983,9 @@ define([
                         }
 
                         var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
-                        if (btnHorizontalAlign.rendered) {
+                        if ( btnHorizontalAlign.rendered ) {
-                            var hIconEl = $('.icon', btnHorizontalAlign.cmpEl);
+                            btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align);
-
+                            btnHorizontalAlign.options.icls = align;
-                            if (hIconEl) {
-                                hIconEl.removeClass(btnHorizontalAlign.options.icls);
-                                btnHorizontalAlign.options.icls = align;
-                                hIconEl.addClass(btnHorizontalAlign.options.icls);
-                            }
                         }
                     }
 
@@ -2088,14 +2013,9 @@ define([
                             toolbar.btnVerticalAlign.menu.items[index].setChecked(true, false);
 
                             var btnVerticalAlign = this.toolbar.btnVerticalAlign;
-                            if (btnVerticalAlign.rendered) {
+                            if ( btnVerticalAlign.rendered ) {
-                                var vIconEl = $('.icon', btnVerticalAlign.cmpEl);
+                                btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls).addClass(align);
-
+                                btnVerticalAlign.options.icls = align;
-                                if (vIconEl) {
-                                    vIconEl.removeClass(btnVerticalAlign.options.icls);
-                                    btnVerticalAlign.options.icls = align;
-                                    vIconEl.addClass(btnVerticalAlign.options.icls);
-                                }
                             }
                         }
                     }
@@ -2425,13 +2345,6 @@ define([
         },
 
         hideElements: function(opts) {
-            if (!_.isUndefined(opts.title)) {
-                var headerView  = this.getApplication().getController('Viewport').getView('Common.Views.Header');
-                headerView && headerView.setVisible(!opts.title);
-
-                Common.NotificationCenter.trigger('layout:changed', 'header');
-            }
-
             if (!_.isUndefined(opts.compact)) {
                 this.onChangeViewMode(opts.compact);
             }
@@ -2995,7 +2908,7 @@ define([
             var toolbar = this.toolbar;
             toolbar.$el.find('.toolbar').toggleClass('masked', disable);
 
-            this.toolbar.lockToolbar(SSE.enumLock.menuFileOpen, disable, {array: [toolbar.btnShowMode]});
+            this.toolbar.lockToolbar(SSE.enumLock.menuFileOpen, disable);
             if(disable) {
                 mask = $("<div class='toolbar-mask'>").appendTo(toolbar.$el.find('.toolbar'));
                 Common.util.Shortcuts.suspendEvents('command+l, ctrl+l, command+shift+l, ctrl+shift+l, command+k, ctrl+k, command+alt+h, ctrl+alt+h, command+1, ctrl+1');
@@ -3034,6 +2947,9 @@ define([
                 me.toolbar.setMode(config);
 
                 if ( config.isEdit ) {
+                    me.toolbar.btnSave && me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                    me.toolbar.btnUndo && me.toolbar.btnUndo.on('disabled', _.bind(me.onBtnChangeState, me, 'undo:disabled'));
+                    me.toolbar.btnRedo && me.toolbar.btnRedo.on('disabled', _.bind(me.onBtnChangeState, me, 'redo:disabled'));
                     me.toolbar.setApi(me.api);
 
                     if ( !config.isEditDiagram && !config.isEditMailMerge ) {
@@ -3049,11 +2965,23 @@ define([
                         if ( $panel )
                             me.toolbar.addTab(tab, $panel, 4);
 
-                        if (config.isDesktopApp && config.isOffline) {
+                        if ( config.isDesktopApp ) {
-                            tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                            // hide 'print' and 'save' buttons group and next separator
-                            var $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                            me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
-                            if ( $panel )
+
-                                me.toolbar.addTab(tab, $panel, 5);
+                            // hide 'undo' and 'redo' buttons and get container
+                            var $box =  me.toolbar.btnUndo.$el.hide().next().hide().parent();
+
+                            // move 'paste' button to the container instead of 'undo' and 'redo'
+                            me.toolbar.btnPaste.$el.detach().appendTo($box);
+                            me.toolbar.btnCopy.$el.removeClass('split');
+
+                            if ( config.isOffline ) {
+                                tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                                var $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                                if ($panel)
+                                    me.toolbar.addTab(tab, $panel, 5);
+                            }
                         }
                     }
                 }

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

@@ -48,7 +48,7 @@ define([
 ], function (Viewport) {
     'use strict';
 
-    SSE.Controllers.Viewport = Backbone.Controller.extend({
+    SSE.Controllers.Viewport = Backbone.Controller.extend(_.assign({
         // Specifying a Viewport model
         models: [],
 
@@ -67,36 +67,212 @@ define([
 
             // This most important part when we will tell our controller what events should be handled
             this.addListeners({
+                'FileMenu': {
+                    'menu:hide': me.onFileMenu.bind(me, 'hide'),
+                    'menu:show': me.onFileMenu.bind(me, 'show')
+                },
+                'Statusbar': {
+                    'sheet:changed': me.onApiSheetChanged.bind(me)
+                },
                 'Toolbar': {
                     'render:before' : function (toolbar) {
                         var config = SSE.getController('Main').appOptions;
                         toolbar.setExtra('right', me.header.getPanel('right', config));
                         toolbar.setExtra('left', me.header.getPanel('left', config));
+
+                        if ( me.appConfig && me.appConfig.isDesktopApp &&
+                                me.appConfig.isEdit && toolbar.btnCollabChanges )
+                            toolbar.btnCollabChanges = me.header.btnSave;
+
                     },
                     'view:compact'  : function (toolbar, state) {
-                        me.viewport.vlayout.panels[0].height = state ? 32 : 32+67;
+                        me.header.mnuitemCompactToolbar.setChecked(state, true);
+                        me.viewport.vlayout.getItem('toolbar').height = state ?
+                            Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal');
+                    },
+                    'undo:disabled' : function (state) {
+                        if ( me.header.btnUndo ) {
+                            if ( me.header.btnUndo.keepState )
+                                me.header.btnUndo.keepState.disabled = state;
+                            else me.header.btnUndo.setDisabled(state);
+                        }
+                    },
+                    'redo:disabled' : function (state) {
+                        if ( me.header.btnRedo ) {
+                            if ( me.header.btnRedo.keepState )
+                                me.header.btnRedo.keepState.disabled = state;
+                            else me.header.btnRedo.setDisabled(state);
+                        }
+                    },
+                    'save:disabled' : function (state) {
+                        if ( me.header.btnSave )
+                            me.header.btnSave.setDisabled(state);
                     }
                 }
             });
 
             Common.NotificationCenter.on('app:face', this.onAppShowed.bind(this));
+            Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
+            Common.NotificationCenter.on('cells:range', this.onCellsRange.bind(this));
         },
 
         setApi: function(api) {
             this.api = api;
+            this.api.asc_registerCallback('asc_onZoomChanged',              this.onApiZoomChange.bind(this));
+            this.api.asc_registerCallback('asc_onSheetsChanged',            this.onApiSheetChanged.bind(this));
+            this.api.asc_registerCallback('asc_onUpdateSheetViewSettings',  this.onApiSheetChanged.bind(this));
+            this.api.asc_registerCallback('asc_onEditCell',                 this.onApiEditCell.bind(this));
         },
 
         onAppShowed: function (config) {
             var me = this;
+            me.appConfig = config;
+
+            var _intvars = Common.Utils.InternalSettings;
+            var $filemenu = $('.toolbar-fullview-panel');
+            $filemenu.css('top', _intvars.get('toolbar-height-tabs'));
 
             if ( !config.isEdit ||
                     ( !Common.localStorage.itemExists("sse-compact-toolbar") &&
                         config.customization && config.customization.compactToolbar ))
             {
-                me.viewport.vlayout.panels[0].height = 32;
+                me.viewport.vlayout.getItem('toolbar').height = _intvars.get('toolbar-height-compact');
             } else
             if ( config.isEditDiagram || config.isEditMailMerge ) {
-                me.viewport.vlayout.panels[0].height = 41;
+                me.viewport.vlayout.getItem('toolbar').height = 41;
+            }
+
+            if ( config.isDesktopApp && config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) {
+                var $title = me.viewport.vlayout.getItem('title').el;
+                $title.html(me.header.getPanel('title', config)).show();
+
+                var toolbar = me.viewport.vlayout.getItem('toolbar');
+                toolbar.el.addClass('top-title');
+                toolbar.height -= _intvars.get('toolbar-height-tabs') - _intvars.get('toolbar-height-tabs-top-title');
+
+                var _tabs_new_height = _intvars.get('toolbar-height-tabs-top-title');
+                _intvars.set('toolbar-height-tabs', _tabs_new_height);
+                _intvars.set('toolbar-height-compact', _tabs_new_height);
+                _intvars.set('toolbar-height-normal', _tabs_new_height + _intvars.get('toolbar-height-controls'));
+
+                $filemenu.css('top', _tabs_new_height + _intvars.get('document-title-height'));
+            }
+        },
+
+        onAppReady: function (config) {
+            var me = this;
+            if ( me.header.btnOptions ) {
+                var compactview = !config.isEdit;
+                if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) {
+                    if ( Common.localStorage.itemExists("sse-compact-toolbar") ) {
+                        compactview = Common.localStorage.getBool("sse-compact-toolbar");
+                    } else
+                    if ( config.customization && config.customization.compactToolbar )
+                        compactview = true;
+                }
+
+                me.header.mnuitemCompactToolbar = new Common.UI.MenuItem({
+                    caption     : me.header.textCompactView,
+                    checked     : compactview,
+                    checkable   : true,
+                    value       : 'toolbar'
+                });
+
+                var mnuitemHideFormulaBar = new Common.UI.MenuItem({
+                    caption     : me.textHideFBar,
+                    checked     : Common.localStorage.getBool('sse-hidden-formula'),
+                    checkable   : true,
+                    value       : 'formula'
+                });
+
+                me.header.mnuitemHideHeadings = new Common.UI.MenuItem({
+                    caption     : me.textHideHeadings,
+                    checkable   : true,
+                    checked     : me.header.mnuitemHideHeadings.isChecked(),
+                    value       : 'headings'
+                });
+
+                me.header.mnuitemHideGridlines = new Common.UI.MenuItem({
+                    caption     : me.textHideGridlines,
+                    checkable   : true,
+                    checked     : me.header.mnuitemHideGridlines.isChecked(),
+                    value       : 'gridlines'
+                });
+
+                me.header.mnuitemFreezePanes = new Common.UI.MenuItem({
+                    caption     : me.textFreezePanes,
+                    checkable   : true,
+                    checked     : me.header.mnuitemFreezePanes.isChecked(),
+                    value       : 'freezepanes'
+                });
+
+                me.header.mnuZoom = new Common.UI.MenuItem({
+                    template: _.template([
+                        '<div id="hdr-menu-zoom" class="menu-zoom" style="height: 25px;" ',
+                            '<% if(!_.isUndefined(options.stopPropagation)) { %>',
+                            'data-stopPropagation="true"',
+                            '<% } %>', '>',
+                            '<label class="title">' + me.header.textZoom + '</label>',
+                            '<button id="hdr-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomin">&nbsp;</i></button>',
+                            '<label class="zoom"><%= options.value %>%</label>',
+                            '<button id="hdr-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomout">&nbsp;</i></button>',
+                        '</div>'
+                    ].join('')),
+                    stopPropagation: true,
+                    value: me.header.mnuZoom.options.value
+                });
+
+                var mnuitemAdvSettings = new Common.UI.MenuItem({
+                    caption: me.header.textAdvSettings,
+                    value: 'advanced'
+                });
+
+                me.header.btnOptions.setMenu(new Common.UI.Menu({
+                        cls: 'pull-right',
+                        style: 'min-width: 180px;',
+                        items: [
+                            me.header.mnuitemCompactToolbar,
+                            mnuitemHideFormulaBar,
+                            {caption:'--'},
+                            me.header.mnuitemHideHeadings,
+                            me.header.mnuitemHideGridlines,
+                            {caption:'--'},
+                            me.header.mnuitemFreezePanes,
+                            {caption:'--'},
+                            me.header.mnuZoom,
+                            {caption:'--'},
+                            mnuitemAdvSettings
+                        ]
+                    })
+                );
+
+                var _on_btn_zoom = function (btn) {
+                    if ( btn == 'up' ) {
+                        var _f = Math.floor(this.api.asc_getZoom() * 10)/10;
+                        _f += .1;
+                        if (_f > 0 && !(_f > 2.))
+                            this.api.asc_setZoom(_f);
+                    } else {
+                        _f = Math.ceil(this.api.asc_getZoom() * 10)/10;
+                        _f -= .1;
+                        if (!(_f < .5))
+                            this.api.asc_setZoom(_f);
+                    }
+
+                    Common.NotificationCenter.trigger('edit:complete', me.header);
+                };
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-out', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'down'));
+
+                (new Common.UI.Button({
+                    el      : $('#hdr-menu-zoom-in', me.header.mnuZoom.$el),
+                    cls     : 'btn-toolbar'
+                })).on('click', _on_btn_zoom.bind(me, 'up'));
+
+                me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
             }
         },
 
@@ -127,6 +303,10 @@ define([
             this.boxFormula = $('#cell-editing-box');
             this.boxSdk.css('border-left', 'none');
             this.boxFormula.css('border-left', 'none');
+
+            this.header.mnuitemHideHeadings = this.header.fakeMenuItem();
+            this.header.mnuitemHideGridlines = this.header.fakeMenuItem();
+            this.header.mnuitemFreezePanes = this.header.fakeMenuItem();
         },
 
         onLayoutChanged: function(area) {
@@ -171,6 +351,67 @@ define([
         onWindowResize: function(e) {
             this.onLayoutChanged('window');
             Common.NotificationCenter.trigger('window:resize');
-        }
+        },
-    });
+
+        onFileMenu: function (opts) {
+            var me = this;
+            var _need_disable =  opts == 'show';
+
+            me.header.lockHeaderBtns( 'undo', _need_disable );
+            me.header.lockHeaderBtns( 'redo', _need_disable );
+            me.header.lockHeaderBtns( 'opts', _need_disable );
+        },
+
+        onApiZoomChange: function(zf, type){
+            switch (type) {
+                case 1: // FitWidth
+                case 2: // FitPage
+                case 0:
+                default: {
+                    this.header.mnuZoom.options.value = Math.floor((zf + .005) * 100);
+                    $('.menu-zoom .zoom', this.header.mnuZoom.$el).html(Math.floor((zf + .005) * 100) + '%');
+                }
+            }
+        },
+
+        onApiSheetChanged: function() {
+            var me = this;
+            var appConfig = me.viewport.mode;
+            if ( !!appConfig && !appConfig.isEditDiagram && !appConfig.isEditMailMerge ) {
+                var params  = me.api.asc_getSheetViewSettings();
+                me.header.mnuitemHideHeadings.setChecked(!params.asc_getShowRowColHeaders());
+                me.header.mnuitemHideGridlines.setChecked(!params.asc_getShowGridLines());
+                me.header.mnuitemFreezePanes.setChecked(params.asc_getIsFreezePane());
+            }
+        },
+
+        onApiEditCell: function(state) {
+            if ( state == Asc.c_oAscCellEditorState.editStart )
+                this.header.lockHeaderBtns('opts', true); else
+            if ( state == Asc.c_oAscCellEditorState.editEnd )
+                this.header.lockHeaderBtns('opts', false);
+        },
+
+        onCellsRange: function(status) {
+            this.onApiEditCell(status != Asc.c_oAscSelectionDialogType.None ? Asc.c_oAscCellEditorState.editStart : Asc.c_oAscCellEditorState.editEnd);
+        },
+
+        onOptionsItemClick: function (menu, item, e) {
+            var me = this;
+
+            switch ( item.value ) {
+            case 'toolbar': me.header.fireEvent('toolbar:setcompact', [menu, item.isChecked()]); break;
+            case 'formula': me.header.fireEvent('formulabar:hide', [item.isChecked()]); break;
+            case 'headings': me.api.asc_setDisplayHeadings(!item.isChecked()); break;
+            case 'gridlines': me.api.asc_setDisplayGridlines(!item.isChecked()); break;
+            case 'freezepanes': me.api.asc_freezePane(); break;
+            case 'advanced': me.header.fireEvent('file:settings', me.header); break;
+            }
+        },
+
+        textHideFBar: 'Hide Formula Bar',
+        textHideHeadings: 'Hide Headings',
+        textHideGridlines: 'Hide Gridlines',
+        textFreezePanes: 'Freeze Panes'
+    }, SSE.Controllers.Viewport));
 });

apps/spreadsheeteditor/main/app/template/Toolbar.template

@@ -8,7 +8,6 @@
             <ul>
                 <% for(var i in tabs) { %>
                 <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                    <div class="tab-bg" />
                     <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
                 </li>
                 <% } %>
@@ -132,16 +131,7 @@
                         <span class="btn-slot split" id="slot-btn-table-tpl"></span>
                     </div>
                 </div>
-                <div class="group" id="slot-field-styles" style="width: 100%; min-width: 160px;">
+                <div class="group" id="slot-field-styles" style="width: 100%; min-width: 160px;"></div>
-                </div>
-                <div class="group no-mask">
-                    <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-hidebars"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot" id="slot-btn-settings"></span>
-                    </div>
-                </div>
             </section>
             <section class="panel" data-tab="ins">
                 <div class="group">

apps/spreadsheeteditor/main/app/template/Viewport.template

@@ -3,6 +3,7 @@
         <section class="layout-ct">
             <div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
         </section>
+        <section id="app-title" class="layout-item"></section>
         <div id="toolbar" class="layout-item"></div>
         <div class="layout-item">
             <div id="viewport-hbox-layout" class="layout-ct hbox">

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

@@ -81,8 +81,11 @@ define([
             this.$btnfunc = $('#ce-func-label', this.el);
 
             var me = this;
-            this.$cellname.on('focusin', function(e){
+            this.$cellname.on('focus', function(e){
-                me.$cellname.select().one('mouseup', function (e) {e.preventDefault();});
+                var txt = me.$cellname[0];
+                txt.selectionStart = 0;
+                txt.selectionEnd = txt.value.length;
+                txt.scrollLeft = txt.scrollWidth;
             });
 
             this.$btnfunc.addClass('disabled');

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

@@ -404,6 +404,106 @@ define([
                 })
             });
 
+            var numFormatTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem">'+
+                '<div style="position: relative;">'+
+                    '<div style="position: absolute; left: 0; width: 100px;"><%= caption %></div>' +
+                    '<label style="width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 100px; color: silver;cursor: pointer;"><%= options.exampleval ? options.exampleval : "" %></label>' +
+                '</div></a>');
+
+            me.pmiNumFormat = new Common.UI.MenuItem({
+                caption: me.txtNumFormat,
+                menu: new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        {
+                            caption: this.txtGeneral,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: 'General',
+                            exampleval: '100',
+                            value: Asc.c_oAscNumFormatType.General
+                        },
+                        {
+                            caption: this.txtNumber,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '0.00',
+                            exampleval: '100,00',
+                            value: Asc.c_oAscNumFormatType.Number
+                        },
+                        {
+                            caption: this.txtScientific,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '0.00E+00',
+                            exampleval: '1,00E+02',
+                            value: Asc.c_oAscNumFormatType.Scientific
+                        },
+                        {
+                            caption: this.txtAccounting,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)',
+                            exampleval: '100,00 $',
+                            value: Asc.c_oAscNumFormatType.Accounting
+                        },
+                        {
+                            caption: this.txtCurrency,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '$#,##0.00',
+                            exampleval: '100,00 $',
+                            value: Asc.c_oAscNumFormatType.Currency
+                        },
+                        {
+                            caption: this.txtDate,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: 'MM-dd-yyyy',
+                            exampleval: '04-09-1900',
+                            value: Asc.c_oAscNumFormatType.Date
+                        },
+                        {
+                            caption: this.txtTime,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: 'HH:MM:ss',
+                            exampleval: '00:00:00',
+                            value: Asc.c_oAscNumFormatType.Time
+                        },
+                        {
+                            caption: this.txtPercentage,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '0.00%',
+                            exampleval: '100,00%',
+                            value: Asc.c_oAscNumFormatType.Percent
+                        },
+                        {
+                            caption: this.txtFraction,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '# ?/?',
+                            exampleval: '100',
+                            value: Asc.c_oAscNumFormatType.Fraction
+                        },
+                        {
+                            caption: this.txtText,
+                            template: numFormatTemplate,
+                            checkable: true,
+                            format: '@',
+                            exampleval: '100',
+                            value: Asc.c_oAscNumFormatType.Text
+                        },
+                        {caption: '--'},
+                        me.pmiAdvancedNumFormat = new Common.UI.MenuItem({
+                            caption: me.textMoreFormats,
+                            value: 'advanced'
+                        })
+                    ]
+                })
+            });
+
             me.ssMenu = new Common.UI.Menu({
                 id          : 'id-context-menu-cell',
                 items       : [
@@ -427,6 +527,7 @@ define([
                     {caption: '--'},
                     me.pmiAddComment,
                     me.pmiCellMenuSeparator,
+                    me.pmiNumFormat,
                     me.pmiEntriesList,
                     me.pmiAddNamedRange,
                     me.pmiInsFunction,
@@ -489,6 +590,21 @@ define([
             me.menuSignatureEditSetup  = new Common.UI.MenuItem({caption: this.strSetup,     value: 2 });
             me.menuEditSignSeparator   = new Common.UI.MenuItem({ caption: '--' });
 
+            me.menuImgOriginalSize = new Common.UI.MenuItem({
+                caption     : me.originalSizeText
+            });
+
+            me.menuImgReplace = new Common.UI.MenuItem({
+                caption     : me.textReplace,
+                menu        : new Common.UI.Menu({
+                    menuAlign: 'tl-tr',
+                    items: [
+                        new Common.UI.MenuItem({caption     : this.textFromFile, value: 'file'}),
+                        new Common.UI.MenuItem({caption     : this.textFromUrl, value: 'url'})
+                    ]
+                })
+            });
+
             this.imgMenu = new Common.UI.Menu({
                 items: [
                     me.pmiImgCut,
@@ -525,6 +641,8 @@ define([
                     me.mnuShapeSeparator,
                     me.mnuChartEdit,
                     me.mnuShapeAdvanced,
+                    me.menuImgOriginalSize,
+                    me.menuImgReplace,
                     me.mnuImgAdvanced
                 ]
             });
@@ -811,7 +929,23 @@ define([
         strSign: 'Sign',
         strDetails: 'Signature Details',
         strSetup: 'Signature Setup',
-        strDelete: 'Remove Signature'
+        strDelete: 'Remove Signature',
+        originalSizeText: 'Default Size',
+        textReplace: 'Replace image',
+        textFromUrl: 'From URL',
+        textFromFile: 'From File',
+        txtNumFormat:       'Number Format',
+        txtGeneral:         'General',
+        txtNumber:          'Number',
+        txtScientific:      'Scientific',
+        txtAccounting:      'Accounting',
+        txtCurrency:        'Currency',
+        txtDate:            'Date',
+        txtTime:            'Time',
+        txtPercentage:      'Percentage',
+        txtFraction:        'Fraction',
+        txtText:            'Text',
+        textMoreFormats: 'More formats'
 
     }, SSE.Views.DocumentHolder || {}));
 });

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

@@ -603,6 +603,7 @@ define([
                     { value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn },
                     { value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe },
                     { value: 'es', displayValue: this.txtEs, exampleValue: this.txtExampleEs },
+                    { value: 'fr', displayValue: this.txtFr, exampleValue: this.txtExampleFr },
                     { value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu },
                     { value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }
                 ]
@@ -809,11 +810,13 @@ define([
         txtRu: 'Russian',
         txtPl: 'Polish',
         txtEs: 'Spanish',
+        txtFr: 'French',
         txtExampleEn: ' SUM; MIN; MAX; COUNT',
         txtExampleDe: ' SUMME; MIN; MAX; ANZAHL',
         txtExampleRu: ' СУММ; МИН; МАКС; СЧЁТ',
         txtExamplePl: ' SUMA; MIN; MAX; ILE.LICZB',
         txtExampleEs: ' SUMA; MIN; MAX; CALCULAR',
+        txtExampleFr: ' SOMME; MIN; MAX; NB',
         strFuncLocale: 'Formula Language',
         strFuncLocaleEx: 'Example: SUM; MIN; MAX; COUNT',
         strRegSettings: 'Regional Settings',

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

@@ -117,7 +117,8 @@ define([
                     de: this[translate+'_de'],
                     ru: this[translate+'_ru'],
                     pl: this[translate+'_pl'],
-                    es: this[translate+'_es']
+                    es: this[translate+'_es'],
+                    fr: this[translate+'_fr']
                 };
             }
 
@@ -408,7 +409,7 @@ define([
         sCategoryEngineering:           'Engineering',
         sCategoryFinancial:             'Financial',
         sCategoryInformation:           'Information',
-        sCategoryLookupAndReference:    'Lookup and Reference',
+        sCategoryLookupAndReference:    'Lookup and reference',
         sCategoryMathematic:            'Math and trigonometry',
         sCategoryStatistical:           'Statistical',
         sCategoryTextAndData:           'Text and data',
@@ -448,10 +449,22 @@ define([
         sCategoryEngineering_es:           'Ingenería',
         sCategoryFinancial_es:             'Financial',
         sCategoryInformation_es:           'Información',
-        sCategoryLookupAndReference_es:    'Búsqueda y Referencia',
+        sCategoryLookupAndReference_es:    'Búsqueda y referencia',
         sCategoryMathematic_es:            'Matemáticas y trigonometría',
         sCategoryStatistical_es:           'Estadístico',
         sCategoryTextAndData_es:           'Texto y datos',
+        sCategoryAll_fr:                   'Tout',
+        sCategoryLogical_fr:               'Logique',
+        sCategoryCube_fr:                  'Cube',
+        sCategoryDatabase_fr:              'Base de données',
+        sCategoryDateAndTime_fr:           'Date et heure',
+        sCategoryEngineering_fr:           'Ingénierie',
+        sCategoryFinancial_fr:             'Financier',
+        sCategoryInformation_fr:           'Information',
+        sCategoryLookupAndReference_fr:    'Recherche et référence',
+        sCategoryMathematic_fr:            'Maths et trigonométrie',
+        sCategoryStatistical_fr:           'Statistiques',
+        sCategoryTextAndData_fr:           'Texte et données',
         sCategoryAll_pl:                   'Wszystko',
         sCategoryLogical_pl:               'Logiczny',
         sCategoryCube_pl:                  'Sześcian',

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

@@ -63,18 +63,17 @@ define([
 
             this.template = [
                 '<div class="box">',
-                    '<div class="input-row">',
+                    '<div class="input-row" style="margin-bottom: 10px;">',
-                        '<label>' + this.textLinkType + '</label>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-external" style="border-top-right-radius: 0;border-bottom-right-radius: 0;">', this.textExternalLink,'</button>',
+                        '<button type="button" class="btn btn-text-default auto" id="id-dlg-hyperlink-internal" style="border-top-left-radius: 0;border-bottom-left-radius: 0;">', this.textInternalLink,'</button>',
                     '</div>',
-                    '<div class="input-row" id="id-dlg-hyperlink-type" style="margin-bottom: 5px;">',
+                    '<div id="id-external-link">',
-                    '</div>',
-                    '<div id="id-dlg-hyperlink-external">',
                         '<div class="input-row">',
                             '<label>' + this.strLinkTo + ' *</label>',
                         '</div>',
                         '<div id="id-dlg-hyperlink-url" class="input-row" style="margin-bottom: 5px;"></div>',
                     '</div>',
-                    '<div id="id-dlg-hyperlink-internal" style="display: none;">',
+                    '<div id="id-internal-link" class="hidden">',
                         '<div class="input-row">',
                             '<label style="width: 50%;">' + this.strSheet + '</label>',
                             '<label style="width: 50%;">' + this.strRange + ' *</label>',
@@ -111,20 +110,22 @@ define([
             var $window = this.getChild(),
                 me = this;
 
-            me.cmbLinkType = new Common.UI.ComboBox({
+            me.btnExternal = new Common.UI.Button({
-                el      : $('#id-dlg-hyperlink-type'),
+                el: $('#id-dlg-hyperlink-external'),
-                cls     : 'input-group-nr',
+                enableToggle: true,
-                editable: false,
+                toggleGroup: 'hyperlink-type',
-                menuStyle: 'min-width: 100%;',
+                allowDepress: false,
-                data    : [
+                pressed: true
-                    {displayValue: this.textInternalLink, value: Asc.c_oAscHyperlinkType.RangeLink},
-                    {displayValue: this.textExternalLink, value: Asc.c_oAscHyperlinkType.WebLink}
-                ]
-            }).on('selected', function(combo, record) {
-                $('#id-dlg-hyperlink-external')[record.value == Asc.c_oAscHyperlinkType.WebLink ? 'show' : 'hide']();
-                $('#id-dlg-hyperlink-internal')[record.value != Asc.c_oAscHyperlinkType.WebLink ? 'show' : 'hide']();
             });
-            me.cmbLinkType.setValue(Asc.c_oAscHyperlinkType.WebLink);
+            me.btnExternal.on('click', _.bind(me.onLinkTypeClick, me, Asc.c_oAscHyperlinkType.WebLink));
+
+            me.btnInternal = new Common.UI.Button({
+                el: $('#id-dlg-hyperlink-internal'),
+                enableToggle: true,
+                toggleGroup: 'hyperlink-type',
+                allowDepress: false
+            });
+            me.btnInternal.on('click', _.bind(me.onLinkTypeClick, me, Asc.c_oAscHyperlinkType.RangeLink));
 
             me.cmbSheets = new Common.UI.ComboBox({
                 el      : $('#id-dlg-hyperlink-sheet'),
@@ -182,6 +183,9 @@ define([
 
             $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
             $window.find('input').on('keypress', _.bind(this.onKeyPress, this));
+
+            me.externalPanel = $window.find('#id-external-link');
+            me.internalPanel = $window.find('#id-internal-link');
         },
 
         show: function() {
@@ -198,20 +202,18 @@ define([
                 var me = this;
 
                 this.cmbSheets.setData(settings.sheets);
+                var type = (settings.props) ? settings.props.asc_getType() : Asc.c_oAscHyperlinkType.WebLink;
+                (type == Asc.c_oAscHyperlinkType.WebLink) ? me.btnExternal.toggle(true) : me.btnInternal.toggle(true);
+                me.ShowHideElem(type);
+                me.btnInternal.setDisabled(!settings.allowInternal && (type == Asc.c_oAscHyperlinkType.WebLink));
+                me.btnExternal.setDisabled(!settings.allowInternal && (type == Asc.c_oAscHyperlinkType.RangeLink));
+
                 if (!settings.props) {
-                    this.cmbLinkType.setValue(Asc.c_oAscHyperlinkType.WebLink);
-                    this.cmbLinkType.setDisabled(!settings.allowInternal);
                     this.inputDisplay.setValue(settings.isLock ? this.textDefault : settings.text);
                     this.focusedInput = this.inputUrl.cmpEl.find('input');
                     this.cmbSheets.setValue(settings.currentSheet);
                 } else {
-                    this.cmbLinkType.setValue(settings.props.asc_getType());
+                    if (type == Asc.c_oAscHyperlinkType.RangeLink) {
-                    this.cmbLinkType.setDisabled(!settings.allowInternal);
-
-                    if (settings.props.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) {
-                        $('#id-dlg-hyperlink-external').hide();
-                        $('#id-dlg-hyperlink-internal').show();
-
                         this.cmbSheets.setValue(settings.props.asc_getSheet());
                         this.inputRange.setValue(settings.props.asc_getRange());
                         this.focusedInput = this.inputRange.cmpEl.find('input');
@@ -231,9 +233,9 @@ define([
         getSettings: function() {
             var props = new Asc.asc_CHyperlink(),
                 def_display = "";
-            props.asc_setType(this.cmbLinkType.getValue());
+            props.asc_setType(this.btnInternal.isActive() ? Asc.c_oAscHyperlinkType.RangeLink : Asc.c_oAscHyperlinkType.WebLink);
 
-            if (this.cmbLinkType.getValue() == Asc.c_oAscHyperlinkType.RangeLink) {
+            if (this.btnInternal.isActive()) {
                 props.asc_setSheet(this.cmbSheets.getValue());
                 props.asc_setRange(this.inputRange.getValue());
                 def_display = this.cmbSheets.getValue() + '!' + this.inputRange.getValue();
@@ -273,8 +275,8 @@ define([
         _handleInput: function(state) {
             if (this.options.handler) {
                 if (state == 'ok') {
-                    var checkurl = (this.cmbLinkType.getValue() === Asc.c_oAscHyperlinkType.WebLink) ? this.inputUrl.checkValidate() : true,
+                    var checkurl = (this.btnExternal.isActive()) ? this.inputUrl.checkValidate() : true,
-                        checkrange = (this.cmbLinkType.getValue() === Asc.c_oAscHyperlinkType.RangeLink) ? this.inputRange.checkValidate() : true,
+                        checkrange = (this.btnInternal.isActive()) ? this.inputRange.checkValidate() : true,
                         checkdisp = this.inputDisplay.checkValidate();
                     if (checkurl !== true)  {
                         this.inputUrl.cmpEl.find('input').focus();
@@ -296,6 +298,15 @@ define([
             this.close();
         },
 
+        ShowHideElem: function(value) {
+            this.externalPanel.toggleClass('hidden', value !== Asc.c_oAscHyperlinkType.WebLink);
+            this.internalPanel.toggleClass('hidden', value !== Asc.c_oAscHyperlinkType.RangeLink);
+        },
+
+        onLinkTypeClick: function(type, btn, event) {
+            this.ShowHideElem(type);
+        },
+
         textTitle:          'Hyperlink Settings',
         textInternalLink:   'Internal Data Range',
         textExternalLink:   'Web Link',
@@ -304,7 +315,6 @@ define([
         textEmptyTooltip:   'Enter tooltip here',
         strSheet:           'Sheet',
         strRange:           'Range',
-        textLinkType:       'Link Type',
         strDisplay:         'Display',
         textTipText:        'Screen Tip Text',
         strLinkTo:          'Link To',

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

@@ -55,25 +55,26 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
         },
 
         initialize : function(options) {
+            this.type = options.type || 'print';
             _.extend(this.options, {
-                title: this.textTitle,
+                title: (this.type == 'print') ? this.textTitle : this.textTitlePDF,
                 template: [
                     '<div class="box" style="height:' + (this.options.height-85) + 'px;">',
                         '<div class="menu-panel" style="overflow: hidden;">',
-                            '<div style="height: 42px; line-height: 42px;" class="div-category">' + this.textPrintRange + '</div>',
+                            '<div style="height: 42px; line-height: 42px;" class="div-category">' + ((this.type == 'print') ? this.textPrintRange : this.textRange)+ '</div>',
                             '<div style="height: 52px; line-height: 66px;" class="div-category">' + this.textSettings + '</div>',
                             '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textPageSize + '</div>',
                             '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textPageOrientation + '</div>',
                             '<div style="height: 38px; line-height: 38px;" class="div-category">' + this.textPageScaling + '</div>',
                             '<div style="height: 108px; line-height: 33px;" class="div-category">' + this.strMargins + '</div>',
-                            '<div style="height: 58px; line-height: 40px;" class="div-category">' + this.strPrint + '</div>',
+                            '<div style="height: 58px; line-height: 40px;" class="div-category">' + ((this.type == 'print') ? this.strPrint : this.strShow) + '</div>',
                         '</div>',
                         '<div class="content-panel">' + _.template(contentTemplate)({scope: this}) + '</div>',
                     '</div>',
                     '<div class="separator horizontal"/>',
                     '<div class="footer justify">',
                         '<button id="printadv-dlg-btn-hide" class="btn btn-text-default" style="margin-right: 55px; width: 100px;">' + this.textHideDetails + '</button>',
-                        '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;  width: 150px;">' + this.btnPrint + '</button>',
+                        '<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;  width: 150px;">' + ((this.type == 'print') ? this.btnPrint : this.btnDownload) + '</button>',
                         '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
                     '</div>'
                 ].join('')
@@ -145,12 +146,12 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
 
             this.chPrintGrid = new Common.UI.CheckBox({
                 el: $('#printadv-dlg-chb-grid'),
-                labelText: this.textPrintGrid
+                labelText: (this.type == 'print') ? this.textPrintGrid : this.textShowGrid
             });
 
             this.chPrintRows = new Common.UI.CheckBox({
                 el: $('#printadv-dlg-chb-rows'),
-                labelText: this.textPrintHeadings
+                labelText: (this.type == 'print') ? this.textPrintHeadings : this.textShowHeadings
             });
 
             this.spnMarginTop = new Common.UI.MetricSpinner({
@@ -301,6 +302,13 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
         cancelButtonText:       'Cancel',
         textHideDetails:        'Hide Details',
         textPageScaling:        'Scaling',
-        textSettings:           'Sheet Settings'
+        textSettings:           'Sheet Settings',
+        textTitlePDF:           'PDF Settings',
+        textShowGrid:           'Show Gridlines',
+        textShowHeadings:       'Show Rows and Columns Headings',
+        strShow:                'Show',
+        btnDownload:            'Save & Download',
+        textRange:              'Range'
+
     }, SSE.Views.PrintSettings || {}));
 });

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

@@ -157,7 +157,8 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-undo',
                 disabled    : true,
-                lock        : [_set.lostConnect]
+                lock        : [_set.lostConnect],
+                signals     : ['disabled']
             });
 
             me.btnRedo = new Common.UI.Button({
@@ -165,7 +166,8 @@ define([
                 cls         : 'btn-toolbar',
                 iconCls     : 'btn-redo',
                 disabled    : true,
-                lock        : [_set.lostConnect]
+                lock        : [_set.lostConnect],
+                signals     : ['disabled']
             });
 
             return this;
@@ -260,6 +262,18 @@ define([
                     lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
                 });
 
+                var formatTemplate =
+                    _.template([
+                        '<% _.each(items, function(item) { %>',
+                        '<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
+                        '<div style="position: relative;"><div style="position: absolute; left: 0; width: 100px;"><%= scope.getDisplayValue(item) %></div>',
+                        '<div style="display: inline-block; width: 100%; max-width: 300px; overflow: hidden; text-overflow: ellipsis; text-align: right; vertical-align: bottom; padding-left: 100px; color: silver;"><%= item.exampleval ? item.exampleval : "" %></div>',
+                        '</div></a></li>',
+                        '<% }); %>',
+                        '<li class="divider">',
+                        '<li id="id-toolbar-mnu-item-more-formats" data-value="-1"><a tabindex="-1" type="menuitem">' + me.textMoreFormats + '</a></li>'
+                    ].join(''));
+
                 me.cmbNumberFormat = new Common.UI.ComboBox({
                     cls         : 'input-group-nr',
                     menuStyle   : 'min-width: 180px;',
@@ -370,9 +384,10 @@ define([
                 me.btnSave = new Common.UI.Button({
                     id          : 'id-toolbar-btn-save',
                     cls         : 'btn-toolbar',
-                    iconCls     : 'no-mask ' + me.btnSaveCls
+                    iconCls     : 'no-mask ' + me.btnSaveCls,
+                    signals     : ['disabled']
                 });
-                me.btnsSave = [me.btnSave];
+                me.btnCollabChanges = me.btnSave;
 
                 me.btnIncFontSize = new Common.UI.Button({
                     id          : 'id-toolbar-btn-incfont',
@@ -1045,41 +1060,6 @@ define([
                     })
                 });
 
-                me.mnuZoomIn = dummyCmp();
-                me.mnuZoomOut = dummyCmp();
-
-                var clone = function(source) {
-                    var obj = {};
-                    for (var prop in source)
-                        obj[prop] = (typeof(source[prop])=='object') ? clone(source[prop]) : source[prop];
-                    return obj;
-                };
-
-                this.mnuitemHideHeadings = {
-                    conf: {checked:false},
-                    setChecked: function(val) { this.conf.checked = val;},
-                    isChecked: function () { return this.conf.checked; }
-                };
-                this.mnuitemHideGridlines = clone(this.mnuitemHideHeadings);
-                this.mnuitemFreezePanes = clone(this.mnuitemHideHeadings);
-                this.mnuZoom = {
-                    options: {value: 100}
-                };
-
-                me.btnShowMode = new Common.UI.Button({
-                    id          : 'id-toolbar-btn-showmode',
-                    cls         : 'btn-toolbar',
-                    iconCls     : 'btn-showmode no-mask',
-                    lock        : [_set.menuFileOpen, _set.editCell],
-                    menu        : true
-                });
-
-                me.btnSettings = new Common.UI.Button({
-                    id          : 'id-toolbar-btn-settings',
-                    cls         : 'btn-toolbar',
-                    iconCls     : 'btn-settings no-mask'
-                });
-
                 // Is unique for the short view
 
                 me.btnHorizontalAlign = new Common.UI.Button({
@@ -1219,7 +1199,7 @@ define([
 
                 var hidetip = Common.localStorage.getItem("sse-hide-synch");
                 me.showSynchTip = !(hidetip && parseInt(hidetip) == 1);
-                me.needShowSynchTip = false;
+                // me.needShowSynchTip = false;
             }
 
             me.lockControls = [
@@ -1232,8 +1212,8 @@ define([
                 me.btnTableTemplate, me.btnPercentStyle, me.btnCurrencyStyle, me.btnDecDecimal, me.btnAddCell, me.btnDeleteCell,
                 me.cmbNumberFormat, me.btnBorders, me.btnInsertImage, me.btnInsertHyperlink,
                 me.btnInsertChart, me.btnColorSchemas,
-                me.btnAutofilter, me.btnCopy, me.btnPaste, me.btnSettings, me.listStyles, me.btnPrint, me.btnShowMode,
+                me.btnAutofilter, me.btnCopy, me.btnPaste, me.listStyles, me.btnPrint,
-                /*me.btnSave, */me.btnClearStyle, me.btnCopyStyle
+                me.btnSave, me.btnClearStyle, me.btnCopyStyle
             ];
 
             var _temp_array = [me.cmbFontName, me.cmbFontSize, me.btnAlignLeft,me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust,me.btnAlignTop,
@@ -1241,8 +1221,8 @@ define([
                 me.btnInsertImage, me.btnInsertText, me.btnInsertTextArt, me.btnInsertShape, me.btnInsertEquation, me.btnIncFontSize,
                 me.btnDecFontSize, me.btnBold, me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnBackColor,
                 me.btnInsertHyperlink, me.btnBorders, me.btnTextOrient, me.btnPercentStyle, me.btnCurrencyStyle, me.btnColorSchemas,
-                me.btnSettings, me.btnInsertFormula, me.btnNamedRange, me.btnDecDecimal, me.btnIncDecimal, me.cmbNumberFormat, me.btnWrap,
+                me.btnInsertFormula, me.btnNamedRange, me.btnDecDecimal, me.btnIncDecimal, me.cmbNumberFormat, me.btnWrap,
-                me.btnInsertChart, me.btnMerge, me.btnAddCell, me.btnDeleteCell, me.btnShowMode, me.btnPrint,
+                me.btnInsertChart, me.btnMerge, me.btnAddCell, me.btnDeleteCell, me.btnPrint,
                 me.btnAutofilter, me.btnSortUp, me.btnSortDown, me.btnTableTemplate, me.btnSetAutofilter, me.btnClearAutofilter,
                 me.btnSave, me.btnClearStyle, me.btnCopyStyle, me.btnCopy, me.btnPaste];
 
@@ -1291,9 +1271,9 @@ define([
                 }
             });
 
+            me.setTab('home');
             if ( me.isCompactView )
-                me.setFolded(true); else
+                me.setFolded(true);
-                me.setTab('home');
 
             return this;
         },
@@ -1376,8 +1356,6 @@ define([
             _injectComponent('#slot-btn-cell-ins',       this.btnAddCell);
             _injectComponent('#slot-btn-cell-del',       this.btnDeleteCell);
             _injectComponent('#slot-btn-colorschemas',   this.btnColorSchemas);
-            _injectComponent('#slot-btn-hidebars',       this.btnShowMode);
-            _injectComponent('#slot-btn-settings',       this.btnSettings);
             _injectComponent('#slot-btn-search',         this.btnSearch);
             _injectComponent('#slot-btn-inschart',       this.btnInsertChart);
             _injectComponent('#slot-field-styles',       this.listStyles);
@@ -1447,77 +1425,11 @@ define([
             _updateHint(this.btnAddCell, this.tipInsertOpt);
             _updateHint(this.btnDeleteCell, this.tipDeleteOpt);
             _updateHint(this.btnColorSchemas, this.tipColorSchemas);
-            _updateHint(this.btnShowMode, this.tipViewSettings);
-            _updateHint(this.btnSettings, this.tipAdvSettings);
             _updateHint(this.btnHorizontalAlign, this.tipHAligh);
             _updateHint(this.btnVerticalAlign, this.tipVAligh);
             _updateHint(this.btnAutofilter, this.tipAutofilter);
 
             // set menus
-            if ( this.btnShowMode && this.btnShowMode.rendered ) {
-                this.btnShowMode.setMenu(new Common.UI.Menu({
-                    items: [
-                        this.mnuitemCompactToolbar = new Common.UI.MenuItem({
-                            caption     : this.textCompactToolbar,
-                            checkable   : true,
-                            checked     : this.isCompactView,
-                            value       : 'compact'
-                        }),
-                        this.mnuitemHideFormulaBar = new Common.UI.MenuItem({
-                            caption     : this.textHideFBar,
-                            checkable   : true,
-                            checked     : Common.localStorage.getBool('sse-hidden-formula'),
-                            value       : 'formula'
-                        }),
-                        {caption: '--'},
-                        this.mnuitemHideHeadings = new Common.UI.MenuItem({
-                            caption     : this.textHideHeadings,
-                            checkable   : true,
-                            checked     : this.mnuitemHideHeadings.isChecked(),
-                            value       : 'headings'
-                        }),
-                        this.mnuitemHideGridlines = new Common.UI.MenuItem({
-                            caption     : this.textHideGridlines,
-                            checkable   : true,
-                            checked     : this.mnuitemHideGridlines.isChecked(),
-                            value       : 'gridlines'
-                        }),
-                        {caption: '--'},
-                        this.mnuitemFreezePanes = new Common.UI.MenuItem({
-                            caption     : this.textFreezePanes,
-                            checkable   : true,
-                            checked     : this.mnuitemFreezePanes.isChecked(),
-                            value       : 'freezepanes'
-                        }),
-                        {caption: '--'},
-                        this.mnuZoom = new Common.UI.MenuItem({
-                            template: _.template([
-                                '<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25px;" ',
-                                    '<% if(!_.isUndefined(options.stopPropagation)) { %>',
-                                        'data-stopPropagation="true"',
-                                    '<% } %>', '>',
-                                    '<label class="title">' + this.textZoom + '</label>',
-                                    '<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><span class="icon btn-zoomin">&nbsp;</span></button>',
-                                    '<label class="zoom"><%= options.value %>%</label>',
-                                    '<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><span class="icon btn-zoomout">&nbsp;</span></button>',
-                                '</div>'
-                            ].join('')),
-                            stopPropagation: true,
-                            value: this.mnuZoom.options.value
-                        })
-                    ]
-                }));
-
-                this.mnuZoomOut = new Common.UI.Button({
-                    el  : $('#id-menu-zoom-out'),
-                    cls : 'btn-toolbar'
-                });
-                this.mnuZoomIn = new Common.UI.Button({
-                    el  : $('#id-menu-zoom-in'),
-                    cls : 'btn-toolbar'
-                });
-            }
-            
             if (this.btnBorders && this.btnBorders.rendered) {
                 this.btnBorders.setMenu( new Common.UI.Menu({
                     items: [
@@ -1706,12 +1618,6 @@ define([
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
                 });
             }
-
-            var btnsave = SSE.getController('LeftMenu').getView('LeftMenu').getMenu('file').getButton('save');
-            if (btnsave && this.btnsSave) {
-                this.btnsSave.push(btnsave);
-                btnsave.setDisabled(this.btnsSave[0].isDisabled());
-            }
         },
 
         onToolbarAfterRender: function(toolbar) {
@@ -1755,8 +1661,6 @@ define([
                 this.lockToolbar( SSE.enumLock.lostConnect, true );
                 this.lockToolbar( SSE.enumLock.lostConnect, true,
                     {array:[this.btnEditChart,this.btnUndo,this.btnRedo]} );
-                this.lockToolbar( SSE.enumLock.lostConnect, true,
-                    {array:this.btnsSave} );
                 this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint || mode.disableDownload, {array: [this.btnPrint]});
             } else {
                 this.mode = mode;
@@ -1828,66 +1732,54 @@ define([
 
         onApiCollaborativeChanges: function() {
             if (this._state.hasCollaborativeChanges) return;
-            if (!this.btnSave.rendered) {
+            if (!this.btnCollabChanges.rendered) {
-                this.needShowSynchTip = true;
+                // this.needShowSynchTip = true;
                 return;
             }
 
             this._state.hasCollaborativeChanges = true;
-            var iconEl = $('.icon', this.btnSave.cmpEl);
+            this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass('btn-synch');
-            iconEl.removeClass(this.btnSaveCls);
-            iconEl.addClass('btn-synch');
 
             if (this.showSynchTip){
-                this.btnSave.updateHint('');
+                this.btnCollabChanges.updateHint('');
                 if (this.synchTooltip===undefined)
                     this.createSynchTip();
 
                 this.synchTooltip.show();
             } else {
-                this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
             }
 
-            this.btnsSave.forEach(function(button) {
+            this.btnSave.setDisabled(false);
-                if ( button ) {
-                    button.setDisabled(false);
-                }
-            });
             Common.Gateway.collaborativeChanges();
         },
 
         createSynchTip: function () {
             this.synchTooltip = new Common.UI.SynchronizeTip({
-                target    : $('#id-toolbar-btn-save')
+                target: this.btnCollabChanges.$el
             });
             this.synchTooltip.on('dontshowclick', function() {
                 this.showSynchTip = false;
                 this.synchTooltip.hide();
-                this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
                 Common.localStorage.setItem('sse-hide-synch', 1);
             }, this);
             this.synchTooltip.on('closeclick', function() {
                 this.synchTooltip.hide();
-                this.btnSave.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
+                this.btnCollabChanges.updateHint(this.tipSynchronize + Common.Utils.String.platformKey('Ctrl+S'));
             }, this);
         },
 
         synchronizeChanges: function() {
-            if (this.btnSave.rendered) {
+            if (this.btnCollabChanges.rendered) {
-                var iconEl = $('.icon', this.btnSave.cmpEl),
+                var me = this;
-                    me = this;
 
-                if (iconEl.hasClass('btn-synch')) {
+                if ( me.btnCollabChanges.$icon.hasClass('btn-synch') ) {
-                    iconEl.removeClass('btn-synch');
+                    me.btnCollabChanges.$icon.removeClass('btn-synch').addClass(this.btnSaveCls);
-                    iconEl.addClass(this.btnSaveCls);
                     if (this.synchTooltip)
                         this.synchTooltip.hide();
-                    this.btnSave.updateHint(this.btnSaveTip);
+                    this.btnCollabChanges.updateHint(this.btnSaveTip);
-                    this.btnsSave.forEach(function(button) {
+                    this.btnSave.setDisabled(!me.mode.forcesave);
-                        if ( button ) {
-                            button.setDisabled(!me.mode.forcesave);
-                        }
-                    });
 
                     this._state.hasCollaborativeChanges = false;
                 }
@@ -1903,14 +1795,12 @@ define([
 
             var length = _.size(editusers);
             var cls = (length>1) ? 'btn-save-coauth' : 'btn-save';
-            if (cls !== this.btnSaveCls && this.btnSave.rendered) {
+            if (cls !== this.btnSaveCls && this.btnCollabChanges.rendered) {
                 this.btnSaveTip = ((length>1) ? this.tipSaveCoauth : this.tipSave )+ Common.Utils.String.platformKey('Ctrl+S');
 
-                var iconEl = $('.icon', this.btnSave.cmpEl);
+                if ( !this.btnCollabChanges.$icon.hasClass('btn-synch') ) {
-                if (!iconEl.hasClass('btn-synch')) {
+                    this.btnCollabChanges.$icon.removeClass(this.btnSaveCls).addClass(cls);
-                    iconEl.removeClass(this.btnSaveCls);
+                    this.btnCollabChanges.updateHint(this.btnSaveTip);
-                    iconEl.addClass(cls);
-                    this.btnSave.updateHint(this.btnSaveTip);
                 }
                 this.btnSaveCls = cls;
             }
@@ -2010,8 +1900,6 @@ define([
         tipDigStylePercent: 'Percent Style',
 //        tipDigStyleCurrency:'Currency Style',
         tipDigStyleAccounting: 'Accounting Style',
-        tipViewSettings:    'View Settings',
-        tipAdvSettings:     'Advanced Settings',
         tipTextOrientation: 'Orientation',
         tipInsertOpt:       'Insert Cells',
         tipDeleteOpt:       'Delete Cells',
@@ -2054,12 +1942,6 @@ define([
         textDelLeft:        'Shift Cells Left',
         textDelUp:          'Shift Cells Up',
         textZoom:           'Zoom',
-        textCompactToolbar: 'Hide Toolbar',
-        textHideTBar:       'Hide Title Bar',
-        textHideFBar:       'Hide Formula Bar',
-        textHideHeadings:   'Hide Headings',
-        textHideGridlines:  'Hide Gridlines',
-        textFreezePanes:    'Freeze Panes',
         txtScheme1:         'Office',
         txtScheme2:         'Grayscale',
         txtScheme3:         'Apex',

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

@@ -85,18 +85,20 @@ define([
             var items = $container.find(' > .layout-item');
             this.vlayout = new Common.UI.VBoxLayout({
                 box: $container,
-                items: [
+                items: [{
-                {
+                    el: $container.find('> .layout-item#app-title').hide(),
-                    // el: items[0],    // decorative element for view mode for desktop
+                    alias: 'title',
-                    // height: 5
+                    height: Common.Utils.InternalSettings.get('document-title-height')
-                // }, {
+                },{
-                    el: items[0],
-                    height: Common.localStorage.getBool('sse-compact-toolbar') ? 32 : 32+67
-                }, {
                     el: items[1],
-                    stretch: true
+                    alias: 'toolbar',
+                    height: Common.localStorage.getBool('sse-compact-toolbar') ?
+                        Common.Utils.InternalSettings.get('toolbar-height-compact') : Common.Utils.InternalSettings.get('toolbar-height-normal')
                 }, {
                     el: items[2],
+                    stretch: true
+                }, {
+                    el: items[3],
                     height: 25
                 }]
             });

apps/spreadsheeteditor/main/app_dev.js

@@ -186,6 +186,7 @@ require([
         'common/main/lib/controller/Plugins'
         ,'common/main/lib/controller/ReviewChanges'
         ,'common/main/lib/controller/Protection'
+        ,'common/main/lib/controller/Desktop'
     ], function() {
         window.compareVersions = true;
         app.start();

apps/spreadsheeteditor/main/locale/en.json

@@ -86,6 +86,12 @@
   "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.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@@ -104,6 +110,9 @@
   "Common.Views.OpenDialog.txtTab": "Tab",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.OpenDialog.txtComma": "Comma",
+  "Common.Views.OpenDialog.txtColon": "Colon",
+  "Common.Views.OpenDialog.txtSemicolon": "Semicolon",
   "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
   "Common.Views.PasswordDialog.okButtonText": "OK",
   "Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document",
@@ -835,6 +844,10 @@
   "SSE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
   "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
+  "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar",
+  "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines",
+  "SSE.Controllers.Viewport.textHideHeadings": "Hide Headings",
+  "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes",
   "SSE.Views.AutoFilterDialog.btnCustomFilter": "Custom Filter",
   "SSE.Views.AutoFilterDialog.cancelButtonText": "Cancel",
   "SSE.Views.AutoFilterDialog.okButtonText": "OK",
@@ -1158,6 +1171,22 @@
   "SSE.Views.DocumentHolder.txtUngroup": "Ungroup",
   "SSE.Views.DocumentHolder.txtWidth": "Width",
   "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+  "SSE.Views.DocumentHolder.originalSizeText": "Default Size",
+  "SSE.Views.DocumentHolder.textReplace": "Replace image",
+  "SSE.Views.DocumentHolder.textFromUrl": "From URL",
+  "SSE.Views.DocumentHolder.textFromFile": "From File",
+  "SSE.Views.DocumentHolder.txtNumFormat": "Number Format",
+  "SSE.Views.DocumentHolder.txtGeneral": "General",
+  "SSE.Views.DocumentHolder.txtNumber": "Number",
+  "SSE.Views.DocumentHolder.txtScientific": "Scientific",
+  "SSE.Views.DocumentHolder.txtAccounting": "Accounting",
+  "SSE.Views.DocumentHolder.txtCurrency": "Currency",
+  "SSE.Views.DocumentHolder.txtDate": "Date",
+  "SSE.Views.DocumentHolder.txtTime": "Time",
+  "SSE.Views.DocumentHolder.txtPercentage": "Percentage",
+  "SSE.Views.DocumentHolder.txtFraction": "Fraction",
+  "SSE.Views.DocumentHolder.txtText": "Text",
+  "SSE.Views.DocumentHolder.textMoreFormats": "More formats",
   "SSE.Views.FileMenu.btnBackCaption": "Go to Documents",
   "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu",
   "SSE.Views.FileMenu.btnCreateNewCaption": "Create New",
@@ -1217,6 +1246,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "German",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "English",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "Spanish",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtFr": "French",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Commenting Display",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",
@@ -1286,7 +1316,7 @@
   "SSE.Views.HyperlinkSettingsDialog.textExternalLink": "External Link",
   "SSE.Views.HyperlinkSettingsDialog.textInternalLink": "Internal Data Range",
   "SSE.Views.HyperlinkSettingsDialog.textInvalidRange": "ERROR! Invalid cells range",
-  "SSE.Views.HyperlinkSettingsDialog.textLinkType": "Link Type",
+  "del_SSE.Views.HyperlinkSettingsDialog.textLinkType": "Link Type",
   "SSE.Views.HyperlinkSettingsDialog.textTipText": "ScreenTip Text",
   "SSE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
   "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "This field is required",
@@ -1497,6 +1527,12 @@
   "SSE.Views.PrintSettings.textSettings": "Sheet Settings",
   "SSE.Views.PrintSettings.textShowDetails": "Show Details",
   "SSE.Views.PrintSettings.textTitle": "Print Settings",
+  "SSE.Views.PrintSettings.textTitlePDF": "PDF Settings",
+  "SSE.Views.PrintSettings.textShowGrid": "Show Gridlines",
+  "SSE.Views.PrintSettings.textShowHeadings": "Show Rows and Columns Headings",
+  "SSE.Views.PrintSettings.strShow": "Show",
+  "SSE.Views.PrintSettings.btnDownload": "Save & Download",
+  "SSE.Views.PrintSettings.textRange": "Range",
   "SSE.Views.RightMenu.txtChartSettings": "Chart settings",
   "SSE.Views.RightMenu.txtImageSettings": "Image settings",
   "SSE.Views.RightMenu.txtParagraphSettings": "Text settings",
@@ -1755,7 +1791,7 @@
   "SSE.Views.Toolbar.textClockwise": "Angle Clockwise",
   "SSE.Views.Toolbar.textColumn": "Column",
   "SSE.Views.Toolbar.textColumnSpark": "Column",
-  "SSE.Views.Toolbar.textCompactToolbar": "Hide Toolbar",
+  "del_SSE.Views.Toolbar.textCompactToolbar": "Hide Toolbar",
   "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise",
   "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left",
   "SSE.Views.Toolbar.textDelUp": "Shift Cells Up",
@@ -1763,11 +1799,11 @@
   "SSE.Views.Toolbar.textDiagUpBorder": "Diagonal Up Border",
   "SSE.Views.Toolbar.textEntireCol": "Entire Column",
   "SSE.Views.Toolbar.textEntireRow": "Entire Row",
-  "SSE.Views.Toolbar.textFreezePanes": "Freeze Panes",
+  "del_SSE.Views.Toolbar.textFreezePanes": "Freeze Panes",
-  "SSE.Views.Toolbar.textHideFBar": "Hide Formula Bar",
+  "del_SSE.Views.Toolbar.textHideFBar": "Hide Formula Bar",
-  "SSE.Views.Toolbar.textHideGridlines": "Hide Gridlines",
+  "del_SSE.Views.Toolbar.textHideGridlines": "Hide Gridlines",
-  "SSE.Views.Toolbar.textHideHeadings": "Hide Headings",
+  "del_SSE.Views.Toolbar.textHideHeadings": "Hide Headings",
-  "SSE.Views.Toolbar.textHideTBar": "Hide Title Bar",
+  "del_SSE.Views.Toolbar.textHideTBar": "Hide Title Bar",
   "SSE.Views.Toolbar.textHorizontal": "Horizontal Text",
   "SSE.Views.Toolbar.textInsDown": "Shift Cells Down",
   "SSE.Views.Toolbar.textInsideBorders": "Inside Borders",
@@ -1804,7 +1840,7 @@
   "SSE.Views.Toolbar.textUnderline": "Underline",
   "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss",
   "SSE.Views.Toolbar.textZoom": "Zoom",
-  "SSE.Views.Toolbar.tipAdvSettings": "Advanced settings",
+  "del_SSE.Views.Toolbar.tipAdvSettings": "Advanced settings",
   "SSE.Views.Toolbar.tipAlignBottom": "Align bottom",
   "SSE.Views.Toolbar.tipAlignCenter": "Align center",
   "SSE.Views.Toolbar.tipAlignJust": "Justified",
@@ -1855,7 +1891,7 @@
   "SSE.Views.Toolbar.tipTextOrientation": "Orientation",
   "SSE.Views.Toolbar.tipUndo": "Undo",
   "SSE.Views.Toolbar.tipVAligh": "Vertical Alignment",
-  "SSE.Views.Toolbar.tipViewSettings": "View settings",
+  "del_SSE.Views.Toolbar.tipViewSettings": "View settings",
   "SSE.Views.Toolbar.tipWrap": "Wrap text",
   "SSE.Views.Toolbar.txtAccounting": "Accounting",
   "SSE.Views.Toolbar.txtAdditional": "Additional",

apps/spreadsheeteditor/main/locale/ko.json

@@ -54,6 +54,7 @@
   "Common.Views.Comments.textAddComment": "덧글 추가",
   "Common.Views.Comments.textAddCommentToDoc": "문서에 설명 추가",
   "Common.Views.Comments.textAddReply": "답장 추가",
+  "Common.Views.Comments.textAnonym": "손님",
   "Common.Views.Comments.textCancel": "취소",
   "Common.Views.Comments.textClose": "닫기",
   "Common.Views.Comments.textComments": "Comments",
@@ -75,10 +76,13 @@
   "Common.Views.Header.labelCoUsersDescr": "문서는 현재 여러 사용자가 편집하고 있습니다.",
   "Common.Views.Header.textBack": "문서로 이동",
   "Common.Views.Header.textSaveBegin": "저장 중 ...",
+  "Common.Views.Header.textSaveChanged": "수정된",
   "Common.Views.Header.textSaveEnd": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.textSaveExpander": "모든 변경 사항이 저장되었습니다",
   "Common.Views.Header.tipAccessRights": "문서 액세스 권한 관리",
   "Common.Views.Header.tipDownload": "파일을 다운로드",
+  "Common.Views.Header.tipGoEdit": "현재 파일 편집",
+  "Common.Views.Header.tipPrint": "파일 출력",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
   "Common.Views.Header.txtRename": "이름 바꾸기",
@@ -88,59 +92,110 @@
   "Common.Views.ImageFromUrlDialog.txtEmpty": "이 입력란은 필수 항목",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다.",
   "Common.Views.OpenDialog.cancelButtonText": "취소",
+  "Common.Views.OpenDialog.closeButtonText": "파일 닫기",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "구분 기호",
   "Common.Views.OpenDialog.txtEncoding": "인코딩",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "비밀번호가 맞지 않음",
   "Common.Views.OpenDialog.txtOther": "기타",
   "Common.Views.OpenDialog.txtPassword": "비밀번호",
+  "Common.Views.OpenDialog.txtPreview": "미리보기",
   "Common.Views.OpenDialog.txtSpace": "공간",
   "Common.Views.OpenDialog.txtTab": "탭",
   "Common.Views.OpenDialog.txtTitle": "% 1 옵션 선택",
   "Common.Views.OpenDialog.txtTitleProtected": "보호 된 파일",
   "Common.Views.PasswordDialog.cancelButtonText": "취소",
   "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "문서 보호용 비밀번호를 세팅하세요",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "확인 비밀번호가 같지 않음",
   "Common.Views.PasswordDialog.txtPassword": "암호",
+  "Common.Views.PasswordDialog.txtRepeat": "비밀번호 반복",
+  "Common.Views.PasswordDialog.txtTitle": "비밀번호 설정",
   "Common.Views.PluginDlg.textLoading": "로드 중",
   "Common.Views.Plugins.groupCaption": "플러그인",
   "Common.Views.Plugins.strPlugins": "플러그인",
   "Common.Views.Plugins.textLoading": "로드 중",
   "Common.Views.Plugins.textStart": "시작",
+  "Common.Views.Plugins.textStop": "정지",
+  "Common.Views.Protection.hintAddPwd": "비밀번호로 암호화",
+  "Common.Views.Protection.hintPwd": "비밀번호 변경 또는 삭제",
+  "Common.Views.Protection.hintSignature": "디지털 서명 또는 서명 라인을 추가 ",
+  "Common.Views.Protection.txtAddPwd": "비밀번호 추가",
   "Common.Views.Protection.txtChangePwd": "비밀번호를 변경",
+  "Common.Views.Protection.txtDeletePwd": "비밀번호 삭제",
+  "Common.Views.Protection.txtEncrypt": "암호화",
+  "Common.Views.Protection.txtInvisibleSignature": "디지털 서명을 추가",
+  "Common.Views.Protection.txtSignature": "서명",
+  "Common.Views.Protection.txtSignatureLine": "서명 라인",
   "Common.Views.RenameDialog.cancelButtonText": "취소",
   "Common.Views.RenameDialog.okButtonText": "Ok",
   "Common.Views.RenameDialog.textName": "파일 이름",
   "Common.Views.RenameDialog.txtInvalidName": "파일 이름에 다음 문자를 포함 할 수 없습니다 :",
   "Common.Views.ReviewChanges.hintNext": "다음 변경 사항",
   "Common.Views.ReviewChanges.hintPrev": "이전 변경으로",
+  "Common.Views.ReviewChanges.strFast": "빠르게",
+  "Common.Views.ReviewChanges.strFastDesc": "실시간 협력 편집. 모든 변경사항들은 자동적으로 저장됨.",
+  "Common.Views.ReviewChanges.strStrict": "엄격한",
+  "Common.Views.ReviewChanges.strStrictDesc": "귀하와 다른 사람이 변경사항을 동기화 하려면 '저장'버튼을 사용하세요.",
   "Common.Views.ReviewChanges.tipAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "협력 편집 모드 세팅",
   "Common.Views.ReviewChanges.tipHistory": "버전 표시",
   "Common.Views.ReviewChanges.tipRejectCurrent": "현재 변경 거부",
   "Common.Views.ReviewChanges.tipReview": "변경 내용 추적",
+  "Common.Views.ReviewChanges.tipReviewView": "변경사항이 표시될 모드 선택",
   "Common.Views.ReviewChanges.tipSetDocLang": "문서 언어 설정",
   "Common.Views.ReviewChanges.tipSetSpelling": "맞춤법 검사",
   "Common.Views.ReviewChanges.tipSharing": "문서 액세스 권한 관리",
   "Common.Views.ReviewChanges.txtAccept": "수락",
   "Common.Views.ReviewChanges.txtAcceptAll": "모든 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtAcceptChanges": "변경 접수",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "현재 변경 내용 적용",
+  "Common.Views.ReviewChanges.txtChat": "채팅",
   "Common.Views.ReviewChanges.txtClose": "완료",
   "Common.Views.ReviewChanges.txtCoAuthMode": "공동 편집 모드",
   "Common.Views.ReviewChanges.txtDocLang": "언어",
+  "Common.Views.ReviewChanges.txtFinal": "모든 변경 접수됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtFinalCap": "최종",
   "Common.Views.ReviewChanges.txtHistory": "버전 기록",
+  "Common.Views.ReviewChanges.txtMarkup": "모든 변경 (편집)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "마크업",
   "Common.Views.ReviewChanges.txtNext": "다음",
+  "Common.Views.ReviewChanges.txtOriginal": "모든 변경 거부됨 (미리보기)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "오리지널",
   "Common.Views.ReviewChanges.txtPrev": "이전",
   "Common.Views.ReviewChanges.txtReject": "거부",
   "Common.Views.ReviewChanges.txtRejectAll": "모든 변경 사항 거부",
+  "Common.Views.ReviewChanges.txtRejectChanges": "변경 거부",
   "Common.Views.ReviewChanges.txtRejectCurrent": "현재 변경 거부",
+  "Common.Views.ReviewChanges.txtSharing": "공유",
   "Common.Views.ReviewChanges.txtSpelling": "맞춤법 검사",
   "Common.Views.ReviewChanges.txtTurnon": "변경 내용 추적",
+  "Common.Views.ReviewChanges.txtView": "디스플레이 모드",
   "Common.Views.SignDialog.cancelButtonText": "취소",
   "Common.Views.SignDialog.okButtonText": "OK",
   "Common.Views.SignDialog.textBold": "볼드체",
+  "Common.Views.SignDialog.textCertificate": "인증",
   "Common.Views.SignDialog.textChange": "변경",
+  "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
+  "Common.Views.SignDialog.textItalic": "이탤릭",
+  "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelectImage": "이미지 선택",
+  "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
+  "Common.Views.SignDialog.textTitle": "서명문서",
+  "Common.Views.SignDialog.textUseImage": "또는 서명으로 그림을 사용하려면 '이미지 선택'을 클릭",
+  "Common.Views.SignDialog.textValid": "%1에서 %2까지 유효",
+  "Common.Views.SignDialog.tipFontName": "폰트명",
   "Common.Views.SignDialog.tipFontSize": "글꼴 크기",
   "Common.Views.SignSettingsDialog.cancelButtonText": "취소",
   "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "서명 대화창에 서명자의 코멘트 추가 허용",
+  "Common.Views.SignSettingsDialog.textInfo": "서명자 정보",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "이메일",
   "Common.Views.SignSettingsDialog.textInfoName": "이름",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
+  "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
+  "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "SSE.Controllers.DocumentHolder.alignmentText": "정렬",
   "SSE.Controllers.DocumentHolder.centerText": "Center",
@@ -237,6 +292,7 @@
   "SSE.Controllers.DocumentHolder.txtPasteValFormat": "값 + 모든 서식 지정",
   "SSE.Controllers.DocumentHolder.txtPasteValNumFormat": "값 + 숫자 형식",
   "SSE.Controllers.DocumentHolder.txtPasteValues": "값만 붙여 넣기",
+  "SSE.Controllers.DocumentHolder.txtRedoExpansion": "리두 테이블 자동확장",
   "SSE.Controllers.DocumentHolder.txtRemFractionBar": "분수 막대 제거",
   "SSE.Controllers.DocumentHolder.txtRemLimit": "제한 제거",
   "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "액센트 문자 제거",
@@ -258,6 +314,7 @@
   "SSE.Controllers.DocumentHolder.txtStretchBrackets": "스트레치 괄호",
   "SSE.Controllers.DocumentHolder.txtTop": "Top",
   "SSE.Controllers.DocumentHolder.txtUnderbar": "텍스트 아래에 바",
+  "SSE.Controllers.DocumentHolder.txtUndoExpansion": "테이블 자동확장 하지 않기",
   "SSE.Controllers.DocumentHolder.txtWidth": "너비",
   "SSE.Controllers.LeftMenu.newDocumentTitle": "이름없는 스프레드 시트",
   "SSE.Controllers.LeftMenu.textByColumns": "열 기준",
@@ -304,6 +361,7 @@
   "SSE.Controllers.Main.errorFileRequest": "외부 오류. <br> 파일 요청 오류입니다. 오류가 지속될 경우 지원 담당자에게 문의하십시오.",
   "SSE.Controllers.Main.errorFileVKey": "외부 오류. <br> 잘못된 보안 키입니다. 오류가 계속 발생하면 지원 부서에 문의하십시오.",
   "SSE.Controllers.Main.errorFillRange": "선택한 셀 범위를 채울 수 없습니다. <br> 병합 된 모든 셀이 같은 크기 여야합니다.",
+  "SSE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "SSE.Controllers.Main.errorFormulaName": "입력 한 수식에 오류가 있습니다. <br> 잘못된 수식 이름이 사용되었습니다.",
   "SSE.Controllers.Main.errorFormulaParsing": "수식을 분석하는 동안 내부 오류가 발생했습니다.",
   "SSE.Controllers.Main.errorFrmlWrongReferences": "이 함수는 존재하지 않는 시트를 참조합니다. <br> 데이터를 확인한 후 다시 시도하십시오.",
@@ -313,6 +371,7 @@
   "SSE.Controllers.Main.errorLockedAll": "다른 사용자가 시트를 잠근 상태에서 작업을 수행 할 수 없습니다.",
   "SSE.Controllers.Main.errorLockedCellPivot": "피벗 테이블에서 데이터를 변경할 수 없습니다.",
   "SSE.Controllers.Main.errorLockedWorksheetRename": "시트의 이름을 다른 사용자가 바꾸면 이름을 바꿀 수 없습니다.",
+  "SSE.Controllers.Main.errorMaxPoints": "차트당 시리즈내 포인트의 최대값은 4096임",
   "SSE.Controllers.Main.errorMoveRange": "병합 된 셀의 일부를 변경할 수 없습니다",
   "SSE.Controllers.Main.errorOpenWarning": "파일에있는 수식 중 하나의 길이가 허용 된 문자 수를 초과하여 제거되었습니다.",
   "SSE.Controllers.Main.errorOperandExpected": "입력 한 함수 구문이 올바르지 않습니다. 괄호 중 하나가 누락되어 있는지 확인하십시오 ( '('또는 ')').",
@@ -448,6 +507,7 @@
   "SSE.Controllers.Toolbar.textLongOperation": "Long operation",
   "SSE.Controllers.Toolbar.textMatrix": "Matrices",
   "SSE.Controllers.Toolbar.textOperator": "연산자",
+  "SSE.Controllers.Toolbar.textPivot": "피봇 테이블",
   "SSE.Controllers.Toolbar.textRadical": "Radicals",
   "SSE.Controllers.Toolbar.textScript": "Scripts",
   "SSE.Controllers.Toolbar.textSymbols": "Symbols",
@@ -855,6 +915,7 @@
   "SSE.Views.ChartSettings.textWidth": "너비",
   "SSE.Views.ChartSettings.textWinLossSpark": "Win / Loss",
   "SSE.Views.ChartSettingsDlg.cancelButtonText": "취소",
+  "SSE.Views.ChartSettingsDlg.errorMaxPoints": "문제발생! 차트당 시리즈내 포인트의 최대값은 4096임",
   "SSE.Views.ChartSettingsDlg.errorMaxRows": "오류! 차트 당 최대 데이터 시리즈 수는 255입니다.",
   "SSE.Views.ChartSettingsDlg.errorStockChart": "잘못된 행 순서. 주식형 차트를 작성하려면 시트의 데이터를 다음 순서로 배치하십시오 : <br> 개시 가격, 최대 가격, 최소 가격, 마감 가격.",
   "SSE.Views.ChartSettingsDlg.textAlt": "대체 텍스트",
@@ -1032,6 +1093,10 @@
   "SSE.Views.DocumentHolder.selectDataText": "열 데이터",
   "SSE.Views.DocumentHolder.selectRowText": "Row",
   "SSE.Views.DocumentHolder.selectTableText": "테이블",
+  "SSE.Views.DocumentHolder.strDelete": "서명 삭제",
+  "SSE.Views.DocumentHolder.strDetails": "서명 상세",
+  "SSE.Views.DocumentHolder.strSetup": "서명 셋업",
+  "SSE.Views.DocumentHolder.strSign": "서명",
   "SSE.Views.DocumentHolder.textArrangeBack": "배경으로 보내기",
   "SSE.Views.DocumentHolder.textArrangeBackward": "뒤로 이동",
   "SSE.Views.DocumentHolder.textArrangeForward": "앞으로 이동",
@@ -1100,6 +1165,7 @@
   "SSE.Views.FileMenu.btnHelpCaption": "Help ...",
   "SSE.Views.FileMenu.btnInfoCaption": "스프레드 시트 정보 ...",
   "SSE.Views.FileMenu.btnPrintCaption": "인쇄",
+  "SSE.Views.FileMenu.btnProtectCaption": "보호",
   "SSE.Views.FileMenu.btnRecentFilesCaption": "최근 열기 ...",
   "SSE.Views.FileMenu.btnRenameCaption": "Rename ...",
   "SSE.Views.FileMenu.btnReturnCaption": "스프레드 시트로 돌아 가기",
@@ -1150,6 +1216,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "센티미터",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Deutsch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "영어",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "스페인어",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "인치",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "표시 설명",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",
@@ -1159,7 +1226,16 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "러시아어",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows로",
   "SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "경고",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "비밀번호로",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "스프레드시트 보호",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strSignature": "서명으로",
   "SSE.Views.FileMenuPanels.ProtectDoc.txtEdit": "스프레드 시트 편집",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "편집은 스프레드시트에서 서명을 삭제할 것입니다.<br> 계속하시겠습니까?",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "이 스프레드시트는 비밀번호로 보호되었슴.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "이 스프레드시트는 서명되어야 함.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtSigned": "유효한 서명이 당 스프레드시트에 추가되었슴. 이 스프레드시트는 편집할 수 없도록 보호됨.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "스프레드시트에 몇 가지 디지털 서명이 유효하지 않거나 확인되지 않음. 스프레드시트는 편집할 수 없도록 보호됨.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtView": "서명 보기",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "일반",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "페이지 설정",
   "SSE.Views.FormatSettingsDialog.textCancel": "취소",
@@ -1340,6 +1416,59 @@
   "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "탭 위치",
   "SSE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
   "SSE.Views.ParagraphSettingsAdvanced.textTitle": "단락 - 고급 설정",
+  "SSE.Views.PivotSettings.notcriticalErrorTitle": "경고",
+  "SSE.Views.PivotSettings.textAdvanced": "고급 설정 표시",
+  "SSE.Views.PivotSettings.textCancel": "취소",
+  "SSE.Views.PivotSettings.textColumns": "컬럼",
+  "SSE.Views.PivotSettings.textFields": "필드 선택",
+  "SSE.Views.PivotSettings.textFilters": "필터",
+  "SSE.Views.PivotSettings.textOK": "확인",
+  "SSE.Views.PivotSettings.textRows": "열",
+  "SSE.Views.PivotSettings.textValues": "값",
+  "SSE.Views.PivotSettings.txtAddColumn": "컬럼에 추가",
+  "SSE.Views.PivotSettings.txtAddFilter": "필터에 추가",
+  "SSE.Views.PivotSettings.txtAddRow": "열에 추가",
+  "SSE.Views.PivotSettings.txtAddValues": "값에 추가",
+  "SSE.Views.PivotSettings.txtFieldSettings": "필드 세팅",
+  "SSE.Views.PivotSettings.txtMoveBegin": "시작점으로 이동",
+  "SSE.Views.PivotSettings.txtMoveColumn": "컬럼으로 이동",
+  "SSE.Views.PivotSettings.txtMoveDown": "아래로 이동",
+  "SSE.Views.PivotSettings.txtMoveEnd": "끝으로 이동",
+  "SSE.Views.PivotSettings.txtMoveFilter": "필터로 이동",
+  "SSE.Views.PivotSettings.txtMoveRow": "열로 이동",
+  "SSE.Views.PivotSettings.txtMoveUp": "위로 이동",
+  "SSE.Views.PivotSettings.txtMoveValues": "값으로 이동",
+  "SSE.Views.PivotSettings.txtRemove": "필드 삭제",
+  "SSE.Views.PivotTable.capBlankRows": "빈 열",
+  "SSE.Views.PivotTable.capGrandTotals": "종합 합계",
+  "SSE.Views.PivotTable.capLayout": "레이아웃 리포트",
+  "SSE.Views.PivotTable.capSubtotals": "서브 합계",
+  "SSE.Views.PivotTable.mniBottomSubtotals": "그룹 하단에 모든 서브 합계를 보여주기",
+  "SSE.Views.PivotTable.mniInsertBlankLine": "각 아이템 다음에 빈 라인을 추가하기",
+  "SSE.Views.PivotTable.mniLayoutCompact": "컴팩트 폼으로 보여주기",
+  "SSE.Views.PivotTable.mniLayoutNoRepeat": "모든 아이템 레이블을 반복하지 말 것",
+  "SSE.Views.PivotTable.mniLayoutOutline": "아웃라인 폼으로 보여주기",
+  "SSE.Views.PivotTable.mniLayoutRepeat": "모든 아이템 레이블 반복",
+  "SSE.Views.PivotTable.mniLayoutTabular": "태블러 폼으로 보여주기",
+  "SSE.Views.PivotTable.mniNoSubtotals": "서브 합계를 보여주지 말 것",
+  "SSE.Views.PivotTable.mniOffTotals": "열과 컬럼용 오프",
+  "SSE.Views.PivotTable.mniOnColumnsTotals": "컬럼만 온",
+  "SSE.Views.PivotTable.mniOnRowsTotals": "열만 온",
+  "SSE.Views.PivotTable.mniOnTotals": "열과 컬럼 온",
+  "SSE.Views.PivotTable.mniRemoveBlankLine": "각 아이템 다음에 빈 라인 삭제",
+  "SSE.Views.PivotTable.mniTopSubtotals": "그룹 상단에 모든 서브 합계 보여주기",
+  "SSE.Views.PivotTable.textColBanded": "묶임 컬럼",
+  "SSE.Views.PivotTable.textColHeader": "컬럼 헤더",
+  "SSE.Views.PivotTable.textRowBanded": "묶인 열",
+  "SSE.Views.PivotTable.textRowHeader": "열 헤더",
+  "SSE.Views.PivotTable.tipCreatePivot": "피봇 테이블 추가하기",
+  "SSE.Views.PivotTable.tipGrandTotals": "종합 합계 보이기 또는 숨기기",
+  "SSE.Views.PivotTable.tipRefresh": "데이터 소스에서 정보를 업데이트 하기",
+  "SSE.Views.PivotTable.tipSelect": "전체 피봇 테이블 선택",
+  "SSE.Views.PivotTable.tipSubtotals": "서브 합계 보이기 또는 숨기기",
+  "SSE.Views.PivotTable.txtCreate": "표 삽입",
+  "SSE.Views.PivotTable.txtRefresh": "새로고침",
+  "SSE.Views.PivotTable.txtSelect": "선택",
   "SSE.Views.PrintSettings.btnPrint": "저장 및 인쇄",
   "SSE.Views.PrintSettings.cancelButtonText": "취소",
   "SSE.Views.PrintSettings.strBottom": "Bottom",
@@ -1371,8 +1500,10 @@
   "SSE.Views.RightMenu.txtChartSettings": "차트 설정",
   "SSE.Views.RightMenu.txtImageSettings": "이미지 설정",
   "SSE.Views.RightMenu.txtParagraphSettings": "텍스트 설정",
+  "SSE.Views.RightMenu.txtPivotSettings": "피봇 테이블 세팅",
   "SSE.Views.RightMenu.txtSettings": "공통 설정",
   "SSE.Views.RightMenu.txtShapeSettings": "도형 설정",
+  "SSE.Views.RightMenu.txtSignatureSettings": "서명 세팅",
   "SSE.Views.RightMenu.txtSparklineSettings": "스파크 라인 설정",
   "SSE.Views.RightMenu.txtTableSettings": "표 설정",
   "SSE.Views.RightMenu.txtTextArtSettings": "텍스트 아트 설정",
@@ -1457,6 +1588,20 @@
   "SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "가중치 및 화살표",
   "SSE.Views.ShapeSettingsAdvanced.textWidth": "너비",
   "SSE.Views.SignatureSettings.notcriticalErrorTitle": "경고",
+  "SSE.Views.SignatureSettings.strDelete": "서명 삭제",
+  "SSE.Views.SignatureSettings.strDetails": "서명 상세",
+  "SSE.Views.SignatureSettings.strInvalid": "잘못된 서명",
+  "SSE.Views.SignatureSettings.strRequested": "요청 서명",
+  "SSE.Views.SignatureSettings.strSetup": "서명 셋업",
+  "SSE.Views.SignatureSettings.strSign": "서명",
+  "SSE.Views.SignatureSettings.strSignature": "서명",
+  "SSE.Views.SignatureSettings.strSigner": "서명자",
+  "SSE.Views.SignatureSettings.strValid": "유효 서명",
+  "SSE.Views.SignatureSettings.txtContinueEditing": "무조건 편집",
+  "SSE.Views.SignatureSettings.txtEditWarning": "편집은 스프레드시트에서 서명을 삭제할 것입니다.<br> 계속하시겠습니까?",
+  "SSE.Views.SignatureSettings.txtRequestedSignatures": "이 스프레드시트는 서명되어야 함.",
+  "SSE.Views.SignatureSettings.txtSigned": "유효한 서명이 당 스프레드시트에 추가되었슴. 이 스프레드시트는 편집할 수 없도록 보호됨.",
+  "SSE.Views.SignatureSettings.txtSignedInvalid": "스프레드시트에 몇 가지 디지털 서명이 유효하지 않거나 확인되지 않음. 스프레드시트는 편집할 수 없도록 보호됨.",
   "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(끝으로 복사)",
   "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(끝으로 이동)",
   "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "시트 이전에 복사",
@@ -1586,7 +1731,9 @@
   "SSE.Views.Toolbar.capInsertEquation": "수식",
   "SSE.Views.Toolbar.capInsertHyperlink": "하이퍼 링크",
   "SSE.Views.Toolbar.capInsertImage": "그림",
+  "SSE.Views.Toolbar.capInsertShape": "쉐이프",
   "SSE.Views.Toolbar.capInsertTable": "테이블",
+  "SSE.Views.Toolbar.capInsertText": "텍스트 박스",
   "SSE.Views.Toolbar.mniImageFromFile": "파일에서 그림",
   "SSE.Views.Toolbar.mniImageFromUrl": "URL에서 그림",
   "SSE.Views.Toolbar.textAlignBottom": "아래쪽 정렬",
@@ -1643,13 +1790,16 @@
   "SSE.Views.Toolbar.textRotateUp": "텍스트 회전",
   "SSE.Views.Toolbar.textSparks": "스파크 라인",
   "SSE.Views.Toolbar.textStock": "Stock",
+  "SSE.Views.Toolbar.textStrikeout": "줄긋기",
   "SSE.Views.Toolbar.textSubscript": "첨자",
   "SSE.Views.Toolbar.textSubSuperscript": "첨자/위에 쓴",
   "SSE.Views.Toolbar.textSuperscript": "위에 쓴",
   "SSE.Views.Toolbar.textSurface": "Surface",
+  "SSE.Views.Toolbar.textTabCollaboration": "합치기",
   "SSE.Views.Toolbar.textTabFile": "파일",
   "SSE.Views.Toolbar.textTabHome": "집",
   "SSE.Views.Toolbar.textTabInsert": "삽입",
+  "SSE.Views.Toolbar.textTabProtect": "보호",
   "SSE.Views.Toolbar.textTopBorders": "위쪽 테두리",
   "SSE.Views.Toolbar.textUnderline": "밑줄",
   "SSE.Views.Toolbar.textWinLossSpark": "Win / Loss",
@@ -1691,7 +1841,7 @@
   "SSE.Views.Toolbar.tipInsertImage": "그림 삽입",
   "SSE.Views.Toolbar.tipInsertOpt": "셀 삽입",
   "SSE.Views.Toolbar.tipInsertShape": "도형 삽입",
-  "SSE.Views.Toolbar.tipInsertText": "텍스트 삽입",
+  "SSE.Views.Toolbar.tipInsertText": "텍스트 상자 삽입",
   "SSE.Views.Toolbar.tipInsertTextart": "텍스트 아트 삽입",
   "SSE.Views.Toolbar.tipMerge": "Merge",
   "SSE.Views.Toolbar.tipNumFormat": "숫자 형식",

apps/spreadsheeteditor/main/locale/nl.json

@@ -92,25 +92,111 @@
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Dit veld is vereist",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "Dit veld moet een URL in de notatie \"http://www.voorbeeld.com\" bevatten",
   "Common.Views.OpenDialog.cancelButtonText": "Annuleren",
+  "Common.Views.OpenDialog.closeButtonText": "Bestand sluiten",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "Scheidingsteken",
   "Common.Views.OpenDialog.txtEncoding": "Versleuteling",
+  "Common.Views.OpenDialog.txtIncorrectPwd": "Wachtwoord is niet juist",
   "Common.Views.OpenDialog.txtOther": "Overige",
   "Common.Views.OpenDialog.txtPassword": "Wachtwoord",
+  "Common.Views.OpenDialog.txtPreview": "Voorbeeld",
   "Common.Views.OpenDialog.txtSpace": "Spatie",
   "Common.Views.OpenDialog.txtTab": "Tab",
   "Common.Views.OpenDialog.txtTitle": "Opties voor %1 kiezen",
   "Common.Views.OpenDialog.txtTitleProtected": "Beschermd bestand",
+  "Common.Views.PasswordDialog.cancelButtonText": "Annuleren",
+  "Common.Views.PasswordDialog.okButtonText": "OK",
+  "Common.Views.PasswordDialog.txtDescription": "Pas een wachtwoord toe om dit document te beveiligen",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "Bevestig wachtwoord is niet identiek",
+  "Common.Views.PasswordDialog.txtPassword": "Wachtwoord",
+  "Common.Views.PasswordDialog.txtRepeat": "Herhaal wachtwoord",
+  "Common.Views.PasswordDialog.txtTitle": "Wachtwoord instellen",
   "Common.Views.PluginDlg.textLoading": "Laden",
   "Common.Views.Plugins.groupCaption": "Plug-ins",
   "Common.Views.Plugins.strPlugins": "Plug-ins",
   "Common.Views.Plugins.textLoading": "Laden",
   "Common.Views.Plugins.textStart": "Starten",
   "Common.Views.Plugins.textStop": "Stoppen",
+  "Common.Views.Protection.hintAddPwd": "Versleutelen met wachtwoord",
+  "Common.Views.Protection.hintPwd": "Verander of verwijder wachtwoord",
+  "Common.Views.Protection.hintSignature": "Digitale handtekening toevoegen of handtekening lijn",
+  "Common.Views.Protection.txtAddPwd": "Wachtwoord toevoegen",
+  "Common.Views.Protection.txtChangePwd": "Verander wachtwoord",
+  "Common.Views.Protection.txtDeletePwd": "Wachtwoord verwijderen",
+  "Common.Views.Protection.txtEncrypt": "Versleutelen",
+  "Common.Views.Protection.txtInvisibleSignature": "Digitale handtekening toevoegen",
+  "Common.Views.Protection.txtSignature": "Handtekening",
+  "Common.Views.Protection.txtSignatureLine": "Handtekening lijn",
   "Common.Views.RenameDialog.cancelButtonText": "Annuleren",
   "Common.Views.RenameDialog.okButtonText": "OK",
   "Common.Views.RenameDialog.textName": "Bestandsnaam",
   "Common.Views.RenameDialog.txtInvalidName": "De bestandsnaam mag geen van de volgende tekens bevatten:",
+  "Common.Views.ReviewChanges.hintNext": "Naar volgende wijziging",
+  "Common.Views.ReviewChanges.hintPrev": "Naar vorige wijziging",
+  "Common.Views.ReviewChanges.strFast": "Snel",
+  "Common.Views.ReviewChanges.strFastDesc": "Real-time samenwerken. Alle wijzigingen worden automatisch opgeslagen.",
+  "Common.Views.ReviewChanges.strStrict": "Strikt",
+  "Common.Views.ReviewChanges.strStrictDesc": "Gebruik de 'Opslaan' knop om de wijzigingen van u en andere te synchroniseren.",
+  "Common.Views.ReviewChanges.tipAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.tipCoAuthMode": "Zet samenwerkings modus",
+  "Common.Views.ReviewChanges.tipHistory": "Toon versie geschiedenis",
+  "Common.Views.ReviewChanges.tipRejectCurrent": "Huidige wijziging afwijzen",
+  "Common.Views.ReviewChanges.tipReview": "Wijzigingen bijhouden",
+  "Common.Views.ReviewChanges.tipReviewView": "Selecteer de modus waarin u de veranderingen weer wilt laten geven",
+  "Common.Views.ReviewChanges.tipSetDocLang": "Taal van document instellen",
+  "Common.Views.ReviewChanges.tipSetSpelling": "Spellingcontrole",
+  "Common.Views.ReviewChanges.tipSharing": "Toegangsrechten documenten beheren",
+  "Common.Views.ReviewChanges.txtAccept": "Accepteren",
+  "Common.Views.ReviewChanges.txtAcceptAll": "Alle wijzigingen accepteren",
+  "Common.Views.ReviewChanges.txtAcceptChanges": "Wijzigingen Accepteren",
+  "Common.Views.ReviewChanges.txtAcceptCurrent": "Huidige wijziging accepteren",
+  "Common.Views.ReviewChanges.txtChat": "Chat",
+  "Common.Views.ReviewChanges.txtClose": "Sluiten",
+  "Common.Views.ReviewChanges.txtCoAuthMode": "Modus Gezamenlijk bewerken",
+  "Common.Views.ReviewChanges.txtDocLang": "Taal",
+  "Common.Views.ReviewChanges.txtFinal": "Alle veranderingen geaccepteerd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtFinalCap": "Einde",
+  "Common.Views.ReviewChanges.txtHistory": "Versie geschiedenis",
+  "Common.Views.ReviewChanges.txtMarkup": "Alle veranderingen (Bewerken)",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Markup",
+  "Common.Views.ReviewChanges.txtNext": "Volgende",
+  "Common.Views.ReviewChanges.txtOriginal": "Alle veranderingen afgekeurd (Voorbeeld)",
+  "Common.Views.ReviewChanges.txtOriginalCap": "Origineel",
+  "Common.Views.ReviewChanges.txtPrev": "Vorige",
+  "Common.Views.ReviewChanges.txtReject": "Afwijzen",
+  "Common.Views.ReviewChanges.txtRejectAll": "Alle wijzigingen afwijzen",
+  "Common.Views.ReviewChanges.txtRejectChanges": "Wijzigingen Afwijzen",
+  "Common.Views.ReviewChanges.txtRejectCurrent": "Huidige wijziging afwijzen",
+  "Common.Views.ReviewChanges.txtSharing": "Delen",
+  "Common.Views.ReviewChanges.txtSpelling": "Spellingcontrole",
+  "Common.Views.ReviewChanges.txtTurnon": "Wijzigingen bijhouden",
+  "Common.Views.ReviewChanges.txtView": "Weergavemodus",
+  "Common.Views.SignDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignDialog.okButtonText": "OK",
+  "Common.Views.SignDialog.textBold": "Vet",
+  "Common.Views.SignDialog.textCertificate": "Certificaat",
+  "Common.Views.SignDialog.textChange": "Wijzigen",
+  "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.textSelectImage": "Selecteer afbeelding",
+  "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
+  "Common.Views.SignDialog.textTitle": "Onderteken document",
+  "Common.Views.SignDialog.textUseImage": "of klik 'Selecteer afbeelding' om een afbeelding als handtekening te gebruiken",
+  "Common.Views.SignDialog.textValid": "Geldig van %1 tot %2",
+  "Common.Views.SignDialog.tipFontName": "Lettertype",
+  "Common.Views.SignDialog.tipFontSize": "Tekengrootte",
+  "Common.Views.SignSettingsDialog.cancelButtonText": "Annuleren",
+  "Common.Views.SignSettingsDialog.okButtonText": "OK",
+  "Common.Views.SignSettingsDialog.textAllowComment": "Sta ondertekenaar toe commentaar toe te voegen in het handtekening venster.",
+  "Common.Views.SignSettingsDialog.textInfo": "Ondertekenaar info",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
+  "Common.Views.SignSettingsDialog.textInfoName": "Naam",
+  "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.txtEmpty": "Dit veld is vereist",
   "SSE.Controllers.DocumentHolder.alignmentText": "Uitlijning",
   "SSE.Controllers.DocumentHolder.centerText": "Centreren",
   "SSE.Controllers.DocumentHolder.deleteColumnText": "Kolom verwijderen",
@@ -206,6 +292,7 @@
   "SSE.Controllers.DocumentHolder.txtPasteValFormat": "Waarde + alle opmaak",
   "SSE.Controllers.DocumentHolder.txtPasteValNumFormat": "Waarde + getalnotatie",
   "SSE.Controllers.DocumentHolder.txtPasteValues": "Alleen waarde plakken",
+  "SSE.Controllers.DocumentHolder.txtRedoExpansion": "Opnieuw toepassen tabel autouitbreiding",
   "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Deelteken verwijderen",
   "SSE.Controllers.DocumentHolder.txtRemLimit": "Limiet verwijderen",
   "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Accentteken verwijderen",
@@ -227,6 +314,7 @@
   "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Vierkante haken uitrekken",
   "SSE.Controllers.DocumentHolder.txtTop": "Boven",
   "SSE.Controllers.DocumentHolder.txtUnderbar": "Staaf onder tekst",
+  "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Tabel autouitbreiding ongedaan maken",
   "SSE.Controllers.DocumentHolder.txtWidth": "Breedte",
   "SSE.Controllers.LeftMenu.newDocumentTitle": "Spreadsheet zonder naam",
   "SSE.Controllers.LeftMenu.textByColumns": "Kolommen",
@@ -273,6 +361,7 @@
   "SSE.Controllers.Main.errorFileRequest": "Externe fout.<br>Fout in aanvraag bestand. Neem contact op met Support als deze fout zich blijft voordoen.",
   "SSE.Controllers.Main.errorFileVKey": "Externe fout.<br>Ongeldige beveiligingssleutel. Neem contact op met Support als deze fout zich blijft voordoen.",
   "SSE.Controllers.Main.errorFillRange": "Het geselecteerde celbereik kan niet worden gevuld.<br>Alle samengevoegde cellen moeten dezelfde grootte hebben.",
+  "SSE.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.",
   "SSE.Controllers.Main.errorFormulaName": "De ingevoerde formule bevat een fout.<br>Onjuiste naam gebruikt voor formule.",
   "SSE.Controllers.Main.errorFormulaParsing": "Interne fout bij ontleden van de formule.",
   "SSE.Controllers.Main.errorFrmlWrongReferences": "De functie verwijst naar een blad dat niet bestaat.<br>Controleer de gegevens en probeer het opnieuw.",
@@ -282,6 +371,7 @@
   "SSE.Controllers.Main.errorLockedAll": "De bewerking kan niet worden uitgevoerd omdat het blad is vergrendeld door een andere gebruiker.",
   "SSE.Controllers.Main.errorLockedCellPivot": "U kunt geen data veranderen in een draaitabel.",
   "SSE.Controllers.Main.errorLockedWorksheetRename": "De naam van het blad kan op dit moment niet worden gewijzigd omdat het al wordt hernoemd door een andere gebruiker",
+  "SSE.Controllers.Main.errorMaxPoints": "Het maximaal aantal punten in een serie per grafiek is 4096",
   "SSE.Controllers.Main.errorMoveRange": "Een gedeelte van een samengevoegde cel kan niet worden gewijzigd",
   "SSE.Controllers.Main.errorOpenWarning": "De lengte van een van de formules in het bestand overschrijdt<br>het toegestane aantal tekens en de formule is verwijderd.",
   "SSE.Controllers.Main.errorOperandExpected": "De syntaxis van de ingevoerde functie is niet juist. Controleer of een van de haakjes '(' of ')' ontbreekt.",
@@ -334,7 +424,7 @@
   "SSE.Controllers.Main.textContactUs": "Contact opnemen met Verkoop",
   "SSE.Controllers.Main.textLoadingDocument": "Spreadsheet wordt geladen",
   "SSE.Controllers.Main.textNo": "Nee",
-  "SSE.Controllers.Main.textNoLicenseTitle": "Open source-versie ONLYOFFICE",
+  "SSE.Controllers.Main.textNoLicenseTitle": "Only Office verbindingslimiet",
   "SSE.Controllers.Main.textPleaseWait": "De bewerking kan meer tijd dan verwacht in beslag nemen. Even geduld...",
   "SSE.Controllers.Main.textRecalcFormulas": "Formules worden berekend...",
   "SSE.Controllers.Main.textShape": "Vorm",
@@ -391,7 +481,8 @@
   "SSE.Controllers.Main.warnBrowserIE9": "Met IE9 heeft de toepassing beperkte mogelijkheden. Gebruik IE10 of hoger.",
   "SSE.Controllers.Main.warnBrowserZoom": "De huidige zoominstelling van uw browser wordt niet ondersteund. Zet de zoominstelling terug op de standaardwaarde door op Ctrl+0 te drukken.",
   "SSE.Controllers.Main.warnLicenseExp": "Uw licentie is vervallen.<br>Werk uw licentie bij en vernieuw de pagina.",
-  "SSE.Controllers.Main.warnNoLicense": "U gebruikt een Open source-versie van ONLYOFFICE. In die versie geldt voor het aantal gelijktijdige verbindingen met de documentserver een limiet van 20 verbindingen.<br>Als u er meer nodig hebt, kunt u overwegen een commerciële licentie aan te schaffen.",
+  "SSE.Controllers.Main.warnNoLicense": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
+  "SSE.Controllers.Main.warnNoLicenseUsers": "Deze versie van Only Office bevat limieten voor het aantal gelijktijdige gebruikers.<br>Indien meer nodig is, upgrade dan de huidige licentie of schaf een commerciële licentie aan.",
   "SSE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
   "SSE.Controllers.Print.strAllSheets": "Alle werkbladen",
   "SSE.Controllers.Print.textWarning": "Waarschuwing",
@@ -416,6 +507,7 @@
   "SSE.Controllers.Toolbar.textLongOperation": "Langdurige bewerking",
   "SSE.Controllers.Toolbar.textMatrix": "Matrices",
   "SSE.Controllers.Toolbar.textOperator": "Operators",
+  "SSE.Controllers.Toolbar.textPivot": "Pivot tabel",
   "SSE.Controllers.Toolbar.textRadical": "Wortels",
   "SSE.Controllers.Toolbar.textScript": "Scripts",
   "SSE.Controllers.Toolbar.textSymbols": "Symbolen",
@@ -823,6 +915,7 @@
   "SSE.Views.ChartSettings.textWidth": "Breedte",
   "SSE.Views.ChartSettings.textWinLossSpark": "Winst/verlies",
   "SSE.Views.ChartSettingsDlg.cancelButtonText": "Annuleren",
+  "SSE.Views.ChartSettingsDlg.errorMaxPoints": "Fout! Het maximaal aantal punten in een serie per grafiek is 4096",
   "SSE.Views.ChartSettingsDlg.errorMaxRows": "FOUT! Het maximumaantal gegevensreeksen per grafiek is 255",
   "SSE.Views.ChartSettingsDlg.errorStockChart": "Onjuiste volgorde rijen. Als u een aandelengrafiek wilt maken, zet u de rijen in de volgende volgorde op het blad:<br> beginkoers, hoogste koers, laagste koers, slotkoers.",
   "SSE.Views.ChartSettingsDlg.textAlt": "Alternatieve tekst",
@@ -1000,6 +1093,10 @@
   "SSE.Views.DocumentHolder.selectDataText": "Kolomgegevens",
   "SSE.Views.DocumentHolder.selectRowText": "Rij",
   "SSE.Views.DocumentHolder.selectTableText": "Tabel",
+  "SSE.Views.DocumentHolder.strDelete": "Handtekening verwijderen",
+  "SSE.Views.DocumentHolder.strDetails": "Handtekening details",
+  "SSE.Views.DocumentHolder.strSetup": "Handtekening opzet",
+  "SSE.Views.DocumentHolder.strSign": "Teken",
   "SSE.Views.DocumentHolder.textArrangeBack": "Naar achtergrond sturen",
   "SSE.Views.DocumentHolder.textArrangeBackward": "Naar Achteren Verplaatsen",
   "SSE.Views.DocumentHolder.textArrangeForward": "Naar Voren Verplaatsen",
@@ -1068,6 +1165,7 @@
   "SSE.Views.FileMenu.btnHelpCaption": "Help...",
   "SSE.Views.FileMenu.btnInfoCaption": "Spreadsheetinfo...",
   "SSE.Views.FileMenu.btnPrintCaption": "Afdrukken",
+  "SSE.Views.FileMenu.btnProtectCaption": "Beveilig",
   "SSE.Views.FileMenu.btnRecentFilesCaption": "Recente openen...",
   "SSE.Views.FileMenu.btnRenameCaption": "Hernoemen...",
   "SSE.Views.FileMenu.btnReturnCaption": "Terug naar spreadsheet",
@@ -1118,6 +1216,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centimeter",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Duits",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "Engels",
+  "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "Spaans",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Commentaarweergave",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "als OS X",
@@ -1126,6 +1225,17 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punt",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russisch",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "als Windows",
+  "SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Waarschuwing",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Met wachtwoord",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Werkblad beveiligen",
+  "SSE.Views.FileMenuPanels.ProtectDoc.strSignature": "Met handtekening",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Spreadsheet bewerken",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekening van dit werkblad word verwijderd.<br>Weet je zeker dat je door wilt gaan?",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Deze spreadsheet is beveiligd met een wachtwoord",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Deze spreadsheet moet ondertekend worden.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Geldige handtekeningen zijn toegevoegd aan het werkblad. Dit werkblad is beveiligd tegen aanpassingen.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Een of meer digitale handtekeningen in het werkblad zijn ongeldig of konden niet geverifieerd worden. Dit werkblad is beveiligd tegen aanpassingen.",
+  "SSE.Views.FileMenuPanels.ProtectDoc.txtView": "Toon handtekeningen",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Algemeen",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Pagina-instellingen",
   "SSE.Views.FormatSettingsDialog.textCancel": "Annuleren",
@@ -1148,6 +1258,7 @@
   "SSE.Views.FormatSettingsDialog.txtDate": "Datum",
   "SSE.Views.FormatSettingsDialog.txtFraction": "Breuk",
   "SSE.Views.FormatSettingsDialog.txtGeneral": "Algemeen",
+  "SSE.Views.FormatSettingsDialog.txtNone": "Geen",
   "SSE.Views.FormatSettingsDialog.txtNumber": "Getal",
   "SSE.Views.FormatSettingsDialog.txtPercentage": "Percentage",
   "SSE.Views.FormatSettingsDialog.txtSample": "Voorbeeld:",
@@ -1206,6 +1317,7 @@
   "SSE.Views.LeftMenu.tipSearch": "Zoeken",
   "SSE.Views.LeftMenu.tipSupport": "Feedback en Support",
   "SSE.Views.LeftMenu.txtDeveloper": "ONTWIKKELAARSMODUS",
+  "SSE.Views.LeftMenu.txtTrial": "TEST MODUS",
   "SSE.Views.MainSettingsPrint.okButtonText": "Opslaan",
   "SSE.Views.MainSettingsPrint.strBottom": "Onder",
   "SSE.Views.MainSettingsPrint.strLandscape": "Liggend",
@@ -1304,6 +1416,59 @@
   "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tabpositie",
   "SSE.Views.ParagraphSettingsAdvanced.textTabRight": "Rechts",
   "SSE.Views.ParagraphSettingsAdvanced.textTitle": "Alinea - Geavanceerde instellingen",
+  "SSE.Views.PivotSettings.notcriticalErrorTitle": "Waarschuwing",
+  "SSE.Views.PivotSettings.textAdvanced": "Geavanceerde Instellingen Tonen",
+  "SSE.Views.PivotSettings.textCancel": "Annuleren",
+  "SSE.Views.PivotSettings.textColumns": "Kolommen",
+  "SSE.Views.PivotSettings.textFields": "Selecteer velden",
+  "SSE.Views.PivotSettings.textFilters": "Filters",
+  "SSE.Views.PivotSettings.textOK": "OK",
+  "SSE.Views.PivotSettings.textRows": "Rijen",
+  "SSE.Views.PivotSettings.textValues": "Waarden",
+  "SSE.Views.PivotSettings.txtAddColumn": "Toevoegen aan kolommen",
+  "SSE.Views.PivotSettings.txtAddFilter": "Toevoegen aan filters",
+  "SSE.Views.PivotSettings.txtAddRow": "Toevoegen aan rijen",
+  "SSE.Views.PivotSettings.txtAddValues": "Toevoegen aan waarden",
+  "SSE.Views.PivotSettings.txtFieldSettings": "Veld instellingen",
+  "SSE.Views.PivotSettings.txtMoveBegin": "Naar het begin",
+  "SSE.Views.PivotSettings.txtMoveColumn": "Naar kolommen",
+  "SSE.Views.PivotSettings.txtMoveDown": "Naar beneden",
+  "SSE.Views.PivotSettings.txtMoveEnd": "Naar het einde",
+  "SSE.Views.PivotSettings.txtMoveFilter": "Naar filters",
+  "SSE.Views.PivotSettings.txtMoveRow": "Naar rijen",
+  "SSE.Views.PivotSettings.txtMoveUp": "Naar boven",
+  "SSE.Views.PivotSettings.txtMoveValues": "Naar waarden",
+  "SSE.Views.PivotSettings.txtRemove": "Veld verwijderen",
+  "SSE.Views.PivotTable.capBlankRows": "Lege rijen",
+  "SSE.Views.PivotTable.capGrandTotals": "Grote totalen",
+  "SSE.Views.PivotTable.capLayout": "Raporteer layout",
+  "SSE.Views.PivotTable.capSubtotals": "Subtotalen",
+  "SSE.Views.PivotTable.mniBottomSubtotals": "Toon alle subtotalen onder elke groep",
+  "SSE.Views.PivotTable.mniInsertBlankLine": "Lege rij invoegen na elk item",
+  "SSE.Views.PivotTable.mniLayoutCompact": "Toon in compacte vorm",
+  "SSE.Views.PivotTable.mniLayoutNoRepeat": "Herhaal niet alle item labels",
+  "SSE.Views.PivotTable.mniLayoutOutline": "Toon in schets vorm",
+  "SSE.Views.PivotTable.mniLayoutRepeat": "Herhaal alle item labels",
+  "SSE.Views.PivotTable.mniLayoutTabular": "Toon in tabel vorm",
+  "SSE.Views.PivotTable.mniNoSubtotals": "Toon geen subtotalen",
+  "SSE.Views.PivotTable.mniOffTotals": "Uit voor rijen en kolommen",
+  "SSE.Views.PivotTable.mniOnColumnsTotals": "Aan voor alleen kolommen",
+  "SSE.Views.PivotTable.mniOnRowsTotals": "Aan voor alleen rijen",
+  "SSE.Views.PivotTable.mniOnTotals": "Aan voor rijen en kolommen",
+  "SSE.Views.PivotTable.mniRemoveBlankLine": "Verwijder lege regel na elk item",
+  "SSE.Views.PivotTable.mniTopSubtotals": "Toon alle subtotalen boven elke groep",
+  "SSE.Views.PivotTable.textColBanded": "Gestreepte kolommen",
+  "SSE.Views.PivotTable.textColHeader": "Kolomkoppen",
+  "SSE.Views.PivotTable.textRowBanded": "Gestreepte rijen",
+  "SSE.Views.PivotTable.textRowHeader": "Rij koppen",
+  "SSE.Views.PivotTable.tipCreatePivot": "Pivot tabel invoegen",
+  "SSE.Views.PivotTable.tipGrandTotals": "Toon of verberg grote totalen",
+  "SSE.Views.PivotTable.tipRefresh": "Informatie van de data bron uitbreiden",
+  "SSE.Views.PivotTable.tipSelect": "Selecteer hele pivot tabel",
+  "SSE.Views.PivotTable.tipSubtotals": "Toon of verberg subtotalen",
+  "SSE.Views.PivotTable.txtCreate": "Tabel invoegen",
+  "SSE.Views.PivotTable.txtRefresh": "Verversen",
+  "SSE.Views.PivotTable.txtSelect": "Selecteer",
   "SSE.Views.PrintSettings.btnPrint": "Opslaan en afdrukken",
   "SSE.Views.PrintSettings.cancelButtonText": "Annuleren",
   "SSE.Views.PrintSettings.strBottom": "Onder",
@@ -1335,8 +1500,10 @@
   "SSE.Views.RightMenu.txtChartSettings": "Grafiekinstellingen",
   "SSE.Views.RightMenu.txtImageSettings": "Afbeeldingsinstellingen",
   "SSE.Views.RightMenu.txtParagraphSettings": "Tekstinstellingen",
+  "SSE.Views.RightMenu.txtPivotSettings": "Pivot table instellingen",
   "SSE.Views.RightMenu.txtSettings": "Algemene instellingen",
   "SSE.Views.RightMenu.txtShapeSettings": "Vorminstellingen",
+  "SSE.Views.RightMenu.txtSignatureSettings": "Handtekening instellingen",
   "SSE.Views.RightMenu.txtSparklineSettings": "Instellingen sparkline",
   "SSE.Views.RightMenu.txtTableSettings": "Tabelinstellingen",
   "SSE.Views.RightMenu.txtTextArtSettings": "TextArt-instellingen",
@@ -1420,6 +1587,21 @@
   "SSE.Views.ShapeSettingsAdvanced.textTop": "Boven",
   "SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Gewichten & pijlen",
   "SSE.Views.ShapeSettingsAdvanced.textWidth": "Breedte",
+  "SSE.Views.SignatureSettings.notcriticalErrorTitle": "Waarschuwing",
+  "SSE.Views.SignatureSettings.strDelete": "Handtekening verwijderen",
+  "SSE.Views.SignatureSettings.strDetails": "Handtekening details",
+  "SSE.Views.SignatureSettings.strInvalid": "Ongeldige handtekeningen",
+  "SSE.Views.SignatureSettings.strRequested": "Gevraagde handtekeningen",
+  "SSE.Views.SignatureSettings.strSetup": "Handtekening opzet",
+  "SSE.Views.SignatureSettings.strSign": "Onderteken",
+  "SSE.Views.SignatureSettings.strSignature": "Handtekening",
+  "SSE.Views.SignatureSettings.strSigner": "Ondertekenaar",
+  "SSE.Views.SignatureSettings.strValid": "Geldige handtekeningen",
+  "SSE.Views.SignatureSettings.txtContinueEditing": "Hoe dan ook bewerken",
+  "SSE.Views.SignatureSettings.txtEditWarning": "Aanpassingen zorgen ervoor dat de handtekening van dit werkblad word verwijderd.<br>Weet je zeker dat je door wilt gaan?",
+  "SSE.Views.SignatureSettings.txtRequestedSignatures": "Deze spreadsheet moet ondertekend worden.",
+  "SSE.Views.SignatureSettings.txtSigned": "Geldige handtekeningen zijn toegevoegd aan het werkblad. Dit werkblad is beveiligd tegen aanpassingen.",
+  "SSE.Views.SignatureSettings.txtSignedInvalid": "Een of meer digitale handtekeningen in het werkblad zijn ongeldig of konden niet geverifieerd worden. Dit werkblad is beveiligd tegen aanpassingen.",
   "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Kopiëren naar einde)",
   "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Verplaatsen naar einde)",
   "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Kopiëren vóór blad",
@@ -1608,10 +1790,16 @@
   "SSE.Views.Toolbar.textRotateUp": "Tekst omhoog draaien",
   "SSE.Views.Toolbar.textSparks": "Sparklines",
   "SSE.Views.Toolbar.textStock": "Voorraad",
+  "SSE.Views.Toolbar.textStrikeout": "Doorhalen",
+  "SSE.Views.Toolbar.textSubscript": "Subscript",
+  "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript",
+  "SSE.Views.Toolbar.textSuperscript": "Superscript",
   "SSE.Views.Toolbar.textSurface": "Oppervlak",
+  "SSE.Views.Toolbar.textTabCollaboration": "Samenwerking",
   "SSE.Views.Toolbar.textTabFile": "Bestand",
   "SSE.Views.Toolbar.textTabHome": "Home",
   "SSE.Views.Toolbar.textTabInsert": "Invoegen",
+  "SSE.Views.Toolbar.textTabProtect": "Beveiliging",
   "SSE.Views.Toolbar.textTopBorders": "Bovenranden",
   "SSE.Views.Toolbar.textUnderline": "Onderstrepen",
   "SSE.Views.Toolbar.textWinLossSpark": "Winst/verlies",
@@ -1628,6 +1816,7 @@
   "SSE.Views.Toolbar.tipBack": "Terug",
   "SSE.Views.Toolbar.tipBorders": "Randen",
   "SSE.Views.Toolbar.tipCellStyle": "Celstijl",
+  "SSE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen",
   "SSE.Views.Toolbar.tipClearStyle": "Wissen",
   "SSE.Views.Toolbar.tipColorSchemas": "Kleurenschema wijzigen",
   "SSE.Views.Toolbar.tipCopy": "Kopiëren",
@@ -1652,7 +1841,7 @@
   "SSE.Views.Toolbar.tipInsertImage": "Afbeelding invoegen",
   "SSE.Views.Toolbar.tipInsertOpt": "Cellen invoegen",
   "SSE.Views.Toolbar.tipInsertShape": "AutoVorm invoegen",
-  "SSE.Views.Toolbar.tipInsertText": "Tekst invoegen",
+  "SSE.Views.Toolbar.tipInsertText": "Tekstvak invoegen",
   "SSE.Views.Toolbar.tipInsertTextart": "Tekst Art Invoegen",
   "SSE.Views.Toolbar.tipMerge": "Samenvoegen",
   "SSE.Views.Toolbar.tipNumFormat": "Getalnotatie",