Merge branch 'release/v7.0.0' into develop

apps/api/documents/api.js

@@ -105,6 +105,7 @@
                 customization: {
                     logo: {
                         image: url,
+                        imageDark: url, // logo for dark theme
                         imageEmbedded: url, // deprecated, use image instead
                         url: http://...
                     },
@@ -114,7 +115,8 @@
                         mail: 'support@gmail.com',
                         www: 'www.superpuper.com',
                         info: 'Some info',
-                        logo: ''
+                        logo: '',
+                        logoDark: '', // logo for dark theme
                     },
                     about: true,
                     feedback: {
@@ -419,7 +421,7 @@
 
                 if (typeof _config.document.fileType === 'string' && _config.document.fileType != '') {
                     _config.document.fileType = _config.document.fileType.toLowerCase();
-                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|oxps|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform))$/
+                    var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp)|(doc|docx|doct|odt|gdoc|txt|rtf|pdf|mht|htm|html|epub|djvu|xps|oxps|docm|dot|dotm|dotx|fodt|ott|fb2|xml|oform|docxf))$/
                                     .exec(_config.document.fileType);
                     if (!type) {
                         window.alert("The \"document.fileType\" parameter for the config object is invalid. Please correct it.");
@@ -935,8 +937,10 @@
             } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
                 if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
                     params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
-                else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
-                    params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image);
+                else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
+                    config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image));
+                    config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark));
+                }
             }
         }
 

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

@@ -463,7 +463,9 @@ Common.UI.HintManager = new(function() {
                                         }
                                     }
                                 }
-                                if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' || curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll')) {
+                                if (curr.prop('id') === 'btn-goback' || curr.closest('.btn-slot').prop('id') === 'slot-btn-options' ||
+                                    curr.closest('.btn-slot').prop('id') === 'slot-btn-mode' || curr.prop('id') === 'btn-favorite' || curr.parent().prop('id') === 'tlb-box-users' ||
+                                    curr.prop('id') === 'left-btn-thumbs' || curr.hasClass('scroll')) {
                                     _resetToDefault();
                                     return;
                                 }

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

@@ -71,8 +71,13 @@ define([
         disabled    : false,
         rendered    : false,
 
-        template    : _.template('<label class="radiobox" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>"><input type="radio" name="<%= name %>" id="<%= id %>" class="button__radiobox">' +
-                                    '<label for="<%= id %>" class="radiobox__shape"></label><span></span></label>'),
+        template    : _.template('<div class="radiobox" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>">' +
+                                    '<input type="radio" name="<%= name %>" id="<%= id %>" class="button__radiobox">' +
+                                    '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">' +
+                                        '<circle class="rb-circle" cx="8" cy="8" r="6.5" />' +
+                                        '<circle class="rb-check-mark" cx="8" cy="8" r="4" />' +
+                                    '</svg>' +
+                                    '<span></span></div>'),
 
         initialize : function(options) {
             Common.UI.BaseView.prototype.initialize.call(this, options);
@@ -96,7 +101,6 @@ define([
             this.setCaption(this.options.labelText);
 
             // handle events
-            this.$radio.on('click', _.bind(this.onItemCheck, this));
         },
 
         render: function () {
@@ -111,9 +115,15 @@ define([
             }));
 
             this.$radio = el.find('input[type=radio]');
-            this.$label = el.find('label.radiobox');
+            this.$label = el.find('div.radiobox');
             this.$span = this.$label.find('span');
-            this.$label.on('keydown', this.onKeyDown.bind(this));
+            this.$label.on({
+                'keydown': this.onKeyDown.bind(this),
+                'click': function(e){
+                    if ( !this.disabled )
+                        this.setValue(true);
+                }.bind(this),});
+
             this.rendered = true;
 
             return this;

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

@@ -387,10 +387,10 @@ define([
                     pos = Math.max(0, Math.min(100, position)),
                     value = pos/me.delta + me.minValue;
                 
-                    if (me.thumbs.length < 3)
-                        me.isRemoveThumb = false;
+                if (me.thumbs.length < 3)
+                    me.isRemoveThumb = false;
 
-                    if (me.isRemoveThumb) {
+                if (me.isRemoveThumb) {
                     me.trigger('removethumb', me, _.findIndex(me.thumbs, {index: index}));
                     me.trigger('change', me, value, lastValue);
                     me.trigger('changecomplete', me, value, lastValue);

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

@@ -344,15 +344,15 @@ define([
                     document.body.className = document.body.className.replace(/theme-[\w-]+\s?/gi, '').trim();
                     document.body.classList.add(id, 'theme-type-' + themes_map[id].type);
 
-                    if ( this.api.asc_setContentDarkMode )
-                        if ( themes_map[id].type == 'light' ) {
-                            this.api.asc_setContentDarkMode(false);
-                        } else {
-                            this.api.asc_setContentDarkMode(this.isContentThemeDark());
-                            Common.NotificationCenter.trigger('contenttheme:dark', this.isContentThemeDark());
-                        }
-
                     if ( this.api ) {
+                        if ( this.api.asc_setContentDarkMode )
+                            if ( themes_map[id].type == 'light' ) {
+                                this.api.asc_setContentDarkMode(false);
+                            } else {
+                                this.api.asc_setContentDarkMode(this.isContentThemeDark());
+                                Common.NotificationCenter.trigger('contenttheme:dark', this.isContentThemeDark());
+                            }
+
                         var obj = get_current_theme_colors(name_colors);
                         obj.type = themes_map[id].type;
                         obj.name = id;

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

@@ -52,14 +52,19 @@ var checkLocalStorage = (function () {
     }
 })();
 
-if ( window.desktop && window.desktop.theme ) {
-    if ( window.desktop.theme.id ) {
-        // params.uitheme = undefined;
-        localStorage.setItem("ui-theme-id", window.desktop.theme.id);
-    } else
-    if ( window.desktop.theme.type ) {
-        if ( window.desktop.theme.type == 'dark' ) params.uitheme == 'default-dark'; else
-        if ( window.desktop.theme.type == 'light' ) params.uitheme == 'default-light';
+if ( window.desktop && !!window.RendererProcessVariable ) {
+    var theme = window.RendererProcessVariable.theme
+
+    if ( theme ) {
+        if ( !theme.id && !!theme.type ) {
+            if ( theme.type == 'dark' ) theme.id = 'theme-dark'; else
+            if ( theme.type == 'light' ) theme.id = 'theme-classic-light';
+        }
+
+        if ( theme.id ) {
+            // params.uitheme = undefined;
+            localStorage.setItem("ui-theme-id", theme.id);
+        }
     }
 }
 

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

@@ -144,7 +144,7 @@ define([
                     '</tr>',
                     '<tr>',
                         '<td colspan="3" align="center">',
-                            '<label class="asc-about-desc"><% print(publisherurl.replace(/https?:\\/{2}/, "").replace(/\\/$/,"")) %></label>',
+                            '<a href="<%= publisherurl %>" target="_blank"><% print(publisherurl.replace(/https?:\\/{2}/, "").replace(/\\/$/,"")) %></a>',
                         '</td>',
                     '</tr>',
                 '</table>'
@@ -195,7 +195,8 @@ define([
             if ( !this.rendered ) {
                 this.licData = data || true;
             } else {
-                if (data && typeof data == 'object' && typeof(data.customer)=='object') {
+                if (data && typeof data == 'object' && data.customer && typeof(data.customer)=='object') {
+                    this.licData = data;
                     var customer = data.customer;
 
                     $('#id-about-licensor-logo').addClass('hidden');
@@ -229,9 +230,11 @@ define([
                         this.lblCompanyLic.text(value) :
                         this.lblCompanyLic.parents('tr').addClass('hidden');
 
-                    (value = customer.logo) && value.length ?
+                    value = Common.UI.Themes.isDarkTheme() ? (customer.logoDark || customer.logo) : (customer.logo || customer.logoDark);
+                    value.length ?
                         this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') :
                         this.divCompanyLogo.parents('tr').addClass('hidden');
+                    value.length && Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
                 } else {
                     this.cntLicenseeInfo.addClass('hidden');
                     this.cntLicensorInfo.addClass('margin-bottom');
@@ -239,6 +242,15 @@ define([
             }
         },
 
+        changeLogo: function () {
+            if (!this.licData) return;
+
+            var customer = this.licData.customer;
+            if ( customer.logo && customer.logoDark && customer.logo !== customer.logoDark) {
+                this.divCompanyLogo.find('img').attr('src', Common.UI.Themes.isDarkTheme() ? (customer.logoDark || customer.logo) : (customer.logo || customer.logoDark));
+            }
+        },
+
         show: function () {
             if ( !this.rendered ) this.render();
 

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

@@ -465,6 +465,7 @@ define([
                 });
                 Common.NotificationCenter.on('collaboration:sharingdeny', onLostEditRights);
                 Common.NotificationCenter.on('contenttheme:dark', onContentThemeChangedToDark.bind(this));
+                Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
             },
 
             render: function (el, role) {
@@ -476,14 +477,14 @@ define([
             getPanel: function (role, config) {
                 var me = this;
 
-                function createTitleButton(iconid, slot, disabled) {
+                function createTitleButton(iconid, slot, disabled, hintDirection, hintOffset) {
                     return (new Common.UI.Button({
                         cls: 'btn-header',
                         iconCls: iconid,
                         disabled: disabled === true,
                         dataHint:'0',
-                        dataHintDirection: 'left',
-                        dataHintOffset: '10, 10'
+                        dataHintDirection: hintDirection ? hintDirection : 'left',
+                        dataHintOffset: hintOffset ? hintOffset : '10, 10'
                     })).render(slot);
                 }
 
@@ -491,8 +492,9 @@ define([
                     $html = $(templateLeftBox);
                     this.logo = $html.find('#header-logo');
 
-                    if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) {
-                        this.logo.html('<img src="' + this.branding.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
+                    if (this.branding && this.branding.logo && (this.branding.logo.image || this.branding.logo.imageDark) && this.logo) {
+                        var image = Common.UI.Themes.isDarkTheme() ? (this.branding.logo.imageDark || this.branding.logo.image) : (this.branding.logo.image || this.branding.logo.imageDark);
+                        this.logo.html('<img src="' + image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
                         this.logo.css({'background-image': 'none', width: 'auto'});
                         (this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link');
                     }
@@ -534,19 +536,19 @@ define([
 
                     if ( !config.isEdit ) {
                         if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline  )
-                            this.btnDownload = createTitleButton('toolbar__icon icon--inverse btn-download', $html.findById('#slot-hbtn-download'));
+                            this.btnDownload = createTitleButton('toolbar__icon icon--inverse btn-download', $html.findById('#slot-hbtn-download'), undefined, 'bottom', 'big');
 
                         if ( config.canPrint )
-                            this.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-hbtn-print'));
+                            this.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-hbtn-print'), undefined, 'bottom', 'big');
 
                         if ( config.canEdit && config.canRequestEditRights )
-                            this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'));
+                            this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big');
                     }
                     me.btnOptions.render($html.find('#slot-btn-options'));
 
                     if (!config.isEdit || config.customization && !!config.customization.compactHeader) {
                         if (config.user.guest && config.canRenameAnonymous)
-                            me.btnUserName = createTitleButton('toolbar__icon icon--inverse btn-user', $html.findById('#slot-btn-user-name'));
+                            me.btnUserName = createTitleButton('toolbar__icon icon--inverse btn-user', $html.findById('#slot-btn-user-name'), undefined, 'bottom', 'big');
                         else {
                             me.elUserName = $html.find('.btn-current-user');
                             me.elUserName.removeClass('hidden');
@@ -562,8 +564,10 @@ define([
 
                     if ( !!window.DE ) {
                         var mode_cls = Common.UI.Themes.isContentThemeDark() ? 'btn-mode-light' : 'btn-mode-dark';
-                        me.btnContentMode = createTitleButton('toolbar__icon icon--inverse ' + mode_cls, $html.findById('#slot-btn-mode'));
-                        me.btnContentMode.setVisible(Common.UI.Themes.isDarkTheme());
+                        me.btnContentMode = createTitleButton('toolbar__icon icon--inverse ' + mode_cls, $html.findById('#slot-btn-mode'), undefined, 'bottom', 'big');
+
+                        var document = window.DE.getController('Main').document;
+                        me.btnContentMode.setVisible(Common.UI.Themes.isDarkTheme() && !/^pdf|djvu|xps|oxps$/.test(document.fileType));
                     }
 
                     return $html;
@@ -615,10 +619,11 @@ define([
                 this.branding = value;
 
                 if ( value ) {
-                    if ( value.logo && value.logo.image ) {
+                    if ( value.logo &&(value.logo.image || value.logo.imageDark)) {
+                        var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
                         element = $('#header-logo');
                         if (element) {
-                            element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
+                            element.html('<img src="' + image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
                             element.css({'background-image': 'none', width: 'auto'});
                             (value.logo.url || value.logo.url===undefined) && element.addClass('link');
                         }
@@ -626,6 +631,14 @@ define([
                 }
             },
 
+            changeLogo: function () {
+                var value = this.branding;
+                if ( value && value.logo && value.logo.image && value.logo.imageDark && (value.logo.image !== value.logo.imageDark)) { // change logo when image and imageDark are different
+                    var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
+                    $('#header-logo img').attr('src', image);
+                }
+            },
+
             setDocumentCaption: function(value) {
                 !value && (value = '');
 
@@ -724,7 +737,7 @@ define([
                         this.btnUserName.updateHint(name);
                     } else if (this.elUserName) {
                         this.elUserName.tooltip({
-                            title: name,
+                            title: Common.Utils.String.htmlEncode(name),
                             placement: 'cursor',
                             html: true
                         });
@@ -746,7 +759,7 @@ define([
                 if ( alias == 'users' ) {
                     if ( lock )
                         $btnUsers.addClass('disabled').attr('disabled', 'disabled'); else
-                        $btnUsers.removeClass('disabled').attr('disabled', '');
+                        $btnUsers.removeClass('disabled').removeAttr('disabled');
                 } else if ( alias == 'rename-user' ) {
                     if (me.labelUserName) {
                         if ( lock ) {

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

@@ -62,7 +62,7 @@ define([
             '<div id="current-plugin-box" class="layout-ct vbox hidden">',
                 '<div id="current-plugin-header">',
                     '<label></label>',
-                    '<div id="id-plugin-close" class="plugin-close img-commonctrl"></div>',
+                    '<div id="id-plugin-close" class="tool close"></div>',
                 '</div>',
                 '<div id="current-plugin-frame" class="">',
                 '</div>',

apps/common/main/resources/less/combo-dataview.less

@@ -92,14 +92,17 @@
         .border-left-radius(0);
 
         .dataview {
+            @minus-px: calc(-1px / @pixel-ratio-factor);
             height: 46px;
             padding: 0;
-            margin: -1px 0 0 -1px;
+            margin: -1 0 0 -1;
+            margin: @minus-px 0 0 @minus-px;
         }
     }
 
     &:not(.shapes) .item {
         padding: 2px;
+        padding: @scaled-two-px-value;
         border: @scaled-one-px-value-ie solid @border-regular-control-ie;
         border: @scaled-one-px-value solid @border-regular-control;
         .box-shadow(none);
@@ -111,6 +114,7 @@
         height: @combo-dataview-height;
         background-color: @background-normal-ie;
         background-color: @background-normal;
+        display: flex;
 
         &:hover {
             .box-inner-shadow(0 0 0 2px @border-preview-hover-ie);

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

@@ -34,6 +34,11 @@
             -webkit-filter: @img-border-type-filter;
             filter: @img-border-type-filter;
         }
+
+        .text {
+            line-height: 20px;
+            padding-left: 2px;
+        }
     }
 
     .btn {

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

@@ -11,6 +11,7 @@
         font-weight: bold;
         margin-top: 10px;
         margin-left: 12px;
+
     }
 
     #plugins-list {
@@ -97,16 +98,16 @@
         }
     }
 
-    .plugin-close {
+    .tool {
         position: absolute;
         top: 9px;
         right: 7px;
-        width: 16px;
-        height: 16px;
-        background-position: -26px -150px;
-        cursor: pointer;
+        margin: 0;
+        /*&:before, &:after {
+            width: 2px;
+            width: @scaled-two-px-value;
+        }*/
     }
-
     #current-plugin-frame {
         width: 100%;
         height: 100%;

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

@@ -1,72 +1,53 @@
 .radiobox {
-    padding-left: 22px;
     margin-bottom: 0;
     .font-size-normal();
     font-weight: normal;
     position: relative;
     min-height: 1em;
 
-    input[type=radio] {
+    display: flex;
+    align-items: center;
 
+    svg {
+        margin-right: 8px;
+        .rb-circle {
+            fill: @background-normal;
+            stroke: @border-regular-control;
+        }
+
+        .rb-check-mark {
+            fill: @text-normal;
+        }
+    }
+
+    input[type=radio] {
         display: none;
 
-        + label {
-            position: absolute;
-            left: 0;
-            margin-top: auto;
-            padding-bottom: 4px;
-            width: 14px;
-            height: 14px;
-
-            background: @background-normal-ie;
-            background: @background-normal;
-            border: @scaled-one-px-value-ie solid @border-regular-control-ie;
-            border: @scaled-one-px-value solid @border-regular-control;
-            border-radius: 50%;
-
-            + span {
-                outline: @scaled-one-px-value-ie dotted transparent;
-                outline: @scaled-one-px-value dotted transparent;
-                display: inline-block;
+        &:not(:checked) + svg {
+            .rb-check-mark {
+                display: none;
             }
         }
+    }
 
-        &:checked {
-            + label {
-                &::before {
-                    content: '';
-                    position: absolute;
-                    background: @text-normal-ie;
-                    background: @text-normal;
-                    border-radius: 50%;
-                    width: 8px;
-                    height: 8px;
-                    left: 2px;
-                    top: 2px;
-                }
-            }
-        }
-
-        &.disabled, &:disabled {
-
-            + label {
-                &::before {
-                }
-            }
+    &.disabled, &:disabled {
+        svg, span {
+            opacity: @component-disabled-opacity;
+            pointer-events: none;
         }
     }
 
     &:focus:not(.disabled) {
-        input[type=radio] {
-            + label {
-                border-color: @border-control-focus-ie;
-                border-color: @border-control-focus;
-
-                + span {
-                    outline-color: @border-control-focus-ie;
-                    outline-color: @border-control-focus;
-                }
+        svg {
+            .rb-circle {
+                stroke: @border-control-focus-ie;
+                stroke: @border-control-focus;
             }
         }
+
+        span {
+            outline: @scaled-one-px-value-ie dotted @border-control-focus-ie;
+            outline: @scaled-one-px-value dotted @border-control-focus;
+        }
     }
 }

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

@@ -22,6 +22,50 @@
         opacity: 0.6;
     }
 }
+.tool {
+    float: right;
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    overflow: hidden;
+    padding: 0px;
+    margin: 4px 3px 0px 0px;
+
+    &.close {
+        position: relative;
+        opacity: 0.7;
+
+        &:hover {
+            opacity: 1;
+        }
+
+        &.disabled {
+            cursor: default;
+        }
+
+        &:before, &:after {
+            content: ' ';
+            position: absolute;
+            left: 7px;
+            left: calc(7px / @pixel-ratio-factor);
+            top: @scaled-one-px-value-ie;
+            top: @scaled-one-px-value;
+            height: 14px;
+            width: @scaled-one-px-value-ie;
+            width: @scaled-one-px-value;
+            background-color: @icon-normal-ie;
+            background-color: @icon-normal;
+        }
+
+        &:before {
+            transform: rotate(45deg);
+        }
+
+        &:after {
+            transform: rotate(-45deg);
+        }
+    }
+}
 
 .asc-window {
     min-height: 50px;
@@ -73,71 +117,27 @@
             padding-right: 6px;
         }
 
-        .tool {
-            float: right;
-            width: 16px;
-            height: 16px;
-            cursor: pointer;
-            overflow: hidden;
-            padding: 0px;
-            margin: 4px 3px 0px 0px;
+        .tool.help {
+            width: 20px;
+            margin-right:0;
+            line-height: 14px;
+            font-size: 14px;
+            font-weight: bold;
+            color: @text-normal-ie;
+            color: @text-normal;
+            opacity: 0.7;
 
-            &.close {
-                position: relative;
-                opacity: 0.7;
-
-                &:hover {
-                    opacity: 1;
-                }
-
-                &.disabled {
-                    cursor: default;
-                }
-
-                &:before, &:after {
-                    content: ' ';
-                    position: absolute;
-                    left: 7px;
-                    left: calc(7px/@pixel-ratio-factor);
-                    top: @scaled-one-px-value-ie;
-                    top: @scaled-one-px-value;
-                    height: 14px;
-                    width: @scaled-one-px-value-ie;
-                    width: @scaled-one-px-value;
-                    background-color: @icon-normal-ie;
-                    background-color: @icon-normal;
-                }
-
-                &:before {
-                    transform: rotate(45deg);
-                }
-
-                &:after {
-                    transform: rotate(-45deg);
-                }
+            &:hover {
+                opacity: 1;
             }
 
-            &.help {
-                width: 20px;
-                margin-right:0;
-                line-height: 14px;
-                font-size: 14px;
-                font-weight: bold;
-                color: @text-normal-ie;
-                color: @text-normal;
-                opacity: 0.7;
-
-                &:hover {
-                    opacity: 1;
-                }
-
-                &.disabled {
-                    opacity: @component-disabled-opacity;
-                    cursor: default;
-                }
+            &.disabled {
+                opacity: @component-disabled-opacity;
+                cursor: default;
             }
         }
 
+
         &.resizing {
             cursor: inherit !important;
         }

apps/common/mobile/lib/view/Search.jsx

@@ -85,15 +85,15 @@ class SearchView extends Component {
     constructor(props) {
         super(props);
 
+        const $$ = Dom7;
+
         this.state = {
             searchQuery: '',
             replaceQuery: ''
         };
 
-        const $$ = Dom7;
-
         $$(document).on('page:init', (e, page) => {
-            if ( page.name == 'home' ) {
+            if(!this.searchbar) {
                 this.searchbar = f7.searchbar.create({
                     el: '.searchbar',
                     customSearch: true,
@@ -107,26 +107,10 @@ class SearchView extends Component {
                     }
                 });
 
-                // function iOSVersion() {
-                //     var ua = navigator.userAgent;
-                //     var m;
-                //     return (m = /(iPad|iPhone|iphone).*?(OS |os |OS\_)(\d+((_|\.)\d)?((_|\.)\d)?)/.exec(ua)) ? parseFloat(m[3]) : 0;
-                // }
-
                 const $editor = $$('#editor_sdk');
-                // const $replaceLink = $$('#replace-link');
-
-                if (false /* iOSVersion < 13 */) {
-                    // $editor.on('mousedown touchstart', this.onEditorTouchStart.bind(this));
-                    // $editor.on('mouseup touchend', this.onEditorTouchEnd.bind(this));
-                } else {
-                    // $editor.on('pointerdown', this.onEditorTouchStart.bind(this));
-                    // $editor.on('pointerup',   this.onEditorTouchEnd.bind(this));
-                }
 
                 $editor.on('pointerdown', this.onEditorTouchStart.bind(this));
-                $editor.on('pointerup',   this.onEditorTouchEnd.bind(this));
-                // $replaceLink.on('click', this.onReplaceHold.bind(this));
+                $editor.on('pointerup', this.onEditorTouchEnd.bind(this));
             }
         });
 
@@ -140,6 +124,14 @@ class SearchView extends Component {
         this.$replace = $$('#idx-replace-val');
     }
 
+    componentWillUnmount() {
+        const $$ = Dom7;
+        const $editor = $$('#editor_sdk');
+
+        $editor.off('pointerdown', this.onEditorTouchStart.bind(this));
+        $editor.off('pointerup', this.onEditorTouchEnd.bind(this));
+    }
+
     onSettingsClick(e) {
         if ( Device.phone ) {
             f7.popup.open('.search-settings-popup');
@@ -306,7 +298,7 @@ class SearchView extends Component {
                 </div>
             </form>
         )
-    }
+    } 
 }
 
 const SearchViewWithObserver = observer(SearchView);

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

@@ -73,13 +73,8 @@
                 margin-bottom: 0;
                 margin-top: 8px;
             }
-            .add-image {
-                ul:before, :after{
-                    display: none;
-                }
-            }
-            .inputs-list {
-                ul:after {
+            .add-image, .inputs-list {
+                ul:after, :before{
                     display: none;
                 }
             }

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

@@ -535,10 +535,10 @@
         padding-top: 5px;
         li.item-theme {
             border: 0.5px solid #c8c7cc;
-            padding: 2px;
+            padding: 1px;
             background-repeat: no-repeat;
-            width: 106px;
-            height: 56px;
+            width: 108px;
+            height: 52px;
             margin-bottom: 10px;
             background-position: center;
             .item-content {
@@ -878,7 +878,7 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .functions-list {
-    height: 175px;
+    max-height: 175px;
     width: 360px;
     overflow-y: auto;
     overflow-x: hidden;

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

@@ -43,6 +43,10 @@
             height: auto;
             display: block;
             line-height: normal;
+
+            &:before{
+                display: none;
+            }
         }
     }
 

apps/documenteditor/embed/js/ApplicationController.js

@@ -597,27 +597,12 @@ DE.ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
-             config.customization && config.customization.logo ) {
-
-            var logo = $('#header-logo');
-            if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
-                logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
-                logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
-
-                config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
-            }
-
-            if (config.customization.logo.url) {
-                logo.attr('href', config.customization.logo.url);
-            } else if (config.customization.logo.url!==undefined) {
-                logo.removeAttr('href');logo.removeAttr('target');
-            }
-        }
         var licType = params.asc_getLicenseType();
         appOptions.canLicense     = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
         appOptions.canFillForms   = appOptions.canLicense && (permissions.fillForms===true) && (config.mode !== 'view');
         appOptions.canSubmitForms = appOptions.canLicense && (typeof (config.customization) == 'object') && !!config.customization.submitForm;
+        appOptions.canBranding  = params.asc_getCustomization();
+        appOptions.canBranding && setBranding(config.customization);
 
         api.asc_setViewMode(!appOptions.canFillForms);
 
@@ -823,6 +808,24 @@ DE.ApplicationController = new(function(){
     function onBeforeUnload () {
         common.localStorage.save();
     }
+
+    function setBranding(value) {
+        if ( value && value.logo) {
+            var logo = $('#header-logo');
+            if (value.logo.image || value.logo.imageEmbedded) {
+                logo.html('<img src="'+(value.logo.image || value.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
+                logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+
+                value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
+            }
+
+            if (value.logo.url) {
+                logo.attr('href', value.logo.url);
+            } else if (value.logo.url!==undefined) {
+                logo.removeAttr('href');logo.removeAttr('target');
+            }
+        }
+    }
         // Helpers
     // -------------------------
 

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

@@ -220,6 +220,10 @@ define([
                     config.msg = this.errorForceSave;
                     break;
 
+                case Asc.c_oAscError.ID.LoadingFontError:
+                    config.msg = this.errorLoadingFont;
+                    break;
+
                 default:
                     config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
                     break;
@@ -431,22 +435,6 @@ define([
 
             if ( this.onServerVersion(params.asc_getBuildVersion())) return;
 
-            if ( (licType === Asc.c_oLicenseResult.Success) && (typeof this.appOptions.customization == 'object') &&
-                this.appOptions.customization && this.appOptions.customization.logo ) {
-
-                var logo = $('#header-logo');
-                if (this.appOptions.customization.logo.image) {
-                    logo.html('<img src="'+this.appOptions.customization.logo.image+'" style="max-width:100px; max-height:20px;"/>');
-                    logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
-                }
-
-                if (this.appOptions.customization.logo.url) {
-                    logo.attr('href', this.appOptions.customization.logo.url);
-                } else if (this.appOptions.customization.logo.url!==undefined) {
-                    logo.removeAttr('href');logo.removeAttr('target');
-                }
-            }
-
             this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review;
             if (params.asc_getRights() !== Asc.c_oRights.Edit)
                 this.permissions.edit = this.permissions.review = false;
@@ -458,6 +446,9 @@ define([
             this.appOptions.canFillForms   = this.appOptions.canLicense && (this.permissions.fillForms===true) && (this.editorConfig.mode !== 'view');
             this.api.asc_setViewMode(!this.appOptions.canFillForms);
 
+            this.appOptions.canBranding  = params.asc_getCustomization();
+            this.appOptions.canBranding && this.setBranding(this.appOptions.customization);
+
             this.appOptions.canDownload       = this.permissions.download !== false;
             this.appOptions.canPrint          = (this.permissions.print !== false);
 
@@ -580,6 +571,23 @@ define([
             }
         },
 
+        setBranding: function (value) {
+            if ( value && value.logo) {
+                var logo = $('#header-logo');
+                if (value.logo.image || value.logo.imageDark) {
+                    var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
+                    logo.html('<img src="' + image + '" style="max-width:100px; max-height:20px;"/>');
+                    logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+                }
+
+                if (value.logo.url) {
+                    logo.attr('href', value.logo.url);
+                } else if (value.logo.url!==undefined) {
+                    logo.removeAttr('href');logo.removeAttr('target');
+                }
+            }
+        },
+
         onLongActionBegin: function(type, id) {
             var action = {id: id, type: type};
             this.stackLongActions.push(action);
@@ -1072,6 +1080,13 @@ define([
             _.each(this.view.mnuThemes.items, function(item){
                 item.setChecked(current===item.value, true);
             });
+            if (this.appOptions.canBranding) {
+                var value = this.appOptions.customization;
+                if ( value && value.logo && (value.logo.image || value.logo.imageDark) && (value.logo.image !== value.logo.imageDark)) {
+                    var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
+                    $('#header-logo img').attr('src', image);
+                }
+            }
         },
 
         createDelayedElements: function() {
@@ -1322,7 +1337,8 @@ define([
         warnNoLicenseUsers: "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
         textBuyNow: 'Visit website',
         textNoLicenseTitle: 'License limit reached',
-        textContactUs: 'Contact sales'
+        textContactUs: 'Contact sales',
+        errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.'
 
     }, DE.Controllers.ApplicationController));
 });

apps/documenteditor/forms/index.html

@@ -189,7 +189,8 @@
 
            var params = getUrlParams(),
                lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-               logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+               logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+               logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
            window.frameEditorId = params["frameEditorId"];
            window.parentOrigin = params["parentOrigin"];
@@ -201,12 +202,12 @@
                document.body.removeChild(document.getElementById('loading-mask'));
            } else {
                var elem = document.querySelector('.loading-logo');
-               if (elem && logo) {
+               if (elem && (logo || logoDark)) {
                    elem.style.backgroundImage= 'none';
                    elem.style.width = 'auto';
                    elem.style.height = 'auto';
                    var img = document.querySelector('.loading-logo img');
-                   img && img.setAttribute('src', logo);
+                   img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                    img.style.opacity = 1;
                }
            }

apps/documenteditor/forms/index.html.deploy

@@ -170,17 +170,18 @@
 
             var params = getUrlParams(),
                            lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-                           logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+                           logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+                           logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
             window.frameEditorId = params["frameEditorId"];
             window.parentOrigin = params["parentOrigin"];
             var elem = document.querySelector('.loading-logo');
-            if (elem && logo) {
+            if (elem && (logo || logoDark)) {
                 elem.style.backgroundImage= 'none';
                 elem.style.width = 'auto';
                 elem.style.height = 'auto';
                 var img = document.querySelector('.loading-logo img');
-                img && img.setAttribute('src', logo);
+                img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 img.style.opacity = 1;
             }
         </script>

apps/documenteditor/forms/locale/ca.json

@@ -1,44 +1,63 @@
 {
-  "common.view.modals.txtCopy": "Copiat al porta-retalls",
-  "common.view.modals.txtEmbed": "Incrustar",
+  "common.view.modals.txtCopy": "Copia al porta-retalls",
+  "common.view.modals.txtEmbed": "Incrusta",
   "common.view.modals.txtHeight": "Alçada",
-  "common.view.modals.txtShare": "Compartir Enllaç",
+  "common.view.modals.txtShare": "Comparteix l'enllaç",
   "common.view.modals.txtWidth": "Amplada",
-  "DE.ApplicationController.convertationErrorText": "Conversió Fallida",
-  "DE.ApplicationController.convertationTimeoutText": "Conversió fora de temps",
+  "DE.ApplicationController.convertationErrorText": "No s'ha pogut convertir",
+  "DE.ApplicationController.convertationTimeoutText": "S'ha superat el temps de conversió.",
   "DE.ApplicationController.criticalErrorTitle": "Error",
-  "DE.ApplicationController.downloadErrorText": "Descàrrega fallida.",
-  "DE.ApplicationController.downloadTextText": "Descarregant document...",
-  "DE.ApplicationController.errorAccessDeny": "Intenteu realitzar una acció per la qual no teniu drets.<br>Poseu-vos en contacte amb l'administrador del servidor de documents.",
+  "DE.ApplicationController.downloadErrorText": "S'ha produït un error en la baixada",
+  "DE.ApplicationController.downloadTextText": "S'està baixant el document...",
+  "DE.ApplicationController.errorAccessDeny": "No teniu permisos per realitzar aquesta acció.<br>Contacteu amb el vostre administrador del servidor de documents.",
   "DE.ApplicationController.errorDefaultMessage": "Codi d'error:%1",
-  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error durant el treball amb el document.<br>Utilitzeu l'opció \"Desar com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
+  "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error mentre es treballava amb el document.<br>Utilitzeu l'opció \"Baixa-ho com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.",
   "DE.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
-  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer excedeix la limitació establerta per al vostre servidor. Podeu contactar amb l'administrador del Document Server per obtenir més detalls.",
-  "DE.ApplicationController.errorSubmit": "Error en enviar",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexió a Internet s'ha restaurat i la versió del fitxer s'ha canviat. <br> Abans de continuar treballant, heu de descarregar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, tornar a carregar aquesta pàgina.",
-  "DE.ApplicationController.errorUserDrop": "Ara no es pot accedir al fitxer.",
-  "DE.ApplicationController.notcriticalErrorTitle": "Avis",
+  "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel vostre servidor. Contacteu amb el vostre administrador del servidor de documents per obtenir més informació.",
+  "DE.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.ApplicationController.errorLoadingFont": "No s'han carregat els tipus de lletra.<br>Contacteu amb l'administrador del Servidor de Documents.",
+  "DE.ApplicationController.errorServerVersion": "S'ha actualitzat la versió de l'editor. Es tornarà a carregar la pàgina per aplicar els canvis.",
+  "DE.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
+  "DE.ApplicationController.errorUpdateVersion": "S'ha canviat la versió del fitxer. La pàgina es tornarà a carregar.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "S'ha restaurat la connexió a internet i la versió del fitxer ha canviat. <br> Abans de continuar treballant, heu de baixar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, torneu a carregar aquesta pàgina.",
+  "DE.ApplicationController.errorUserDrop": "Ara mateix no es pot accedir al fitxer.",
+  "DE.ApplicationController.notcriticalErrorTitle": "Advertiment",
   "DE.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.",
   "DE.ApplicationController.textAnonymous": "Anònim",
-  "DE.ApplicationController.textClear": "Esborrar tots els camps",
+  "DE.ApplicationController.textBuyNow": "Visiteu el lloc web",
+  "DE.ApplicationController.textCloseTip": "Feu clic per tancar el suggeriment.",
+  "DE.ApplicationController.textContactUs": "Contacteu amb vendes",
   "DE.ApplicationController.textGotIt": "Ho tinc",
   "DE.ApplicationController.textGuest": "Convidat",
-  "DE.ApplicationController.textLoadingDocument": "Carregant document",
-  "DE.ApplicationController.textNext": "Següent camp",
+  "DE.ApplicationController.textLoadingDocument": "S'està carregant el document",
+  "DE.ApplicationController.textNoLicenseTitle": "S'ha assolit el límit de llicència",
   "DE.ApplicationController.textOf": "de",
-  "DE.ApplicationController.textRequired": "Ompli tots els camps requerits per enviar el formulari.",
-  "DE.ApplicationController.textSubmit": "Enviar",
-  "DE.ApplicationController.textSubmited": "<b>Formulari enviat amb èxit</b><br>Faci clic per a tancar el consell",
-  "DE.ApplicationController.txtClose": "Tancar",
-  "DE.ApplicationController.unknownErrorText": "Error Desconegut.",
+  "DE.ApplicationController.textRequired": "Emplena tots els camps necessaris per enviar el formulari.",
+  "DE.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Cliqueu per tancar el consell",
+  "DE.ApplicationController.titleServerVersion": "S'ha actualitzat l'editor",
+  "DE.ApplicationController.titleUpdateVersion": "S'ha canviat la versió",
+  "DE.ApplicationController.txtClose": "Tanca",
+  "DE.ApplicationController.txtEmpty": "(Buit)",
+  "DE.ApplicationController.txtPressLink": "Prem CTRL i clica a l'enllaç",
+  "DE.ApplicationController.unknownErrorText": "Error desconegut.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
-  "DE.ApplicationController.waitText": "Si us plau, esperi...",
-  "DE.ApplicationView.txtDownload": "\nDescarregar",
-  "DE.ApplicationView.txtDownloadDocx": "Desar com a .docx",
-  "DE.ApplicationView.txtDownloadPdf": "Desar com a pdf",
-  "DE.ApplicationView.txtEmbed": "Incrustar",
-  "DE.ApplicationView.txtFileLocation": "Obrir ubicació del fitxer",
-  "DE.ApplicationView.txtFullScreen": "Pantalla Completa",
-  "DE.ApplicationView.txtPrint": "Imprimir",
-  "DE.ApplicationView.txtShare": "Compartir"
+  "DE.ApplicationController.waitText": "Espereu...",
+  "DE.ApplicationController.warnLicenseExceeded": "Heu arribat al límit de connexions simultànies amb %1 editors. Aquest document només s'obrirà en mode lectura. <br> Contacteu amb el vostre administrador per obtenir més informació.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "La llicència ha caducat.<br>No teniu accés a la funció d'edició de documents.<br>Contacteu amb el vostre administrador.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "Cal renovar la llicència.<br>Teniu accés limitat a la funció d'edició de documents.<br>Contacteu amb el vostre administrador per obtenir accés complet",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Heu arribat al límit d'usuaris per a %1 editors. Contacteu amb el vostre administrador per a més informació.",
+  "DE.ApplicationController.warnNoLicense": "Heu arribat al límit de connexions simultànies per als editors %1. Aquest document s'obrirà en mode de només lectura. Contacteu l'equip de vendes %1 per a les condicions personals de millora del servei.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Heu arribat al límit d'usuaris per a %1 editors. Contacteu amb l'equip de vendes de %1 per obtenir les condicions de millora personals dels vostres serveis.",
+  "DE.ApplicationView.textClear": "Esborra tots els camps",
+  "DE.ApplicationView.textNext": "Camp següent",
+  "DE.ApplicationView.textSubmit": "Envia",
+  "DE.ApplicationView.txtDownload": "Baixa",
+  "DE.ApplicationView.txtDownloadDocx": "Baixa-ho com a .docx",
+  "DE.ApplicationView.txtDownloadPdf": "Baixa-ho com a pdf",
+  "DE.ApplicationView.txtEmbed": "Incrusta",
+  "DE.ApplicationView.txtFileLocation": "Obre la ubicació del fitxer",
+  "DE.ApplicationView.txtFullScreen": "Pantalla sencera",
+  "DE.ApplicationView.txtPrint": "Imprimeix",
+  "DE.ApplicationView.txtShare": "Comparteix",
+  "DE.ApplicationView.txtTheme": "Tema de la interfície"
 }

apps/documenteditor/forms/locale/cs.json

@@ -1,5 +1,6 @@
 {
   "common.view.modals.txtCopy": "Zkopírovat do schránky",
+  "common.view.modals.txtEmbed": "Vestavěný",
   "common.view.modals.txtHeight": "Výška",
   "common.view.modals.txtShare": "Odkaz pro sdílení",
   "common.view.modals.txtWidth": "Šířka",
@@ -10,19 +11,34 @@
   "DE.ApplicationController.downloadTextText": "Stahování dokumentu…",
   "DE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.<br>Obraťte se na správce vámi využívaného dokumentového serveru.",
   "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "Při práci s dokumentem došlo k chybě.<br>Použijte volbu 'Stáhnout jako…' pro uložení záložní kopie na harddisk Vašeho počítače. ",
   "DE.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.",
   "DE.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.<br>Ohledně podrobností se obraťte na správce dokumentového serveru.",
+  "DE.ApplicationController.errorForceSave": "Při ukládání souboru došlo k chybě. Prosím použijte 'Stáhnout jako' k uložení souboru na harddisk Vašeho počítače, nebo opakujte volbu později.",
+  "DE.ApplicationController.errorLoadingFont": "Styly nejsou načteny.<br>Prosím kontaktujte Vašeho administrátora dokumentových serverů.",
+  "DE.ApplicationController.errorSubmit": "Potvrzení selhalo.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.<br>Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.",
   "DE.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.",
   "DE.ApplicationController.notcriticalErrorTitle": "Varování",
   "DE.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.",
+  "DE.ApplicationController.textAnonymous": "Anonymní",
+  "DE.ApplicationController.textGotIt": "Rozumím",
+  "DE.ApplicationController.textGuest": "Host",
   "DE.ApplicationController.textLoadingDocument": "Načítání dokumentu",
   "DE.ApplicationController.textOf": "z",
+  "DE.ApplicationController.textRequired": "Pro odeslání formuláře vyplňte všechna požadovaná pole.",
+  "DE.ApplicationController.textSubmited": "<b>Formulář úspěšně uložen.</b><br>Klikněte pro zavření nápovědy.",
   "DE.ApplicationController.txtClose": "Zavřít",
+  "DE.ApplicationController.txtEmpty": "(Prázdné)",
+  "DE.ApplicationController.txtPressLink": "Stiskněte CTRL a klikněte na odkaz",
   "DE.ApplicationController.unknownErrorText": "Neznámá chyba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Vámi používaný webový prohlížeč není podporován.",
   "DE.ApplicationController.waitText": "Čekejte prosím…",
   "DE.ApplicationView.txtDownload": "Stáhnout",
+  "DE.ApplicationView.txtDownloadDocx": "Stáhnout jako docx",
+  "DE.ApplicationView.txtDownloadPdf": "Stáhnout jako pdf",
+  "DE.ApplicationView.txtEmbed": "Vestavěný",
+  "DE.ApplicationView.txtFileLocation": "Otevřít umístění souboru",
   "DE.ApplicationView.txtFullScreen": "Na celou obrazovku",
   "DE.ApplicationView.txtPrint": "Tisk",
   "DE.ApplicationView.txtShare": "Sdílet"

apps/documenteditor/forms/locale/de.json

@@ -14,25 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "Fehler bei der Bearbeitung.<br>Speichern Sie eine Kopie dieser Datei auf Ihrem Computer, indem Sie auf \"Herunterladen als...\" klicken.",
   "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.errorLoadingFont": "Schriftarten nicht hochgeladen.<br>Bitte wenden Sie sich an Administratoren von Ihrem Document Server.",
+  "DE.ApplicationController.errorServerVersion": "Version des Editors wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
   "DE.ApplicationController.errorSubmit": "Fehler beim Senden.",
+  "DE.ApplicationController.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
   "DE.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.",
   "DE.ApplicationController.errorUserDrop": "Der Zugriff auf diese Datei ist nicht möglich.",
   "DE.ApplicationController.notcriticalErrorTitle": "Warnung",
   "DE.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
   "DE.ApplicationController.textAnonymous": "Anonym",
-  "DE.ApplicationController.textClear": "Alle Felder löschen",
+  "DE.ApplicationController.textBuyNow": "Webseite besuchen",
+  "DE.ApplicationController.textCloseTip": "Klicken Sie hier, um den Tipp zu schließen.",
+  "DE.ApplicationController.textContactUs": "Verkaufsteam kontaktieren",
   "DE.ApplicationController.textGotIt": "OK",
   "DE.ApplicationController.textGuest": "Gast",
   "DE.ApplicationController.textLoadingDocument": "Dokument wird geladen...",
-  "DE.ApplicationController.textNext": "Nächstes Feld",
+  "DE.ApplicationController.textNoLicenseTitle": "Lizenzlimit erreicht",
   "DE.ApplicationController.textOf": "von",
   "DE.ApplicationController.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular zu senden.",
-  "DE.ApplicationController.textSubmit": "Senden",
   "DE.ApplicationController.textSubmited": "<b>Das Formular wurde erfolgreich abgesendet</b><br>Klicken Sie hier, um den Tipp auszublenden",
+  "DE.ApplicationController.titleServerVersion": "Editor wurde aktualisiert",
+  "DE.ApplicationController.titleUpdateVersion": "Version wurde geändert",
   "DE.ApplicationController.txtClose": "Schließen",
+  "DE.ApplicationController.txtEmpty": "(Leer)",
+  "DE.ApplicationController.txtPressLink": "Drücken Sie STRG und klicken Sie auf den Link",
   "DE.ApplicationController.unknownErrorText": "Unbekannter Fehler.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ihr Webbrowser wird nicht unterstützt.",
   "DE.ApplicationController.waitText": "Bitte warten...",
+  "DE.ApplicationController.warnLicenseExceeded": "Sie haben das Limit für gleichzeitige Verbindungen in %1-Editoren erreicht. Dieses Dokument wird nur zum Anzeigen geöffnet.<br>Bitte wenden Sie sich an Ihren Administrator, um weitere Informationen zu erhalten.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Die Lizenz ist abgelaufen.<br>Die Bearbeitungsfunktionen sind nicht verfügbar.<br>Bitte wenden Sie sich an Ihrem Administrator.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "Die Lizenz soll aktualisiert werden.<br>Die Bearbeitungsfunktionen sind eingeschränkt.<br>Bitte wenden Sie sich an Ihrem Administrator für vollen Zugriff",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte wenden Sie sich an Ihren Administrator, um weitere Informationen zu erhalten.",
+  "DE.ApplicationController.warnNoLicense": "Sie haben das Limit für gleichzeitige Verbindungen in %1-Editoren erreicht. Dieses Dokument wird nur zum Anzeigen geöffnet.<br>Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Sie haben das Benutzerlimit für %1-Editoren erreicht. Bitte kontaktieren Sie unser Verkaufsteam, um persönliche Upgrade-Bedingungen zu erhalten.",
+  "DE.ApplicationView.textClear": "Alle Felder leeren",
+  "DE.ApplicationView.textNext": "Nächstes Feld",
+  "DE.ApplicationView.textSubmit": "Senden",
   "DE.ApplicationView.txtDownload": "Herunterladen",
   "DE.ApplicationView.txtDownloadDocx": "Als DOCX herunterladen",
   "DE.ApplicationView.txtDownloadPdf": "Als PDF herunterladen",
@@ -40,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Dateispeicherort öffnen",
   "DE.ApplicationView.txtFullScreen": "Vollbild-Modus",
   "DE.ApplicationView.txtPrint": "Drucken",
-  "DE.ApplicationView.txtShare": "Freigeben"
+  "DE.ApplicationView.txtShare": "Freigeben",
+  "DE.ApplicationView.txtTheme": "Thema der Benutzeroberfläche"
 }

apps/documenteditor/forms/locale/el.json

@@ -14,22 +14,23 @@
   "DE.ApplicationController.errorEditingDownloadas": "Παρουσιάστηκε σφάλμα κατά την εργασία με το έγγραφο.<br>Χρησιμοποιήστε την επιλογή «Λήψη ως...» για να αποθηκεύσετε το αντίγραφο ασφαλείας στον σκληρό δίσκο του υπολογιστή σας.",
   "DE.ApplicationController.errorFilePassProtect": "Το αρχείο προστατεύεται με συνθηματικό και δεν μπορεί να ανοίξει.",
   "DE.ApplicationController.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων για λεπτομέρειες.",
+  "DE.ApplicationController.errorForceSave": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου. Χρησιμοποιήστε την επιλογή «Λήψη ως» για να αποθηκεύσετε το αρχείο στον σκληρό δίσκο του υπολογιστή σας ή δοκιμάστε ξανά αργότερα.",
+  "DE.ApplicationController.errorLoadingFont": "Οι γραμματοσειρές δεν έχουν φορτωθεί.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων σας.",
   "DE.ApplicationController.errorSubmit": "Η υποβολή απέτυχε.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Η σύνδεση στο Διαδίκτυο έχει αποκατασταθεί και η έκδοση του αρχείου έχει αλλάξει.<br>Προτού συνεχίσετε να εργάζεστε, πρέπει να κατεβάσετε το αρχείο ή να αντιγράψετε το περιεχόμενό του για να βεβαιωθείτε ότι δεν έχει χαθεί τίποτα και, στη συνέχεια, φορτώστε ξανά αυτήν τη σελίδα.",
   "DE.ApplicationController.errorUserDrop": "Δεν είναι δυνατή η πρόσβαση στο αρχείο αυτήν τη στιγμή.",
   "DE.ApplicationController.notcriticalErrorTitle": "Προειδοποίηση",
   "DE.ApplicationController.scriptLoadError": "Η σύνδεση είναι πολύ αργή, δεν ήταν δυνατή η φόρτωση ορισμένων στοιχείων. Φορτώστε ξανά τη σελίδα.",
   "DE.ApplicationController.textAnonymous": "Ανώνυμος",
-  "DE.ApplicationController.textClear": "Εκκαθάριση Όλων των Πεδίων",
   "DE.ApplicationController.textGotIt": "Ελήφθη",
   "DE.ApplicationController.textGuest": "Επισκέπτης",
   "DE.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου",
-  "DE.ApplicationController.textNext": "Επόμενο Πεδίο",
   "DE.ApplicationController.textOf": "του",
   "DE.ApplicationController.textRequired": "Συμπληρώστε όλα τα απαιτούμενα πεδία για την αποστολή της φόρμας.",
-  "DE.ApplicationController.textSubmit": "Υποβολή",
   "DE.ApplicationController.textSubmited": "<b>Η φόρμα υποβλήθηκε με επιτυχία</b><br>Κάντε κλικ για να κλείσετε τη συμβουλή ",
   "DE.ApplicationController.txtClose": "Κλείσιμο",
+  "DE.ApplicationController.txtEmpty": "(Κενό)",
+  "DE.ApplicationController.txtPressLink": "Πατήστε Ctrl και κάντε κλικ στο σύνδεσμο",
   "DE.ApplicationController.unknownErrorText": "Άγνωστο σφάλμα.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ο περιηγητής σας δεν υποστηρίζεται.",
   "DE.ApplicationController.waitText": "Παρακαλούμε, περιμένετε...",

apps/documenteditor/forms/locale/en.json

@@ -14,39 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
   "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.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
+  "DE.ApplicationController.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
   "DE.ApplicationController.errorSubmit": "Submit failed.",
+  "DE.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet 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.",
   "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
-  "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.notcriticalErrorTitle": "Warning",
   "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
   "DE.ApplicationController.textAnonymous": "Anonymous",
+  "DE.ApplicationController.textBuyNow": "Visit website",
+  "DE.ApplicationController.textCloseTip": "Click to close the tip.",
+  "DE.ApplicationController.textContactUs": "Contact sales",
   "DE.ApplicationController.textGotIt": "Got it",
   "DE.ApplicationController.textGuest": "Guest",
   "DE.ApplicationController.textLoadingDocument": "Loading document",
+  "DE.ApplicationController.textNoLicenseTitle": "License limit reached",
   "DE.ApplicationController.textOf": "of",
   "DE.ApplicationController.textRequired": "Fill all required fields to send form.",
   "DE.ApplicationController.textSubmited": "<b>Form submitted successfully</b><br>Click to close the tip",
+  "DE.ApplicationController.titleServerVersion": "Editor updated",
+  "DE.ApplicationController.titleUpdateVersion": "Version changed",
   "DE.ApplicationController.txtClose": "Close",
+  "DE.ApplicationController.txtEmpty": "(Empty)",
+  "DE.ApplicationController.txtPressLink": "Press Ctrl and click link",
   "DE.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.ApplicationController.waitText": "Please, wait...",
-  "DE.ApplicationController.txtEmpty": "(Empty)",
-  "DE.ApplicationController.txtPressLink": "Press Ctrl and click link",
-  "DE.ApplicationController.textCloseTip": "Click to close the tip.",
-  "DE.ApplicationController.titleServerVersion": "Editor updated",
-  "DE.ApplicationController.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
-  "DE.ApplicationController.titleUpdateVersion": "Version changed",
-  "DE.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
-  "DE.ApplicationController.warnLicenseLimitedRenewed": "License needs to be renewed.<br>You have a limited access to document editing functionality.<br>Please contact your administrator to get full access",
-  "DE.ApplicationController.warnLicenseLimitedNoAccess": "License expired.<br>You have no access to document editing functionality.<br>Please contact your administrator.",
   "DE.ApplicationController.warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact your administrator to learn more.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "License expired.<br>You have no access to document editing functionality.<br>Please contact your administrator.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "License needs to be renewed.<br>You have a limited access to document editing functionality.<br>Please contact your administrator to get full access",
   "DE.ApplicationController.warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
   "DE.ApplicationController.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
   "DE.ApplicationController.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
-  "DE.ApplicationController.textBuyNow": "Visit website",
-  "DE.ApplicationController.textNoLicenseTitle": "License limit reached",
-  "DE.ApplicationController.textContactUs": "Contact sales",
+  "DE.ApplicationView.textClear": "Clear All Fields",
+  "DE.ApplicationView.textNext": "Next Field",
+  "DE.ApplicationView.textSubmit": "Submit",
   "DE.ApplicationView.txtDownload": "Download",
   "DE.ApplicationView.txtDownloadDocx": "Download as docx",
   "DE.ApplicationView.txtDownloadPdf": "Download as pdf",
@@ -55,8 +59,5 @@
   "DE.ApplicationView.txtFullScreen": "Full Screen",
   "DE.ApplicationView.txtPrint": "Print",
   "DE.ApplicationView.txtShare": "Share",
-  "DE.ApplicationView.textSubmit": "Submit",
-  "DE.ApplicationView.textClear": "Clear All Fields",
-  "DE.ApplicationView.textNext": "Next Field",
   "DE.ApplicationView.txtTheme": "Interface theme"
 }

apps/documenteditor/forms/locale/es.json

@@ -14,25 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.<br>Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.",
   "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
   "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede el límite establecido para su servidor. Por favor póngase en contacto con el administrador del Servidor de Documentos para obtener más información.",
+  "DE.ApplicationController.errorForceSave": "Ha ocurrido un error al guardar el archivo. Por favor, use la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
+  "DE.ApplicationController.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
+  "DE.ApplicationController.errorServerVersion": "La versión del editor ha sido actualizada. La página será recargada para aplicar los cambios.",
   "DE.ApplicationController.errorSubmit": "Error al enviar.",
+  "DE.ApplicationController.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.",
   "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
   "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Por favor, recargue la página.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
-  "DE.ApplicationController.textClear": "Borrar todos los campos",
+  "DE.ApplicationController.textBuyNow": "Visitar sitio web",
+  "DE.ApplicationController.textCloseTip": "Haga clic para cerrar el consejo.",
+  "DE.ApplicationController.textContactUs": "Contactar con el equipo de ventas",
   "DE.ApplicationController.textGotIt": "Entiendo",
   "DE.ApplicationController.textGuest": "Invitado",
   "DE.ApplicationController.textLoadingDocument": "Cargando documento",
-  "DE.ApplicationController.textNext": "Campo siguiente",
+  "DE.ApplicationController.textNoLicenseTitle": "Se ha alcanzado el límite de licencia",
   "DE.ApplicationController.textOf": "de",
   "DE.ApplicationController.textRequired": "Rellene todos los campos obligatorios para enviar el formulario.",
-  "DE.ApplicationController.textSubmit": "Enviar",
   "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Haga clic para cerrar el consejo",
+  "DE.ApplicationController.titleServerVersion": "Editor ha sido actualizado",
+  "DE.ApplicationController.titleUpdateVersion": "Versión se ha cambiado",
   "DE.ApplicationController.txtClose": "Cerrar",
+  "DE.ApplicationController.txtEmpty": "(Vacío)",
+  "DE.ApplicationController.txtPressLink": "Pulse CTRL y haga clic en el enlace",
   "DE.ApplicationController.unknownErrorText": "Error desconocido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
   "DE.ApplicationController.waitText": "Por favor, espere...",
+  "DE.ApplicationController.warnLicenseExceeded": "Usted ha alcanzado el límite de conexiones simultáneas con %1 editores. Este documento se abrirá sólo para su visualización.<br>Por favor, contacte con su administrador para recibir más información.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Licencia expirada.<br>No tiene acceso a la funcionalidad de edición de documentos.<br>Por favor, póngase en contacto con su administrador.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "La licencia requiere ser renovada.<br>Tiene un acceso limitado a la funcionalidad de edición de documentos.<br>Por favor, póngase en contacto con su administrador para obtener un acceso completo",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Usted ha alcanzado el límite de usuarios para los editores de %1. Por favor, contacte con su administrador para recibir más información.",
+  "DE.ApplicationController.warnNoLicense": "Usted ha alcanzado el límite de conexiones simultáneas con %1 editores. Este documento se abrirá sólo para su visualización.<br>Contacte con el equipo de ventas de %1 para conocer los términos de actualización personal.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Usted ha alcanzado el límite de usuarios para los editores de %1.<br>Contacte con el equipo de ventas de %1 para conocer los términos de actualización personal.",
+  "DE.ApplicationView.textClear": "Borrar todos los campos",
+  "DE.ApplicationView.textNext": "Campo siguiente",
+  "DE.ApplicationView.textSubmit": "Enviar",
   "DE.ApplicationView.txtDownload": "Descargar",
   "DE.ApplicationView.txtDownloadDocx": "Descargar como docx",
   "DE.ApplicationView.txtDownloadPdf": "Descargar como pdf",
@@ -40,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Abrir ubicación del archivo",
   "DE.ApplicationView.txtFullScreen": "Pantalla Completa",
   "DE.ApplicationView.txtPrint": "Imprimir",
-  "DE.ApplicationView.txtShare": "Compartir"
+  "DE.ApplicationView.txtShare": "Compartir",
+  "DE.ApplicationView.txtTheme": "Tema de interfaz"
 }

apps/documenteditor/forms/locale/fr.json

@@ -14,25 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "Une erreur s'est produite lors du travail avec le document.<br>Utilisez l'option 'Télécharger comme...' pour enregistrer une copie de sauvegarde du fichier sur le disque dur de votre ordinateur.",
   "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.",
   "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.<br>Veuillez contacter votre administrateur de Document Server pour obtenir plus d'informations.  ",
+  "DE.ApplicationController.errorForceSave": "Une erreur est survenue lors de l'enregistrement du fichier. Veuillez utiliser l'option «Télécharger en tant que» pour enregistrer le fichier sur le disque dur de votre ordinateur ou réessayer plus tard.",
+  "DE.ApplicationController.errorLoadingFont": "Les polices ne sont pas téléchargées.<br>Veuillez contacter l'administrateur de Document Server.",
+  "DE.ApplicationController.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
   "DE.ApplicationController.errorSubmit": "Échec de soumission",
+  "DE.ApplicationController.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.<br>Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.",
   "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertissement",
   "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains  éléments ne peuvent pas être chargés. Veuillez recharger la page.",
   "DE.ApplicationController.textAnonymous": "Anonyme",
-  "DE.ApplicationController.textClear": "Effacer tous les champs",
+  "DE.ApplicationController.textBuyNow": "Visiter le site web",
+  "DE.ApplicationController.textCloseTip": "Cliquez pour fermer le conseil.",
+  "DE.ApplicationController.textContactUs": "Contacter l'équipe de ventes",
   "DE.ApplicationController.textGotIt": "C'est compris",
   "DE.ApplicationController.textGuest": "Invité",
   "DE.ApplicationController.textLoadingDocument": "Chargement du document",
-  "DE.ApplicationController.textNext": "Champ suivant",
+  "DE.ApplicationController.textNoLicenseTitle": "La limite de la licence est atteinte",
   "DE.ApplicationController.textOf": "de",
   "DE.ApplicationController.textRequired": "Veuillez remplir tous les champs obligatoires avant d'envoyer le formulaire.",
-  "DE.ApplicationController.textSubmit": "Soumettre ",
   "DE.ApplicationController.textSubmited": "<b>Le formulaire a été soumis avec succès</b><br>Cliquez ici pour fermer l'astuce",
+  "DE.ApplicationController.titleServerVersion": "L'éditeur est mis à jour",
+  "DE.ApplicationController.titleUpdateVersion": "La version a été modifiée",
   "DE.ApplicationController.txtClose": "Fermer",
+  "DE.ApplicationController.txtEmpty": "(Vide)",
+  "DE.ApplicationController.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
   "DE.ApplicationController.unknownErrorText": "Erreur inconnue.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Votre navigateur n'est pas pris en charge.",
   "DE.ApplicationController.waitText": "Veuillez patienter...",
+  "DE.ApplicationController.warnLicenseExceeded": "Vous avez dépassé le nombre maximal de connexions simultanées aux éditeurs %1. Ce document sera ouvert en mode lecture seule.<br>Veuillez contacter votre administrateur pour en savoir davantage.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "La licence est expirée.<br>Vous n'avez plus d'accès aux outils d'édition.<br>Veuillez contacter votre administrateur.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "La licence doit être renouvelée.<br>Vous avez un accès limité aux outils d'édition des documents.<br>Veuillez contacter votre administrateur pour obtenir un accès complet.",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Vous avez dépassé le nombre maximal d’utilisateurs des éditeurs %1. Veuillez contacter votre administrateur pour en savoir davantage.",
+  "DE.ApplicationController.warnNoLicense": "Vous avez dépassé le nombre maximal de connexions simultanées aux éditeurs %1. Ce document sera ouvert en lecture seule.<br>Veuillez contacter le service des ventes %1 pour connaître les conditions de mise à niveau personnelle.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Vous avez dépassé le nombre maximal d’utilisateurs des éditeurs %1. Veuillez contacter l’équipe des ventes %1 pour connaître les conditions de mise à niveau personnelle.",
+  "DE.ApplicationView.textClear": "Effacer tous les champs",
+  "DE.ApplicationView.textNext": "Champ suivant",
+  "DE.ApplicationView.textSubmit": "Soumettre ",
   "DE.ApplicationView.txtDownload": "Télécharger",
   "DE.ApplicationView.txtDownloadDocx": "Télécharger en tant que docx",
   "DE.ApplicationView.txtDownloadPdf": "Télécharger en tant que pdf",
@@ -40,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier",
   "DE.ApplicationView.txtFullScreen": "Plein écran",
   "DE.ApplicationView.txtPrint": "Imprimer",
-  "DE.ApplicationView.txtShare": "Partager"
+  "DE.ApplicationView.txtShare": "Partager",
+  "DE.ApplicationView.txtTheme": "Thème d’interface"
 }

apps/documenteditor/forms/locale/it.json

@@ -14,21 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "Si è verificato un errore durante il lavoro con il documento.<br>Utilizzare l'opzione 'Scarica come ...' per salvare la copia di backup del file sul disco rigido del computer.",
   "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
   "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.<br>Per i dettagli, contatta l'amministratore del Document server.",
+  "DE.ApplicationController.errorForceSave": "Si è verificato un errore durante il salvataggio del file. Utilizzare l'opzione 'Scarica come' per salvare il file sul disco rigido del computer o riprovare più tardi.",
+  "DE.ApplicationController.errorLoadingFont": "I caratteri non sono caricati.<br>Si prega di contattare il tuo amministratore di Document Server.",
+  "DE.ApplicationController.errorServerVersion": "La versione dell'editor è stata aggiornata. La pagina verrà ricaricata per applicare le modifiche.",
   "DE.ApplicationController.errorSubmit": "Invio fallito.",
+  "DE.ApplicationController.errorUpdateVersion": "La versione del file è stata cambiata. La pagina verrà ricaricata.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.<br>Prima di poter continuare a lavorare, è necessario scaricare il file o copiarne il contenuto per assicurarsi che non vada perso nulla, successivamente ricaricare questa pagina.",
   "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avviso",
   "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",
-  "DE.ApplicationController.textClear": "‎Cancella tutti i campi‎",
+  "DE.ApplicationController.textAnonymous": "Anonimo",
+  "DE.ApplicationController.textBuyNow": "Visita il sito web",
+  "DE.ApplicationController.textCloseTip": "Clicca su per chiudere la notifica",
+  "DE.ApplicationController.textContactUs": "Contatta il team di vendita",
+  "DE.ApplicationController.textGotIt": "Capito",
+  "DE.ApplicationController.textGuest": "Ospite",
   "DE.ApplicationController.textLoadingDocument": "Caricamento del documento",
-  "DE.ApplicationController.textNext": "Campo successivo",
+  "DE.ApplicationController.textNoLicenseTitle": "E' stato raggiunto il limite della licenza",
   "DE.ApplicationController.textOf": "di",
-  "DE.ApplicationController.textSubmit": "‎Invia‎",
+  "DE.ApplicationController.textRequired": "Compila tutti i campi richiesti per inviare il modulo.",
   "DE.ApplicationController.textSubmited": "<b>Modulo inviato con successo</b><br>Fare click per chiudere la notifica</br>",
+  "DE.ApplicationController.titleServerVersion": "L'editor è stato aggiornato",
+  "DE.ApplicationController.titleUpdateVersion": "La versione è stata cambiata",
   "DE.ApplicationController.txtClose": "Chiudi",
+  "DE.ApplicationController.txtEmpty": "(Vuoto)",
+  "DE.ApplicationController.txtPressLink": "Premi CTRL e clicca sul collegamento",
   "DE.ApplicationController.unknownErrorText": "Errore sconosciuto.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Il tuo browser non è supportato.",
   "DE.ApplicationController.waitText": "Per favore, attendi...",
+  "DE.ApplicationController.warnLicenseExceeded": "Hai raggiunto il limite delle connessioni simultanee con gli editor %1. Questo documento verrà aperto solo per la visualizzazione.<br>Ti preghiamo di contattare il tuo amministratore per maggior informazioni.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Licenza è scaduta. <br>Non hai accesso alle funzionalità di modifica dei documenti.<br>Ti preghiamo di contattare l'amministratore.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "La licenza va rinnovata. <br>Hai un accesso limitato alle funzionalità di modifica dei documenti.<br>Ti preghiamo di contattare l'amministratore per ottenere l'accesso completo",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Hai raggiunto il limite degli utenti per gli editor %1. Ti preghiamo di contattare il tuo amministratore per maggior informazioni.",
+  "DE.ApplicationController.warnNoLicense": "Hai raggiunto il limite delle connessioni simultanee con gli editor %1. Questo documento verrà aperto solo per la visualizzazione.<br>Ti preghiamo di contattare il team di vendite di %1 per i termini di aggiornamento personali.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Hai raggiunto il limite degli utenti per gli editor %1. Ti preghiamo di contattare il team di vendite di %1 per i termini di aggiornamento personali.",
+  "DE.ApplicationView.textClear": "‎Cancellare tutti i campi‎",
+  "DE.ApplicationView.textNext": "Campo successivo",
+  "DE.ApplicationView.textSubmit": "‎Invia‎",
   "DE.ApplicationView.txtDownload": "Scarica",
   "DE.ApplicationView.txtDownloadDocx": "Scarica come .docx",
   "DE.ApplicationView.txtDownloadPdf": "Scarica come .pdf",
@@ -36,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Apri percorso file",
   "DE.ApplicationView.txtFullScreen": "Schermo intero",
   "DE.ApplicationView.txtPrint": "Stampa",
-  "DE.ApplicationView.txtShare": "Condividi"
+  "DE.ApplicationView.txtShare": "Condividi",
+  "DE.ApplicationView.txtTheme": "Tema dell'interfaccia"
 }

apps/documenteditor/forms/locale/ja.json

@@ -11,20 +11,34 @@
   "DE.ApplicationController.downloadTextText": "ドキュメントのダウンロード中...",
   "DE.ApplicationController.errorAccessDeny": "利用権限がない操作をしようとしました。<br>Documentサーバー管理者に連絡してください。",
   "DE.ApplicationController.errorDefaultMessage": "エラー コード: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "ドキュメントの作業中にエラーが発生しました。<br>「名前を付けてダウンロード」オプションを使用して、ファイルのバックアップコピーをコンピュータに保存します。",
   "DE.ApplicationController.errorFilePassProtect": "ドキュメントがパスワードで保護されているため開くことができません",
   "DE.ApplicationController.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。<br>Documentサーバー管理者に詳細をお問い合わせください。",
+  "DE.ApplicationController.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「...としてダウンロード」を使用し、または後で再お試しください。",
+  "DE.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。文書サーバのアドミニストレータを連絡してください。",
+  "DE.ApplicationController.errorSubmit": "送信に失敗しました。",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして、変更が消えてしまわないようにしてからページを再読み込みしてください。",
   "DE.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
   "DE.ApplicationController.scriptLoadError": "接続が非常に遅いため、いくつかのコンポーネントはロードされませんでした。ページを再読み込みしてください。",
+  "DE.ApplicationController.textAnonymous": "匿名",
+  "DE.ApplicationController.textGotIt": "OK",
+  "DE.ApplicationController.textGuest": "ゲスト",
   "DE.ApplicationController.textLoadingDocument": "ドキュメントを読み込んでいます",
   "DE.ApplicationController.textOf": "から",
+  "DE.ApplicationController.textRequired": "必須事項をすべて入力し、送信してください。",
+  "DE.ApplicationController.textSubmited": "<b>フォームが正常に送信されました。</b><br>クリックしてヒントを閉じます。",
   "DE.ApplicationController.txtClose": "閉じる",
+  "DE.ApplicationController.txtEmpty": "(空)",
+  "DE.ApplicationController.txtPressLink": "リンクをクリックしてCTRLを押してください",
   "DE.ApplicationController.unknownErrorText": "不明なエラー",
-  "DE.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザがサポートされていません。",
+  "DE.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザはサポートされていません。",
   "DE.ApplicationController.waitText": "少々お待ちください...",
   "DE.ApplicationView.txtDownload": "ダウンロード",
+  "DE.ApplicationView.txtDownloadDocx": "docxとして保存",
+  "DE.ApplicationView.txtDownloadPdf": "PDFとして保存",
   "DE.ApplicationView.txtEmbed": "埋め込み",
+  "DE.ApplicationView.txtFileLocation": "ファイルを開く",
   "DE.ApplicationView.txtFullScreen": "全画面表示",
   "DE.ApplicationView.txtPrint": "印刷する",
   "DE.ApplicationView.txtShare": "シェア"

apps/documenteditor/forms/locale/ko.json

@@ -1,6 +1,6 @@
 {
   "common.view.modals.txtCopy": "클립보드로 복사",
-  "common.view.modals.txtEmbed": "개체 삽입",
+  "common.view.modals.txtEmbed": "퍼가기",
   "common.view.modals.txtHeight": "높이",
   "common.view.modals.txtShare": "링크 공유",
   "common.view.modals.txtWidth": "너비",
@@ -10,21 +10,54 @@
   "DE.ApplicationController.downloadErrorText": "다운로드 실패",
   "DE.ApplicationController.downloadTextText": "문서 다운로드 중...",
   "DE.ApplicationController.errorAccessDeny": "권한이없는 작업을 수행하려고합니다. <br> Document Server 관리자에게 문의하십시오.",
-  "DE.ApplicationController.errorDefaultMessage": "오류 코드: %1",
-  "DE.ApplicationController.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.",
+  "DE.ApplicationController.errorDefaultMessage": "오류 코드 : % 1",
+  "DE.ApplicationController.errorEditingDownloadas": "  문서 작업 중에 알수 없는 장애가 발생했습니다.<br>  \"다른 이름으로 다운로드...\"를 선택하여 파일을 현재 사용 중인 컴퓨터 하드 디스크에 저장하시기 바랍니다.",
+  "DE.ApplicationController.errorFilePassProtect": "이 문서는 암호로 보호되어 있어 열 수 없습니다.",
   "DE.ApplicationController.errorFileSizeExceed": "파일의 크기가 서버에서 정해진 범위를 초과 했습니다. 문서 서버 관리자에게 해당 내용에 대한 자세한 안내를 받아 보시기 바랍니다.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "인터넷 연결이 복구 되었으며 파일에 수정 사항이 발생되었습니다. 작업을 계속 하시기 전에 반드시 기존의 파일을 다운로드하거나 내용을 복사해서 작업 내용을 잃어 버리는 일이 없도록 한 후에 이 페이지를 새로 고침(reload) 해 주시기 바랍니다.",
+  "DE.ApplicationController.errorForceSave": "파일을 저장하는 동안 오류가 발생했습니다. \"다른 이름으로 다운로드\" 옵션을 사용하여 파일을 컴퓨터의 하드 드라이브에 저장하거나 나중에 다시 시도하십시오.",
+  "DE.ApplicationController.errorLoadingFont": "글꼴이 로드되지 않았습니다. <br>문서 관리 관리자에게 문의하십시오.",
+  "DE.ApplicationController.errorServerVersion": "편집기 버전이 업데이트되었습니다. 페이지가 다시로드되어 변경 사항이 적용됩니다.",
+  "DE.ApplicationController.errorSubmit": "전송실패",
+  "DE.ApplicationController.errorUpdateVersion": "파일 버전이 변경되었습니다. 페이지가 다시로드됩니다.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "네트워크 연결이 복원되었으며 파일 버전이 변경되었습니다. <br>계속 작업하기 전에 데이터 손실을 방지하기 위해 파일을 다운로드하거나 내용을 복사한 다음 이 페이지를 새로 고쳐야 합니다.",
   "DE.ApplicationController.errorUserDrop": "파일에 지금 액세스 할 수 없습니다.",
   "DE.ApplicationController.notcriticalErrorTitle": "경고",
   "DE.ApplicationController.scriptLoadError": "연결 속도가 느려, 일부 요소들이 로드되지 않았습니다. 페이지를 다시 새로 고침해주세요.",
+  "DE.ApplicationController.textAnonymous": "익명",
+  "DE.ApplicationController.textBuyNow": "웹 사이트 방문",
+  "DE.ApplicationController.textCloseTip": "팁을 닫으려면 클릭합니다.",
+  "DE.ApplicationController.textContactUs": "영업 담당자에게 문의",
+  "DE.ApplicationController.textGotIt": "취득",
+  "DE.ApplicationController.textGuest": "게스트",
   "DE.ApplicationController.textLoadingDocument": "문서 로드 중",
+  "DE.ApplicationController.textNoLicenseTitle": "ONLYOFFICE 연결 제한",
   "DE.ApplicationController.textOf": "의",
+  "DE.ApplicationController.textRequired": "양식을 보내려면 모든 필수 필드를 채우십시오.",
+  "DE.ApplicationController.textSubmited": "<b>양식이 성공적으로 전송되었습니다.</b><br>여기를 클릭하여 프롬프트를 닫으십시오",
+  "DE.ApplicationController.titleServerVersion": "편집기가 업데이트되었습니다.",
+  "DE.ApplicationController.titleUpdateVersion": "버전이 변경되었습니다.",
   "DE.ApplicationController.txtClose": "닫기",
-  "DE.ApplicationController.unknownErrorText": "알 수없는 오류.",
+  "DE.ApplicationController.txtEmpty": "(없음)",
+  "DE.ApplicationController.txtPressLink": "CTRL 키를 누른 상태에서 링크 클릭",
+  "DE.ApplicationController.unknownErrorText": "알 수 없는 오류.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "사용중인 브라우저가 지원되지 않습니다.",
-  "DE.ApplicationController.waitText": "잠시만 기달려주세요...",
+  "DE.ApplicationController.waitText": "잠시만 기다려주세요...",
+  "DE.ApplicationController.warnLicenseExceeded": "귀하의 시스템은 동시에 연결을 편집하는 %1명의 편집자에게 도달했습니다. 이 문서는 보기 모드에서만 열 수 있습니다. <br> 자세한 내용은 관리자에게 문의하십시오.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "라이센스가 만료되었습니다.<br>더 이상 파일을 수정할 수 있는 권한이 없습니다.<br> 관리자에게 문의하세요.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "라이센스를 갱신해야합니다. <br> 문서 편집 기능에 대한 액세스가 제한되어 있습니다. <br> 전체 액세스 권한을 얻으려면 관리자에게 문의하십시오",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "편집자 사용자 한도인 %1명에 도달했습니다. 자세한 내용은 관리자에게 문의하십시오.",
+  "DE.ApplicationController.warnNoLicense": "이 버전의 %1 편집자는 문서 서버에 대한 동시 연결에 특정 제한 사항이 있습니다. <br> 더 많은 정보가 필요하면 현재 라이센스를 업그레이드하거나 상업용 라이센스를 구입하십시오.",
+  "DE.ApplicationController.warnNoLicenseUsers": "ONLYOFFICE 편집자의이 버전은 동시 사용자에게 일정한 제한이 있습니다. <br> 더 필요한 것이 있으면 현재 라이센스를 업그레이드하거나 상용 라이센스를 구입하십시오.",
+  "DE.ApplicationView.textClear": "모든 필드 지우기",
+  "DE.ApplicationView.textNext": "다음 필드",
+  "DE.ApplicationView.textSubmit": "전송",
   "DE.ApplicationView.txtDownload": "다운로드 ",
-  "DE.ApplicationView.txtEmbed": "개체 삽입",
+  "DE.ApplicationView.txtDownloadDocx": "docx 형식으로 다운로드",
+  "DE.ApplicationView.txtDownloadPdf": "PDF형식으로 다운로드",
+  "DE.ApplicationView.txtEmbed": "퍼가기",
+  "DE.ApplicationView.txtFileLocation": "파일 위치 열기",
   "DE.ApplicationView.txtFullScreen": "전체 화면",
-  "DE.ApplicationView.txtShare": "공유"
+  "DE.ApplicationView.txtPrint": "인쇄",
+  "DE.ApplicationView.txtShare": "공유",
+  "DE.ApplicationView.txtTheme": "인터페이스 테마"
 }

apps/documenteditor/forms/locale/lo.json

@@ -19,11 +19,8 @@
   "DE.ApplicationController.errorUserDrop": "ບໍ່ສາມາດເຂົ້າເຖິງຟາຍໄດ້",
   "DE.ApplicationController.notcriticalErrorTitle": "ເຕືອນ",
   "DE.ApplicationController.scriptLoadError": "ການເຊື່ອມຕໍ່ອິນເຕີເນັດຊ້າເກີນໄປ, ບາງອົງປະກອບບໍ່ສາມາດໂຫຼດໄດ້. ກະລຸນາໂຫຼດໜ້ານີ້ຄືນໃໝ່",
-  "DE.ApplicationController.textClear": "ລຶບລ້າງຟີລທັງໝົດ",
   "DE.ApplicationController.textLoadingDocument": "ກຳລັງໂຫຼດເອກະສານ",
-  "DE.ApplicationController.textNext": "ຟີລທັດໄປ",
   "DE.ApplicationController.textOf": "ຂອງ",
-  "DE.ApplicationController.textSubmit": "ສົ່ງອອກ",
   "DE.ApplicationController.textSubmited": "<b> ແບບຟອມທີ່ສົ່ງມາແລ້ວ",
   "DE.ApplicationController.txtClose": " ປິດ",
   "DE.ApplicationController.unknownErrorText": "ມີຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ",

apps/documenteditor/forms/locale/nl.json

@@ -20,14 +20,11 @@
   "DE.ApplicationController.notcriticalErrorTitle": "Waarschuwing",
   "DE.ApplicationController.scriptLoadError": "De verbinding is te langzaam, sommige componenten konden niet geladen worden. Laad de pagina opnieuw.",
   "DE.ApplicationController.textAnonymous": "Anoniem",
-  "DE.ApplicationController.textClear": "Wis Alle Velden",
   "DE.ApplicationController.textGotIt": "OK",
   "DE.ApplicationController.textGuest": "Gast",
   "DE.ApplicationController.textLoadingDocument": "Document wordt geladen",
-  "DE.ApplicationController.textNext": "Volgend veld ",
   "DE.ApplicationController.textOf": "van",
   "DE.ApplicationController.textRequired": "Vul alle verplichte velden in om het formulier te verzenden.",
-  "DE.ApplicationController.textSubmit": "Verzenden ",
   "DE.ApplicationController.textSubmited": "<b>Formulier succesvol ingediend</b><br>Klik om de tip te sluiten",
   "DE.ApplicationController.txtClose": "Sluiten",
   "DE.ApplicationController.unknownErrorText": "Onbekende fout.",

apps/documenteditor/forms/locale/pl.json

@@ -9,22 +9,35 @@
   "DE.ApplicationController.criticalErrorTitle": "Błąd",
   "DE.ApplicationController.downloadErrorText": "Pobieranie nieudane.",
   "DE.ApplicationController.downloadTextText": "Pobieranie dokumentu...",
-  "DE.ApplicationController.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.<br>Proszę skontaktować się z administratorem serwera dokumentów.",
+  "DE.ApplicationController.errorAccessDeny": "Próbujesz wykonać działanie, do którego nie masz uprawnień.<br>Proszę skontaktować się ze swoim administratorem Serwera Dokumentów.",
   "DE.ApplicationController.errorDefaultMessage": "Kod błędu: %1",
-  "DE.ApplicationController.errorFilePassProtect": "Dokument jest chroniony hasłem i nie może być otwarty.",
-  "DE.ApplicationController.errorFileSizeExceed": "Rozmiar pliku przekracza dopuszczone limit dla twojego serwera.<br>Prosimy o kontakt z administratorem twojego serwera w celu uzyskania szczegółowych informacji.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Połączenie z internetem zostało odzyskane, a wersja pliku uległa zmianie.<br>Zanim będzie mógł kontynuować pracę, musisz pobrać plik albo skopiować jego zawartość, aby mieć pewność, że nic nie zostało utracone, a następnie odświeżyć stronę.",
+  "DE.ApplicationController.errorEditingDownloadas": "Wystąpił błąd podczas pracy z dokumentem.<br>Użyj opcji \"Pobierz jako...\", aby zapisać kopię zapasową pliku na dysku twardym komputera.",
+  "DE.ApplicationController.errorFilePassProtect": "Dokument jest chroniony hasłem i nie może zostać otwarty.",
+  "DE.ApplicationController.errorFileSizeExceed": "Rozmiar pliku przekracza dopuszczone limit ustawiony dla twojego serwera.<br>Prosimy o kontakt z administratorem twojego serwera w celu uzyskania szczegółowych informacji.",
+  "DE.ApplicationController.errorForceSave": "Wystąpił błąd podczas zapisywania pliku. Użyj opcji \"Pobierz jako\", aby zapisać plik na dysku twardym komputera lub spróbuj poźniej zapisać plik ponownie.",
+  "DE.ApplicationController.errorLoadingFont": "Czcionki nie zostały załadowane.<br>Skontaktuj się z administratorem Serwera Dokumentów.",
+  "DE.ApplicationController.errorSubmit": "Przesyłanie nie powiodło się.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Połączenie z internetem zostało odzyskane, a wersja pliku uległa zmianie.<br>Zanim będziesz mógł kontynuować pracę, musisz pobrać plik albo skopiować jego zawartość, aby mieć pewność, że nic nie zostało utracone, a następnie odświeżyć stronę.",
   "DE.ApplicationController.errorUserDrop": "Nie można uzyskać dostępu do tego pliku.",
   "DE.ApplicationController.notcriticalErrorTitle": "Ostrzeżenie",
-  "DE.ApplicationController.scriptLoadError": "Połączenie jest zbyt wolne, niektóre komponenty mogą być niezaładowane. Prosimy odświeżyć stronę.",
-  "DE.ApplicationController.textLoadingDocument": "Ładowanie dokumentu",
+  "DE.ApplicationController.scriptLoadError": "Połączenie jest zbyt wolne, niektóre komponenty mogą być niezaładowane. Proszę odświeżyć stronę.",
+  "DE.ApplicationController.textAnonymous": "Anonimowy użytkownik ",
+  "DE.ApplicationController.textGuest": "Gość",
+  "DE.ApplicationController.textLoadingDocument": "Wgrywanie dokumentu",
   "DE.ApplicationController.textOf": "z",
+  "DE.ApplicationController.textRequired": "Wypełnij wszystkie wymagane pola, aby wysłać formularz.",
+  "DE.ApplicationController.textSubmited": "</b>Formularz załączony poprawnie</b><br>Kliknij aby zamknąć podpowiedź.",
   "DE.ApplicationController.txtClose": "Zamknij",
+  "DE.ApplicationController.txtEmpty": "(Pusty)",
+  "DE.ApplicationController.txtPressLink": "Naciśnij Ctrl i kliknij w link",
   "DE.ApplicationController.unknownErrorText": "Nieznany błąd.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Twoja przeglądarka nie jest wspierana.",
   "DE.ApplicationController.waitText": "Proszę czekać...",
   "DE.ApplicationView.txtDownload": "Pobierz",
+  "DE.ApplicationView.txtDownloadDocx": "Pobierz jako docx",
+  "DE.ApplicationView.txtDownloadPdf": "Pobierz jako pdf",
   "DE.ApplicationView.txtEmbed": "Osadź",
+  "DE.ApplicationView.txtFileLocation": "Otwórz miejsce lokalizacji pliku",
   "DE.ApplicationView.txtFullScreen": "Pełny ekran",
   "DE.ApplicationView.txtPrint": "Drukuj",
   "DE.ApplicationView.txtShare": "Udostępnij"

apps/documenteditor/forms/locale/pt.json

@@ -1,5 +1,5 @@
 {
-  "common.view.modals.txtCopy": "Copiar para a área de transferência",
+  "common.view.modals.txtCopy": "Copiar para a área de trabalho",
   "common.view.modals.txtEmbed": "Incorporar",
   "common.view.modals.txtHeight": "Altura",
   "common.view.modals.txtShare": "Compartilhar link",
@@ -7,38 +7,57 @@
   "DE.ApplicationController.convertationErrorText": "Conversão falhou.",
   "DE.ApplicationController.convertationTimeoutText": "Tempo limite de conversão excedido.",
   "DE.ApplicationController.criticalErrorTitle": "Erro",
-  "DE.ApplicationController.downloadErrorText": "Transferência falhou.",
-  "DE.ApplicationController.downloadTextText": "Transferindo documento...",
-  "DE.ApplicationController.errorAccessDeny": "Você está tentando executar uma ação para a qual não tem direitos.<br>Entre em contato com o administrador do Document Server.",
+  "DE.ApplicationController.downloadErrorText": "Download falhou.",
+  "DE.ApplicationController.downloadTextText": "Baixando documento...",
+  "DE.ApplicationController.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.ApplicationController.errorDefaultMessage": "Código do erro: %1",
-  "DE.ApplicationController.errorEditingDownloadas": "Ocorreu um erro durante o trabalho com o documento.<br>Utilizar a opção 'Download as...' para salvar a cópia de backup do arquivo no disco rígido do seu computador.",
+  "DE.ApplicationController.errorEditingDownloadas": "Ocorreu um erro. <br> Use a opção 'Transferir como...' para gravar a cópia de backup em seu computador.",
   "DE.ApplicationController.errorFilePassProtect": "O documento é protegido por senha e não pode ser aberto.",
   "DE.ApplicationController.errorFileSizeExceed": "O tamanho do arquivo excede o limite de seu servidor. <br> Por favor, contate seu administrador de Servidor de Documentos para detalhes.",
+  "DE.ApplicationController.errorForceSave": "Ocorreu um erro na gravação. Favor utilizar a opção 'Baixar como' para gravar o arquivo em seu computador ou tente novamente mais tarde.",
+  "DE.ApplicationController.errorLoadingFont": "As fontes não foram carregadas. <br> Entre em contato com o administrador do Document Server.",
+  "DE.ApplicationController.errorServerVersion": "A versão do editor foi atualizada. A página será recarregada para aplicar as alterações.",
   "DE.ApplicationController.errorSubmit": "Falha no envio.",
+  "DE.ApplicationController.errorUpdateVersion": "A versão do arquivo foi alterada. A página será recarregada.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A conexão à internet foi restabelecida, e a versão do arquivo foi alterada. <br> Antes de continuar seu trabalho, transfira o arquivo ou copie seu conteúdo para assegurar que nada seja perdido, e então, recarregue esta página.",
   "DE.ApplicationController.errorUserDrop": "O arquivo não pode ser acessado agora.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
   "DE.ApplicationController.scriptLoadError": "A conexão está muito lenta, e alguns dos componentes não puderam ser carregados. Por favor, recarregue a página.",
   "DE.ApplicationController.textAnonymous": "Anônimo",
-  "DE.ApplicationController.textClear": "Limpar todos os campos",
+  "DE.ApplicationController.textBuyNow": "Visitar website",
+  "DE.ApplicationController.textCloseTip": "Clique para fechar a dica.",
+  "DE.ApplicationController.textContactUs": "Entre em contato com o departamento de vendas",
   "DE.ApplicationController.textGotIt": "Entendi",
-  "DE.ApplicationController.textGuest": "Convidado(a)",
+  "DE.ApplicationController.textGuest": "Convidado",
   "DE.ApplicationController.textLoadingDocument": "Carregando documento",
-  "DE.ApplicationController.textNext": "Próximo campo",
+  "DE.ApplicationController.textNoLicenseTitle": "Limite de licença atingido",
   "DE.ApplicationController.textOf": "de",
   "DE.ApplicationController.textRequired": "Preencha todos os campos obrigatórios para enviar o formulário.",
-  "DE.ApplicationController.textSubmit": "Enviar",
   "DE.ApplicationController.textSubmited": "<b>Formulário apresentado com sucesso</b>>br>Click para fechar a ponta",
-  "DE.ApplicationController.txtClose": "Fechar",
+  "DE.ApplicationController.titleServerVersion": "Editor atualizado",
+  "DE.ApplicationController.titleUpdateVersion": "Versão alterada",
+  "DE.ApplicationController.txtClose": "Encerrar",
+  "DE.ApplicationController.txtEmpty": "(Vazio)",
+  "DE.ApplicationController.txtPressLink": "Pressione CTRL e clique no link",
   "DE.ApplicationController.unknownErrorText": "Erro desconhecido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Seu navegador não é suportado.",
-  "DE.ApplicationController.waitText": "Aguarde...",
-  "DE.ApplicationView.txtDownload": "Transferir",
+  "DE.ApplicationController.waitText": "Por favor, aguarde...",
+  "DE.ApplicationController.warnLicenseExceeded": "Você atingiu o limite de conexões simultâneas para editores %1. Este documento será aberto apenas para visualização.<br>Entre em contato com seu administrador para saber mais.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "A licença expirou.<br>Você não tem acesso à funcionalidade de edição de documentos.<br>Por favor, contate seu administrador.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "A licença precisa ser renovada. <br> Você tem acesso limitado à funcionalidade de edição de documentos. <br> Entre em contato com o administrador para obter acesso total.",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Você atingiu o limite de usuários para editores %1. Entre em contato com seu administrador para saber mais.",
+  "DE.ApplicationController.warnNoLicense": "Você atingiu o limite de conexões simultâneas para editores %1. Este documento será aberto apenas para visualização.<br>Entre em contato com a equipe de vendas da %1 para obter os termos de atualização pessoais.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Você atingiu o limite de usuários para editores %1.<br>Entre em contato com a equipe de vendas da %1 para obter os termos de atualização pessoais.",
+  "DE.ApplicationView.textClear": "Limpar todos os campos",
+  "DE.ApplicationView.textNext": "Próximo campo",
+  "DE.ApplicationView.textSubmit": "Enviar",
+  "DE.ApplicationView.txtDownload": "Baixar",
   "DE.ApplicationView.txtDownloadDocx": "Baixar como docx",
   "DE.ApplicationView.txtDownloadPdf": "Baixar como pdf",
   "DE.ApplicationView.txtEmbed": "Incorporar",
   "DE.ApplicationView.txtFileLocation": "Local do arquivo aberto",
   "DE.ApplicationView.txtFullScreen": "Tela cheia",
   "DE.ApplicationView.txtPrint": "Imprimir",
-  "DE.ApplicationView.txtShare": "Compartilhar"
+  "DE.ApplicationView.txtShare": "Compartilhar",
+  "DE.ApplicationView.txtTheme": "Tema de interface"
 }

apps/documenteditor/forms/locale/ro.json

@@ -14,25 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.<br>Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca...",
   "DE.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
+  "DE.ApplicationController.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
+  "DE.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
+  "DE.ApplicationController.errorServerVersion": "Editorul a fost actualizat. Pagina va fi reîmprospătată pentru a aplica această actualizare.",
   "DE.ApplicationController.errorSubmit": "Remiterea eșuată.",
+  "DE.ApplicationController.errorUpdateVersion": "Versiunea fișierului s-a modificat. Pagina va fi reîmprospătată.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea la Internet s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",
   "DE.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
   "DE.ApplicationController.notcriticalErrorTitle": "Avertisment",
   "DE.ApplicationController.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.",
   "DE.ApplicationController.textAnonymous": "Anonim",
-  "DE.ApplicationController.textClear": "Goleşte toate câmpurile",
+  "DE.ApplicationController.textBuyNow": "Vizitarea site-ul Web",
+  "DE.ApplicationController.textCloseTip": "Faceţi clic pentru a închide sfatul.",
+  "DE.ApplicationController.textContactUs": "Contactați Departamentul de Vânzări",
   "DE.ApplicationController.textGotIt": "Am înțeles",
   "DE.ApplicationController.textGuest": "Invitat",
   "DE.ApplicationController.textLoadingDocument": "Încărcare document",
-  "DE.ApplicationController.textNext": "Câmpul următor",
+  "DE.ApplicationController.textNoLicenseTitle": "Ați atins limita stabilită de licență",
   "DE.ApplicationController.textOf": "din",
   "DE.ApplicationController.textRequired": "Toate câmpurile din formular trebuie completate înainte de a-l trimite.",
-  "DE.ApplicationController.textSubmit": "Remitere",
   "DE.ApplicationController.textSubmited": "<b>Formularul a fost remis cu succes</b><br>Faceţi clic pentru a închide sfatul",
+  "DE.ApplicationController.titleServerVersion": "Editorul a fost actualizat",
+  "DE.ApplicationController.titleUpdateVersion": "Versiunea s-a modificat",
   "DE.ApplicationController.txtClose": "Închidere",
+  "DE.ApplicationController.txtEmpty": "(Gol)",
+  "DE.ApplicationController.txtPressLink": "Apăsați Ctrl și faceți clic pe linkul",
   "DE.ApplicationController.unknownErrorText": "Eroare necunoscută.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Browserul nu este compatibil.",
   "DE.ApplicationController.waitText": "Vă rugăm să așteptați...",
+  "DE.ApplicationController.warnLicenseExceeded": "Ați atins numărul maxim de conexiuni simultane la %1 de editoare. Documentul este disponibil numai pentru vizualizare.<br>Pentru detalii, contactați administratorul dvs.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Licența dvs. a expirat.<br>Nu aveți acces la funcții de editare a documentului.<br>Contactați administratorul dvs. de rețeea.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "Licență urmează să fie reînnoită.<br>Funcțiile de editare sunt cu acces limitat.<br>Pentru a obține acces nelimitat, contactați administratorul dvs. de rețea.",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Ați atins numărul maxim de utilizatori ai %1 editoare. Pentru detalii, contactați administratorul dvs.",
+  "DE.ApplicationController.warnNoLicense": "Ați atins numărul maxim de conexiuni simultane la %1 de editoare. Documentul este disponibil numai pentru vizualizare.<br>Contactați %1 Departamentul de Vânzări pentru acordarea condițiilor personale de licențiere.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Ați atins numărul maxim de utilizatori ai %1 editoare. Contactați Grup Vânzări %1 pentru acordarea condițiilor personale de licențiere.",
+  "DE.ApplicationView.textClear": "Goleşte toate câmpurile",
+  "DE.ApplicationView.textNext": "Câmpul următor",
+  "DE.ApplicationView.textSubmit": "Remitere",
   "DE.ApplicationView.txtDownload": "Descărcare",
   "DE.ApplicationView.txtDownloadDocx": "Descărcare ca docx",
   "DE.ApplicationView.txtDownloadPdf": "Descărcare ca pdf",
@@ -40,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Deschidere locația fișierului",
   "DE.ApplicationView.txtFullScreen": "Ecran complet",
   "DE.ApplicationView.txtPrint": "Imprimare",
-  "DE.ApplicationView.txtShare": "Partajează"
+  "DE.ApplicationView.txtShare": "Partajează",
+  "DE.ApplicationView.txtTheme": "Tema interfeței"
 }

apps/documenteditor/forms/locale/ru.json

@@ -14,25 +14,43 @@
   "DE.ApplicationController.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.<br>Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.",
   "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
   "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.<br>Обратитесь к администратору Сервера документов для получения дополнительной информации.",
+  "DE.ApplicationController.errorForceSave": "При сохранении файла произошла ошибка. Используйте опцию 'Скачать как', чтобы сохранить файл на жестком диске компьютера или повторите попытку позже.",
+  "DE.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
+  "DE.ApplicationController.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
   "DE.ApplicationController.errorSubmit": "Не удалось отправить.",
+  "DE.ApplicationController.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",
   "DE.ApplicationController.textAnonymous": "Анонимный пользователь",
-  "DE.ApplicationController.textClear": "Очистить все поля",
+  "DE.ApplicationController.textBuyNow": "Перейти на сайт",
+  "DE.ApplicationController.textCloseTip": "Нажмите, чтобы закрыть подсказку.",
+  "DE.ApplicationController.textContactUs": "Связаться с отделом продаж",
   "DE.ApplicationController.textGotIt": "ОК",
   "DE.ApplicationController.textGuest": "Гость",
   "DE.ApplicationController.textLoadingDocument": "Загрузка документа",
-  "DE.ApplicationController.textNext": "Следующее поле",
+  "DE.ApplicationController.textNoLicenseTitle": "Лицензионное ограничение",
   "DE.ApplicationController.textOf": "из",
   "DE.ApplicationController.textRequired": "Заполните все обязательные поля для отправки формы.",
-  "DE.ApplicationController.textSubmit": "Отправить",
   "DE.ApplicationController.textSubmited": "<b>Форма успешно отправлена</b><br>Нажмите, чтобы закрыть подсказку",
+  "DE.ApplicationController.titleServerVersion": "Редактор обновлен",
+  "DE.ApplicationController.titleUpdateVersion": "Версия изменилась",
   "DE.ApplicationController.txtClose": "Закрыть",
+  "DE.ApplicationController.txtEmpty": "(Пусто)",
+  "DE.ApplicationController.txtPressLink": "Нажмите CTRL и щелкните по ссылке",
   "DE.ApplicationController.unknownErrorText": "Неизвестная ошибка.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
   "DE.ApplicationController.waitText": "Пожалуйста, подождите...",
+  "DE.ApplicationController.warnLicenseExceeded": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт только на просмотр.<br>Свяжитесь с администратором, чтобы узнать больше.",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Истек срок действия лицензии.<br>Нет доступа к функциональности редактирования документов.<br>Пожалуйста, обратитесь к администратору.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "Необходимо обновить лицензию.<br>У вас ограниченный доступ к функциональности редактирования документов.<br>Пожалуйста, обратитесь к администратору, чтобы получить полный доступ",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "Вы достигли лимита на количество пользователей редакторов %1. Свяжитесь с администратором, чтобы узнать больше.",
+  "DE.ApplicationController.warnNoLicense": "Вы достигли лимита на одновременные подключения к редакторам %1. Этот документ будет открыт на просмотр.<br>Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия лицензирования.",
+  "DE.ApplicationController.warnNoLicenseUsers": "Вы достигли лимита на количество пользователей редакторов %1. Напишите в отдел продаж %1, чтобы обсудить индивидуальные условия обновления.",
+  "DE.ApplicationView.textClear": "Очистить все поля",
+  "DE.ApplicationView.textNext": "Следующее поле",
+  "DE.ApplicationView.textSubmit": "Отправить",
   "DE.ApplicationView.txtDownload": "Скачать файл",
   "DE.ApplicationView.txtDownloadDocx": "Скачать как docx",
   "DE.ApplicationView.txtDownloadPdf": "Скачать как pdf",
@@ -40,5 +58,6 @@
   "DE.ApplicationView.txtFileLocation": "Открыть расположение файла",
   "DE.ApplicationView.txtFullScreen": "Во весь экран",
   "DE.ApplicationView.txtPrint": "Печать",
-  "DE.ApplicationView.txtShare": "Поделиться"
+  "DE.ApplicationView.txtShare": "Поделиться",
+  "DE.ApplicationView.txtTheme": "Тема интерфейса"
 }

apps/documenteditor/forms/locale/sk.json

@@ -11,21 +11,49 @@
   "DE.ApplicationController.downloadTextText": "Sťahovanie dokumentu...",
   "DE.ApplicationController.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.<br>Prosím, kontaktujte svojho správcu dokumentového servera.",
   "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "Pri práci s dokumentom došlo k chybe.<br>Použite voľbu \"Stiahnuť ako...\" a uložte si záložnú kópiu súboru na svoj počítač.",
   "DE.ApplicationController.errorFilePassProtect": "Dokument je chránený heslom a nie je možné ho otvoriť.",
   "DE.ApplicationController.errorFileSizeExceed": "Veľkosť súboru prekračuje limity vášho servera.<br> Kontaktujte prosím vášho správcu dokumentového servera o ďalšie podrobnosti.",
+  "DE.ApplicationController.errorForceSave": "Pri ukladaní súboru sa vyskytla chyba. Ak chcete súbor uložiť na pevný disk počítača, použite možnosť 'Prevziať ako' alebo to skúste znova neskôr.",
+  "DE.ApplicationController.errorLoadingFont": "Fonty sa nenahrali.<br>Kontaktujte prosím svojho administrátora Servera dokumentov.",
+  "DE.ApplicationController.errorServerVersion": "Verzia editora bola aktualizovaná. Stránka sa opätovne načíta, aby sa vykonali zmeny.",
+  "DE.ApplicationController.errorSubmit": "Odoslanie sa nepodarilo.",
+  "DE.ApplicationController.errorUpdateVersion": "Verzia súboru bola zmenená. Stránka sa znova načíta.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetové spojenie bolo obnovené a verzia súboru bola zmenená.<br>Predtým, než budete pokračovať v práci, potrebujete si stiahnuť súbor alebo kópiu jeho obsahu, aby sa nič nestratilo. Potom znovu načítajte stránku.",
   "DE.ApplicationController.errorUserDrop": "K súboru nie je možné práve teraz získať prístup.",
   "DE.ApplicationController.notcriticalErrorTitle": "Upozornenie",
   "DE.ApplicationController.scriptLoadError": "Spojenie je príliš pomalé, niektoré komponenty nemožno nahrať. Obnovte prosím stránku.",
+  "DE.ApplicationController.textAnonymous": "Anonymný",
+  "DE.ApplicationController.textBuyNow": "Navštíviť webovú stránku",
+  "DE.ApplicationController.textCloseTip": "Kliknite na zatvorenie tipu.",
+  "DE.ApplicationController.textContactUs": "Kontaktujte predajcu",
+  "DE.ApplicationController.textGotIt": "Pochopil/a som",
+  "DE.ApplicationController.textGuest": "Hosť",
   "DE.ApplicationController.textLoadingDocument": "Načítavanie dokumentu",
+  "DE.ApplicationController.textNoLicenseTitle": "Bol dosiahnutý limit licencie",
   "DE.ApplicationController.textOf": "z",
+  "DE.ApplicationController.textRequired": "Vyplňte všetky požadované polia, aby ste formulár mohli odoslať.",
+  "DE.ApplicationController.textSubmited": "<b>Formulár bol úspešne predložený</b><br>Kliknite, aby ste tip zatvorili",
+  "DE.ApplicationController.titleServerVersion": "Editor bol aktualizovaný",
+  "DE.ApplicationController.titleUpdateVersion": "Verzia bola zmenená",
   "DE.ApplicationController.txtClose": "Zatvoriť",
+  "DE.ApplicationController.txtEmpty": "(Prázdne)",
+  "DE.ApplicationController.txtPressLink": "Stlačte CTRL a kliknite na odkaz",
   "DE.ApplicationController.unknownErrorText": "Neznáma chyba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Váš prehliadač nie je podporovaný.",
   "DE.ApplicationController.waitText": "Prosím čakajte...",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "Licencia vypršala.<br>K funkcii úprav dokumentu už nemáte prístup.<br>Kontaktujte svojho administrátora, prosím.",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "Je potrebné obnoviť licenciu.<br>K funkciám úprav dokumentov máte obmedzený prístup.<br>Pre získanie úplného prístupu kontaktujte prosím svojho administrátora.",
+  "DE.ApplicationView.textClear": "Vyčistiť všetky polia",
+  "DE.ApplicationView.textNext": "Nasledujúce pole",
+  "DE.ApplicationView.textSubmit": "Odoslať",
   "DE.ApplicationView.txtDownload": "Stiahnuť",
+  "DE.ApplicationView.txtDownloadDocx": "Stiahnuť ako docx",
+  "DE.ApplicationView.txtDownloadPdf": "Stiahnuť ako pdf",
   "DE.ApplicationView.txtEmbed": "Vložiť",
+  "DE.ApplicationView.txtFileLocation": "Otvoriť umiestnenie súboru",
   "DE.ApplicationView.txtFullScreen": "Celá obrazovka",
   "DE.ApplicationView.txtPrint": "Tlačiť",
-  "DE.ApplicationView.txtShare": "Zdieľať"
+  "DE.ApplicationView.txtShare": "Zdieľať",
+  "DE.ApplicationView.txtTheme": "Téma rozhrania"
 }

apps/documenteditor/forms/locale/sl.json

@@ -19,11 +19,8 @@
   "DE.ApplicationController.errorUserDrop": "Do datoteke v tem trenutku ni možno dostopati.",
   "DE.ApplicationController.notcriticalErrorTitle": "Opozorilo",
   "DE.ApplicationController.scriptLoadError": "Povezava je počasna, nekatere komponente niso pravilno naložene.Prosimo osvežite stran.",
-  "DE.ApplicationController.textClear": "Počisti vsa polja",
   "DE.ApplicationController.textLoadingDocument": "Nalaganje dokumenta",
-  "DE.ApplicationController.textNext": "Naslednje polje",
   "DE.ApplicationController.textOf": "od",
-  "DE.ApplicationController.textSubmit": "Pošlji",
   "DE.ApplicationController.textSubmited": "<b>Obrazec poslan uspešno</b><br>Pritisnite tukaj za zaprtje obvestila",
   "DE.ApplicationController.txtClose": "Zapri",
   "DE.ApplicationController.unknownErrorText": "Neznana napaka.",

apps/documenteditor/forms/locale/sv.json

@@ -11,20 +11,30 @@
   "DE.ApplicationController.downloadTextText": "Laddar ner dokumentet...",
   "DE.ApplicationController.errorAccessDeny": "Du försöker utföra en åtgärd som du inte har rättighet till.<br>Vänligen kontakta din systemadministratör.",
   "DE.ApplicationController.errorDefaultMessage": "Felkod: %1",
+  "DE.ApplicationController.errorEditingDownloadas": "Ett fel har inträffat.<br>Använd \"Ladda ned som...\" för att spara en säkerhetskopia på din dator.",
   "DE.ApplicationController.errorFilePassProtect": "Dokumentet är lösenordsskyddat och kunde inte öppnas. ",
   "DE.ApplicationController.errorFileSizeExceed": "Filstorleken överskrider gränsen för din server.<br>Var snäll och kontakta administratören för dokumentservern för mer information.",
+  "DE.ApplicationController.errorSubmit": "Gick ej att verkställa.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetanslutningen har återställts och filversionen har ändrats.<br>Innan du fortsätter arbeta, ladda ner filen eller kopiera innehållet för att försäkra dig om att inte förlora något, ladda sedan om denna sida.",
   "DE.ApplicationController.errorUserDrop": "Filen kan inte nås för tillfället. ",
   "DE.ApplicationController.notcriticalErrorTitle": "Varning",
   "DE.ApplicationController.scriptLoadError": "Anslutningen är för långsam, vissa av komponenterna kunde inte laddas. Vänligen ladda om sidan.",
+  "DE.ApplicationController.textAnonymous": "Anonym",
+  "DE.ApplicationController.textGotIt": "Ok!",
+  "DE.ApplicationController.textGuest": "Gäst",
   "DE.ApplicationController.textLoadingDocument": "Laddar dokument",
   "DE.ApplicationController.textOf": "av",
+  "DE.ApplicationController.textRequired": "Fyll i alla fält för att skicka formulär.",
+  "DE.ApplicationController.textSubmited": "<b> Formulär skickat </b> <br> Klicka för att stänga tipset",
   "DE.ApplicationController.txtClose": "Stäng",
   "DE.ApplicationController.unknownErrorText": "Okänt fel.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Din webbläsare stöds ej.",
   "DE.ApplicationController.waitText": "Var snäll och vänta...",
   "DE.ApplicationView.txtDownload": "Ladda ner",
+  "DE.ApplicationView.txtDownloadDocx": "Ladda ner som docx",
+  "DE.ApplicationView.txtDownloadPdf": "Ladda ner som pdf",
   "DE.ApplicationView.txtEmbed": "Inbädda",
+  "DE.ApplicationView.txtFileLocation": "Gå till filens plats",
   "DE.ApplicationView.txtFullScreen": "Fullskärm",
   "DE.ApplicationView.txtPrint": "Skriva ut",
   "DE.ApplicationView.txtShare": "Dela"

apps/documenteditor/forms/locale/tr.json

@@ -17,11 +17,8 @@
   "DE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.",
   "DE.ApplicationController.notcriticalErrorTitle": "Uyarı",
   "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.",
-  "DE.ApplicationController.textClear": "Tüm alanları temizle",
   "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor",
-  "DE.ApplicationController.textNext": "Sonraki alan",
   "DE.ApplicationController.textOf": "'in",
-  "DE.ApplicationController.textSubmit": "Kaydet",
   "DE.ApplicationController.textSubmited": "<b>Form başarılı bir şekilde kaydedildi</b><br>İpucunu kapatmak için tıklayın",
   "DE.ApplicationController.txtClose": "Kapat",
   "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.",

apps/documenteditor/forms/locale/zh.json

@@ -14,31 +14,50 @@
   "DE.ApplicationController.errorEditingDownloadas": "在处理文档期间发生错误。<br>使用“下载为…”选项将文件备份复制到您的计算机硬盘中。",
   "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法被打开。",
   "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.<br>有关详细信息，请与文档服务器管理员联系。",
+  "DE.ApplicationController.errorForceSave": "保存文件时发生错误。请使用“下载为”选项将文件保存到计算机硬盘中或稍后重试。",
+  "DE.ApplicationController.errorLoadingFont": "字体未加载。<br>请联系文档服务器管理员。",
+  "DE.ApplicationController.errorServerVersion": "编辑器版本已完成更新。为应用这些更改，该页将要刷新。",
   "DE.ApplicationController.errorSubmit": "提交失败",
+  "DE.ApplicationController.errorUpdateVersion": "文件版本发生改变。该页将要刷新。",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已变更。<br>在继续工作之前，需要下载文件或复制其内容以避免丢失数据，然后刷新此页。",
   "DE.ApplicationController.errorUserDrop": "该文件现在无法访问。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
   "DE.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。",
   "DE.ApplicationController.textAnonymous": "匿名",
-  "DE.ApplicationController.textClear": "清除所有字段",
+  "DE.ApplicationController.textBuyNow": "访问网站",
+  "DE.ApplicationController.textCloseTip": "点按以关闭提示。",
+  "DE.ApplicationController.textContactUs": "联系销售",
   "DE.ApplicationController.textGotIt": "知道了",
   "DE.ApplicationController.textGuest": "访客",
   "DE.ApplicationController.textLoadingDocument": "文件加载中…",
-  "DE.ApplicationController.textNext": "下一域",
+  "DE.ApplicationController.textNoLicenseTitle": "触碰到许可证数量限制。",
   "DE.ApplicationController.textOf": "的",
   "DE.ApplicationController.textRequired": "要发送表单，请填写所有必填项目。",
-  "DE.ApplicationController.textSubmit": "提交",
-  "DE.ApplicationController.textSubmited": "<b>表单成功地被提交了</b><br>点击以关闭贴士",
+  "DE.ApplicationController.textSubmited": "<b>表单提交成功</b><br>点击以关闭提示",
+  "DE.ApplicationController.titleServerVersion": "编辑器已更新",
+  "DE.ApplicationController.titleUpdateVersion": "版本已变化",
   "DE.ApplicationController.txtClose": "关闭",
+  "DE.ApplicationController.txtEmpty": "（空）",
+  "DE.ApplicationController.txtPressLink": "按CTRL并单击链接",
   "DE.ApplicationController.unknownErrorText": "未知错误。",
   "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持",
   "DE.ApplicationController.waitText": "请稍候...",
+  "DE.ApplicationController.warnLicenseExceeded": "与文档服务器的并发连接次数已超出限制，文档打开后将仅供查看。<br>请联系您的账户管理员了解详情。",
+  "DE.ApplicationController.warnLicenseLimitedNoAccess": "授权过期<br>您不具备文件编辑功能的授权<br>请联系管理员。",
+  "DE.ApplicationController.warnLicenseLimitedRenewed": "授权需更新<br>您只有文件编辑功能的部分权限<br>请联系管理员以取得完整权限。",
+  "DE.ApplicationController.warnLicenseUsersExceeded": "你触发了 %1 编辑器的同时在线数限制。可联系管理员来了解更多信息。",
+  "DE.ApplicationController.warnNoLicense": "该版本对文档服务器的并发连接有限制。<br>如果需要更多请考虑购买商业许可证。",
+  "DE.ApplicationController.warnNoLicenseUsers": "你触发了 %1 编辑器的同时在线数限制。可联系管理员来了解更多信息。",
+  "DE.ApplicationView.textClear": "清除所有字段",
+  "DE.ApplicationView.textNext": "下一填充框",
+  "DE.ApplicationView.textSubmit": "提交",
   "DE.ApplicationView.txtDownload": "下载",
-  "DE.ApplicationView.txtDownloadDocx": "导出成docx格式",
-  "DE.ApplicationView.txtDownloadPdf": "导出成PDF格式",
+  "DE.ApplicationView.txtDownloadDocx": "导出成docx",
+  "DE.ApplicationView.txtDownloadPdf": "导出成PDF",
   "DE.ApplicationView.txtEmbed": "嵌入",
   "DE.ApplicationView.txtFileLocation": "打开文件所在位置",
   "DE.ApplicationView.txtFullScreen": "全屏",
   "DE.ApplicationView.txtPrint": "打印",
-  "DE.ApplicationView.txtShare": "共享"
+  "DE.ApplicationView.txtShare": "共享",
+  "DE.ApplicationView.txtTheme": "界面主题"
 }

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

@@ -325,7 +325,8 @@ define([
                 })).on('click', _on_btn_zoom.bind(me, 'up'));
 
                 me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
-                if ( !Common.UI.Themes.isDarkTheme() ) {
+                var document = DE.getController('Main').document;
+                if ( !Common.UI.Themes.isDarkTheme() || /^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
                     me.header.menuItemsDarkMode.hide();
                     me.header.menuItemsDarkMode.$el.prev('.divider').hide();
                 }
@@ -370,13 +371,16 @@ define([
         },
 
         onThemeChanged: function (id) {
-            var current_dark = Common.UI.Themes.isDarkTheme();
-            var menuItem = this.header.menuItemsDarkMode;
-            menuItem.setVisible(current_dark);
-            menuItem.$el.prev('.divider')[current_dark ? 'show' : 'hide']();
+            var document = DE.getController('Main').document;
+            if ( !/^pdf|djvu|xps|oxps$/.test(document.fileType) ) {
+                var current_dark = Common.UI.Themes.isDarkTheme();
+                var menuItem = this.header.menuItemsDarkMode;
+                menuItem.setVisible(current_dark);
+                menuItem.$el.prev('.divider')[current_dark ? 'show' : 'hide']();
 
-            menuItem.setChecked(current_dark);
-            this.header.btnContentMode.setVisible(current_dark);
+                menuItem.setChecked(current_dark);
+                this.header.btnContentMode.setVisible(current_dark);
+            }
         },
 
         onContentThemeChangedToDark: function (isdark) {

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

@@ -79,8 +79,8 @@ define([
                                     '<tr>',
                                         '<td class="padding-extra-small">',
                                             '<label class="header" style="margin-right: 10px;">', me.textSort,'</label>',
-                                            '<div id="bookmarks-radio-name" style="display: inline-block; margin-right: 10px;"></div>',
-                                            '<div id="bookmarks-radio-location" style="display: inline-block;"></div>',
+                                            '<div id="bookmarks-radio-name"></div>',
+                                            '<div id="bookmarks-radio-location"></div>',
                                         '</td>',
                                     '</tr>',
                                     '<tr>',

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

@@ -91,8 +91,8 @@ define([
                                 '</tr>',
                                 '<tr>',
                                     '<td style="padding-bottom: 5px;">',
-                                        '<div id="id-text-table-radio-fixed" style="display: inline-block;margin-right: 10px;"></div>',
-                                        '<div id="id-text-table-spn-fixed" style="display: inline-block;"></div>',
+                                        '<div id="id-text-table-radio-fixed"></div>',
+                                        '<div id="id-text-table-spn-fixed"></div>',
                                     '</td>',
                                 '</tr>',
                                 '<tr>',

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

@@ -1309,10 +1309,10 @@ define([
                             if (menu.cmpEl) {
                                 var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
                                 var itemMargin = /*parseInt($(itemEl.get(0)).parent().css('margin-right'))*/-1;
-                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = itemMargin + 1/Common.Utils.applicationPixelRatio());
-                                var itemWidth = itemEl.is(':visible') ? parseInt(itemEl.css('width')) :
-                                    (cmp.itemWidth + parseInt(itemEl.css('padding-left')) + parseInt(itemEl.css('padding-right')) +
-                                    parseInt(itemEl.css('border-left-width')) + parseInt(itemEl.css('border-right-width')));
+                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = -1 / Common.Utils.applicationPixelRatio());
+                                var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) :
+                                    (cmp.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) +
+                                        parseFloat(itemEl.css('border-left-width')) + parseFloat(itemEl.css('border-right-width')));
 
                                 var minCount = cmp.menuPicker.store.length >= minMenuColumn ? minMenuColumn : cmp.menuPicker.store.length,
                                     columnCount = Math.min(cmp.menuPicker.store.length, Math.round($('.dataview', $(cmp.fieldPicker.el)).width() / (itemMargin + itemWidth) + 0.5));

apps/documenteditor/main/index.html

@@ -233,7 +233,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -292,7 +293,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }

apps/documenteditor/main/index.html.deploy

@@ -205,7 +205,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -264,7 +265,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }

apps/documenteditor/main/resources/less/advanced-settings.less

@@ -73,4 +73,25 @@
 #page-margins-preview {
     border: @scaled-one-px-value-ie solid @border-regular-control-ie;
     border: @scaled-one-px-value solid @border-regular-control;
+}
+
+#id-text-table-radio-fixed {
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: middle;
+
+    .pixel-ratio__1_75 &, .pixel-ratio__2 & {
+        padding-bottom: 1px;
+    }
+}
+
+#bookmarks-radio-name {
+    display: inline-block;
+    margin-right: 10px;
+    vertical-align: middle;
+}
+
+#id-text-table-spn-fixed, #bookmarks-radio-location {
+    display: inline-block;
+    vertical-align: middle;
 }

apps/documenteditor/mobile/locale/be.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/bg.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/ca.json

@@ -538,6 +538,8 @@
     "textOpenFile": "Introdueix una contrasenya per obrir el fitxer",
     "textOrientation": "Orientació",
     "textOwner": "Propietari",
+    "textPages": "Pàgines",
+    "textParagraphs": "Paràgrafs",
     "textPoint": "Punt",
     "textPortrait": "Orientació vertical",
     "textPrint": "Imprimeix",
@@ -549,13 +551,16 @@
     "textSearch": "Cerca",
     "textSettings": "Configuració",
     "textShowNotification": "Mostra la notificació",
+    "textSpaces": "Espais",
     "textSpellcheck": "Revisió ortogràfica",
     "textStatistic": "Estadístiques",
     "textSubject": "Assumpte",
+    "textSymbols": "Símbols",
     "textTitle": "Títol",
     "textTop": "Superior",
     "textUnitOfMeasurement": "Unitat de mesura",
     "textUploaded": "S'ha carregat",
+    "textWords": "Paraules",
     "txtDownloadTxt": "Baixar TXT",
     "txtIncorrectPwd": "La contrasenya no és correcta",
     "txtOk": "D'acord",

apps/documenteditor/mobile/locale/cs.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/da.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/de.json

@@ -122,6 +122,7 @@
       "textNot": "Nicht",
       "textNoWidow": "Keine Absatzkontrolle",
       "textNum": "Nummerierung ändern",
+      "textOk": "OK",
       "textOriginal": "Original",
       "textParaDeleted": "Absatz gelöscht",
       "textParaFormatted": "Absatz formatiert",
@@ -154,8 +155,7 @@
       "textTryUndoRedo": "Die Optionen Rückgängig machen/Wiederholen sind für den Schnellmodus deaktiviert.",
       "textUnderline": "Unterstrichen",
       "textUsers": "Benutzer",
-      "textWidow": "Absatzkontrolle",
-      "textOk": "Ok"
+      "textWidow": "Absatzkontrolle"
     },
     "ThemeColorPalette": {
       "textCustomColors": "Benutzerdefinierte Farben",
@@ -168,28 +168,28 @@
     "menuAddComment": "Kommentar hinzufügen",
     "menuAddLink": "Link hinzufügen",
     "menuCancel": "Abbrechen",
+    "menuContinueNumbering": "Nummerierung fortführen",
     "menuDelete": "Löschen",
     "menuDeleteTable": "Tabelle löschen",
     "menuEdit": "Bearbeiten",
+    "menuJoinList": "Mit der vorherigen Liste verbinden",
     "menuMerge": "Verbinden",
     "menuMore": "Mehr",
     "menuOpenLink": "Link öffnen",
     "menuReview": "Überprüfung",
     "menuReviewChange": "Änderung überprüfen",
+    "menuSeparateList": "Liste trennen",
     "menuSplit": "Aufteilen",
+    "menuStartNewList": "Neue Liste beginnen",
+    "menuStartNumberingFrom": "Nummerierungswert festlegen",
     "menuViewComment": "Kommentar anzeigen",
+    "textCancel": "Abbrechen",
     "textColumns": "Spalten",
     "textCopyCutPasteActions": "Kopieren, Ausschneiden und Einfügen",
     "textDoNotShowAgain": "Nicht mehr anzeigen",
-    "textRows": "Zeilen",
-    "menuContinueNumbering": "Continue numbering",
-    "menuJoinList": "Join to previous list",
-    "menuSeparateList": "Separate list",
-    "menuStartNewList": "Start new list",
-    "menuStartNumberingFrom": "Set numbering value",
-    "textCancel": "Cancel",
-    "textNumberingValue": "Numbering Value",
-    "textOk": "OK"
+    "textNumberingValue": "Nummerierungswert",
+    "textOk": "OK",
+    "textRows": "Zeilen"
   },
   "Edit": {
     "notcriticalErrorTitle": "Warnung",
@@ -491,6 +491,8 @@
     "textCancel": "Abbrechen",
     "textCaseSensitive": "Groß-/Kleinschreibung beachten",
     "textCentimeter": "Zentimeter",
+    "textChooseEncoding": "Codierung auswählen",
+    "textChooseTxtOptions": "Optionen für TXT-Dateien auswählen",
     "textCollaboration": "Zusammenarbeit",
     "textColorSchemes": "Farbschemata",
     "textComment": "Kommentar",
@@ -536,6 +538,8 @@
     "textOpenFile": "Kennwort zum Öffnen der Datei eingeben",
     "textOrientation": "Orientierung",
     "textOwner": "Besitzer",
+    "textPages": "Seiten",
+    "textParagraphs": "Absätze",
     "textPoint": "Punkt",
     "textPortrait": "Hochformat",
     "textPrint": "Drucken",
@@ -547,14 +551,19 @@
     "textSearch": "Suche",
     "textSettings": "Einstellungen",
     "textShowNotification": "Benachrichtigung anzeigen",
+    "textSpaces": "Leerzeichen",
     "textSpellcheck": "Rechtschreibprüfung",
     "textStatistic": "Statistik",
     "textSubject": "Betreff",
+    "textSymbols": "Symbole",
     "textTitle": "Titel",
     "textTop": "Oben",
     "textUnitOfMeasurement": "Maßeinheit",
     "textUploaded": "Hochgeladen",
+    "textWords": "Wörter",
+    "txtDownloadTxt": "TXT herunterladen",
     "txtIncorrectPwd": "Passwort ist falsch",
+    "txtOk": "OK",
     "txtProtected": "Wenn Sie das Password eingeben und die Datei öffnen, wird das aktive Password zurückgesetzt",
     "txtScheme1": "Office",
     "txtScheme10": "Median",
@@ -577,11 +586,7 @@
     "txtScheme6": "Halle",
     "txtScheme7": "Kapital",
     "txtScheme8": "Fluss",
-    "txtScheme9": "Gießerei",
-    "textChooseEncoding": "Choose Encoding",
-    "textChooseTxtOptions": "Choose TXT Options",
-    "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtScheme9": "Gießerei"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Sie haben nicht gespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und warten Sie, bis die Datei automatisch gespeichert wird. Klicken Sie auf \"Die Seite verlassen\", um nicht gespeicherte Änderungen zu verwerfen.",

apps/documenteditor/mobile/locale/el.json

@@ -1,7 +1,7 @@
 {
   "About": {
-    "textAbout": "About",
-    "textAddress": "Address",
+    "textAbout": "Περί",
+    "textAddress": "Διεύθυνση",
     "textBack": "Back",
     "textEmail": "Email",
     "textPoweredBy": "Powered By",
@@ -9,9 +9,9 @@
     "textVersion": "Version"
   },
   "Add": {
+    "textAddLink": "Προσθήκη συνδέσμου",
+    "textAddress": "Διεύθυνση",
     "notcriticalErrorTitle": "Warning",
-    "textAddLink": "Add link",
-    "textAddress": "Address",
     "textBack": "Back",
     "textBelowText": "Below text",
     "textBottomOfPage": "Bottom of page",
@@ -60,14 +60,20 @@
   },
   "Common": {
     "Collaboration": {
+      "textAccept": "Αποδοχή",
+      "textAcceptAllChanges": "Αποδοχή όλων των αλλαγών",
+      "textAddComment": "Προσθήκη σχολίου",
+      "textAddReply": "Προσθήκη απάντησης",
+      "textAllChangesAcceptedPreview": "Όλες οι αλλαγές έγιναν αποδεκτές (Προεπισκόπηση)",
+      "textAllChangesEditing": "Όλες οι αλλαγές (Επεξεργασία)",
+      "textAllChangesRejectedPreview": "Όλες οι αλλαγές απορρίφθηκαν (Προεπισκόπηση)",
+      "textCaps": "Όλα κεφαλαία",
+      "textCenter": "Στοίχιση στο κέντρο",
+      "textJustify": "Στοίχιση πλήρης",
+      "textLeft": "Στοίχιση αριστερά",
+      "textNoContextual": "Προσθήκη διαστήματος μεταξύ παραγράφων της ίδιας τεχνοτροπίας",
+      "textRight": "Στοίχιση δεξιά",
       "notcriticalErrorTitle": "Warning",
-      "textAccept": "Accept",
-      "textAcceptAllChanges": "Accept all changes",
-      "textAddComment": "Add comment",
-      "textAddReply": "Add reply",
-      "textAllChangesAcceptedPreview": "All changes accepted (Preview)",
-      "textAllChangesEditing": "All changes (Editing)",
-      "textAllChangesRejectedPreview": "All changes rejected (Preview)",
       "textAtLeast": "at least",
       "textAuto": "auto",
       "textBack": "Back",
@@ -75,8 +81,6 @@
       "textBold": "Bold",
       "textBreakBefore": "Page break before",
       "textCancel": "Cancel",
-      "textCaps": "All caps",
-      "textCenter": "Align center",
       "textChart": "Chart",
       "textCollaboration": "Collaboration",
       "textColor": "Font color",
@@ -104,10 +108,8 @@
       "textIndentRight": "Indent right",
       "textInserted": "Inserted:",
       "textItalic": "Italic",
-      "textJustify": "Align justified ",
       "textKeepLines": "Keep lines together",
       "textKeepNext": "Keep with next",
-      "textLeft": "Align left",
       "textLineSpacing": "Line Spacing: ",
       "textMarkup": "Markup",
       "textMessageDeleteComment": "Do you really want to delete this comment?",
@@ -116,12 +118,12 @@
       "textNoBreakBefore": "No page break before",
       "textNoChanges": "There are no changes.",
       "textNoComments": "This document doesn't contain comments",
-      "textNoContextual": "Add interval between paragraphs of the same style",
       "textNoKeepLines": "Don't keep lines together",
       "textNoKeepNext": "Don't keep with next",
       "textNot": "Not ",
       "textNoWidow": "No widow control",
       "textNum": "Change numbering",
+      "textOk": "Ok",
       "textOriginal": "Original",
       "textParaDeleted": "Paragraph Deleted",
       "textParaFormatted": "Paragraph Formatted",
@@ -136,7 +138,6 @@
       "textResolve": "Resolve",
       "textReview": "Review",
       "textReviewChange": "Review Change",
-      "textRight": "Align right",
       "textShape": "Shape",
       "textShd": "Background color",
       "textSmallCaps": "Small caps",
@@ -154,8 +155,7 @@
       "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
       "textUnderline": "Underline",
       "textUsers": "Users",
-      "textWidow": "Widow control",
-      "textOk": "Ok"
+      "textWidow": "Widow control"
     },
     "ThemeColorPalette": {
       "textCustomColors": "Custom Colors",
@@ -164,46 +164,46 @@
     }
   },
   "ContextMenu": {
+    "menuAddComment": "Προσθήκη σχολίου",
+    "menuAddLink": "Προσθήκη συνδέσμου",
     "errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
-    "menuAddComment": "Add comment",
-    "menuAddLink": "Add link",
     "menuCancel": "Cancel",
+    "menuContinueNumbering": "Continue numbering",
     "menuDelete": "Delete",
     "menuDeleteTable": "Delete Table",
     "menuEdit": "Edit",
+    "menuJoinList": "Join to previous list",
     "menuMerge": "Merge",
     "menuMore": "More",
     "menuOpenLink": "Open Link",
     "menuReview": "Review",
     "menuReviewChange": "Review Change",
+    "menuSeparateList": "Separate list",
     "menuSplit": "Split",
+    "menuStartNewList": "Start new list",
+    "menuStartNumberingFrom": "Set numbering value",
     "menuViewComment": "View Comment",
+    "textCancel": "Cancel",
     "textColumns": "Columns",
     "textCopyCutPasteActions": "Copy, Cut and Paste Actions",
     "textDoNotShowAgain": "Don't show again",
-    "textRows": "Rows",
-    "menuStartNewList": "Start new list",
-    "menuStartNumberingFrom": "Set numbering value",
-    "menuContinueNumbering": "Continue numbering",
-    "menuSeparateList": "Separate list",
-    "menuJoinList": "Join to previous list",
+    "textNumberingValue": "Numbering Value",
     "textOk": "OK",
-    "textCancel": "Cancel",
-    "textNumberingValue": "Numbering Value"
+    "textRows": "Rows"
   },
   "Edit": {
+    "textActualSize": "Πραγματικό μέγεθος",
+    "textAddCustomColor": "Προσθήκη προσαρμοσμένου χρώματος",
+    "textAdditional": "Επιπρόσθετα",
+    "textAdditionalFormatting": "Πρόσθετη μορφοποίηση",
+    "textAddress": "Διεύθυνση",
+    "textAdvanced": "Για προχωρημένους",
+    "textAdvancedSettings": "Προηγμένες ρυθμίσεις",
+    "textAfter": "Μετά",
+    "textAlign": "Στοίχιση",
+    "textAllCaps": "Όλα κεφαλαία",
+    "textAllowOverlap": "Να επιτρέπεται η επικάλυψη",
     "notcriticalErrorTitle": "Warning",
-    "textActualSize": "Actual size",
-    "textAddCustomColor": "Add custom color",
-    "textAdditional": "Additional",
-    "textAdditionalFormatting": "Additional formatting",
-    "textAddress": "Address",
-    "textAdvanced": "Advanced",
-    "textAdvancedSettings": "Advanced settings",
-    "textAfter": "After",
-    "textAlign": "Align",
-    "textAllCaps": "All caps",
-    "textAllowOverlap": "Allow overlap",
     "textAuto": "Auto",
     "textAutomatic": "Automatic",
     "textBack": "Back",
@@ -260,6 +260,7 @@
     "textNone": "None",
     "textNoStyles": "No styles for this type of charts.",
     "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
+    "textNumbers": "Numbers",
     "textOpacity": "Opacity",
     "textOptions": "Options",
     "textOrphanControl": "Orphan Control",
@@ -303,16 +304,17 @@
     "textTopAndBottom": "Top and Bottom",
     "textTotalRow": "Total Row",
     "textType": "Type",
-    "textWrap": "Wrap",
-    "textNumbers": "Numbers"
+    "textWrap": "Wrap"
   },
   "Error": {
+    "openErrorText": "Σφάλμα κατά το άνοιγμα του αρχείου",
+    "saveErrorText": "Σφάλμα κατά την αποθήκευση του αρχείου",
     "convertationTimeoutText": "Conversion timeout exceeded.",
     "criticalErrorExtText": "Press 'OK' to go back to the document list.",
     "criticalErrorTitle": "Error",
     "downloadErrorText": "Download failed.",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your admin.",
-    "errorBadImageUrl": "Image url is incorrect",
+    "errorBadImageUrl": "Image URL is incorrect",
     "errorConnectToServer": "Can't save this doc. Check your connection settings or contact the admin.<br>When you click OK, you will be prompted to download the document.",
     "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
     "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
@@ -323,6 +325,7 @@
     "errorFileSizeExceed": "The file size exceeds your server limit.<br>Please, contact your admin.",
     "errorKeyEncrypt": "Unknown key descriptor",
     "errorKeyExpire": "Key descriptor expired",
+    "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
     "errorMailMergeLoadFile": "Loading failed",
     "errorMailMergeSaveFile": "Merge failed.",
     "errorSessionAbsolute": "The document editing session has expired. Please, reload the page.",
@@ -332,10 +335,8 @@
     "errorUpdateVersionOnDisconnect": "Internet 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.",
     "errorUserDrop": "The file can't be accessed right now.",
     "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
-    "errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but you won't be able to download it until the connection is restored and the page is reloaded.",
+    "errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but you won't be able to download or print it until the connection is restored and the page is reloaded.",
     "notcriticalErrorTitle": "Warning",
-    "openErrorText": "An error has occurred while opening the file",
-    "saveErrorText": "An error has occurred while saving the file",
     "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please, reload the page.",
     "splitDividerErrorText": "The number of rows must be a divisor of %1",
     "splitMaxColsErrorText": "The number of columns must be less than %1",
@@ -343,56 +344,12 @@
     "unknownErrorText": "Unknown error.",
     "uploadImageExtMessage": "Unknown image format.",
     "uploadImageFileCountMessage": "No images uploaded.",
-    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
-    "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator."
-  },
-  "LongActions": {
-    "applyChangesTextText": "Loading data...",
-    "applyChangesTitleText": "Loading Data",
-    "downloadMergeText": "Downloading...",
-    "downloadMergeTitle": "Downloading",
-    "downloadTextText": "Downloading document...",
-    "downloadTitleText": "Downloading Document",
-    "loadFontsTextText": "Loading data...",
-    "loadFontsTitleText": "Loading Data",
-    "loadFontTextText": "Loading data...",
-    "loadFontTitleText": "Loading Data",
-    "loadImagesTextText": "Loading images...",
-    "loadImagesTitleText": "Loading Images",
-    "loadImageTextText": "Loading image...",
-    "loadImageTitleText": "Loading Image",
-    "loadingDocumentTextText": "Loading document...",
-    "loadingDocumentTitleText": "Loading document",
-    "mailMergeLoadFileText": "Loading Data Source...",
-    "mailMergeLoadFileTitle": "Loading Data Source",
-    "openTextText": "Opening document...",
-    "openTitleText": "Opening Document",
-    "printTextText": "Printing document...",
-    "printTitleText": "Printing Document",
-    "savePreparingText": "Preparing to save",
-    "savePreparingTitle": "Preparing to save. Please wait...",
-    "saveTextText": "Saving document...",
-    "saveTitleText": "Saving Document",
-    "sendMergeText": "Sending Merge...",
-    "sendMergeTitle": "Sending Merge",
-    "textLoadingDocument": "Loading document",
-    "txtEditingMode": "Set editing mode...",
-    "uploadImageTextText": "Uploading image...",
-    "uploadImageTitleText": "Uploading Image",
-    "waitText": "Please, wait..."
+    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
   },
   "Main": {
-    "criticalErrorTitle": "Error",
-    "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your administrator.",
-    "errorOpensource": "Using the free Community version, you can open documents for viewing only. To access mobile web editors, a commercial license is required.",
-    "errorProcessSaveResult": "Saving failed.",
-    "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
-    "errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
-    "leavePageText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
-    "notcriticalErrorTitle": "Warning",
     "SDK": {
-      " -Section ": " -Section ",
-      "above": "above",
+      " -Section ": "-Τμήμα",
+      "above": "πάνω από",
       "below": "below",
       "Caption": "Caption",
       "Choose an item": "Choose an item",
@@ -452,6 +409,14 @@
       "Your text here": "Your text here",
       "Zero Divide": "Zero Divide"
     },
+    "criticalErrorTitle": "Error",
+    "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your administrator.",
+    "errorOpensource": "Using the free Community version, you can open documents for viewing only. To access mobile web editors, a commercial license is required.",
+    "errorProcessSaveResult": "Saving failed.",
+    "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
+    "errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
+    "leavePageText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
+    "notcriticalErrorTitle": "Warning",
     "textAnonymous": "Anonymous",
     "textBuyNow": "Visit website",
     "textClose": "Close",
@@ -477,12 +442,12 @@
     "warnProcessRightsChange": "You don't have permission to edit this file."
   },
   "Settings": {
+    "textAbout": "Περί",
     "advDRMOptions": "Protected File",
     "advDRMPassword": "Password",
     "advTxtOptions": "Choose TXT Options",
     "closeButtonText": "Close File",
     "notcriticalErrorTitle": "Warning",
-    "textAbout": "About",
     "textApplication": "Application",
     "textApplicationSettings": "Application settings",
     "textAuthor": "Author",
@@ -491,6 +456,8 @@
     "textCancel": "Cancel",
     "textCaseSensitive": "Case Sensitive",
     "textCentimeter": "Centimeter",
+    "textChooseEncoding": "Choose Encoding",
+    "textChooseTxtOptions": "Choose TXT Options",
     "textCollaboration": "Collaboration",
     "textColorSchemes": "Color Schemes",
     "textComment": "Comment",
@@ -532,9 +499,12 @@
     "textMarginsW": "Left and right margins are too wide for a given page width",
     "textNoCharacters": "Nonprinting Characters",
     "textNoTextFound": "Text not found",
+    "textOk": "Ok",
     "textOpenFile": "Enter a password to open the file",
     "textOrientation": "Orientation",
     "textOwner": "Owner",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
     "textPoint": "Point",
     "textPortrait": "Portrait",
     "textPrint": "Print",
@@ -546,14 +516,19 @@
     "textSearch": "Search",
     "textSettings": "Settings",
     "textShowNotification": "Show Notification",
+    "textSpaces": "Spaces",
     "textSpellcheck": "Spell Checking",
     "textStatistic": "Statistic",
     "textSubject": "Subject",
+    "textSymbols": "Symbols",
     "textTitle": "Title",
     "textTop": "Top",
     "textUnitOfMeasurement": "Unit Of Measurement",
     "textUploaded": "Uploaded",
+    "textWords": "Words",
+    "txtDownloadTxt": "Download TXT",
     "txtIncorrectPwd": "Password is incorrect",
+    "txtOk": "Ok",
     "txtProtected": "Once you enter the password and open the file, the current password will be reset",
     "txtScheme1": "Office",
     "txtScheme10": "Median",
@@ -576,12 +551,42 @@
     "txtScheme6": "Concourse",
     "txtScheme7": "Equity",
     "txtScheme8": "Flow",
-    "txtScheme9": "Foundry",
-    "textOk": "Ok",
-    "textChooseEncoding": "Choose Encoding",
-    "textChooseTxtOptions": "Choose TXT Options",
-    "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtScheme9": "Foundry"
+  },
+  "LongActions": {
+    "applyChangesTextText": "Loading data...",
+    "applyChangesTitleText": "Loading Data",
+    "downloadMergeText": "Downloading...",
+    "downloadMergeTitle": "Downloading",
+    "downloadTextText": "Downloading document...",
+    "downloadTitleText": "Downloading Document",
+    "loadFontsTextText": "Loading data...",
+    "loadFontsTitleText": "Loading Data",
+    "loadFontTextText": "Loading data...",
+    "loadFontTitleText": "Loading Data",
+    "loadImagesTextText": "Loading images...",
+    "loadImagesTitleText": "Loading Images",
+    "loadImageTextText": "Loading image...",
+    "loadImageTitleText": "Loading Image",
+    "loadingDocumentTextText": "Loading document...",
+    "loadingDocumentTitleText": "Loading document",
+    "mailMergeLoadFileText": "Loading Data Source...",
+    "mailMergeLoadFileTitle": "Loading Data Source",
+    "openTextText": "Opening document...",
+    "openTitleText": "Opening Document",
+    "printTextText": "Printing document...",
+    "printTitleText": "Printing Document",
+    "savePreparingText": "Preparing to save",
+    "savePreparingTitle": "Preparing to save. Please wait...",
+    "saveTextText": "Saving document...",
+    "saveTitleText": "Saving Document",
+    "sendMergeText": "Sending Merge...",
+    "sendMergeTitle": "Sending Merge",
+    "textLoadingDocument": "Loading document",
+    "txtEditingMode": "Set editing mode...",
+    "uploadImageTextText": "Uploading image...",
+    "uploadImageTitleText": "Uploading Image",
+    "waitText": "Please, wait..."
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/en.json

@@ -336,7 +336,7 @@
     "criticalErrorTitle": "Error",
     "downloadErrorText": "Download failed.",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your admin.",
-    "errorBadImageUrl": "Image url is incorrect",
+    "errorBadImageUrl": "Image URL is incorrect",
     "errorConnectToServer": "Can't save this doc. Check your connection settings or contact the admin.<br>When you click OK, you will be prompted to download the document.",
     "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
     "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
@@ -562,6 +562,8 @@
     "textOpenFile": "Enter a password to open the file",
     "textOrientation": "Orientation",
     "textOwner": "Owner",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
     "textPoint": "Point",
     "textPortrait": "Portrait",
     "textPrint": "Print",
@@ -573,13 +575,16 @@
     "textSearch": "Search",
     "textSettings": "Settings",
     "textShowNotification": "Show Notification",
+    "textSpaces": "Spaces",
     "textSpellcheck": "Spell Checking",
     "textStatistic": "Statistic",
     "textSubject": "Subject",
+    "textSymbols": "Symbols",
     "textTitle": "Title",
     "textTop": "Top",
     "textUnitOfMeasurement": "Unit Of Measurement",
     "textUploaded": "Uploaded",
+    "textWords": "Words",
     "txtDownloadTxt": "Download TXT",
     "txtIncorrectPwd": "Password is incorrect",
     "txtOk": "Ok",

apps/documenteditor/mobile/locale/es.json

@@ -168,28 +168,28 @@
     "menuAddComment": "Añadir comentario",
     "menuAddLink": "Añadir enlace ",
     "menuCancel": "Cancelar",
+    "menuContinueNumbering": "Continuar numeración",
     "menuDelete": "Eliminar",
     "menuDeleteTable": "Eliminar tabla",
     "menuEdit": "Editar",
+    "menuJoinList": "Unir a lista anterior",
     "menuMerge": "Combinar",
     "menuMore": "Más",
     "menuOpenLink": "Abrir enlace",
     "menuReview": "Revisión",
     "menuReviewChange": "Revisar cambios",
+    "menuSeparateList": "Separar lista",
     "menuSplit": "Dividir",
+    "menuStartNewList": "Iniciar nueva lista",
+    "menuStartNumberingFrom": "Establecer valor de numeración",
     "menuViewComment": "Ver comentario",
+    "textCancel": "Cancelar",
     "textColumns": "Columnas",
     "textCopyCutPasteActions": "Acciones de Copiar, Cortar y Pegar",
     "textDoNotShowAgain": "No mostrar de nuevo",
-    "textRows": "Filas",
-    "menuContinueNumbering": "Continue numbering",
-    "menuJoinList": "Join to previous list",
-    "menuSeparateList": "Separate list",
-    "menuStartNewList": "Start new list",
-    "menuStartNumberingFrom": "Set numbering value",
-    "textCancel": "Cancel",
-    "textNumberingValue": "Numbering Value",
-    "textOk": "OK"
+    "textNumberingValue": "Valor de numeración",
+    "textOk": "OK",
+    "textRows": "Filas"
   },
   "Edit": {
     "notcriticalErrorTitle": "Advertencia",
@@ -538,6 +538,8 @@
     "textOpenFile": "Introduzca la contraseña para abrir el archivo",
     "textOrientation": "Orientación ",
     "textOwner": "Propietario",
+    "textPages": "Páginas",
+    "textParagraphs": "Párrafos",
     "textPoint": "Punto",
     "textPortrait": "Vertical",
     "textPrint": "Imprimir",
@@ -549,13 +551,16 @@
     "textSearch": "Buscar",
     "textSettings": "Ajustes",
     "textShowNotification": "Mostrar notificación",
+    "textSpaces": "Espacios",
     "textSpellcheck": "Сorrección ortográfica",
     "textStatistic": "Estadísticas",
     "textSubject": "Asunto",
+    "textSymbols": "Símbolos",
     "textTitle": "Título",
     "textTop": "Arriba",
     "textUnitOfMeasurement": "Unidad de medida",
     "textUploaded": "Cargado",
+    "textWords": "Palabras",
     "txtDownloadTxt": "Descargar TXT",
     "txtIncorrectPwd": "La contraseña es incorrecta",
     "txtOk": "OK",

apps/documenteditor/mobile/locale/fi.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/fr.json

@@ -122,6 +122,7 @@
       "textNot": "Non",
       "textNoWidow": "Pas de contrôle des veuves",
       "textNum": "Changer la numérotation",
+      "textOk": "Ok",
       "textOriginal": "Original",
       "textParaDeleted": "Paragraphe supprimé",
       "textParaFormatted": "Paragraphe formaté",
@@ -154,8 +155,7 @@
       "textTryUndoRedo": "Les fonctions Annuler/Rétablir sont désactivées pour le mode de co-édition rapide.",
       "textUnderline": "Souligné",
       "textUsers": "Utilisateurs",
-      "textWidow": "Contrôle des veuves",
-      "textOk": "Ok"
+      "textWidow": "Contrôle des veuves"
     },
     "ThemeColorPalette": {
       "textCustomColors": "Couleurs personnalisées",
@@ -168,28 +168,28 @@
     "menuAddComment": "Ajouter un commentaire",
     "menuAddLink": "Ajouter un lien",
     "menuCancel": "Annuler",
+    "menuContinueNumbering": "Continuer la numérotation",
     "menuDelete": "Supprimer",
     "menuDeleteTable": "Supprimer le tableau",
     "menuEdit": "Modifier",
+    "menuJoinList": "Joindre à la liste précédente",
     "menuMerge": "Fusionner",
     "menuMore": "Plus",
     "menuOpenLink": "Ouvrir le lien",
     "menuReview": "Révision",
     "menuReviewChange": "Réviser modifications",
+    "menuSeparateList": "Séparer la liste",
     "menuSplit": "Fractionner",
+    "menuStartNewList": "Commencer une nouvelle liste",
+    "menuStartNumberingFrom": "Fixer la valeur initiale",
     "menuViewComment": "Voir le commentaire",
+    "textCancel": "Annuler",
     "textColumns": "Colonnes",
     "textCopyCutPasteActions": "Fonctions de Copier, Couper et Coller",
     "textDoNotShowAgain": "Ne plus afficher",
-    "textRows": "Lignes",
-    "menuContinueNumbering": "Continue numbering",
-    "menuJoinList": "Join to previous list",
-    "menuSeparateList": "Separate list",
-    "menuStartNewList": "Start new list",
-    "menuStartNumberingFrom": "Set numbering value",
-    "textCancel": "Cancel",
-    "textNumberingValue": "Numbering Value",
-    "textOk": "OK"
+    "textNumberingValue": "Valeur de numérotation",
+    "textOk": "Ok",
+    "textRows": "Lignes"
   },
   "Edit": {
     "notcriticalErrorTitle": "Avertissement",
@@ -491,6 +491,8 @@
     "textCancel": "Annuler",
     "textCaseSensitive": "Sensible à la casse",
     "textCentimeter": "Centimètre",
+    "textChooseEncoding": "Choisir l'encodage",
+    "textChooseTxtOptions": "Choisir les options TXT",
     "textCollaboration": "Collaboration",
     "textColorSchemes": "Jeux de couleurs",
     "textComment": "Commentaire",
@@ -536,6 +538,8 @@
     "textOpenFile": "Entrer le mot de passe pour ouvrir le fichier",
     "textOrientation": "Orientation",
     "textOwner": "Propriétaire",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphes",
     "textPoint": "Point",
     "textPortrait": "Portrait",
     "textPrint": "Imprimer",
@@ -547,14 +551,19 @@
     "textSearch": "Rechercher",
     "textSettings": "Paramètres",
     "textShowNotification": "Montrer  la notification",
+    "textSpaces": "Espaces",
     "textSpellcheck": "Vérification de l'orthographe",
     "textStatistic": "Statistique",
     "textSubject": "Sujet",
+    "textSymbols": "Symboles",
     "textTitle": "Titre",
     "textTop": "En haut",
     "textUnitOfMeasurement": "Unité de mesure",
     "textUploaded": "Chargé",
+    "textWords": "Mots",
+    "txtDownloadTxt": "Télécharger le TXT",
     "txtIncorrectPwd": "Mot de passe incorrect",
+    "txtOk": "Ok",
     "txtProtected": "Une fois le mot de passe saisi et le fichier ouvert, le mot de passe actuel de fichier sera réinitialisé",
     "txtScheme1": "Office",
     "txtScheme10": "Médian",
@@ -577,11 +586,7 @@
     "txtScheme6": "Rotonde",
     "txtScheme7": "Capitaux",
     "txtScheme8": "Flux",
-    "txtScheme9": "Fonderie",
-    "textChooseEncoding": "Choose Encoding",
-    "textChooseTxtOptions": "Choose TXT Options",
-    "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtScheme9": "Fonderie"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur Rester sur cette page et attendez l'enregistrement automatique. Cliquez sur Quitter cette page pour annuler toutes les modifications non enregistrées.",

apps/documenteditor/mobile/locale/hu.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/ja.json

@@ -538,6 +538,8 @@
     "textOpenFile": "ファイルを開くためにパスワードを入力してください",
     "textOrientation": "向き",
     "textOwner": "所有者",
+    "textPages": "ページ",
+    "textParagraphs": "段落",
     "textPoint": "ポイント",
     "textPortrait": "縦長の向き",
     "textPrint": "印刷",
@@ -549,13 +551,16 @@
     "textSearch": "検索",
     "textSettings": "設定",
     "textShowNotification": " 通知を表示する",
+    "textSpaces": "スペース",
     "textSpellcheck": "スペルチェック",
     "textStatistic": "統計値",
     "textSubject": "件名",
+    "textSymbols": "記号",
     "textTitle": "タイトル",
     "textTop": "上",
     "textUnitOfMeasurement": "測定の単位",
     "textUploaded": "アップロードした",
+    "textWords": "文字数",
     "txtDownloadTxt": "TXTをダウンロード",
     "txtIncorrectPwd": "パスワードが間違い",
     "txtOk": "OK",

apps/documenteditor/mobile/locale/lo.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/lv.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/nb.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/nl.json

@@ -580,6 +580,11 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "textOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words",
     "txtDownloadTxt": "Download TXT",
     "txtOk": "Ok"
   },

apps/documenteditor/mobile/locale/pl.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/pt.json

@@ -538,6 +538,8 @@
     "textOpenFile": "Inserir a Senha para Abrir o Arquivo",
     "textOrientation": "Orientação",
     "textOwner": "Proprietário",
+    "textPages": "Páginas",
+    "textParagraphs": "Parágrafos",
     "textPoint": "Ponto",
     "textPortrait": "Retrato ",
     "textPrint": "Imprimir",
@@ -549,13 +551,16 @@
     "textSearch": "Pesquisar",
     "textSettings": "Configurações",
     "textShowNotification": "Mostrar notificação",
+    "textSpaces": "Espaços",
     "textSpellcheck": "Verificação ortográfica",
     "textStatistic": "Estatística",
     "textSubject": "Assunto",
+    "textSymbols": "Símbolos",
     "textTitle": "Título",
     "textTop": "Parte superior",
     "textUnitOfMeasurement": "Unidade de medida",
     "textUploaded": "Carregado",
+    "textWords": "Palavras",
     "txtDownloadTxt": "Baixar TXT",
     "txtIncorrectPwd": "A senha está incorreta",
     "txtOk": "OK",

apps/documenteditor/mobile/locale/ro.json

@@ -471,9 +471,9 @@
     "warnLicenseExp": "Licența dvs. a expirat. Licența urmează să fie reînnoită iar pagina reîmprospătată.",
     "warnLicenseLimitedNoAccess": "Licența dvs. a expirat. Nu aveți acces la funcții de editare a documentului.Contactați administratorul dvs. de rețeea.",
     "warnLicenseLimitedRenewed": "Licență urmează să fie reînnoită. Funcțiile de editare sunt cu acces limitat. Pentru a obține acces nelimitat, contactați administratorul dvs. de rețea.",
-    "warnLicenseUsersExceeded": "Ați atins numărul maxim de utilizatori al %1 editoare. Pentru detalii, contactați administratorul dvs.",
+    "warnLicenseUsersExceeded": "Ați atins numărul maxim de utilizatori ai %1 editoare. Pentru detalii, contactați administratorul dvs.",
     "warnNoLicense": "Ați atins numărul maxim de conexiuni simultane la %1 de editoare. Documentul este disponibil numai pentru vizualizare. Contactați %1 Departamentul de Vânzări pentru acordarea condițiilor personale de actualizare.",
-    "warnNoLicenseUsers": "Ați atins numărul maxim de utilizatori al %1 editoare. Contactați Grup Vânzări %1 pentru acordarea condițiilor personale de actualizare.",
+    "warnNoLicenseUsers": "Ați atins numărul maxim de utilizatori ai %1 editoare. Contactați Grup Vânzări %1 pentru acordarea condițiilor personale de licențiere.",
     "warnProcessRightsChange": "Nu aveți permisiunea de editare pentru fișier."
   },
   "Settings": {
@@ -538,6 +538,8 @@
     "textOpenFile": "Introduceți parola pentru deschidere fișier",
     "textOrientation": "Orientare",
     "textOwner": "Proprietar",
+    "textPages": "Pagini",
+    "textParagraphs": "Paragrafe",
     "textPoint": "Punct",
     "textPortrait": "Portret",
     "textPrint": "Imprimare",
@@ -549,13 +551,16 @@
     "textSearch": "Căutare",
     "textSettings": "Setări",
     "textShowNotification": "Afișare notificări",
+    "textSpaces": "Spații",
     "textSpellcheck": "Verificarea ortografică",
     "textStatistic": "Statistic",
     "textSubject": "Subiect",
+    "textSymbols": "Simboluri",
     "textTitle": "Titlu",
     "textTop": "Sus",
     "textUnitOfMeasurement": "Unitate de măsură ",
     "textUploaded": "S-a încărcat",
+    "textWords": "Cuvinte",
     "txtDownloadTxt": "Încărcare TXT",
     "txtIncorrectPwd": "Parolă incorectă",
     "txtOk": "OK",

apps/documenteditor/mobile/locale/ru.json

@@ -539,6 +539,8 @@
     "textOpenFile": "Введите пароль для открытия файла",
     "textOrientation": "Ориентация",
     "textOwner": "Владелец",
+    "textPages": "Страницы",
+    "textParagraphs": "Абзацы",
     "textPoint": "Пункт",
     "textPortrait": "Книжная",
     "textPrint": "Печать",
@@ -550,13 +552,16 @@
     "textSearch": "Поиск",
     "textSettings": "Настройки",
     "textShowNotification": "Показывать уведомление",
+    "textSpaces": "Пробелы",
     "textSpellcheck": "Проверка орфографии",
     "textStatistic": "Статистика",
     "textSubject": "Тема",
+    "textSymbols": "Символы",
     "textTitle": "Название",
     "textTop": "Верхнее",
     "textUnitOfMeasurement": "Единица измерения",
     "textUploaded": "Загружен",
+    "textWords": "Слова",
     "txtDownloadTxt": "Скачать TXT",
     "txtIncorrectPwd": "Неверный пароль",
     "txtOk": "Ok",

apps/documenteditor/mobile/locale/sk.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/sl.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/sv.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/tr.json

@@ -21,6 +21,7 @@
     "textColumnBreak": "Sütun Sonu",
     "textColumns": "Sütunlar",
     "textComment": "Yorum",
+    "textLinkSettings": "Bağlantı Ayarları",
     "notcriticalErrorTitle": "Warning",
     "textContinuousPage": "Continuous Page",
     "textCurrentPosition": "Current Position",
@@ -37,7 +38,6 @@
     "textLeftBottom": "Left Bottom",
     "textLeftTop": "Left Top",
     "textLink": "Link",
-    "textLinkSettings": "Link Settings",
     "textLocation": "Location",
     "textNextPage": "Next Page",
     "textOddPage": "Odd Page",
@@ -77,10 +77,16 @@
       "textCenter": "Ortaya Hizala",
       "textChart": "Grafik",
       "textCollaboration": "Ortak çalışma",
+      "textContextual": "Aynı stildeki paragrafların arasına boşluk ekleme",
+      "textDeleted": "Silindi:",
+      "textInserted": "Eklendi:",
       "textJustify": "İki yana hizala",
       "textLeft": "Sola Hizala",
       "textNoContextual": "Aynı stildeki paragraflar arasına aralık ekle",
       "textNum": "Numaralandırmayı değiştir",
+      "textParaMoveFromDown": "Aşağıya taşı",
+      "textParaMoveFromUp": "Aşağıya taşı:",
+      "textParaMoveTo": "Taşındı:",
       "textRight": "Sağa Hizala",
       "textShd": "Arka plan rengi",
       "textTabs": "Sekmeleri değiştir",
@@ -88,10 +94,8 @@
       "textBreakBefore": "Page break before",
       "textColor": "Font color",
       "textComments": "Comments",
-      "textContextual": "Don't add intervals between paragraphs of the same style",
       "textDelete": "Delete",
       "textDeleteComment": "Delete Comment",
-      "textDeleted": "Deleted:",
       "textDeleteReply": "Delete Reply",
       "textDisplayMode": "Display Mode",
       "textDone": "Done",
@@ -109,7 +113,6 @@
       "textImage": "Image",
       "textIndentLeft": "Indent left",
       "textIndentRight": "Indent right",
-      "textInserted": "Inserted:",
       "textItalic": "Italic",
       "textKeepLines": "Keep lines together",
       "textKeepNext": "Keep with next",
@@ -130,9 +133,6 @@
       "textParaDeleted": "Paragraph Deleted",
       "textParaFormatted": "Paragraph Formatted",
       "textParaInserted": "Paragraph Inserted",
-      "textParaMoveFromDown": "Moved Down:",
-      "textParaMoveFromUp": "Moved Up:",
-      "textParaMoveTo": "Moved:",
       "textPosition": "Position",
       "textReject": "Reject",
       "textRejectAllChanges": "Reject All Changes",
@@ -164,16 +164,17 @@
     }
   },
   "ContextMenu": {
+    "errorCopyCutPaste": "Context menüyü kullanarak yapılacak kopyalama, kesme ve yapıştırma işlemleri sadece bu dosya özelinde yapılabilecektir.",
     "menuAddComment": "Yorum Ekle",
     "menuAddLink": "Bağlantı Ekle",
     "menuCancel": "İptal Et",
+    "menuContinueNumbering": "Numaralandırmaya devam et",
+    "menuJoinList": "Bir önceki listeye bağlan",
     "textColumns": "Sütunlar",
-    "errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only.",
-    "menuContinueNumbering": "Continue numbering",
+    "textDoNotShowAgain": "Tekrar gösterme",
     "menuDelete": "Delete",
     "menuDeleteTable": "Delete Table",
     "menuEdit": "Edit",
-    "menuJoinList": "Join to previous list",
     "menuMerge": "Merge",
     "menuMore": "More",
     "menuOpenLink": "Open Link",
@@ -186,7 +187,6 @@
     "menuViewComment": "View Comment",
     "textCancel": "Cancel",
     "textCopyCutPasteActions": "Copy, Cut and Paste Actions",
-    "textDoNotShowAgain": "Don't show again",
     "textNumberingValue": "Numbering Value",
     "textOk": "OK",
     "textRows": "Rows"
@@ -219,6 +219,8 @@
     "textChart": "Grafik",
     "textClose": "Kapat",
     "textColor": "Renk",
+    "textFirstLine": "İlk Satır",
+    "textNoStyles": "Bu tip çizelge için stil yok!",
     "notcriticalErrorTitle": "Warning",
     "textContinueFromPreviousSection": "Continue from previous section",
     "textCustomColor": "Custom Color",
@@ -232,7 +234,6 @@
     "textEmptyImgUrl": "You need to specify image URL.",
     "textFill": "Fill",
     "textFirstColumn": "First Column",
-    "textFirstLine": "FirstLine",
     "textFlow": "Flow",
     "textFontColor": "Font Color",
     "textFontColors": "Font Colors",
@@ -258,7 +259,6 @@
     "textMoveForward": "Move Forward",
     "textMoveWithText": "Move with Text",
     "textNone": "None",
-    "textNoStyles": "No styles for this type of charts.",
     "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
     "textNumbers": "Numbers",
     "textOpacity": "Opacity",
@@ -307,6 +307,11 @@
     "textWrap": "Wrap"
   },
   "Error": {
+    "errorConnectToServer": "Doküman kaydedilemiyor. Kontrol et.",
+    "errorEditingDownloadas": "Dokümanla çalışma sırasında hata oluştu.<br> Lokal olarak dosyayı kaydetmek için dokümanı indirin.",
+    "errorMailMergeLoadFile": "Yükleme başarısız",
+    "errorStockChart": "Yanlış satır sırası. Stok çizelgesi oluşturmak içi, verilen sıralamada veriyi yerleştirmek gereklidir: <br>  ücret açma, max ücret, minimum ücret ve ücret kapama",
+    "errorViewerDisconnect": "Bağlantı kesildi. Dokümanı hala görebilirsiniz,<br> ancak Bağlantı tekrar sağlanıncaya kadar ve sayfa yüklenmeden, dosyayı indirmek veya çıktısını almak mümkün olmayacaktır. ",
     "openErrorText": "Dosya açılırken bir hata oluştu.",
     "saveErrorText": "Dosya kaydedilirken bir hata oluştu",
     "convertationTimeoutText": "Conversion timeout exceeded.",
@@ -314,28 +319,23 @@
     "criticalErrorTitle": "Error",
     "downloadErrorText": "Download failed.",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your admin.",
-    "errorBadImageUrl": "Image url is incorrect",
-    "errorConnectToServer": "Can't save this doc. Check your connection settings or contact the admin.<br>When you click OK, you will be prompted to download the document.",
+    "errorBadImageUrl": "Image URL is incorrect",
     "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
     "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
     "errorDataRange": "Incorrect data range.",
     "errorDefaultMessage": "Error code: %1",
-    "errorEditingDownloadas": "An error occurred during the work with the document.<br>Download document to save the file backup copy locally.",
     "errorFilePassProtect": "The file is password protected and could not be opened.",
     "errorFileSizeExceed": "The file size exceeds your server limit.<br>Please, contact your admin.",
     "errorKeyEncrypt": "Unknown key descriptor",
     "errorKeyExpire": "Key descriptor expired",
     "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
-    "errorMailMergeLoadFile": "Loading failed",
     "errorMailMergeSaveFile": "Merge failed.",
     "errorSessionAbsolute": "The document editing session has expired. Please, reload the page.",
     "errorSessionIdle": "The document has not been edited for quite a long time. Please, reload the page.",
     "errorSessionToken": "The connection to the server has been interrupted. Please, reload the page.",
-    "errorStockChart": "Incorrect row order. To build a stock chart, place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
     "errorUpdateVersionOnDisconnect": "Internet 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.",
     "errorUserDrop": "The file can't be accessed right now.",
     "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
-    "errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but you won't be able to download or print it until the connection is restored and the page is reloaded.",
     "notcriticalErrorTitle": "Warning",
     "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please, reload the page.",
     "splitDividerErrorText": "The number of rows must be a divisor of %1",
@@ -348,19 +348,23 @@
   },
   "Main": {
     "SDK": {
+      " -Section ": "Bölüm",
       "above": "Yukarıda",
       "below": "Altında",
       "Choose an item": "Bir öğe seçin",
+      "Click to load image": "Resmi yüklemek için tıkla",
       "Diagram Title": "Grafik başlığı",
-      " -Section ": " -Section ",
+      "endnote text": "Endnote metni",
+      "Error! Main Document Only": "Hata! Yanlızca Ana Doküman.",
+      "Error! No text of specified style in document": "Hata! Doküman içinde belirtilen stil metni yok.",
+      "Index Too Large": "Index Çok Büyük",
+      "Is Not In Table": "Tabloda mevcut değil",
+      "Missing Argument": "Eksik Değişken",
+      "Missing Operator": "Eksik Operatör",
       "Caption": "Caption",
-      "Click to load image": "Click to load image",
       "Current Document": "Current Document",
-      "endnote text": "Endnote Text",
       "Enter a date": "Enter a date",
       "Error! Bookmark not defined": "Error! Bookmark not defined.",
-      "Error! Main Document Only": "Error! Main Document Only.",
-      "Error! No text of specified style in document": "Error! No text of specified style in document.",
       "Error! Not a valid bookmark self-reference": "Error! Not a valid bookmark self-reference.",
       "Even Page ": "Even Page ",
       "First Page ": "First Page ",
@@ -377,12 +381,8 @@
       "Heading 8": "Heading 8",
       "Heading 9": "Heading 9",
       "Hyperlink": "Hyperlink",
-      "Index Too Large": "Index Too Large",
       "Intense Quote": "Intense Quote",
-      "Is Not In Table": "Is Not In Table",
       "List Paragraph": "List Paragraph",
-      "Missing Argument": "Missing Argument",
-      "Missing Operator": "Missing Operator",
       "No Spacing": "No Spacing",
       "No table of contents entries found": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
       "No table of figures entries found": "No table of figures entries found.",
@@ -411,6 +411,8 @@
     },
     "textAnonymous": "Anonim",
     "textClose": "Kapat",
+    "textNoLicenseTitle": "Lisans limitine ulaşıldı.",
+    "warnLicenseLimitedNoAccess": "Lisans süresi doldu. Doküman edit etme özelliğini kullanmaya izniniz bulunmamaktadır. Lütfen, yöneticinizle iletişime geçin.",
     "criticalErrorTitle": "Error",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please, contact your administrator.",
     "errorOpensource": "Using the free Community version, you can open documents for viewing only. To access mobile web editors, a commercial license is required.",
@@ -425,7 +427,6 @@
     "textGuest": "Guest",
     "textHasMacros": "The file contains automatic macros.<br>Do you want to run macros?",
     "textNo": "No",
-    "textNoLicenseTitle": "License limit reached",
     "textPaidFeature": "Paid feature",
     "textRemember": "Remember my choice",
     "textYes": "Yes",
@@ -434,7 +435,6 @@
     "titleUpdateVersion": "Version changed",
     "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.",
     "warnLicenseExp": "Your license has expired. Please, update your license and refresh the page.",
-    "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please, contact your admin.",
     "warnLicenseLimitedRenewed": "The license needs to be renewed. You have limited access to document editing functionality.<br>Please contact your administrator to get full access",
     "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
     "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
@@ -453,12 +453,21 @@
     "textCancel": "İptal Et",
     "textCaseSensitive": "Büyük küçük harfe duyarlı",
     "textCentimeter": "Santimetre",
+    "textChooseEncoding": "Kodlama Seç",
     "textCollaboration": "Ortak çalışma",
     "textColorSchemes": "Renk Şeması",
+    "textDisableAllMacrosWithNotification": "Makroları bildirim ile pasifleştir",
+    "textDisableAllMacrosWithoutNotification": "Tüm makroları bildirimsiz devre dışı bırak",
+    "textDownloadRtf": "Bu biçimde kaydetmeye devam ederseniz, bazı biçimler kaybolabilir. Devam etmek istediğinize emin misiniz?",
+    "textDownloadTxt": "Bu biçimde kayıt etmeye devam ederseniz, metin dışında tüm özellikler kaybolacaktır. Devam etmek istediğinize emin misiniz?",
+    "textEnableAllMacrosWithoutNotification": "Tüm makroları bildirimsiz etkinleştir",
+    "textFindAndReplaceAll": " Bul ve Hepsini Değiştir",
+    "textMarginsW": "Sağ ve Sol çizelgeler verilen sayfa genişliği için çok geniş",
+    "txtDownloadTxt": "TXT olarak indir",
+    "txtScheme22": "Yeni Ofis",
     "advDRMOptions": "Protected File",
     "advDRMPassword": "Password",
     "notcriticalErrorTitle": "Warning",
-    "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "textComment": "Comment",
     "textComments": "Comments",
@@ -466,22 +475,16 @@
     "textCreated": "Created",
     "textCustomSize": "Custom Size",
     "textDisableAll": "Disable All",
-    "textDisableAllMacrosWithNotification": "Disable all macros with notification",
-    "textDisableAllMacrosWithoutNotification": "Disable all macros without notification",
     "textDocumentInfo": "Document Info",
     "textDocumentSettings": "Document Settings",
     "textDocumentTitle": "Document Title",
     "textDone": "Done",
     "textDownload": "Download",
     "textDownloadAs": "Download As",
-    "textDownloadRtf": "If you continue saving in this format some of the formatting might be lost. Are you sure you want to continue?",
-    "textDownloadTxt": "If you continue saving in this format all features except the text will be lost. Are you sure you want to continue?",
     "textEnableAll": "Enable All",
-    "textEnableAllMacrosWithoutNotification": "Enable all macros without notification",
     "textEncoding": "Encoding",
     "textFind": "Find",
     "textFindAndReplace": "Find and Replace",
-    "textFindAndReplaceAll": "Find and Replace All",
     "textFormat": "Format",
     "textHelp": "Help",
     "textHiddenTableBorders": "Hidden Table Borders",
@@ -496,13 +499,14 @@
     "textMacrosSettings": "Macros Settings",
     "textMargins": "Margins",
     "textMarginsH": "Top and bottom margins are too high for a given page height",
-    "textMarginsW": "Left and right margins are too wide for a given page width",
     "textNoCharacters": "Nonprinting Characters",
     "textNoTextFound": "Text not found",
     "textOk": "Ok",
     "textOpenFile": "Enter a password to open the file",
     "textOrientation": "Orientation",
     "textOwner": "Owner",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
     "textPoint": "Point",
     "textPortrait": "Portrait",
     "textPrint": "Print",
@@ -514,14 +518,16 @@
     "textSearch": "Search",
     "textSettings": "Settings",
     "textShowNotification": "Show Notification",
+    "textSpaces": "Spaces",
     "textSpellcheck": "Spell Checking",
     "textStatistic": "Statistic",
     "textSubject": "Subject",
+    "textSymbols": "Symbols",
     "textTitle": "Title",
     "textTop": "Top",
     "textUnitOfMeasurement": "Unit Of Measurement",
     "textUploaded": "Uploaded",
-    "txtDownloadTxt": "Download TXT",
+    "textWords": "Words",
     "txtIncorrectPwd": "Password is incorrect",
     "txtOk": "Ok",
     "txtProtected": "Once you enter the password and open the file, the current password will be reset",
@@ -539,7 +545,6 @@
     "txtScheme2": "Grayscale",
     "txtScheme20": "Urban",
     "txtScheme21": "Verve",
-    "txtScheme22": "New Office",
     "txtScheme3": "Apex",
     "txtScheme4": "Aspect",
     "txtScheme5": "Civic",

apps/documenteditor/mobile/locale/uk.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/vi.json

@@ -581,7 +581,12 @@
     "textChooseEncoding": "Choose Encoding",
     "textChooseTxtOptions": "Choose TXT Options",
     "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok"
+    "txtOk": "Ok",
+    "textPages": "Pages",
+    "textParagraphs": "Paragraphs",
+    "textSpaces": "Spaces",
+    "textSymbols": "Symbols",
+    "textWords": "Words"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",

apps/documenteditor/mobile/locale/zh.json

@@ -62,12 +62,12 @@
     "Collaboration": {
       "notcriticalErrorTitle": "警告",
       "textAccept": "接受",
-      "textAcceptAllChanges": "接受所有更改",
+      "textAcceptAllChanges": "接受所有修订",
       "textAddComment": "添加评论",
       "textAddReply": "添加回复",
-      "textAllChangesAcceptedPreview": "已经接受所有更改 (预览)",
-      "textAllChangesEditing": "所有更改 (编辑中)",
-      "textAllChangesRejectedPreview": "已经否决所有更改 (预览)",
+      "textAllChangesAcceptedPreview": "已接受所有修订（只读）",
+      "textAllChangesEditing": "显示所有修订（可编辑）",
+      "textAllChangesRejectedPreview": "已拒绝所有修订（只读）",
       "textAtLeast": "至少",
       "textAuto": "自动",
       "textBack": "返回",
@@ -122,6 +122,7 @@
       "textNot": "不",
       "textNoWidow": "没有单独控制",
       "textNum": "更改编号",
+      "textOk": "好",
       "textOriginal": "原始版",
       "textParaDeleted": "已删除段落",
       "textParaFormatted": "段落已被排版",
@@ -154,8 +155,7 @@
       "textTryUndoRedo": "快速共同编辑模式下，撤销/重做功能被禁用。",
       "textUnderline": "下划线",
       "textUsers": "用户",
-      "textWidow": "单独控制",
-      "textOk": "Ok"
+      "textWidow": "单独控制"
     },
     "ThemeColorPalette": {
       "textCustomColors": "自定义颜色",
@@ -168,38 +168,38 @@
     "menuAddComment": "添加评论",
     "menuAddLink": "添加链接",
     "menuCancel": "取消",
+    "menuContinueNumbering": "继续编号",
     "menuDelete": "删除",
     "menuDeleteTable": "删除表",
     "menuEdit": "编辑",
+    "menuJoinList": "联接上一个列表",
     "menuMerge": "合并",
     "menuMore": "更多",
     "menuOpenLink": "打开链接",
     "menuReview": "审阅",
     "menuReviewChange": "审查变更",
+    "menuSeparateList": "分隔列表",
     "menuSplit": "分开",
+    "menuStartNewList": "开始新列表",
+    "menuStartNumberingFrom": "设置编号值",
     "menuViewComment": "查看批注",
+    "textCancel": "取消",
     "textColumns": "列",
     "textCopyCutPasteActions": "拷贝，剪切和粘贴操作",
     "textDoNotShowAgain": "不要再显示",
-    "textRows": "行",
-    "menuContinueNumbering": "Continue numbering",
-    "menuJoinList": "Join to previous list",
-    "menuSeparateList": "Separate list",
-    "menuStartNewList": "Start new list",
-    "menuStartNumberingFrom": "Set numbering value",
-    "textCancel": "Cancel",
-    "textNumberingValue": "Numbering Value",
-    "textOk": "OK"
+    "textNumberingValue": "编号值",
+    "textOk": "好",
+    "textRows": "行"
   },
   "Edit": {
     "notcriticalErrorTitle": "警告",
     "textActualSize": "实际大小",
-    "textAddCustomColor": "\n添加自定义颜色",
+    "textAddCustomColor": "添加自定义颜色",
     "textAdditional": "其他",
     "textAdditionalFormatting": "其他格式",
     "textAddress": "地址",
-    "textAdvanced": "进阶",
-    "textAdvancedSettings": "进阶设置",
+    "textAdvanced": "高级",
+    "textAdvancedSettings": "高级设置",
     "textAfter": "之后",
     "textAlign": "对齐",
     "textAllCaps": "全部大写",
@@ -214,6 +214,7 @@
     "textBehind": "之后",
     "textBorder": "边界",
     "textBringToForeground": "放到最上面",
+    "textBullets": "着重号",
     "textBulletsAndNumbers": "项目符号与编号",
     "textCellMargins": "单元格边距",
     "textChart": "图表",
@@ -259,6 +260,7 @@
     "textNone": "无",
     "textNoStyles": "这个类型的图表没有对应的样式。",
     "textNotUrl": "该字段应为“http://www.example.com”格式的URL",
+    "textNumbers": "数字",
     "textOpacity": "不透明度",
     "textOptions": "选项",
     "textOrphanControl": "单独控制",
@@ -302,9 +304,7 @@
     "textTopAndBottom": "上下",
     "textTotalRow": "总行",
     "textType": "类型",
-    "textWrap": "包裹",
-    "textBullets": "Bullets",
-    "textNumbers": "Numbers"
+    "textWrap": "包裹"
   },
   "Error": {
     "convertationTimeoutText": "转换超时",
@@ -323,6 +323,7 @@
     "errorFileSizeExceed": "文件大小超出了服务器的限制。<br>恳请你联系管理员。",
     "errorKeyEncrypt": "未知密钥描述",
     "errorKeyExpire": "密钥过期",
+    "errorLoadingFont": "字体未加载。<br>请与文档服务器管理员联系。",
     "errorMailMergeLoadFile": "加载失败",
     "errorMailMergeSaveFile": "合并失败",
     "errorSessionAbsolute": "该文件编辑窗口已过期。请刷新该页。",
@@ -332,7 +333,7 @@
     "errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已变更。<br>在继续工作之前，需要下载文件或复制其内容以避免丢失数据，然后刷新此页。",
     "errorUserDrop": "当前不能访问该文件。",
     "errorUsersExceed": "超过了定价计划允许的用户数",
-    "errorViewerDisconnect": "网络连接失败。你仍然可以查看这个文档，<br>但在连接恢复并刷新该页之前，你将不能下载这个文档。",
+    "errorViewerDisconnect": "网络连接失败。你仍然可以查看这个文档，<br>但在连接恢复并刷新该页之前，你将不能下载或打印这个文档。",
     "notcriticalErrorTitle": "警告",
     "openErrorText": "打开文件时发生错误",
     "saveErrorText": "保存文件时发生错误",
@@ -343,8 +344,7 @@
     "unknownErrorText": "未知错误。",
     "uploadImageExtMessage": "未知图像格式。",
     "uploadImageFileCountMessage": "没有图片上传",
-    "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB.",
-    "errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator."
+    "uploadImageSizeMessage": "图片太大了。最大允许的大小是 25 MB."
   },
   "LongActions": {
     "applyChangesTextText": "数据加载中…",
@@ -391,7 +391,22 @@
     "leavePageText": "你有未保存的修改。点击“留在该页”可等待自动保存完成。点击“离开该页”将丢弃全部未经保存的修改。",
     "notcriticalErrorTitle": "警告",
     "SDK": {
+      " -Section ": "-节",
+      "above": "以上",
+      "below": "以下",
+      "Caption": "标题",
+      "Choose an item": "选择一个项目",
+      "Click to load image": "点按以加载图像",
+      "Current Document": "当前文件",
       "Diagram Title": "图表标题",
+      "endnote text": "结束处文本",
+      "Enter a date": "输入日期",
+      "Error! Bookmark not defined": "错误！未定义书签。",
+      "Error! Main Document Only": "错误！仅限主文档。",
+      "Error! No text of specified style in document": "错误！文档中没有指定样式的文本。",
+      "Error! Not a valid bookmark self-reference": "错误！不是有效的书签自引用。",
+      "Even Page ": "偶数页",
+      "First Page ": "首页",
       "Footer": "页脚",
       "footnote text": "脚注文本",
       "Header": "页眉",
@@ -404,53 +419,38 @@
       "Heading 7": "标题7",
       "Heading 8": "标题8",
       "Heading 9": "标题9",
+      "Hyperlink": "超链接",
+      "Index Too Large": "指数过大",
       "Intense Quote": "直接引用",
+      "Is Not In Table": "不在表格中",
       "List Paragraph": "列表段落",
+      "Missing Argument": "缺少参数",
+      "Missing Operator": "缺少运算符",
       "No Spacing": "无空格",
+      "No table of contents entries found": "未找到目录条目。",
+      "No table of figures entries found": "未找到图片或表格的元素。",
+      "None": "无",
       "Normal": "正常",
+      "Number Too Large To Format": "数字太大，无法设定格式",
+      "Odd Page ": "奇数页",
       "Quote": "引用",
+      "Same as Previous": "与上一个相同",
       "Series": "系列",
       "Subtitle": "副标题",
+      "Syntax Error": "语法错误",
+      "Table Index Cannot be Zero": "表格索引不能为零",
+      "Table of Contents": "目录",
+      "table of figures": "图表目录",
+      "The Formula Not In Table": "公式不在表格中",
       "Title": "标题",
+      "TOC Heading": "目录标题",
+      "Type equation here": "在此处输入公式",
+      "Undefined Bookmark": "未定义书签",
+      "Unexpected End of Formula": "意外的公式结尾",
       "X Axis": "X 轴 XAS",
       "Y Axis": "Y 轴",
       "Your text here": "你的文本在此",
-      " -Section ": " -Section ",
-      "above": "above",
-      "below": "below",
-      "Caption": "Caption",
-      "Choose an item": "Choose an item",
-      "Click to load image": "Click to load image",
-      "Current Document": "Current Document",
-      "endnote text": "Endnote Text",
-      "Enter a date": "Enter a date",
-      "Error! Bookmark not defined": "Error! Bookmark not defined.",
-      "Error! Main Document Only": "Error! Main Document Only.",
-      "Error! No text of specified style in document": "Error! No text of specified style in document.",
-      "Error! Not a valid bookmark self-reference": "Error! Not a valid bookmark self-reference.",
-      "Even Page ": "Even Page ",
-      "First Page ": "First Page ",
-      "Hyperlink": "Hyperlink",
-      "Index Too Large": "Index Too Large",
-      "Is Not In Table": "Is Not In Table",
-      "Missing Argument": "Missing Argument",
-      "Missing Operator": "Missing Operator",
-      "No table of contents entries found": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.",
-      "No table of figures entries found": "No table of figures entries found.",
-      "None": "None",
-      "Number Too Large To Format": "Number Too Large To Format",
-      "Odd Page ": "Odd Page ",
-      "Same as Previous": "Same as Previous",
-      "Syntax Error": "Syntax Error",
-      "Table Index Cannot be Zero": "Table Index Cannot be Zero",
-      "Table of Contents": "Table of Contents",
-      "table of figures": "Table of figures",
-      "The Formula Not In Table": "The Formula Not In Table",
-      "TOC Heading": "TOC Heading",
-      "Type equation here": "Type equation here",
-      "Undefined Bookmark": "Undefined Bookmark",
-      "Unexpected End of Formula": "Unexpected End of Formula",
-      "Zero Divide": "Zero Divide"
+      "Zero Divide": "除数为零"
     },
     "textAnonymous": "匿名",
     "textBuyNow": "访问网站",
@@ -491,6 +491,8 @@
     "textCancel": "取消",
     "textCaseSensitive": "区分大小写",
     "textCentimeter": "厘米",
+    "textChooseEncoding": "选择编码格式",
+    "textChooseTxtOptions": "选择TXT选项",
     "textCollaboration": "协作",
     "textColorSchemes": "颜色方案",
     "textComment": "评论",
@@ -532,9 +534,12 @@
     "textMarginsW": "对给定的页面宽度来说，左右边距过高。",
     "textNoCharacters": "非打印字符",
     "textNoTextFound": "文本没找到",
+    "textOk": "好",
     "textOpenFile": "输入密码来打开文件",
     "textOrientation": "方向",
     "textOwner": "创建者",
+    "textPages": "页面",
+    "textParagraphs": "段落",
     "textPoint": "点",
     "textPortrait": "纵向",
     "textPrint": "打印",
@@ -546,42 +551,42 @@
     "textSearch": "搜索",
     "textSettings": "设置",
     "textShowNotification": "显示通知",
+    "textSpaces": "间隔",
     "textSpellcheck": "拼写检查",
     "textStatistic": "统计",
     "textSubject": "主题",
+    "textSymbols": "符号",
     "textTitle": "标题",
     "textTop": "顶部",
     "textUnitOfMeasurement": "计量单位",
     "textUploaded": "已上传",
+    "textWords": "字幕",
+    "txtDownloadTxt": "下载 TXT",
     "txtIncorrectPwd": "密码有误",
+    "txtOk": "好",
     "txtProtected": "输入密码并打开文件后，当前密码将会被重设。",
-    "textChooseEncoding": "Choose Encoding",
-    "textChooseTxtOptions": "Choose TXT Options",
-    "textOk": "Ok",
-    "txtDownloadTxt": "Download TXT",
-    "txtOk": "Ok",
-    "txtScheme1": "Office",
-    "txtScheme10": "Median",
-    "txtScheme11": "Metro",
-    "txtScheme12": "Module",
-    "txtScheme13": "Opulent",
-    "txtScheme14": "Oriel",
-    "txtScheme15": "Origin",
-    "txtScheme16": "Paper",
-    "txtScheme17": "Solstice",
-    "txtScheme18": "Technic",
-    "txtScheme19": "Trek",
-    "txtScheme2": "Grayscale",
-    "txtScheme20": "Urban",
-    "txtScheme21": "Verve",
-    "txtScheme22": "New Office",
-    "txtScheme3": "Apex",
-    "txtScheme4": "Aspect",
-    "txtScheme5": "Civic",
-    "txtScheme6": "Concourse",
-    "txtScheme7": "Equity",
-    "txtScheme8": "Flow",
-    "txtScheme9": "Foundry"
+    "txtScheme1": "办公室",
+    "txtScheme10": "中位数",
+    "txtScheme11": "组件",
+    "txtScheme12": "模块",
+    "txtScheme13": "富裕的",
+    "txtScheme14": "奥丽尔",
+    "txtScheme15": "原来的",
+    "txtScheme16": "纸",
+    "txtScheme17": "至点",
+    "txtScheme18": "技术",
+    "txtScheme19": "行进",
+    "txtScheme2": "灰度",
+    "txtScheme20": "城市的",
+    "txtScheme21": "气势",
+    "txtScheme22": "新的 Office",
+    "txtScheme3": "顶点",
+    "txtScheme4": "方面",
+    "txtScheme5": "公民",
+    "txtScheme6": "汇合",
+    "txtScheme7": "公平",
+    "txtScheme8": "流动",
+    "txtScheme9": "发现"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "你有未保存的修改。点击“留在该页”可等待自动保存完成。点击“离开该页”将丢弃全部未经保存的修改。",

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

@@ -32,24 +32,26 @@ class EncodingController extends Component {
             this.mode = mode;
             this.advOptions = advOptions;
             this.formatOptions = formatOptions;
-            this.pages = [];
-            this.pagesName = [];
+            this.encodeData = [];
         
             const recommendedSettings = this.advOptions.asc_getRecommendedSettings();
 
-            this.initPages();
+            this.initEncodeData();
             this.valueEncoding = recommendedSettings.asc_getCodePage();
         
             this.setState({
-                isOpen: true
+                isOpen: true 
             });
         }
     }
 
-    initPages() {
+    initEncodeData() {
         for (let page of this.advOptions.asc_getCodePages()) {
-            this.pages.push(page.asc_getCodePage());
-            this.pagesName.push(page.asc_getCodePageName());
+            this.encodeData.push({
+                value: page.asc_getCodePage(),
+                displayValue: page.asc_getCodePageName(),
+                lcid: page.asc_getLcid()
+            });
         }
     }
 
@@ -78,8 +80,7 @@ class EncodingController extends Component {
                     closeModal={this.closeModal}
                     mode={this.mode}  
                     onSaveFormat={this.onSaveFormat} 
-                    pages={this.pages}
-                    pagesName={this.pagesName}
+                    encodeData={this.encodeData}
                     valueEncoding={this.valueEncoding}
                 /> 
         );

apps/documenteditor/mobile/src/less/app.less

@@ -108,8 +108,11 @@
    }
 }
 
-.swiper-pagination-bullet-active{
-    background: @black;
+.swiper-container {
+    height: 100%;
+    .swiper-pagination-bullet-active{
+        background: @black;
+    }
 }
 
 // Skeleton table
@@ -126,3 +129,4 @@
     height: 50px;
 }
 
+

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

@@ -6,10 +6,10 @@ import { Device } from '../../../../common/mobile/utils/device';
 const PageEncoding = props => {
     const { t } = useTranslation();
     const _t = t("Settings", { returnObjects: true });
-    const pagesName = props.pagesName;
-    const pages = props.pages;
+    const encodeData = props.encodeData;
     const [stateEncoding, setStateEncoding] = useState(props.valueEncoding);
-    const nameEncoding = pagesName[pages.indexOf(stateEncoding)];
+    const getIndexNameEncoding = () => encodeData.findIndex(encoding => encoding.value === stateEncoding);
+    const nameEncoding = encodeData[getIndexNameEncoding()].displayValue;
     const mode = props.mode;
 
     const changeStateEncoding = value => {
@@ -24,8 +24,7 @@ const PageEncoding = props => {
                 <List>
                     <ListItem title={nameEncoding} link="/encoding-list/" routeProps={{
                         stateEncoding,
-                        pages: props.pages,
-                        pagesName: props.pagesName,
+                        encodeData,
                         changeStateEncoding
                     }}></ListItem>
                 </List>
@@ -45,19 +44,18 @@ const PageEncodingList = props => {
     const { t } = useTranslation();
     const _t = t("Settings", { returnObjects: true });
     const [currentEncoding, changeCurrentEncoding] = useState(props.stateEncoding);
-    const pages = props.pages;
-    const pagesName = props.pagesName;
+    const encodeData = props.encodeData;
     
     return (
         <Page>
             <Navbar title={_t.txtDownloadTxt} backLink={_t.textBack} />
             <BlockTitle>{_t.textChooseEncoding}</BlockTitle>
             <List>
-                {pagesName.map((name, index) => {
+                {encodeData.map((encoding, index) => {
                     return (
-                        <ListItem radio checked={currentEncoding === pages[index]} title={name} key={index} value={pages[index]} onChange={() => {
-                            changeCurrentEncoding(pages[index]);
-                            props.changeStateEncoding(pages[index]);
+                        <ListItem radio checked={currentEncoding === encoding.value} title={encoding.displayValue} key={index} value={encoding.value} after={encoding.lcid} onChange={() => {
+                            changeCurrentEncoding(encoding.value);
+                            props.changeStateEncoding(encoding.value);
                             f7.views.current.router.back();
                         }}></ListItem>
                     )
@@ -79,8 +77,7 @@ class EncodingView extends Component {
                     onSaveFormat={this.props.onSaveFormat} 
                     closeModal={this.props.closeModal}
                     mode={this.props.mode}  
-                    pages={this.props.pages}
-                    pagesName={this.props.pagesName}
+                    encodeData={this.props.encodeData}
                     valueEncoding={this.props.valueEncoding}
                 />
             </Popup>
@@ -108,8 +105,7 @@ const Encoding = props => {
             closeModal={props.closeModal}
             onSaveFormat={props.onSaveFormat} 
             mode={props.mode}  
-            pages={props.pages}
-            pagesName={props.pagesName}
+            encodeData={props.encodeData}
             valueEncoding={props.valueEncoding}
         />
     )

apps/documenteditor/mobile/src/view/add/AddImage.jsx

@@ -11,7 +11,7 @@ const PageLinkSettings = props => {
         <Page>
             <Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar>
             <BlockTitle>{_t.textAddress}</BlockTitle>
-            <List className='inputs-list'>
+            <List className='add-image'>
                 <ListInput
                     type='text'
                     placeholder={_t.textImageURL}

apps/documenteditor/mobile/src/view/edit/EditImage.jsx

@@ -184,12 +184,12 @@ const PageReplace = props => {
             </Navbar>
             <List>
                 <ListItem title={_t.textPictureFromLibrary} onClick={() => {props.onReplaceByFile()}}>
-                    <Icon slot="media" icon="icon-link"></Icon>
+                    <Icon slot="media" icon="icon-image-library"></Icon>
                 </ListItem>
                 <ListItem title={_t.textPictureFromURL} link='/edit-image-link/' routeProps={{
                     onReplaceByUrl: props.onReplaceByUrl
                 }}>
-                    <Icon slot="media" icon="icon-image-library"></Icon>
+                    <Icon slot="media" icon="icon-link"></Icon>
                 </ListItem>
             </List>
         </Page>

apps/documenteditor/mobile/src/view/edit/EditShape.jsx

@@ -508,7 +508,13 @@ const EditShape = props => {
     const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill();
     const shapeObject = props.storeFocusObjects.shapeObject;
     const wrapType = props.storeShapeSettings.getWrapType(shapeObject);
-    
+
+    const shapeType = shapeObject.get_ShapeProperties().asc_getType();
+    const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
+    || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
+    || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
+    || shapeType=='straightConnector1';
+
     let disableRemove = !!props.storeFocusObjects.paragraphObject;
 
     return (
@@ -533,9 +539,11 @@ const EditShape = props => {
                     onOverlap: props.onOverlap,
                     onWrapDistance: props.onWrapDistance
                 }}></ListItem>
-                <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
-                    onReplace: props.onReplace
-                }}></ListItem>
+                { !hideChangeType &&
+                    <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
+                        onReplace: props.onReplace
+                    }}></ListItem>
+                }
                 { wrapType !== 'inline' && <ListItem  title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
                     onReorder: props.onReorder
                 }}></ListItem> }

apps/documenteditor/mobile/src/view/settings/DocumentInfo.jsx

@@ -57,11 +57,11 @@ const PageDocumentInfo = (props) => {
             ) : null}
             <BlockTitle>{_t.textStatistic}</BlockTitle>
             <List> 
-                <ListItem title="Pages" after={isLoaded ? String(pageCount) : _t.textLoading}></ListItem>
-                <ListItem title="Paragraphs" after={isLoaded ? String(paragraphCount) : _t.textLoading}></ListItem>
-                <ListItem title="Words" after={isLoaded ? String(wordsCount) : _t.textLoading}></ListItem>
-                <ListItem title="Symbols" after={isLoaded ? String(symbolsCount) : _t.textLoading}></ListItem>
-                <ListItem title="Spaces" after={isLoaded ? String(symbolsWSCount) : _t.textLoading}></ListItem>
+                <ListItem title={t('Settings.textPages')} after={isLoaded ? String(pageCount) : _t.textLoading}></ListItem>
+                <ListItem title={t('Settings.textParagraphs')} after={isLoaded ? String(paragraphCount) : _t.textLoading}></ListItem>
+                <ListItem title={t('Settings.textWords')} after={isLoaded ? String(wordsCount) : _t.textLoading}></ListItem>
+                <ListItem title={t('Settings.textSymbols')} after={isLoaded ? String(symbolsCount) : _t.textLoading}></ListItem>
+                <ListItem title={t('Settings.textSpaces')} after={isLoaded ? String(symbolsWSCount) : _t.textLoading}></ListItem>
             </List>
             {props.title ? (
                 <Fragment>

apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx

@@ -174,10 +174,8 @@ const PageDocumentColorSchemes = props => {
                         return (
                             <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
                                 onChange={() => {
-                                    if(index !== curScheme) {
-                                        setScheme(index);
-                                        props.onColorSchemeChange(index);
-                                    };
+                                    setScheme(index);
+                                    setTimeout(() => props.onColorSchemeChange(index), 10);
                             }}>
                                 <div slot="before-title">
                                     <span className="color-schema-block">

apps/presentationeditor/embed/js/ApplicationController.js

@@ -37,6 +37,7 @@ PE.ApplicationController = new(function(){
         docConfig = {},
         embedConfig = {},
         permissions = {},
+        appOptions = {},
         maxPages = 0,
         created = false,
         currentPage = 0,
@@ -455,23 +456,8 @@ PE.ApplicationController = new(function(){
     }
 
     function onEditorPermissions(params) {
-        if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
-            config.customization && config.customization.logo ) {
-
-            var logo = $('#header-logo');
-            if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
-                logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
-                logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
-
-                config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
-            }
-
-            if (config.customization.logo.url) {
-                logo.attr('href', config.customization.logo.url);
-            } else if (config.customization.logo.url!==undefined) {
-                logo.removeAttr('href');logo.removeAttr('target');
-            }
-        }
+        appOptions.canBranding  = params.asc_getCustomization();
+        appOptions.canBranding && setBranding(config.customization);
 
         var $parent = labelDocName.parent();
         var _left_width = $parent.position().left,
@@ -657,6 +643,24 @@ PE.ApplicationController = new(function(){
     function onBeforeUnload () {
         common.localStorage.save();
     }
+
+    function setBranding(value) {
+        if ( value && value.logo) {
+            var logo = $('#header-logo');
+            if (value.logo.image || value.logo.imageEmbedded) {
+                logo.html('<img src="'+(value.logo.image || value.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
+                logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
+
+                value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
+            }
+
+            if (value.logo.url) {
+                logo.attr('href', value.logo.url);
+            } else if (value.logo.url!==undefined) {
+                logo.removeAttr('href');logo.removeAttr('target');
+            }
+        }
+    }
     // Helpers
     // -------------------------
 

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

@@ -1011,10 +1011,10 @@ define([
                             if (menu.cmpEl) {
                                 var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
                                 var itemMargin = /*parseInt($(itemEl.get(0)).parent().css('margin-right'))*/-1;
-                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = itemMargin + 1/Common.Utils.applicationPixelRatio());
-                                var itemWidth = itemEl.is(':visible') ? parseInt(itemEl.css('width')) :
-                                    (cmp.itemWidth + parseInt(itemEl.css('padding-left')) + parseInt(itemEl.css('padding-right')) +
-                                    parseInt(itemEl.css('border-left-width')) + parseInt(itemEl.css('border-right-width')));
+                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = -1 / Common.Utils.applicationPixelRatio());
+                                var itemWidth = itemEl.is(':visible') ? parseFloat(itemEl.css('width')) :
+                                    (cmp.itemWidth + parseFloat(itemEl.css('padding-left')) + parseFloat(itemEl.css('padding-right')) +
+                                    parseFloat(itemEl.css('border-left-width')) + parseFloat(itemEl.css('border-right-width')));
 
                                 var minCount = cmp.menuPicker.store.length >= minMenuColumn ? minMenuColumn : cmp.menuPicker.store.length,
                                     columnCount = Math.min(cmp.menuPicker.store.length, Math.round($('.dataview', $(cmp.fieldPicker.el)).width() / (itemMargin + itemWidth) + 0.5));

apps/presentationeditor/main/index.html

@@ -255,16 +255,12 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
 
-        var ui_theme_name = params.uitheme || localStorage.getItem("ui-theme");
-        if ( !!ui_theme_name ) {
-            document.documentElement.classList.add(ui_theme_name);
-        }
-
         if(/MSIE \d|Trident.*rv:/.test(navigator.userAgent))
             document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>');
     </script>
@@ -318,7 +314,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }

apps/presentationeditor/main/index.html.deploy

@@ -247,7 +247,8 @@
 
         var params = getUrlParams(),
             lang = (params["lang"] || 'en').split(/[\-\_]/)[0],
-            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
+            logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null,
+            logoDark = params["headerlogodark"] ? encodeUrlParam(params["headerlogodark"]) : null;
 
         window.frameEditorId = params["frameEditorId"];
         window.parentOrigin = params["parentOrigin"];
@@ -315,7 +316,7 @@
         } else {
             var elem = document.querySelector('.loading-logo img');
             if (elem) {
-                logo && (elem.setAttribute('src', logo));
+                (logo || logoDark) && elem.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark);
                 elem.style.opacity = 1;
             }
         }

apps/presentationeditor/mobile/locale/be.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Zoom In",
       "textZoomOut": "Zoom Out",
-      "textZoomRotate": "Zoom and Rotate"
+      "textZoomRotate": "Zoom and Rotate",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",

apps/presentationeditor/mobile/locale/bg.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Zoom In",
       "textZoomOut": "Zoom Out",
-      "textZoomRotate": "Zoom and Rotate"
+      "textZoomRotate": "Zoom and Rotate",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",

apps/presentationeditor/mobile/locale/ca.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Amplia",
       "textZoomOut": "Redueix",
-      "textZoomRotate": "Amplia i gira"
+      "textZoomRotate": "Amplia i gira",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Estàndard (4:3)",

apps/presentationeditor/mobile/locale/cs.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Zoom In",
       "textZoomOut": "Zoom Out",
-      "textZoomRotate": "Zoom and Rotate"
+      "textZoomRotate": "Zoom and Rotate",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",

apps/presentationeditor/mobile/locale/de.json

@@ -27,11 +27,11 @@
       "textMessageDeleteComment": "Möchten Sie diesen Kommentar wirklich löschen?",
       "textMessageDeleteReply": "Möchten Sie diese Antwort wirklich löschen?",
       "textNoComments": "Dieses Dokument enthält keine Kommentare",
+      "textOk": "OK",
       "textReopen": "Wiederöffnen",
       "textResolve": "Lösen",
       "textTryUndoRedo": "Die Optionen Rückgängig machen/Wiederholen sind für den Schnellmodus deaktiviert.",
-      "textUsers": "Benutzer",
-      "textOk": "Ok"
+      "textUsers": "Benutzer"
     },
     "ThemeColorPalette": {
       "textCustomColors": "Benutzerdefinierte Farben",
@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Vergrößern",
       "textZoomOut": "Verkleinern",
-      "textZoomRotate": "Vergrößern und drehen"
+      "textZoomRotate": "Vergrößern und drehen",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",

apps/presentationeditor/mobile/locale/el.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Zoom In",
       "textZoomOut": "Zoom Out",
-      "textZoomRotate": "Zoom and Rotate"
+      "textZoomRotate": "Zoom and Rotate",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Standard (4:3)",

apps/presentationeditor/mobile/locale/en.json

@@ -132,7 +132,7 @@
     "criticalErrorTitle": "Error",
     "downloadErrorText": "Download failed.",
     "errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your admin.",
-    "errorBadImageUrl": "Image url is incorrect",
+    "errorBadImageUrl": "Image URL is incorrect",
     "errorConnectToServer": "Can't save this doc. Check your connection settings or contact your admin.<br>When you click the 'OK' button, you will be prompted to download the document.",
     "errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
     "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
@@ -376,7 +376,7 @@
       "textTopLeft": "Top-Left",
       "textTopRight": "Top-Right",
       "textTotalRow": "Total Row",
-      "textTransition": "Transition",
+      "textTransitions": "Transitions",
       "textType": "Type",
       "textUnCover": "UnCover",
       "textVerticalIn": "Vertical In",

apps/presentationeditor/mobile/locale/es.json

@@ -382,7 +382,8 @@
       "textZoom": "Zoom",
       "textZoomIn": "Acercar",
       "textZoomOut": "Alejar",
-      "textZoomRotate": "Zoom y giro"
+      "textZoomRotate": "Zoom y giro",
+      "textTransitions": "Transitions"
     },
     "Settings": {
       "mniSlideStandard": "Estándar (4:3)",