v5.1.4

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

@@ -71,7 +71,7 @@ define([
 
         function onClickDocument(e) {
             if ( this.isFolded ) {
-                if ( $(e.target).parents('.toolbar').length ){
+                if ( $(e.target).parents('.toolbar, #file-menu-panel').length ){
                 } else {
                     this.collapse();
                 }

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

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

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

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

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

@@ -87,7 +87,7 @@ define([
             if (api) {
                 this.api = api;
 
-                if (this.appConfig.isDesktopApp && this.appConfig.isOffline) {
+                if (this.appConfig.isProtectSupport && this.appConfig.isDesktopApp && this.appConfig.isOffline) {
                     this.api.asc_registerCallback('asc_onDocumentPassword',  _.bind(this.onDocumentPassword, this));
                     if (this.appConfig.canProtect) {
                         Common.NotificationCenter.on('protect:sign',            _.bind(this.onSignatureRequest, this));

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

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

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

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

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

@@ -152,11 +152,11 @@ define([
                     },
 
                     getTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text : undefined;
                     },
                     setFocusToTextBox: function (blur) {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         if (blur) {
                             text.blur();
                         } else {
@@ -169,16 +169,15 @@ define([
                         }
                     },
                     getActiveTextBoxVal: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text.val().trim() : '';
                     },
                     autoHeightTextBox: function () {
                         var view = this,
                             textBox = this.$el.find('textarea'),
                             domTextBox = null,
-                            $domTextBox = null,
-                            lineHeight = 0,
                             minHeight = 50,
+                            lineHeight = 0,
                             scrollPos = 0,
                             oldHeight = 0,
                             newHeight = 0;
@@ -187,17 +186,17 @@ define([
                             scrollPos = $(view.scroller.el).scrollTop();
 
                             if (domTextBox.scrollHeight > domTextBox.clientHeight) {
-                                $domTextBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
+                                textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
 
                                 parentView.calculateSizeOfContent();
                             } else {
                                 oldHeight = domTextBox.clientHeight;
                                 if (oldHeight >= minHeight) {
-                                    $domTextBox.css({height: minHeight + 'px'});
+                                    textBox.css({height: minHeight + 'px'});
 
                                     if (domTextBox.scrollHeight > domTextBox.clientHeight) {
                                         newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight);
-                                        $domTextBox.css({height: newHeight + 'px'});
+                                        textBox.css({height: newHeight + 'px'});
                                     }
 
                                     parentView.calculateSizeOfContent();
@@ -210,23 +209,17 @@ define([
                             view.autoScrollToEditButtons();
                         }
 
-                        this.textBox = undefined;
                         if (textBox && textBox.length) {
-                            textBox.each(function(idx, item){
+                            domTextBox = textBox.get(0);
-                                if (item) {
+
-                                    domTextBox = item;
+                            if (domTextBox) {
-                                    $domTextBox = $(item);
+                                lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
-                                    var isEdited = !$domTextBox.hasClass('user-message');
+                                updateTextBoxHeight();
-                                    lineHeight = isEdited ? parseInt($domTextBox.css('lineHeight'), 10) * 0.25 : 0;
+                                textBox.bind('input propertychange', updateTextBoxHeight)
-                                    minHeight = isEdited ? 50 : 24;
+                            }
-                                    updateTextBoxHeight();
-                                    if (isEdited) {
-                                        $domTextBox.bind('input propertychange', updateTextBoxHeight);
-                                        view.textBox = $domTextBox;
-                                    }
-                                }
-                            });
                         }
+
+                        this.textBox = textBox;
                     },
                     clearTextBoxBind: function () {
                         if (this.textBox) {
@@ -383,7 +376,6 @@ define([
                                 t.fireEvent('comment:closeEditing');
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('user-reply')) {
                                 t.fireEvent('comment:closeEditing');
@@ -408,7 +400,6 @@ define([
                                     t.fireEvent('comment:closeEditing');
 
                                     readdresolves();
-                                    this.autoHeightTextBox();
                                 }
                             } else if (btn.hasClass('btn-close', false)) {
                                 t.fireEvent('comment:closeEditing', [commentId]);
@@ -416,7 +407,6 @@ define([
                                 t.fireEvent('comment:show', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-inner-edit', false)) {
 
@@ -447,7 +437,6 @@ define([
                                 }
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-inner-close', false)) {
                                 if (record.get('dummy')) {
@@ -459,8 +448,11 @@ define([
                                     me.saveText();
                                     record.set('hideAddReply', false);
                                     this.getTextBox().val(me.textVal);
+                                    this.autoHeightTextBox();
                                 } else {
+
                                     this.clearTextBoxBind();
+
                                     t.fireEvent('comment:closeEditing', [commentId]);
                                 }
 
@@ -471,7 +463,6 @@ define([
                                 me.calculateSizeOfContent();
 
                                 readdresolves();
-                                this.autoHeightTextBox();
 
                             } else if (btn.hasClass('btn-resolve', false)) {
                                 var tip = btn.data('bs.tooltip');
@@ -480,7 +471,6 @@ define([
                                 t.fireEvent('comment:resolve', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
                             } else if (btn.hasClass('btn-resolve-check', false)) {
                                 var tip = btn.data('bs.tooltip');
                                 if (tip) tip.dontShow = true;
@@ -488,21 +478,20 @@ define([
                                 t.fireEvent('comment:resolve', [commentId]);
 
                                 readdresolves();
-                                this.autoHeightTextBox();
                             }
                         }
                     });
                     me.on({
                         'show': function () {
-                            me.$window.find('textarea:not(.user-message)').keydown(function (event) {
+                            me.commentsView.autoHeightTextBox();
+                            me.$window.find('textarea').keydown(function (event) {
                                 if (event.keyCode == Common.UI.Keys.ESC) {
                                     me.hide();
                                 }
                             });
                         },
                         'animate:before': function () {
-                            me.commentsView.autoHeightTextBox();
+                            var text = me.$window.find('textarea');
-                            var text = me.$window.find('textarea:not(.user-message)');
                             if (text && text.length)
                                 text.focus();
                         }
@@ -910,11 +899,11 @@ define([
                     },
 
                     getTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text : undefined;
                     },
                     setFocusToTextBox: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         if (text && text.length) {
                             var val = text.val();
                             text.focus();
@@ -923,7 +912,7 @@ define([
                         }
                     },
                     getActiveTextBoxVal: function () {
-                        var text = $(this.el).find('textarea:not(.user-message)');
+                        var text = $(this.el).find('textarea');
                         return (text && text.length) ? text.val().trim() : '';
                     },
                     autoHeightTextBox: function () {

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

@@ -55,10 +55,11 @@ define([
 
             _.extend(_options,  {
                 closable        : false,
-                width           : (options.preview) ? 414 : 262,
-                height          : (options.preview) ? 291 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 205 : 155),
-                header          : true,
                 preview         : options.preview,
+                warning         : options.warning,
+                width           : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM && options.warning) ? 370 : 262),
+                height          : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : (options.warning ? 187 : 147)),
+                header          : true,
                 cls             : 'open-dlg',
                 contentTemplate : '',
                 title           : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT'),
@@ -70,8 +71,19 @@ define([
                 '<div class="box" style="height:' + (_options.height - 85) + 'px;">',
                     '<div class="content-panel" >',
                     '<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>',
-                        '<label class="header">' + t.txtPassword + '</label>',
+                        '<% if (warning) { %>',
-                        '<div id="id-password-txt" style="margin-bottom:15px;"></div>',
+                        '<div>',
+                            '<div class="icon img-commonctrl warn"/>',
+                            '<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
+                                '<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
+                                '<div id="id-password-txt" style="width: 240px;"></div></div>',
+                        '</div>',
+                        '<% } else { %>',
+                        '<div>',
+                            '<label class="header">' + t.txtPassword + '</label>',
+                            '<div id="id-password-txt"></div>',
+                        '</div>',
+                        '<% } %>',
                     '<% } else { %>',
                         '<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">',
                             '<label class="header">' + t.txtEncoding + '</label>',
@@ -105,11 +117,10 @@ define([
                     '<% } %>',
                     '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
                 '<div class="footer center">',
-                    '<button class="btn normal dlg-btn primary" result="ok" style="margin-right:10px;">' + t.okButtonText + '</button>',
+                    '<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
                     '<% if (closable) { %>',
-                    '<button class="btn normal dlg-btn" result="cancel">' + t.closeButtonText + '</button>',
+                    '<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
                     '<% } %>',
                 '</div>'
             ].join('');
@@ -117,6 +128,7 @@ define([
             this.handler        =   _options.handler;
             this.type           =   _options.type;
             this.preview        =   _options.preview;
+            this.warning        =   _options.warning || false;
             this.closable       =   _options.closable;
             this.codepages      =   _options.codepages;
             this.settings       =   _options.settings;
@@ -527,7 +539,8 @@ define([
         txtPreview: 'Preview',
         txtComma: 'Comma',
         txtColon: 'Colon',
-        txtSemicolon: 'Semicolon'
+        txtSemicolon: 'Semicolon',
+        txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset.'
 
     }, Common.Views.OpenDialog || {}));
 });

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

@@ -65,7 +65,7 @@ define([
         function setEvents() {
             var me = this;
 
-            if ( me.appConfig.isDesktopApp && me.appConfig.isOffline ) {
+            if ( me.appConfig.isProtectSupport && me.appConfig.isDesktopApp && me.appConfig.isOffline ) {
                 this.btnsAddPwd.concat(this.btnsChangePwd).forEach(function(button) {
                     button.on('click', function (b, e) {
                         me.fireEvent('protect:password', [b, 'add']);
@@ -116,7 +116,7 @@ define([
                 var filter = Common.localStorage.getKeysFilter();
                 this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
 
-                if ( this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
+                if ( this.appConfig.isProtectSupport && this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
                     this.btnAddPwd = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'btn-ic-protect',
@@ -159,7 +159,7 @@ define([
                 (new Promise(function (accept, reject) {
                     accept();
                 })).then(function(){
-                    if ( config.isDesktopApp && config.isOffline) {
+                    if ( config.isProtectSupport && config.isDesktopApp && config.isOffline) {
                         me.btnAddPwd.updateHint(me.hintAddPwd);
                         me.btnPwd.updateHint(me.hintPwd);
 
@@ -206,7 +206,7 @@ define([
             getPanel: function () {
                 this.$el = $(_.template(template)( {} ));
 
-                if ( this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
+                if ( this.appConfig.isProtectSupport && this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
                     this.btnAddPwd.render(this.$el.find('#slot-btn-add-password'));
                     this.btnPwd.render(this.$el.find('#slot-btn-change-password'));
                     this.btnSignature && this.btnSignature.render(this.$el.find('#slot-btn-signature'));
@@ -308,7 +308,7 @@ define([
             txtDeletePwd: 'Delete password',
             txtAddPwd: 'Add password',
             txtInvisibleSignature: 'Add digital signature',
-            txtSignatureLine: 'Signature line'
+            txtSignatureLine: 'Add Signature line'
         }
     }()), Common.Views.Protection || {}));
 });

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -242,13 +242,13 @@
     position: absolute;
     bottom: 0;
     width: 100%;
-    z-index: 102;
+    z-index: @zindex-navbar + 3;
 }
 
 .toolbar {
     &.cover {
         ul {
-            z-index: 102;
+            z-index: @zindex-navbar + 4;
         }
     }
 }

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

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

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

@@ -321,19 +321,19 @@ define([
                 this.api.asc_SetFastCollaborative(fast_coauth);
 
                 value = Common.localStorage.getItem((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict");
+                Common.Utils.InternalSettings.set((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", value);
                 switch(value) {
                 case 'all': value = Asc.c_oAscCollaborativeMarksShowType.All; break;
                 case 'none': value = Asc.c_oAscCollaborativeMarksShowType.None; break;
                 case 'last': value = Asc.c_oAscCollaborativeMarksShowType.LastChanges; break;
                 default: value = (fast_coauth) ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges;
                 }
-                Common.Utils.InternalSettings.set((fast_coauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", value);
                 this.api.SetCollaborativeMarksShowType(value);
             }
 
             value = Common.localStorage.getBool("de-settings-livecomment", true);
             Common.Utils.InternalSettings.set("de-settings-livecomment", value);
-            var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+            var resolved = Common.localStorage.getBool("de-settings-resolvedcomment");
             Common.Utils.InternalSettings.set("de-settings-resolvedcomment", resolved);
             if (this.mode.canComments && this.leftMenu.panelComments.isVisible())
                 value = resolved = true;

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

@@ -163,6 +163,7 @@ define([
                 });
 
                 if (this.api){
+                    this.api.SetDrawingFreeze(true);
                     switch (value) {
                         case '0': this.api.SetFontRenderingMode(3); break;
                         case '1': this.api.SetFontRenderingMode(1); break;
@@ -625,7 +626,7 @@ define([
                 if (this.api && !toolbarView._state.previewmode) {
                     var cansave = this.api.asc_isDocumentCanSave(),
                         forcesave = this.appOptions.forcesave,
-                        isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.$icon.hasClass('btn-synch') : false,
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
                 }
@@ -815,7 +816,7 @@ define([
                 /** coauthoring begin **/
                 this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true);
                 Common.Utils.InternalSettings.set("de-settings-livecomment", this.isLiveCommenting);
-                value = Common.localStorage.getBool("de-settings-resolvedcomment", true);
+                value = Common.localStorage.getBool("de-settings-resolvedcomment");
                 Common.Utils.InternalSettings.set("de-settings-resolvedcomment", value);
                 this.isLiveCommenting ? this.api.asc_showComments(value) : this.api.asc_hideComments();
                 /** coauthoring end **/
@@ -1088,7 +1089,8 @@ define([
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
                 this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
                 this.appOptions.trialMode      = params.asc_getLicenseMode();
-                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
+                this.appOptions.isProtectSupport = false; // remove in 5.2
+                this.appOptions.canProtect     = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
 
                 if ( this.appOptions.isLightVersion ) {
                     this.appOptions.canUseHistory =
@@ -1179,7 +1181,7 @@ define([
 
                     reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
 
-                    if (this.appOptions.isDesktopApp && this.appOptions.isOffline)
+                    if (this.appOptions.isProtectSupport && this.appOptions.isDesktopApp && this.appOptions.isOffline)
                         application.getController('Common.Controllers.Protection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
 
                     var viewport = this.getApplication().getController('Viewport').getView('Viewport');
@@ -1518,7 +1520,7 @@ define([
                 var toolbarView = this.getApplication().getController('Toolbar').getView();
 
                 if (toolbarView && !toolbarView._state.previewmode) {
-                    var isSyncButton = toolbarView.btnSave.$icon.hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1534,7 +1536,7 @@ define([
                 var toolbarView = this.getApplication().getController('Toolbar').getView();
 
                 if (toolbarView && this.api && !toolbarView._state.previewmode) {
-                    var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1589,6 +1591,8 @@ define([
 
                 Common.NotificationCenter.trigger('layout:changed', 'main');
                 $('#loading-mask').hide().remove();
+
+                Common.Controllers.Desktop.process('preloader:hide');
             },
 
             onDownloadUrl: function(url) {
@@ -1854,6 +1858,7 @@ define([
                     me._state.openDlg = new Common.Views.OpenDialog({
                         closable: me.appOptions.canRequestClose,
                         type: type,
+                        warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
                         validatePwd: !!me._state.isDRM,
                         handler: function (result, value) {
                             me.isShowOpenDialog = false;
@@ -2143,7 +2148,7 @@ define([
             errorKeyExpire: 'Key descriptor expired',
             errorUsersExceed: 'Count of users was exceed',
             errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.',
-            errorFilePassProtect: 'The document is password protected.',
+            errorFilePassProtect: 'The file is password protected and cannot be opened.',
             txtBasicShapes: 'Basic Shapes',
             txtFiguredArrows: 'Figured Arrows',
             txtMath: 'Math',

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

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

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

@@ -1837,11 +1837,12 @@ define([
             menu.items[3].setDisabled(isAllDefailtNotModifaed);
             menu.items[4].setDisabled(isAllCustomDeleted);
 
-            var top = e.clientY*Common.Utils.zoom();
+            var parentOffset = this.toolbar.$el.offset(),
+                top = e.clientY*Common.Utils.zoom();
             if ($('#header-container').is(":visible")) {
                 top -= $('#header-container').height()
             }
-            showPoint = [e.clientX*Common.Utils.zoom(), top];
+            showPoint = [e.clientX*Common.Utils.zoom(), top - parentOffset.top];
 
             if (record != undefined) {
                 //itemMenu
@@ -2717,7 +2718,7 @@ define([
                     me.toolbar.btnPaste.$el.detach().appendTo($box);
                     me.toolbar.btnCopy.$el.removeClass('split');
 
-                    if ( config.isOffline ) {
+                    if ( config.isProtectSupport && config.isOffline ) {
                         tab = {action: 'protect', caption: me.toolbar.textTabProtect};
                         $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
 

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

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

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

@@ -243,7 +243,7 @@ define([
         applyMode: function() {
             this.miPrint[this.mode.canPrint?'show':'hide']();
             this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
-            this.miProtect[(this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) ?'show':'hide']();
+            this.miProtect[(this.mode.isProtectSupport && this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) ?'show':'hide']();
             this.miProtect.$el.find('+.devider')[!this.mode.isDisconnected?'show':'hide']();
             this.miRecent[this.mode.canOpenRecent?'show':'hide']();
             this.miNew[this.mode.canCreateNew?'show':'hide']();
@@ -280,7 +280,7 @@ define([
                 }
             }
 
-            if (this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) {
+            if (this.mode.isProtectSupport && this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) {
 //                this.$el.find('#fm-btn-back').hide();
                 this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render();
                 this.panels['protect'].setMode(this.mode);

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

@@ -1115,7 +1115,7 @@ define([
                 '<div id="fms-btn-add-pwd" style="width:190px;"></div>',
                 '<table id="id-fms-view-pwd" cols="2" width="300">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@@ -1139,7 +1139,7 @@ define([
             this.templateSignature = _.template([
                 '<table cols="2" width="300" class="<% if (!hasRequested && !hasSigned) { %>hidden<% } %>"">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

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

@@ -2052,6 +2052,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
+                    extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
                     target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {

apps/documenteditor/main/locale/de.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Datei herunterladen",
   "Common.Views.Header.tipGoEdit": "Aktuelle Datei bearbeiten",
   "Common.Views.Header.tipPrint": "Datei drucken",
+  "Common.Views.Header.tipRedo": "Wiederholen",
+  "Common.Views.Header.tipSave": "Speichern",
+  "Common.Views.Header.tipUndo": "Rückgängig machen",
   "Common.Views.Header.tipViewSettings": "Ansichts-Einstellungen",
   "Common.Views.Header.tipViewUsers": "Benutzer ansehen und Zugriffsrechte für das Dokument verwalten",
   "Common.Views.Header.txtAccessRights": "Zugriffsrechte ändern",
@@ -189,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
   "Common.Views.OpenDialog.txtPassword": "Kennwort",
   "Common.Views.OpenDialog.txtPreview": "Vorschau",
+  "Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.",
   "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
   "Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei",
   "Common.Views.PasswordDialog.cancelButtonText": "Abbrechen",
@@ -275,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Name des Signaturgebers eingeben",
   "Common.Views.SignDialog.textItalic": "Kursiv",
   "Common.Views.SignDialog.textPurpose": "Zweck der Signierung dieses Dokuments",
+  "Common.Views.SignDialog.textSelect": "Wählen",
   "Common.Views.SignDialog.textSelectImage": "Bild auswählen",
   "Common.Views.SignDialog.textSignature": "Wie sieht Signatur aus:",
   "Common.Views.SignDialog.textTitle": "Dokument signieren",
@@ -1287,6 +1292,7 @@
   "DE.Views.LeftMenu.tipAbout": "Über das Produkt",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Kommentare",
+  "DE.Views.LeftMenu.tipNavigation": "Navigation",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Suchen",
   "DE.Views.LeftMenu.tipSupport": "Feedback und Support",

apps/documenteditor/main/locale/en.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Download file",
   "Common.Views.Header.tipGoEdit": "Edit current file",
   "Common.Views.Header.tipPrint": "Print file",
+  "Common.Views.Header.tipRedo": "Redo",
+  "Common.Views.Header.tipSave": "Save",
+  "Common.Views.Header.tipUndo": "Undo",
   "Common.Views.Header.tipViewSettings": "View settings",
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
@@ -189,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
   "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtPreview": "Preview",
+  "Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
   "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
@@ -275,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Input signer name",
   "Common.Views.SignDialog.textItalic": "Italic",
   "Common.Views.SignDialog.textPurpose": "Purpose for signing this document",
+  "Common.Views.SignDialog.textSelect": "Select",
   "Common.Views.SignDialog.textSelectImage": "Select Image",
   "Common.Views.SignDialog.textSignature": "Signature looks as",
   "Common.Views.SignDialog.textTitle": "Sign Document",
@@ -291,7 +296,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer",
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
-  "Common.Views.SignSettingsDialog.textTitle": "Signature Settings",
+  "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
@@ -321,7 +326,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
@@ -1287,6 +1292,7 @@
   "DE.Views.LeftMenu.tipAbout": "About",
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comments",
+  "DE.Views.LeftMenu.tipNavigation": "Navigation",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Search",
   "DE.Views.LeftMenu.tipSupport": "Feedback & Support",

apps/documenteditor/main/locale/es.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Descargar archivo",
   "Common.Views.Header.tipGoEdit": "Editar archivo actual",
   "Common.Views.Header.tipPrint": "Imprimir archivo",
+  "Common.Views.Header.tipRedo": "Rehacer",
+  "Common.Views.Header.tipSave": "Guardar",
+  "Common.Views.Header.tipUndo": "Deshacer",
   "Common.Views.Header.tipViewSettings": "Mostrar ajustes",
   "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento",
   "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso",
@@ -275,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Ingresar nombre de quien firma",
   "Common.Views.SignDialog.textItalic": "Itálica",
   "Common.Views.SignDialog.textPurpose": "Propósito al firmar este documento",
+  "Common.Views.SignDialog.textSelect": "Seleccionar",
   "Common.Views.SignDialog.textSelectImage": "Seleccionar Imagen",
   "Common.Views.SignDialog.textSignature": "La firma se ve como",
   "Common.Views.SignDialog.textTitle": "Firmar documento",
@@ -291,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Título de quien firma",
   "Common.Views.SignSettingsDialog.textInstructions": "Instrucciones para quien firma",
   "Common.Views.SignSettingsDialog.textShowDate": "Presentar fecha de la firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Configuración de firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Preparación de la firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "DE.Controllers.LeftMenu.leavePageText": "Todos los cambios no guardados de este documento se perderán.<br> Pulse \"Cancelar\" después \"Guardar\" para guardarlos. Pulse \"OK\" para deshacer todos los cambios no guardados.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento sin título",
@@ -320,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
   "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "El documento está protegido por una contraseña y no puede ser abierto.",
+  "DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.Controllers.Main.errorForceSave": "Ha ocurrido un error mientras",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",

apps/documenteditor/main/locale/fr.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Télécharger le fichier",
   "Common.Views.Header.tipGoEdit": "Modifier le fichier courant",
   "Common.Views.Header.tipPrint": "Imprimer le fichier",
+  "Common.Views.Header.tipRedo": "Rétablir",
+  "Common.Views.Header.tipSave": "Enregistrer",
+  "Common.Views.Header.tipUndo": "Annuler",
   "Common.Views.Header.tipViewSettings": "Paramètres d'affichage",
   "Common.Views.Header.tipViewUsers": "Afficher les utilisateurs et gérer les droits d'accès aux documents",
   "Common.Views.Header.txtAccessRights": "Modifier les droits d'accès",
@@ -275,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Nom du signataire d'entrée",
   "Common.Views.SignDialog.textItalic": "Italique",
   "Common.Views.SignDialog.textPurpose": "But de la signature du document",
+  "Common.Views.SignDialog.textSelect": "Sélectionner",
   "Common.Views.SignDialog.textSelectImage": "Sélectionner une image",
   "Common.Views.SignDialog.textSignature": "La signature ressemble à",
   "Common.Views.SignDialog.textTitle": "Signer le document",
@@ -291,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titre du signataire",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions pour les signataires",
   "Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
-  "Common.Views.SignSettingsDialog.textTitle": "Paramètre de signature",
+  "Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
   "Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire.",
   "DE.Controllers.LeftMenu.leavePageText": "Toutes les modifications non enregistrées dans ce document seront perdus.<br> Cliquez sur \"Annuler\", puis \"Enregistrer\" pour les sauver. Cliquez sur \"OK\" pour annuler toutes les modifications non enregistrées.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Document sans nom",
@@ -320,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Le document est protégé par le mot de passe et ne peut être ouvert.",
+  "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
   "DE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "DE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
@@ -1183,12 +1187,14 @@
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragment du texte sélectionné",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Afficher",
   "DE.Views.HyperlinkSettingsDialog.textExternal": "Lien externe",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Endroit dans le document",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Paramètres du lien hypertexte",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Texte de l'info-bulle ",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Lien vers",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Début du document",
   "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Signets",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire",
+  "DE.Views.HyperlinkSettingsDialog.txtHeadings": "En-têtes",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.ImageSettings.textEdit": "Modifier",
@@ -1359,6 +1365,7 @@
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Fusion a échoué",
   "DE.Views.Navigation.txtCollapse": "Réduire tout",
   "DE.Views.Navigation.txtDemote": "Dégrader",
+  "DE.Views.Navigation.txtEmpty": "Ce document ne contient pas d'en-têtes",
   "DE.Views.Navigation.txtEmptyItem": "En-tête vide",
   "DE.Views.Navigation.txtExpand": "Développer tout",
   "DE.Views.Navigation.txtHeadingAfter": "Nouvel en-tête après",

apps/documenteditor/main/locale/it.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Scarica file",
   "Common.Views.Header.tipGoEdit": "Modifica il file corrente",
   "Common.Views.Header.tipPrint": "Stampa file",
+  "Common.Views.Header.tipRedo": "Ripristina",
+  "Common.Views.Header.tipSave": "Salva",
+  "Common.Views.Header.tipUndo": "Annulla",
   "Common.Views.Header.tipViewSettings": "Mostra impostazioni",
   "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento",
   "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso",
@@ -275,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Inserisci nome firmatario",
   "Common.Views.SignDialog.textItalic": "Corsivo",
   "Common.Views.SignDialog.textPurpose": "Motivo della firma del documento",
+  "Common.Views.SignDialog.textSelect": "Seleziona",
   "Common.Views.SignDialog.textSelectImage": "Seleziona Immagine",
   "Common.Views.SignDialog.textSignature": "La firma appare come",
   "Common.Views.SignDialog.textTitle": "Firma Documento",
@@ -291,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titolo del Firmatario",
   "Common.Views.SignSettingsDialog.textInstructions": "Istruzioni per i Firmatari",
   "Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni della Firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
   "DE.Controllers.LeftMenu.leavePageText": "Tutte le modifiche non salvate nel documento verranno perse.<br> Clicca \"Annulla\" e poi \"Salva\" per salvarle. Clicca \"OK\" per annullare tutte le modifiche non salvate.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome",
@@ -320,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Il documento è protetto da una password. Impossibile aprirlo.",
+  "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.Controllers.Main.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",

apps/documenteditor/main/locale/ja.json

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

apps/documenteditor/main/locale/ko.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "파일을 다운로드",
   "Common.Views.Header.tipGoEdit": "현재 파일 편집",
   "Common.Views.Header.tipPrint": "파일 출력",
+  "Common.Views.Header.tipRedo": "다시 실행",
+  "Common.Views.Header.tipSave": "저장",
+  "Common.Views.Header.tipUndo": "실행 취소",
   "Common.Views.Header.tipViewSettings": "보기 설정",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
@@ -275,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
   "Common.Views.SignDialog.textItalic": "이탈릭",
   "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelect": "선택",
   "Common.Views.SignDialog.textSelectImage": "이미지 선택",
   "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
   "Common.Views.SignDialog.textTitle": "서명문서",
@@ -291,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
   "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
   "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
-  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 셋업",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "DE.Controllers.LeftMenu.leavePageText": "이 문서의 모든 저장되지 않은 변경 사항이 손실됩니다. <br>취소 를 클릭 한 다음저장 \"을 클릭하여 저장하십시오. 저장되지 않은 변경 사항. ",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
@@ -320,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "외부 오류. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.",
   "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
-  "DE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "DE.Controllers.Main.errorFilePassProtect": "문서가 암호로 보호되어 있습니다.",
   "DE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "DE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "DE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",

apps/documenteditor/main/locale/lv.json

@@ -153,6 +153,9 @@
   "Common.Views.Header.tipDownload": "Lejupielādēt failu",
   "Common.Views.Header.tipGoEdit": "Rediģēt šībrīža failu",
   "Common.Views.Header.tipPrint": "Drukāt failu",
+  "Common.Views.Header.tipRedo": "Pārtaisīt",
+  "Common.Views.Header.tipSave": "Saglabāt",
+  "Common.Views.Header.tipUndo": "Atsaukt",
   "Common.Views.Header.tipViewUsers": "Apskatīt lietotājus un pārvaldīt dokumentu piekļuves tiesības",
   "Common.Views.Header.txtAccessRights": "Izmainīt pieejas tiesības",
   "Common.Views.Header.txtRename": "Pārdēvēt",
@@ -272,6 +275,7 @@
   "Common.Views.SignDialog.textInputName": "Ievadiet parakstītāja vārdu",
   "Common.Views.SignDialog.textItalic": "Kursīvs",
   "Common.Views.SignDialog.textPurpose": "Šī dokumenta parakstīšanas mērķis",
+  "Common.Views.SignDialog.textSelect": "Izvēlēties",
   "Common.Views.SignDialog.textSelectImage": "Izvēlēties attēlu",
   "Common.Views.SignDialog.textSignature": "Kā izskatās paraksts",
   "Common.Views.SignDialog.textTitle": "Parakstīt dokumentu",
@@ -288,7 +292,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Parakstītāja amats",
   "Common.Views.SignSettingsDialog.textInstructions": "Norādījumi parakstītājam",
   "Common.Views.SignSettingsDialog.textShowDate": "Rādīt datumu paraksta līnijā",
-  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādījumi",
+  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādīšana",
   "Common.Views.SignSettingsDialog.txtEmpty": "Šis lauks ir jāaizpilda",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Dokuments bez nosaukuma",
@@ -317,7 +321,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "DE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "DE.Controllers.Main.errorFilePassProtect": "Fails ir aizsargāts ar paroli un to nevar atvērt.",
   "DE.Controllers.Main.errorForceSave": "Faila noglabāšanas laikā radās kļūda. Lūdzu, izmantojiet iespēju \"Lejupielādēt kā\", lai noglabātu failu datora cietajā diskā, vai mēģiniet vēlāk vēlreiz.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",

apps/documenteditor/main/locale/nl.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Bestand downloaden",
   "Common.Views.Header.tipGoEdit": "Huidig bestand bewerken",
   "Common.Views.Header.tipPrint": "Bestand afdrukken",
+  "Common.Views.Header.tipRedo": "Opnieuw",
+  "Common.Views.Header.tipSave": "Opslaan",
+  "Common.Views.Header.tipUndo": "Ongedaan maken",
   "Common.Views.Header.tipViewSettings": "Weergave-instellingen",
   "Common.Views.Header.tipViewUsers": "Gebruikers weergeven en toegangsrechten voor documenten beheren",
   "Common.Views.Header.txtAccessRights": "Toegangsrechten wijzigen",
@@ -275,6 +278,7 @@
   "Common.Views.SignDialog.textInputName": "Naam ondertekenaar invoeren",
   "Common.Views.SignDialog.textItalic": "Cursief",
   "Common.Views.SignDialog.textPurpose": "Doel voor het ondertekenen van dit document",
+  "Common.Views.SignDialog.textSelect": "Selecteren",
   "Common.Views.SignDialog.textSelectImage": "Selecteer afbeelding",
   "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
   "Common.Views.SignDialog.textTitle": "Onderteken document",
@@ -291,7 +295,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Ondertekenaar titel",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructies voor ondertekenaar",
   "Common.Views.SignSettingsDialog.textShowDate": "Toon signeer datum in handtekening regel",
-  "Common.Views.SignSettingsDialog.textTitle": "Handtekening instellingen",
+  "Common.Views.SignSettingsDialog.textTitle": "Handtekening opzet",
   "Common.Views.SignSettingsDialog.txtEmpty": "Dit veld is vereist",
   "DE.Controllers.LeftMenu.leavePageText": "Alle niet-opgeslagen wijzigingen in dit document zullen verloren gaan.<br/> Klik op \"Annuleren\" en dan op \"Opslaan\" om de wijzigingen op te slaan. Klik \"OK\" om de wijzigingen te negeren.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Naamloos document",
@@ -320,7 +324,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Het document is beschermd met een wachtwoord en kan niet worden geopend.",
+  "DE.Controllers.Main.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.",
   "DE.Controllers.Main.errorForceSave": "Er is een fout ontstaan bij het opslaan van het bestand. Gebruik de 'Download als' knop om het bestand op te slaan op uw computer of probeer het later nog eens.",
   "DE.Controllers.Main.errorKeyEncrypt": "Onbekende sleuteldescriptor",
   "DE.Controllers.Main.errorKeyExpire": "Sleuteldescriptor vervallen",

apps/documenteditor/main/locale/pl.json

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

apps/documenteditor/main/locale/pt.json

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

apps/documenteditor/main/locale/ru.json

@@ -155,6 +155,9 @@
   "Common.Views.Header.tipDownload": "Скачать файл",
   "Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
   "Common.Views.Header.tipPrint": "Напечатать файл",
+  "Common.Views.Header.tipRedo": "Повторить",
+  "Common.Views.Header.tipSave": "Сохранить",
+  "Common.Views.Header.tipUndo": "Отменить",
   "Common.Views.Header.tipViewSettings": "Параметры представления",
   "Common.Views.Header.tipViewUsers": "Просмотр пользователей и управление правами доступа к документу",
   "Common.Views.Header.txtAccessRights": "Изменить права доступа",
@@ -189,6 +192,7 @@
   "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.",
   "Common.Views.OpenDialog.txtPassword": "Пароль",
   "Common.Views.OpenDialog.txtPreview": "Просмотр",
+  "Common.Views.OpenDialog.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен.",
   "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл",
   "Common.Views.PasswordDialog.cancelButtonText": "Отмена",
@@ -275,6 +279,7 @@
   "Common.Views.SignDialog.textInputName": "Введите имя подписывающего",
   "Common.Views.SignDialog.textItalic": "Курсив",
   "Common.Views.SignDialog.textPurpose": "Цель подписания документа",
+  "Common.Views.SignDialog.textSelect": "Выбрать",
   "Common.Views.SignDialog.textSelectImage": "Выбрать изображение",
   "Common.Views.SignDialog.textSignature": "Как выглядит подпись:",
   "Common.Views.SignDialog.textTitle": "Подписание документа",
@@ -321,7 +326,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем и не может быть открыт.",
+  "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
@@ -1287,6 +1292,7 @@
   "DE.Views.LeftMenu.tipAbout": "О программе",
   "DE.Views.LeftMenu.tipChat": "Чат",
   "DE.Views.LeftMenu.tipComments": "Комментарии",
+  "DE.Views.LeftMenu.tipNavigation": "Навигация",
   "DE.Views.LeftMenu.tipPlugins": "Плагины",
   "DE.Views.LeftMenu.tipSearch": "Поиск",
   "DE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка",

apps/documenteditor/main/locale/sl.json

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

apps/documenteditor/main/locale/tr.json

@@ -1547,14 +1547,8 @@
   "DE.Views.Toolbar.textColumnsRight": "Right",
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
-  "DE.Views.Toolbar.textCompactView": "Kompakt Aletçantasını göster",
   "DE.Views.Toolbar.textContPage": "Devam Eden Sayfa",
   "DE.Views.Toolbar.textEvenPage": "Çift Sayfa",
-  "DE.Views.Toolbar.textFitPage": "Sayfaya Sığdır",
-  "DE.Views.Toolbar.textFitWidth": "Genişliğe Sığdır",
-  "DE.Views.Toolbar.textHideLines": "Cetvelleri Gizle",
-  "DE.Views.Toolbar.textHideStatusBar": "Durum Çubuğunu Gizle",
-  "DE.Views.Toolbar.textHideTitleBar": "Başlık Çubuğunu Gizle",
   "DE.Views.Toolbar.textInMargin": "Kenar boşluğunda",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
   "DE.Views.Toolbar.textInsertPageCount": "Sayfa sayısı ekle",
@@ -1602,8 +1596,6 @@
   "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona",
   "DE.Views.Toolbar.textTop": "Top: ",
   "DE.Views.Toolbar.textUnderline": "Altı çizili",
-  "DE.Views.Toolbar.textZoom": "Zum",
-  "DE.Views.Toolbar.tipAdvSettings": "Gelişmiş Ayarlar",
   "DE.Views.Toolbar.tipAlignCenter": "Ortaya Hizala",
   "DE.Views.Toolbar.tipAlignJust": "İki yana yaslı",
   "DE.Views.Toolbar.tipAlignLeft": "Sola Hizala",
@@ -1658,7 +1650,6 @@
   "DE.Views.Toolbar.tipShowHiddenChars": "Basılmaz Karakterler",
   "DE.Views.Toolbar.tipSynchronize": "Döküman başka bir kullanıcı tarafından değiştirildi. Lütfen değişikleri kaydetmek için tıklayın ve güncellemeleri yenileyin.",
   "DE.Views.Toolbar.tipUndo": "Geri Al",
-  "DE.Views.Toolbar.tipViewSettings": "Ayarları Göster",
   "DE.Views.Toolbar.txtScheme1": "Ofis",
   "DE.Views.Toolbar.txtScheme10": "Medyan",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/uk.json

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

apps/documenteditor/main/locale/vi.json

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

apps/documenteditor/main/locale/zh.json

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

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

@@ -373,7 +373,7 @@
 }
 
 #panel-protect {
-  label, span {
+  label {
     font-size: 12px;
   }
 

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

@@ -30,11 +30,11 @@
     position: absolute;
     top: 32px;
     left: 48px;
-    right: 45px;
+    right: 0;
     bottom: 0;
     opacity: 0;
     background-color: @gray-light;
-    z-index: @zindex-tooltip + 1;
+    /* z-index: @zindex-tooltip + 1; */
 }
 
 .toolbar-group-mask {
@@ -128,8 +128,9 @@
 
 // menu zoom
 .menu-zoom {
+    line-height: @line-height-base;
     .title {
-        padding: 5px 0 5px 20px;
+        padding: 5px 5px 5px 20px;
         float: left;
         //max-width: 95px;
         overflow: hidden;

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

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

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

@@ -163,7 +163,7 @@ define([
             },
 
             activateControls: function() {
-                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
             },
 
             activateViewControls: function() {

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

@@ -93,7 +93,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
-                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
+                $('#toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').addClass('disabled');
 
                 return me;
             },

apps/documenteditor/mobile/locale/de.json

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

apps/documenteditor/mobile/locale/en.json

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

apps/documenteditor/mobile/locale/es.json

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

apps/documenteditor/mobile/locale/fr.json

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

apps/documenteditor/mobile/locale/it.json

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

apps/documenteditor/mobile/locale/ko.json

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

apps/documenteditor/mobile/locale/lv.json

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

apps/documenteditor/mobile/locale/nl.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support.",
   "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik",
   "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Het document is beschermd met een wachtwoord.",
+  "DE.Controllers.Main.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.",
   "DE.Controllers.Main.errorKeyEncrypt": "Onbekende sleuteldescriptor",
   "DE.Controllers.Main.errorKeyExpire": "Sleuteldescriptor vervallen",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Laden mislukt",

apps/documenteditor/mobile/locale/ru.json

@@ -58,7 +58,7 @@
   "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
   "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
-  "DE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем.",
+  "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Сбой при загрузке",
@@ -121,6 +121,7 @@
   "DE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
   "DE.Controllers.Main.txtFooter": "Нижний колонтитул",
   "DE.Controllers.Main.txtHeader": "Верхний колонтитул",
+  "DE.Controllers.Main.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен",
   "DE.Controllers.Main.txtSeries": "Ряд",
   "DE.Controllers.Main.txtStyle_footnote_text": "Текст сноски",
   "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1",

apps/documenteditor/mobile/locale/sk.json

@@ -119,7 +119,10 @@
   "DE.Controllers.Main.txtArt": "Váš text tu",
   "DE.Controllers.Main.txtDiagramTitle": "Názov grafu",
   "DE.Controllers.Main.txtEditingMode": "Nastaviť režim úprav ...",
+  "DE.Controllers.Main.txtFooter": "Päta stránky",
+  "DE.Controllers.Main.txtHeader": "Hlavička",
   "DE.Controllers.Main.txtSeries": "Rady",
+  "DE.Controllers.Main.txtStyle_footnote_text": "Text poznámky pod čiarou",
   "DE.Controllers.Main.txtStyle_Heading_1": "Nadpis 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Nadpis 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "Nadpis 3",
@@ -147,6 +150,7 @@
   "DE.Controllers.Main.uploadImageTitleText": "Nahrávanie obrázku",
   "DE.Controllers.Main.warnLicenseExp": "Vaša licencia vypršala.<br>Prosím, aktualizujte si svoju licenciu a obnovte stránku.",
   "DE.Controllers.Main.warnNoLicense": "Táto verzia aplikácie ONLYOFFICE Editors má určité obmedzenia pre súbežné pripojenia k dokumentovému serveru. <br> Ak potrebujete viac, zvážte aktualizáciu aktuálnej licencie alebo zakúpenie komerčnej.",
+  "DE.Controllers.Main.warnNoLicenseUsers": "Táto verzia ONLYOFFICE Editors má určité obmedzenia pre spolupracujúcich používateľov. <br> Ak potrebujete viac, zvážte aktualizáciu vašej aktuálnej licencie alebo kúpu komerčnej.",
   "DE.Controllers.Main.warnProcessRightsChange": "Bolo vám zamietnuté právo upravovať súbor.",
   "DE.Controllers.Search.textNoTextFound": "Text nebol nájdený",
   "DE.Controllers.Search.textReplaceAll": "Nahradiť všetko",

apps/documenteditor/mobile/resources/css/app-material.css

@@ -5664,11 +5664,11 @@ a.item-link,
 }
 .settings.popup .popover-view,
 .settings.popover .popover-view {
-  border-radius: 3px;
+  border-radius: 2px;
 }
 .settings.popup .popover-view > .pages,
 .settings.popover .popover-view > .pages {
-  border-radius: 3px;
+  border-radius: 2px;
 }
 .settings .categories {
   width: 100%;

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

@@ -426,7 +426,7 @@ define([
                 if (this.api && this.api.asc_isDocumentCanSave) {
                     var cansave = this.api.asc_isDocumentCanSave(),
                         forcesave = this.appOptions.forcesave,
-                        isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                        isSyncButton = (toolbarView.btnCollabChanges.rendered) ? toolbarView.btnCollabChanges.$icon.hasClass('btn-synch') : false,
                         isDisabled = !cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
                 }
@@ -852,7 +852,8 @@ define([
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
                 this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
                 this.appOptions.trialMode      = params.asc_getLicenseMode();
-                this.appOptions.canProtect     = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
+                this.appOptions.isProtectSupport = false; // remove in 5.2
+                this.appOptions.canProtect     = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
 
                 this.appOptions.canBranding  = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
                 if (this.appOptions.canBranding)
@@ -928,7 +929,7 @@ define([
 
                     reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
 
-                    if (me.appOptions.isDesktopApp && me.appOptions.isOffline)
+                    if (me.appOptions.isProtectSupport && me.appOptions.isDesktopApp && me.appOptions.isOffline)
                         application.getController('Common.Controllers.Protection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
 
                     var viewport = this.getApplication().getController('Viewport').getView('Viewport');
@@ -1268,7 +1269,7 @@ define([
 
                 var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar');
                 if (toolbarView) {
-                    var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1277,7 +1278,7 @@ define([
             onDocumentCanSaveChanged: function (isCanSave) {
                 var toolbarView = this.getApplication().getController('Toolbar').getView('Toolbar');
                 if ( toolbarView ) {
-                    var isSyncButton = $('.icon', toolbarView.btnSave.cmpEl).hasClass('btn-synch'),
+                    var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
                         forcesave = this.appOptions.forcesave,
                         isDisabled = !isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
                         toolbarView.btnSave.setDisabled(isDisabled);
@@ -1332,6 +1333,8 @@ define([
 
                 Common.NotificationCenter.trigger('layout:changed', 'main');
                 $('#loading-mask').hide().remove();
+
+                Common.Controllers.Desktop.process('preloader:hide');
             },
 
             onDownloadUrl: function(url) {
@@ -1709,6 +1712,7 @@ define([
                     me._state.openDlg = new Common.Views.OpenDialog({
                         closable: me.appOptions.canRequestClose,
                         type: type,
+                        warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
                         validatePwd: !!me._state.isDRM,
                         handler: function (result, value) {
                             me.isShowOpenDialog = false;
@@ -1944,7 +1948,7 @@ define([
             errorUsersExceed: 'Count of users was exceed',
             txtEditingMode: 'Set editing mode...',
             errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.',
-            errorFilePassProtect: 'The document is password protected.',
+            errorFilePassProtect: 'The file is password protected and cannot be opened.',
             textAnonymous: 'Anonymous',
             txtNeedSynchronize: 'You have an updates',
             applyChangesTitleText: 'Loading Data',

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

@@ -2009,7 +2009,7 @@ define([
                     me.toolbar.btnPaste.$el.detach().appendTo($box);
                     me.toolbar.btnCopy.$el.removeClass('split');
 
-                    if ( config.isOffline ) {
+                    if ( config.isProtectSupport && config.isOffline ) {
                         tab = {action: 'protect', caption: me.toolbar.textTabProtect};
                         $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
                         if ($panel)

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

@@ -1,5 +1,5 @@
 <div class="layout-region">
-    <div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%; z-index: 1;"></div>
+    <div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%;"></div>
     <section class="layout-ct">
         <div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div>
     </section>

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

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

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

@@ -238,7 +238,7 @@ define([
         applyMode: function() {
             this.miPrint[this.mode.canPrint?'show':'hide']();
             this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
-            this.miProtect[(this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) ?'show':'hide']();
+            this.miProtect[(this.mode.isProtectSupport && this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) ?'show':'hide']();
             this.miProtect.$el.find('+.devider')[!this.mode.isDisconnected?'show':'hide']();
             this.miRecent[this.mode.canOpenRecent?'show':'hide']();
             this.miNew[this.mode.canCreateNew?'show':'hide']();
@@ -275,7 +275,7 @@ define([
                 }
             }
 
-            if (this.mode.isDesktopApp && this.mode.isOffline) {
+            if (this.mode.isProtectSupport && this.mode.isDesktopApp && this.mode.isOffline) {
                 this.$el.find('#fm-btn-create, #fm-btn-back, #fm-btn-create+.devider').hide();
                 if (this.mode.isEdit) {
                     this.panels['protect'] = (new PE.Views.FileMenuPanels.ProtectDoc({menu:this})).render();

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

@@ -880,7 +880,7 @@ define([
                 '<div id="fms-btn-add-pwd" style="width:190px;"></div>',
                 '<table id="id-fms-view-pwd" cols="2" width="300">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= scope.txtEncrypted %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= scope.txtEncrypted %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><div id="fms-btn-change-pwd" style="width:190px;"></div></td>',
@@ -904,7 +904,7 @@ define([
             this.templateSignature = _.template([
                 '<table cols="2" width="300" class="<% if (!hasSigned) { %>hidden<% } %>"">',
                     '<tr>',
-                        '<td colspan="2"><span style="cursor: default;"><%= tipText %></span></td>',
+                        '<td colspan="2"><label style="cursor: default;"><%= tipText %></label></td>',
                     '</tr>',
                     '<tr>',
                         '<td><label class="link signature-view-link">' + me.txtView + '</label></td>',

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

@@ -109,6 +109,8 @@ define([
                 me.shapeControls = [];
                 me.slideOnlyControls = [];
                 me.synchTooltip = undefined;
+                me.needShowSynchTip = false;
+
                 me.schemeNames = [
                     me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5,
                     me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10,
@@ -1254,7 +1256,6 @@ define([
 
                 /** coauthoring begin **/
                 this.showSynchTip = !Common.localStorage.getBool('pe-hide-synch');
-                this.needShowSynchTip = false;
 
                 if (this.needShowSynchTip) {
                     this.needShowSynchTip = false;
@@ -1404,6 +1405,7 @@ define([
 
             createSynchTip: function () {
                 this.synchTooltip = new Common.UI.SynchronizeTip({
+                    extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
                     target: this.btnCollabChanges.$el
                 });
                 this.synchTooltip.on('dontshowclick', function () {

apps/presentationeditor/main/locale/de.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Datei herunterladen",
   "Common.Views.Header.tipGoEdit": "Aktuelle Datei bearbeiten",
   "Common.Views.Header.tipPrint": "Datei drucken",
+  "Common.Views.Header.tipRedo": "Wiederholen",
+  "Common.Views.Header.tipSave": "Speichern",
+  "Common.Views.Header.tipUndo": "Rückgängig machen",
   "Common.Views.Header.tipViewSettings": "Ansichts-Einstellungen",
   "Common.Views.Header.tipViewUsers": "Benutzer ansehen und Zugriffsrechte für das Dokument verwalten",
   "Common.Views.Header.txtAccessRights": "Zugriffsrechte ändern",
@@ -121,6 +124,7 @@
   "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
   "Common.Views.OpenDialog.txtPassword": "Kennwort",
+  "Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.",
   "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
   "Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei",
   "Common.Views.PasswordDialog.cancelButtonText": "Abbrechen",
@@ -198,6 +202,7 @@
   "Common.Views.SignDialog.textInputName": "Name des Signaturgebers eingeben",
   "Common.Views.SignDialog.textItalic": "Kursiv",
   "Common.Views.SignDialog.textPurpose": "Zweck der Signierung dieses Dokuments",
+  "Common.Views.SignDialog.textSelect": "Wählen",
   "Common.Views.SignDialog.textSelectImage": "Bild auswählen",
   "Common.Views.SignDialog.textSignature": "Wie sieht Signatur aus:",
   "Common.Views.SignDialog.textTitle": "Dokument signieren",

apps/presentationeditor/main/locale/en.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Download file",
   "Common.Views.Header.tipGoEdit": "Edit current file",
   "Common.Views.Header.tipPrint": "Print file",
+  "Common.Views.Header.tipRedo": "Redo",
+  "Common.Views.Header.tipSave": "Save",
+  "Common.Views.Header.tipUndo": "Undo",
   "Common.Views.Header.tipViewSettings": "View settings",
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
@@ -121,6 +124,7 @@
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
   "Common.Views.OpenDialog.txtPassword": "Password",
+  "Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
   "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
@@ -198,6 +202,7 @@
   "Common.Views.SignDialog.textInputName": "Input signer name",
   "Common.Views.SignDialog.textItalic": "Italic",
   "Common.Views.SignDialog.textPurpose": "Purpose for signing this document",
+  "Common.Views.SignDialog.textSelect": "Select",
   "Common.Views.SignDialog.textSelectImage": "Select Image",
   "Common.Views.SignDialog.textSignature": "Signature looks as",
   "Common.Views.SignDialog.textTitle": "Sign Document",
@@ -214,7 +219,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Signer Title",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions for Signer",
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
-  "Common.Views.SignSettingsDialog.textTitle": "Signature Settings",
+  "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
@@ -235,7 +240,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "PE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
   "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",

apps/presentationeditor/main/locale/es.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Descargar archivo",
   "Common.Views.Header.tipGoEdit": "Editar el archivo actual",
   "Common.Views.Header.tipPrint": "Imprimir archivo",
+  "Common.Views.Header.tipRedo": "Rehacer",
+  "Common.Views.Header.tipSave": "Guardar",
+  "Common.Views.Header.tipUndo": "Deshacer",
   "Common.Views.Header.tipViewSettings": "Mostrar ajustes",
   "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento",
   "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso",
@@ -198,6 +201,7 @@
   "Common.Views.SignDialog.textInputName": "Ingresar nombre de quien firma",
   "Common.Views.SignDialog.textItalic": "Cursiva",
   "Common.Views.SignDialog.textPurpose": "Propósito al firmar este documento",
+  "Common.Views.SignDialog.textSelect": "Seleccionar",
   "Common.Views.SignDialog.textSelectImage": "Seleccionar Imagen",
   "Common.Views.SignDialog.textSignature": "La firma se ve como",
   "Common.Views.SignDialog.textTitle": "Firmar documento",
@@ -214,7 +218,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Título de quien firma",
   "Common.Views.SignSettingsDialog.textInstructions": "Instrucciones para quien firma",
   "Common.Views.SignSettingsDialog.textShowDate": "Presentar fecha de la firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Configuración de firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Preparación de la firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentación sin nombre",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Solicitando derechos de edición...",
@@ -235,7 +239,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
   "PE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
   "PE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "El documento está protegido por una contraseña y no puede ser abierto.",
+  "PE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "PE.Controllers.Main.errorForceSave": "Ha ocurrido un error mientras guardaba el archivo. Por favor use la opción \"Descargar\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
   "PE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido",
   "PE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado",

apps/presentationeditor/main/locale/fr.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Télécharger le fichier",
   "Common.Views.Header.tipGoEdit": "Modifier le fichier courant",
   "Common.Views.Header.tipPrint": "Imprimer le fichier",
+  "Common.Views.Header.tipRedo": "Rétablir",
+  "Common.Views.Header.tipSave": "Enregistrer",
+  "Common.Views.Header.tipUndo": "Annuler",
   "Common.Views.Header.tipViewSettings": "Paramètres d'affichage",
   "Common.Views.Header.tipViewUsers": "Afficher les utilisateurs et gérer les droits d'accès aux documents",
   "Common.Views.Header.txtAccessRights": "Modifier les droits d'accès",
@@ -198,6 +201,7 @@
   "Common.Views.SignDialog.textInputName": "Nom du signataire d'entrée",
   "Common.Views.SignDialog.textItalic": "Italique",
   "Common.Views.SignDialog.textPurpose": "But de la signature du document",
+  "Common.Views.SignDialog.textSelect": "Sélectionner",
   "Common.Views.SignDialog.textSelectImage": "Sélectionner une image",
   "Common.Views.SignDialog.textSignature": "La signature ressemble à",
   "Common.Views.SignDialog.textTitle": "Signer le document",
@@ -214,7 +218,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titre du signataire",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions pour les signataires",
   "Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
-  "Common.Views.SignSettingsDialog.textTitle": "Paramètre de signature",
+  "Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
   "Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Présentation sans nom",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Demande des droits de modification...",
@@ -235,7 +239,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
   "PE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
   "PE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Le document est protégé par le mot de passe et ne peut être ouvert.",
+  "PE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
   "PE.Controllers.Main.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
   "PE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
   "PE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré",
@@ -360,6 +364,7 @@
   "PE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
   "PE.Controllers.Main.txtTheme_blank": "Vide",
   "PE.Controllers.Main.txtTheme_classic": "Classique",
+  "PE.Controllers.Main.txtTheme_corner": "Angulaire",
   "PE.Controllers.Main.txtTheme_green": "Vert",
   "PE.Controllers.Main.txtTheme_lines": "Lignes",
   "PE.Controllers.Main.txtTheme_office": "Bureau",

apps/presentationeditor/main/locale/it.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Scarica file",
   "Common.Views.Header.tipGoEdit": "Modifica il file corrente",
   "Common.Views.Header.tipPrint": "Stampa file",
+  "Common.Views.Header.tipRedo": "Ripristina",
+  "Common.Views.Header.tipSave": "Salva",
+  "Common.Views.Header.tipUndo": "Annulla",
   "Common.Views.Header.tipViewSettings": "Mostra impostazioni",
   "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento",
   "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso",
@@ -198,6 +201,7 @@
   "Common.Views.SignDialog.textInputName": "Inserisci nome firmatario",
   "Common.Views.SignDialog.textItalic": "Corsivo",
   "Common.Views.SignDialog.textPurpose": "Motivo della firma del documento",
+  "Common.Views.SignDialog.textSelect": "Seleziona",
   "Common.Views.SignDialog.textSelectImage": "Seleziona Immagine",
   "Common.Views.SignDialog.textSignature": "La firma appare come",
   "Common.Views.SignDialog.textTitle": "Firma Documento",
@@ -214,7 +218,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titolo del Firmatario",
   "Common.Views.SignSettingsDialog.textInstructions": "Istruzioni per i Firmatari",
   "Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni della Firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentazione senza nome",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Richiesta di autorizzazione di modifica...",
@@ -235,7 +239,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
   "PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Il documento è protetto da una password. Impossibile aprirlo.",
+  "PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "PE.Controllers.Main.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
   "PE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "PE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",

apps/presentationeditor/main/locale/ja.json

@@ -378,7 +378,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "ここでヒントを挿入してください。",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "外部リンク",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "プレゼンテーションのスライド",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "リンクの種類",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "ヒントのテキスト:",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "ハイパーリンクの設定",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "このフィールドは必須項目です",
@@ -740,12 +739,6 @@
   "PE.Views.Toolbar.textBold": "太字",
   "PE.Views.Toolbar.textCancel": "キャンセル",
   "PE.Views.Toolbar.textColumn": "縦棒グラフ",
-  "PE.Views.Toolbar.textCompactView": "コンパクトのツールバー",
-  "PE.Views.Toolbar.textFitPage": "スライドを拡大または縮小します。",
-  "PE.Views.Toolbar.textFitWidth": "幅を合わせる",
-  "PE.Views.Toolbar.textHideLines": "ルーラーを表示しない",
-  "PE.Views.Toolbar.textHideStatusBar": "ステータスバーを表示しない",
-  "PE.Views.Toolbar.textHideTitleBar": "タイトルバーを表示しない",
   "PE.Views.Toolbar.textItalic": "斜体",
   "PE.Views.Toolbar.textLine": "折れ線グラフ",
   "PE.Views.Toolbar.textNewColor": "ユーザー設定の色",
@@ -764,9 +757,7 @@
   "PE.Views.Toolbar.textSuperscript": "上付き文字",
   "PE.Views.Toolbar.textTitleError": "エラー",
   "PE.Views.Toolbar.textUnderline": "下線",
-  "PE.Views.Toolbar.textZoom": "ズーム",
   "PE.Views.Toolbar.tipAddSlide": "スライドの追加",
-  "PE.Views.Toolbar.tipAdvSettings": "詳細設定",
   "PE.Views.Toolbar.tipBack": "戻る",
   "PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更",
   "PE.Views.Toolbar.tipClearStyle": "スタイルのクリア",
@@ -778,7 +769,6 @@
   "PE.Views.Toolbar.tipFontName": "フォント名",
   "PE.Views.Toolbar.tipFontSize": "フォントのサイズ",
   "PE.Views.Toolbar.tipHAligh": "左右の整列",
-  "PE.Views.Toolbar.tipHideBars": "タイトルバーとステータスバーを表示しない。",
   "PE.Views.Toolbar.tipIncPrLeft": "インデントを増やす",
   "PE.Views.Toolbar.tipInsertChart": "グラフの挿入",
   "PE.Views.Toolbar.tipInsertHyperlink": "ハイパーリンクの追加",

apps/presentationeditor/main/locale/ko.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "파일을 다운로드",
   "Common.Views.Header.tipGoEdit": "현재 파일 편집",
   "Common.Views.Header.tipPrint": "파일 출력",
+  "Common.Views.Header.tipRedo": "다시 실행",
+  "Common.Views.Header.tipSave": "저장",
+  "Common.Views.Header.tipUndo": "실행 취소",
   "Common.Views.Header.tipViewSettings": "보기 설정",
   "Common.Views.Header.tipViewUsers": "사용자보기 및 문서 액세스 권한 관리",
   "Common.Views.Header.txtAccessRights": "액세스 권한 변경",
@@ -198,6 +201,7 @@
   "Common.Views.SignDialog.textInputName": "서명자 성함을 입력하세요",
   "Common.Views.SignDialog.textItalic": "이탤릭",
   "Common.Views.SignDialog.textPurpose": "이 문서에 서명하는 목적",
+  "Common.Views.SignDialog.textSelect": "선택",
   "Common.Views.SignDialog.textSelectImage": "이미지 선택",
   "Common.Views.SignDialog.textSignature": "서명은 처럼 보임",
   "Common.Views.SignDialog.textTitle": "서명문서",
@@ -214,7 +218,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "서명자 타이틀",
   "Common.Views.SignSettingsDialog.textInstructions": "서명자용 지침",
   "Common.Views.SignSettingsDialog.textShowDate": "서명라인에 서명 날짜를 보여주세요",
-  "Common.Views.SignSettingsDialog.textTitle": "서명 세팅",
+  "Common.Views.SignSettingsDialog.textTitle": "서명 셋업",
   "Common.Views.SignSettingsDialog.txtEmpty": "이 입력란은 필수 항목",
   "PE.Controllers.LeftMenu.newDocumentTitle": "명명되지 않은 프레젠테이션",
   "PE.Controllers.LeftMenu.requestEditRightsText": "편집 권한 요청 중 ...",
@@ -235,7 +239,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다. <br> 데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원 담당자에게 문의하십시오.",
   "PE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.",
   "PE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1",
-  "PE.Controllers.Main.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "PE.Controllers.Main.errorFilePassProtect": "문서가 암호로 보호되어 있습니다.",
   "PE.Controllers.Main.errorForceSave": "파일 저장중 문제 발생됨. 컴퓨터 하드 드라이브에 파일을 저장하려면 '로 다운로드' 옵션을 사용 또는 나중에 다시 시도하세요.",
   "PE.Controllers.Main.errorKeyEncrypt": "알 수없는 키 설명자",
   "PE.Controllers.Main.errorKeyExpire": "키 설명자가 만료되었습니다",

apps/presentationeditor/main/locale/lv.json

@@ -92,6 +92,9 @@
   "Common.Views.Header.tipDownload": "Lejupielādēt failu",
   "Common.Views.Header.tipGoEdit": "Rediģēt šībrīža failu",
   "Common.Views.Header.tipPrint": "Drukāt failu",
+  "Common.Views.Header.tipRedo": "Pārtaisīt",
+  "Common.Views.Header.tipSave": "Saglabāt",
+  "Common.Views.Header.tipUndo": "Atsaukt",
   "Common.Views.Header.tipViewUsers": "Apskatīt lietotājus un pārvaldīt dokumentu piekļuves tiesības",
   "Common.Views.Header.txtAccessRights": "Izmainīt pieejas tiesības",
   "Common.Views.Header.txtRename": "Pārdēvēt",
@@ -195,6 +198,7 @@
   "Common.Views.SignDialog.textInputName": "Ievadiet parakstītāja vārdu",
   "Common.Views.SignDialog.textItalic": "Kursīvs",
   "Common.Views.SignDialog.textPurpose": "Šī dokumenta parakstīšanas mērķis",
+  "Common.Views.SignDialog.textSelect": "Izvēlēties",
   "Common.Views.SignDialog.textSelectImage": "Izvēlēties attēlu",
   "Common.Views.SignDialog.textSignature": "Kā izskatās paraksts",
   "Common.Views.SignDialog.textTitle": "Parakstīt dokumentu",
@@ -211,7 +215,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Parakstītāja amats",
   "Common.Views.SignSettingsDialog.textInstructions": "Norādījumi parakstītājam",
   "Common.Views.SignSettingsDialog.textShowDate": "Rādīt datumu paraksta līnijā",
-  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādījumi",
+  "Common.Views.SignSettingsDialog.textTitle": "Paraksta uzstādīšana",
   "Common.Views.SignSettingsDialog.txtEmpty": "Šis lauks ir jāaizpilda",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
@@ -232,7 +236,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
   "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "The document is password protected and could not be opened.",
+  "PE.Controllers.Main.errorFilePassProtect": "Fails ir aizsargāts ar paroli un to nevar atvērt.",
   "PE.Controllers.Main.errorForceSave": "Faila noglabāšanas laikā radās kļūda. Lūdzu, izmantojiet iespēju \"Lejupielādēt kā\", lai noglabātu failu datora cietajā diskā, vai mēģiniet vēlāk vēlreiz.",
   "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",

apps/presentationeditor/main/locale/nl.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Bestand downloaden",
   "Common.Views.Header.tipGoEdit": "Huidig bestand bewerken",
   "Common.Views.Header.tipPrint": "Bestand afdrukken",
+  "Common.Views.Header.tipRedo": "Opnieuw",
+  "Common.Views.Header.tipSave": "Opslaan",
+  "Common.Views.Header.tipUndo": "Ongedaan maken",
   "Common.Views.Header.tipViewSettings": "Weergave-instellingen",
   "Common.Views.Header.tipViewUsers": "Gebruikers weergeven en toegangsrechten voor documenten beheren",
   "Common.Views.Header.txtAccessRights": "Toegangsrechten wijzigen",
@@ -198,6 +201,7 @@
   "Common.Views.SignDialog.textInputName": "Naam ondertekenaar invoeren",
   "Common.Views.SignDialog.textItalic": "Cursief",
   "Common.Views.SignDialog.textPurpose": "Doel voor het ondertekenen van dit document",
+  "Common.Views.SignDialog.textSelect": "Selecteren",
   "Common.Views.SignDialog.textSelectImage": "Selecteer afbeelding",
   "Common.Views.SignDialog.textSignature": "Handtekening lijkt op",
   "Common.Views.SignDialog.textTitle": "Onderteken document",
@@ -214,7 +218,7 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Ondertekenaar titel",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructies voor ondertekenaar",
   "Common.Views.SignSettingsDialog.textShowDate": "Toon signeer datum in handtekening regel",
-  "Common.Views.SignSettingsDialog.textTitle": "Handtekening instellingen",
+  "Common.Views.SignSettingsDialog.textTitle": "Handtekening opzet",
   "Common.Views.SignSettingsDialog.txtEmpty": "Dit veld is vereist",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentatie zonder naam",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Bewerkrechten worden aangevraagd...",
@@ -235,7 +239,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.",
   "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.errorFilePassProtect": "Het bestand 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",

apps/presentationeditor/main/locale/pl.json

@@ -875,7 +875,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Podaj tutaj etykietkę",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Link zewnętrzny",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Slajd w tej prezentacji",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Typ linku",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Tekst wskazówki na ekranie",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia hiperlinku",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "To pole jest wymagane",
@@ -1282,12 +1281,6 @@
   "PE.Views.Toolbar.textCancel": "Anulować",
   "PE.Views.Toolbar.textCharts": "Wykresy",
   "PE.Views.Toolbar.textColumn": "Kolumna",
-  "PE.Views.Toolbar.textCompactView": "Wyświetl kompaktowy pasek narzędzi",
-  "PE.Views.Toolbar.textFitPage": "Dopasuj do slajdu",
-  "PE.Views.Toolbar.textFitWidth": "Dopasuj do szerokości",
-  "PE.Views.Toolbar.textHideLines": "Ukryj linijki",
-  "PE.Views.Toolbar.textHideStatusBar": "Ukryj pasek stanu",
-  "PE.Views.Toolbar.textHideTitleBar": "Ukryj pasek tytułowy",
   "PE.Views.Toolbar.textItalic": "Kursywa",
   "PE.Views.Toolbar.textLine": "Wykres",
   "PE.Views.Toolbar.textNewColor": "Własny kolor",
@@ -1314,9 +1307,7 @@
   "PE.Views.Toolbar.textTabInsert": "Wstawić",
   "PE.Views.Toolbar.textTitleError": "Błąd",
   "PE.Views.Toolbar.textUnderline": "Podkreśl",
-  "PE.Views.Toolbar.textZoom": "Powiększenie",
   "PE.Views.Toolbar.tipAddSlide": "Dodaj slajd",
-  "PE.Views.Toolbar.tipAdvSettings": "Zaawansowane ustawienia",
   "PE.Views.Toolbar.tipBack": "Powrót",
   "PE.Views.Toolbar.tipChangeChart": "Zmień typ wykresu",
   "PE.Views.Toolbar.tipChangeSlide": "Zmień układ slajdów",
@@ -1329,7 +1320,6 @@
   "PE.Views.Toolbar.tipFontName": "Czcionka",
   "PE.Views.Toolbar.tipFontSize": "Rozmiar czcionki",
   "PE.Views.Toolbar.tipHAligh": "Wyrównaj poziomo",
-  "PE.Views.Toolbar.tipHideBars": "Ukryj pasek tytułowy i stanu",
   "PE.Views.Toolbar.tipIncPrLeft": "Zwiększ wcięcie",
   "PE.Views.Toolbar.tipInsertChart": "Wstaw wykres",
   "PE.Views.Toolbar.tipInsertEquation": "Wstaw równanie",

apps/presentationeditor/main/locale/pt.json

@@ -874,7 +874,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Inserir dica de ferramenta aqui",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Link externo",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Slide nesta apresentação",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Tipo de link",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Texto de dica de tela:",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Configurações de hiperlink",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo é obrigatório",
@@ -1281,12 +1280,6 @@
   "PE.Views.Toolbar.textCancel": "Cancelar",
   "PE.Views.Toolbar.textCharts": "Gráficos",
   "PE.Views.Toolbar.textColumn": "Gráfico de coluna",
-  "PE.Views.Toolbar.textCompactView": "Ocultar barra de ferramentas",
-  "PE.Views.Toolbar.textFitPage": "Ajustar slide",
-  "PE.Views.Toolbar.textFitWidth": "Ajustar largura",
-  "PE.Views.Toolbar.textHideLines": "Ocultar réguas",
-  "PE.Views.Toolbar.textHideStatusBar": "Ocultar barra de status",
-  "PE.Views.Toolbar.textHideTitleBar": "Ocultar barra de título",
   "PE.Views.Toolbar.textItalic": "Itálico",
   "PE.Views.Toolbar.textLine": "Gráfico de linha",
   "PE.Views.Toolbar.textNewColor": "Cor personalizada",
@@ -1313,9 +1306,7 @@
   "PE.Views.Toolbar.textTabInsert": "Inserir",
   "PE.Views.Toolbar.textTitleError": "Erro",
   "PE.Views.Toolbar.textUnderline": "Sublinhado",
-  "PE.Views.Toolbar.textZoom": "Zoom",
   "PE.Views.Toolbar.tipAddSlide": "Adicionar slide",
-  "PE.Views.Toolbar.tipAdvSettings": "Configurações avançadas",
   "PE.Views.Toolbar.tipBack": "Voltar",
   "PE.Views.Toolbar.tipChangeChart": "Alterar tipo de gráfico",
   "PE.Views.Toolbar.tipChangeSlide": "Alterar slide de layout",
@@ -1328,7 +1319,6 @@
   "PE.Views.Toolbar.tipFontName": "Fonte",
   "PE.Views.Toolbar.tipFontSize": "Tamanho da fonte",
   "PE.Views.Toolbar.tipHAligh": "Alinhamento horizontal",
-  "PE.Views.Toolbar.tipHideBars": "Ocultar barra de título e barra de status",
   "PE.Views.Toolbar.tipIncPrLeft": "Aumentar recuo",
   "PE.Views.Toolbar.tipInsertChart": "Inserir gráfico",
   "PE.Views.Toolbar.tipInsertEquation": "Inserir equação",

apps/presentationeditor/main/locale/ru.json

@@ -94,6 +94,9 @@
   "Common.Views.Header.tipDownload": "Скачать файл",
   "Common.Views.Header.tipGoEdit": "Редактировать текущий файл",
   "Common.Views.Header.tipPrint": "Напечатать файл",
+  "Common.Views.Header.tipRedo": "Повторить",
+  "Common.Views.Header.tipSave": "Сохранить",
+  "Common.Views.Header.tipUndo": "Отменить",
   "Common.Views.Header.tipViewSettings": "Параметры представления",
   "Common.Views.Header.tipViewUsers": "Просмотр пользователей и управление правами доступа к документу",
   "Common.Views.Header.txtAccessRights": "Изменить права доступа",
@@ -121,6 +124,7 @@
   "Common.Views.OpenDialog.txtEncoding": "Кодировка",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.",
   "Common.Views.OpenDialog.txtPassword": "Пароль",
+  "Common.Views.OpenDialog.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен.",
   "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл",
   "Common.Views.PasswordDialog.cancelButtonText": "Отмена",
@@ -198,6 +202,7 @@
   "Common.Views.SignDialog.textInputName": "Введите имя подписывающего",
   "Common.Views.SignDialog.textItalic": "Курсив",
   "Common.Views.SignDialog.textPurpose": "Цель подписания документа",
+  "Common.Views.SignDialog.textSelect": "Выбрать",
   "Common.Views.SignDialog.textSelectImage": "Выбрать изображение",
   "Common.Views.SignDialog.textSignature": "Как выглядит подпись:",
   "Common.Views.SignDialog.textTitle": "Подписание документа",
@@ -235,7 +240,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
   "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем и не может быть открыт.",
+  "PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "PE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
   "PE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "PE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
@@ -359,10 +364,10 @@
   "PE.Controllers.Main.txtSlideTitle": "Заголовок слайда",
   "PE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
   "PE.Controllers.Main.txtTheme_blank": "Пустой слайд",
-  "PE.Controllers.Main.txtTheme_classic": "Классический",
+  "PE.Controllers.Main.txtTheme_classic": "Классическая",
   "PE.Controllers.Main.txtTheme_corner": "Угловая",
   "PE.Controllers.Main.txtTheme_dotted": "Точечная",
-  "PE.Controllers.Main.txtTheme_green": "Зеленый",
+  "PE.Controllers.Main.txtTheme_green": "Зеленая",
   "PE.Controllers.Main.txtTheme_lines": "Линии",
   "PE.Controllers.Main.txtTheme_office": "Офис",
   "PE.Controllers.Main.txtTheme_official": "Официальная",

apps/presentationeditor/main/locale/sl.json

@@ -371,7 +371,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Namig vnesite tu",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Zunanja povezava",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Diapozitiv v tej predstavitvi",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Vrsta povezave",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Besedila zaslonskega tipa",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Nastavitve hiperpovezave",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "To polje je obvezno",
@@ -732,12 +731,6 @@
   "PE.Views.Toolbar.textBold": "Krepko",
   "PE.Views.Toolbar.textCancel": "Prekliči",
   "PE.Views.Toolbar.textColumn": "Stolpični grafikon",
-  "PE.Views.Toolbar.textCompactView": "Poglej kompaktno orodno vrstico",
-  "PE.Views.Toolbar.textFitPage": "Prilagodi diapozitiv",
-  "PE.Views.Toolbar.textFitWidth": "Prilagodi širino",
-  "PE.Views.Toolbar.textHideLines": "Skrij pravila",
-  "PE.Views.Toolbar.textHideStatusBar": "Skrij statusno vrstico",
-  "PE.Views.Toolbar.textHideTitleBar": "Skrij naslovno vrstico",
   "PE.Views.Toolbar.textItalic": "Poševno",
   "PE.Views.Toolbar.textLine": "Vrstični grafikon",
   "PE.Views.Toolbar.textNewColor": "Barva po meri",
@@ -756,9 +749,7 @@
   "PE.Views.Toolbar.textSuperscript": "Nadpis",
   "PE.Views.Toolbar.textTitleError": "Napaka",
   "PE.Views.Toolbar.textUnderline": "Podčrtaj",
-  "PE.Views.Toolbar.textZoom": "Povečava",
   "PE.Views.Toolbar.tipAddSlide": "Dodaj diapozitiv",
-  "PE.Views.Toolbar.tipAdvSettings": "Napredne nastavitve",
   "PE.Views.Toolbar.tipBack": "Nazaj",
   "PE.Views.Toolbar.tipChangeSlide": "Spremeni postavitev diapozitiva",
   "PE.Views.Toolbar.tipClearStyle": "Počisti stil",
@@ -770,7 +761,6 @@
   "PE.Views.Toolbar.tipFontName": "Ime pisave",
   "PE.Views.Toolbar.tipFontSize": "Velikost pisave",
   "PE.Views.Toolbar.tipHAligh": "Horizontalno poravnano",
-  "PE.Views.Toolbar.tipHideBars": "Skrij naslovno vrstico & Statusno vrstico",
   "PE.Views.Toolbar.tipIncPrLeft": "Povečajte zamik",
   "PE.Views.Toolbar.tipInsertChart": "Vstavi grafikon",
   "PE.Views.Toolbar.tipInsertHyperlink": "Dodaj Hiperpovezavo",

apps/presentationeditor/main/locale/tr.json

@@ -875,7 +875,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Araç bilgisini buraya girin",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Dosya yada İnternet Sayfası",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Bu Dökümana Yerleştir",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Bağlantı tipi",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Ekranİpucu metni",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Hiper bağ Ayarları",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "Bu alan gereklidir",
@@ -1282,12 +1281,6 @@
   "PE.Views.Toolbar.textCancel": "İptal Et",
   "PE.Views.Toolbar.textCharts": "Grafikler",
   "PE.Views.Toolbar.textColumn": "Sütun grafik",
-  "PE.Views.Toolbar.textCompactView": "Araç listesini gizle",
-  "PE.Views.Toolbar.textFitPage": "Slaytı sığdır",
-  "PE.Views.Toolbar.textFitWidth": "Genişliğe Sığdır",
-  "PE.Views.Toolbar.textHideLines": "Cetvelleri Gizle",
-  "PE.Views.Toolbar.textHideStatusBar": "Durum Çubuğunu Gizle",
-  "PE.Views.Toolbar.textHideTitleBar": "Başlık Çubuğunu Gizle",
   "PE.Views.Toolbar.textItalic": "İtalik",
   "PE.Views.Toolbar.textLine": "Çizgi grafiği",
   "PE.Views.Toolbar.textNewColor": "Özel Renk",
@@ -1314,9 +1307,7 @@
   "PE.Views.Toolbar.textTabInsert": "Ekle",
   "PE.Views.Toolbar.textTitleError": "Hata",
   "PE.Views.Toolbar.textUnderline": "Altı çizili",
-  "PE.Views.Toolbar.textZoom": "Zum",
   "PE.Views.Toolbar.tipAddSlide": "Slayt ekle",
-  "PE.Views.Toolbar.tipAdvSettings": "Gelişmiş Ayarlar",
   "PE.Views.Toolbar.tipBack": "Geri",
   "PE.Views.Toolbar.tipChangeChart": "Grafik Tipini Değiştir",
   "PE.Views.Toolbar.tipChangeSlide": "Slayt Tasarımını Değiştir",
@@ -1329,7 +1320,6 @@
   "PE.Views.Toolbar.tipFontName": "Yazı Tipi",
   "PE.Views.Toolbar.tipFontSize": "Yazıtipi boyutu",
   "PE.Views.Toolbar.tipHAligh": "Yatay Hizala",
-  "PE.Views.Toolbar.tipHideBars": "Başlık Çubuğu & Durum Çubuğunu Gizle",
   "PE.Views.Toolbar.tipIncPrLeft": "Girintiyi Arttır",
   "PE.Views.Toolbar.tipInsertChart": "Tablo ekle",
   "PE.Views.Toolbar.tipInsertEquation": "Denklem Ekle",

apps/presentationeditor/main/locale/uk.json

@@ -874,7 +874,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Введіть підказку тут",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Зовнішнє посилання",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Слайд у цій Презентації",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Тип посилання",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Текст ScreenTip",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Налаштування гіперсилки",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "Це поле є обов'язковим",
@@ -1281,12 +1280,6 @@
   "PE.Views.Toolbar.textCancel": "Скасувати",
   "PE.Views.Toolbar.textCharts": "Діаграми",
   "PE.Views.Toolbar.textColumn": "Колона",
-  "PE.Views.Toolbar.textCompactView": "Сховати панель інструментів",
-  "PE.Views.Toolbar.textFitPage": "Пристосувати до слайду",
-  "PE.Views.Toolbar.textFitWidth": "Придатний до ширини",
-  "PE.Views.Toolbar.textHideLines": "Сховати лінійки",
-  "PE.Views.Toolbar.textHideStatusBar": "Сховати панель стану",
-  "PE.Views.Toolbar.textHideTitleBar": "Сховати заголовний рядок",
   "PE.Views.Toolbar.textItalic": "Курсив",
   "PE.Views.Toolbar.textLine": "Лінія",
   "PE.Views.Toolbar.textNewColor": "Власний колір",
@@ -1313,9 +1306,7 @@
   "PE.Views.Toolbar.textTabInsert": "Вставити",
   "PE.Views.Toolbar.textTitleError": "Помилка",
   "PE.Views.Toolbar.textUnderline": "Підкреслений",
-  "PE.Views.Toolbar.textZoom": "Збільшити",
   "PE.Views.Toolbar.tipAddSlide": "Додати слайд",
-  "PE.Views.Toolbar.tipAdvSettings": "Розширені налаштування",
   "PE.Views.Toolbar.tipBack": "Назад",
   "PE.Views.Toolbar.tipChangeChart": "Змінити тип діаграми",
   "PE.Views.Toolbar.tipChangeSlide": "Змінити розміщення слайду",
@@ -1328,7 +1319,6 @@
   "PE.Views.Toolbar.tipFontName": "Шрифт",
   "PE.Views.Toolbar.tipFontSize": "Розмір шрифта",
   "PE.Views.Toolbar.tipHAligh": "Горизонтальне вирівнювання",
-  "PE.Views.Toolbar.tipHideBars": "Сховати панель заголовків і панель стану",
   "PE.Views.Toolbar.tipIncPrLeft": "Збільшити відступ",
   "PE.Views.Toolbar.tipInsertChart": "Вставити діаграму",
   "PE.Views.Toolbar.tipInsertEquation": "Вставити рівняння",

apps/presentationeditor/main/locale/vi.json

@@ -875,7 +875,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "Nhập tooltip ở đây",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "Liên kết ngoài",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "Slide trong Bản trình chiếu này",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "Loại liên kết",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "Văn bản ScreenTip",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "Cài đặt Siêu liên kết",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "Trường bắt buộc",
@@ -1282,12 +1281,6 @@
   "PE.Views.Toolbar.textCancel": "Hủy",
   "PE.Views.Toolbar.textCharts": "Biểu đồ",
   "PE.Views.Toolbar.textColumn": "Cột",
-  "PE.Views.Toolbar.textCompactView": "Xem thanh công cụ nhỏ gọn",
-  "PE.Views.Toolbar.textFitPage": "Vừa với Slide",
-  "PE.Views.Toolbar.textFitWidth": "Vừa với Chiều rộng",
-  "PE.Views.Toolbar.textHideLines": "Ẩn Thước",
-  "PE.Views.Toolbar.textHideStatusBar": "Ẩn thanh trạng thái",
-  "PE.Views.Toolbar.textHideTitleBar": "Ẩn thanh Tiêu đề",
   "PE.Views.Toolbar.textItalic": "Nghiêng",
   "PE.Views.Toolbar.textLine": "Đường kẻ",
   "PE.Views.Toolbar.textNewColor": "Màu tùy chỉnh",
@@ -1314,9 +1307,7 @@
   "PE.Views.Toolbar.textTabInsert": "Chèn",
   "PE.Views.Toolbar.textTitleError": "Lỗi",
   "PE.Views.Toolbar.textUnderline": "Gạch chân",
-  "PE.Views.Toolbar.textZoom": "Thu phóng",
   "PE.Views.Toolbar.tipAddSlide": "Thêm slide",
-  "PE.Views.Toolbar.tipAdvSettings": "Cài đặt nâng cao",
   "PE.Views.Toolbar.tipBack": "Quay lại",
   "PE.Views.Toolbar.tipChangeChart": "Thay đổi Loại biểu đồ",
   "PE.Views.Toolbar.tipChangeSlide": "Thay đổi Bố cục slide",
@@ -1329,7 +1320,6 @@
   "PE.Views.Toolbar.tipFontName": "Phông chữ",
   "PE.Views.Toolbar.tipFontSize": "Cỡ chữ",
   "PE.Views.Toolbar.tipHAligh": "Căn chỉnh ngang",
-  "PE.Views.Toolbar.tipHideBars": "Ẩn Thanh tiêu đề và Thanh trạng thái",
   "PE.Views.Toolbar.tipIncPrLeft": "Tăng thụt lề",
   "PE.Views.Toolbar.tipInsertChart": "Chèn biểu đồ",
   "PE.Views.Toolbar.tipInsertEquation": "Chèn phương trình",

apps/presentationeditor/main/locale/zh.json

@@ -843,7 +843,6 @@
   "PE.Views.HyperlinkSettingsDialog.textEmptyTooltip": "在这里输入工具提示",
   "PE.Views.HyperlinkSettingsDialog.textExternalLink": "外部链接",
   "PE.Views.HyperlinkSettingsDialog.textInternalLink": "幻灯片在本演示文稿",
-  "PE.Views.HyperlinkSettingsDialog.textLinkType": "链接类型",
   "PE.Views.HyperlinkSettingsDialog.textTipText": "屏幕提示文字",
   "PE.Views.HyperlinkSettingsDialog.textTitle": "超链接设置",
   "PE.Views.HyperlinkSettingsDialog.txtEmpty": "这是必填栏",
@@ -1238,12 +1237,6 @@
   "PE.Views.Toolbar.textCancel": "取消",
   "PE.Views.Toolbar.textCharts": "图表",
   "PE.Views.Toolbar.textColumn": "列",
-  "PE.Views.Toolbar.textCompactView": "查看紧凑工具栏",
-  "PE.Views.Toolbar.textFitPage": "适合幻灯片",
-  "PE.Views.Toolbar.textFitWidth": "适合宽度",
-  "PE.Views.Toolbar.textHideLines": "隐藏标尺",
-  "PE.Views.Toolbar.textHideStatusBar": "隐藏状态栏",
-  "PE.Views.Toolbar.textHideTitleBar": "隐藏标题栏",
   "PE.Views.Toolbar.textItalic": "斜体",
   "PE.Views.Toolbar.textLine": "线",
   "PE.Views.Toolbar.textNewColor": "自定义颜色",
@@ -1265,9 +1258,7 @@
   "PE.Views.Toolbar.textSuperscript": "上标",
   "PE.Views.Toolbar.textTitleError": "错误",
   "PE.Views.Toolbar.textUnderline": "下划线",
-  "PE.Views.Toolbar.textZoom": "放大",
   "PE.Views.Toolbar.tipAddSlide": "添加幻灯片",
-  "PE.Views.Toolbar.tipAdvSettings": "高级设置",
   "PE.Views.Toolbar.tipBack": "返回",
   "PE.Views.Toolbar.tipChangeChart": "更改图表类型",
   "PE.Views.Toolbar.tipChangeSlide": "更改幻灯片布局",
@@ -1280,7 +1271,6 @@
   "PE.Views.Toolbar.tipFontName": "字体名称",
   "PE.Views.Toolbar.tipFontSize": "字体大小",
   "PE.Views.Toolbar.tipHAligh": "水平对齐",
-  "PE.Views.Toolbar.tipHideBars": "隐藏标题栏和状态栏",
   "PE.Views.Toolbar.tipIncPrLeft": "增加缩进",
   "PE.Views.Toolbar.tipInsertChart": "插入图表",
   "PE.Views.Toolbar.tipInsertEquation": "插入方程",

apps/presentationeditor/main/resources/less/document-preview.less

@@ -1,3 +1,6 @@
+#pe-preview {
+    z-index: @zindex-navbar+3;
+}
 .preview-controls {
     display: table;
     background: @gray-light;

apps/presentationeditor/main/resources/less/leftmenu.less

@@ -454,7 +454,7 @@
         }
 
         #panel-protect {
-            label, span {
+            label {
                 font-size: 12px;
             }
 

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

@@ -25,11 +25,11 @@
     position: absolute;
     top: 32px;
     left: 48px;
-    right: 45px;
+    right: 0;
     bottom: 0;
     opacity: 0;
     background-color: @gray-light;
-    z-index: @zindex-tooltip + 1;
+    /*z-index: @zindex-tooltip + 1;*/
 }
 
 .menu-layouts {
@@ -90,8 +90,9 @@
 
 // menu zoom
 .menu-zoom {
+    line-height: @line-height-base;
     .title {
-        padding: 5px 0 5px 20px;
+        padding: 5px 5px 5px 20px;
         float: left;
         max-width: 95px;
         overflow: hidden;

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

@@ -1037,7 +1037,7 @@ define([
 
                     me._state.openDlg = uiApp.modal({
                         title: me.advDRMOptions,
-                        text: me.advDRMEnterPassword,
+                        text: me.txtProtected,
                         afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
                         buttons: [
                             {
@@ -1224,7 +1224,7 @@ define([
             errorUsersExceed: 'Count of users was exceed',
             txtEditingMode: 'Set editing mode...',
             errorCoAuthoringDisconnect: 'Server connection lost. You can\'t edit anymore.',
-            errorFilePassProtect: 'The document is password protected.',
+            errorFilePassProtect: 'The file is password protected and cannot be opened.',
             textAnonymous: 'Anonymous',
             txtNeedSynchronize: 'You have an updates',
             applyChangesTitleText: 'Loading Data',
@@ -1285,7 +1285,8 @@ define([
             txtSlideNumber: 'Slide number',
             txtSlideSubtitle: 'Slide subtitle',
             txtSlideTitle: 'Slide title',
-            warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.'
+            warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
+            txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset'
         }
     })(), PE.Controllers.Main || {}))
 });

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

@@ -174,7 +174,7 @@ define([
             },
 
             activateControls: function() {
-                $('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back').removeClass('disabled');
+                $('#toolbar-preview, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').removeClass('disabled');
             },
 
             activateViewControls: function() {

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

@@ -94,7 +94,7 @@ define([
                 }));
 
                 $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me));
-                $('#toolbar-preview, #toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back').addClass('disabled');
+                $('#toolbar-preview, #toolbar-edit, #toolbar-add, #toolbar-settings, #toolbar-search, #document-back, #toolbar-edit-document').addClass('disabled');
 
                 return me;
             },

apps/presentationeditor/mobile/locale/de.json

@@ -73,7 +73,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
   "PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
   "PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt.",
+  "PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "PE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
   "PE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
   "PE.Controllers.Main.errorProcessSaveResult": "Fehler beim Speichern von Daten.",
@@ -150,6 +150,7 @@
   "PE.Controllers.Main.txtMedia": "Medien",
   "PE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen",
   "PE.Controllers.Main.txtPicture": "Bild",
+  "PE.Controllers.Main.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt",
   "PE.Controllers.Main.txtRectangles": "Rechtecke",
   "PE.Controllers.Main.txtSeries": "Reihen",
   "PE.Controllers.Main.txtSldLtTBlank": "Leer",
@@ -420,7 +421,7 @@
   "PE.Views.Search.textSearch": "Suche",
   "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
   "PE.Views.Settings.mniSlideWide": "Breitbildschirm (16:9)",
-  "PE.Views.Settings.textAbout": "Über",
+  "PE.Views.Settings.textAbout": "Über das Produkt",
   "PE.Views.Settings.textAddress": "Adresse",
   "PE.Views.Settings.textAuthor": "Autor",
   "PE.Views.Settings.textBack": "Zurück",

apps/presentationeditor/mobile/locale/en.json

@@ -73,7 +73,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
   "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
   "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "The document is password protected.",
+  "PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
   "PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.",
@@ -150,6 +150,7 @@
   "PE.Controllers.Main.txtMedia": "Media",
   "PE.Controllers.Main.txtNeedSynchronize": "You have updates",
   "PE.Controllers.Main.txtPicture": "Picture",
+  "PE.Controllers.Main.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
   "PE.Controllers.Main.txtRectangles": "Rectangles",
   "PE.Controllers.Main.txtSeries": "Series",
   "PE.Controllers.Main.txtSldLtTBlank": "Blank",

apps/presentationeditor/mobile/locale/es.json

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

apps/presentationeditor/mobile/locale/fr.json

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

apps/presentationeditor/mobile/locale/it.json

@@ -73,7 +73,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
   "PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
   "PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Il documento è protetto da password",
+  "PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "PE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto",
   "PE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto",
   "PE.Controllers.Main.errorProcessSaveResult": "Salvataggio non riuscito",
@@ -150,6 +150,7 @@
   "PE.Controllers.Main.txtMedia": "Multimedia",
   "PE.Controllers.Main.txtNeedSynchronize": "Ci sono aggiornamenti disponibili",
   "PE.Controllers.Main.txtPicture": "Foto",
+  "PE.Controllers.Main.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file",
   "PE.Controllers.Main.txtRectangles": "Rettangoli",
   "PE.Controllers.Main.txtSeries": "Serie",
   "PE.Controllers.Main.txtSldLtTBlank": "Vuoto",

apps/presentationeditor/mobile/locale/ko.json

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

apps/presentationeditor/mobile/locale/lv.json

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

apps/presentationeditor/mobile/locale/nl.json

@@ -73,7 +73,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Externe fout.<br>Fout in databaseverbinding. Neem contact op met Support.",
   "PE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.",
   "PE.Controllers.Main.errorDefaultMessage": "Foutcode: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Het document is beschermd met een wachtwoord.",
+  "PE.Controllers.Main.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.",
   "PE.Controllers.Main.errorKeyEncrypt": "Onbekende sleuteldescriptor",
   "PE.Controllers.Main.errorKeyExpire": "Sleuteldescriptor vervallen",
   "PE.Controllers.Main.errorProcessSaveResult": "Opslaan mislukt.",

apps/presentationeditor/mobile/locale/ru.json

@@ -73,7 +73,7 @@
   "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
   "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
   "PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
-  "PE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем.",
+  "PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "PE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "PE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "PE.Controllers.Main.errorProcessSaveResult": "Не удалось завершить сохранение.",
@@ -150,6 +150,7 @@
   "PE.Controllers.Main.txtMedia": "Клип мультимедиа",
   "PE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
   "PE.Controllers.Main.txtPicture": "Рисунок",
+  "PE.Controllers.Main.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен",
   "PE.Controllers.Main.txtRectangles": "Прямоугольники",
   "PE.Controllers.Main.txtSeries": "Ряд",
   "PE.Controllers.Main.txtSldLtTBlank": "Пустой слайд",

apps/presentationeditor/mobile/locale/sk.json

@@ -204,6 +204,7 @@
   "PE.Controllers.Main.uploadImageTitleText": "Nahrávanie obrázku",
   "PE.Controllers.Main.warnLicenseExp": "Vaša licencia vypršala.<br>Prosím, aktualizujte si svoju licenciu a obnovte stránku.",
   "PE.Controllers.Main.warnNoLicense": "Táto verzia aplikácie ONLYOFFICE Editors má určité obmedzenia pre súbežné pripojenia k dokumentovému serveru. <br> Ak potrebujete viac, zvážte aktualizáciu aktuálnej licencie alebo zakúpenie komerčnej.",
+  "PE.Controllers.Main.warnNoLicenseUsers": "Táto verzia ONLYOFFICE Editors má určité obmedzenia pre spolupracujúcich používateľov. <br> Ak potrebujete viac, zvážte aktualizáciu vašej aktuálnej licencie alebo kúpu komerčnej.",
   "PE.Controllers.Main.warnProcessRightsChange": "Bolo vám zamietnuté právo upravovať súbor.",
   "PE.Controllers.Search.textNoTextFound": "Text nebol nájdený",
   "PE.Controllers.Settings.notcriticalErrorTitle": "Upozornenie",

apps/presentationeditor/mobile/resources/css/app-material.css

@@ -5664,11 +5664,11 @@ a.item-link,
 }
 .settings.popup .popover-view,
 .settings.popover .popover-view {
-  border-radius: 3px;
+  border-radius: 2px;
 }
 .settings.popup .popover-view > .pages,
 .settings.popover .popover-view > .pages {
-  border-radius: 3px;
+  border-radius: 2px;
 }
 .settings .categories {
   width: 100%;

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

@@ -279,7 +279,7 @@ define([
             /** coauthoring begin **/
             value = Common.localStorage.getBool("sse-settings-livecomment", true);
             Common.Utils.InternalSettings.set("sse-settings-livecomment", value);
-            var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true);
+            var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment");
             Common.Utils.InternalSettings.set("sse-settings-resolvedcomment", resolved);
 
             if (this.mode.canComments && this.leftMenu.panelComments.isVisible())