Merge branch 'release/v7.3.0' into fix/sse-check-status

apps/api/documents/api.js

@@ -193,6 +193,9 @@
                             change: false/true // hide/show feature in de/pe/sse
                         } / false / true // if false/true - use as init value in de/pe. use instead of customization.spellcheck parameter
                     },
+                    font: {
+                        name: "Arial",
+                    },
                     chat: true,
                     comments: true,
                     zoom: 100,

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

@@ -1368,12 +1368,30 @@ define([
                 props = {minScrollbarLength  : this.minScrollbarLength};
             this.scrollAlwaysVisible && (props.alwaysVisibleY = this.scrollAlwaysVisible);
 
-            if (top + menuH > docH ) {
+            var menuUp = false;
-                innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
+            if (this.parentMenu.menuAlign) {
-                this.scroller.update(props);
+                var m = this.parentMenu.menuAlign.match(/^([a-z]+)-([a-z]+)/);
-            } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
+                menuUp = (m[1]==='bl' || m[1]==='br');
-                innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
+            }
-                this.scroller.update(props);
+            if (menuUp) {
+                var bottom = top + menuH;
+                if (top<0) {
+                    innerEl.css('max-height', (bottom - paddings - margins) + 'px');
+                    menuRoot.css('top', 0);
+                    this.scroller.update(props);
+                } else if (top>0 && innerEl.height() < this.options.restoreHeight) {
+                    innerEl.css('max-height', (Math.min(bottom - paddings - margins, this.options.restoreHeight)) + 'px');
+                    menuRoot.css('top', bottom - menuRoot.outerHeight());
+                    this.scroller.update(props);
+                }
+            } else {
+                if (top + menuH > docH ) {
+                    innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
+                    this.scroller.update(props);
+                } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
+                    innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
+                    this.scroller.update(props);
+                }
             }
         },
 

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

@@ -145,7 +145,7 @@ define([
                 style       : '',
                 itemTemplate: null,
                 items       : [],
-                menuAlign   : 'tl-bl',
+                menuAlign   : 'tl-bl',//menu - parent
                 menuAlignEl : null,
                 offset      : [0, 0],
                 cyclic      : true,

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

@@ -74,6 +74,7 @@ define([
         subEditStrings : {},
         filter : undefined,
         hintmode : false,
+        fullInfoHintMode: false,
         viewmode: false,
         isSelectedComment : false,
         uids : [],
@@ -186,7 +187,8 @@ define([
                 this.currentUserId      =   data.config.user.id;
                 this.sdkViewName        =   data['sdkviewname'] || this.sdkViewName;
                 this.hintmode           =   data['hintmode'] || false;
-                this.viewmode        =   data['viewmode'] || false;
+                this.fullInfoHintMode   =   data['fullInfoHintMode'] || false;
+                this.viewmode           =   data['viewmode'] || false;
             }
         },
         setApi: function (api) {
@@ -966,11 +968,11 @@ define([
 
                     if (!comment) continue;
 
-                    if (this.subEditStrings[saveTxtId] && !hint) {
+                    if (this.subEditStrings[saveTxtId] && (comment.get('fullInfoInHint') || !hint)) {
                         comment.set('editTextInPopover', true);
                         text = this.subEditStrings[saveTxtId];
                     }
-                    else if (this.subEditStrings[saveTxtReplyId] && !hint) {
+                    else if (this.subEditStrings[saveTxtReplyId] && (comment.get('fullInfoInHint') || !hint)) {
                         comment.set('showReplyInPopover', true);
                         text = this.subEditStrings[saveTxtReplyId];
                     }
@@ -978,13 +980,16 @@ define([
                     comment.set('hint', !_.isUndefined(hint) ? hint : false);
 
                     if (!hint && this.hintmode) {
-                        if (same_uids && (this.uids.length === 0))
+                        if (same_uids)
                             animate = false;
 
                         if (this.oldUids.length && (0 === _.difference(this.oldUids, uids).length) && (0 === _.difference(uids, this.oldUids).length)) {
                             animate = false;
                             this.oldUids = [];
                         }
+
+                        if (same_uids && !apihint && !this.isModeChanged)
+                            this.api.asc_selectComment(comment.get('uid'));
                     }
 
                     if (this.animate) {
@@ -1006,7 +1011,7 @@ define([
                 this.popoverComments.reset(comments);
 
                 if (this.popoverComments.findWhere({hide: false})) {
-                    if (popover.isVisible()) {
+                    if (popover.isVisible() && (!same_uids || this.isModeChanged)) {
                         popover.hide();
                     }
 
@@ -1355,6 +1360,7 @@ define([
                 removable           : (this.mode.canDeleteComments || (data.asc_getUserId() == this.currentUserId)) && AscCommon.UserInfoParser.canDeleteComment(data.asc_getUserName()),
                 hide                : !AscCommon.UserInfoParser.canViewComment(data.asc_getUserName()),
                 hint                : !this.mode.canComments,
+                fullInfoInHint      : this.fullInfoHintMode,
                 groupName           : (groupname && groupname.length>1) ? groupname[1] : null
             });
             if (comment) {

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

@@ -261,21 +261,21 @@ define([
                                 })).render($('#box-document-title #slot-btn-dt-home'));
                                 titlebuttons['home'] = {btn: header.btnHome};
 
-                                header.btnHome.on('click', event => {
+                                header.btnHome.on('click', function (e) {
                                     native.execCommand('title:button', JSON.stringify({click: "home"}));
                                 });
 
                                 $('#id-box-doc-name').on({
-                                    'dblclick': e => {
+                                    'dblclick': function (e) {
                                         native.execCommand('title:dblclick', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
                                     },
-                                    'mousedown': e => {
+                                    'mousedown': function (e) {
                                         native.execCommand('title:mousedown', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
                                     },
-                                    'mousemove': e => {
+                                    'mousemove': function (e) {
                                         native.execCommand('title:mousemove', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
                                     },
-                                    'mouseup': e => {
+                                    'mouseup': function (e) {
                                         native.execCommand('title:mouseup', JSON.stringify({x: e.originalEvent.screenX, y: e.originalEvent.screenY}))
                                     }
                                 });

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

@@ -82,6 +82,7 @@ define([
             hide                : false,
             filtered            : false,
             hint                : false,
+            fullInfoInHint      : false,
             dummy               : undefined,
             editable            : true,
             removable           : true

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

@@ -7,11 +7,11 @@
         <div class="color" style="display: inline-block; background-color: <% if (usercolor!==null) { %><%=usercolor%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getEncodedName(parsedName) %>
     </div>
     <div class="user-date"><%=date%></div>
-    <% if (!editTextInPopover || hint || scope.viewmode) { %>
+    <% if (!editTextInPopover || (hint && !fullInfoInHint) || scope.viewmode) { %>
         <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" spellcheck="false" <% if (!!dummy) { %> placeholder="textMention"<% } %>><%=comment%></textarea>
+            <textarea class="msg-reply user-select" maxlength="maxCommLength" spellcheck="false" <% if (!!dummy) { %> placeholder="textMentionComment"<% } %>><%=comment%></textarea>
             <% if (hideAddReply) { %>
                 <button class="btn normal dlg-btn primary btn-inner-edit" id="id-comments-change-popover">textAdd</button>
             <% } else { %>
@@ -37,7 +37,7 @@
                 <div class="user-date"><%=item.get("date")%></div>
                 <% if (!item.get("editTextInPopover")) { %>
                     <div oo_editor_input="true" tabindex="-1" class="user-message user-select"><%=scope.pickLink(item.get("reply"))%></div>
-                    <% if (!hint && !scope.viewmode) { %>
+                    <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                         <div class="btns-reply-ct">
                             <% if (item.get("editable")) { %>
                                 <div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
@@ -61,7 +61,7 @@
 
     <!-- add reply button -->
 
-    <% if (!showReplyInPopover && !hideAddReply && !hint && !scope.viewmode) { %>
+    <% if (!showReplyInPopover && !hideAddReply && (fullInfoInHint || !hint) && !scope.viewmode) { %>
         <% if (replys.length && !add_arrow) { %>
             <label class="user-reply" style="margin-left: 20px; margin-top: 5px;" role="presentation" tabindex="-1">textAddReply</label>
         <% } else { %>
@@ -73,7 +73,7 @@
 
     <% if (!editTextInPopover && !lock) { %>
         <div class="edit-ct">
-            <% if (!hint && !scope.viewmode) { %>
+            <% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
                 <% if (editable) { %>
                     <div class="btn-edit img-commonctrl"></div>
                 <% } %>
@@ -81,9 +81,9 @@
                     <div class="btn-delete img-commonctrl"></div>
                 <% } %>
             <% } %>
-            <% if (editable && !hint && !scope.viewmode) { %>
+            <% if (editable && (fullInfoInHint || !hint) && !scope.viewmode) { %>
                 <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
-            <% } else if (!hint && (!editable || scope.viewmode) && resolved) { %>
+            <% } else if ((fullInfoInHint || !hint) && (!editable || scope.viewmode) && resolved) { %>
                 <div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div>
             <% } %>
         </div>
@@ -93,7 +93,7 @@
 
     <% if (showReplyInPopover) { %>
         <div class="reply-ct">
-            <textarea class="msg-reply user-select" placeholder="textAddReply" maxlength="maxCommLength" spellcheck="false"></textarea>
+            <textarea class="msg-reply user-select" placeholder="textMentionReply" maxlength="maxCommLength" spellcheck="false"></textarea>
             <button class="btn normal dlg-btn primary btn-reply" id="id-comments-change-popover">textReply</button>
             <button class="btn normal dlg-btn btn-close">textClose</button>
         </div>

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

@@ -68,6 +68,7 @@ if ( window.desktop ) {
                 delete params.uitheme;
             } else {
                 localStorage.setItem("ui-theme-id", theme.id);
+                localStorage.removeItem("ui-theme-use-system");
             }
 
             localStorage.removeItem("ui-theme");

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

@@ -336,9 +336,24 @@ define([
             // text box setup autosize input text
 
             this.setupAutoSizingTextBox();
-            this.txtMessage.bind('input propertychange',  _.bind(this.updateHeightTextBox, this));
+            this.disableTextBoxButton($(this.txtMessage));
+            this.txtMessage.bind('input propertychange',  _.bind(this.onTextareaInput, this));
         },
+        onTextareaInput: function(event) {
+            this.updateHeightTextBox(event);
+            this.disableTextBoxButton($(event.target));
+        },
+        disableTextBoxButton: function(textboxEl) {
+            var button = $(textboxEl.siblings('#chat-msg-btn-add')[0]);
 
+            if(textboxEl.val().trim().length > 0) {
+                button.removeAttr('disabled');
+                button.removeClass('disabled');
+            } else {
+                button.attr('disabled', true);
+                button.addClass('disabled');
+            }
+        },
         updateLayout: function (applyUsersAutoSizig) {
             var me = this;
             var height = this.panelBox.height();

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

@@ -98,6 +98,17 @@ define([
                 var text = $(this.el).find('textarea');
                 return (text && text.length) ? text.val().trim() : '';
             },
+            disableTextBoxButton: function(textboxEl) {
+                var button = $(textboxEl.siblings('#id-comments-change')[0]);
+
+                if(textboxEl.val().trim().length > 0) {
+                    button.removeAttr('disabled');
+                    button.removeClass('disabled');
+                } else {
+                    button.attr('disabled', true);
+                    button.addClass('disabled');
+                }
+            },
             autoHeightTextBox: function () {
                 var view = this,
                     textBox = $(this.el).find('textarea'),
@@ -127,13 +138,19 @@ define([
                     view.autoScrollToEditButtons();
                 }
 
+                function onTextareaInput(event) {
+                    updateTextBoxHeight();
+                    view.disableTextBoxButton($(event.target));
+                }
+
                 if (textBox && textBox.length) {
                     domTextBox = textBox.get(0);
 
+                    view.disableTextBoxButton(textBox);
                     if (domTextBox) {
                         lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
                         updateTextBoxHeight();
-                        textBox.bind('input propertychange', updateTextBoxHeight)
+                        textBox.bind('input propertychange', onTextareaInput)
                     }
                 }
 
@@ -171,7 +188,7 @@ define([
 
         addCommentHeight: 45,
         newCommentHeight: 110,
-        textBoxAutoSizeLocked: undefined, // disable autosize textbox
+        textBoxAutoSizeLocked: undefined, // disable autoHeightTextBoxsize textbox
         viewmode: false,
 
         _commentsViewOnItemClick: function (picker, item, record, e) {
@@ -694,7 +711,17 @@ define([
                 this.layout.setResizeValue(0, container.height() - this.addCommentHeight);
             }
         },
+        disableTextBoxButton: function(textboxEl) {
+            var button = $(textboxEl.parent().siblings('.add')[0]);
 
+            if(textboxEl.val().trim().length > 0) {
+                button.removeAttr('disabled');
+                button.removeClass('disabled');
+            } else {
+                button.attr('disabled', true);
+                button.addClass('disabled');
+            }
+        },
         autoHeightTextBox: function () {
             var me = this, domTextBox = null, lineHeight = 0, minHeight = 44;
             var textBox = $('#comment-msg-new', this.el);
@@ -736,9 +763,15 @@ define([
                         Math.min(height - contentHeight - textBoxMinHeightIndent, height - me.newCommentHeight)));
             }
 
+            function onTextareaInput(event) {
+                updateTextBoxHeight();
+                me.disableTextBoxButton($(event.target));
+            }
+
+            me.disableTextBoxButton(textBox);
             lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
             updateTextBoxHeight();
-            textBox.bind('input propertychange', updateTextBoxHeight);
+            textBox.bind('input propertychange', onTextareaInput);
 
             this.textBox = textBox;
         },

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

@@ -173,6 +173,17 @@ define([
                         var text = $(this.el).find('textarea');
                         return (text && text.length) ? text.val().trim() : '';
                     },
+                    disableTextBoxButton: function(textboxEl) {
+                        var button = $(textboxEl.siblings('#id-comments-change-popover')[0]);
+
+                        if(textboxEl.val().trim().length > 0) {
+                            button.removeAttr('disabled');
+                            button.removeClass('disabled');
+                        } else {
+                            button.attr('disabled', true);
+                            button.addClass('disabled');
+                        }
+                    },
                     autoHeightTextBox: function () {
                         var view = this,
                             textBox = this.$el.find('textarea'),
@@ -183,6 +194,7 @@ define([
                             oldHeight = 0,
                             newHeight = 0;
 
+
                         function updateTextBoxHeight() {
                             scrollPos = parentView.scroller.getScrollTop();
                             if (domTextBox.scrollHeight > domTextBox.clientHeight) {
@@ -211,13 +223,20 @@ define([
                             parentView.autoScrollToEditButtons();
                         }
 
+                        function onTextareaInput(event) {
+                            updateTextBoxHeight();
+                            view.disableTextBoxButton($(event.target));
+                        }
+
+
                         if (textBox && textBox.length && parentView.scroller) {
                             domTextBox = textBox.get(0);
 
+                            view.disableTextBoxButton(textBox);
                             if (domTextBox) {
                                 lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
                                 updateTextBoxHeight();
-                                textBox.bind('input propertychange', updateTextBoxHeight)
+                                textBox.bind('input propertychange', onTextareaInput)
                             }
                         }
 
@@ -240,13 +259,14 @@ define([
                         el: $('#id-comments-popover'),
                         itemTemplate: _.template(replaceWords(commentsTemplate, {
                                 textAddReply: me.textAddReply,
+                                textMentionReply: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textAddReply,
                                 textAdd: me.textAdd,
                                 textCancel: me.textCancel,
                                 textEdit: me.textEdit,
                                 textReply: me.textReply,
                                 textClose: me.textClose,
                                 maxCommLength: Asc.c_oAscMaxCellOrCommentLength,
-                                textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : ''
+                                textMentionComment: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : me.textEnterComment
                             })
                         )
                     });
@@ -321,7 +341,9 @@ define([
 
                             if (record.get('hint')) {
                                 me.fireEvent('comment:disableHint', [record]);
-                                return;
+
+                                if(!record.get('fullInfoInHint'))
+                                    return;
                             }
 
                             if (btn.hasClass('btn-edit')) {
@@ -516,8 +538,10 @@ define([
                         },
                         'animate:before': function () {
                             var text = me.$window.find('textarea');
-                            if (text && text.length)
+                            if (text && text.length){
                                 text.focus();
+                                me.commentsView.disableTextBoxButton(text);
+                            }
                         }
                     });
                 }
@@ -1292,6 +1316,7 @@ define([
         textFollowMove          : 'Follow Move',
         textMention             : '+mention will provide access to the document and send an email',
         textMentionNotify       : '+mention will notify the user via email',
+        textEnterComment        : 'Enter your comment here',
         textViewResolved        : 'You have not permission for reopen comment',
         txtAccept: 'Accept',
         txtReject: 'Reject',

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

@@ -70,7 +70,7 @@
         label {
             color: @text-normal-ie;
             color: @text-normal;
-            font: 12px arial;
+            font-size: 12px;
             line-height: normal;
             border-bottom: @scaled-one-px-value-ie dotted @text-normal-ie;
             border-bottom: @scaled-one-px-value dotted @text-normal;
@@ -120,7 +120,7 @@
 .dataview-ct {
     width: 100%;
     height: 100%;
-    font: 12px arial;
+    font-size: 12px;
     line-height: normal;
     position: relative;
     overflow: hidden;

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

@@ -298,4 +298,7 @@ body {
     &.pixel-ratio__1_75 {
         image-rendering: crisp-edges; // FF only
     }
+
+    font-family: @font-family-sans-serif;
+    font-family: @font-family-base;
 }

apps/common/main/resources/less/variables.less

@@ -60,7 +60,7 @@
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-tahoma:      tahoma, arial, verdana, sans-serif;
-@font-family-base:        @font-family-sans-serif;
+@font-family-base:        var(--font-family-base-custom, @font-family-sans-serif), @font-family-sans-serif;
 
 @font-size-base:          11px;
 @font-size-large:         13px;

apps/common/mobile/resources/css/skeleton.css

@@ -116,3 +116,31 @@ body.theme-type-dark {
     50%  { opacity:1; }
     100% { opacity:0.1; }
 }
+
+.md .navbar.navbar-with-logo {
+    height: 34px;
+}
+
+.ios .navbar.navbar-with-logo {
+    height: 26px;
+}
+
+:root .theme-type-dark {
+    --f7-navbar-bg-color: #232323;
+    --f7-subnavbar-bg-color: #232323;
+}
+
+.md .word-editor {
+    --f7-navbar-bg-color: var(--background-navbar-word, #446995);
+    --f7-subnavbar-bg-color: var(--background-navbar-word, #446995);
+}
+
+.md .cell-editor {
+    --f7-navbar-bg-color: var(--background-navbar-word, #40865c);
+    --f7-subnavbar-bg-color: var(--background-navbar-word, #40865c);
+}
+
+.md .slide-editor {
+    --f7-navbar-bg-color: var(--background-navbar-word, #aa5252);
+    --f7-subnavbar-bg-color: var(--background-navbar-word, #aa5252);
+}

apps/common/mobile/resources/less/common.less

@@ -25,12 +25,12 @@
     }
 }
 
-.navbar {
+//.navbar {
-    .title {
+//    .title {
-        text-overflow: initial;
+//        text-overflow: initial;
-        white-space: normal;
+//        white-space: normal;
-    }
+//    }
-}
+//}
 
 .navbar-hidden {
     transform: translate3d(0, calc(-1 * (var(--f7-navbar-height) + var(--f7-subnavbar-height))), 0);
@@ -48,9 +48,12 @@
     .subnavbar-inner {
         padding: 0;
         .title {
-            white-space: nowrap;
+            //white-space: nowrap;
             overflow: hidden;
-            text-overflow: ellipsis;
+            text-overflow: initial;
+            margin: 0;
+            padding: 0;
+            flex-shrink: initial;
         }
     }
     .icon-back {

apps/common/mobile/utils/htmlutils.js

@@ -15,11 +15,11 @@ if ( localStorage && localStorage.getItem('mobile-mode-direction') === 'rtl' ) {
     load_stylesheet('./css/framework7.css')
 }
 
-let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("ui-theme"));
+let obj = !localStorage ? {id: 'theme-light', type: 'light'} : JSON.parse(localStorage.getItem("mobile-ui-theme"));
 if ( !obj ) {
     obj = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ?
         {id: 'theme-dark', type: 'dark'} : {id: 'theme-light', type: 'light'};
-    localStorage && localStorage.setItem("ui-theme", JSON.stringify(obj));
+    localStorage && localStorage.setItem("mobile-ui-theme", JSON.stringify(obj));
 }
 
-document.body.classList.add(`theme-type-${obj.type}`);
+document.body.classList.add(`theme-type-${obj.type}`, `${window.asceditor}-editor`);

apps/documenteditor/embed/js/ApplicationController.js

@@ -753,6 +753,19 @@ DE.ApplicationController = new(function(){
                 message = me.errorTokenExpire;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                if (errData === 'pdf')
+                    message = me.errorInconsistentExtPdf.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'docx')
+                    message = me.errorInconsistentExtDocx.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'xlsx')
+                    message = me.errorInconsistentExtXlsx.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'pptx')
+                    message = me.errorInconsistentExtPptx.replace('%1', docConfig.fileType || '');
+                else
+                    message = me.errorInconsistentExt;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -962,6 +975,11 @@ DE.ApplicationController = new(function(){
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
         errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
         openErrorText: 'An error has occurred while opening the file',
-        textCtrl: 'Ctrl'
+        textCtrl: 'Ctrl',
+        errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
+        errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
     }
 })();

apps/documenteditor/embed/locale/de.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.<br>Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.",
   "DE.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
+  "DE.ApplicationController.errorInconsistentExt": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei stimmt nicht mit der Dateierweiterung überein.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Textdokumenten (z.B. docx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht einem der folgenden Formate: pdf/djvu/xps/oxps, aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Präsentationen (z.B. pptx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Tabellenkalkulationen (z.B. xlsx), aber die Datei hat die inkonsistente Erweiterung: %1.",
   "DE.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.ApplicationController.errorSubmit": "Fehler beim Senden.",
   "DE.ApplicationController.errorTokenExpire": "Sicherheitstoken des Dokuments ist abgelaufen.<br>Wenden Sie sich an Ihren Serveradministrator.",

apps/documenteditor/embed/locale/el.json

@@ -26,6 +26,7 @@
   "DE.ApplicationController.scriptLoadError": "Η σύνδεση είναι πολύ αργή, δεν ήταν δυνατή η φόρτωση ορισμένων στοιχείων. Φορτώστε ξανά τη σελίδα.",
   "DE.ApplicationController.textAnonymous": "Ανώνυμος",
   "DE.ApplicationController.textClear": "Εκκαθάριση Όλων των Πεδίων",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Ελήφθη",
   "DE.ApplicationController.textGuest": "Επισκέπτης",
   "DE.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου",

apps/documenteditor/embed/locale/en.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.ApplicationController.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.ApplicationController.errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
   "DE.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "DE.ApplicationController.errorSubmit": "Submit failed.",
   "DE.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",

apps/documenteditor/embed/locale/ru.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.ApplicationController.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
+  "DE.ApplicationController.errorInconsistentExt": "При открытии файла произошла ошибка.<br>Содержимое файла не соответствует расширению файла.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует документам (например, docx), но файл имеет несоответствующее расширение: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует одному из следующих форматов: pdf/djvu/xps/oxps, но файл имеет несоответствующее расширение: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует презентациям (например, pptx), но файл имеет несоответствующее расширение: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует электронным таблицам (например, xlsx), но файл имеет несоответствующее расширение: %1.",
   "DE.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorSubmit": "Не удалось отправить.",
   "DE.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -301,6 +301,20 @@ define([
                     config.msg = this.errorTextFormWrongFormat;
                     break;
 
+                case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                    config.maxwidth = 600;
+                    if (errData === 'pdf')
+                        config.msg = this.errorInconsistentExtPdf.replace('%1', this.document.fileType || '');
+                    else if  (errData === 'docx')
+                        config.msg = this.errorInconsistentExtDocx.replace('%1', this.document.fileType || '');
+                    else if  (errData === 'xlsx')
+                        config.msg = this.errorInconsistentExtXlsx.replace('%1', this.document.fileType || '');
+                    else if  (errData === 'pptx')
+                        config.msg = this.errorInconsistentExtPptx.replace('%1', this.document.fileType || '');
+                    else
+                        config.msg = this.errorInconsistentExt;
+                    break;
+
                 default:
                     config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                     break;
@@ -1909,7 +1923,12 @@ define([
         textSaveAsDesktop: 'Save as...',
         warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
         titleLicenseExp: 'License expired',
-        errorTextFormWrongFormat: 'The value entered does not match the format of the field.'
+        errorTextFormWrongFormat: 'The value entered does not match the format of the field.',
+        errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
+        errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
 
     }, DE.Controllers.ApplicationController));
 

apps/documenteditor/forms/locale/ca.json

@@ -53,7 +53,7 @@
   "Common.UI.Window.yesButtonText": "Sí",
   "Common.Views.CopyWarningDialog.textDontShow": "No tornis a mostrar aquest missatge",
   "Common.Views.CopyWarningDialog.textMsg": "Les accions de copia, retalla i enganxa utilitzant el menú contextual només es realitzaran dins d'aquesta pestanya de l'editor. <br><br>Per copiar o enganxar a o des d'aplicacions fora de la pestanya de l'editor utilitza les següents combinacions de teclat:",
-  "Common.Views.CopyWarningDialog.textTitle": "Accions de copia, talla i enganxa ",
+  "Common.Views.CopyWarningDialog.textTitle": "Accions de Copiar, Tallar i Enganxar ",
   "Common.Views.CopyWarningDialog.textToCopy": "Per copiar",
   "Common.Views.CopyWarningDialog.textToCut": "Per tallar",
   "Common.Views.CopyWarningDialog.textToPaste": "Per enganxar",
@@ -65,7 +65,7 @@
   "Common.Views.ImageFromUrlDialog.textUrl": "Enganxa un URL d'imatge:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Aquest camp és obligatori",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "Aquest camp hauria de ser un URL amb el format \"http://www.example.com\"",
-  "Common.Views.OpenDialog.closeButtonText": "Tanca el fitxer",
+  "Common.Views.OpenDialog.closeButtonText": "Tancar fitxer",
   "Common.Views.OpenDialog.txtEncoding": "Codificació",
   "Common.Views.OpenDialog.txtIncorrectPwd": "La contrasenya no és correcta.",
   "Common.Views.OpenDialog.txtOpenFile": "Introduïu una contrasenya per obrir el fitxer",
@@ -73,11 +73,11 @@
   "Common.Views.OpenDialog.txtPreview": "Visualització prèvia",
   "Common.Views.OpenDialog.txtProtected": "Un cop introduïu la contrasenya i obriu el fitxer, es restablirà la contrasenya actual del fitxer.",
   "Common.Views.OpenDialog.txtTitle": "Tria les opcions %1",
-  "Common.Views.OpenDialog.txtTitleProtected": "El fitxer està protegit",
+  "Common.Views.OpenDialog.txtTitleProtected": "Arxiu Protegit",
   "Common.Views.SaveAsDlg.textLoading": "S'està carregant",
   "Common.Views.SaveAsDlg.textTitle": "Carpeta per desar",
   "Common.Views.SelectFileDlg.textLoading": "S'està carregant",
-  "Common.Views.SelectFileDlg.textTitle": "Seleccioneu l'origen de les dades",
+  "Common.Views.SelectFileDlg.textTitle": "Selecciona l'origen de les dades",
   "Common.Views.ShareDialog.textTitle": "Comparteix l'enllaç",
   "Common.Views.ShareDialog.txtCopy": "Copia al porta-retalls",
   "Common.Views.ShareDialog.warnCopy": "Error del navegador! Utilitzeu la drecera de teclat [Ctrl] + [C]",

apps/documenteditor/forms/locale/de.json

@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.<br>Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.",
   "DE.Controllers.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei stimmt nicht mit der Dateierweiterung überein.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Textdokumenten (z.B. docx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht einem der folgenden Formate: pdf/djvu/xps/oxps, aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Präsentationen (z.B. pptx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Tabellenkalkulationen (z.B. xlsx), aber die Datei hat die inkonsistente Erweiterung: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Version des Editors wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Die Bearbeitungssitzung des Dokumentes ist abgelaufen. Laden Sie die Seite neu.",

apps/documenteditor/forms/locale/el.json

@@ -65,7 +65,7 @@
   "Common.Views.ImageFromUrlDialog.textUrl": "Επικόλληση URL εικόνας:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Αυτό το πεδίο είναι υποχρεωτικό",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "Αυτό το πεδίο πρέπει να είναι διεύθυνση URL με τη μορφή «http://www.example.com»",
-  "Common.Views.OpenDialog.closeButtonText": "Κλείσιμο Αρχείου",
+  "Common.Views.OpenDialog.closeButtonText": "Κλείσιμο αρχείου",
   "Common.Views.OpenDialog.txtEncoding": "Κωδικοποίηση",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Το συνθηματικό είναι εσφαλμένο.",
   "Common.Views.OpenDialog.txtOpenFile": "Εισάγετε συνθηματικό για να ανοίξετε το αρχείο",

apps/documenteditor/forms/locale/en.json

@@ -53,7 +53,7 @@
   "Common.UI.Window.yesButtonText": "Yes",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
-  "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",
+  "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste actions",
   "Common.Views.CopyWarningDialog.textToCopy": "for Copy",
   "Common.Views.CopyWarningDialog.textToCut": "for Cut",
   "Common.Views.CopyWarningDialog.textToPaste": "for Paste",
@@ -65,7 +65,7 @@
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
-  "Common.Views.OpenDialog.closeButtonText": "Close File",
+  "Common.Views.OpenDialog.closeButtonText": "Close file",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
   "Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
@@ -73,12 +73,12 @@
   "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.OpenDialog.txtTitleProtected": "Protected file",
   "Common.Views.SaveAsDlg.textLoading": "Loading",
   "Common.Views.SaveAsDlg.textTitle": "Folder for save",
   "Common.Views.SelectFileDlg.textLoading": "Loading",
-  "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
+  "Common.Views.SelectFileDlg.textTitle": "Select data source",
-  "Common.Views.ShareDialog.textTitle": "Share Link",
+  "Common.Views.ShareDialog.textTitle": "Share link",
   "Common.Views.ShareDialog.txtCopy": "Copy to clipboard",
   "Common.Views.ShareDialog.warnCopy": "Browser's error! Use keyboard shortcut [Ctrl] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Conversion failed.",
@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.Controllers.ApplicationController.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.ApplicationController.errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "The document editing session has expired. Please reload the page.",

apps/documenteditor/forms/locale/ru.json

@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.ApplicationController.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "При открытии файла произошла ошибка.<br>Содержимое файла не соответствует расширению файла.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует документам (например, docx), но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует одному из следующих форматов: pdf/djvu/xps/oxps, но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует презентациям (например, pptx), но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует электронным таблицам (например, xlsx), но файл имеет несоответствующее расширение: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Время сеанса редактирования документа истекло. Пожалуйста, обновите страницу.",

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

@@ -2367,7 +2367,7 @@ define([
                         store: group.get('groupStore'),
                         scrollAlwaysVisible: true,
                         showLast: false,
-                        restoreHeight: 10000,
+                        restoreHeight: 450,
                         itemTemplate: _.template(
                             '<div class="item-equation" style="" >' +
                             '<div class="equation-icon" style="background-position:<%= posX %>px <%= posY %>px;width:<%= width %>px;height:<%= height %>px;" id="<%= id %>"></div>' +
@@ -2381,6 +2381,12 @@ define([
                     });
                     menu.off('show:before', onShowBefore);
                 };
+                var bringForward = function (menu) {
+                    eqContainer.addClass('has-open-menu');
+                };
+                var sendBackward = function (menu) {
+                    eqContainer.removeClass('has-open-menu');
+                };
                 for (var i = 0; i < equationsStore.length; ++i) {
                     var equationGroup = equationsStore.at(i);
                     var btn = new Common.UI.Button({
@@ -2399,6 +2405,8 @@ define([
                         })
                     });
                     btn.menu.on('show:before', onShowBefore);
+                    btn.menu.on('show:before', bringForward);
+                    btn.menu.on('hide:after', sendBackward);
                     me.equationBtns.push(btn);
                 }
 
@@ -2430,8 +2438,14 @@ define([
                 showPoint[1] = bounds[3] + 10;
                 !Common.Utils.InternalSettings.get("de-hidden-rulers") && (showPoint[1] -= 26);
             }
-            eqContainer.css({left: showPoint[0], top : Math.min(this._Height - eqContainer.outerHeight(), Math.max(0, showPoint[1]))});
+            showPoint[1] = Math.min(me._Height - eqContainer.outerHeight(), Math.max(0, showPoint[1]));
-            // menu.menuAlign = validation ? 'tr-br' : 'tl-bl';
+            eqContainer.css({left: showPoint[0], top : showPoint[1]});
+
+            var menuAlign = (me._Height - showPoint[1] - eqContainer.outerHeight() < 220) ? 'bl-tl' : 'tl-bl';
+            me.equationBtns.forEach(function(item){
+                item && (item.menu.menuAlign = menuAlign);
+            });
+            me.equationSettingsBtn.menu.menuAlign = menuAlign;
             if (eqContainer.is(':visible')) {
                 if (me.equationSettingsBtn.menu.isVisible()) {
                     me.equationSettingsBtn.menu.options.initMenu();

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

@@ -380,6 +380,19 @@ define([
                     Common.Utils.InternalSettings.set("guest-username", value);
                     Common.Utils.InternalSettings.set("save-guest-username", !!value);
                 }
+                if (this.appOptions.customization.font) {
+                    if (this.appOptions.customization.font.name && typeof this.appOptions.customization.font.name === 'string') {
+                        var arr = this.appOptions.customization.font.name.split(',');
+                        for (var i=0; i<arr.length; i++) {
+                            var item = arr[i].trim();
+                            if (item && (/[\s0-9\.]/).test(item)) {
+                                arr[i] = "'" + item + "'";
+                            }
+                        }
+                        document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
+                    }
+                }
+
                 this.editorConfig.user          =
                 this.appOptions.user            = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.appOptions.guestName + ')' ) : this.textAnonymous,
                                                                             Common.localStorage.getItem("guest-id") || ('uid-' + Date.now()));
@@ -1418,7 +1431,8 @@ define([
                         });
                     }
                 } else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt &&
-                            this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
+                            this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo ||
+                                                                                     this.editorConfig.customization.font && this.editorConfig.customization.font.name)) {
                     Common.UI.warning({
                         title: this.textPaidFeature,
                         msg  : this.textCustomLoader,
@@ -1983,6 +1997,20 @@ define([
                         config.msg = this.errorPasswordIsNotCorrect;
                         break;
 
+                    case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                        config.maxwidth = 600;
+                        if (errData === 'pdf')
+                            config.msg = this.errorInconsistentExtPdf.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'docx')
+                            config.msg = this.errorInconsistentExtDocx.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'xlsx')
+                            config.msg = this.errorInconsistentExtXlsx.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'pptx')
+                            config.msg = this.errorInconsistentExtPptx.replace('%1', this.document.fileType || '');
+                        else
+                            config.msg = this.errorInconsistentExt;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -3287,7 +3315,12 @@ define([
             errorPasswordIsNotCorrect: 'The password you supplied is not correct.<br>Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.',
             confirmMaxChangesSize: 'The size of actions exceeds the limitation set for your server.<br>Press "Undo" to cancel your last action or press "Continue" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).',
             textUndo: 'Undo',
-            textContinue: 'Continue'
+            textContinue: 'Continue',
+            errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
+            errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -69,7 +69,7 @@ define([
                         if (item.options.action === 'help') {
                             if ( panel.noHelpContents === true && navigator.onLine ) {
                                 this.fireEvent('item:click', [this, 'external-help', true]);
-                                window.open(panel.urlHelpCenter, '_blank');
+                                !!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
                                 return;
                             }
                         }

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

@@ -2019,7 +2019,14 @@ define([
             this.menu = options.menu;
             this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
             this.openUrl = null;
-            this.urlHelpCenter = '{{HELP_CENTER_WEB_DE}}';
+
+            if ( !Common.Utils.isIE ) {
+                if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_DE}}') ) {
+                    const _url_obj = new URL('{{HELP_CENTER_WEB_DE}}');
+                    _url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
+                    this.urlHelpCenter = _url_obj.toString();
+                }
+            }
 
             this.en_data = [
                 {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Document Editor user interface", "headername": "Program Interface"},

apps/documenteditor/main/locale/az.json

@@ -9,6 +9,7 @@
   "Common.Controllers.ExternalMergeEditor.textClose": "Bağla",
   "Common.Controllers.ExternalMergeEditor.warningText": "Obyekt deaktiv edilib, çünki o, başqa istifadəçi tərəfindən redaktə olunur.",
   "Common.Controllers.ExternalMergeEditor.warningTitle": "Xəbərdarlıq",
+  "Common.Controllers.ExternalOleEditor.textAnonymous": "Anonim",
   "Common.Controllers.History.notcriticalErrorTitle": "Xəbərdarlıq",
   "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "Sənədləri müqayisə etmək üçün edilən bütün dəyişikliklər qəbul edilmiş hesab ediləcək. Davam etmək istəyirsiniz?",
   "Common.Controllers.ReviewChanges.textAtLeast": "ən azı",
@@ -242,6 +243,7 @@
   "Common.Views.Comments.textAddComment": "Şərh Əlavə Et",
   "Common.Views.Comments.textAddCommentToDoc": "Sənədə şərh əlavə et",
   "Common.Views.Comments.textAddReply": "Cavab əlavə edin",
+  "Common.Views.Comments.textAll": "Bütün",
   "Common.Views.Comments.textAnonym": "Qonaq",
   "Common.Views.Comments.textCancel": "Ləğv et",
   "Common.Views.Comments.textClose": "Bağla",
@@ -433,6 +435,7 @@
   "Common.Views.ReviewPopover.txtReject": "Rədd edin",
   "Common.Views.SaveAsDlg.textLoading": "Yüklənir",
   "Common.Views.SaveAsDlg.textTitle": "Yadda saxlama üçün qovluq",
+  "Common.Views.SearchPanel.textCaseSensitive": "Böyük-kiçik hərflərə diqqət",
   "Common.Views.SelectFileDlg.textLoading": "Yüklənir",
   "Common.Views.SelectFileDlg.textTitle": "Verilənlər Mənbəyini Seçin",
   "Common.Views.SignDialog.textBold": "Qalın",
@@ -1978,6 +1981,7 @@
   "DE.Views.LineNumbersDialog.textStartAt": "Başlayın",
   "DE.Views.LineNumbersDialog.textTitle": "Sətir Nömrələri",
   "DE.Views.LineNumbersDialog.txtAutoText": "Avto",
+  "DE.Views.Links.capBtnAddText": "Mətn əlavə edin",
   "DE.Views.Links.capBtnBookmarks": "Əlfəcin",
   "DE.Views.Links.capBtnCaption": "Başlıq",
   "DE.Views.Links.capBtnContentsUpdate": "Təzələyin",
@@ -2662,6 +2666,7 @@
   "DE.Views.Toolbar.textTabLinks": "İstinadlar",
   "DE.Views.Toolbar.textTabProtect": "Qoruma",
   "DE.Views.Toolbar.textTabReview": "Nəzərdən keçir",
+  "DE.Views.Toolbar.textTabView": "Görünüş",
   "DE.Views.Toolbar.textTitleError": "Xəta",
   "DE.Views.Toolbar.textToCurrent": "Cari mövqeyə qədər",
   "DE.Views.Toolbar.textTop": "Yuxarı:",
@@ -2753,6 +2758,8 @@
   "DE.Views.Toolbar.txtScheme7": "Bərabərlik",
   "DE.Views.Toolbar.txtScheme8": "Axın",
   "DE.Views.Toolbar.txtScheme9": "Emalatxana",
+  "DE.Views.ViewTab.textInterfaceTheme": "İnterfeys mövzusu",
+  "DE.Views.ViewTab.tipInterfaceTheme": "İnterfeys mövzusu",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Avto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Qalın",
   "DE.Views.WatermarkSettingsDialog.textColor": "Mətn rəngi",

apps/documenteditor/main/locale/be.json

@@ -827,6 +827,7 @@
   "DE.Controllers.Main.txtSyntaxError": "Сінтаксічная памылка",
   "DE.Controllers.Main.txtTableInd": "Індэкс табліцы не можа быць нулём",
   "DE.Controllers.Main.txtTableOfContents": "Змест",
+  "DE.Controllers.Main.txtTableOfFigures": "Спіс ілюстрацый",
   "DE.Controllers.Main.txtTooLarge": "Лік занадта вялікі для фарматавання",
   "DE.Controllers.Main.txtTypeEquation": "Месца для раўнання.",
   "DE.Controllers.Main.txtUndefBookmark": "Закладка не вызначаная",
@@ -1682,6 +1683,7 @@
   "DE.Views.FileMenuPanels.Settings.strPasteButton": "Паказваць кнопку параметраў устаўкі падчас устаўкі",
   "DE.Views.FileMenuPanels.Settings.strShowChanges": "Адлюстроўваць змены падчас сумеснай працы",
   "DE.Views.FileMenuPanels.Settings.strStrict": "Строгі",
+  "DE.Views.FileMenuPanels.Settings.strTheme": "Тэма інтэрфейсу",
   "DE.Views.FileMenuPanels.Settings.strUnit": "Адзінкі вымярэння",
   "DE.Views.FileMenuPanels.Settings.strZoom": "Прадвызначанае значэнне маштабу",
   "DE.Views.FileMenuPanels.Settings.text10Minutes": "Кожныя 10 хвілін",
@@ -1937,6 +1939,7 @@
   "DE.Views.Links.capBtnInsContents": "Змест",
   "DE.Views.Links.capBtnInsFootnote": "Зноска",
   "DE.Views.Links.capBtnInsLink": "Гіперспасылка",
+  "DE.Views.Links.capBtnTOF": "Спіс ілюстрацый",
   "DE.Views.Links.confirmDeleteFootnotes": "Хочаце выдаліць усе зноскі?",
   "DE.Views.Links.confirmReplaceTOF": "Хочаце замяніць абраную табліцу фігур?",
   "DE.Views.Links.mniConvertNote": "Пераўтварыць усе зноскі",
@@ -2311,6 +2314,7 @@
   "DE.Views.TableOfContentsSettings.textStyles": "Стылі",
   "DE.Views.TableOfContentsSettings.textTable": "Табліца",
   "DE.Views.TableOfContentsSettings.textTitle": "Змест",
+  "DE.Views.TableOfContentsSettings.textTitleTOF": "Спіс ілюстрацый",
   "DE.Views.TableOfContentsSettings.txtCentered": "Па цэнтры",
   "DE.Views.TableOfContentsSettings.txtClassic": "Класічны",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Бягучы",
@@ -2705,6 +2709,7 @@
   "DE.Views.ViewTab.tipDarkDocument": "Цёмны дакумент",
   "DE.Views.ViewTab.tipFitToPage": "Па памеры старонкі",
   "DE.Views.ViewTab.tipFitToWidth": "Па шырыні",
+  "DE.Views.ViewTab.tipInterfaceTheme": "Тэма інтэрфейсу",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Аўта",
   "DE.Views.WatermarkSettingsDialog.textBold": "Тоўсты",
   "DE.Views.WatermarkSettingsDialog.textColor": "Колер тэксту",

apps/documenteditor/main/locale/ca.json

@@ -125,6 +125,61 @@
   "Common.define.chartData.textScatterSmoothMarker": "Dispersió amb línies suaus i marcadors",
   "Common.define.chartData.textStock": "Accions",
   "Common.define.chartData.textSurface": "Superfície",
+  "Common.define.smartArt.textAccentedPicture": "Imatge amb èmfasi",
+  "Common.define.smartArt.textAccentProcess": "Procés d'èmfasi",
+  "Common.define.smartArt.textAlternatingFlow": "Flux alternatiu",
+  "Common.define.smartArt.textAlternatingHexagons": "Hexàgons alternants",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Blocs d'imatges alternatius",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Cercles d'imatges alternatius",
+  "Common.define.smartArt.textArchitectureLayout": "Disposició de l'arquitectura",
+  "Common.define.smartArt.textArrowRibbon": "Banda amb fletxes",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Procés d'èmfasi d'imatge ascendent",
+  "Common.define.smartArt.textBalance": "Saldo",
+  "Common.define.smartArt.textBasicBendingProcess": "Procés corb bàsic",
+  "Common.define.smartArt.textBasicBlockList": "Llista de blocs bàsica",
+  "Common.define.smartArt.textBasicChevronProcess": "Procés angular bàsic",
+  "Common.define.smartArt.textBasicCycle": "Cicle bàsic",
+  "Common.define.smartArt.textBasicMatrix": "Matriu bàsica",
+  "Common.define.smartArt.textBasicPie": "Circular bàsic",
+  "Common.define.smartArt.textBasicProcess": "Procés bàsic",
+  "Common.define.smartArt.textBasicPyramid": "Piràmide bàsica",
+  "Common.define.smartArt.textBasicRadial": "Radial bàsic",
+  "Common.define.smartArt.textBasicTarget": "Destinació bàsica",
+  "Common.define.smartArt.textBasicTimeline": "Cronologia bàsica",
+  "Common.define.smartArt.textBasicVenn": "Venn bàsic",
+  "Common.define.smartArt.textBendingPictureAccentList": "Llista d'èmfasi d'imatges corba",
+  "Common.define.smartArt.textBendingPictureBlocks": "Blocs d'imatges corbes",
+  "Common.define.smartArt.textBendingPictureCaption": "Llegenda d'imatge corba",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Llista de llegendes d'imatges corba",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Text d'imatge semitransparent corb",
+  "Common.define.smartArt.textBlockCycle": "Cicle de blocs",
+  "Common.define.smartArt.textBubblePictureList": "Llista d'imatges de bombolla",
+  "Common.define.smartArt.textCaptionedPictures": "Imatges amb llegenda",
+  "Common.define.smartArt.textChevronAccentProcess": "Procés d'èmfasi angular",
+  "Common.define.smartArt.textChevronList": "Llista angular",
+  "Common.define.smartArt.textCircleAccentTimeline": "Cronologia d'èmfasi de cercle",
+  "Common.define.smartArt.textCircleArrowProcess": "Procés de fletxa circular",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Jerarquia d'imatge circular",
+  "Common.define.smartArt.textCircleProcess": "Procés circular",
+  "Common.define.smartArt.textCircleRelationship": "Relació circular",
+  "Common.define.smartArt.textCircularBendingProcess": "Procés corb circular",
+  "Common.define.smartArt.textCircularPictureCallout": "Crida d'imatge circular",
+  "Common.define.smartArt.textClosedChevronProcess": "Procés angular tancat",
+  "Common.define.smartArt.textContinuousArrowProcess": "Procés de fletxes continu",
+  "Common.define.smartArt.textContinuousBlockProcess": "Procés de blocs continu",
+  "Common.define.smartArt.textContinuousCycle": "Cicle continu",
+  "Common.define.smartArt.textContinuousPictureList": "Llista d'imatges contínua",
+  "Common.define.smartArt.textConvergingArrows": "Fletxes convergents",
+  "Common.define.smartArt.textConvergingRadial": "Radial convergent",
+  "Common.define.smartArt.textConvergingText": "Text convergent",
+  "Common.define.smartArt.textCounterbalanceArrows": "Fletxes de contrapès",
+  "Common.define.smartArt.textCycle": "Cicle",
+  "Common.define.smartArt.textCycleMatrix": "Matriu de cicle",
+  "Common.define.smartArt.textDescendingBlockList": "Llista de blocs descendents",
+  "Common.define.smartArt.textDescendingProcess": "Procés descendent",
+  "Common.define.smartArt.textDetailedProcess": "Procés detallat",
+  "Common.define.smartArt.textDivergingArrows": "Fletxes divergents",
+  "Common.define.smartArt.textDivergingRadial": "Radial divergent",
   "Common.Translation.textMoreButton": "Més",
   "Common.Translation.warnFileLocked": "No pots editar aquest fitxer perquè és obert en una altra aplicació.",
   "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
@@ -288,6 +343,7 @@
   "Common.Views.DocumentAccessDialog.textLoading": "S'està carregant...",
   "Common.Views.DocumentAccessDialog.textTitle": "Configuració per compartir",
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor de gràfics",
+  "Common.Views.ExternalEditor.textClose": "Tanca",
   "Common.Views.ExternalMergeEditor.textTitle": "Destinataris de la combinació de la correspondència",
   "Common.Views.ExternalOleEditor.textTitle": "Editor del full de càlcul",
   "Common.Views.Header.labelCoUsersDescr": "Usuaris que editen el fitxer:",
@@ -354,6 +410,7 @@
   "Common.Views.Plugins.textStart": "Inici",
   "Common.Views.Plugins.textStop": "Atura",
   "Common.Views.Protection.hintAddPwd": "Xifra amb contrasenya",
+  "Common.Views.Protection.hintDelPwd": "Suprimeix la contrasenya",
   "Common.Views.Protection.hintPwd": "Canvia o suprimeix la contrasenya",
   "Common.Views.Protection.hintSignature": "Afegeix una signatura digital o una línia de signatura",
   "Common.Views.Protection.txtAddPwd": "Afegeix una contrasenya",
@@ -499,6 +556,7 @@
   "Common.Views.SignDialog.tipFontName": "Nom de la lletra",
   "Common.Views.SignDialog.tipFontSize": "Mida de la lletra",
   "Common.Views.SignSettingsDialog.textAllowComment": "Permet al signant afegir comentaris al diàleg de signatura",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Abans de signar aquest document, comproveu que el contingut és correcte.",
   "Common.Views.SignSettingsDialog.textInfoEmail": "Correu electrònic",
   "Common.Views.SignSettingsDialog.textInfoName": "Nom",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Títol del signant",
@@ -640,6 +698,7 @@
   "DE.Controllers.Main.textClose": "Tanca",
   "DE.Controllers.Main.textCloseTip": "Feu clic per tancar el consell",
   "DE.Controllers.Main.textContactUs": "Contacta amb vendes",
+  "DE.Controllers.Main.textContinue": "Continua",
   "DE.Controllers.Main.textConvertEquation": "Aquesta equació es va crear amb una versió antiga de l'editor d'equacions que ja no és compatible. Per editar-la, converteix l’equació al format d’Office Math ML. <br>Vols convertir-ho ara?",
   "DE.Controllers.Main.textCustomLoader": "Tingueu en compte que, segons els termes de la llicència, no teniu dret a canviar el carregador. <br>Contacteu amb el nostre departament de vendes per obtenir un pressupost.",
   "DE.Controllers.Main.textDisconnect": "S'ha perdut la connexió",
@@ -1329,9 +1388,13 @@
   "DE.Views.CellsAddDialog.textRow": "Files",
   "DE.Views.CellsAddDialog.textTitle": "Insereix diversos",
   "DE.Views.CellsAddDialog.textUp": "Per damunt del cursor",
+  "DE.Views.ChartSettings.text3dDepth": "Profunditat (% de la base)",
   "DE.Views.ChartSettings.text3dRotation": "Rotació 3D",
   "DE.Views.ChartSettings.textAdvanced": "Mostra la configuració avançada",
+  "DE.Views.ChartSettings.textAutoscale": "Escala automàtica",
   "DE.Views.ChartSettings.textChartType": "Canvia el tipus de gràfic",
+  "DE.Views.ChartSettings.textDefault": "Rotació per defecte",
+  "DE.Views.ChartSettings.textDown": "Avall",
   "DE.Views.ChartSettings.textEditData": "Edita les dades",
   "DE.Views.ChartSettings.textHeight": "Alçada",
   "DE.Views.ChartSettings.textOriginalSize": "Mida real",
@@ -1429,6 +1492,8 @@
   "DE.Views.DateTimeDialog.textLang": "Idioma",
   "DE.Views.DateTimeDialog.textUpdate": "Actualitza automàticament",
   "DE.Views.DateTimeDialog.txtTitle": "Hora i data",
+  "DE.Views.DocProtection.hintProtectDoc": "Protegir document",
+  "DE.Views.DocProtection.txtProtectDoc": "Protegir document",
   "DE.Views.DocumentHolder.aboveText": "A dalt",
   "DE.Views.DocumentHolder.addCommentText": "Afegeix un comentari",
   "DE.Views.DocumentHolder.advancedDropCapText": "Configuració de la lletra de caixa alta",
@@ -1437,6 +1502,8 @@
   "DE.Views.DocumentHolder.advancedTableText": "Configuració avançada de la taula",
   "DE.Views.DocumentHolder.advancedText": "Configuració avançada",
   "DE.Views.DocumentHolder.alignmentText": "Alineació",
+  "DE.Views.DocumentHolder.allLinearText": "Tot lineal",
+  "DE.Views.DocumentHolder.allProfText": "Tot professional",
   "DE.Views.DocumentHolder.belowText": "Més avall",
   "DE.Views.DocumentHolder.breakBeforeText": "Salt de pàgina anterior",
   "DE.Views.DocumentHolder.bulletsText": "Pics i numeració",
@@ -1445,6 +1512,8 @@
   "DE.Views.DocumentHolder.centerText": "Centra",
   "DE.Views.DocumentHolder.chartText": "Configuració avançada del gràfic",
   "DE.Views.DocumentHolder.columnText": "Columna",
+  "DE.Views.DocumentHolder.currLinearText": "Lineal - actual",
+  "DE.Views.DocumentHolder.currProfText": "Professional - actual",
   "DE.Views.DocumentHolder.deleteColumnText": "Suprimeix la columna",
   "DE.Views.DocumentHolder.deleteRowText": "Suprimeix la fila",
   "DE.Views.DocumentHolder.deleteTableText": "Suprimeix la taula",
@@ -1457,6 +1526,7 @@
   "DE.Views.DocumentHolder.editFooterText": "Edita el peu de pàgina",
   "DE.Views.DocumentHolder.editHeaderText": "Edita la capçalera",
   "DE.Views.DocumentHolder.editHyperlinkText": "Edita l'enllaç",
+  "DE.Views.DocumentHolder.eqToInlineText": "Canvia a Inline",
   "DE.Views.DocumentHolder.guestText": "Convidat",
   "DE.Views.DocumentHolder.hyperlinkText": "Enllaç",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Ignora-ho tot",
@@ -2374,6 +2444,11 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Estableix només la vora superior",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automàtic",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Sense vores",
+  "DE.Views.ProtectDialog.textComments": "Comentaris",
+  "DE.Views.ProtectDialog.txtAllow": "Només permet aquest tipus d'edició del document",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "La contrasenya de confirmació no és idèntica",
+  "DE.Views.ProtectDialog.txtProtect": "Protegir",
+  "DE.Views.ProtectDialog.txtTitle": "Protegir",
   "DE.Views.RightMenu.txtChartSettings": "Configuració del gràfic",
   "DE.Views.RightMenu.txtFormSettings": "Configuració del formulari\n\t",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Configuració de la capçalera i el peu de pàgina",
@@ -2564,8 +2639,12 @@
   "DE.Views.TableSettings.tipOuter": "Estableix només la vora exterior",
   "DE.Views.TableSettings.tipRight": "Estableix només la vora exterior dreta",
   "DE.Views.TableSettings.tipTop": "Estableix només la vora superior externa",
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Taules amb vores i línies",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "personalitzat",
   "DE.Views.TableSettings.txtNoBorders": "Sense vores",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
+  "DE.Views.TableSettings.txtTable_Bordered": "Amb vores",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Amb vores i línies",
   "DE.Views.TableSettings.txtTable_Colorful": "Multicolor",
   "DE.Views.TableSettings.txtTable_Dark": "Fosc",
   "DE.Views.TableSettings.txtTable_GridTable": "Taula amb quadrícula",

apps/documenteditor/main/locale/de.json

@@ -125,6 +125,13 @@
   "Common.define.chartData.textScatterSmoothMarker": "Punkte mit interpolierten Linien und Datenpunkten",
   "Common.define.chartData.textStock": "Kurs",
   "Common.define.chartData.textSurface": "Oberfläche",
+  "Common.define.smartArt.textBalance": "Kontostand",
+  "Common.define.smartArt.textEquation": "Gleichung",
+  "Common.define.smartArt.textFunnel": "Trichter",
+  "Common.define.smartArt.textList": "Liste",
+  "Common.define.smartArt.textMatrix": "Matrix",
+  "Common.define.smartArt.textOther": "Sonstiges",
+  "Common.define.smartArt.textPicture": "Bild",
   "Common.Translation.textMoreButton": "Mehr",
   "Common.Translation.warnFileLocked": "Die Datei wird in einer anderen App bearbeitet. Sie können die Bearbeitung fortsetzen und die Kopie dieser Datei speichern.",
   "Common.Translation.warnFileLockedBtnEdit": "Kopie erstellen",
@@ -288,6 +295,8 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Ladevorgang...",
   "Common.Views.DocumentAccessDialog.textTitle": "Freigabeeinstellungen",
   "Common.Views.ExternalDiagramEditor.textTitle": "Diagramm bearbeiten",
+  "Common.Views.ExternalEditor.textClose": "Schließen",
+  "Common.Views.ExternalEditor.textSave": "Speichern und beenden",
   "Common.Views.ExternalMergeEditor.textTitle": "Seriendruckempfänger",
   "Common.Views.ExternalOleEditor.textTitle": "Editor der Tabellenkalkulationen",
   "Common.Views.Header.labelCoUsersDescr": "Das Dokument wird gerade von mehreren Benutzern bearbeitet.",
@@ -354,6 +363,7 @@
   "Common.Views.Plugins.textStart": "Starten",
   "Common.Views.Plugins.textStop": "Beenden",
   "Common.Views.Protection.hintAddPwd": "Mit Kennwort verschlüsseln",
+  "Common.Views.Protection.hintDelPwd": "Kennwort löschen",
   "Common.Views.Protection.hintPwd": "Das Kennwort ändern oder löschen",
   "Common.Views.Protection.hintSignature": "Digitale Signatur oder Unterschriftenzeile hinzufügen",
   "Common.Views.Protection.txtAddPwd": "Kennwort hinzufügen",
@@ -584,6 +594,7 @@
   "DE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden des Dokuments. Bitte wählen Sie eine andere Datei.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Merge ist fehlgeschlagen.",
   "DE.Controllers.Main.errorNoTOC": "Es gibt kein Inhaltsverzeichnis. Sie können es auf der Registerkarte \"Verweise\" einfügen.",
+  "DE.Controllers.Main.errorPasswordIsNotCorrect": "Das eingegebene Kennwort ist ungültig.<br>Stellen Sie sicher, dass die FESTSTELLTASTE nicht aktiviert ist und dass Sie die korrekte Groß-/Kleinschreibung verwenden.",
   "DE.Controllers.Main.errorProcessSaveResult": "Speichern ist fehlgeschlagen.",
   "DE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
   "DE.Controllers.Main.errorSessionAbsolute": "Die Bearbeitungssitzung des Dokumentes ist abgelaufen. Laden Sie die Seite neu.",
@@ -640,6 +651,7 @@
   "DE.Controllers.Main.textClose": "Schließen",
   "DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen",
   "DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
+  "DE.Controllers.Main.textContinue": "Fortsetzen",
   "DE.Controllers.Main.textConvertEquation": "Diese Gleichung wurde in einer alten Version des Gleichungseditors erstellt, die nicht mehr unterstützt wird. Um die Gleichung zu bearbeiten, konvertieren Sie diese ins Format Office Math ML. <br>Jetzt konvertieren?",
   "DE.Controllers.Main.textCustomLoader": "Bitte beachten Sie, dass Sie gemäß den Lizenzbedingungen nicht berechtigt sind, den Loader zu wechseln. <br> Wenden Sie sich an unseren Vertrieb, um ein Angebot zu erhalten.",
   "DE.Controllers.Main.textDisconnect": "Verbindung wurde unterbrochen",
@@ -660,6 +672,7 @@
   "DE.Controllers.Main.textStrict": "Formaler Modus",
   "DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind  für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Die Optionen Rückgängig/Wiederholen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.",
+  "DE.Controllers.Main.textUndo": "Rückgängig",
   "DE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
   "DE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
   "DE.Controllers.Main.titleUpdateVersion": "Version wurde geändert",
@@ -1331,12 +1344,17 @@
   "DE.Views.CellsAddDialog.textUp": "Über dem Cursor",
   "DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.ChartSettings.textChartType": "Diagrammtyp ändern",
+  "DE.Views.ChartSettings.textDown": "Unten",
   "DE.Views.ChartSettings.textEditData": "Daten ändern",
   "DE.Views.ChartSettings.textHeight": "Höhe",
+  "DE.Views.ChartSettings.textLeft": "Links",
   "DE.Views.ChartSettings.textOriginalSize": "Tatsächliche Größe",
+  "DE.Views.ChartSettings.textPerspective": "Perspektive",
+  "DE.Views.ChartSettings.textRight": "Rechts",
   "DE.Views.ChartSettings.textSize": "Größe",
   "DE.Views.ChartSettings.textStyle": "Stil",
   "DE.Views.ChartSettings.textUndock": "Seitenbereich abdocken",
+  "DE.Views.ChartSettings.textUp": "Aufwärts",
   "DE.Views.ChartSettings.textWidth": "Breite",
   "DE.Views.ChartSettings.textWrap": "Textumbruch",
   "DE.Views.ChartSettings.txtBehind": "Hinter dem Text",
@@ -1428,6 +1446,8 @@
   "DE.Views.DateTimeDialog.textLang": "Sprache",
   "DE.Views.DateTimeDialog.textUpdate": "Automatisch aktualisieren",
   "DE.Views.DateTimeDialog.txtTitle": "Datum & Uhrzeit",
+  "DE.Views.DocProtection.hintProtectDoc": "Datei schützen",
+  "DE.Views.DocProtection.txtProtectDoc": "Datei schützen",
   "DE.Views.DocumentHolder.aboveText": "Oben",
   "DE.Views.DocumentHolder.addCommentText": "Kommentar hinzufügen",
   "DE.Views.DocumentHolder.advancedDropCapText": "Initialformatierung",
@@ -1753,6 +1773,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiken",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Thema",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbole",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Tags",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titel",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Hochgeladen",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Wörter",
@@ -2066,6 +2087,7 @@
   "DE.Views.LeftMenu.tipComments": "Kommentare",
   "DE.Views.LeftMenu.tipNavigation": "Navigation",
   "DE.Views.LeftMenu.tipOutline": "Überschriften",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Miniaturansichten",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Suchen",
   "DE.Views.LeftMenu.tipSupport": "Feedback und Support",
@@ -2373,6 +2395,14 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Nur obere Rahmenlinie festlegen",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatisch",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Keine Rahmen",
+  "DE.Views.ProtectDialog.textComments": "Kommentare",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "Bestätigungseingabe ist nicht identisch",
+  "DE.Views.ProtectDialog.txtOptional": "optional",
+  "DE.Views.ProtectDialog.txtPassword": "Kennwort",
+  "DE.Views.ProtectDialog.txtProtect": "Schützen",
+  "DE.Views.ProtectDialog.txtRepeat": "Kennwort wiederholen",
+  "DE.Views.ProtectDialog.txtTitle": "Schützen",
+  "DE.Views.ProtectDialog.txtWarning": "Vorsicht: Wenn Sie das Kennwort verlieren oder vergessen, lässt es sich nicht mehr wiederherstellen. Bewahren Sie es an einem sicheren Ort auf.",
   "DE.Views.RightMenu.txtChartSettings": "Diagrammeinstellungen",
   "DE.Views.RightMenu.txtFormSettings": "Einstellungen des Formulars",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Kopf- und Fußzeileneinstellungen",
@@ -2563,6 +2593,7 @@
   "DE.Views.TableSettings.tipOuter": "Nur äußere Rahmenlinie festlegen",
   "DE.Views.TableSettings.tipRight": "Nur äußere rechte Rahmenlinie festlegen",
   "DE.Views.TableSettings.tipTop": "Nur äußere obere Rahmenlinie festlegen",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Einstellbar",
   "DE.Views.TableSettings.txtNoBorders": "Keine Rahmen",
   "DE.Views.TableSettings.txtTable_Accent": "Akzent",
   "DE.Views.TableSettings.txtTable_Colorful": "Farbig",
@@ -2690,7 +2721,7 @@
   "DE.Views.TextToTableDialog.textTitle": "Text in Tabelle umwandeln",
   "DE.Views.TextToTableDialog.textWindow": "An Fenster autoanpassen",
   "DE.Views.TextToTableDialog.txtAutoText": "Automatisch",
-  "DE.Views.Toolbar.capBtnAddComment": "Kommentar hinzufügen",
+  "DE.Views.Toolbar.capBtnAddComment": "Kommentar Hinzufügen",
   "DE.Views.Toolbar.capBtnBlankPage": "Leere Seite",
   "DE.Views.Toolbar.capBtnColumns": "Spalten",
   "DE.Views.Toolbar.capBtnComment": "Kommentar",
@@ -2703,6 +2734,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Bild",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Umbrüche",
   "DE.Views.Toolbar.capBtnInsShape": "Form",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Symbol",
   "DE.Views.Toolbar.capBtnInsTable": "Tabelle",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",

apps/documenteditor/main/locale/en.json

@@ -343,12 +343,12 @@
   "Common.UI.SearchDialog.textMatchCase": "Case sensitive",
   "Common.UI.SearchDialog.textReplaceDef": "Enter the replacement text",
   "Common.UI.SearchDialog.textSearchStart": "Enter your text here",
-  "Common.UI.SearchDialog.textTitle": "Find and Replace",
+  "Common.UI.SearchDialog.textTitle": "Find and replace",
   "Common.UI.SearchDialog.textTitle2": "Find",
   "Common.UI.SearchDialog.textWholeWords": "Whole words only",
   "Common.UI.SearchDialog.txtBtnHideReplace": "Hide Replace",
   "Common.UI.SearchDialog.txtBtnReplace": "Replace",
-  "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All",
+  "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace all",
   "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
   "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br>Please click to save your changes and reload the updates.",
   "Common.UI.ThemeColorPalette.textRecentColors": "Recent Colors",
@@ -382,9 +382,9 @@
   "Common.Views.About.txtTel": "tel.: ",
   "Common.Views.About.txtVersion": "Version ",
   "Common.Views.AutoCorrectDialog.textAdd": "Add",
-  "Common.Views.AutoCorrectDialog.textApplyText": "Apply As You Type",
+  "Common.Views.AutoCorrectDialog.textApplyText": "Apply as you type",
   "Common.Views.AutoCorrectDialog.textAutoCorrect": "Text AutoCorrect",
-  "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat As You Type",
+  "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat as you type",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatic bulleted lists",
   "Common.Views.AutoCorrectDialog.textBy": "By",
   "Common.Views.AutoCorrectDialog.textDelete": "Delete",
@@ -396,10 +396,10 @@
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect",
   "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists",
   "Common.Views.AutoCorrectDialog.textQuotes": "\"Straight quotes\" with \"smart quotes\"",
-  "Common.Views.AutoCorrectDialog.textRecognized": "Recognized Functions",
+  "Common.Views.AutoCorrectDialog.textRecognized": "Recognized functions",
   "Common.Views.AutoCorrectDialog.textRecognizedDesc": "The following expressions are recognized math expressions. They will not be automatically italicized.",
   "Common.Views.AutoCorrectDialog.textReplace": "Replace",
-  "Common.Views.AutoCorrectDialog.textReplaceText": "Replace As You Type",
+  "Common.Views.AutoCorrectDialog.textReplaceText": "Replace as you type",
   "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type",
   "Common.Views.AutoCorrectDialog.textReset": "Reset",
   "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default",
@@ -440,12 +440,12 @@
   "Common.Views.Comments.txtEmpty": "There are no comments in the document.",
   "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.<br><br>To copy or paste to or from applications outside the editor tab use the following keyboard combinations:",
-  "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions",
+  "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste actions",
   "Common.Views.CopyWarningDialog.textToCopy": "for Copy",
   "Common.Views.CopyWarningDialog.textToCut": "for Cut",
   "Common.Views.CopyWarningDialog.textToPaste": "for Paste",
   "Common.Views.DocumentAccessDialog.textLoading": "Loading...",
-  "Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings",
+  "Common.Views.DocumentAccessDialog.textTitle": "Sharing settings",
   "Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
   "Common.Views.ExternalEditor.textClose": "Close",
   "Common.Views.ExternalEditor.textSave": "Save & Exit",
@@ -485,14 +485,14 @@
   "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
   "Common.Views.InsertTableDialog.textInvalidRowsCols": "You need to specify valid rows and columns count.",
-  "Common.Views.InsertTableDialog.txtColumns": "Number of Columns",
+  "Common.Views.InsertTableDialog.txtColumns": "Number of columns",
   "Common.Views.InsertTableDialog.txtMaxText": "The maximum value for this field is {0}.",
   "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
-  "Common.Views.InsertTableDialog.txtRows": "Number of Rows",
+  "Common.Views.InsertTableDialog.txtRows": "Number of rows",
-  "Common.Views.InsertTableDialog.txtTitle": "Table Size",
+  "Common.Views.InsertTableDialog.txtTitle": "Table size",
-  "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
+  "Common.Views.InsertTableDialog.txtTitleSplit": "Split cell",
   "Common.Views.LanguageDialog.labelSelect": "Select document language",
-  "Common.Views.OpenDialog.closeButtonText": "Close File",
+  "Common.Views.OpenDialog.closeButtonText": "Close file",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
   "Common.Views.OpenDialog.txtOpenFile": "Enter a password to open the file",
@@ -500,12 +500,12 @@
   "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.OpenDialog.txtTitleProtected": "Protected file",
   "Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document",
   "Common.Views.PasswordDialog.txtIncorrectPwd": "Confirmation password is not identical",
   "Common.Views.PasswordDialog.txtPassword": "Password",
   "Common.Views.PasswordDialog.txtRepeat": "Repeat password",
-  "Common.Views.PasswordDialog.txtTitle": "Set Password",
+  "Common.Views.PasswordDialog.txtTitle": "Set password",
   "Common.Views.PasswordDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
   "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.Plugins.groupCaption": "Plugins",
@@ -598,20 +598,21 @@
   "Common.Views.ReviewChanges.txtSpelling": "Spell Checking",
   "Common.Views.ReviewChanges.txtTurnon": "Track Changes",
   "Common.Views.ReviewChanges.txtView": "Display Mode",
-  "Common.Views.ReviewChangesDialog.textTitle": "Review Changes",
+  "Common.Views.ReviewChangesDialog.textTitle": "Review changes",
   "Common.Views.ReviewChangesDialog.txtAccept": "Accept",
-  "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes",
+  "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept all changes",
-  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Accept Current Change",
+  "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Accept current change",
   "Common.Views.ReviewChangesDialog.txtNext": "To next change",
   "Common.Views.ReviewChangesDialog.txtPrev": "To previous change",
   "Common.Views.ReviewChangesDialog.txtReject": "Reject",
-  "Common.Views.ReviewChangesDialog.txtRejectAll": "Reject All Changes",
+  "Common.Views.ReviewChangesDialog.txtRejectAll": "Reject all changes",
-  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Reject Current Change",
+  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Reject current change",
   "Common.Views.ReviewPopover.textAdd": "Add",
   "Common.Views.ReviewPopover.textAddReply": "Add Reply",
   "Common.Views.ReviewPopover.textCancel": "Cancel",
   "Common.Views.ReviewPopover.textClose": "Close",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Enter your comment here",
   "Common.Views.ReviewPopover.textFollowMove": "Follow Move",
   "Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email",
   "Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email",
@@ -644,7 +645,7 @@
   "Common.Views.SearchPanel.tipNextResult": "Next result",
   "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
   "Common.Views.SelectFileDlg.textLoading": "Loading",
-  "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
+  "Common.Views.SelectFileDlg.textTitle": "Select data source",
   "Common.Views.SignDialog.textBold": "Bold",
   "Common.Views.SignDialog.textCertificate": "Certificate",
   "Common.Views.SignDialog.textChange": "Change",
@@ -653,13 +654,13 @@
   "Common.Views.SignDialog.textNameError": "Signer name must not be empty.",
   "Common.Views.SignDialog.textPurpose": "Purpose for signing this document",
   "Common.Views.SignDialog.textSelect": "Select",
-  "Common.Views.SignDialog.textSelectImage": "Select Image",
+  "Common.Views.SignDialog.textSelectImage": "Select image",
   "Common.Views.SignDialog.textSignature": "Signature looks as",
-  "Common.Views.SignDialog.textTitle": "Sign Document",
+  "Common.Views.SignDialog.textTitle": "Sign document",
   "Common.Views.SignDialog.textUseImage": "or click 'Select Image' to use a picture as signature",
   "Common.Views.SignDialog.textValid": "Valid from %1 to %2",
-  "Common.Views.SignDialog.tipFontName": "Font Name",
+  "Common.Views.SignDialog.tipFontName": "Font name",
-  "Common.Views.SignDialog.tipFontSize": "Font Size",
+  "Common.Views.SignDialog.tipFontSize": "Font size",
   "Common.Views.SignSettingsDialog.textAllowComment": "Allow signer to add comment in the signature dialog",
   "Common.Views.SignSettingsDialog.textDefInstruction": "Before signing this document, verify that the content you are signing is correct.",
   "Common.Views.SignSettingsDialog.textInfoEmail": "Suggested signer's e-mail",
@@ -667,35 +668,35 @@
   "Common.Views.SignSettingsDialog.textInfoTitle": "Suggested signer's title",
   "Common.Views.SignSettingsDialog.textInstructions": "Instructions for signer",
   "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line",
-  "Common.Views.SignSettingsDialog.textTitle": "Signature Setup",
+  "Common.Views.SignSettingsDialog.textTitle": "Signature setup",
   "Common.Views.SignSettingsDialog.txtEmpty": "This field is required",
   "Common.Views.SymbolTableDialog.textCharacter": "Character",
   "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value",
-  "Common.Views.SymbolTableDialog.textCopyright": "Copyright Sign",
+  "Common.Views.SymbolTableDialog.textCopyright": "Copyright sign",
-  "Common.Views.SymbolTableDialog.textDCQuote": "Closing Double Quote",
+  "Common.Views.SymbolTableDialog.textDCQuote": "Closing double quote",
-  "Common.Views.SymbolTableDialog.textDOQuote": "Opening Double Quote",
+  "Common.Views.SymbolTableDialog.textDOQuote": "Opening double quote",
-  "Common.Views.SymbolTableDialog.textEllipsis": "Horizontal Ellipsis",
+  "Common.Views.SymbolTableDialog.textEllipsis": "Horizontal ellipsis",
-  "Common.Views.SymbolTableDialog.textEmDash": "Em Dash",
+  "Common.Views.SymbolTableDialog.textEmDash": "Em dash",
-  "Common.Views.SymbolTableDialog.textEmSpace": "Em Space",
+  "Common.Views.SymbolTableDialog.textEmSpace": "Em space",
-  "Common.Views.SymbolTableDialog.textEnDash": "En Dash",
+  "Common.Views.SymbolTableDialog.textEnDash": "En dash",
-  "Common.Views.SymbolTableDialog.textEnSpace": "En Space",
+  "Common.Views.SymbolTableDialog.textEnSpace": "En space",
   "Common.Views.SymbolTableDialog.textFont": "Font",
-  "Common.Views.SymbolTableDialog.textNBHyphen": "Non-breaking Hyphen",
+  "Common.Views.SymbolTableDialog.textNBHyphen": "Non-breaking hyphen",
-  "Common.Views.SymbolTableDialog.textNBSpace": "No-break Space",
+  "Common.Views.SymbolTableDialog.textNBSpace": "No-break space",
-  "Common.Views.SymbolTableDialog.textPilcrow": "Pilcrow Sign",
+  "Common.Views.SymbolTableDialog.textPilcrow": "Pilcrow sign",
-  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em Space",
+  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em space",
   "Common.Views.SymbolTableDialog.textRange": "Range",
   "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols",
-  "Common.Views.SymbolTableDialog.textRegistered": "Registered Sign",
+  "Common.Views.SymbolTableDialog.textRegistered": "Registered sign",
-  "Common.Views.SymbolTableDialog.textSCQuote": "Closing Single Quote",
+  "Common.Views.SymbolTableDialog.textSCQuote": "Closing single quote",
-  "Common.Views.SymbolTableDialog.textSection": "Section Sign",
+  "Common.Views.SymbolTableDialog.textSection": "Section sign",
-  "Common.Views.SymbolTableDialog.textShortcut": "Shortcut Key",
+  "Common.Views.SymbolTableDialog.textShortcut": "Shortcut key",
-  "Common.Views.SymbolTableDialog.textSHyphen": "Soft Hyphen",
+  "Common.Views.SymbolTableDialog.textSHyphen": "Soft hyphen",
-  "Common.Views.SymbolTableDialog.textSOQuote": "Opening Single Quote",
+  "Common.Views.SymbolTableDialog.textSOQuote": "Opening single quote",
   "Common.Views.SymbolTableDialog.textSpecial": "Special characters",
   "Common.Views.SymbolTableDialog.textSymbols": "Symbols",
   "Common.Views.SymbolTableDialog.textTitle": "Symbol",
-  "Common.Views.SymbolTableDialog.textTradeMark": "Trademark Symbol ",
+  "Common.Views.SymbolTableDialog.textTradeMark": "Trademark symbol ",
   "Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
   "Common.Views.UserNameDialog.textLabel": "Label:",
   "Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
@@ -742,6 +743,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to a drive or try again later.",
+  "DE.Controllers.Main.errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
   "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
   "DE.Controllers.Main.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
@@ -1459,7 +1465,7 @@
   "DE.Views.BookmarksDialog.textClose": "Close",
   "DE.Views.BookmarksDialog.textCopy": "Copy",
   "DE.Views.BookmarksDialog.textDelete": "Delete",
-  "DE.Views.BookmarksDialog.textGetLink": "Get Link",
+  "DE.Views.BookmarksDialog.textGetLink": "Get link",
   "DE.Views.BookmarksDialog.textGoto": "Go to",
   "DE.Views.BookmarksDialog.textHidden": "Hidden bookmarks",
   "DE.Views.BookmarksDialog.textLocation": "Location",
@@ -1488,13 +1494,13 @@
   "DE.Views.CaptionDialog.textPeriod": "period",
   "DE.Views.CaptionDialog.textSeparator": "Use separator",
   "DE.Views.CaptionDialog.textTable": "Table",
-  "DE.Views.CaptionDialog.textTitle": "Insert Caption",
+  "DE.Views.CaptionDialog.textTitle": "Insert caption",
   "DE.Views.CellsAddDialog.textCol": "Columns",
   "DE.Views.CellsAddDialog.textDown": "Below the cursor",
   "DE.Views.CellsAddDialog.textLeft": "To the left",
   "DE.Views.CellsAddDialog.textRight": "To the right",
   "DE.Views.CellsAddDialog.textRow": "Rows",
-  "DE.Views.CellsAddDialog.textTitle": "Insert Several",
+  "DE.Views.CellsAddDialog.textTitle": "Insert several",
   "DE.Views.CellsAddDialog.textUp": "Above the cursor",
   "DE.Views.ChartSettings.text3dDepth": "Depth (% of base)",
   "DE.Views.ChartSettings.text3dHeight": "Height (% of base)",
@@ -1532,7 +1538,7 @@
   "DE.Views.ControlSettingsDialog.strGeneral": "General",
   "DE.Views.ControlSettingsDialog.textAdd": "Add",
   "DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
-  "DE.Views.ControlSettingsDialog.textApplyAll": "Apply to All",
+  "DE.Views.ControlSettingsDialog.textApplyAll": "Apply to all",
   "DE.Views.ControlSettingsDialog.textBox": "Bounding box",
   "DE.Views.ControlSettingsDialog.textChange": "Edit",
   "DE.Views.ControlSettingsDialog.textCheckbox": "Check box",
@@ -1553,7 +1559,7 @@
   "DE.Views.ControlSettingsDialog.textShowAs": "Show as",
   "DE.Views.ControlSettingsDialog.textSystemColor": "System",
   "DE.Views.ControlSettingsDialog.textTag": "Tag",
-  "DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
+  "DE.Views.ControlSettingsDialog.textTitle": "Content control settings",
   "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol",
   "DE.Views.ControlSettingsDialog.textUp": "Up",
   "DE.Views.ControlSettingsDialog.textValue": "Value",
@@ -1857,15 +1863,15 @@
   "DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
   "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
-  "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
+  "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop cap",
   "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
   "DE.Views.DropcapSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.DropcapSettingsAdvanced.textAtLeast": "At least",
   "DE.Views.DropcapSettingsAdvanced.textAuto": "Auto",
-  "DE.Views.DropcapSettingsAdvanced.textBackColor": "Background Color",
+  "DE.Views.DropcapSettingsAdvanced.textBackColor": "Background color",
-  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Border Color",
+  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Border color",
   "DE.Views.DropcapSettingsAdvanced.textBorderDesc": "Click on diagram or use buttons to select borders",
-  "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Border Size",
+  "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Border size",
   "DE.Views.DropcapSettingsAdvanced.textBottom": "Bottom",
   "DE.Views.DropcapSettingsAdvanced.textCenter": "Center",
   "DE.Views.DropcapSettingsAdvanced.textColumn": "Column",
@@ -1890,8 +1896,8 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "Relative to",
   "DE.Views.DropcapSettingsAdvanced.textRight": "Right",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Height in rows",
-  "DE.Views.DropcapSettingsAdvanced.textTitle": "Drop Cap - Advanced Settings",
+  "DE.Views.DropcapSettingsAdvanced.textTitle": "Drop cap - Advanced settings",
-  "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Frame - Advanced Settings",
+  "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Frame - Advanced settings",
   "DE.Views.DropcapSettingsAdvanced.textTop": "Top",
   "DE.Views.DropcapSettingsAdvanced.textVertical": "Vertical",
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Width",
@@ -2141,9 +2147,9 @@
   "DE.Views.HeaderFooterSettings.textTopRight": "Top right",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Selected text fragment",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Display",
-  "DE.Views.HyperlinkSettingsDialog.textExternal": "External Link",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "External link",
-  "DE.Views.HyperlinkSettingsDialog.textInternal": "Place in Document",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Place in document",
-  "DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
+  "DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink settings",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "ScreenTip text",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Link to",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Beginning of document",
@@ -2184,10 +2190,10 @@
   "DE.Views.ImageSettings.txtThrough": "Through",
   "DE.Views.ImageSettings.txtTight": "Tight",
   "DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
-  "DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
+  "DE.Views.ImageSettingsAdvanced.strMargins": "Text padding",
   "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Alignment",
-  "DE.Views.ImageSettingsAdvanced.textAlt": "Alternative Text",
+  "DE.Views.ImageSettingsAdvanced.textAlt": "Alternative text",
   "DE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
   "DE.Views.ImageSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart, or table.",
   "DE.Views.ImageSettingsAdvanced.textAltTitle": "Title",
@@ -2195,36 +2201,36 @@
   "DE.Views.ImageSettingsAdvanced.textArrows": "Arrows",
   "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Lock aspect ratio",
   "DE.Views.ImageSettingsAdvanced.textAutofit": "AutoFit",
-  "DE.Views.ImageSettingsAdvanced.textBeginSize": "Begin Size",
+  "DE.Views.ImageSettingsAdvanced.textBeginSize": "Begin size",
-  "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Begin Style",
+  "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Begin style",
   "DE.Views.ImageSettingsAdvanced.textBelow": "below",
   "DE.Views.ImageSettingsAdvanced.textBevel": "Bevel",
   "DE.Views.ImageSettingsAdvanced.textBottom": "Bottom",
-  "DE.Views.ImageSettingsAdvanced.textBottomMargin": "Bottom Margin",
+  "DE.Views.ImageSettingsAdvanced.textBottomMargin": "Bottom margin",
-  "DE.Views.ImageSettingsAdvanced.textBtnWrap": "Text Wrapping",
+  "DE.Views.ImageSettingsAdvanced.textBtnWrap": "Text wrapping",
-  "DE.Views.ImageSettingsAdvanced.textCapType": "Cap Type",
+  "DE.Views.ImageSettingsAdvanced.textCapType": "Cap type",
   "DE.Views.ImageSettingsAdvanced.textCenter": "Center",
   "DE.Views.ImageSettingsAdvanced.textCharacter": "Character",
   "DE.Views.ImageSettingsAdvanced.textColumn": "Column",
-  "DE.Views.ImageSettingsAdvanced.textDistance": "Distance from Text",
+  "DE.Views.ImageSettingsAdvanced.textDistance": "Distance from text",
-  "DE.Views.ImageSettingsAdvanced.textEndSize": "End Size",
+  "DE.Views.ImageSettingsAdvanced.textEndSize": "End size",
-  "DE.Views.ImageSettingsAdvanced.textEndStyle": "End Style",
+  "DE.Views.ImageSettingsAdvanced.textEndStyle": "End style",
   "DE.Views.ImageSettingsAdvanced.textFlat": "Flat",
   "DE.Views.ImageSettingsAdvanced.textFlipped": "Flipped",
   "DE.Views.ImageSettingsAdvanced.textHeight": "Height",
   "DE.Views.ImageSettingsAdvanced.textHorizontal": "Horizontal",
   "DE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally",
-  "DE.Views.ImageSettingsAdvanced.textJoinType": "Join Type",
+  "DE.Views.ImageSettingsAdvanced.textJoinType": "Join type",
   "DE.Views.ImageSettingsAdvanced.textKeepRatio": "Constant proportions",
   "DE.Views.ImageSettingsAdvanced.textLeft": "Left",
-  "DE.Views.ImageSettingsAdvanced.textLeftMargin": "Left Margin",
+  "DE.Views.ImageSettingsAdvanced.textLeftMargin": "Left margin",
   "DE.Views.ImageSettingsAdvanced.textLine": "Line",
-  "DE.Views.ImageSettingsAdvanced.textLineStyle": "Line Style",
+  "DE.Views.ImageSettingsAdvanced.textLineStyle": "Line style",
   "DE.Views.ImageSettingsAdvanced.textMargin": "Margin",
   "DE.Views.ImageSettingsAdvanced.textMiter": "Miter",
   "DE.Views.ImageSettingsAdvanced.textMove": "Move object with text",
   "DE.Views.ImageSettingsAdvanced.textOptions": "Options",
-  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size",
+  "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual size",
   "DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap",
   "DE.Views.ImageSettingsAdvanced.textPage": "Page",
   "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph",
@@ -2234,27 +2240,27 @@
   "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relative",
   "DE.Views.ImageSettingsAdvanced.textResizeFit": "Resize shape to fit text",
   "DE.Views.ImageSettingsAdvanced.textRight": "Right",
-  "DE.Views.ImageSettingsAdvanced.textRightMargin": "Right Margin",
+  "DE.Views.ImageSettingsAdvanced.textRightMargin": "Right margin",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "to the right of",
   "DE.Views.ImageSettingsAdvanced.textRotation": "Rotation",
   "DE.Views.ImageSettingsAdvanced.textRound": "Round",
-  "DE.Views.ImageSettingsAdvanced.textShape": "Shape Settings",
+  "DE.Views.ImageSettingsAdvanced.textShape": "Shape settings",
   "DE.Views.ImageSettingsAdvanced.textSize": "Size",
   "DE.Views.ImageSettingsAdvanced.textSquare": "Square",
-  "DE.Views.ImageSettingsAdvanced.textTextBox": "Text Box",
+  "DE.Views.ImageSettingsAdvanced.textTextBox": "Text box",
-  "DE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced Settings",
+  "DE.Views.ImageSettingsAdvanced.textTitle": "Image - Advanced settings",
-  "DE.Views.ImageSettingsAdvanced.textTitleChart": "Chart - Advanced Settings",
+  "DE.Views.ImageSettingsAdvanced.textTitleChart": "Chart - Advanced settings",
-  "DE.Views.ImageSettingsAdvanced.textTitleShape": "Shape - Advanced Settings",
+  "DE.Views.ImageSettingsAdvanced.textTitleShape": "Shape - Advanced settings",
   "DE.Views.ImageSettingsAdvanced.textTop": "Top",
-  "DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin",
+  "DE.Views.ImageSettingsAdvanced.textTopMargin": "Top margin",
   "DE.Views.ImageSettingsAdvanced.textVertical": "Vertical",
   "DE.Views.ImageSettingsAdvanced.textVertically": "Vertically",
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Weights & Arrows",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Width",
-  "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style",
+  "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping style",
-  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind Text",
+  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind text",
-  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "In Front of Text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "In front of text",
-  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "In Line with Text",
+  "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "In line with text",
   "DE.Views.ImageSettingsAdvanced.textWrapSquareTooltip": "Square",
   "DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Through",
   "DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "Tight",
@@ -2282,11 +2288,11 @@
   "DE.Views.LineNumbersDialog.textForward": "This point forward",
   "DE.Views.LineNumbersDialog.textFromText": "From text",
   "DE.Views.LineNumbersDialog.textNumbering": "Numbering",
-  "DE.Views.LineNumbersDialog.textRestartEachPage": "Restart Each Page",
+  "DE.Views.LineNumbersDialog.textRestartEachPage": "Restart each page",
-  "DE.Views.LineNumbersDialog.textRestartEachSection": "Restart Each Section",
+  "DE.Views.LineNumbersDialog.textRestartEachSection": "Restart each section",
   "DE.Views.LineNumbersDialog.textSection": "Current section",
   "DE.Views.LineNumbersDialog.textStartAt": "Start at",
-  "DE.Views.LineNumbersDialog.textTitle": "Line Numbers",
+  "DE.Views.LineNumbersDialog.textTitle": "Line numbers",
   "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnAddText": "Add Text",
   "DE.Views.Links.capBtnBookmarks": "Bookmark",
@@ -2335,13 +2341,13 @@
   "DE.Views.ListSettingsDialog.txtAlign": "Alignment",
   "DE.Views.ListSettingsDialog.txtBullet": "Bullet",
   "DE.Views.ListSettingsDialog.txtColor": "Color",
-  "DE.Views.ListSettingsDialog.txtFont": "Font and Symbol",
+  "DE.Views.ListSettingsDialog.txtFont": "Font and symbol",
   "DE.Views.ListSettingsDialog.txtLikeText": "Like a text",
   "DE.Views.ListSettingsDialog.txtNewBullet": "New bullet",
   "DE.Views.ListSettingsDialog.txtNone": "None",
   "DE.Views.ListSettingsDialog.txtSize": "Size",
   "DE.Views.ListSettingsDialog.txtSymbol": "Symbol",
-  "DE.Views.ListSettingsDialog.txtTitle": "List Settings",
+  "DE.Views.ListSettingsDialog.txtTitle": "List settings",
   "DE.Views.ListSettingsDialog.txtType": "Type",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
@@ -2353,8 +2359,8 @@
   "DE.Views.MailMergeEmailDlg.textFrom": "From",
   "DE.Views.MailMergeEmailDlg.textHTML": "HTML",
   "DE.Views.MailMergeEmailDlg.textMessage": "Message",
-  "DE.Views.MailMergeEmailDlg.textSubject": "Subject Line",
+  "DE.Views.MailMergeEmailDlg.textSubject": "Subject line",
-  "DE.Views.MailMergeEmailDlg.textTitle": "Send to Email",
+  "DE.Views.MailMergeEmailDlg.textTitle": "Send to email",
   "DE.Views.MailMergeEmailDlg.textTo": "To",
   "DE.Views.MailMergeEmailDlg.textWarning": "Warning!",
   "DE.Views.MailMergeEmailDlg.textWarningMsg": "Please note that mailing cannot be stopped once your click the 'Send' button.",
@@ -2413,7 +2419,7 @@
   "DE.Views.NoteSettingsDialog.textApply": "Apply",
   "DE.Views.NoteSettingsDialog.textApplyTo": "Apply changes to",
   "DE.Views.NoteSettingsDialog.textContinue": "Continuous",
-  "DE.Views.NoteSettingsDialog.textCustom": "Custom Mark",
+  "DE.Views.NoteSettingsDialog.textCustom": "Custom mark",
   "DE.Views.NoteSettingsDialog.textDocEnd": "End of document",
   "DE.Views.NoteSettingsDialog.textDocument": "Whole document",
   "DE.Views.NoteSettingsDialog.textEachPage": "Restart each page",
@@ -2424,16 +2430,16 @@
   "DE.Views.NoteSettingsDialog.textInsert": "Insert",
   "DE.Views.NoteSettingsDialog.textLocation": "Location",
   "DE.Views.NoteSettingsDialog.textNumbering": "Numbering",
-  "DE.Views.NoteSettingsDialog.textNumFormat": "Number Format",
+  "DE.Views.NoteSettingsDialog.textNumFormat": "Number format",
   "DE.Views.NoteSettingsDialog.textPageBottom": "Bottom of page",
   "DE.Views.NoteSettingsDialog.textSectEnd": "End of section",
   "DE.Views.NoteSettingsDialog.textSection": "Current section",
   "DE.Views.NoteSettingsDialog.textStart": "Start at",
   "DE.Views.NoteSettingsDialog.textTextBottom": "Below text",
-  "DE.Views.NoteSettingsDialog.textTitle": "Notes Settings",
+  "DE.Views.NoteSettingsDialog.textTitle": "Notes settings",
-  "DE.Views.NotesRemoveDialog.textEnd": "Delete All Endnotes",
+  "DE.Views.NotesRemoveDialog.textEnd": "Delete all endnotes",
-  "DE.Views.NotesRemoveDialog.textFoot": "Delete All Footnotes",
+  "DE.Views.NotesRemoveDialog.textFoot": "Delete all footnotes",
-  "DE.Views.NotesRemoveDialog.textTitle": "Delete Notes",
+  "DE.Views.NotesRemoveDialog.textTitle": "Delete notes",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.textBottom": "Bottom",
   "DE.Views.PageMarginsDialog.textGutter": "Gutter",
@@ -2455,7 +2461,7 @@
   "DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textPreset": "Preset",
-  "DE.Views.PageSizeDialog.textTitle": "Page Size",
+  "DE.Views.PageSizeDialog.textTitle": "Page size",
   "DE.Views.PageSizeDialog.textWidth": "Width",
   "DE.Views.PageSizeDialog.txtCustom": "Custom",
   "DE.Views.PageThumbnails.textClosePanel": "Close page thumbnails",
@@ -2489,7 +2495,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
   "DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
-  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line spacing",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
@@ -2501,7 +2507,7 @@
   "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Orphan control",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing",
-  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks",
+  "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page breaks",
   "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Placement",
   "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps",
   "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style",
@@ -2515,26 +2521,26 @@
   "DE.Views.ParagraphSettingsAdvanced.textAll": "All",
   "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least",
   "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
-  "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Background Color",
+  "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Background color",
-  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Basic Text",
+  "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Basic text",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Border Color",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Border color",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Click on diagram or use buttons to select borders and apply chosen style to them",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Border Size",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Border size",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Bottom",
   "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
-  "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Character Spacing",
+  "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Character spacing",
   "DE.Views.ParagraphSettingsAdvanced.textContext": "Contextual",
-  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Contextual and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Contextual and discretionary",
-  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Contextual, Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Contextual, historical and discretionary",
-  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Contextual and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Contextual and historical",
-  "DE.Views.ParagraphSettingsAdvanced.textDefault": "Default Tab",
+  "DE.Views.ParagraphSettingsAdvanced.textDefault": "Default tab",
   "DE.Views.ParagraphSettingsAdvanced.textDiscret": "Discretionary",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effects",
   "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactly",
   "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
   "DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
   "DE.Views.ParagraphSettingsAdvanced.textHistorical": "Historical",
-  "DE.Views.ParagraphSettingsAdvanced.textHistoricalDiscret": "Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textHistoricalDiscret": "Historical and discretionary",
   "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
   "DE.Views.ParagraphSettingsAdvanced.textLeader": "Leader",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Left",
@@ -2542,25 +2548,25 @@
   "DE.Views.ParagraphSettingsAdvanced.textLigatures": "Ligatures",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "None",
   "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
-  "DE.Views.ParagraphSettingsAdvanced.textOpenType": "OpenType Features",
+  "DE.Views.ParagraphSettingsAdvanced.textOpenType": "OpenType features",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Remove",
-  "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Remove All",
+  "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Remove all",
   "DE.Views.ParagraphSettingsAdvanced.textRight": "Right",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Specify",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Spacing",
   "DE.Views.ParagraphSettingsAdvanced.textStandard": "Standard only",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Standard and Contextual",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Standard and contextual",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Standard, Contextual and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Standard, contextual and discretionary",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Standard, Contextual and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Standard, contextual and historical",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Standard and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Standard and discretionary",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Standard, Historical and Discretionary",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Standard, historical and discretionary",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Standard and Historical",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Standard and historical",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Center",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Left",
-  "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position",
+  "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab position",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
-  "DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings",
+  "DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced settings",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "Top",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Set outer border and all inner lines",
   "DE.Views.ParagraphSettingsAdvanced.tipBottom": "Set bottom border only",
@@ -2685,20 +2691,20 @@
   "DE.Views.Statusbar.tipZoomIn": "Zoom in",
   "DE.Views.Statusbar.tipZoomOut": "Zoom out",
   "DE.Views.Statusbar.txtPageNumInvalid": "Page number invalid",
-  "DE.Views.StyleTitleDialog.textHeader": "Create New Style",
+  "DE.Views.StyleTitleDialog.textHeader": "Create new style",
   "DE.Views.StyleTitleDialog.textNextStyle": "Next paragraph style",
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
   "DE.Views.StyleTitleDialog.txtSameAs": "Same as created new style",
-  "DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",
+  "DE.Views.TableFormulaDialog.textBookmark": "Paste bookmark",
-  "DE.Views.TableFormulaDialog.textFormat": "Number Format",
+  "DE.Views.TableFormulaDialog.textFormat": "Number format",
   "DE.Views.TableFormulaDialog.textFormula": "Formula",
-  "DE.Views.TableFormulaDialog.textInsertFunction": "Paste Function",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Paste function",
-  "DE.Views.TableFormulaDialog.textTitle": "Formula Settings",
+  "DE.Views.TableFormulaDialog.textTitle": "Formula settings",
   "DE.Views.TableOfContentsSettings.strAlign": "Right align page numbers",
   "DE.Views.TableOfContentsSettings.strFullCaption": "Include label and number",
-  "DE.Views.TableOfContentsSettings.strLinks": "Format Table of Contents as links",
+  "DE.Views.TableOfContentsSettings.strLinks": "Format table of contents as links",
   "DE.Views.TableOfContentsSettings.strLinksOF": "Format table of figures as links",
   "DE.Views.TableOfContentsSettings.strShowPages": "Show page numbers",
   "DE.Views.TableOfContentsSettings.textBuildTable": "Build table of contents from",
@@ -2716,8 +2722,8 @@
   "DE.Views.TableOfContentsSettings.textStyle": "Style",
   "DE.Views.TableOfContentsSettings.textStyles": "Styles",
   "DE.Views.TableOfContentsSettings.textTable": "Table",
-  "DE.Views.TableOfContentsSettings.textTitle": "Table of Contents",
+  "DE.Views.TableOfContentsSettings.textTitle": "Table of contents",
-  "DE.Views.TableOfContentsSettings.textTitleTOF": "Table of Figures",
+  "DE.Views.TableOfContentsSettings.textTitleTOF": "Table of figures",
   "DE.Views.TableOfContentsSettings.txtCentered": "Centered",
   "DE.Views.TableOfContentsSettings.txtClassic": "Classic",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Current",
@@ -2794,33 +2800,33 @@
   "DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
-  "DE.Views.TableSettingsAdvanced.textAlt": "Alternative Text",
+  "DE.Views.TableSettingsAdvanced.textAlt": "Alternative text",
   "DE.Views.TableSettingsAdvanced.textAltDescription": "Description",
   "DE.Views.TableSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart, or table.",
   "DE.Views.TableSettingsAdvanced.textAltTitle": "Title",
   "DE.Views.TableSettingsAdvanced.textAnchorText": "Text",
   "DE.Views.TableSettingsAdvanced.textAutofit": "Automatically resize to fit contents",
-  "DE.Views.TableSettingsAdvanced.textBackColor": "Cell Background",
+  "DE.Views.TableSettingsAdvanced.textBackColor": "Cell background",
   "DE.Views.TableSettingsAdvanced.textBelow": "below",
-  "DE.Views.TableSettingsAdvanced.textBorderColor": "Border Color",
+  "DE.Views.TableSettingsAdvanced.textBorderColor": "Border color",
   "DE.Views.TableSettingsAdvanced.textBorderDesc": "Click on diagram or use buttons to select borders and apply chosen style to them",
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borders & Background",
-  "DE.Views.TableSettingsAdvanced.textBorderWidth": "Border Size",
+  "DE.Views.TableSettingsAdvanced.textBorderWidth": "Border size",
   "DE.Views.TableSettingsAdvanced.textBottom": "Bottom",
-  "DE.Views.TableSettingsAdvanced.textCellOptions": "Cell Options",
+  "DE.Views.TableSettingsAdvanced.textCellOptions": "Cell options",
   "DE.Views.TableSettingsAdvanced.textCellProps": "Cell",
-  "DE.Views.TableSettingsAdvanced.textCellSize": "Cell Size",
+  "DE.Views.TableSettingsAdvanced.textCellSize": "Cell size",
   "DE.Views.TableSettingsAdvanced.textCenter": "Center",
   "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center",
   "DE.Views.TableSettingsAdvanced.textCheckMargins": "Use default margins",
-  "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default Cell Margins",
+  "DE.Views.TableSettingsAdvanced.textDefaultMargins": "Default cell margins",
-  "DE.Views.TableSettingsAdvanced.textDistance": "Distance from Text",
+  "DE.Views.TableSettingsAdvanced.textDistance": "Distance from text",
   "DE.Views.TableSettingsAdvanced.textHorizontal": "Horizontal",
-  "DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from Left",
+  "DE.Views.TableSettingsAdvanced.textIndLeft": "Indent from left",
   "DE.Views.TableSettingsAdvanced.textLeft": "Left",
   "DE.Views.TableSettingsAdvanced.textLeftTooltip": "Left",
   "DE.Views.TableSettingsAdvanced.textMargin": "Margin",
-  "DE.Views.TableSettingsAdvanced.textMargins": "Cell Margins",
+  "DE.Views.TableSettingsAdvanced.textMargins": "Cell margins",
   "DE.Views.TableSettingsAdvanced.textMeasure": "Measure in",
   "DE.Views.TableSettingsAdvanced.textMove": "Move object with text",
   "DE.Views.TableSettingsAdvanced.textOnlyCells": "For selected cells only",
@@ -2835,18 +2841,18 @@
   "DE.Views.TableSettingsAdvanced.textRightOf": "to the right of",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Right",
   "DE.Views.TableSettingsAdvanced.textTable": "Table",
-  "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background",
+  "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table background",
-  "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position",
+  "DE.Views.TableSettingsAdvanced.textTablePosition": "Table position",
-  "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size",
+  "DE.Views.TableSettingsAdvanced.textTableSize": "Table size",
-  "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings",
+  "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced settings",
   "DE.Views.TableSettingsAdvanced.textTop": "Top",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertical",
   "DE.Views.TableSettingsAdvanced.textWidth": "Width",
   "DE.Views.TableSettingsAdvanced.textWidthSpaces": "Width & Spaces",
-  "DE.Views.TableSettingsAdvanced.textWrap": "Text Wrapping",
+  "DE.Views.TableSettingsAdvanced.textWrap": "Text wrapping",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline table",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow table",
-  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping Style",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Wrapping style",
   "DE.Views.TableSettingsAdvanced.textWrapText": "Wrap text",
   "DE.Views.TableSettingsAdvanced.tipAll": "Set outer border and all inner lines",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Set borders for inner cells only",
@@ -2870,7 +2876,7 @@
   "DE.Views.TableToTextDialog.textSemicolon": "Semicolons",
   "DE.Views.TableToTextDialog.textSeparator": "Separate text with",
   "DE.Views.TableToTextDialog.textTab": "Tabs",
-  "DE.Views.TableToTextDialog.textTitle": "Convert Table to Text",
+  "DE.Views.TableToTextDialog.textTitle": "Convert table to text",
   "DE.Views.TextArtSettings.strColor": "Color",
   "DE.Views.TextArtSettings.strFill": "Fill",
   "DE.Views.TextArtSettings.strSize": "Size",
@@ -2894,7 +2900,7 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Add gradient point",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Remove gradient point",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
-  "DE.Views.TextToTableDialog.textAutofit": "Autofit Behavior",
+  "DE.Views.TextToTableDialog.textAutofit": "Autofit behavior",
   "DE.Views.TextToTableDialog.textColumns": "Columns",
   "DE.Views.TextToTableDialog.textContents": "Autofit to contents",
   "DE.Views.TextToTableDialog.textEmpty": "You must type a character for the custom separator.",
@@ -2903,10 +2909,10 @@
   "DE.Views.TextToTableDialog.textPara": "Paragraphs",
   "DE.Views.TextToTableDialog.textRows": "Rows",
   "DE.Views.TextToTableDialog.textSemicolon": "Semicolons",
-  "DE.Views.TextToTableDialog.textSeparator": "Separate Text at",
+  "DE.Views.TextToTableDialog.textSeparator": "Separate text at",
   "DE.Views.TextToTableDialog.textTab": "Tabs",
-  "DE.Views.TextToTableDialog.textTableSize": "Table Size",
+  "DE.Views.TextToTableDialog.textTableSize": "Table size",
-  "DE.Views.TextToTableDialog.textTitle": "Convert Text to Table",
+  "DE.Views.TextToTableDialog.textTitle": "Convert text to table",
   "DE.Views.TextToTableDialog.textWindow": "Autofit to window",
   "DE.Views.TextToTableDialog.txtAutoText": "Auto",
   "DE.Views.Toolbar.capBtnAddComment": "Add Comment",
@@ -3145,13 +3151,15 @@
   "DE.Views.Toolbar.txtScheme7": "Equity",
   "DE.Views.Toolbar.txtScheme8": "Flow",
   "DE.Views.Toolbar.txtScheme9": "Foundry",
-  "DE.Views.ViewTab.textAlwaysShowToolbar": "Always show toolbar",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Always Show Toolbar",
-  "DE.Views.ViewTab.textDarkDocument": "Dark document",
+  "DE.Views.ViewTab.textDarkDocument": "Dark Document",
   "DE.Views.ViewTab.textFitToPage": "Fit To Page",
   "DE.Views.ViewTab.textFitToWidth": "Fit To Width",
-  "DE.Views.ViewTab.textInterfaceTheme": "Interface theme",
+  "DE.Views.ViewTab.textInterfaceTheme": "Interface Theme",
+  "DE.Views.ViewTab.textLeftMenu": "Left Panel",
   "DE.Views.ViewTab.textNavigation": "Navigation",
   "DE.Views.ViewTab.textOutline": "Headings",
+  "DE.Views.ViewTab.textRightMenu": "Right Panel",
   "DE.Views.ViewTab.textRulers": "Rulers",
   "DE.Views.ViewTab.textStatusBar": "Status Bar",
   "DE.Views.ViewTab.textZoom": "Zoom",
@@ -3160,15 +3168,13 @@
   "DE.Views.ViewTab.tipFitToWidth": "Fit to width",
   "DE.Views.ViewTab.tipHeadings": "Headings",
   "DE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
-  "DE.Views.ViewTab.textLeftMenu": "Left panel",
-  "DE.Views.ViewTab.textRightMenu": "Right panel",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",
   "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal",
   "DE.Views.WatermarkSettingsDialog.textFont": "Font",
-  "DE.Views.WatermarkSettingsDialog.textFromFile": "From File",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "From file",
-  "DE.Views.WatermarkSettingsDialog.textFromStorage": "From Storage",
+  "DE.Views.WatermarkSettingsDialog.textFromStorage": "From storage",
   "DE.Views.WatermarkSettingsDialog.textFromUrl": "From URL",
   "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
   "DE.Views.WatermarkSettingsDialog.textImageW": "Image watermark",
@@ -3177,13 +3183,13 @@
   "DE.Views.WatermarkSettingsDialog.textLayout": "Layout",
   "DE.Views.WatermarkSettingsDialog.textNone": "None",
   "DE.Views.WatermarkSettingsDialog.textScale": "Scale",
-  "DE.Views.WatermarkSettingsDialog.textSelect": "Select Image",
+  "DE.Views.WatermarkSettingsDialog.textSelect": "Select image",
   "DE.Views.WatermarkSettingsDialog.textStrikeout": "Strikethrough",
   "DE.Views.WatermarkSettingsDialog.textText": "Text",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Text watermark",
-  "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark Settings",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark settings",
   "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent",
   "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline",
-  "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name",
+  "DE.Views.WatermarkSettingsDialog.tipFontName": "Font name",
-  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size"
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size"
 }

apps/documenteditor/main/locale/es.json

@@ -125,6 +125,12 @@
   "Common.define.chartData.textScatterSmoothMarker": "Dispersión con líneas suavizadas y marcadores",
   "Common.define.chartData.textStock": "De cotizaciones",
   "Common.define.chartData.textSurface": "Superficie",
+  "Common.define.smartArt.textBalance": "Saldo",
+  "Common.define.smartArt.textEquation": "Ecuación",
+  "Common.define.smartArt.textFunnel": "Embudo",
+  "Common.define.smartArt.textList": "Lista",
+  "Common.define.smartArt.textOther": "Otro",
+  "Common.define.smartArt.textPicture": "Imagen",
   "Common.Translation.textMoreButton": "Más",
   "Common.Translation.warnFileLocked": "No puede editar este archivo porque está siendo editado en otra aplicación.",
   "Common.Translation.warnFileLockedBtnEdit": "Crear una copia",
@@ -288,6 +294,8 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Cargando...",
   "Common.Views.DocumentAccessDialog.textTitle": "Ajustes de uso compartido",
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor de gráfico",
+  "Common.Views.ExternalEditor.textClose": "Cerrar",
+  "Common.Views.ExternalEditor.textSave": "Guardar y salir",
   "Common.Views.ExternalMergeEditor.textTitle": "Receptores de Fusión de Correo",
   "Common.Views.ExternalOleEditor.textTitle": "Editor de hojas de cálculo",
   "Common.Views.Header.labelCoUsersDescr": "Usuarios que están editando el archivo:",
@@ -354,6 +362,7 @@
   "Common.Views.Plugins.textStart": "Iniciar",
   "Common.Views.Plugins.textStop": "Detener",
   "Common.Views.Protection.hintAddPwd": "Encriptar con contraseña",
+  "Common.Views.Protection.hintDelPwd": "Eliminar contraseña",
   "Common.Views.Protection.hintPwd": "Cambie o elimine la contraseña",
   "Common.Views.Protection.hintSignature": "Agregar firma digital o línea de firma",
   "Common.Views.Protection.txtAddPwd": "Agregar contraseña",
@@ -584,6 +593,7 @@
   "DE.Controllers.Main.errorMailMergeLoadFile": "La carga del documento ha fallado. Por favor, seleccione un archivo diferente.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Error de fusión.",
   "DE.Controllers.Main.errorNoTOC": "No hay ninguna tabla de contenido para actualizar. Se puede insertar una desde la pestaña Referencias.",
+  "DE.Controllers.Main.errorPasswordIsNotCorrect": "La contraseña que ha proporcionado no es correcta.<br>Verifique que la tecla Bloq Mayús está desactivada y asegúrese de utilizar las mayúsculas correctas.",
   "DE.Controllers.Main.errorProcessSaveResult": "Problemas al guardar",
   "DE.Controllers.Main.errorServerVersion": "La versión del editor ha sido actualizada. La página será recargada para aplicar los cambios.",
   "DE.Controllers.Main.errorSessionAbsolute": "Sesión de editar el documento ha expirado. Por favor, recargue la página.",
@@ -640,6 +650,7 @@
   "DE.Controllers.Main.textClose": "Cerrar",
   "DE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
   "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
+  "DE.Controllers.Main.textContinue": "Continuar",
   "DE.Controllers.Main.textConvertEquation": "Esta ecuación fue creada con una versión antigua del editor de ecuaciones que ya no es compatible. Para editarla, convierta la ecuación al formato ML de Office Math.<br>¿Convertir ahora?",
   "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.<br>Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.",
   "DE.Controllers.Main.textDisconnect": "Se ha perdido la conexión",
@@ -660,6 +671,7 @@
   "DE.Controllers.Main.textStrict": "Modo estricto",
   "DE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Las funciones Deshacer/Rehacer son desactivados en el modo de co-edición rápido.",
+  "DE.Controllers.Main.textUndo": "Deshacer",
   "DE.Controllers.Main.titleLicenseExp": "Licencia ha expirado",
   "DE.Controllers.Main.titleServerVersion": "Editor ha sido actualizado",
   "DE.Controllers.Main.titleUpdateVersion": "Versión ha cambiado",
@@ -1331,12 +1343,16 @@
   "DE.Views.CellsAddDialog.textUp": "Por encima del cursor",
   "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
   "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico",
+  "DE.Views.ChartSettings.textDown": "Abajo",
   "DE.Views.ChartSettings.textEditData": "Editar datos",
   "DE.Views.ChartSettings.textHeight": "Altura",
+  "DE.Views.ChartSettings.textLeft": "Izquierda",
   "DE.Views.ChartSettings.textOriginalSize": "Tamaño real",
+  "DE.Views.ChartSettings.textRight": "Derecha",
   "DE.Views.ChartSettings.textSize": "Tamaño",
   "DE.Views.ChartSettings.textStyle": "Estilo",
   "DE.Views.ChartSettings.textUndock": "Desacoplar de panel",
+  "DE.Views.ChartSettings.textUp": "Arriba",
   "DE.Views.ChartSettings.textWidth": "Ancho",
   "DE.Views.ChartSettings.textWrap": "Ajuste de texto",
   "DE.Views.ChartSettings.txtBehind": "Detrás del texto",
@@ -1428,6 +1444,8 @@
   "DE.Views.DateTimeDialog.textLang": "Idioma",
   "DE.Views.DateTimeDialog.textUpdate": "Actualizar automáticamente",
   "DE.Views.DateTimeDialog.txtTitle": "Fecha y hora",
+  "DE.Views.DocProtection.hintProtectDoc": "Proteger documento",
+  "DE.Views.DocProtection.txtProtectDoc": "Proteger documento",
   "DE.Views.DocumentHolder.aboveText": "Encima",
   "DE.Views.DocumentHolder.addCommentText": "Agregar comentario",
   "DE.Views.DocumentHolder.advancedDropCapText": "Configuración de Capitalización",
@@ -1753,6 +1771,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estadísticas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Asunto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etiquetas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Subido",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palabras",
@@ -2066,6 +2085,7 @@
   "DE.Views.LeftMenu.tipComments": "Comentarios",
   "DE.Views.LeftMenu.tipNavigation": "Navegación",
   "DE.Views.LeftMenu.tipOutline": "Títulos",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Miniaturas de página",
   "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Búsqueda",
   "DE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
@@ -2087,7 +2107,7 @@
   "DE.Views.LineNumbersDialog.textRestartEachSection": "Reiniciar cada sección",
   "DE.Views.LineNumbersDialog.textSection": "Sección actual",
   "DE.Views.LineNumbersDialog.textStartAt": "Empezar en",
-  "DE.Views.LineNumbersDialog.textTitle": "Numeración de Líneas",
+  "DE.Views.LineNumbersDialog.textTitle": "Numeración de líneas",
   "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnAddText": "Agregar texto",
   "DE.Views.Links.capBtnBookmarks": "Marcador",
@@ -2373,6 +2393,14 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Fijar sólo borde superior",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Sin bordes",
+  "DE.Views.ProtectDialog.textComments": "Comentarios",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "La contraseña de confirmación no es idéntica",
+  "DE.Views.ProtectDialog.txtOptional": "opcional",
+  "DE.Views.ProtectDialog.txtPassword": "Contraseña",
+  "DE.Views.ProtectDialog.txtProtect": "Proteger",
+  "DE.Views.ProtectDialog.txtRepeat": "Repita la contraseña",
+  "DE.Views.ProtectDialog.txtTitle": "Proteger",
+  "DE.Views.ProtectDialog.txtWarning": "Precaución: Si pierde u olvida su contraseña, no podrá recuperarla. Guárdalo en un lugar seguro.",
   "DE.Views.RightMenu.txtChartSettings": "Ajustes de gráfico",
   "DE.Views.RightMenu.txtFormSettings": "Ajustes de formulario",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Ajustes de encabezado y pie de página",
@@ -2563,6 +2591,7 @@
   "DE.Views.TableSettings.tipOuter": "Fijar sólo borde exterior",
   "DE.Views.TableSettings.tipRight": "Fijar sólo borde exterior derecho",
   "DE.Views.TableSettings.tipTop": "Fijar sólo borde exterior superior",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Personalizado",
   "DE.Views.TableSettings.txtNoBorders": "Sin bordes",
   "DE.Views.TableSettings.txtTable_Accent": "Acento",
   "DE.Views.TableSettings.txtTable_Colorful": "Colorido",
@@ -2703,6 +2732,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Imagen",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Cambios de línea",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Símbolo",
   "DE.Views.Toolbar.capBtnInsTable": "Tabla",
   "DE.Views.Toolbar.capBtnInsTextart": "Galería de Texto",

apps/documenteditor/main/locale/hu.json

@@ -125,6 +125,26 @@
   "Common.define.chartData.textScatterSmoothMarker": "Szórás sima vonalakkal és jelölőkkel",
   "Common.define.chartData.textStock": "Részvény",
   "Common.define.chartData.textSurface": "Felület",
+  "Common.define.smartArt.textAccentedPicture": "Hangsúlyos kép",
+  "Common.define.smartArt.textAccentProcess": "Akcentus eljárás",
+  "Common.define.smartArt.textAlternatingFlow": "Váltakozó folyamat",
+  "Common.define.smartArt.textAlternatingHexagons": "Váltakozó hatszögek",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Váltakozó képblokkok",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Váltakozó képkörök",
+  "Common.define.smartArt.textArchitectureLayout": "Tervezés Elrendezés",
+  "Common.define.smartArt.textArrowRibbon": "Nyilas szalag",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Felszálló kép hangsúlyozásának folyamata",
+  "Common.define.smartArt.textBalance": "Egyensúly",
+  "Common.define.smartArt.textBasicBendingProcess": "Alapvető elhajlítási folyamat",
+  "Common.define.smartArt.textBasicBlockList": "Alapvető blokkok listája",
+  "Common.define.smartArt.textBasicChevronProcess": "Alapvető Chevron folyamat",
+  "Common.define.smartArt.textBasicCycle": "Alapciklus",
+  "Common.define.smartArt.textBasicMatrix": "Alap mátrix",
+  "Common.define.smartArt.textBasicPie": "Egyszerű körforgás",
+  "Common.define.smartArt.textBasicProcess": "Alapfolyamat",
+  "Common.define.smartArt.textBasicPyramid": "Egyszerű piramis",
+  "Common.define.smartArt.textBasicRadial": "Alap sugárirányú",
+  "Common.define.smartArt.textBasicTarget": "Alapvető cél",
   "Common.Translation.textMoreButton": "Több",
   "Common.Translation.warnFileLocked": "Nem szerkesztheti ezt a fájlt, mert egy másik alkalmazásban szerkesztik.",
   "Common.Translation.warnFileLockedBtnEdit": "Másolat létrehozása",
@@ -2401,6 +2421,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Csak felső szegély beállítása",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Nincsenek szegélyek",
+  "DE.Views.ProtectDialog.txtAllow": "Csak ilyen típusú szerkesztés engedélyezése a dokumentumban",
   "DE.Views.RightMenu.txtChartSettings": "Diagram beállítások",
   "DE.Views.RightMenu.txtFormSettings": "Űrlapbeállítások",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Fejléc és lábléc beállítások",

apps/documenteditor/main/locale/hy.json

@@ -125,11 +125,93 @@
   "Common.define.chartData.textScatterSmoothMarker": "Ցրել սահուն գծերով և նշիչներով",
   "Common.define.chartData.textStock": "Տվյալների տատանում",
   "Common.define.chartData.textSurface": "Մակերեսային",
+  "Common.define.smartArt.textAccentedPicture": "Շեշտված նկար",
+  "Common.define.smartArt.textAccentProcess": "Շեշտման ընթացք",
+  "Common.define.smartArt.textAlternatingFlow": "Այլընտրական հոսք",
+  "Common.define.smartArt.textAlternatingHexagons": "Այլընտրական վեցանկյունիներ",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Այլընտրական նկարների կազմեր",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Այլընտրական նկարների շրջանակներ",
+  "Common.define.smartArt.textArchitectureLayout": "Ճարտարապետական դասավորություն",
+  "Common.define.smartArt.textArrowRibbon": "Սլաքի երիզ",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Աճող նկարների շեշտման ընթացք",
   "Common.define.smartArt.textBalance": "Հաշվեկշիռ",
+  "Common.define.smartArt.textBasicBendingProcess": "Հիմնական ծռման ընթացք",
+  "Common.define.smartArt.textBasicBlockList": "Հիմնական բաժնի ցուցակ",
+  "Common.define.smartArt.textBasicChevronProcess": "Հիմնական ծպեղների ընթացք",
+  "Common.define.smartArt.textBasicCycle": "Հիմնական շրջան",
+  "Common.define.smartArt.textBasicMatrix": "Հիմնական մատրիցա",
+  "Common.define.smartArt.textBasicPie": "Հիմնական բլիթ",
+  "Common.define.smartArt.textBasicProcess": "Հիմնական ընթացք",
+  "Common.define.smartArt.textBasicPyramid": "Հիմնական բուրգ",
+  "Common.define.smartArt.textBasicRadial": "Հիմնական շառավիղ",
+  "Common.define.smartArt.textBasicTarget": "Հիմնական նպատակ",
+  "Common.define.smartArt.textBasicTimeline": "Հիմնական ժամագիծ",
+  "Common.define.smartArt.textBasicVenn": "Հիմնական վրածածք",
+  "Common.define.smartArt.textBendingPictureAccentList": "Ծռված նկարի շեշտման ցուցակ",
+  "Common.define.smartArt.textBendingPictureBlocks": "Ծռված նկարների կազմեր",
+  "Common.define.smartArt.textBendingPictureCaption": "Ծռված նկարի խորագիր",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Ծռված նկարի խորագրերի ցուցակ",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Ծռված նկարի կիսաթափանցիկ գրվածք",
+  "Common.define.smartArt.textBlockCycle": "Բաժնի շրջան",
+  "Common.define.smartArt.textBubblePictureList": "Դրսագրով նկարների ցուցակ",
+  "Common.define.smartArt.textCaptionedPictures": "Խորագրով նկարներ",
+  "Common.define.smartArt.textChevronAccentProcess": "Ծպեղների շեշտման ընթաց",
+  "Common.define.smartArt.textChevronList": "Ծպեղների ցուցակ",
+  "Common.define.smartArt.textCircleAccentTimeline": "Շրջանաձև շեշտման ժամագիծ",
+  "Common.define.smartArt.textCircleArrowProcess": "Շրջանաձև սլաքի ընթացք",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Շրջանաձև նկարների աստիճանակարգություն",
+  "Common.define.smartArt.textCircleProcess": "Շրջանաձև ընթացք",
+  "Common.define.smartArt.textCircleRelationship": "Շրջանների հարաբերություն",
+  "Common.define.smartArt.textCircularBendingProcess": "Շրջանային ծռման ընթացք",
+  "Common.define.smartArt.textCircularPictureCallout": "Շրջանաձև նկարի դրսագիր",
+  "Common.define.smartArt.textClosedChevronProcess": "Փակ ծպեղների ընթացք",
+  "Common.define.smartArt.textContinuousArrowProcess": "Շարունակական սլաքի ընթացք",
+  "Common.define.smartArt.textContinuousBlockProcess": "Շարունակական բաժնի ընթացք",
+  "Common.define.smartArt.textContinuousCycle": "Շարունակական շրջան",
+  "Common.define.smartArt.textContinuousPictureList": "Շարունակական նկարի ցուցակ",
+  "Common.define.smartArt.textConvergingArrows": "Միակցող սլաքներ",
+  "Common.define.smartArt.textConvergingRadial": "Զուգահեռ շառավիղ",
+  "Common.define.smartArt.textConvergingText": "Զուգամետ գրվածք",
+  "Common.define.smartArt.textCounterbalanceArrows": "Հակակշիռ սլաքներ",
+  "Common.define.smartArt.textCycle": "Շրջան",
+  "Common.define.smartArt.textCycleMatrix": "Շրջանային մատրիցա",
+  "Common.define.smartArt.textDescendingBlockList": "Նվազող կազմերի ցուցակ",
+  "Common.define.smartArt.textDescendingProcess": "Նվազող ընթացք",
+  "Common.define.smartArt.textDetailedProcess": "Մանրամասն ընթացք",
+  "Common.define.smartArt.textDivergingArrows": "Հակադիր սլաքներ",
+  "Common.define.smartArt.textDivergingRadial": "Ցրված շառավիղ",
   "Common.define.smartArt.textEquation": "Հավասարում",
+  "Common.define.smartArt.textFramedTextPicture": "Շրջանակված գրվածքով նկար",
   "Common.define.smartArt.textFunnel": "Ձագարաձև",
+  "Common.define.smartArt.textGear": "Ատամնանիվ",
+  "Common.define.smartArt.textGridMatrix": "Ցանցավոր մատրիցա",
+  "Common.define.smartArt.textGroupedList": "Խմբավորված ցուցակ",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Կիսաշրջանաձև կազմակերպության գծապատկեր",
+  "Common.define.smartArt.textHexagonCluster": "Վեցանկյունիների բույլ",
+  "Common.define.smartArt.textHexagonRadial": "Վեցանկյունիների շառավիղ",
+  "Common.define.smartArt.textHierarchy": "Ստորակարգ",
+  "Common.define.smartArt.textHierarchyList": "տորակարգի ցուցակ",
+  "Common.define.smartArt.textHorizontalBulletList": "Հորիզոնական պարբերակի ցուցակ",
+  "Common.define.smartArt.textHorizontalHierarchy": "Հորիզոնական ստորակարգ",
+  "Common.define.smartArt.textHorizontalLabeledHierarchy": "Հորիզոնական պիտակված ստորակարգ",
+  "Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Հորիզոնական բազմակակարդակ աստիճանակարգություն",
+  "Common.define.smartArt.textHorizontalOrganizationChart": "Հորիզոնական կազմակերպության գծապատկեր",
+  "Common.define.smartArt.textHorizontalPictureList": "Հորիզոնական նկարների ցուցակ",
+  "Common.define.smartArt.textIncreasingArrowProcess": "Աճող սլաքի ընթացք",
+  "Common.define.smartArt.textIncreasingCircleProcess": "Աճող շրջանաձև ընթացք",
+  "Common.define.smartArt.textInterconnectedBlockProcess": "Փոխկապակցված կազմերի ընթացք",
+  "Common.define.smartArt.textInterconnectedRings": "Փոխկապակցված օղակներ",
+  "Common.define.smartArt.textInvertedPyramid": "Հակադարձված բուրգ",
+  "Common.define.smartArt.textLabeledHierarchy": "Պիտակված ստորակարգ",
+  "Common.define.smartArt.textLinearVenn": "Գծային վրածածք",
+  "Common.define.smartArt.textLinedList": "Գծված ցուցակ",
   "Common.define.smartArt.textList": "Ցուցակ",
+  "Common.define.smartArt.textMatrix": "Մատրիցա",
+  "Common.define.smartArt.textMultidirectionalCycle": "Բազմուղի շրջան",
+  "Common.define.smartArt.textNameAndTitleOrganizationChart": "Անուններով և պաշտոններով կազմակերպության գծապատկեր",
+  "Common.define.smartArt.textNestedTarget": "Ներդրված թիրախ",
   "Common.define.smartArt.textOther": "Այլ",
+  "Common.define.smartArt.textPicture": "Նկար",
   "Common.Translation.textMoreButton": "Ավել",
   "Common.Translation.warnFileLocked": "Դուք չեք կարող խմբագրել այս ֆայլը, քանի որ այն խմբագրվում է մեկ այլ հավելվածում:",
   "Common.Translation.warnFileLockedBtnEdit": "Ստեղծել պատճեն",
@@ -294,6 +376,7 @@
   "Common.Views.DocumentAccessDialog.textTitle": "Համօգտագործման կարգավորումներ",
   "Common.Views.ExternalDiagramEditor.textTitle": "Գծապատկերի խմբագրիչ",
   "Common.Views.ExternalEditor.textClose": "Փակել",
+  "Common.Views.ExternalEditor.textSave": "Պահպանել և դուրս գալ",
   "Common.Views.ExternalMergeEditor.textTitle": "Փոստի միավորման հաղորդագրություն ստացողներ",
   "Common.Views.ExternalOleEditor.textTitle": "Աղյուսակաթերթի խմբագիր",
   "Common.Views.Header.labelCoUsersDescr": "Փաստաթուղթը խմբագրողներ՝",
@@ -506,6 +589,7 @@
   "Common.Views.SignDialog.tipFontName": "Տառատեսակի անուն",
   "Common.Views.SignDialog.tipFontSize": "Տառատեսակի չափ",
   "Common.Views.SignSettingsDialog.textAllowComment": "Թույլ տալ ստորագրողին ավելացնել մեկնաբանություն ստորագրության երկխոսության մեջ",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Նախքան այս փաստաթուղթը ստորագրելը, ստուգեք, որ Ձեր ստորագրած բովանդակությունը ճիշտ է:",
   "Common.Views.SignSettingsDialog.textInfoEmail": "Էլ․ հասցե",
   "Common.Views.SignSettingsDialog.textInfoName": "Անուն",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Ստորագրողի անվանումը",
@@ -585,12 +669,18 @@
   "DE.Controllers.Main.errorFilePassProtect": "Ֆայլն ունի գաղտնաբառ և չի կարող բացվել։",
   "DE.Controllers.Main.errorFileSizeExceed": "Ֆայլի չափը գերազանցում է ձեր սերվերի համար սահմանված սահմանափակումը:<br> Մանրամասների համար խնդրում ենք կապվել Ձեր փաստաթղթերի սերվերի ադմինիստրատորի հետ:",
   "DE.Controllers.Main.errorForceSave": "Փաստաթղթի պահպանման ժամանակ տեղի ունեցավ սխալ։ «Ներբեռնել որպես» հրամանով պահպանեք նիշքը Ձեր համակարգչի կոշտ սկավառակում կամ ավելի ուշ նորից փորձեք։",
+  "DE.Controllers.Main.errorInconsistentExt": "Ֆայլը բացելիս սխալ է տեղի ունեցել:<br>Ֆայլի բովանդակությունը չի համապատասխանում ֆայլի ընդլայնմանը:",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "Ֆայլը բացելիս սխալ է տեղի ունեցել:<br>Ֆայլի բովանդակությունը համապատասխանում է տեքստային փաստաթղթերին (օրինակ՝ docx), սակայն ֆայլն ունի անհամապատասխան ընդլայնում՝ %1:",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "Ֆայլը բացելիս սխալ է տեղի ունեցել:Ֆայլի բովանդակությունը համապատասխանում է հետևյալ ձևաչափերից մեկին՝pdf/djvu/xps/oxps,բայց ֆայլն ունի անհամապատասխան ընդլայնում. %1:",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "Ֆայլը բացելիս սխալ է տեղի ունեցել:<br>Ֆայլի բովանդակությունը համապատասխանում է ներկայացումներին (օրինակ՝ pptx), սակայն ֆայլն ունի անհամապատասխան ընդլայնում. %1:",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "Ֆայլը բացելիս սխալ է տեղի ունեցել:<br>Ֆայլի բովանդակությունը համապատասխանում է աղյուսակներին (օր. xlsx), սակայն ֆայլն ունի անհամապատասխան ընդլայնում. %1:",
   "DE.Controllers.Main.errorKeyEncrypt": "Բանալու անհայտ նկարագրիչ",
   "DE.Controllers.Main.errorKeyExpire": "Բանալու նկարագրիչի ժամկետը սպառվել է",
   "DE.Controllers.Main.errorLoadingFont": "Տառատեսակները բեռնված չեն:<br>Խնդրում ենք կապվել ձեր փաստաթղթերի սերվերի ադմինիստրատորի հետ:",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Փաստաթղթի բեռնումը խափանվեց։ Խնդրում ենք ընտրել մեկ այլ ֆայլ:",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Միաձուլումը խափանվեց։",
   "DE.Controllers.Main.errorNoTOC": "Արդիացնելու համար բովանդակություն չկա: Կարող եք զետեղել այն հղումներ ներդիրից:",
+  "DE.Controllers.Main.errorPasswordIsNotCorrect": "Ձեր տրամադրած գաղտնաբառը ճիշտ չէ:<br>Ստուգեք, որ CAPS LOCK ստեղնը անջատված է և օգտագործեք ճիշտ գլխատառացումը:",
   "DE.Controllers.Main.errorProcessSaveResult": "Պահումը ձախողվել է:",
   "DE.Controllers.Main.errorServerVersion": "Խմբագրիչի տարբերակը արդիացվել է։ Որպեսզի փոփոխումները տեղի ունենան, էջը նորից կբեռնվի։",
   "DE.Controllers.Main.errorSessionAbsolute": "Փաստաթղթի խմբագրման գործաժամը սպառվել է։ Նորի՛ց բեռնեք էջը։",
@@ -1338,12 +1428,18 @@
   "DE.Views.CellsAddDialog.textRow": "Տողեր",
   "DE.Views.CellsAddDialog.textTitle": "Տեղադրեք մի քանիսը",
   "DE.Views.CellsAddDialog.textUp": "Նշորդի վերևում",
+  "DE.Views.ChartSettings.text3dDepth": "Խորությունը (բազայի %)",
+  "DE.Views.ChartSettings.text3dHeight": "Բարձրություն (բազայի %)",
+  "DE.Views.ChartSettings.text3dRotation": "3D Պտտում",
   "DE.Views.ChartSettings.textAdvanced": "Ցուցադրել լրացուցիչ կարգավորումները",
+  "DE.Views.ChartSettings.textAutoscale": "Ինքնասանդղակ",
   "DE.Views.ChartSettings.textChartType": "Փոխել գծապատկերի տեսակը",
+  "DE.Views.ChartSettings.textDefault": "Սկզբնադիր շրջում",
   "DE.Views.ChartSettings.textDown": "Ներքև",
   "DE.Views.ChartSettings.textEditData": "Խմբագրել տվյալները",
   "DE.Views.ChartSettings.textHeight": "Բարձրություն",
   "DE.Views.ChartSettings.textLeft": "Ձախ",
+  "DE.Views.ChartSettings.textNarrow": "Նեղ տեսադաշտ",
   "DE.Views.ChartSettings.textOriginalSize": "Իրական չափ",
   "DE.Views.ChartSettings.textRight": "Աջ",
   "DE.Views.ChartSettings.textSize": "Չափ",
@@ -1442,15 +1538,23 @@
   "DE.Views.DateTimeDialog.textUpdate": "Ինքնաբար արդիացնել",
   "DE.Views.DateTimeDialog.txtTitle": "Ամիս-ամսաթիվ, ժամ",
   "DE.Views.DocProtection.hintProtectDoc": "Պաշտպանել փաստաթուղթը",
+  "DE.Views.DocProtection.txtDocProtectedComment": "Փաստաթուղթը պաշտպանված է:<br>Դուք կարող եք միայն մեկնաբանություններ տեղադրել այս փաստաթղթում:",
+  "DE.Views.DocProtection.txtDocProtectedForms": "Փաստաթուղթը պաշտպանված է:<br>Այս փաստաթղթում կարող եք լրացնել միայն ձևերը:",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "Փաստաթուղթը պաշտպանված է:<br>Դուք կարող եք խմբագրել այս փաստաթուղթը, բայց բոլոր փոփոխությունները կհետևվեն:",
+  "DE.Views.DocProtection.txtDocProtectedView": "Փաստաթուղթը պաշտպանված է:<br>Դուք կարող եք դիտել միայն այս փաստաթուղթը:",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Փաստաթուղթը չպաշտպանելու համար մուտքագրեք գաղտնաբառ։",
   "DE.Views.DocProtection.txtProtectDoc": "Պաշտպանել փաստաթուղթը",
   "DE.Views.DocumentHolder.aboveText": "Վերև",
   "DE.Views.DocumentHolder.addCommentText": "Ավելացնել մեկնաբանություն",
   "DE.Views.DocumentHolder.advancedDropCapText": "Սկզբնատառի կարգավորումներ",
+  "DE.Views.DocumentHolder.advancedEquationText": "Հավասարման կարգավորումներ",
   "DE.Views.DocumentHolder.advancedFrameText": "Շրջանակի լրացուցիչ կարգավորումներ",
   "DE.Views.DocumentHolder.advancedParagraphText": "Պարբերության լրացուցիչ  կարգավորումներ",
   "DE.Views.DocumentHolder.advancedTableText": "Աղյուսակի լրացուցիչ կարգավորումներ",
   "DE.Views.DocumentHolder.advancedText": "Լրացուցիչ կարգավորումներ",
   "DE.Views.DocumentHolder.alignmentText": "Հավասարեցում",
+  "DE.Views.DocumentHolder.allLinearText": "Ամբողջական գծային",
+  "DE.Views.DocumentHolder.allProfText": "Ամբողջական պրոֆեսիոնալ",
   "DE.Views.DocumentHolder.belowText": "Ներքևում",
   "DE.Views.DocumentHolder.breakBeforeText": "Սկզբից էջատում",
   "DE.Views.DocumentHolder.bulletsText": "Պարբերակներ և համարակալում",
@@ -1459,6 +1563,8 @@
   "DE.Views.DocumentHolder.centerText": "Կենտրոնով",
   "DE.Views.DocumentHolder.chartText": "Գծապատկերի լրացուցիչ  կարգավորումներ",
   "DE.Views.DocumentHolder.columnText": "Սյունակ",
+  "DE.Views.DocumentHolder.currLinearText": "Ընթացիկ - Գծային",
+  "DE.Views.DocumentHolder.currProfText": "Ընթացիկ-Պրոֆեսիոնալ",
   "DE.Views.DocumentHolder.deleteColumnText": "Ջնջել սյունակ",
   "DE.Views.DocumentHolder.deleteRowText": "Ջնջել տող",
   "DE.Views.DocumentHolder.deleteTableText": "Ջնջել աղյուսակը",
@@ -1471,6 +1577,7 @@
   "DE.Views.DocumentHolder.editFooterText": "Խմբագրել էջատակը",
   "DE.Views.DocumentHolder.editHeaderText": "Խմբագրել էջագլուխը",
   "DE.Views.DocumentHolder.editHyperlinkText": "Խմբագրել գերհղումը",
+  "DE.Views.DocumentHolder.eqToInlineText": "Փոխել ներտող ",
   "DE.Views.DocumentHolder.guestText": "Հյուր",
   "DE.Views.DocumentHolder.hyperlinkText": "Գերհղում",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Անտեսել բոլորը",
@@ -1485,6 +1592,7 @@
   "DE.Views.DocumentHolder.insertText": "Զետեղել",
   "DE.Views.DocumentHolder.keepLinesText": "Տողերը պահել միասին ",
   "DE.Views.DocumentHolder.langText": "Ընտրել լեզուն",
+  "DE.Views.DocumentHolder.latexText": "LaTeX",
   "DE.Views.DocumentHolder.leftText": "Ձախ",
   "DE.Views.DocumentHolder.loadSpellText": "Տարբերակների բեռնում...",
   "DE.Views.DocumentHolder.mergeCellsText": "Միաձուլել վանդակները",
@@ -2390,12 +2498,16 @@
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Ինքնաշխատ",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Առանց եզրագծերի",
   "DE.Views.ProtectDialog.textComments": "Մեկնաբանություններ",
+  "DE.Views.ProtectDialog.textForms": "Լրացվող ձևեր",
+  "DE.Views.ProtectDialog.textView": "Փոփոխություններ չկան (Միայն-կարդալու)",
+  "DE.Views.ProtectDialog.txtAllow": "Թույլատրել միայն այս տեսակի խմբագրումը փաստաթղթում",
   "DE.Views.ProtectDialog.txtIncorrectPwd": "Հաստատման գաղտնաբառը նույնը չէ",
   "DE.Views.ProtectDialog.txtOptional": "ընտրովի",
   "DE.Views.ProtectDialog.txtPassword": "Գաղտնաբառ",
   "DE.Views.ProtectDialog.txtProtect": "Պաշտպանել",
   "DE.Views.ProtectDialog.txtRepeat": "Կրկնել գաղտնաբառը",
   "DE.Views.ProtectDialog.txtTitle": "Պաշտպանել",
+  "DE.Views.ProtectDialog.txtWarning": "Զգուշացում․ գաղտնաբառը կորցնելու կամ մոռանալու դեպքում այն ​​չի կարող վերականգնվել։Խնդրում ենք պահել այն ապահով տեղում:",
   "DE.Views.RightMenu.txtChartSettings": "Գծապատկերի կարգավորումներ",
   "DE.Views.RightMenu.txtFormSettings": "Ձևի կարգավորումներ",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Էջագլխի և էջատակի կարգավորումներ",
@@ -2586,13 +2698,19 @@
   "DE.Views.TableSettings.tipOuter": "Սահմանել միայն արտաքին եզրագիծը",
   "DE.Views.TableSettings.tipRight": "Սահմանել միայն արտաքին աջ եզրագիծը",
   "DE.Views.TableSettings.tipTop": "Սահմանել միայն արտաքին վերին եզրագիծը",
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Եզրագծած և Ընդգծված Աղյուսակներ",
   "DE.Views.TableSettings.txtGroupTable_Custom": "Հարմարեցված",
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Ցանցավոր աղյուսակներ",
+  "DE.Views.TableSettings.txtGroupTable_List": "Ցուցակային աղյուսակներ",
   "DE.Views.TableSettings.txtNoBorders": "Առանց եզրագծերի",
   "DE.Views.TableSettings.txtTable_Accent": "Շեշտ",
+  "DE.Views.TableSettings.txtTable_Bordered": "Եզրագծած",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Եզրագծած և Ընդգծված",
   "DE.Views.TableSettings.txtTable_Colorful": "Գունավոր",
   "DE.Views.TableSettings.txtTable_Dark": "Մութ",
   "DE.Views.TableSettings.txtTable_GridTable": "Ցանցային աղյուսակ",
   "DE.Views.TableSettings.txtTable_Light": "Լույս",
+  "DE.Views.TableSettings.txtTable_Lined": "Գծավոր",
   "DE.Views.TableSettings.txtTable_ListTable": "Ցանկի աղյուսակ",
   "DE.Views.TableSettings.txtTable_PlainTable": "Պարզ աղյուսակ ",
   "DE.Views.TableSettings.txtTable_TableGrid": "Աղյուսակի կետացանց",
@@ -2874,13 +2992,16 @@
   "DE.Views.Toolbar.tipIncPrLeft": "Մեծացնել բացատը պարբերության սկզբում",
   "DE.Views.Toolbar.tipInsertChart": "Զետեղել գծապատկեր",
   "DE.Views.Toolbar.tipInsertEquation": "Դնել հավասարում",
+  "DE.Views.Toolbar.tipInsertHorizontalText": "Զետեղել հորիզոնական գրվածքի տուփ",
   "DE.Views.Toolbar.tipInsertImage": "Զետեղել նկար",
   "DE.Views.Toolbar.tipInsertNum": "Դնել էջի համարը",
   "DE.Views.Toolbar.tipInsertShape": "Զետեղել պատկեր",
+  "DE.Views.Toolbar.tipInsertSmartArt": "Զետեղել SmartArt",
   "DE.Views.Toolbar.tipInsertSymbol": "Տեղադրել նշան",
   "DE.Views.Toolbar.tipInsertTable": "Դնել աղյուսակ",
   "DE.Views.Toolbar.tipInsertText": "Դնել տեքստատուփ",
   "DE.Views.Toolbar.tipInsertTextArt": "Դնել տեքստարվեստից",
+  "DE.Views.Toolbar.tipInsertVerticalText": "Զետեղել ուղղահայաց գրվածքի տուփ",
   "DE.Views.Toolbar.tipLineNumbers": "Ցուցադրել տողերի համարները",
   "DE.Views.Toolbar.tipLineSpace": "Պարբերության տողամիջոց",
   "DE.Views.Toolbar.tipMailRecepients": "Փոստի միավորում",
@@ -2952,6 +3073,7 @@
   "DE.Views.ViewTab.textFitToPage": "Հարմարեցնել էջին",
   "DE.Views.ViewTab.textFitToWidth": "Լայնքով",
   "DE.Views.ViewTab.textInterfaceTheme": "Ինտերֆեյսի թեմա",
+  "DE.Views.ViewTab.textLeftMenu": "Ձախ վահանակ",
   "DE.Views.ViewTab.textNavigation": "Նավիգացիա",
   "DE.Views.ViewTab.textOutline": "Վերնագրեր",
   "DE.Views.ViewTab.textRulers": "Քանոններ",

apps/documenteditor/main/locale/id.json

@@ -125,6 +125,165 @@
   "Common.define.chartData.textScatterSmoothMarker": "Diagram sebar dengan garis mulus dan marker",
   "Common.define.chartData.textStock": "Diagram Garis",
   "Common.define.chartData.textSurface": "Permukaan",
+  "Common.define.smartArt.textAccentedPicture": "Gambar Beraksen",
+  "Common.define.smartArt.textAccentProcess": "Proses Aksen",
+  "Common.define.smartArt.textAlternatingFlow": "Alur Bolak-Balik",
+  "Common.define.smartArt.textAlternatingHexagons": "Segi Enam Bolak-Balik",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Blok Gambar Bolak-Balik",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Lingkaran Gambar Bolak-Balik",
+  "Common.define.smartArt.textArchitectureLayout": "Tata Letak Arsitektur",
+  "Common.define.smartArt.textArrowRibbon": "Pita Anak Panah",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Proses Akses Gambar Naik",
+  "Common.define.smartArt.textBalance": "Seimbang",
+  "Common.define.smartArt.textBasicBendingProcess": "Proses Meliuk Dasar",
+  "Common.define.smartArt.textBasicBlockList": "Daftar Blok Dasar",
+  "Common.define.smartArt.textBasicChevronProcess": "Proses Chevron Dasar",
+  "Common.define.smartArt.textBasicCycle": "Lingkaran Dasar",
+  "Common.define.smartArt.textBasicMatrix": "Matriks Dasar",
+  "Common.define.smartArt.textBasicPie": "Pai Dasar",
+  "Common.define.smartArt.textBasicProcess": "Proses Dasar",
+  "Common.define.smartArt.textBasicPyramid": "Piramida Dasar",
+  "Common.define.smartArt.textBasicRadial": "Radial Dasar",
+  "Common.define.smartArt.textBasicTarget": "Target Dasar",
+  "Common.define.smartArt.textBasicTimeline": "Garis Waktu Dasar",
+  "Common.define.smartArt.textBasicVenn": "Venn Dasar",
+  "Common.define.smartArt.textBendingPictureAccentList": "Daftar Akses Gambar Meliuk",
+  "Common.define.smartArt.textBendingPictureBlocks": "Blok Gambar Meliuk",
+  "Common.define.smartArt.textBendingPictureCaption": "Keterangan Gambar Meliuk",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Daftar Keterangan Gambar Meliuk",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Teks Semi-Transparan Gambar Meliuk",
+  "Common.define.smartArt.textBlockCycle": "Lingkaran Blok",
+  "Common.define.smartArt.textBubblePictureList": "Daftar Gambar Gelembung",
+  "Common.define.smartArt.textCaptionedPictures": "Gambar Dengan Keterangan",
+  "Common.define.smartArt.textChevronAccentProcess": "Proses Aksen Chevron",
+  "Common.define.smartArt.textChevronList": "Daftar Chevron",
+  "Common.define.smartArt.textCircleAccentTimeline": "Garis Waktu Aksen Lingkaran",
+  "Common.define.smartArt.textCircleArrowProcess": "Proses Panah Lingkaran",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Hierarki Gambar Lingkaran",
+  "Common.define.smartArt.textCircleProcess": "Proses Lingkaran",
+  "Common.define.smartArt.textCircleRelationship": "Hubungan Lingkaran",
+  "Common.define.smartArt.textCircularBendingProcess": "Proses Melingkar",
+  "Common.define.smartArt.textCircularPictureCallout": "Panggilan Gambar Melingkar",
+  "Common.define.smartArt.textClosedChevronProcess": "Proses Chevron Tertutup",
+  "Common.define.smartArt.textContinuousArrowProcess": "Proses Panah Berkelanjutan",
+  "Common.define.smartArt.textContinuousBlockProcess": "Proses Blok Berkelanjutan",
+  "Common.define.smartArt.textContinuousCycle": "Siklus Berkelanjutan",
+  "Common.define.smartArt.textContinuousPictureList": "Daftar Gambar Berkelanjutan",
+  "Common.define.smartArt.textConvergingArrows": "Panah Memusat",
+  "Common.define.smartArt.textConvergingRadial": "Radial Memusat",
+  "Common.define.smartArt.textConvergingText": "Teks Memusat",
+  "Common.define.smartArt.textCounterbalanceArrows": "Panah Pengimbang",
+  "Common.define.smartArt.textCycle": "Siklus",
+  "Common.define.smartArt.textCycleMatrix": "Matriks Siklus",
+  "Common.define.smartArt.textDescendingBlockList": "Daftar Blok Turun",
+  "Common.define.smartArt.textDescendingProcess": "Proses Menurun",
+  "Common.define.smartArt.textDetailedProcess": "Proses Terperinci",
+  "Common.define.smartArt.textDivergingArrows": "Panah Menyebar",
+  "Common.define.smartArt.textDivergingRadial": "Radial Menyebar",
+  "Common.define.smartArt.textEquation": "Persamaan",
+  "Common.define.smartArt.textFramedTextPicture": "Gambar Teks Terbingkai",
+  "Common.define.smartArt.textFunnel": "Corong",
+  "Common.define.smartArt.textGear": "Gerigi",
+  "Common.define.smartArt.textGridMatrix": "Matriks Kisi",
+  "Common.define.smartArt.textGroupedList": "Daftar yang Dikelompokkan",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Bagan Organisasi Setengah Lingkaran",
+  "Common.define.smartArt.textHexagonCluster": "Kluster Segi Enam",
+  "Common.define.smartArt.textHexagonRadial": "Radial Segi Enam",
+  "Common.define.smartArt.textHierarchy": "Hierarki",
+  "Common.define.smartArt.textHierarchyList": "Daftar Hierarki",
+  "Common.define.smartArt.textHorizontalBulletList": "Daftar Poin Horizontal",
+  "Common.define.smartArt.textHorizontalHierarchy": "Hierarki Horizontal",
+  "Common.define.smartArt.textHorizontalLabeledHierarchy": "Hierarki Berlabel Horizontal",
+  "Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Hierarki Multi-Level Horizontal",
+  "Common.define.smartArt.textHorizontalOrganizationChart": "Bagan Organisasi Horizontal",
+  "Common.define.smartArt.textHorizontalPictureList": "Daftar Gambar Horizontal",
+  "Common.define.smartArt.textIncreasingArrowProcess": "Proses Panah Meningkat",
+  "Common.define.smartArt.textIncreasingCircleProcess": "Proses Lingkaran Meningkat",
+  "Common.define.smartArt.textInterconnectedBlockProcess": "Proses Blok yang Saling Terhubung",
+  "Common.define.smartArt.textInterconnectedRings": "Cincin yang Saling Terhubung",
+  "Common.define.smartArt.textInvertedPyramid": "Piramida Terbalik",
+  "Common.define.smartArt.textLabeledHierarchy": "Hierarki Berlabel",
+  "Common.define.smartArt.textLinearVenn": "Venn Linear",
+  "Common.define.smartArt.textLinedList": "Daftar Bergaris",
+  "Common.define.smartArt.textList": "Daftar",
+  "Common.define.smartArt.textMatrix": "Matriks",
+  "Common.define.smartArt.textMultidirectionalCycle": "Siklus Multiarah",
+  "Common.define.smartArt.textNameAndTitleOrganizationChart": "Bagan Organisasi Nama dan Jabatan",
+  "Common.define.smartArt.textNestedTarget": "Target Bertumpuk",
+  "Common.define.smartArt.textNondirectionalCycle": "Siklus Tanpa Arah",
+  "Common.define.smartArt.textOpposingArrows": "Panah Berlawanan",
+  "Common.define.smartArt.textOpposingIdeas": "Ide Berlawanan",
+  "Common.define.smartArt.textOrganizationChart": "Bagan Organisasi",
+  "Common.define.smartArt.textOther": "Lainnya",
+  "Common.define.smartArt.textPhasedProcess": "Proses Berfase",
+  "Common.define.smartArt.textPicture": "Gambar",
+  "Common.define.smartArt.textPictureAccentBlocks": "Blok Aksen Gambar",
+  "Common.define.smartArt.textPictureAccentList": "Daftar Aksen Gambar",
+  "Common.define.smartArt.textPictureAccentProcess": "Proses Aksen Gambar",
+  "Common.define.smartArt.textPictureCaptionList": "Daftar Keterangan Gambar",
+  "Common.define.smartArt.textPictureFrame": "PictureFrame",
+  "Common.define.smartArt.textPictureGrid": "Kisi Gambar",
+  "Common.define.smartArt.textPictureLineup": "Deretan Gambar",
+  "Common.define.smartArt.textPictureOrganizationChart": "Bagan Organisasi Gambar",
+  "Common.define.smartArt.textPictureStrips": "Jalur Gambar",
+  "Common.define.smartArt.textPieProcess": "Proses Pai",
+  "Common.define.smartArt.textPlusAndMinus": "Plus dan Minus",
+  "Common.define.smartArt.textProcess": "Proses",
+  "Common.define.smartArt.textProcessArrows": "Panah Proses",
+  "Common.define.smartArt.textProcessList": "Daftar Proses",
+  "Common.define.smartArt.textPyramid": "Piramida",
+  "Common.define.smartArt.textPyramidList": "Daftar Piramida",
+  "Common.define.smartArt.textRadialCluster": "Kluster Radial",
+  "Common.define.smartArt.textRadialCycle": "Siklus Radial",
+  "Common.define.smartArt.textRadialList": "Daftar Radial",
+  "Common.define.smartArt.textRadialPictureList": "Daftar Gambar Radial",
+  "Common.define.smartArt.textRadialVenn": "Venn Radial",
+  "Common.define.smartArt.textRandomToResultProcess": "Proses Acak ke Hasil",
+  "Common.define.smartArt.textRelationship": "Hubungan",
+  "Common.define.smartArt.textRepeatingBendingProcess": "Proses Pengarahan Berulang",
+  "Common.define.smartArt.textReverseList": "Daftar Terbalik",
+  "Common.define.smartArt.textSegmentedCycle": "Siklus Bersegmen",
+  "Common.define.smartArt.textSegmentedProcess": "Proses Bersegmen",
+  "Common.define.smartArt.textSegmentedPyramid": "Piramida Bersegmen",
+  "Common.define.smartArt.textSnapshotPictureList": "Daftar Gambar Snapshot",
+  "Common.define.smartArt.textSpiralPicture": "Gambar Spiral",
+  "Common.define.smartArt.textSquareAccentList": "Daftar Aksen Persegi",
+  "Common.define.smartArt.textStackedList": "Daftar Bertumpuk",
+  "Common.define.smartArt.textStackedVenn": "Venn Bertumpuk",
+  "Common.define.smartArt.textStaggeredProcess": "Proses Pengaturan",
+  "Common.define.smartArt.textStepDownProcess": "Proses Mundur",
+  "Common.define.smartArt.textStepUpProcess": "Proses Meningkat",
+  "Common.define.smartArt.textSubStepProcess": "Proses Sub-Langkah",
+  "Common.define.smartArt.textTabbedArc": "Busur Bertab",
+  "Common.define.smartArt.textTableHierarchy": "Hierarki Tabel",
+  "Common.define.smartArt.textTableList": "Daftar Tabel",
+  "Common.define.smartArt.textTabList": "Daftar Tab",
+  "Common.define.smartArt.textTargetList": "Daftar Target",
+  "Common.define.smartArt.textTextCycle": "Siklus Teks",
+  "Common.define.smartArt.textThemePictureAccent": "Aksen Gambar Tema",
+  "Common.define.smartArt.textThemePictureAlternatingAccent": "Aksen Bolak-Balik Gambar Tema",
+  "Common.define.smartArt.textThemePictureGrid": "Kisi Gambar Tema",
+  "Common.define.smartArt.textTitledMatrix": "Matriks Berjudul",
+  "Common.define.smartArt.textTitledPictureAccentList": "Daftar Aksen Gambar Berjudul",
+  "Common.define.smartArt.textTitledPictureBlocks": "Blok Gambar Berjudul",
+  "Common.define.smartArt.textTitlePictureLineup": "Deretan Gambar Judul",
+  "Common.define.smartArt.textTrapezoidList": "Daftar Trapesium",
+  "Common.define.smartArt.textUpwardArrow": "Panah ke Atas",
+  "Common.define.smartArt.textVaryingWidthList": "Daftar dengan Lebar Bervariasi",
+  "Common.define.smartArt.textVerticalAccentList": "Daftar Aksen Vertikal",
+  "Common.define.smartArt.textVerticalArrowList": "Daftar Panah Vertikal",
+  "Common.define.smartArt.textVerticalBendingProcess": "Arah Proses Vertikal",
+  "Common.define.smartArt.textVerticalBlockList": "Daftar Blok Vertikal",
+  "Common.define.smartArt.textVerticalBoxList": "Daftar Kotak Vertikal",
+  "Common.define.smartArt.textVerticalBracketList": "Daftar Tanda Kurung Vertikal",
+  "Common.define.smartArt.textVerticalBulletList": "Daftar Poin Vertikal",
+  "Common.define.smartArt.textVerticalChevronList": "Daftar Chevron Vertikal",
+  "Common.define.smartArt.textVerticalCircleList": "Daftar Lingkaran Vertikal",
+  "Common.define.smartArt.textVerticalCurvedList": "Daftar Kurva Vertikal",
+  "Common.define.smartArt.textVerticalEquation": "Persamaan Vertikal",
+  "Common.define.smartArt.textVerticalPictureAccentList": "Daftar Aksen Gambar Vertikal",
+  "Common.define.smartArt.textVerticalPictureList": "Daftar Gambar Vertikal",
+  "Common.define.smartArt.textVerticalProcess": "Proses Vertikal",
   "Common.Translation.textMoreButton": "Lainnya",
   "Common.Translation.warnFileLocked": "Anda tidak bisa edit file ini karena sedang di edit di aplikasi lain.",
   "Common.Translation.warnFileLockedBtnEdit": "Buat salinan",
@@ -556,6 +715,7 @@
   "DE.Controllers.LeftMenu.warnReplaceString": "{0} bukan karakter khusus yang valid untuk bidang penggantian.",
   "DE.Controllers.Main.applyChangesTextText": "Memuat perubahan...",
   "DE.Controllers.Main.applyChangesTitleText": "Memuat Perubahan",
+  "DE.Controllers.Main.confirmMaxChangesSize": "Ukuran tindakan melebihi batas yang ditetapkan untuk server Anda.<br>Tekan \"Batalkan\" untuk membatalkan tindakan terakhir Anda atau tekan \"Lanjutkan\" untuk menyimpan tindakan secara lokal (Anda perlu mengunduh file atau menyalin isinya untuk memastikan tidak ada yang hilang).",
   "DE.Controllers.Main.convertationTimeoutText": "Waktu konversi habis.",
   "DE.Controllers.Main.criticalErrorExtText": "Tekan \"OK\" untuk kembali ke daftar dokumen.",
   "DE.Controllers.Main.criticalErrorTitle": "Kesalahan",
@@ -645,6 +805,7 @@
   "DE.Controllers.Main.textClose": "Tutup",
   "DE.Controllers.Main.textCloseTip": "Klik untuk menutup tips",
   "DE.Controllers.Main.textContactUs": "Hubungi sales",
+  "DE.Controllers.Main.textContinue": "Lanjutkan",
   "DE.Controllers.Main.textConvertEquation": "Persamaan ini dibuat dengan editor persamaan versi lama yang sudah tidak didukung. Untuk edit, konversikan persamaan ke format Office Math ML.<br>Konversi sekarang?",
   "DE.Controllers.Main.textCustomLoader": "Perlu diketahui bahwa berdasarkan syarat dari lisensi, Anda tidak bisa untuk mengganti loader.<br>Silakan hubungi Departemen Penjualan kami untuk mendapatkan harga.",
   "DE.Controllers.Main.textDisconnect": "Koneksi terputus",
@@ -665,6 +826,7 @@
   "DE.Controllers.Main.textStrict": "Mode strict",
   "DE.Controllers.Main.textTryUndoRedo": "Fungsi Undo/Redo dinonaktifkan untuk mode Co-editing Cepat.<br>Klik tombol 'Mode strict' untuk mengganti ke Mode Strict Co-editing untuk edit file tanpa gangguan dari user lain dan kirim perubahan Anda hanya setelah Anda menyimpannya. Anda bisa mengganti mode co-editing menggunakan editor di pengaturan lanjut.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Fungsi Undo/Redo dinonaktifkan untuk mode Co-editing Cepat.",
+  "DE.Controllers.Main.textUndo": "Batalkan",
   "DE.Controllers.Main.titleLicenseExp": "Lisensi kadaluwarsa",
   "DE.Controllers.Main.titleServerVersion": "Editor mengupdate",
   "DE.Controllers.Main.titleUpdateVersion": "Versi telah diubah",
@@ -1788,6 +1950,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistik",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subyek",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simbol",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Tag",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Judul",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Diunggah",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Kata",
@@ -2759,6 +2922,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Gambar",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
   "DE.Views.Toolbar.capBtnInsShape": "Bentuk",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Simbol",
   "DE.Views.Toolbar.capBtnInsTable": "Tabel",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",
@@ -2909,6 +3073,7 @@
   "DE.Views.Toolbar.tipInsertImage": "Sisipkan Gambar",
   "DE.Views.Toolbar.tipInsertNum": "Sisipkan Nomor Halaman",
   "DE.Views.Toolbar.tipInsertShape": "Sisipkan Bentuk Otomatis",
+  "DE.Views.Toolbar.tipInsertSmartArt": "Sisipkan SmartArt",
   "DE.Views.Toolbar.tipInsertSymbol": "Sisipkan simbol",
   "DE.Views.Toolbar.tipInsertTable": "Sisipkan Tabel",
   "DE.Views.Toolbar.tipInsertText": "Sisipkan kotak teks",
@@ -2985,8 +3150,10 @@
   "DE.Views.ViewTab.textFitToPage": "Sesuaikan Halaman",
   "DE.Views.ViewTab.textFitToWidth": "Sesuaikan Lebar",
   "DE.Views.ViewTab.textInterfaceTheme": "Tema interface",
+  "DE.Views.ViewTab.textLeftMenu": "Panel kiri",
   "DE.Views.ViewTab.textNavigation": "Navigasi",
   "DE.Views.ViewTab.textOutline": "Tajuk",
+  "DE.Views.ViewTab.textRightMenu": "Panel kanan",
   "DE.Views.ViewTab.textRulers": "Penggaris",
   "DE.Views.ViewTab.textStatusBar": "Bar Status",
   "DE.Views.ViewTab.textZoom": "Pembesaran",

apps/documenteditor/main/locale/it.json

@@ -125,6 +125,13 @@
   "Common.define.chartData.textScatterSmoothMarker": "Grafico a dispersione con linee e indicatori",
   "Common.define.chartData.textStock": "Azionario",
   "Common.define.chartData.textSurface": "Superficie",
+  "Common.define.smartArt.textBalance": "Equilibri",
+  "Common.define.smartArt.textEquation": "Equazione",
+  "Common.define.smartArt.textFunnel": "Imbuto",
+  "Common.define.smartArt.textList": "Elenco",
+  "Common.define.smartArt.textMatrix": "Matrice",
+  "Common.define.smartArt.textOther": "Altro",
+  "Common.define.smartArt.textPicture": "Immagine",
   "Common.Translation.textMoreButton": "più",
   "Common.Translation.warnFileLocked": "Non puoi modificare questo file perché è in fase di modifica in un'altra applicazione.",
   "Common.Translation.warnFileLockedBtnEdit": "Crea copia",
@@ -288,6 +295,8 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Caricamento in corso...",
   "Common.Views.DocumentAccessDialog.textTitle": "Impostazioni di condivisione",
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor di grafici",
+  "Common.Views.ExternalEditor.textClose": "Chiudi",
+  "Common.Views.ExternalEditor.textSave": "Salva ed esci",
   "Common.Views.ExternalMergeEditor.textTitle": "Destinatari Stampa unione",
   "Common.Views.ExternalOleEditor.textTitle": "Editor di fogli di calcolo",
   "Common.Views.Header.labelCoUsersDescr": "Utenti che stanno modificando il file:",
@@ -354,6 +363,7 @@
   "Common.Views.Plugins.textStart": "Inizia",
   "Common.Views.Plugins.textStop": "Termina",
   "Common.Views.Protection.hintAddPwd": "Crittografa con password",
+  "Common.Views.Protection.hintDelPwd": "Elimina password",
   "Common.Views.Protection.hintPwd": "Modifica o rimuovi password",
   "Common.Views.Protection.hintSignature": "Aggiungi firma digitale o riga di firma",
   "Common.Views.Protection.txtAddPwd": "Aggiungi password",
@@ -435,7 +445,7 @@
   "Common.Views.ReviewChanges.txtSharing": "Condivisione",
   "Common.Views.ReviewChanges.txtSpelling": "Controllo ortografico",
   "Common.Views.ReviewChanges.txtTurnon": "Traccia cambiamenti",
-  "Common.Views.ReviewChanges.txtView": "Modalità Visualizzazione",
+  "Common.Views.ReviewChanges.txtView": "Modalità di visualizzazione",
   "Common.Views.ReviewChangesDialog.textTitle": "Rivedi modifiche",
   "Common.Views.ReviewChangesDialog.txtAccept": "Accetta",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accetta tutte le modifiche",
@@ -591,6 +601,7 @@
   "DE.Controllers.Main.errorSetPassword": "Impossibile impostare la password.",
   "DE.Controllers.Main.errorStockChart": "Righe ordinate in modo errato. Per creare un grafico azionario posizionare i dati sul foglio nel seguente ordine:<br> prezzo di apertura, prezzo massimo, prezzo minimo, prezzo di chiusura.",
   "DE.Controllers.Main.errorSubmit": "Invio fallito.",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "Il valore inserito non corrisponde al formato del campo.",
   "DE.Controllers.Main.errorToken": "Il token di sicurezza del documento non è stato creato correttamente.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorTokenExpire": "Il token di sicurezza del documento è scaduto.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
   "DE.Controllers.Main.errorUpdateVersion": "La versione del file è stata modificata. La pagina verrà ricaricata.",
@@ -638,6 +649,7 @@
   "DE.Controllers.Main.textClose": "Chiudi",
   "DE.Controllers.Main.textCloseTip": "Clicca su per chiudere la notifica",
   "DE.Controllers.Main.textContactUs": "Contatta il team di vendite",
+  "DE.Controllers.Main.textContinue": "Continua",
   "DE.Controllers.Main.textConvertEquation": "Questa equazione è stata creata con una vecchia versione dell'editor di equazioni che non è più supportata.Per modificarla, convertire l'equazione nel formato ML di Office Math.<br>Convertire ora?",
   "DE.Controllers.Main.textCustomLoader": "Si prega di notare che, in base ai termini della licenza, non si ha il diritto di modificare il caricatore.<br>Si prega di contattare il nostro reparto vendite per ottenere un preventivo.",
   "DE.Controllers.Main.textDisconnect": "Connessione persa",
@@ -658,6 +670,7 @@
   "DE.Controllers.Main.textStrict": "Modalità Rigorosa",
   "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.<br>Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Le funzioni Annulla/Ripeti sono disattivate nella modalità rapida in modifica collaborativa.",
+  "DE.Controllers.Main.textUndo": "Annulla",
   "DE.Controllers.Main.titleLicenseExp": "La licenza è scaduta",
   "DE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato",
   "DE.Controllers.Main.titleUpdateVersion": "Versione Modificata",
@@ -1329,12 +1342,17 @@
   "DE.Views.CellsAddDialog.textUp": "Sopra il cursore",
   "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
   "DE.Views.ChartSettings.textChartType": "Cambia tipo di grafico",
+  "DE.Views.ChartSettings.textDown": "Giù",
   "DE.Views.ChartSettings.textEditData": "Modifica dati",
   "DE.Views.ChartSettings.textHeight": "Altezza",
+  "DE.Views.ChartSettings.textLeft": "A sinistra",
   "DE.Views.ChartSettings.textOriginalSize": "Dimensione reale",
+  "DE.Views.ChartSettings.textPerspective": "Prospettiva",
+  "DE.Views.ChartSettings.textRight": "A destra",
   "DE.Views.ChartSettings.textSize": "Dimensione",
   "DE.Views.ChartSettings.textStyle": "Stile",
   "DE.Views.ChartSettings.textUndock": "Disancora dal pannello",
+  "DE.Views.ChartSettings.textUp": "Verso l'alto",
   "DE.Views.ChartSettings.textWidth": "Larghezza",
   "DE.Views.ChartSettings.textWrap": "Stile di disposizione testo",
   "DE.Views.ChartSettings.txtBehind": "Dietro al testo",
@@ -1426,6 +1444,8 @@
   "DE.Views.DateTimeDialog.textLang": "Lingua",
   "DE.Views.DateTimeDialog.textUpdate": "Aggiorna automaticamente",
   "DE.Views.DateTimeDialog.txtTitle": "Data e ora",
+  "DE.Views.DocProtection.hintProtectDoc": "Proteggi documento",
+  "DE.Views.DocProtection.txtProtectDoc": "Proteggi documento",
   "DE.Views.DocumentHolder.aboveText": "Al di sopra",
   "DE.Views.DocumentHolder.addCommentText": "Aggiungi commento",
   "DE.Views.DocumentHolder.advancedDropCapText": "Impostazioni di capolettera",
@@ -1751,6 +1771,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiche",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Oggetto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simboli",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etichette",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titolo documento",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Caricato",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Parole",
@@ -1759,7 +1780,7 @@
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persone che hanno diritti",
   "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Avviso",
   "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "con Password",
-  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Proteggi Documento",
+  "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Proteggi documento",
   "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "con Firma",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Modifica documento",
   "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "La modifica eliminerà le firme dal documento.<br>Vuoi continuare?",
@@ -1841,6 +1862,7 @@
   "DE.Views.FormSettings.textComplex": "Campo complesso",
   "DE.Views.FormSettings.textConnected": "Campi collegati",
   "DE.Views.FormSettings.textDelete": "Elimina",
+  "DE.Views.FormSettings.textDigits": "Cifre",
   "DE.Views.FormSettings.textDisconnect": "Disconnetti",
   "DE.Views.FormSettings.textDropDown": "Menù a discesca",
   "DE.Views.FormSettings.textExact": "Esattamente",
@@ -1859,6 +1881,7 @@
   "DE.Views.FormSettings.textMulti": "Campo con molte righe",
   "DE.Views.FormSettings.textNever": "Mai",
   "DE.Views.FormSettings.textNoBorder": "Senza bordo",
+  "DE.Views.FormSettings.textNone": "Nessuno",
   "DE.Views.FormSettings.textPlaceholder": "Segnaposto",
   "DE.Views.FormSettings.textRadiobox": "Pulsante opzione",
   "DE.Views.FormSettings.textRequired": "Richiesto",
@@ -2059,6 +2082,7 @@
   "DE.Views.LeftMenu.tipComments": "Commenti",
   "DE.Views.LeftMenu.tipNavigation": "Navigazione",
   "DE.Views.LeftMenu.tipOutline": "Intestazioni",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Miniature delle pagine",
   "DE.Views.LeftMenu.tipPlugins": "Plugin",
   "DE.Views.LeftMenu.tipSearch": "Ricerca",
   "DE.Views.LeftMenu.tipSupport": "Feedback & Supporto",
@@ -2366,6 +2390,14 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Imposta solo bordo superiore",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Nessun bordo",
+  "DE.Views.ProtectDialog.textComments": "Commenti",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "La password di conferma non corrisponde",
+  "DE.Views.ProtectDialog.txtOptional": "opzionale",
+  "DE.Views.ProtectDialog.txtPassword": "Password",
+  "DE.Views.ProtectDialog.txtProtect": "Proteggere",
+  "DE.Views.ProtectDialog.txtRepeat": "Ripeti la password",
+  "DE.Views.ProtectDialog.txtTitle": "Proteggere",
+  "DE.Views.ProtectDialog.txtWarning": "Importante: una volta persa o dimenticata, la password non potrà più essere recuperata. Conservalo in un luogo sicuro.",
   "DE.Views.RightMenu.txtChartSettings": "Impostazioni grafico",
   "DE.Views.RightMenu.txtFormSettings": "‎Impostazioni modulo‎",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Impostazioni intestazione e piè di pagina",
@@ -2556,6 +2588,7 @@
   "DE.Views.TableSettings.tipOuter": "Imposta solo bordi esterni",
   "DE.Views.TableSettings.tipRight": "Imposta solo bordo esterno destro",
   "DE.Views.TableSettings.tipTop": "Imposta solo bordo esterno superiore",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Personalizzato",
   "DE.Views.TableSettings.txtNoBorders": "Nessun bordo",
   "DE.Views.TableSettings.txtTable_Accent": "Accento",
   "DE.Views.TableSettings.txtTable_Colorful": "Colorato",
@@ -2684,7 +2717,7 @@
   "DE.Views.TextToTableDialog.textWindow": "Autofit alla finestra",
   "DE.Views.TextToTableDialog.txtAutoText": "Automatico",
   "DE.Views.Toolbar.capBtnAddComment": "Aggiungi commento",
-  "DE.Views.Toolbar.capBtnBlankPage": "Pagina Vuota",
+  "DE.Views.Toolbar.capBtnBlankPage": "Pagina vuota",
   "DE.Views.Toolbar.capBtnColumns": "Colonne",
   "DE.Views.Toolbar.capBtnComment": "Commento",
   "DE.Views.Toolbar.capBtnDateTime": "Data e ora",
@@ -2696,6 +2729,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Immagine",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Interruzione di pagina",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Simbolo",
   "DE.Views.Toolbar.capBtnInsTable": "Tabella",
   "DE.Views.Toolbar.capBtnInsTextart": "Text Art",

apps/documenteditor/main/locale/pt-pt.json

@@ -125,6 +125,11 @@
   "Common.define.chartData.textScatterSmoothMarker": "Dispersão com Linhas Suaves e Marcadores",
   "Common.define.chartData.textStock": "Gráfico de ações",
   "Common.define.chartData.textSurface": "Superfície",
+  "Common.define.smartArt.textEquation": "Equação",
+  "Common.define.smartArt.textFunnel": "Funil",
+  "Common.define.smartArt.textList": "Lista",
+  "Common.define.smartArt.textOther": "Outro",
+  "Common.define.smartArt.textPicture": "Imagem",
   "Common.Translation.textMoreButton": "Mais",
   "Common.Translation.warnFileLocked": "Não pode editar o ficheiro porque este está a ser editado por outra aplicação.",
   "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia",
@@ -645,6 +650,7 @@
   "DE.Controllers.Main.textClose": "Fechar",
   "DE.Controllers.Main.textCloseTip": "Clique para fechar a dica",
   "DE.Controllers.Main.textContactUs": "Contacte a equipa comercial",
+  "DE.Controllers.Main.textContinue": "Continuar",
   "DE.Controllers.Main.textConvertEquation": "Esta equação foi criada com uma versão anterior da aplicação e já não é suportada. Para a editar, tem que converter a equação para o formato Office Math ML.<br>Converter agora?",
   "DE.Controllers.Main.textCustomLoader": "Tenha em conta de que, de acordo com os termos da licença, não tem permissões para alterar o carregador.<br>Por favor contacte a equipa comercial.",
   "DE.Controllers.Main.textDisconnect": "A ligação está perdida",
@@ -665,6 +671,7 @@
   "DE.Controllers.Main.textStrict": "Modo estrito",
   "DE.Controllers.Main.textTryUndoRedo": "As funções Desfazer/Refazer foram desativadas para se poder co-editar o documento.<br>Clique no botão 'Modo estrito' para ativar este modo de edição e editar o ficheiro sem ser incomodado por outros utilizadores enviando apenas as suas alterações assim que terminar e guardar. Pode alternar entre modos de co-edição através das definições avançadas.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "As funções Desfazer/Refazer estão desativadas no modo de co-edição rápida.",
+  "DE.Controllers.Main.textUndo": "Desfazer",
   "DE.Controllers.Main.titleLicenseExp": "Licença expirada",
   "DE.Controllers.Main.titleServerVersion": "Editor atualizado",
   "DE.Controllers.Main.titleUpdateVersion": "Versão alterada",
@@ -1788,6 +1795,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estatísticas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Assunto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Tags",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Carregado",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palavras",
@@ -2759,6 +2767,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Imagem",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Quebras",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Símbolo",
   "DE.Views.Toolbar.capBtnInsTable": "Tabela",
   "DE.Views.Toolbar.capBtnInsTextart": "Lágrima",

apps/documenteditor/main/locale/pt.json

@@ -125,6 +125,12 @@
   "Common.define.chartData.textScatterSmoothMarker": "Dispersão com linhas suaves e marcadores",
   "Common.define.chartData.textStock": "Gráfico de ações",
   "Common.define.chartData.textSurface": "Superfície",
+  "Common.define.smartArt.textBalance": "Saldo",
+  "Common.define.smartArt.textEquation": "Equação",
+  "Common.define.smartArt.textFunnel": "Funil",
+  "Common.define.smartArt.textList": "Lista",
+  "Common.define.smartArt.textOther": "Outro",
+  "Common.define.smartArt.textPicture": "Imagem",
   "Common.Translation.textMoreButton": "Mais",
   "Common.Translation.warnFileLocked": "Documento está em uso por outra aplicação. Você pode continuar editando e salvá-lo como uma cópia.",
   "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia",
@@ -645,6 +651,7 @@
   "DE.Controllers.Main.textClose": "Fechar",
   "DE.Controllers.Main.textCloseTip": "Clique para fechar a dica",
   "DE.Controllers.Main.textContactUs": "Contate as vendas",
+  "DE.Controllers.Main.textContinue": "Continuar",
   "DE.Controllers.Main.textConvertEquation": "Esta equação foi criada com uma versão antiga do editor de equação que não é mais compatível. Para editá-lo, converta a equação para o formato Office Math ML. <br> Converter agora?",
   "DE.Controllers.Main.textCustomLoader": "Por favor, observe que de acordo com os termos de licença, você não tem autorização para alterar o carregador. <br> Por favor, contate o Departamento de Vendas para fazer cotação.",
   "DE.Controllers.Main.textDisconnect": "A conexão está perdida",
@@ -665,6 +672,7 @@
   "DE.Controllers.Main.textStrict": "Modo estrito",
   "DE.Controllers.Main.textTryUndoRedo": "As funções Desfazer/Refazer ficam desabilitadas no modo de Coedição Rápida.<br>Selecione o modo 'Estrito' para editar o aquivo sem que outros usuários interfiram e envie suas mudanças somente ao salvar o documento. Você pode alternar entre os modos de coedição usando as Configurações Avançadas.\",",
   "DE.Controllers.Main.textTryUndoRedoWarn": "As funções Desfazer/Refazer estão desabilitadas para o modo de coedição rápido",
+  "DE.Controllers.Main.textUndo": "Desfazer",
   "DE.Controllers.Main.titleLicenseExp": "A licença expirou",
   "DE.Controllers.Main.titleServerVersion": "Editor atualizado",
   "DE.Controllers.Main.titleUpdateVersion": "Versão alterada",
@@ -1788,6 +1796,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estatísticas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Assunto",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etiquetas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título do documento",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Carregado",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palavras",
@@ -2759,6 +2768,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Imagem",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Quebras",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Símbolo",
   "DE.Views.Toolbar.capBtnInsTable": "Tabela",
   "DE.Views.Toolbar.capBtnInsTextart": "Arte de texto",

apps/documenteditor/main/locale/ru.json

@@ -612,6 +612,7 @@
   "Common.Views.ReviewPopover.textCancel": "Отмена",
   "Common.Views.ReviewPopover.textClose": "Закрыть",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Введите здесь свой комментарий",
   "Common.Views.ReviewPopover.textFollowMove": "Перейти на прежнее место",
   "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте",
   "Common.Views.ReviewPopover.textMentionNotify": "+упоминание отправит пользователю оповещение по почте",
@@ -742,6 +743,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.Controllers.Main.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "DE.Controllers.Main.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на диск или повторите попытку позже.",
+  "DE.Controllers.Main.errorInconsistentExt": "При открытии файла произошла ошибка.<br>Содержимое файла не соответствует расширению файла.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует документам (например, docx), но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует одному из следующих форматов: pdf/djvu/xps/oxps, но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует презентациям (например, pptx), но файл имеет несоответствующее расширение: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует электронным таблицам (например, xlsx), но файл имеет несоответствующее расширение: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
   "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
   "DE.Controllers.Main.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
@@ -3150,8 +3156,10 @@
   "DE.Views.ViewTab.textFitToPage": "По размеру страницы",
   "DE.Views.ViewTab.textFitToWidth": "По ширине",
   "DE.Views.ViewTab.textInterfaceTheme": "Тема интерфейса",
+  "DE.Views.ViewTab.textLeftMenu": "Левая панель",
   "DE.Views.ViewTab.textNavigation": "Навигация",
   "DE.Views.ViewTab.textOutline": "Заголовки",
+  "DE.Views.ViewTab.textRightMenu": "Правая панель",
   "DE.Views.ViewTab.textRulers": "Линейки",
   "DE.Views.ViewTab.textStatusBar": "Строка состояния",
   "DE.Views.ViewTab.textZoom": "Масштаб",

apps/documenteditor/main/locale/zh.json

@@ -263,7 +263,27 @@
   "Common.define.smartArt.textThemePictureAccent": "主题图片重点",
   "Common.define.smartArt.textThemePictureAlternatingAccent": "主题图片交替重点",
   "Common.define.smartArt.textThemePictureGrid": "主题图片网格",
+  "Common.define.smartArt.textTitledMatrix": "带标题的矩阵",
+  "Common.define.smartArt.textTitledPictureAccentList": "标题图片重点列表",
+  "Common.define.smartArt.textTitledPictureBlocks": "标题图片块",
   "Common.define.smartArt.textTitlePictureLineup": "标题图片排列",
+  "Common.define.smartArt.textTrapezoidList": "梯形列表",
+  "Common.define.smartArt.textUpwardArrow": "向上箭头",
+  "Common.define.smartArt.textVaryingWidthList": "不同宽度列表",
+  "Common.define.smartArt.textVerticalAccentList": "垂直重点列表",
+  "Common.define.smartArt.textVerticalArrowList": "垂直箭头列表",
+  "Common.define.smartArt.textVerticalBendingProcess": "垂直蛇形流程",
+  "Common.define.smartArt.textVerticalBlockList": "垂直块列表",
+  "Common.define.smartArt.textVerticalBoxList": "垂直框列表",
+  "Common.define.smartArt.textVerticalBracketList": "垂直括弧列表",
+  "Common.define.smartArt.textVerticalBulletList": "垂直项目符号列表",
+  "Common.define.smartArt.textVerticalChevronList": "垂直 V 形列表",
+  "Common.define.smartArt.textVerticalCircleList": "垂直圆形列表",
+  "Common.define.smartArt.textVerticalCurvedList": "垂直曲形列表",
+  "Common.define.smartArt.textVerticalEquation": "垂直公式",
+  "Common.define.smartArt.textVerticalPictureAccentList": "垂直图片重点列表",
+  "Common.define.smartArt.textVerticalPictureList": "垂直图片列表",
+  "Common.define.smartArt.textVerticalProcess": "垂直流程",
   "Common.Translation.textMoreButton": "更多",
   "Common.Translation.warnFileLocked": "您不能编辑此文件，因为它正在另一个应用程序中被编辑。",
   "Common.Translation.warnFileLockedBtnEdit": "建立副本",
@@ -806,6 +826,7 @@
   "DE.Controllers.Main.textStrict": "手动模式",
   "DE.Controllers.Main.textTryUndoRedo": "对于自动的协同编辑模式，取消/重做功能是禁用的。< br >单击“手动模式”按钮切换到手动协同编辑模式，这样，编辑该文件时只有您保存修改之后，其他用户才能访问这些修改。您可以使用编辑器高级设置易于切换编辑模式。",
   "DE.Controllers.Main.textTryUndoRedoWarn": "自动共同编辑模式下，撤销/重做功能被禁用。",
+  "DE.Controllers.Main.textUndo": "撤消",
   "DE.Controllers.Main.titleLicenseExp": "许可证过期",
   "DE.Controllers.Main.titleServerVersion": "编辑器已更新",
   "DE.Controllers.Main.titleUpdateVersion": "版本已变化",
@@ -2553,6 +2574,7 @@
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "没有边框",
   "DE.Views.ProtectDialog.textComments": "评论",
   "DE.Views.ProtectDialog.textForms": "填写表单",
+  "DE.Views.ProtectDialog.textReview": "修订",
   "DE.Views.ProtectDialog.textView": "不允许任何更改（只读）",
   "DE.Views.ProtectDialog.txtAllow": "仅允许在文档中进行此类型的编辑",
   "DE.Views.ProtectDialog.txtIncorrectPwd": "确认的密码与先前输入的不一致。",
@@ -2561,6 +2583,7 @@
   "DE.Views.ProtectDialog.txtProtect": "保护",
   "DE.Views.ProtectDialog.txtRepeat": "重复输入密码",
   "DE.Views.ProtectDialog.txtTitle": "保护",
+  "DE.Views.ProtectDialog.txtWarning": "警告: 如果丢失或忘记密码，则无法将其恢复。请妥善保存。",
   "DE.Views.RightMenu.txtChartSettings": "图表设置",
   "DE.Views.RightMenu.txtFormSettings": "表单设置",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "页眉和页脚设置",

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

@@ -130,7 +130,7 @@
     border-radius: 0;
     padding: 3px 10px;
     color: #ffffff;
-    font: 11px arial;
+    .font-size-normal();
     white-space: nowrap;
     letter-spacing: 1px;
     overflow: hidden;
@@ -179,7 +179,9 @@
     .separator {
         height: 20px;
     }
-    z-index: @zindex-dropdown - 19;
+    &.has-open-menu {
+        z-index: @zindex-navbar + 1;
+    }
 }
 
 .dropdown-menu.list-settings-level {

apps/documenteditor/mobile/locale/az.json

@@ -220,6 +220,7 @@
     "textAlign": "Nizamlayın",
     "textAllCaps": "Bütün başlıqlar",
     "textAllowOverlap": "Üst-üstə düşməsinə icazə verin",
+    "textAugust": "avqust",
     "textAuto": "Avtomatik",
     "textAutomatic": "Avtomatik",
     "textBack": "Geriyə",
@@ -232,7 +233,9 @@
     "textBringToForeground": "Ön plana çıxarın",
     "textBullets": "Markerlər",
     "textBulletsAndNumbers": "Markerlər və Ədədlər",
+    "textCancel": "Ləğv",
     "textCellMargins": "Xanalardakı Kənar Boşluqlar",
+    "textCentered": "Mərkəzlənmiş",
     "textChart": "Diaqram",
     "textClose": "Bağlayın",
     "textColor": "Rəng",
@@ -320,9 +323,6 @@
     "textWrap": "Keçirin",
     "textAmountOfLevels": "Amount of Levels",
     "textApril": "April",
-    "textAugust": "August",
-    "textCancel": "Cancel",
-    "textCentered": "Centered",
     "textChangeShape": "Change Shape",
     "textClassic": "Classic",
     "textCreateTextStyle": "Create new text style",
@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "Təsvir çox böyükdür. Maksimum ölçü 25 MB-dır.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
@@ -570,6 +575,7 @@
     "textApplicationSettings": "Proqram Parametrləri",
     "textAuthor": "Müəllif",
     "textBack": "Geriyə",
+    "textBeginningDocument": "Sənədin başlanğıcı",
     "textBottom": "Aşağı",
     "textCancel": "Ləğv edin",
     "textCaseSensitive": "Böyük/Kiçik Hərfə Həssas",
@@ -670,7 +676,6 @@
     "txtScheme7": "Bərabər",
     "txtScheme8": "Axın",
     "txtScheme9": "Emalatxana",
-    "textBeginningDocument": "Beginning of document",
     "textDirection": "Direction",
     "textEmptyHeading": "Empty Heading",
     "textEmptyScreens": "There are no headings in the document. Apply a headings style to the text so that it appears in the table of contents.",

apps/documenteditor/mobile/locale/be.json

@@ -407,6 +407,11 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorFilePassProtect": "The file is password protected and could not be opened.",
     "errorFileSizeExceed": "The file size exceeds your server limit.<br>Please, contact your admin.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
     "errorMailMergeLoadFile": "Loading failed",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",

apps/documenteditor/mobile/locale/bg.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/ca.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Error desconegut.",
     "uploadImageExtMessage": "Format d'imatge desconegut.",
     "uploadImageFileCountMessage": "No s'ha carregat cap imatge.",
-    "uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és de 25 MB."
+    "uploadImageSizeMessage": "La imatge és massa gran. La mida màxima és de 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "S'estan carregant les dades...",

apps/documenteditor/mobile/locale/cs.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Pokračovat na stránce",
     "textCurrentPosition": "Aktuální pozice",
     "textDisplay": "Zobrazit",
+    "textDone": "Hotovo",
     "textEmptyImgUrl": "Musíte upřesnit URL obrázku.",
     "textEvenPage": "Sudá stránka",
     "textFootnote": "Poznámka pod čarou",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Obrázek z knihovny",
     "textPictureFromURL": "Obrázek z adresy URL",
     "textPosition": "Pozice",
+    "textRecommended": "Doporučeno",
+    "textRequired": "Požadováno",
     "textRightBottom": "Vpravo dole",
     "textRightTop": "Vpravo nahoře",
     "textRows": "Řádky",
@@ -61,10 +64,7 @@
     "textTableSize": "Velikost tabulky",
     "textWithBlueLinks": "s modrými odkazy",
     "textWithPageNumbers": "s číslováním stránek",
-    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\"",
+    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\""
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Přehled změn",
       "textRight": "Zarovnat vpravo",
       "textShape": "Obrazec",
+      "textSharingSettings": "Nastavení sdílení",
       "textShd": "Barva pozadí",
       "textSmallCaps": "Malá písmena",
       "textSpacing": "Mezery",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Funkce Zpět/Znovu jsou vypnuty pro rychlý režim spolupráce.",
       "textUnderline": "Podtržení",
       "textUsers": "Uživatelé",
-      "textWidow": "Ovládací prvek okna",
+      "textWidow": "Ovládací prvek okna"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Bez výplně"
@@ -184,6 +184,7 @@
     "menuDelete": "Odstranit",
     "menuDeleteTable": "Odstranit tabulku",
     "menuEdit": "Upravit",
+    "menuEditLink": "Upravit odkaz",
     "menuJoinList": "Připojit k předchozímu seznamu",
     "menuMerge": "Sloučit",
     "menuMore": "Více",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Obnovit celou tabulku",
     "textRefreshPageNumbersOnly": "Obnovit pouze číslování stránek",
     "textRows": "Řádky",
-    "txtWarnUrl": "Kliknutí na tento odkaz může být škodlivé pro Vaše zařízení a Vaše data.<br>Jste si jistí, že chcete pokračovat?",
+    "txtWarnUrl": "Kliknutí na tento odkaz může být škodlivé pro Vaše zařízení a Vaše data.<br>Jste si jistí, že chcete pokračovat?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Varování",
@@ -238,6 +238,7 @@
     "textCancel": "Zrušit",
     "textCellMargins": "Okraje buňky",
     "textCentered": "Vycentrováno",
+    "textChangeShape": "Vlastní tvar",
     "textChart": "Graf",
     "textClassic": "Klasické",
     "textClose": "Zavřít",
@@ -246,7 +247,10 @@
     "textCreateTextStyle": "Vytvořit nový styl textu",
     "textCurrent": "Aktuální",
     "textCustomColor": "Vlastní barva",
+    "textCustomStyle": "Vlastní styl",
     "textDecember": "prosinec",
+    "textDeleteImage": "Smazat obrázek",
+    "textDeleteLink": "Smazat odkaz",
     "textDesign": "Vzhled",
     "textDifferentFirstPage": "Odlišná první stránka",
     "textDifferentOddAndEvenPages": "Rozdílné liché a sudé stránky",
@@ -319,6 +323,7 @@
     "textPictureFromLibrary": "Obrázek z knihovny",
     "textPictureFromURL": "Obrázek z adresy URL",
     "textPt": "pt",
+    "textRecommended": "Doporučeno",
     "textRefresh": "Načíst znovu",
     "textRefreshEntireTable": "Obnovit celou tabulku",
     "textRefreshPageNumbersOnly": "Obnovit pouze číslování stránek",
@@ -330,6 +335,7 @@
     "textRepeatAsHeaderRow": "Opakujte jako řádek záhlaví",
     "textReplace": "Nahradit",
     "textReplaceImage": "Nahradit obrázek",
+    "textRequired": "Požadováno",
     "textResizeToFitContent": "Změnit velikost pro přizpůsobení obsahu",
     "textRightAlign": "Zarovnat vpravo",
     "textSa": "so",
@@ -359,6 +365,7 @@
     "textTableOfCont": "Obsah",
     "textTableOptions": "Možnosti tabulky",
     "textText": "Text",
+    "textTextWrapping": "Obtékaní textu",
     "textTh": "čt",
     "textThrough": "Skrz",
     "textTight": "Těsné",
@@ -369,14 +376,7 @@
     "textType": "Typ",
     "textWe": "st",
     "textWrap": "Obtékání",
-    "textChangeShape": "Change Shape",
+    "textWrappingStyle": "Obtékání textu"
-    "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
-    "textRecommended": "Recommended",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "Vypršel čas konverze.",
@@ -390,6 +390,7 @@
     "errorDataEncrypted": "Obdrženy šifrované změny – bez hesla je není možné zobrazit.",
     "errorDataRange": "Nesprávný datový rozsah.",
     "errorDefaultMessage": "Kód chyby: %1",
+    "errorDirectUrl": "Ověřte správnost odkazu na dokument.<br>Je třeba, aby se jednalo o přímý odkaz pro stažení souboru.",
     "errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Stáhněte dokument pro vytvoření lokální zálohy souboru.",
     "errorEmptyTOC": "Začít vytvářet obsah aplikováním stylů pro nadpisy na vybraný text. ",
     "errorFilePassProtect": "Soubor je zabezpečen heslem a nemůže být otevřen.",
@@ -419,7 +420,11 @@
     "uploadImageExtMessage": "Neznámý formát obrázku.",
     "uploadImageFileCountMessage": "Nenahrány žádné obrázky.",
     "uploadImageSizeMessage": "Obrázek je příliš velký. Maximální velikost je 25 MB.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {
@@ -451,14 +456,14 @@
     "saveTitleText": "Ukládání dokumentu",
     "sendMergeText": "Odesílaní hromadné zprávy…",
     "sendMergeTitle": "Odesílaní hromadné zprávy",
+    "textContinue": "Pokračovat",
     "textLoadingDocument": "Načítání dokumentu",
+    "textUndo": "Zpět",
     "txtEditingMode": "Nastavit režim úprav…",
     "uploadImageTextText": "Nahrávání obrázku...",
     "uploadImageTitleText": "Nahrávání obrázku",
     "waitText": "Čekejte prosím...",
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
+    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost)."
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Chyba",
@@ -622,6 +627,7 @@
     "textMargins": "Okraje",
     "textMarginsH": "Horní a spodní okraj je příliš velký vzhledem k dané výšce stránky",
     "textMarginsW": "Okraje vlevo a vpravo jsou příliš velké vzhledem k šířce stránky",
+    "textMobileView": "Mobilní zobrazení",
     "textNavigation": "Navigace",
     "textNo": "Ne",
     "textNoCharacters": "Netisknutelné znaky",
@@ -685,8 +691,7 @@
     "txtScheme6": "Hala",
     "txtScheme7": "Rovnost",
     "txtScheme8": "Tok",
-    "txtScheme9": "Slévárna",
+    "txtScheme9": "Slévárna"
-    "textMobileView": "Mobile View"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "V tomto dokumentu máte neuložené změny. Klikněte na 'Zůstat na této stránce'. Klikněte na 'Opustit tuto stránku' pro zahození neuložených změn.",
@@ -694,7 +699,7 @@
     "leaveButtonText": "Opustit tuto stránku",
     "stayButtonText": "Zůstat na této stránce",
     "textOk": "OK",
-    "textSwitchedMobileView": "Switched to Mobile view",
+    "textSwitchedMobileView": "Přepnout na mobilní zobrazení",
-    "textSwitchedStandardView": "Switched to Standard view"
+    "textSwitchedStandardView": "Přepnout na standartní zobrazení"
   }
 }

apps/documenteditor/mobile/locale/da.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/de.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Fortlaufende Seite",
     "textCurrentPosition": "Aktuelle Position",
     "textDisplay": "Anzeigen",
+    "textDone": "Fertig",
     "textEmptyImgUrl": "URL des Bildes erforderlich",
     "textEvenPage": "Gerade Seite",
     "textFootnote": "Fußnote",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Bild aus dem Verzeichnis",
     "textPictureFromURL": "Bild aus URL",
     "textPosition": "Position",
+    "textRecommended": "Empfohlen",
+    "textRequired": "Erforderlich",
     "textRightBottom": "Rechts unten",
     "textRightTop": "Rechts oben",
     "textRows": "Zeilen",
@@ -61,10 +64,7 @@
     "textTableSize": "Tabellengröße",
     "textWithBlueLinks": "Mit blauen Links",
     "textWithPageNumbers": "Mit Seitennummern",
-    "txtNotUrl": "Dieser Bereich soll eine URL im Format \"http://www.example.com\" sein.",
+    "txtNotUrl": "Dieser Bereich soll eine URL im Format \"http://www.example.com\" sein."
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Änderung überprüfen",
       "textRight": "Rechtsbündig ausrichten",
       "textShape": "Form",
+      "textSharingSettings": "Freigabeeinstellungen",
       "textShd": "Hintergrundfarbe",
       "textSmallCaps": "Kapitälchen",
       "textSpacing": "Abstand",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Die Optionen Rückgängig machen/Wiederholen sind für den Schnellmodus deaktiviert.",
       "textUnderline": "Unterstrichen",
       "textUsers": "Benutzer",
-      "textWidow": "Absatzkontrolle",
+      "textWidow": "Absatzkontrolle"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Keine Füllung"
@@ -184,6 +184,7 @@
     "menuDelete": "Löschen",
     "menuDeleteTable": "Tabelle löschen",
     "menuEdit": "Bearbeiten",
+    "menuEditLink": "Link bearbeiten",
     "menuJoinList": "Mit der vorherigen Liste verbinden",
     "menuMerge": "Verbinden",
     "menuMore": "Mehr",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Ganze Tabelle aktualisieren",
     "textRefreshPageNumbersOnly": "Nur Seitenzahlen aktualisieren",
     "textRows": "Zeilen",
-    "txtWarnUrl": "Dieser Link kann für Ihr Gerät und Daten gefährlich sein.<br>Möchten Sie wirklich fortsetzen?",
+    "txtWarnUrl": "Dieser Link kann für Ihr Gerät und Daten gefährlich sein.<br>Möchten Sie wirklich fortsetzen?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Warnung",
@@ -238,6 +238,7 @@
     "textCancel": "Abbrechen",
     "textCellMargins": "Zellenränder",
     "textCentered": "Zentriert",
+    "textChangeShape": "Form ändern",
     "textChart": "Diagramm",
     "textClassic": "Klassisch",
     "textClose": "Schließen",
@@ -246,7 +247,10 @@
     "textCreateTextStyle": "Neuen Textstil erstellen",
     "textCurrent": "Aktuell",
     "textCustomColor": "Benutzerdefinierte Farbe",
+    "textCustomStyle": "Benutzerdefinierter Stil",
     "textDecember": "Dezember",
+    "textDeleteImage": "Bild löschen",
+    "textDeleteLink": "Link löschen",
     "textDesign": "Design",
     "textDifferentFirstPage": "Erste Seite anders",
     "textDifferentOddAndEvenPages": "Gerade und ungerade Seiten anders",
@@ -319,6 +323,7 @@
     "textPictureFromLibrary": "Bild aus dem Verzeichnis",
     "textPictureFromURL": "Bild aus URL",
     "textPt": "pt",
+    "textRecommended": "Empfohlen",
     "textRefresh": "Aktualisieren",
     "textRefreshEntireTable": "Ganze Tabelle aktualisieren",
     "textRefreshPageNumbersOnly": "Nur Seitenzahlen aktualisieren",
@@ -330,6 +335,7 @@
     "textRepeatAsHeaderRow": "Als Überschriftenzeile wiederholen",
     "textReplace": "Ersetzen",
     "textReplaceImage": "Bild ersetzen",
+    "textRequired": "Erforderlich",
     "textResizeToFitContent": "An die Größe des Inhalts anpassen",
     "textRightAlign": "Rechtsbündig",
     "textSa": "Sa",
@@ -359,6 +365,7 @@
     "textTableOfCont": "Inhaltsverzeichnis",
     "textTableOptions": "Tabellenoptionen",
     "textText": "Text",
+    "textTextWrapping": "Textumbruch",
     "textTh": "Do",
     "textThrough": "Durchgehend",
     "textTight": "Passend",
@@ -369,14 +376,7 @@
     "textType": "Typ",
     "textWe": "Mi",
     "textWrap": "Umbrechen",
-    "textChangeShape": "Change Shape",
+    "textWrappingStyle": "Textumbruch"
-    "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
-    "textRecommended": "Recommended",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.",
@@ -390,10 +390,16 @@
     "errorDataEncrypted": "Verschlüsselte Änderungen wurden empfangen. Sie können nicht entschlüsselt werden.",
     "errorDataRange": "Falscher Datenbereich.",
     "errorDefaultMessage": "Fehlercode: %1",
+    "errorDirectUrl": "Bitte überprüfen Sie den Link zum Dokument.<br>Dieser Link muss ein direkter Link zu der Datei zum Herunterladen sein.",
     "errorEditingDownloadas": "Fehler bei der Arbeit an diesem Dokument.<br>Laden Sie die Datei herunter, um sie lokal zu speichern.",
     "errorEmptyTOC": "Beginnen Sie die Erstellung eines Inhaltsverzeichnisses, indem Sie eine Überschriftenvorlage aus der Galerie von Stilen auf den ausgewählten Text anwenden.",
     "errorFilePassProtect": "Die Datei ist mit Passwort geschützt und kann nicht geöffnet werden.",
     "errorFileSizeExceed": "Die Dateigröße ist zu hoch für Ihren Server.<br>Bitte wenden Sie sich an Administratoren.",
+    "errorInconsistentExt": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei stimmt nicht mit der Dateierweiterung überein.",
+    "errorInconsistentExtDocx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Textdokumenten (z.B. docx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+    "errorInconsistentExtPdf": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht einem der folgenden Formate: pdf/djvu/xps/oxps, aber die Datei hat die inkonsistente Erweiterung: %1.",
+    "errorInconsistentExtPptx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Präsentationen (z.B. pptx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+    "errorInconsistentExtXlsx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Tabellenkalkulationen (z.B. xlsx), aber die Datei hat die inkonsistente Erweiterung: %1.",
     "errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
     "errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
     "errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
@@ -419,12 +425,12 @@
     "unknownErrorText": "Unbekannter Fehler.",
     "uploadImageExtMessage": "Unbekanntes Bildformat.",
     "uploadImageFileCountMessage": "Keine Bilder hochgeladen.",
-    "uploadImageSizeMessage": "Die maximal zulässige Bildgröße von 25 MB ist überschritten.",
+    "uploadImageSizeMessage": "Die maximal zulässige Bildgröße von 25 MB ist überschritten."
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
   },
   "LongActions": {
     "applyChangesTextText": "Daten werden geladen...",
     "applyChangesTitleText": "Daten werden geladen",
+    "confirmMaxChangesSize": "Die Anzahl der Aktionen überschreitet die für Ihren Server festgelegte Grenze.<br>Drücken Sie \"Rückgängig\", um Ihre letzte Aktion abzubrechen, oder drücken Sie \"Weiter\", um die Aktion lokal fortzusetzen (Sie müssen die Datei herunterladen oder ihren Inhalt kopieren, um sicherzustellen, dass nichts verloren geht).",
     "downloadMergeText": "Ladevorgang...",
     "downloadMergeTitle": "Ladevorgang",
     "downloadTextText": "Dokument wird heruntergeladen...",
@@ -451,14 +457,13 @@
     "saveTitleText": "Dokument wird gespeichert...",
     "sendMergeText": "Merge wird versandt...",
     "sendMergeTitle": "Ergebnisse der Zusammenführung werden gesendet",
+    "textContinue": "Fortsetzen",
     "textLoadingDocument": "Dokument wird geladen",
+    "textUndo": "Rückgängig",
     "txtEditingMode": "Bearbeitungsmodul wird festgelegt...",
     "uploadImageTextText": "Bild wird hochgeladen...",
     "uploadImageTitleText": "Bild wird hochgeladen",
-    "waitText": "Bitte warten...",
+    "waitText": "Bitte warten..."
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Fehler",

apps/documenteditor/mobile/locale/el.json

@@ -420,6 +420,11 @@
     "uploadImageFileCountMessage": "Δεν μεταφορτώθηκαν εικόνες.",
     "uploadImageSizeMessage": "Η εικόνα είναι πολύ μεγάλη. Το μέγιστο μέγεθος είναι 25MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {

apps/documenteditor/mobile/locale/en.json

@@ -395,6 +395,11 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorFilePassProtect": "The file is password protected and could not be opened.",
     "errorFileSizeExceed": "The file size exceeds your server limit.<br>Please, contact your admin.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorKeyEncrypt": "Unknown key descriptor",
     "errorKeyExpire": "Key descriptor expired",
     "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",

apps/documenteditor/mobile/locale/es.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Página continua",
     "textCurrentPosition": "Posición actual",
     "textDisplay": "Mostrar",
+    "textDone": "Hecho",
     "textEmptyImgUrl": "Hay que especificar URL de imagen.",
     "textEvenPage": "Página par",
     "textFootnote": "Nota a pie de página",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Imagen desde biblioteca",
     "textPictureFromURL": "Imagen desde URL",
     "textPosition": "Posición",
+    "textRecommended": "Recomendado",
+    "textRequired": "Necesario",
     "textRightBottom": "Abajo a la derecha",
     "textRightTop": "Arriba a la derecha",
     "textRows": "Filas",
@@ -61,10 +64,7 @@
     "textTableSize": "Tamaño de tabla",
     "textWithBlueLinks": "Con enlaces azules",
     "textWithPageNumbers": "Con números de página",
-    "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\"",
+    "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\""
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Revisar cambios",
       "textRight": "Alinear a la derecha",
       "textShape": "Forma",
+      "textSharingSettings": "Ajustes de uso compartido",
       "textShd": "Color de fondo",
       "textSmallCaps": "Versalitas",
       "textSpacing": "Espaciado",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Las funciones Deshacer/Rehacer están desactivadas en el modo de co-edición rápido.",
       "textUnderline": "Subrayar",
       "textUsers": "Usuarios",
-      "textWidow": "Control de viudas",
+      "textWidow": "Control de viudas"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Sin relleno"
@@ -184,6 +184,7 @@
     "menuDelete": "Eliminar",
     "menuDeleteTable": "Eliminar tabla",
     "menuEdit": "Editar",
+    "menuEditLink": "Editar enlace",
     "menuJoinList": "Unir a lista anterior",
     "menuMerge": "Combinar",
     "menuMore": "Más",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Actualizar toda la tabla",
     "textRefreshPageNumbersOnly": "Actualizar solamente los números de página",
     "textRows": "Filas",
-    "txtWarnUrl": "Hacer clic en este enlace puede ser perjudicial para su dispositivo y sus datos.<br>¿Está seguro de que quiere continuar?",
+    "txtWarnUrl": "Hacer clic en este enlace puede ser perjudicial para su dispositivo y sus datos.<br>¿Está seguro de que quiere continuar?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Advertencia",
@@ -319,6 +319,7 @@
     "textPictureFromLibrary": "Imagen desde biblioteca",
     "textPictureFromURL": "Imagen desde URL",
     "textPt": "pt",
+    "textRecommended": "Recomendado",
     "textRefresh": "Actualizar",
     "textRefreshEntireTable": "Actualizar toda la tabla",
     "textRefreshPageNumbersOnly": "Actualizar solamente los números de página",
@@ -330,6 +331,7 @@
     "textRepeatAsHeaderRow": "Repetir como fila de encabezado",
     "textReplace": "Reemplazar",
     "textReplaceImage": "Reemplazar imagen",
+    "textRequired": "Necesario",
     "textResizeToFitContent": "Cambiar el tamaño para ajustar el contenido",
     "textRightAlign": "Alinear a la derecha",
     "textSa": "sá.",
@@ -359,6 +361,7 @@
     "textTableOfCont": "TDC",
     "textTableOptions": "Opciones de tabla",
     "textText": "Texto",
+    "textTextWrapping": "Ajuste de texto",
     "textTh": "ju.",
     "textThrough": "A través",
     "textTight": "Estrecho",
@@ -369,14 +372,11 @@
     "textType": "Tipo",
     "textWe": "mi.",
     "textWrap": "Ajuste",
+    "textWrappingStyle": "Estilo de ajuste",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
     "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
+    "textDeleteLink": "Delete Link"
-    "textRecommended": "Recommended",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "Tiempo de conversión está superado.",
@@ -390,6 +390,7 @@
     "errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
     "errorDataRange": "Rango de datos incorrecto.",
     "errorDefaultMessage": "Código de error: %1",
+    "errorDirectUrl": "Por favor, verifique el vínculo al documento.<br>Este vínculo debe ser un vínculo directo al archivo para descargar.",
     "errorEditingDownloadas": "Se ha producido un error al trabajar con el documento.<br>Descargue el documento para guardar la copia de seguridad del archivo localmente.",
     "errorEmptyTOC": "Empezar a crear una tabla de contenidos aplicando un estilo de encabezamiento de la galería de Estilos al texto seleccionado.",
     "errorFilePassProtect": "El archivo está protegido por contraseña y no se puede abrir.",
@@ -420,7 +421,11 @@
     "uploadImageExtMessage": "Formato de imagen desconocido.",
     "uploadImageFileCountMessage": "No hay imágenes subidas.",
     "uploadImageSizeMessage": "La imagen es demasiado grande. El tamaño máximo es de 25 MB.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Cargando datos...",
@@ -451,14 +456,14 @@
     "saveTitleText": "Guardando documento",
     "sendMergeText": "Envío de los resultados de la fusión...",
     "sendMergeTitle": "Envío de los resultados de la fusión",
+    "textContinue": "Continuar",
     "textLoadingDocument": "Cargando documento",
+    "textUndo": "Deshacer",
     "txtEditingMode": "Establecer el modo de edición...",
     "uploadImageTextText": "Cargando imagen...",
     "uploadImageTitleText": "Cargando imagen",
     "waitText": "Por favor, espere...",
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
+    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost)."
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Error",

apps/documenteditor/mobile/locale/eu.json

@@ -420,7 +420,12 @@
     "uploadImageExtMessage": "Irudi-formatu ezezaguna.",
     "uploadImageFileCountMessage": "Ez da irudirik kargatu.",
     "uploadImageSizeMessage": "Irudia handiegia da. Gehienezko tamaina 25 MB da.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Datuak kargatzen...",

apps/documenteditor/mobile/locale/fi.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/fr.json

@@ -244,7 +244,7 @@
     "textClose": "Fermer",
     "textColor": "Couleur",
     "textContinueFromPreviousSection": "Continuer à partir de la section précédente",
-    "textCreateTextStyle": "Créer un nouveau style de texte",
+    "textCreateTextStyle": "Créer un nouveau style",
     "textCurrent": "Actuel",
     "textCustomColor": "Couleur personnalisée",
     "textCustomStyle": "Style personnalisé",
@@ -263,7 +263,7 @@
     "textEffects": "Effets",
     "textEmpty": "Vide",
     "textEmptyImgUrl": "Spécifiez l'URL de l'image",
-    "textEnterTitleNewStyle": "Saisissez le titre d'un nouveau style",
+    "textEnterTitleNewStyle": "Saisissez le titre du style",
     "textFebruary": "février",
     "textFill": "Remplissage",
     "textFirstColumn": "Première colonne",
@@ -420,7 +420,12 @@
     "unknownErrorText": "Erreur inconnue.",
     "uploadImageExtMessage": "Format d'image inconnu.",
     "uploadImageFileCountMessage": "Aucune image chargée.",
-    "uploadImageSizeMessage": "L'image est trop grande. La taille limite est de 25 Mo."
+    "uploadImageSizeMessage": "L'image est trop grande. La taille limite est de 25 Mo.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Chargement des données en cours...",

apps/documenteditor/mobile/locale/gl.json

@@ -420,6 +420,11 @@
     "uploadImageFileCountMessage": "Non hai imaxes subidas.",
     "uploadImageSizeMessage": "A imaxe é demasiado grande. O tamaño máximo é de 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {

apps/documenteditor/mobile/locale/hu.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Ismeretlen hiba.",
     "uploadImageExtMessage": "Ismeretlen képformátum.",
     "uploadImageFileCountMessage": "Nincsenek feltöltött képek.",
-    "uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB."
+    "uploadImageSizeMessage": "A kép túl nagy. A maximális méret 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Adatok betöltése...",

apps/documenteditor/mobile/locale/hy.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Անհայտ սխալ։",
     "uploadImageExtMessage": "Նկարի անհայտ ձևաչափ։",
     "uploadImageFileCountMessage": "Ոչ մի նկար չի բեռնվել։",
-    "uploadImageSizeMessage": "Պատկերը չափազանց մեծ է:Առավելագույն չափը 25 ՄԲ է:"
+    "uploadImageSizeMessage": "Պատկերը չափազանց մեծ է:Առավելագույն չափը 25 ՄԲ է:",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Տվյալների բեռնում...",

apps/documenteditor/mobile/locale/id.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Kesalahan tidak diketahui.",
     "uploadImageExtMessage": "Format gambar tidak dikenal.",
     "uploadImageFileCountMessage": "Tidak ada gambar yang diunggah.",
-    "uploadImageSizeMessage": "Melebihi ukuran maksimal file. Ukuran maksimum adalah 25 MB."
+    "uploadImageSizeMessage": "Melebihi ukuran maksimal file. Ukuran maksimum adalah 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Memuat data...",
@@ -471,7 +476,7 @@
     "notcriticalErrorTitle": "Peringatan",
     "SDK": {
       " -Section ": "-Bagian",
-      "above": "Di atas",
+      "above": "di atas",
       "below": "di bawah",
       "Caption": "Caption",
       "Choose an item": "Pilih satu barang",

apps/documenteditor/mobile/locale/it.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Pagina continua",
     "textCurrentPosition": "Posizione attuale",
     "textDisplay": "Visualizzare",
+    "textDone": "Fatto",
     "textEmptyImgUrl": "Devi specificare l'URL dell'immagine.",
     "textEvenPage": "Pagina pari",
     "textFootnote": "Note a piè di pagina",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Immagine dalla libreria",
     "textPictureFromURL": "Immagine dall'URL",
     "textPosition": "Posizione",
+    "textRecommended": "Consigliato",
+    "textRequired": "Richiesto",
     "textRightBottom": "In basso a destra",
     "textRightTop": "In alto a destra",
     "textRows": "Righe",
@@ -61,10 +64,7 @@
     "textTableSize": "Dimensione di tabella",
     "textWithBlueLinks": "Con link blu",
     "textWithPageNumbers": "Con numeri di pagina",
-    "txtNotUrl": "Questo campo deve essere un URL nel formato \"http://www.example.com\"",
+    "txtNotUrl": "Questo campo deve essere un URL nel formato \"http://www.example.com\""
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Riesaminare le modifiche",
       "textRight": "Allineare a destra",
       "textShape": "Forma",
+      "textSharingSettings": "Impostazioni di condivisione",
       "textShd": "Colore di sfondo",
       "textSmallCaps": "Maiuscoletto",
       "textSpacing": "Spaziatura",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Le funzioni Annulla/Ripeti sono disattivate nella modalità rapida di modifica collaborativa.",
       "textUnderline": "Sottolineato",
       "textUsers": "Utenti",
-      "textWidow": "Controllo vedovo",
+      "textWidow": "Controllo vedovo"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Nessun riempimento"
@@ -184,6 +184,7 @@
     "menuDelete": "Eliminare",
     "menuDeleteTable": "Eliminare tabella",
     "menuEdit": "Modificare",
+    "menuEditLink": "Modifica collegamento",
     "menuJoinList": "Unire all'elenco precedente",
     "menuMerge": "Unire",
     "menuMore": "Di più",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Aggiorna intera tabella",
     "textRefreshPageNumbersOnly": "Aggiorna solo numeri di pagina",
     "textRows": "Righe",
-    "txtWarnUrl": "Fare clic su questo collegamento può danneggiare il tuo dispositivo e i tuoi dati.<br>Sei sicuro che vuoi continuare?",
+    "txtWarnUrl": "Fare clic su questo collegamento può danneggiare il tuo dispositivo e i tuoi dati.<br>Sei sicuro che vuoi continuare?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Avvertimento",
@@ -247,6 +247,7 @@
     "textCurrent": "Attuale",
     "textCustomColor": "Colore personalizzato",
     "textDecember": "Dicembre",
+    "textDeleteLink": "Elimina collegamento",
     "textDesign": "Design",
     "textDifferentFirstPage": "Prima pagina diversa",
     "textDifferentOddAndEvenPages": "Pagine pari e dispari diverse",
@@ -319,6 +320,7 @@
     "textPictureFromLibrary": "Immagine dalla libreria",
     "textPictureFromURL": "Immagine dall'URL",
     "textPt": "pt",
+    "textRecommended": "Consigliato",
     "textRefresh": "Aggiorna",
     "textRefreshEntireTable": "Aggiorna intera tabella",
     "textRefreshPageNumbersOnly": "Aggiorna solo numeri di pagina",
@@ -330,6 +332,7 @@
     "textRepeatAsHeaderRow": "Ripetere come riga di intestazione",
     "textReplace": "Sostituire",
     "textReplaceImage": "Sostituire l'immagine",
+    "textRequired": "Richiesto",
     "textResizeToFitContent": "Ridimensionare per adattare il contenuto",
     "textRightAlign": "Allinea a destra",
     "textSa": "Sab",
@@ -359,6 +362,7 @@
     "textTableOfCont": "Indice",
     "textTableOptions": "Opzioni di tabella",
     "textText": "Testo",
+    "textTextWrapping": "Disposizione testo",
     "textTh": "Gio",
     "textThrough": "Attraverso",
     "textTight": "Stretto",
@@ -369,14 +373,10 @@
     "textType": "Tipo",
     "textWe": "Mer",
     "textWrap": "Avvolgere",
+    "textWrappingStyle": "Stile di disposizione testo",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
+    "textDeleteImage": "Delete Image"
-    "textDeleteLink": "Delete Link",
-    "textRecommended": "Recommended",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "È stato superato il tempo massimo della conversione.",
@@ -390,6 +390,7 @@
     "errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
     "errorDataRange": "Intervallo di dati non corretto.",
     "errorDefaultMessage": "Codice errore: %1",
+    "errorDirectUrl": "Si prega di verificare il link al documento. <br>Questo collegamento deve essere un collegamento diretto al file da scaricare.",
     "errorEditingDownloadas": "Si è verificato un errore durante il lavoro con il documento.<br>Scarica il documento per salvare il backup del file localmente.",
     "errorEmptyTOC": "Inizia a creare un sommario applicando uno stile di intestazione dalla galleria Stili al testo selezionato.",
     "errorFilePassProtect": "Il file è protetto da password e non può essere aperto.",
@@ -404,6 +405,7 @@
     "errorSessionIdle": "Il documento non è stato modificato per molto tempo. Ti preghiamo di ricaricare la pagina.",
     "errorSessionToken": "La connessione al server è stata interrotta. Ti preghiamo di ricaricare la pagina.",
     "errorStockChart": "Ordine delle righe incorretto. Per creare un grafico azionario, inserisci i dati sul foglio nel seguente ordine:<br> prezzo di apertura, prezzo massimo, prezzo minimo, prezzo di chiusura.",
+    "errorTextFormWrongFormat": "Il valore inserito non corrisponde al formato del campo.",
     "errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.<br>Prima di poter continuare a lavorare, devi scaricare il file o copiarne il contenuto per assicurarti che nulla vada perso, quindi ricarica questa pagina.",
     "errorUserDrop": "Non si può accedere al file al momento.",
     "errorUsersExceed": "È stato superato il numero degli utenti consentito dalla tariffa",
@@ -419,8 +421,11 @@
     "uploadImageExtMessage": "Formato d'immagine sconosciuto.",
     "uploadImageFileCountMessage": "Nessuna immagine caricata.",
     "uploadImageSizeMessage": "L'immagine è troppo grande. La dimensione massima è 25 MB.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
-    "errorTextFormWrongFormat": "The value entered does not match the format of the field."
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Caricamento di dati...",
@@ -451,14 +456,14 @@
     "saveTitleText": "Salvataggio del documento",
     "sendMergeText": "Invio dei resultati della fusione...",
     "sendMergeTitle": "Invio dei resultati della fusione",
+    "textContinue": "Continua",
     "textLoadingDocument": "Caricamento di documento",
+    "textUndo": "Annulla",
     "txtEditingMode": "Impostare la modalità di modifica...",
     "uploadImageTextText": "Caricamento dell'immagine...",
     "uploadImageTitleText": "Caricamento dell'immagine",
     "waitText": "Attendere prego...",
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
+    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost)."
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Errore",

apps/documenteditor/mobile/locale/ja.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "不明なエラー",
     "uploadImageExtMessage": "不明なイメージの形式",
     "uploadImageFileCountMessage": "アップロードしたイメージがない",
-    "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。"
+    "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "データの読み込み中...",

apps/documenteditor/mobile/locale/ko.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "이미지 크기 제한을 초과했습니다.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/lo.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "ຮູບພາບໃຫຍ່ເກີນໄປ. ຂະຫນາດສູງສຸດແມ່ນ 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/lv.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/ms.json

@@ -420,6 +420,11 @@
     "uploadImageFileCountMessage": "Tiada Imej dimuat naik.",
     "uploadImageSizeMessage": "Imej terlalu besar. Saiz maksimum adalah 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {

apps/documenteditor/mobile/locale/nb.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/nl.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "De afbeelding is te groot. De maximale grootte is 25MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/pl.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/pt-pt.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Erro desconhecido.",
     "uploadImageExtMessage": "Formato de imagem desconhecido.",
     "uploadImageFileCountMessage": "Nenhuma imagem foi carregada.",
-    "uploadImageSizeMessage": "A imagem é muito grande. O tamanho máximo é de 25 MB."
+    "uploadImageSizeMessage": "A imagem é muito grande. O tamanho máximo é de 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "A carregar dados...",

apps/documenteditor/mobile/locale/pt.json

@@ -420,7 +420,12 @@
     "unknownErrorText": "Erro desconhecido.",
     "uploadImageExtMessage": "Formato de imagem desconhecido.",
     "uploadImageFileCountMessage": "Sem imagens carregadas.",
-    "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB."
+    "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "Carregando dados...",
@@ -451,13 +456,13 @@
     "saveTitleText": "Salvando documento",
     "sendMergeText": "Enviando mesclar...",
     "sendMergeTitle": "Enviando Mesclar",
+    "textContinue": "Continuar",
     "textLoadingDocument": "Carregando documento",
     "txtEditingMode": "Definir modo de edição...",
     "uploadImageTextText": "Carregando imagem...",
     "uploadImageTitleText": "Carregando imagem",
     "waitText": "Por favor, aguarde...",
     "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
     "textUndo": "Undo"
   },
   "Main": {

apps/documenteditor/mobile/locale/ro.json

@@ -420,6 +420,11 @@
     "uploadImageFileCountMessage": "Nicio imagine nu a fost încărcată.",
     "uploadImageSizeMessage": "Imaginea este prea mare. Limita de dimensiune este de 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {

apps/documenteditor/mobile/locale/ru.json

@@ -395,6 +395,11 @@
     "errorEmptyTOC": "Начните создавать оглавление, применив к выделенному тексту стиль заголовка из галереи Стилей.",
     "errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
     "errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Пожалуйста, обратитесь к администратору.",
+    "errorInconsistentExt": "При открытии файла произошла ошибка.<br>Содержимое файла не соответствует расширению файла.",
+    "errorInconsistentExtDocx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует документам (например, docx), но файл имеет несоответствующее расширение: %1.",
+    "errorInconsistentExtPdf": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует одному из следующих форматов: pdf/djvu/xps/oxps, но файл имеет несоответствующее расширение: %1.",
+    "errorInconsistentExtPptx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует презентациям (например, pptx), но файл имеет несоответствующее расширение: %1.",
+    "errorInconsistentExtXlsx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует электронным таблицам (например, xlsx), но файл имеет несоответствующее расширение: %1.",
     "errorKeyEncrypt": "Неизвестный дескриптор ключа",
     "errorKeyExpire": "Срок действия дескриптора ключа истек",
     "errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",

apps/documenteditor/mobile/locale/sk.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "Obrázok je príliš veľký. Maximálna veľkosť je 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/sl.json

@@ -623,6 +623,11 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorFilePassProtect": "The file is password protected and could not be opened.",
     "errorFileSizeExceed": "The file size exceeds your server limit.<br>Please, contact your admin.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorKeyEncrypt": "Unknown key descriptor",
     "errorKeyExpire": "Key descriptor expired",
     "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",

apps/documenteditor/mobile/locale/sv.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/tr.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "Görüntü çok büyük. Maksimum boyut 25 MB'dir.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/uk.json

@@ -419,6 +419,11 @@
     "uploadImageSizeMessage": "Занадто велике зображення. Максимальний розмір – 25 MB.",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },

apps/documenteditor/mobile/locale/vi.json

@@ -423,7 +423,12 @@
     "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading."
+    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension."
   },
   "LongActions": {
     "applyChangesTextText": "Loading data...",

apps/documenteditor/mobile/locale/zh-tw.json

@@ -420,6 +420,11 @@
     "uploadImageFileCountMessage": "無上傳圖片。",
     "uploadImageSizeMessage": "圖像超出最大大小限制。最大為25MB。",
     "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorTextFormWrongFormat": "The value entered does not match the format of the field."
   },
   "LongActions": {

apps/documenteditor/mobile/locale/zh.json

@@ -420,11 +420,17 @@
     "unknownErrorText": "未知错误。",
     "uploadImageExtMessage": "未知图像格式。",
     "uploadImageFileCountMessage": "没有图片上传",
-    "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB."
+    "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB.",
+    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1."
   },
   "LongActions": {
     "applyChangesTextText": "数据加载中…",
     "applyChangesTitleText": "数据加载中",
+    "confirmMaxChangesSize": "行动的大小超过了对您服务器设置的限制。<br>按 \"撤消\"取消您的最后一次行动，或按\"继续\"在本地保留该行动（您需要下载文件或复制其内容以确保没有任何损失）。",
     "downloadMergeText": "下载中…",
     "downloadMergeTitle": "下载中",
     "downloadTextText": "正在下载文件...",
@@ -451,14 +457,13 @@
     "saveTitleText": "保存文件",
     "sendMergeText": "任务合并",
     "sendMergeTitle": "任务合并",
+    "textContinue": "发送",
     "textLoadingDocument": "文件加载中…",
+    "textUndo": "复原",
     "txtEditingMode": "设置编辑模式..",
     "uploadImageTextText": "上传图片...",
     "uploadImageTitleText": "图片上传中",
-    "waitText": "请稍候...",
+    "waitText": "请稍候..."
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "错误",

apps/documenteditor/mobile/src/controller/Error.jsx

@@ -3,7 +3,7 @@ import { inject } from 'mobx-react';
 import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 
-const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocument}) => {
+const ErrorController = inject('storeAppOptions','storeDocumentInfo')(({storeAppOptions, storeDocumentInfo, LoadingDocument}) => {
     const { t } = useTranslation();
     const _t = t("Error", { returnObjects: true });
 
@@ -197,6 +197,20 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
                 config.msg = _t.errorDirectUrl;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                let docExt = storeDocumentInfo.dataDoc ? storeDocumentInfo.dataDoc.fileType || '' : '';
+                if (errData === 'pdf')
+                    config.msg = _t.errorInconsistentExtPdf.replace('%1', docExt);
+                else if  (errData === 'docx')
+                    config.msg = _t.errorInconsistentExtDocx.replace('%1', docExt);
+                else if  (errData === 'xlsx')
+                    config.msg = _t.errorInconsistentExtXlsx.replace('%1', docExt);
+                else if  (errData === 'pptx')
+                    config.msg = _t.errorInconsistentExtPptx.replace('%1', docExt);
+                else
+                    config.msg = _t.errorInconsistentExt;
+                break;
+
             default:
                 config.msg = _t.errorDefaultMessage.replace('%1', id);
                 break;

apps/documenteditor/mobile/src/index_dev.html

@@ -25,6 +25,7 @@
 <body>
     <% if ( htmlWebpackPlugin.options.skeleton.htmlscript ) { %>
     <script>
+        window.asceditor = 'word';
         <%= htmlWebpackPlugin.options.skeleton.htmlscript %>
     </script>
     <% } %>

apps/documenteditor/mobile/src/page/main.jsx

@@ -33,6 +33,12 @@ class MainPage extends Component {
         };
     }
 
+    componentDidMount() {
+        if ( $$('.skl-container').length ) {
+            $$('.skl-container').remove();
+        }
+    }
+
     handleClickToOpenOptions = (opts, showOpts) => {
         f7.popover.close('.document-menu.modal-in', false);
 
@@ -141,9 +147,6 @@ class MainPage extends Component {
         }
 
         const showPlaceholder = !appOptions.isDocReady && (!config.customization || !(config.customization.loaderName || config.customization.loaderLogo));
-        if ($$('.skl-container').length) {
-            $$('.skl-container').remove();
-        }
 
         return (
             <Page name="home" className={`editor${showLogo ? ' page-with-logo' : ''}`}>

apps/documenteditor/mobile/src/view/Toolbar.jsx

@@ -1,4 +1,4 @@
-import React, {Fragment} from 'react';
+import React, {Fragment, useEffect} from 'react';
 import { useTranslation } from 'react-i18next';
 import {NavLeft, NavRight, NavTitle, Link, Icon} from 'framework7-react';
 import { Device } from '../../../../common/mobile/utils/device';
@@ -12,20 +12,35 @@ const ToolbarView = props => {
     const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls || isDisconnected;
     const isViewer = props.isViewer;
     const isMobileView = props.isMobileView;
+    const docTitle = props.docTitle;
+    const docTitleLength = docTitle.length;
 
-    const shortTitle = (title) => {
+    const correctOverflowedText = el => {
-        const arrDocTitle = title.split('.');
+        if(el) {
-        const ext = arrDocTitle[1];
+            el.innerText = docTitle;
-        const name = arrDocTitle[0];
 
-        if(name.length > 7 && Device.phone) {
+            if(el.scrollWidth > el.clientWidth) {
-            let shortName = name.substring(0, 7);
+                const arrDocTitle = docTitle.split('.');
-            return `${shortName}...${ext}`;
+                const ext = arrDocTitle[1];
+                const name = arrDocTitle[0];
+                const diff = Math.floor(docTitleLength * el.clientWidth / el.scrollWidth - ext.length - 6);
+                const shortName = name.substring(0, diff).trim();
+
+                return `${shortName}...${ext}`;
+            }
+
+           return docTitle;
         }
-
-        return title;
     };
 
+    useEffect(() => {
+        const elemTitle = document.querySelector('.subnavbar .title');
+
+        if (elemTitle) {
+            elemTitle.innerText = correctOverflowedText(elemTitle);
+        }
+    }, [docTitle, isViewer]);
+
     return (
         <Fragment>
             <NavLeft>
@@ -38,7 +53,7 @@ const ToolbarView = props => {
                     onRedoClick: props.onRedo
                 })}
             </NavLeft>
-            {(!Device.phone || isViewer) && <NavTitle>{shortTitle(props.docTitle)}</NavTitle>}
+            {(!Device.phone || isViewer) && <div className='title' style={{width: '71%'}}>{docTitle}</div>}
             <NavRight>
                 {(Device.android && props.isEdit && !isViewer) && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({
                     disabledUndo: !props.isCanUndo,
@@ -46,7 +61,8 @@ const ToolbarView = props => {
                     onUndoClick: props.onUndo,
                     onRedoClick: props.onRedo
                 })}
-                {(isViewer || !Device.phone) && isAvailableExt && !props.disabledControls && <Link icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
+                {/*isAvailableExt && !props.disabledControls &&*/}
+                {(isViewer || !Device.phone) && <Link className={(!isAvailableExt || props.disabledControls) && 'disabled'} icon={isMobileView ? 'icon-standard-view' : 'icon-mobile-view'} href={false} onClick={async e => {
                     await props.changeMobileView();
                     await props.openOptions('snackbar');
                     setTimeout(() => {
@@ -61,8 +77,9 @@ const ToolbarView = props => {
                     onEditClick: e => props.openOptions('edit'),
                     onAddClick: e => props.openOptions('add')
                 })}
+                {/*props.displayCollaboration &&*/}
                 {Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
-                {props.displayCollaboration && window.matchMedia("(min-width: 360px)").matches ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => props.openOptions('coauth')}></Link> : null}
+                {!Device.phone ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={e => props.openOptions('coauth')}></Link> : null}
                 <Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={e => props.openOptions('settings')}></Link>
             </NavRight>
         </Fragment>

apps/presentationeditor/embed/js/ApplicationController.js

@@ -614,6 +614,19 @@ PE.ApplicationController = new(function(){
                 message = me.errorTokenExpire;
                 break;
 
+            case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                if (errData === 'pdf')
+                    message = me.errorInconsistentExtPdf.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'docx')
+                    message = me.errorInconsistentExtDocx.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'xlsx')
+                    message = me.errorInconsistentExtXlsx.replace('%1', docConfig.fileType || '');
+                else if  (errData === 'pptx')
+                    message = me.errorInconsistentExtPptx.replace('%1', docConfig.fileType || '');
+                else
+                    message = me.errorInconsistentExt;
+                break;
+
             default:
                 message = me.errorDefaultMessage.replace('%1', id);
                 break;
@@ -782,6 +795,11 @@ PE.ApplicationController = new(function(){
         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.",
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
         errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
-        openErrorText: 'An error has occurred while opening the file'
+        openErrorText: 'An error has occurred while opening the file',
+        errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
+        errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
+        errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
     }
 })();

apps/presentationeditor/embed/locale/de.json

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
   "PE.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.<br>Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.",
   "PE.ApplicationController.errorForceSave": "Beim Speichern der Datei ist ein Fehler aufgetreten. Verwenden Sie die Option \"Herunterladen als\", um die Datei auf Ihrer Computerfestplatte zu speichern oder versuchen Sie es später erneut.",
+  "PE.ApplicationController.errorInconsistentExt": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei stimmt nicht mit der Dateierweiterung überein.",
+  "PE.ApplicationController.errorInconsistentExtDocx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Textdokumenten (z.B. docx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "PE.ApplicationController.errorInconsistentExtPdf": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht einem der folgenden Formate: pdf/djvu/xps/oxps, aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "PE.ApplicationController.errorInconsistentExtPptx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Präsentationen (z.B. pptx), aber die Datei hat die inkonsistente Erweiterung: %1.",
+  "PE.ApplicationController.errorInconsistentExtXlsx": "Beim Öffnen der Datei ist ein Fehler aufgetreten.<br>Der Inhalt der Datei entspricht Tabellenkalkulationen (z.B. xlsx), aber die Datei hat die inkonsistente Erweiterung: %1.",
   "PE.ApplicationController.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
   "PE.ApplicationController.errorTokenExpire": "Sicherheitstoken des Dokuments ist abgelaufen.<br>Wenden Sie sich an Ihren Serveradministrator.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.<br>Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.",

apps/presentationeditor/embed/locale/en.json

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
   "PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.<br>Please contact your Document Server administrator for details.",
   "PE.ApplicationController.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.ApplicationController.errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
+  "PE.ApplicationController.errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
+  "PE.ApplicationController.errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
+  "PE.ApplicationController.errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
+  "PE.ApplicationController.errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
   "PE.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "PE.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",

apps/presentationeditor/embed/locale/ru.json

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "PE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
   "PE.ApplicationController.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
+  "PE.ApplicationController.errorInconsistentExt": "При открытии файла произошла ошибка.<br>Содержимое файла не соответствует расширению файла.",
+  "PE.ApplicationController.errorInconsistentExtDocx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует документам (например, docx), но файл имеет несоответствующее расширение: %1.",
+  "PE.ApplicationController.errorInconsistentExtPdf": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует одному из следующих форматов: pdf/djvu/xps/oxps, но файл имеет несоответствующее расширение: %1.",
+  "PE.ApplicationController.errorInconsistentExtPptx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует презентациям (например, pptx), но файл имеет несоответствующее расширение: %1.",
+  "PE.ApplicationController.errorInconsistentExtXlsx": "При открытии файла произошла ошибка.<br>Содержимое файла соответствует электронным таблицам (например, xlsx), но файл имеет несоответствующее расширение: %1.",
   "PE.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "PE.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Соединение было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",

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

@@ -2282,7 +2282,7 @@ define([
                         store: group.get('groupStore'),
                         scrollAlwaysVisible: true,
                         showLast: false,
-                        restoreHeight: group.get('groupHeight') ? parseInt(group.get('groupHeight')) : true,
+                        restoreHeight: 450,
                         itemTemplate: _.template(
                             '<div class="item-equation" style="" >' +
                             '<div class="equation-icon" style="background-position:<%= posX %>px <%= posY %>px;width:<%= width %>px;height:<%= height %>px;" id="<%= id %>"></div>' +
@@ -2296,6 +2296,12 @@ define([
                     });
                     menu.off('show:before', onShowBefore);
                 };
+                var bringForward = function (menu) {
+                    eqContainer.addClass('has-open-menu');
+                };
+                var sendBackward = function (menu) {
+                    eqContainer.removeClass('has-open-menu');
+                };
                 for (var i = 0; i < equationsStore.length; ++i) {
                     var equationGroup = equationsStore.at(i);
                     var btn = new Common.UI.Button({
@@ -2315,6 +2321,8 @@ define([
                         })
                     });
                     btn.menu.on('show:before', onShowBefore);
+                    btn.menu.on('show:before', bringForward);
+                    btn.menu.on('hide:after', sendBackward);
                     me.equationBtns.push(btn);
                 }
 
@@ -2341,8 +2349,14 @@ define([
             if (showPoint[1]<0) {
                 showPoint[1] = bounds[3] + 10;
             }
-            eqContainer.css({left: showPoint[0], top : Math.min(me._Height - eqContainer.outerHeight(), Math.max(0, showPoint[1]))});
+            showPoint[1] = Math.min(me._Height - eqContainer.outerHeight(), Math.max(0, showPoint[1]));
-            // menu.menuAlign = validation ? 'tr-br' : 'tl-bl';
+            eqContainer.css({left: showPoint[0], top : showPoint[1]});
+
+            var menuAlign = (me._Height - showPoint[1] - eqContainer.outerHeight() < 220) ? 'bl-tl' : 'tl-bl';
+            me.equationBtns.forEach(function(item){
+                item && (item.menu.menuAlign = menuAlign);
+            });
+            me.equationSettingsBtn.menu.menuAlign = menuAlign;
             if (eqContainer.is(':visible')) {
                 if (me.equationSettingsBtn.menu.isVisible()) {
                     me.equationSettingsBtn.menu.options.initMenu();

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

@@ -339,6 +339,19 @@ define([
                     Common.Utils.InternalSettings.set("guest-username", value);
                     Common.Utils.InternalSettings.set("save-guest-username", !!value);
                 }
+                if (this.appOptions.customization.font) {
+                    if (this.appOptions.customization.font.name && typeof this.appOptions.customization.font.name === 'string') {
+                        var arr = this.appOptions.customization.font.name.split(',');
+                        for (var i=0; i<arr.length; i++) {
+                            var item = arr[i].trim();
+                            if (item && (/[\s0-9\.]/).test(item)) {
+                                arr[i] = "'" + item + "'";
+                            }
+                        }
+                        document.documentElement.style.setProperty("--font-family-base-custom", arr.join(','));
+                    }
+                }
+
                 this.editorConfig.user          =
                 this.appOptions.user            = Common.Utils.fillUserInfo(data.config.user, this.editorConfig.lang, value ? (value + ' (' + this.appOptions.guestName + ')' ) : this.textAnonymous,
                                                   Common.localStorage.getItem("guest-id") || ('uid-' + Date.now()));
@@ -1040,7 +1053,8 @@ define([
                         });
                     }
                 } else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt &&
-                    this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
+                    this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo ||
+                                                                             this.editorConfig.customization.font && this.editorConfig.customization.font.name)) {
                     Common.UI.warning({
                         title: this.textPaidFeature,
                         msg  : this.textCustomLoader,
@@ -1579,6 +1593,20 @@ define([
                         config.msg = this.errorDirectUrl;
                         break;
 
+                    case Asc.c_oAscError.ID.ConvertationOpenFormat:
+                        config.maxwidth = 600;
+                        if (errData === 'pdf')
+                            config.msg = this.errorInconsistentExtPdf.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'docx')
+                            config.msg = this.errorInconsistentExtDocx.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'xlsx')
+                            config.msg = this.errorInconsistentExtXlsx.replace('%1', this.document.fileType || '');
+                        else if  (errData === 'pptx')
+                            config.msg = this.errorInconsistentExtPptx.replace('%1', this.document.fileType || '');
+                        else
+                            config.msg = this.errorInconsistentExt;
+                        break;
+
                     default:
                         config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                         break;
@@ -3017,7 +3045,12 @@ define([
             textRememberMacros: 'Remember my choice for all macros',
             confirmMaxChangesSize: 'The size of actions exceeds the limitation set for your server.<br>Press "Undo" to cancel your last action or press "Continue" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).',
             textUndo: 'Undo',
-            textContinue: 'Continue'
+            textContinue: 'Continue',
+            errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
+            errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
+            errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
         }
     })(), PE.Controllers.Main || {}))
 });

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

@@ -72,7 +72,7 @@ define([
                         if (item.options.action === 'help') {
                             if ( panel.noHelpContents === true && navigator.onLine ) {
                                 this.fireEvent('item:click', [this, 'external-help', true]);
-                                window.open(panel.urlHelpCenter, '_blank');
+                                !!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
                                 return;
                             }
                         }

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

@@ -1512,7 +1512,14 @@ define([
             this.menu = options.menu;
             this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
             this.openUrl = null;
-            this.urlHelpCenter = '{{HELP_CENTER_WEB_PE}}';
+
+            if ( !Common.Utils.isIE ) {
+                if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_PE}}') ) {
+                    const _url_obj = new URL('{{HELP_CENTER_WEB_PE}}');
+                    _url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
+                    this.urlHelpCenter = _url_obj.toString();
+                }
+            }
 
             this.en_data = [
                 {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Presentation Editor user interface", "headername": "Program Interface"},

apps/presentationeditor/main/locale/az.json

@@ -1892,6 +1892,7 @@
   "PE.Views.Toolbar.textTabInsert": "Daxil edin",
   "PE.Views.Toolbar.textTabProtect": "Qoruma",
   "PE.Views.Toolbar.textTabTransitions": "Keçidlər",
+  "PE.Views.Toolbar.textTabView": "Görünüş",
   "PE.Views.Toolbar.textTitleError": "Xəta",
   "PE.Views.Toolbar.textUnderline": "Altından xətt çəkilmiş",
   "PE.Views.Toolbar.tipAddSlide": "Slayd əlavə et",
@@ -2006,5 +2007,7 @@
   "PE.Views.Transitions.txtApplyToAll": "Bütün Slaydlara Tətbiq et",
   "PE.Views.Transitions.txtParameters": "Parametreler",
   "PE.Views.Transitions.txtPreview": "Önbaxış",
-  "PE.Views.Transitions.txtSec": "s"
+  "PE.Views.Transitions.txtSec": "s",
+  "PE.Views.ViewTab.textInterfaceTheme": "İnterfeys mövzusu",
+  "PE.Views.ViewTab.tipInterfaceTheme": "İnterfeys mövzusu"
 }