Merge branch 'release/v7.2.0' into develop

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

@@ -36,6 +36,11 @@
     !common.utils && (common.utils = {});
 
     common.utils = new(function(){
+        var userAgent = navigator.userAgent.toLowerCase(),
+            check = function(regex){
+                return regex.test(userAgent);
+            },
+            isMac = check(/macintosh|mac os x/);
         return {
             openLink: function(url) {
                 if (url) {
@@ -100,7 +105,9 @@
                             return prop;
                     }
                 }
-            }
+            },
+
+            isMac : isMac
         };
     })();
 }();

apps/common/embed/lib/view/SearchBar.js

@@ -66,9 +66,9 @@ common.view.SearchBar = new(function() {
         },
 
         disableNavButtons: function (resultNumber, allResults) {
-            var disable = $('#search-bar-text').val() === '';
+            var disable = $('#search-bar-text').val() === '' || !allResults;
-            $('#search-bar-back').attr({disabled: disable || !allResults || resultNumber === 0});
+            $('#search-bar-back').attr({disabled: disable});
-            $('#search-bar-next').attr({disabled: disable || resultNumber + 1 === allResults});
+            $('#search-bar-next').attr({disabled: disable});
         },
 
         textFind: 'Find'

apps/common/forms/resources/less/common.less

@@ -546,15 +546,15 @@
     }
     &.search-close {
         background-position: -@icon-width*18 0;
-    }
+        background-position: -@icon-width*18 @icon-normal-top;
-    &.search {
-        background-position: -@icon-width*24 0;
     }
     &.search-arrow-up {
         background-position: -@icon-width*27 0;
+        background-position: -@icon-width*27 @icon-normal-top;
     }
     &.search-arrow-down {
         background-position: -@icon-width*28 0;
+        background-position: -@icon-width*28 @icon-normal-top;
     }
 }
 

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

@@ -358,6 +358,9 @@ define([
                 Common.NotificationCenter.trigger('menu:hide', this, isFromInputControl);
                 if (this.options.takeFocusOnClose) {
                     var me = this;
+                    (me._input && me._input.length>0 && !me.editable) && (me._input[0].selectionStart===me._input[0].selectionEnd) && setTimeout(function() {
+                        me._input[0].selectionStart = me._input[0].selectionEnd = 0;
+                    },1);
                     setTimeout(function(){me.focus();}, 1);
                 }
             },

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

@@ -301,6 +301,7 @@ define([
         },
 
         onItemMouseDown: function(e) {
+            Common.UI.HintManager && Common.UI.HintManager.clearHints();
             if (e.which != 1) {
                 e.preventDefault();
                 e.stopPropagation();

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

@@ -503,7 +503,8 @@ define([
             setMoreButton: function(tab, panel) {
                 var me = this;
                 if (!btnsMore[tab]) {
-                    var box = $('<div class="more-box" style="position: absolute;right: 0; padding-left: 12px;padding-right: 6px;display: none;">' +
+                    var top = panel.position().top;
+                    var box = $('<div class="more-box" style="position: absolute;right: 0; top:'+ top +'px; padding-left: 12px;padding-right: 6px;display: none;">' +
                         '<div class="separator long" style="position: relative;display: table-cell;"></div>' +
                         '<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
                         '</div>');
@@ -561,7 +562,7 @@ define([
                     var need_break = false;
                     for (var i=items.length-1; i>=0; i--) {
                         var item = $(items[i]);
-                        if (!item.is(':visible')) { // move invisible items as is and set special attr
+                        if (!item.is(':visible') && !item.attr('hidden-on-resize')) { // move invisible items as is and set special attr
                             item.attr('data-hidden-tb-item', true);
                             this.$moreBar.prepend(item);
                             hideAllMenus = true;
@@ -585,6 +586,7 @@ define([
                                 this.$moreBar.prepend(item);
                                 if (last_separator) {
                                     last_separator.css('display', '');
+                                    last_separator.removeAttr('hidden-on-resize');
                                 }
                                 hideAllMenus = true;
                             } else if ( offset.left+item_width > _maxright ) {
@@ -595,6 +597,7 @@ define([
                                         this.$moreBar.prepend(item);
                                         if (last_separator) {
                                             last_separator.css('display', '');
+                                            last_separator.removeAttr('hidden-on-resize');
                                         }
                                         hideAllMenus = true;
                                         break;
@@ -612,6 +615,7 @@ define([
                                                 this.$moreBar.prepend(last_group);
                                                 if (last_separator) {
                                                     last_separator.css('display', '');
+                                                    last_separator.removeAttr('hidden-on-resize');
                                                 }
                                             }
                                             last_group.prepend(child);
@@ -638,6 +642,7 @@ define([
                         } else if (item.hasClass('separator')) {
                             this.$moreBar.prepend(item);
                             item.css('display', 'none');
+                            item.attr('hidden-on-resize', true);
                             last_separator = item;
                             hideAllMenus = true;
                         }
@@ -683,6 +688,7 @@ define([
                                     more_section.before(item);
                                     if (last_separator) {
                                         last_separator.css('display', '');
+                                        last_separator.removeAttr('hidden-on-resize');
                                     }
                                     if (this.$moreBar.children().filter('.group').length == 0) {
                                         this.hideMoreBtns();
@@ -717,6 +723,7 @@ define([
                                                     more_section.before(last_group);
                                                     if (last_separator) {
                                                         last_separator.css('display', '');
+                                                        last_separator.removeAttr('hidden-on-resize');
                                                     }
                                                 }
                                                 last_group.append(child);
@@ -747,6 +754,7 @@ define([
                             } else if (item.hasClass('separator')) {
                                 more_section.before(item);
                                 item.css('display', 'none');
+                                item.attr('hidden-on-resize', true);
                                 last_separator = item;
                                 last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1;
                                 hideAllMenus = true;
@@ -779,7 +787,7 @@ define([
                     right = Common.Utils.innerWidth() - (showxy.left - parentxy.left + target.width()),
                     top = showxy.top - parentxy.top + target.height() + 10;
 
-                moreContainer.css({right: right, left: 'auto', top : top});
+                moreContainer.css({right: right, left: 'auto', top : top, 'max-width': Common.Utils.innerWidth() + 'px'});
                 moreContainer.show();
             },
 

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

@@ -241,7 +241,7 @@ define([
 
         function _autoSize() {
             if (this.initConfig.height == 'auto') {
-                var height = parseInt(this.$window.find('> .body').css('height'));
+                var height = Math.ceil(parseFloat(this.$window.find('> .body').css('height')));
                 this.initConfig.header && (height += parseInt(this.$window.find('> .header').css('height')));
                 this.$window.height(height);
             }
@@ -490,7 +490,8 @@ define([
                 if (options.width=='auto') {
                     text_cnt.height(Math.max(text.height(), icon_height) + ((check.length>0) ? (check.height() + parseInt(check.css('margin-top'))) : 0));
                     body.height(parseInt(text_cnt.css('height')) + parseInt(footer.css('height')));
-                    window.setSize(text.position().left + text.width() + parseInt(text_cnt.css('padding-right')),
+                    var span_el = check.find('span');
+                     window.setSize(Math.max(text.width(), span_el.length>0 ? span_el.position().left + span_el.width() : 0) + text.position().left + parseInt(text_cnt.css('padding-right')),
                         parseInt(body.css('height')) + parseInt(header.css('height')));
                 } else {
                     text.css('white-space', 'normal');

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

@@ -363,7 +363,7 @@ define([
                 if ( !!nativevars && nativevars.helpUrl ) {
                     var webapp = window.SSE ? 'spreadsheeteditor' :
                                     window.PE ? 'presentationeditor' : 'documenteditor';
-                    return nativevars.helpUrl + webapp + '/main/resources/help';
+                    return nativevars.helpUrl + '/' + webapp + '/main/resources/help';
                 }
 
                 return undefined;

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

@@ -603,7 +603,9 @@ Common.UI.HintManager = new(function() {
                 }
             }
 
-            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0);
+            _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-use-alt-key") && !e.shiftKey && e.keyCode == Common.UI.Keys.ALT &&
+                !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 &&
+                !(window.PE && $('#pe-preview').is(':visible')));
             if (e.altKey && e.keyCode !== 115) {
                 e.preventDefault();
             }

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

@@ -242,6 +242,10 @@ define([
                         $('<div class="separator long"></div>').appendTo(me.$toolbarPanelPlugins);
                         _group = $('<div class="group"></div>');
                         rank_plugins = 0;
+                    } else {
+                        _group.appendTo(me.$toolbarPanelPlugins);
+                        $('<div class="separator long invisible"></div>').appendTo(me.$toolbarPanelPlugins);
+                        _group = $('<div class="group" style="padding-left: 0;"></div>');
                     }
 
                     var btn = me.panelPlugins.createPluginButton(model);

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

@@ -36,6 +36,11 @@ define([
                 type: 'dark',
                 source: 'static',
             },
+            'theme-contrast-dark': {
+                text: locale.txtThemeContrastDark || 'Dark Contrast',
+                type: 'dark',
+                source: 'static',
+            },
         }
 
         if ( !!window.currentLoaderTheme ) {
@@ -118,6 +123,7 @@ define([
             "canvas-page-border",
 
             "canvas-ruler-background",
+            "canvas-ruler-border",
             "canvas-ruler-margins-background",
             "canvas-ruler-mark",
             "canvas-ruler-handle-border",
@@ -413,10 +419,11 @@ define([
                 Common.NotificationCenter.trigger('contenttheme:dark', !is_current_dark);
             },
 
-            setTheme: function (obj, force) {
+            setTheme: function (obj) {
                 if ( !obj ) return;
 
-                var id = get_ui_theme_name(obj);
+                var id = get_ui_theme_name(obj),
+                    refresh_only = arguments[1];
 
                 if ( is_theme_type_system(id) ) {
                     Common.localStorage.setBool('ui-theme-use-system', true);
@@ -425,7 +432,7 @@ define([
                     Common.localStorage.setBool('ui-theme-use-system', false);
                 }
 
-                if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
+                if ( (this.currentThemeId() != id || refresh_only) && !!themes_map[id] ) {
                     document.body.className = document.body.className.replace(/theme-[\w-]+\s?/gi, '').trim();
                     document.body.classList.add(id, 'theme-type-' + themes_map[id].type);
 
@@ -456,9 +463,11 @@ define([
                             theme_obj.colors = obj;
                         }
 
+                        if ( !refresh_only )
                             Common.localStorage.setItem('ui-theme', JSON.stringify(theme_obj));
                     }
 
+                    if ( !refresh_only )
                         Common.localStorage.setItem('ui-theme-id', id);
                     Common.NotificationCenter.trigger('uitheme:changed', id);
                 }

apps/common/main/lib/template/SearchPanel.template

@@ -17,16 +17,16 @@
                         <label id="search-adv-results-number" style="display: inline-block;">
                             <%= scope.textSearchResults %>
                         </label>
-                        <div class="search-nav-btns" style="display: inline-block; float: right;">
+                        <div class="search-nav-btns">
-                            <div id="search-adv-back" style="display: inline-block; margin-right: 4px;"></div>
+                            <div id="search-adv-back"></div>
-                            <div id="search-adv-next" style="display: inline-block;"></div>
+                            <div id="search-adv-next"></div>
                         </div>
                     </td>
                 </tr>
                 <tr class="edit-setting">
                     <td class="padding-large">
-                       <button type="button" class="btn btn-text-default" id="search-adv-replace" style="display: inline-block; min-width: 62px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
-                       <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace-all" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
                     </td>
                 </tr>
                 <tr class="search-options-block">

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

@@ -62,8 +62,13 @@ if ( window.desktop ) {
         }
 
         if ( theme.id ) {
-            // params.uitheme = undefined;
+            if ( theme.id == 'theme-system' ) {
+                localStorage.setItem("ui-theme-use-system", "1");
+                localStorage.removeItem("ui-theme-id");
+            } else {
                 localStorage.setItem("ui-theme-id", theme.id);
+            }
+
             localStorage.removeItem("ui-theme");
         }
     }
@@ -93,10 +98,12 @@ if ( !!ui_theme_name ) {
 }
 
 if ( checkLocalStorage ) {
-    var content_theme = localStorage.getItem("content-theme");
+    let current_theme = localStorage.getItem("ui-theme");
-    if ( content_theme == 'dark' ) {
-        var current_theme = localStorage.getItem("ui-theme");
     if ( !!current_theme && /type":\s*"dark/.test(current_theme) ) {
+        document.body.classList.add("theme-type-dark");
+
+        let content_theme = localStorage.getItem("content-theme");
+        if ( content_theme == 'dark' ) {
             document.body.classList.add("content-theme-dark");
         }
     }

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

@@ -193,13 +193,18 @@ var utils = new(function() {
             me.innerHeight = window.innerHeight * me.zoom;
             me.applicationPixelRatio = scale.applicationPixelRatio || scale.devicePixelRatio;
         };
+        checkSizeIE = function() {
+            me.innerWidth = window.innerWidth;
+            me.innerHeight = window.innerHeight;
+        };
         me.zoom = 1;
         me.applicationPixelRatio = 1;
         me.innerWidth = window.innerWidth;
         me.innerHeight = window.innerHeight;
-        if ( isIE )
+        if ( isIE ) {
             $(document.body).addClass('ie');
-        else {
+            $(window).on('resize', checkSizeIE);
+        } else {
             checkSize();
             $(window).on('resize', checkSize);
         }
@@ -436,7 +441,7 @@ var metrics = new(function() {
     }
 })();
 
-Common.Utils.Metric = _extend_object(Common.Utils.Metric, metrics);
+Common.Utils.Metric = _extend_object(metrics, Common.Utils.Metric);
 
 Common.Utils.RGBColor = function(colorString) {
     var r, g, b;
@@ -603,8 +608,12 @@ Common.Utils.RGBColor = function(colorString) {
     }
 };
 
-Common.Utils.String = new (function() {
+var utilsString = new (function() {
     return {
+        textCtrl: 'Ctrl',
+        textShift: 'Shift',
+        textAlt: 'Alt',
+
         format: function(format) {
             var args = _.toArray(arguments).slice(1);
             if (args.length && typeof args[0] == 'object')
@@ -648,7 +657,7 @@ Common.Utils.String = new (function() {
                 return Common.Utils.String.format(template, string.replace(/\+(?=\S)/g, '').replace(/Ctrl|ctrl/g, '⌘').replace(/Alt|alt/g, '⌥').replace(/Shift|shift/g, '⇧'));
             }
 
-            return Common.Utils.String.format(template, string);
+            return Common.Utils.String.format(template, string.replace(/Ctrl|ctrl/g, this.textCtrl).replace(/Alt|alt/g, this.textAlt).replace(/Shift|shift/g, this.textShift));
         },
 
         parseFloat: function(string) {
@@ -680,6 +689,8 @@ Common.Utils.String = new (function() {
     }
 })();
 
+Common.Utils.String = _extend_object(utilsString, Common.Utils.String);
+
 Common.Utils.isBrowserSupported = function() {
     return !((Common.Utils.ieVersion != 0 && Common.Utils.ieVersion < 10.0) ||
              (Common.Utils.safariVersion != 0 && Common.Utils.safariVersion < 5.0) ||

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

@@ -48,7 +48,7 @@ define([
     Common.Views.InsertTableDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 230,
-            height: 156,
+            height: 157,
             style: 'min-width: 230px;',
             cls: 'modal-dlg',
             split: false,

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

@@ -61,7 +61,7 @@ define([
         options: {
             type: 0, // 0 - markers, 1 - numbers
             width: 280,
-            height: 255,
+            height: 261,
             style: 'min-width: 240px;',
             cls: 'modal-dlg',
             split: false,

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

@@ -139,6 +139,7 @@ define([
                 left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
             Common.UI.Window.prototype.show.call(this, left, top);
 
+            this.disableNavButtons();
             if (text) {
                 this.inputSearch.val(text);
                 this.fireEvent('search:input', [text]);
@@ -146,7 +147,6 @@ define([
                 this.inputSearch.val('');
             }
 
-            this.disableNavButtons();
             this.focus();
         },
 
@@ -185,9 +185,9 @@ define([
         },
 
         disableNavButtons: function (resultNumber, allResults) {
-            var disable = this.inputSearch.val() === '';
+            var disable = (this.inputSearch.val() === '' && !window.SSE) || !allResults;
-            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnBack.setDisabled(disable);
-            this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
+            this.btnNext.setDisabled(disable);
         },
 
         textFind: 'Find',

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

@@ -91,6 +91,11 @@ define([
                     dataHintDirection: 'left',
                     dataHintOffset: 'small'
                 });
+                this.inputReplace._input.on('keydown', _.bind(function (e) {
+                    if (e.keyCode === Common.UI.Keys.RETURN && !this.btnReplace.isDisabled()) {
+                        this.onReplaceClick('replace');
+                    }
+                }, this));
 
                 this.btnBack = new Common.UI.Button({
                     parentEl: $('#search-adv-back'),
@@ -253,11 +258,13 @@ define([
                     this.cmbLookIn.setValue(0);
 
                     var tableTemplate = '<div class="search-table">' +
+                        '<div class="header-items">' +
                         '<div class="header-item">' + this.textSheet + '</div>' +
                         '<div class="header-item">' + this.textName + '</div>' +
                         '<div class="header-item">' + this.textCell + '</div>' +
                         '<div class="header-item">' + this.textValue + '</div>' +
                         '<div class="header-item">' + this.textFormula + '</div>' +
+                        '</div>' +
                         '<div class="ps-container oo search-items"></div>' +
                         '</div>',
                         $resultTable = $(tableTemplate).appendTo(this.$resultsContainer);
@@ -326,10 +333,12 @@ define([
             if (count > 300) {
                 text = this.textTooManyResults;
             } else {
-                text = current === 'no-results' ? this.textNoSearchResults : (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count));
+                text = current === 'no-results' ? this.textNoSearchResults :
+                    (current === 'stop' ? this.textSearchHasStopped :
+                    (!count ? this.textNoMatches : Common.Utils.String.format(this.textSearchResults, current + 1, count)));
             }
             this.$reaultsNumber.text(text);
-            this.disableReplaceButtons(!count);
+            !window.SSE && this.disableReplaceButtons(!count);
         },
 
         onClickClosePanel: function() {
@@ -371,9 +380,9 @@ define([
         },
 
         disableNavButtons: function (resultNumber, allResults) {
-            var disable = this.inputText._input.val() === '';
+            var disable = (this.inputText._input.val() === '' && !window.SSE) || !allResults;
-            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnBack.setDisabled(disable);
-            this.btnNext.setDisabled(disable || !allResults || resultNumber + 1 === allResults);
+            this.btnNext.setDisabled(disable);
         },
 
         disableReplaceButtons: function (disable) {
@@ -412,7 +421,8 @@ define([
         textName: 'Name',
         textCell: 'Cell',
         textValue: 'Value',
-        textFormula: 'Formula'
+        textFormula: 'Formula',
+        textSearchHasStopped: 'Search has stopped'
 
     }, Common.Views.SearchPanel || {}));
 });

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

@@ -430,7 +430,7 @@ define([
                         '<table cols="1" style="width: 100%;">',
                             '<tr>',
                                 '<td style="padding-bottom: 16px;">',
-                                    '<div id="symbol-table-scrollable-div" style="position: relative;height:'+ (this.options.height-302 + 38*(this.special ? 0 : 1)) + 'px;">',
+                                    '<div id="symbol-table-scrollable-div" style="position: relative;height:'+ (this.options.height-304 + 38*(this.special ? 0 : 1)) + 'px;">',
                                         '<div style="width: 100%;">',
                                             '<div id="id-preview">',
                                                 '<div>',
@@ -476,7 +476,7 @@ define([
                             '</tr>',
                             '<tr>',
                                 '<td>',
-                                    '<div id="symbol-table-special-list" class="no-borders" style="width:100%; height: '+ (this.options.height-156 + 38*(this.special ? 0 : 1)) + 'px;"></div>',
+                                    '<div id="symbol-table-special-list" class="no-borders" style="width:100%; height: '+ (this.options.height-157 + 38*(this.special ? 0 : 1)) + 'px;"></div>',
                                 '</td>',
                             '</tr>',
                         '</table>',
@@ -1104,7 +1104,7 @@ define([
         },
 
         getMaxHeight: function(){
-            return this.symbolTablePanel.innerHeight();
+            return this.symbolTablePanel.innerHeight()-2;
         },
 
         getRowsCount: function() {
@@ -1436,8 +1436,8 @@ define([
                 this.curSize = {resize: false, width: size[0], height: size[1]};
             } else if (this.curSize.resize) {
                 this._preventUpdateScroll = false;
-                this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
+                this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
-                var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+                var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
                     height = rows*CELL_HEIGHT;
 
                 this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
@@ -1447,7 +1447,7 @@ define([
 
                 this.updateView(undefined, undefined, undefined, true);
 
-                this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
+                this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
 
                 !this.special && (size[1] += 38);
                 var valJson = JSON.stringify(size);
@@ -1465,16 +1465,16 @@ define([
                     this.curSize.resize = true;
 
                 this.curSize.width = size[0];
-                this.curSize.height = size[1] - 302 + 38*(this.special ? 0 : 1);
+                this.curSize.height = size[1] - 304 + 38*(this.special ? 0 : 1);
 
-                var rows = Math.max(1, ((this.curSize.height/CELL_HEIGHT) >> 0)),
+                var rows = Math.max(1, (((this.curSize.height-2)/CELL_HEIGHT) >> 0)),
                     height = rows*CELL_HEIGHT;
 
                 this.symbolTablePanel.css({'height': this.curSize.height + 'px'});
                 this.previewPanel.css({'height': height  + 'px'});
                 this.previewScrolled.css({'height': height + 'px'});
 
-                this.specialList.cmpEl.height(size[1] - 156 + 38*(this.special ? 0 : 1));
+                this.specialList.cmpEl.height(size[1] - 157 + 38*(this.special ? 0 : 1));
 
                 this.updateView(undefined, undefined, undefined, true);
             }

apps/common/main/resources/help/download.html

@@ -1,6 +1,10 @@
 <html>
 <head>
     <style>
+        body {
+            font-family: Arial,Helvetica,"Helvetica Neue",sans-serif;
+            color: #444;
+        }
         .centered {
             text-align: center;
             display: flex;

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

@@ -53,3 +53,28 @@
         }
     }
 }
+
+.combo-arrow-style {
+    .form-control {
+        cursor: pointer;
+
+        .image {
+            width: 100%;
+            height: 100%;
+            display: block;
+            background-color: transparent;
+            margin: 0 0 0 -3px;
+        }
+    }
+}
+
+.img-arrows {
+    .background-ximage-v2('right-panels/Begin-EndStyle.png', 480px);
+    -webkit-filter: @img-border-type-filter;
+    filter: @img-border-type-filter;
+}
+
+.item-arrow {
+    width:44px;
+    height:20px;
+}

apps/common/main/resources/less/colors-table-classic.less

@@ -71,6 +71,7 @@
         --canvas-page-border: #bbbec2;
 
         --canvas-ruler-background: #fff;
+        --canvas-ruler-border: #cbcbcb;
         --canvas-ruler-margins-background: #d6d6d6;
         --canvas-ruler-mark: #585b5e;
         --canvas-ruler-handle-border: #555;
@@ -138,3 +139,4 @@
         --menu-icon-item-checked-offset-x: -20px;
     }
 }
+

apps/common/main/resources/less/colors-table-dark-contrast.less

@@ -0,0 +1,142 @@
+
+:root {
+    .theme-contrast-dark {
+        --toolbar-header-document: #1e1e1e;
+        --toolbar-header-spreadsheet: #1e1e1e;
+        --toolbar-header-presentation: #1e1e1e;
+
+        --text-toolbar-header-on-background-document: #2a2a2a;
+        --text-toolbar-header-on-background-spreadsheet: #2a2a2a;
+        --text-toolbar-header-on-background-presentation: #2a2a2a;
+
+        --background-normal: #212121;
+        --background-toolbar: #2a2a2a;
+        --background-toolbar-additional: #2a2a2a;
+        --background-primary-dialog-button: #E6E6E6;
+        --background-accent-button: #4d76a8;
+        --background-tab-underline: #717171;
+        --background-notification-popover: #5f5d81;
+        --background-notification-badge: #7792fd;
+        --background-scrim: fade(black, 60%);
+        --background-loader: fade(#121212, 95%);
+        --background-alt-key-hint: #FFD938;
+        --background-contrast-popover: #121212;
+
+        --highlight-button-hover: #424242;
+        --highlight-button-pressed: #666666;
+        --highlight-button-pressed-hover: #828282;
+        --highlight-primary-dialog-button-hover: #a6a6a6;
+        --highlight-accent-button-hover: #75a2d6;
+        --highlight-accent-button-pressed: #89afdc;
+        --highlight-header-button-hover: #424242;
+        --highlight-header-button-pressed: #828282;
+        --highlight-toolbar-tab-underline: #d0d0d0;
+        --highlight-text-select: #96c8fd;
+
+        --border-toolbar: #616161;
+        --border-divider: #414141;
+        --border-regular-control: #696969;
+        --border-toolbar-button-hover: #616161;
+        --border-preview-hover: #828282;
+        --border-preview-select: #888;
+        --border-control-focus: #b8b8b8;
+        --border-color-shading: fade(#fff, 15%);
+        --border-error: #f62211;
+        --border-contrast-popover: #616161;
+
+        --text-normal: #e8e8e8;
+        --text-normal-pressed: #e8e8e8;
+        --text-secondary: #b8b8b8;
+        --text-tertiary: #888888;
+        --text-link: #ffd78c;
+        --text-link-hover: #ffd78c;
+        --text-link-active: #ffd78c;
+        --text-link-visited: #ffd78c;
+        --text-inverse: #121212;
+        --text-toolbar-header: #e8e8e8;
+        --text-contrast-background: #fff;
+        --text-alt-key-hint: #121212;
+
+        --icon-normal: #e8e8e8;
+        --icon-normal-pressed: #e8e8e8;
+        --icon-inverse: #2a2a2a;
+        --icon-toolbar-header: #d0d0d0;
+        --icon-notification-badge: #121212;
+        --icon-contrast-popover: #fff;
+        --icon-success: #090;
+
+        // Canvas
+
+        --canvas-background: #121212;
+        --canvas-content-background: #fff;
+        --canvas-page-border: #5f5f5f;
+
+        --canvas-ruler-background: #414141;
+        --canvas-ruler-border: #616161;
+        --canvas-ruler-margins-background: #1e1e1e;
+        --canvas-ruler-mark: #d0d0d0;
+        --canvas-ruler-handle-border: #b8b8b8;
+        --canvas-ruler-handle-border-disabled: #717171;
+
+        --canvas-high-contrast: #c3c3c3;
+        --canvas-high-contrast-disabled: #7d7d7d;
+
+        --canvas-cell-border: #656565;
+        --canvas-cell-title-border: #616161;
+        --canvas-cell-title-border-hover: #a0a0a0;
+        --canvas-cell-title-border-selected: #888888;
+        --canvas-cell-title-hover: #303030;
+        --canvas-cell-title-selected: #3d3d3d;
+
+        --canvas-dark-cell-title: #1e1e1e;
+        --canvas-dark-cell-title-hover: #828282;
+        --canvas-dark-cell-title-selected: #414141;
+        --canvas-dark-cell-title-border: #717171;
+        --canvas-dark-cell-title-border-hover: #a0a0a0;
+        --canvas-dark-cell-title-border-selected: #b8b8b8;
+
+        --canvas-scroll-thumb: #2a2a2a;
+        --canvas-scroll-thumb-hover: #424242;
+        --canvas-scroll-thumb-pressed: #4d4d4d;
+        --canvas-scroll-thumb-border: #616161;
+        --canvas-scroll-thumb-border-hover: #616161;
+        --canvas-scroll-thumb-border-pressed: #616161;
+        --canvas-scroll-arrow: #7d7d7d;
+        --canvas-scroll-arrow-hover: #8c8c8c;
+        --canvas-scroll-arrow-pressed: #999999;
+        --canvas-scroll-thumb-target: #717171;
+        --canvas-scroll-thumb-target-hover: #8c8c8c;
+        --canvas-scroll-thumb-target-pressed: #999999;
+
+        // Others
+
+        --button-small-normal-icon-offset-x: -20px;
+        --button-small-active-icon-offset-x: -20px;
+        --button-large-normal-icon-offset-x: -31px;
+        --button-large-active-icon-offset-x: -31px;
+        --button-huge-normal-icon-offset-x: -40px;
+        --button-huge-active-icon-offset-x: -40px;
+        --button-xhuge-normal-icon-offset-x: -28px;
+        --button-xhuge-active-icon-offset-x: -28px;
+        //--button-xhuge-normal-icon-offset-x: -37px;
+        //--button-xhuge-active-icon-offset-x: -37px;
+
+        --modal-window-mask-opacity: 0.6;
+        --image-border-types-filter: invert(100%) brightness(4);
+        --image-border-types-filter-selected: invert(100%) brightness(4);
+        --component-normal-icon-filter: invert(100%);
+
+        --component-normal-icon-opacity: .8;
+        --component-hover-icon-opacity: .8;
+        --component-active-icon-opacity: 1;
+        --component-active-hover-icon-opacity: 1;
+        --component-disabled-opacity: .4;
+
+        --header-component-normal-icon-opacity: .8;
+        --header-component-hover-icon-opacity: .8;
+        --header-component-active-icon-opacity: 1;
+        --header-component-active-hover-icon-opacity: 1;
+
+        --menu-icon-item-checked-offset-x: -20px;
+    }
+}

apps/common/main/resources/less/colors-table-dark.less

@@ -33,7 +33,7 @@
         --highlight-toolbar-tab-underline: #ddd;
         --highlight-text-select: #96c8fd;
 
-        --border-toolbar: #2a2a2a;
+        --border-toolbar: #616161;
         --border-divider: #505050;
         --border-regular-control: #666;
         --border-toolbar-button-hover: #5a5a5a;
@@ -60,7 +60,7 @@
         --icon-normal: fade(#fff, 80%);
         --icon-normal-pressed: fade(#fff, 80%);
         --icon-inverse: #444;
-        --icon-toolbar-header: #fff;
+        --icon-toolbar-header: fade(#fff, 80%);
         --icon-notification-badge: #000;
         --icon-contrast-popover: #fff;
         --icon-success: #090;
@@ -72,6 +72,7 @@
         --canvas-page-border: #555;
 
         --canvas-ruler-background: #555;
+        --canvas-ruler-border: #2A2A2A;
         --canvas-ruler-margins-background: #444;
         --canvas-ruler-mark: #b6b6b6;
         --canvas-ruler-handle-border: #b6b6b6;
@@ -129,7 +130,7 @@
         --component-hover-icon-opacity: .8;
         --component-active-icon-opacity: 1;
         --component-active-hover-icon-opacity: 1;
-        --component-disabled-opacity: .4;
+        --component-disabled-opacity: .6;
 
         --header-component-normal-icon-opacity: .8;
         --header-component-hover-icon-opacity: .8;

apps/common/main/resources/less/colors-table.less

@@ -83,6 +83,7 @@
     --canvas-page-border: #ccc;
 
     --canvas-ruler-background: #fff;
+    --canvas-ruler-border: #cbcbcb;
     --canvas-ruler-margins-background: #d9d9d9;
     --canvas-ruler-mark: #555;
     --canvas-ruler-handle-border: #555;
@@ -256,3 +257,4 @@
 @canvas-page-border: var(--canvas-page-border);
 @canvas-scroll-thumb-hover: var(--canvas-scroll-thumb-hover);
 @canvas-scroll-thumb-border-hover: var(--canvas-scroll-thumb-border-hover);
+

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

@@ -70,6 +70,8 @@
 
         &:hover, &:focus {
             background-color: transparent;
+            border-right-color: @border-regular-control-ie;
+            border-right-color: @border-regular-control;
         }
     }
 

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

@@ -466,6 +466,7 @@
     color: @text-toolbar-header-ie;
     color: @text-toolbar-header;
     position: relative;
+    z-index: 1;
 
     .btn-slot {
         display: inline-block;

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

@@ -160,6 +160,30 @@
             color: @text-secondary-ie;
             color: @text-secondary;
         }
+
+        .search-nav-btns {
+            display: inline-block;
+            float: right;
+            div {
+                display: inline-block;
+            }
+            #search-adv-back {
+                margin-right: 4px;
+            }
+        }
+
+        .btn-text-default {
+            display: inline-block;
+            width: auto;
+        }
+
+        #search-adv-replace {
+            min-width: 62px;
+        }
+
+        #search-adv-replace-all {
+            min-width: 78px;
+        }
     }
 
     .search-options-block {

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

@@ -231,8 +231,18 @@
                 }
             }
         }
+        .group {
+            height: 52px !important;
+        }
         &[data-tab=pivot] {
             padding: 5px 10px 0 0;
+            .group {
+                height: 60px !important;
+            }
+            .separator {
+                margin-top: 4px;
+                margin-bottom: 4px;
+            }
         }
     }
 
@@ -258,7 +268,7 @@
         &.small {
             padding-left: 10px;
 
-            + .separator {
+            + .separator:not(.invisible) {
                 margin-left: 10px;
             }
         }
@@ -290,6 +300,11 @@
             margin-left: 5px;
         }
 
+        &.invisible {
+            margin-left: 0;
+            border: none;
+        }
+
         &.long {
             height: 52px;
         }

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

@@ -12,7 +12,9 @@ class ThemesController {
                 id: 'theme-light',
                 type: 'light'
             }};
+    }
 
+    init() {
         const obj = LocalStorage.getItem("ui-theme");
         let theme = this.themes_map.light;
         if ( !!obj )
@@ -23,10 +25,15 @@ class ThemesController {
             LocalStorage.setItem("ui-theme", JSON.stringify(theme));
         }
 
-        const $$ = Dom7;
+        this.switchDarkTheme(theme, true);
-        const $body = $$('body');
+
-        $body.attr('class') && $body.attr('class',  $body.attr('class').replace(/\s?theme-type-(?:dark|light)/, ''));
+        $$(window).on('storage', e => {
-        $body.addClass(`theme-type-${theme.type}`);
+            if ( e.key == LocalStorage.prefix + 'ui-theme' ) {
+                if ( !!e.newValue ) {
+                    this.switchDarkTheme(JSON.parse(e.newValue), true);
+                }
+            }
+        });
     }
 
     get isCurrentDark() {
@@ -35,12 +42,23 @@ class ThemesController {
     }
 
     switchDarkTheme(dark) {
-        const theme = this.themes_map[dark ? 'dark' : 'light'];
+        const theme = typeof dark == 'object' ? dark : this.themes_map[dark ? 'dark' : 'light'];
+        const refresh_only = !!arguments[1];
+
+        if ( !refresh_only )
             LocalStorage.setItem("ui-theme", JSON.stringify(theme));
 
         const $body = $$('body');
         $body.attr('class') && $body.attr('class',  $body.attr('class').replace(/\s?theme-type-(?:dark|light)/, ''));
         $body.addClass(`theme-type-${theme.type}`);
+
+        const on_engine_created = api => {
+            api.asc_setSkin(theme.id);
+        };
+
+        const api = Common.EditorApi ? Common.EditorApi.get() : undefined;
+        if(!api) Common.Notifications.on('engineCreated', on_engine_created);
+        else on_engine_created(api);
     }
 }
 

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

@@ -128,7 +128,7 @@ const PageAbout = props => {
 };
 
 const About = inject("storeAppOptions")(observer(PageAbout));
-About.appVersion = () => (__PRODUCT_VERSION__);
+About.appVersion = () => (__PRODUCT_VERSION__).match(/\d+.\d+.\d+/)[0];     // skip build number
 About.compareVersions = () => /d$/.test(__PRODUCT_VERSION__);
 About.developVersion = () => /(?:d|debug)$/.test(__PRODUCT_VERSION__);
 

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

@@ -118,6 +118,9 @@
   .reply-list {
     padding-left: 26px;
   }
+  .reply-item {
+    padding-right: 26px;
+  }
 }
 
 .edit-comment-popup, .add-reply-popup, .edit-reply-popup {

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

@@ -181,6 +181,7 @@
                 margin-top: 21px;
                 box-sizing: border-box;
                 box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
+                background: @fill-white;
             }
             .item-after {
                 .color-preview {

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

@@ -127,6 +127,9 @@
     .item-link .item-inner {
         width: 100%;
     }
+    .item-inner {
+        color: @text-normal;
+    }
 }
 
 // Bullets, numbers and multilevels
@@ -1081,6 +1084,9 @@ input[type="number"]::-webkit-inner-spin-button {
     .view {
         transition: .2s height;
     }
+    .popover-angle.on-bottom {
+        display: none;
+    }
 }
 
 .target-function-list {
@@ -1124,6 +1130,15 @@ input[type="number"]::-webkit-inner-spin-button {
     border: 0.5px solid @background-menu-divider;
 }
 
+// Navigation list 
+
+.list.navigation-list {
+    .item-title {
+        color: @text-normal;
+    }
+}
+
+
 
 
 

apps/common/mobile/utils/LocalStorage.js

@@ -8,6 +8,7 @@ class LocalStorage {
         });
 
         this._store = {};
+        this._prefix = 'mobile-';
 
         try {
             this._isAllowed = !!window.localStorage;
@@ -32,6 +33,14 @@ class LocalStorage {
         return this._filter;
     }
 
+    get prefix() {
+        return this._prefix;
+    }
+
+    set prefix(p) {
+        this._prefix = p;
+    }
+
     sync() {
         if ( !this._isAllowed )
             Common.Gateway.internalMessage('localstorage', {cmd:'get', keys:this._filter});
@@ -43,6 +52,7 @@ class LocalStorage {
     }
 
     setItem(name, value, just) {
+        name = this._prefix + name;
         if ( this._isAllowed ) {
             try {
                 localStorage.setItem(name, value);
@@ -57,6 +67,7 @@ class LocalStorage {
     }
 
     getItem(name) {
+        name = this._prefix + name;
         if ( this._isAllowed )
             return localStorage.getItem(name);
         else return this._store[name]===undefined ? null : this._store[name];

apps/common/mobile/utils/htmlutils.js

@@ -7,3 +7,19 @@ if ( !obj ) {
 }
 
 document.body.classList.add(`theme-type-${obj.type}`);
+
+const load_stylesheet = reflink => {
+    let link = document.createElement( "link" );
+    link.href = reflink;
+    link.type = "text/css";
+    link.rel = "stylesheet";
+
+    document.getElementsByTagName("head")[0].appendChild(link);
+};
+
+if ( !localStorage && localStorage.getItem('mode-direction') === 'rtl' ) {
+    document.body.classList.add('rtl');
+    load_stylesheet('./css/framework7-rtl.css')
+} else {
+    load_stylesheet('./css/framework7.css')
+}

apps/documenteditor/embed/js/ApplicationController.js

@@ -229,7 +229,7 @@ DE.ApplicationController = new(function(){
             if (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Form) { // hyperlink
                 me.isHideBodyTip = false;
 
-                var str = (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? me.txtPressLink : data.get_FormHelpText();
+                var str = (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? (me.txtPressLink.replace('%1', common.utils.isMac ? '⌘' : me.textCtrl)) : data.get_FormHelpText();
                 if (str.length>500)
                     str = str.substr(0, 500) + '...';
                 str = common.utils.htmlEncode(str);
@@ -957,9 +957,10 @@ DE.ApplicationController = new(function(){
         textGotIt: 'Got it',
         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.",
         txtEmpty: '(Empty)',
-        txtPressLink: 'Press Ctrl and click link',
+        txtPressLink: 'Press %1 and click link',
         errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
         errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
-        openErrorText: 'An error has occurred while opening the file'
+        openErrorText: 'An error has occurred while opening the file',
+        textCtrl: 'Ctrl'
     }
 })();

apps/documenteditor/embed/locale/az.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b> Forma uğurla təqdim edildi </b> <br> İpucunu bağlamaq üçün bura klikləyin",
   "DE.ApplicationController.txtClose": "Bağla",
   "DE.ApplicationController.txtEmpty": "(Boşdur)",
-  "DE.ApplicationController.txtPressLink": "Ctrl düyməsinə basıb linkə klikləyin",
+  "DE.ApplicationController.txtPressLink": "%1 düyməsinə basıb linkə klikləyin",
   "DE.ApplicationController.unknownErrorText": "Naməlum xəta.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Brauzeriniz dəstəklənmir.",
   "DE.ApplicationController.waitText": "Zəhmət olmasa, gözləyin...",

apps/documenteditor/embed/locale/be.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>Форма паспяхова адпраўленая</b><br>Пстрыкніце, каб закрыць падказку",
   "DE.ApplicationController.txtClose": "Закрыць",
   "DE.ApplicationController.txtEmpty": "(Пуста)",
-  "DE.ApplicationController.txtPressLink": "Націсніце CTRL і пстрыкніце па спасылцы",
+  "DE.ApplicationController.txtPressLink": "Націсніце %1 і пстрыкніце па спасылцы",
   "DE.ApplicationController.unknownErrorText": "Невядомая памылка.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браўзер не падтрымліваецца.",
   "DE.ApplicationController.waitText": "Калі ласка, пачакайце...",

apps/documenteditor/embed/locale/ca.json

@@ -26,6 +26,7 @@
   "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": "Esborra tots els camps",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Entesos",
   "DE.ApplicationController.textGuest": "Convidat",
   "DE.ApplicationController.textLoadingDocument": "S'està carregant el document",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>El formulari s'ha enviat amb èxit</b><br>Feu clic per a tancar el consell",
   "DE.ApplicationController.txtClose": "Tanca",
   "DE.ApplicationController.txtEmpty": "(Buit)",
-  "DE.ApplicationController.txtPressLink": "Premeu CTRL i feu clic a l'enllaç",
+  "DE.ApplicationController.txtPressLink": "Premeu %1 i feu clic a l'enllaç",
   "DE.ApplicationController.unknownErrorText": "Error desconegut.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.",
   "DE.ApplicationController.waitText": "Espereu...",
@@ -47,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Obre la ubicació del fitxer",
   "DE.ApplicationView.txtFullScreen": "Pantalla completa",
   "DE.ApplicationView.txtPrint": "Imprimeix",
+  "DE.ApplicationView.txtSearch": "Cerca",
   "DE.ApplicationView.txtShare": "Comparteix"
 }

apps/documenteditor/embed/locale/cs.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Výška",
   "common.view.modals.txtShare": "Odkaz pro sdílení",
   "common.view.modals.txtWidth": "Šířka",
+  "common.view.SearchBar.textFind": "Najít",
   "DE.ApplicationController.convertationErrorText": "Převod se nezdařil.",
   "DE.ApplicationController.convertationTimeoutText": "Překročen časový limit pro provedení převodu.",
   "DE.ApplicationController.criticalErrorTitle": "Chyba",
@@ -25,6 +26,7 @@
   "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.textClear": "Odstranit všechny kolonky",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Rozumím",
   "DE.ApplicationController.textGuest": "Návštěvník",
   "DE.ApplicationController.textLoadingDocument": "Načítání dokumentu",
@@ -35,7 +37,7 @@
   "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.txtPressLink": "Stiskněte %1 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…",
@@ -46,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Otevřít umístění souboru",
   "DE.ApplicationView.txtFullScreen": "Na celou obrazovku",
   "DE.ApplicationView.txtPrint": "Tisk",
+  "DE.ApplicationView.txtSearch": "Hledat",
   "DE.ApplicationView.txtShare": "Sdílet"
 }

apps/documenteditor/embed/locale/da.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "\n<b>Formularen blev indsendt</b><br>Klik for at lukke tippet",
   "DE.ApplicationController.txtClose": "Luk",
   "DE.ApplicationController.txtEmpty": "(Tom)",
-  "DE.ApplicationController.txtPressLink": "Tryk CTRL og klik på linket",
+  "DE.ApplicationController.txtPressLink": "Tryk %1 og klik på linket",
   "DE.ApplicationController.unknownErrorText": "Ukendt fejl.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Din browser understøttes ikke.",
   "DE.ApplicationController.waitText": "Vent venligst...",

apps/documenteditor/embed/locale/de.json

@@ -26,6 +26,7 @@
   "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.textCtrl": "Strg",
   "DE.ApplicationController.textGotIt": "OK",
   "DE.ApplicationController.textGuest": "Gast",
   "DE.ApplicationController.textLoadingDocument": "Dokument wird geladen...",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Das Formular wurde erfolgreich abgesendet</b><br>Klicken Sie hier, um den Tipp auszublenden",
   "DE.ApplicationController.txtClose": "Schließen",
   "DE.ApplicationController.txtEmpty": "(Leer)",
-  "DE.ApplicationController.txtPressLink": "Drücken Sie STRG und klicken Sie auf den Link",
+  "DE.ApplicationController.txtPressLink": "Drücken Sie %1 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...",

apps/documenteditor/embed/locale/el.json

@@ -36,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Η φόρμα υποβλήθηκε με επιτυχία</b><br>Κάντε κλικ για να κλείσετε τη συμβουλή ",
   "DE.ApplicationController.txtClose": "Κλείσιμο",
   "DE.ApplicationController.txtEmpty": "(Κενό)",
-  "DE.ApplicationController.txtPressLink": "Πατήστε Ctrl και κάντε κλικ στο σύνδεσμο",
+  "DE.ApplicationController.txtPressLink": "Πατήστε %1 και κάντε κλικ στο σύνδεσμο",
   "DE.ApplicationController.unknownErrorText": "Άγνωστο σφάλμα.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ο περιηγητής σας δεν υποστηρίζεται.",
   "DE.ApplicationController.waitText": "Παρακαλούμε, περιμένετε...",

apps/documenteditor/embed/locale/en.json

@@ -19,13 +19,14 @@
   "DE.ApplicationController.errorLoadingFont": "Fonts are not loaded.<br>Please contact your Document Server administrator.",
   "DE.ApplicationController.errorSubmit": "Submit failed.",
   "DE.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
-  "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.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
   "DE.ApplicationController.notcriticalErrorTitle": "Warning",
   "DE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
   "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.textClear": "Clear All Fields",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Got it",
   "DE.ApplicationController.textGuest": "Guest",
   "DE.ApplicationController.textLoadingDocument": "Loading document",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Form submitted successfully</b><br>Click to close the tip",
   "DE.ApplicationController.txtClose": "Close",
   "DE.ApplicationController.txtEmpty": "(Empty)",
-  "DE.ApplicationController.txtPressLink": "Press Ctrl and click link",
+  "DE.ApplicationController.txtPressLink": "Press %1 and click link",
   "DE.ApplicationController.unknownErrorText": "Unknown error.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
   "DE.ApplicationController.waitText": "Please, wait...",

apps/documenteditor/embed/locale/es.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Altura",
   "common.view.modals.txtShare": "Compartir enlace",
   "common.view.modals.txtWidth": "Ancho",
+  "common.view.SearchBar.textFind": "Buscar",
   "DE.ApplicationController.convertationErrorText": "Fallo de conversión.",
   "DE.ApplicationController.convertationTimeoutText": "Se ha superado el tiempo de conversión.",
   "DE.ApplicationController.criticalErrorTitle": "Error",
@@ -18,13 +19,14 @@
   "DE.ApplicationController.errorLoadingFont": "Los tipos de letra no están cargados. <br>Contacte con el administrador del servidor de documentos.",
   "DE.ApplicationController.errorSubmit": "Error al enviar.",
   "DE.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado. <br>Contacte con el administrador del servidor de documentos",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo.<br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo. <br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
   "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo.",
   "DE.ApplicationController.notcriticalErrorTitle": "Advertencia",
   "DE.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
   "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Recargue la página.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
   "DE.ApplicationController.textClear": "Borrar todos los campos",
+  "DE.ApplicationController.textCtrl": "Control",
   "DE.ApplicationController.textGotIt": "Entendido",
   "DE.ApplicationController.textGuest": "Invitado",
   "DE.ApplicationController.textLoadingDocument": "Cargando documento",
@@ -35,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito. </b><br>Haga clic para cerrar el consejo",
   "DE.ApplicationController.txtClose": "Cerrar",
   "DE.ApplicationController.txtEmpty": "(Vacío)",
-  "DE.ApplicationController.txtPressLink": "Pulse CTRL y haga clic en el enlace",
+  "DE.ApplicationController.txtPressLink": "Pulse %1 y haga clic en el enlace",
   "DE.ApplicationController.unknownErrorText": "Error desconocido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
   "DE.ApplicationController.waitText": "Espere...",
@@ -46,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Abrir ubicación del archivo",
   "DE.ApplicationView.txtFullScreen": "Pantalla completa",
   "DE.ApplicationView.txtPrint": "Imprimir",
+  "DE.ApplicationView.txtSearch": "Búsqueda",
   "DE.ApplicationView.txtShare": "Compartir"
 }

apps/documenteditor/embed/locale/eu.json

@@ -26,6 +26,7 @@
   "DE.ApplicationController.scriptLoadError": "Interneterako konexioa motelegia da, ezin izan dira osagai batzuk kargatu. Kargatu berriro orria.",
   "DE.ApplicationController.textAnonymous": "Anonimoa",
   "DE.ApplicationController.textClear": "Garbitu eremu guztiak",
+  "DE.ApplicationController.textCtrl": "Ktrl",
   "DE.ApplicationController.textGotIt": "Ulertu dut",
   "DE.ApplicationController.textGuest": "Gonbidatua",
   "DE.ApplicationController.textLoadingDocument": "Dokumentua kargatzen",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formularioa behar bezala bidali da</b><br>Egin klik argibidea ixteko",
   "DE.ApplicationController.txtClose": "Itxi",
   "DE.ApplicationController.txtEmpty": "(Hutsik)",
-  "DE.ApplicationController.txtPressLink": "Sakatu Ctrl eta egin klik estekan",
+  "DE.ApplicationController.txtPressLink": "Sakatu %1 eta egin klik estekan",
   "DE.ApplicationController.unknownErrorText": "Errore ezezaguna.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Zure nabigatzaileak ez du euskarririk.",
   "DE.ApplicationController.waitText": "Mesedez, itxaron...",

apps/documenteditor/embed/locale/fr.json

@@ -36,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Le formulaire a été soumis avec succès</b><br>Cliquez ici pour fermer l'astuce",
   "DE.ApplicationController.txtClose": "Fermer",
   "DE.ApplicationController.txtEmpty": "(Vide)",
-  "DE.ApplicationController.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien",
+  "DE.ApplicationController.txtPressLink": "Appuyez sur %1 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...",
@@ -47,5 +47,6 @@
   "DE.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier",
   "DE.ApplicationView.txtFullScreen": "Plein écran",
   "DE.ApplicationView.txtPrint": "Imprimer",
+  "DE.ApplicationView.txtSearch": "Recherche",
   "DE.ApplicationView.txtShare": "Partager"
 }

apps/documenteditor/embed/locale/gl.json

@@ -36,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Prema para pechar o consello",
   "DE.ApplicationController.txtClose": "Pechar",
   "DE.ApplicationController.txtEmpty": "(Vacío)",
-  "DE.ApplicationController.txtPressLink": "Prema Ctrl e na ligazón",
+  "DE.ApplicationController.txtPressLink": "Prema %1 e na ligazón",
   "DE.ApplicationController.unknownErrorText": "Erro descoñecido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "O seu navegador non é compatible.",
   "DE.ApplicationController.waitText": "Agarde...",

apps/documenteditor/embed/locale/hu.json

@@ -4,38 +4,40 @@
   "common.view.modals.txtHeight": "Magasság",
   "common.view.modals.txtShare": "Hivatkozás megosztása",
   "common.view.modals.txtWidth": "Szélesség",
-  "DE.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.",
+  "common.view.SearchBar.textFind": "Keres",
-  "DE.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.",
+  "DE.ApplicationController.convertationErrorText": "Az átváltás nem sikerült.",
+  "DE.ApplicationController.convertationTimeoutText": "A konverziós időkorlát túllépve.",
   "DE.ApplicationController.criticalErrorTitle": "Hiba",
   "DE.ApplicationController.downloadErrorText": "Sikertelen letöltés.",
   "DE.ApplicationController.downloadTextText": "Dokumentum letöltése...",
-  "DE.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a Document Server adminisztrátorával.",
+  "DE.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.<br>Vegye fel a kapcsolatot a dokumentum szerver adminisztrátorával.",
   "DE.ApplicationController.errorDefaultMessage": "Hibakód: %1",
-  "DE.ApplicationController.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.<br>Használja a 'Letöltés másként...' opciót, hogy mentse a fájl biztonsági másolatát a számítógép merevlemezére.",
+  "DE.ApplicationController.errorEditingDownloadas": "A dokumentummal való munka során hiba történt.<br>Használja a 'Letöltés másként...' opciót a fájl másolatának a számítógépére történő mentéséhez.",
   "DE.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
-  "DE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a Document Server rendszergazdájához a részletekért.",
+  "DE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.<br>Kérjük, forduljon a dokumentumszerver rendszergazdájához a részletekért.",
-  "DE.ApplicationController.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót, hogy a fájlt a számítógépére mentse, vagy próbálkozzon később.",
+  "DE.ApplicationController.errorForceSave": "Hiba történt a fájl mentése közben. Kérjük, használja a 'Letöltés másként' opciót a fájl számítógépére való mentéséhez, vagy próbálja meg később újra.",
-  "DE.ApplicationController.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
+  "DE.ApplicationController.errorLoadingFont": "A betűtípusok nem töltődnek be.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
-  "DE.ApplicationController.errorSubmit": "A beküldés nem sikerült.",
+  "DE.ApplicationController.errorSubmit": "A beküldés sikertelen.",
   "DE.ApplicationController.errorTokenExpire": "A dokumentum biztonsági tokenje lejárt.<br>Kérjük, lépjen kapcsolatba a dokumentumszerver rendszergazdájával.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internetkapcsolat helyreállt és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt vagy másolja át annak tartalmát megbizonyosodva arról, hogy semmi sem veszett el, végül töltse újra ezt az oldalt.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.<br>Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.",
-  "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.",
+  "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem érhető el.",
   "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés",
-  "DE.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor",
+  "DE.ApplicationController.openErrorText": "Hiba történt a fájl megnyitásakor.",
-  "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.",
+  "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, egyes komponensek nem tudtak betöltődni. Kérjük, töltse újra az oldalt.",
-  "DE.ApplicationController.textAnonymous": "Névtelen",
+  "DE.ApplicationController.textAnonymous": "Anonim",
-  "DE.ApplicationController.textClear": "Az összes mező törlése",
+  "DE.ApplicationController.textClear": "Minden mező törlése",
-  "DE.ApplicationController.textGotIt": "OK",
+  "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textGotIt": "Értem",
   "DE.ApplicationController.textGuest": "Vendég",
   "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése",
   "DE.ApplicationController.textNext": "Következő mező",
-  "DE.ApplicationController.textOf": "of",
+  "DE.ApplicationController.textOf": "-nak/-nek a ",
-  "DE.ApplicationController.textRequired": "Töltse ki az összes szükséges mezőt az űrlap elküldéséhez.",
+  "DE.ApplicationController.textRequired": "Az űrlap elküldéséhez töltse ki az összes szükséges mezőt.",
   "DE.ApplicationController.textSubmit": "Beküldés",
   "DE.ApplicationController.textSubmited": "<b>Az űrlap sikeresen elküldve</b><br>Kattintson a tipp bezárásához",
   "DE.ApplicationController.txtClose": "Bezárás",
   "DE.ApplicationController.txtEmpty": "(Üres)",
-  "DE.ApplicationController.txtPressLink": "Nyomja meg a CTRL billentyűt és kattintson a hivatkozásra",
+  "DE.ApplicationController.txtPressLink": "Nyomja meg a %1 billentyűt és kattintson a hivatkozásra",
   "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.",
   "DE.ApplicationController.waitText": "Kérjük, várjon...",
@@ -43,8 +45,9 @@
   "DE.ApplicationView.txtDownloadDocx": "Letöltés DOCX-ként",
   "DE.ApplicationView.txtDownloadPdf": "Letöltés PDF-ként",
   "DE.ApplicationView.txtEmbed": "Beágyazás",
-  "DE.ApplicationView.txtFileLocation": "Fájl helyének megnyitása",
+  "DE.ApplicationView.txtFileLocation": "A fájl megnyitásának helye",
   "DE.ApplicationView.txtFullScreen": "Teljes képernyő",
   "DE.ApplicationView.txtPrint": "Nyomtatás",
+  "DE.ApplicationView.txtSearch": "Keres",
   "DE.ApplicationView.txtShare": "Megosztás"
 }

apps/documenteditor/embed/locale/hy.json

@@ -36,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Ձևը հաջողությամբ ուղարկվեց</b><br>Սեղմեք՝ հուշակը փակելու համար",
   "DE.ApplicationController.txtClose": "Փակել",
   "DE.ApplicationController.txtEmpty": "(Դատարկ)",
-  "DE.ApplicationController.txtPressLink": "Սեղմել Ctrl և անցնել հղումը",
+  "DE.ApplicationController.txtPressLink": "Սեղմել %1 և անցնել հղումը",
   "DE.ApplicationController.unknownErrorText": "Անհայտ սխալ։",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ձեր դիտարկիչը չի աջակցվում։",
   "DE.ApplicationController.waitText": "Խնդրում ենք սպասել...",

apps/documenteditor/embed/locale/id.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>Form berhasil disubmit</b><br>Klik untuk menutup tips",
   "DE.ApplicationController.txtClose": "Tutup",
   "DE.ApplicationController.txtEmpty": "(Kosong)",
-  "DE.ApplicationController.txtPressLink": "Tekan CTRL dan klik tautan",
+  "DE.ApplicationController.txtPressLink": "Tekan %1 dan klik tautan",
   "DE.ApplicationController.unknownErrorText": "Kesalahan tidak diketahui",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Peramban kamu tidak didukung",
   "DE.ApplicationController.waitText": "Silahkan menunggu",

apps/documenteditor/embed/locale/it.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Altezza",
   "common.view.modals.txtShare": "Condividi collegamento",
   "common.view.modals.txtWidth": "Larghezza",
+  "common.view.SearchBar.textFind": "Trova",
   "DE.ApplicationController.convertationErrorText": "Conversione fallita.",
   "DE.ApplicationController.convertationTimeoutText": "È stato superato il tempo limite della conversione.",
   "DE.ApplicationController.criticalErrorTitle": "Errore",
@@ -35,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Modulo è stato inviato con successo</b><br>Clicca su per chiudere la notifica</br>",
   "DE.ApplicationController.txtClose": "Chiudi",
   "DE.ApplicationController.txtEmpty": "(Vuoto)",
-  "DE.ApplicationController.txtPressLink": "Premi CTRL e clicca sul collegamento",
+  "DE.ApplicationController.txtPressLink": "Premi %1 e clicca sul collegamento",
   "DE.ApplicationController.unknownErrorText": "Errore sconosciuto.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Il tuo browser non è supportato.",
   "DE.ApplicationController.waitText": "Per favore, attendi...",
@@ -46,5 +47,6 @@
   "DE.ApplicationView.txtFileLocation": "Apri percorso file",
   "DE.ApplicationView.txtFullScreen": "Schermo intero",
   "DE.ApplicationView.txtPrint": "Stampa",
+  "DE.ApplicationView.txtSearch": "Cerca",
   "DE.ApplicationView.txtShare": "Condividi"
 }

apps/documenteditor/embed/locale/ja.json

@@ -19,13 +19,14 @@
   "DE.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。<br>文書サーバのアドミニストレータを連絡してください。",
   "DE.ApplicationController.errorSubmit": "送信に失敗しました。",
   "DE.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして、変更が消えてしまわないようにしてからページを再読み込みしてください。",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されました。<br>作業を継続する前に、ファイルをダウンロードするか、内容をコピーして、変更が消えてしまわないように確認してから、ページを再びお読み込みください。",
   "DE.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",
   "DE.ApplicationController.openErrorText": "ファイルの読み込み中にエラーが発生しました。",
   "DE.ApplicationController.scriptLoadError": "接続が非常に遅いため、いくつかのコンポーネントはロードされませんでした。ページを再読み込みしてください。",
   "DE.ApplicationController.textAnonymous": "匿名",
   "DE.ApplicationController.textClear": "すべてのフィールドを削除する",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "OK",
   "DE.ApplicationController.textGuest": "ゲスト",
   "DE.ApplicationController.textLoadingDocument": "ドキュメントを読み込んでいます",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>フォームが正常に送信されました。</b><br>クリックしてヒントを閉じます。",
   "DE.ApplicationController.txtClose": "閉じる",
   "DE.ApplicationController.txtEmpty": "(空)",
-  "DE.ApplicationController.txtPressLink": "リンクをクリックしてCTRLを押してください",
+  "DE.ApplicationController.txtPressLink": "リンクをクリックして%1を押してください",
   "DE.ApplicationController.unknownErrorText": "不明なエラー",
   "DE.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザはサポートされていません。",
   "DE.ApplicationController.waitText": "少々お待ちください...",
@@ -47,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "ファイルを開く",
   "DE.ApplicationView.txtFullScreen": "全画面表示",
   "DE.ApplicationView.txtPrint": "印刷する",
+  "DE.ApplicationView.txtSearch": "検索",
   "DE.ApplicationView.txtShare": "シェア"
 }

apps/documenteditor/embed/locale/ko.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>양식이 성공적으로 전송되었습니다.</b><br>여기를 클릭하여 프롬프트를 닫으십시오",
   "DE.ApplicationController.txtClose": "닫기",
   "DE.ApplicationController.txtEmpty": "(없음)",
-  "DE.ApplicationController.txtPressLink": "CTRL 키를 누른 상태에서 링크 클릭",
+  "DE.ApplicationController.txtPressLink": "%1 키를 누른 상태에서 링크 클릭",
   "DE.ApplicationController.unknownErrorText": "알 수없는 오류.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "사용중인 브라우저가 지원되지 않습니다.",
   "DE.ApplicationController.waitText": "잠시만 기다려주세요...",

apps/documenteditor/embed/locale/lo.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b> ແບບຟອມທີ່ສົ່ງມາແລ້ວ",
   "DE.ApplicationController.txtClose": " ປິດ",
   "DE.ApplicationController.txtEmpty": "(ຫວ່າງເປົ່າ)",
-  "DE.ApplicationController.txtPressLink": "ກົດ Ctrl ແລະກົດລິ້ງ",
+  "DE.ApplicationController.txtPressLink": "ກົດ %1 ແລະກົດລິ້ງ",
   "DE.ApplicationController.unknownErrorText": "ມີຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ",
   "DE.ApplicationController.unsupportedBrowserErrorText": "ບຣາວເຊີຂອງທ່ານບໍ່ສາມານຳໃຊ້ໄດ້",
   "DE.ApplicationController.waitText": "ກະລຸນາລໍຖ້າ...",

apps/documenteditor/embed/locale/ms.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>Borang telah berjaya dihantar</b><br>Klik untuk menutup petua",
   "DE.ApplicationController.txtClose": "Tutup",
   "DE.ApplicationController.txtEmpty": "(Kosong)",
-  "DE.ApplicationController.txtPressLink": "Tekan Ctrl dan klik pautan",
+  "DE.ApplicationController.txtPressLink": "Tekan %1 dan klik pautan",
   "DE.ApplicationController.unknownErrorText": "Ralat tidak diketahui.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Pelayar anda tidak disokong.",
   "DE.ApplicationController.waitText": "Sila, tunggu…",

apps/documenteditor/embed/locale/nl.json

@@ -36,7 +36,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formulier succesvol ingediend</b><br>Klik om de tip te sluiten",
   "DE.ApplicationController.txtClose": "Sluiten",
   "DE.ApplicationController.txtEmpty": "(Leeg)",
-  "DE.ApplicationController.txtPressLink": "Druk op Ctrl en klik op de koppeling",
+  "DE.ApplicationController.txtPressLink": "Druk op %1 en klik op de koppeling",
   "DE.ApplicationController.unknownErrorText": "Onbekende fout.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Uw browser wordt niet ondersteund.",
   "DE.ApplicationController.waitText": "Een moment geduld",

apps/documenteditor/embed/locale/pl.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Wysokość",
   "common.view.modals.txtShare": "Udostępnij link",
   "common.view.modals.txtWidth": "Szerokość",
+  "common.view.SearchBar.textFind": "Znajdź",
   "DE.ApplicationController.convertationErrorText": "Konwertowanie nieudane.",
   "DE.ApplicationController.convertationTimeoutText": "Przekroczono limit czasu konwersji.",
   "DE.ApplicationController.criticalErrorTitle": "Błąd",
@@ -25,6 +26,7 @@
   "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.textClear": "Wyczyść wszystkie pola",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Rozumiem",
   "DE.ApplicationController.textGuest": "Gość",
   "DE.ApplicationController.textLoadingDocument": "Wgrywanie dokumentu",
@@ -35,7 +37,7 @@
   "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.txtPressLink": "Naciśnij %1 i kliknij w link",
   "DE.ApplicationController.unknownErrorText": "Nieznany błąd.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Twoja przeglądarka nie jest wspierana.",
   "DE.ApplicationController.waitText": "Proszę czekać...",
@@ -46,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Otwórz miejsce lokalizacji pliku",
   "DE.ApplicationView.txtFullScreen": "Pełny ekran",
   "DE.ApplicationView.txtPrint": "Drukuj",
+  "DE.ApplicationView.txtSearch": "Szukaj",
   "DE.ApplicationView.txtShare": "Udostępnij"
 }

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

@@ -12,31 +12,32 @@
   "DE.ApplicationController.downloadTextText": "A descarregar documento…",
   "DE.ApplicationController.errorAccessDeny": "Está a tentar executar uma ação para a qual não tem permissão.<br>Contacte o administrador do servidor de documentos.",
   "DE.ApplicationController.errorDefaultMessage": "Código de erro: %1",
-  "DE.ApplicationController.errorEditingDownloadas": "Ocorreu um erro ao trabalhar no documento.<br>Utilize a opção 'Descarregar como...' para guardar uma cópia do ficheiro no computador.",
+  "DE.ApplicationController.errorEditingDownloadas": "Ocorreu um erro ao trabalhar o documento.<br>Utilize a opção 'Descarregar como...' para guardar uma cópia do ficheiro no computador.",
   "DE.ApplicationController.errorFilePassProtect": "O documento está protegido por palavra-passe e não pode ser aberto.",
-  "DE.ApplicationController.errorFileSizeExceed": "O tamanho do documento excede o limite do servidor.<br>Contacte o administrador do servidor de documentos para mais detalhes.",
+  "DE.ApplicationController.errorFileSizeExceed": "O tamanho do documento excede o limite permitido pelo servidor.<br>Contacte o administrador do servidor de documentos para mais informações.",
-  "DE.ApplicationController.errorForceSave": "Ocorreu um erro ao guardar o ficheiro. Utilize a opção 'Descarregar como' para guardar o ficheiro no computador ou tente novamente mais tarde.",
+  "DE.ApplicationController.errorForceSave": "Ocorreu um erro ao guardar o ficheiro. Utilize a opção 'Descarregar como' para guardar o ficheiro no computador ou tente mais tarde.",
   "DE.ApplicationController.errorLoadingFont": "Tipos de letra não carregados.<br>Por favor contacte o administrador do servidor de documentos.",
   "DE.ApplicationController.errorSubmit": "Falha ao submeter.",
-  "DE.ApplicationController.errorTokenExpire": "O token de segurança do documento expirou.<br>Entre em contacto com o administrador do Servidor de Documentos.",
+  "DE.ApplicationController.errorTokenExpire": "O 'token' de segurança do documento expirou.<br>Entre em contacto com o administrador do servidor de documentos.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A ligação à Internet foi restaurada e a versão do ficheiro foi alterada.<br>Antes de continuar o seu trabalho, descarregue o ficheiro ou copie o seu conteúdo para ter a certeza de que não perde os seus elementos e recarregue a página.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A ligação foi restaurada e a versão do ficheiro foi alterada.<br>Antes de poder continuar a trabalhar, é necessário descarregar o ficheiro ou copiar o seu conteúdo para garantir que nada se perde e depois voltar a carregar esta página.",
   "DE.ApplicationController.errorUserDrop": "De momento, não é possível aceder ao ficheiro.",
   "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
   "DE.ApplicationController.openErrorText": "Ocorreu um erro ao abrir o ficheiro.",
   "DE.ApplicationController.scriptLoadError": "A ligação está muito lenta e alguns dos componentes não foram carregados. Recarregue a página.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
   "DE.ApplicationController.textClear": "Limpar todos os campos",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Percebi",
   "DE.ApplicationController.textGuest": "Convidado",
   "DE.ApplicationController.textLoadingDocument": "A carregar documento",
-  "DE.ApplicationController.textNext": "Próximo campo",
+  "DE.ApplicationController.textNext": "Campo seguinte",
   "DE.ApplicationController.textOf": "de",
-  "DE.ApplicationController.textRequired": "Preencha todos os campos obrigatório para poder submeter o formulário.",
+  "DE.ApplicationController.textRequired": "Preencha todos os campos obrigatório para submeter o formulário.",
   "DE.ApplicationController.textSubmit": "Submeter",
-  "DE.ApplicationController.textSubmited": "<b>Formulário submetido com êxito</b><br>Clique para fechar a dica",
+  "DE.ApplicationController.textSubmited": "<b>Formulário submetido com sucesso</b><br>Clique para fechar a dica",
   "DE.ApplicationController.txtClose": "Fechar",
   "DE.ApplicationController.txtEmpty": "(Vazio)",
-  "DE.ApplicationController.txtPressLink": "Prima Ctrl e clique na ligação",
+  "DE.ApplicationController.txtPressLink": "Prima %1 e clique na ligação",
   "DE.ApplicationController.unknownErrorText": "Erro desconhecido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "O seu navegador não é suportado.",
   "DE.ApplicationController.waitText": "Aguarde…",
@@ -45,7 +46,8 @@
   "DE.ApplicationView.txtDownloadPdf": "Descarregar como pdf",
   "DE.ApplicationView.txtEmbed": "Incorporar",
   "DE.ApplicationView.txtFileLocation": "Abrir localização do ficheiro",
-  "DE.ApplicationView.txtFullScreen": "Ecrã inteiro",
+  "DE.ApplicationView.txtFullScreen": "Ecrã completo",
   "DE.ApplicationView.txtPrint": "Imprimir",
+  "DE.ApplicationView.txtSearch": "Pesquisar",
   "DE.ApplicationView.txtShare": "Partilhar"
 }

apps/documenteditor/embed/locale/pt.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Altura",
   "common.view.modals.txtShare": "Compartilhar link",
   "common.view.modals.txtWidth": "Largura",
+  "common.view.SearchBar.textFind": "Localizar",
   "DE.ApplicationController.convertationErrorText": "Conversão falhou.",
   "DE.ApplicationController.convertationTimeoutText": "Tempo limite de conversão excedido.",
   "DE.ApplicationController.criticalErrorTitle": "Erro",
@@ -25,6 +26,7 @@
   "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.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Entendi",
   "DE.ApplicationController.textGuest": "Convidado(a)",
   "DE.ApplicationController.textLoadingDocument": "Carregando documento",
@@ -35,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formulário apresentado com sucesso</b>>br>Click para fechar a ponta",
   "DE.ApplicationController.txtClose": "Fechar",
   "DE.ApplicationController.txtEmpty": "(Vazio)",
-  "DE.ApplicationController.txtPressLink": "Pressione CTRL e clique no link",
+  "DE.ApplicationController.txtPressLink": "Pressione %1 e clique no link",
   "DE.ApplicationController.unknownErrorText": "Erro desconhecido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Seu navegador não é suportado.",
   "DE.ApplicationController.waitText": "Aguarde...",
@@ -46,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Local do arquivo aberto",
   "DE.ApplicationView.txtFullScreen": "Tela cheia",
   "DE.ApplicationView.txtPrint": "Imprimir",
+  "DE.ApplicationView.txtSearch": "Pesquisar",
   "DE.ApplicationView.txtShare": "Compartilhar"
 }

apps/documenteditor/embed/locale/ro.json

@@ -19,13 +19,14 @@
   "DE.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.ApplicationController.errorSubmit": "Remiterea eșuată.",
   "DE.ApplicationController.errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
-  "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.errorUpdateVersionOnDisconnect": "Conexiunea 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.openErrorText": "Eroare la deschiderea fișierului.",
   "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.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Am înțeles",
   "DE.ApplicationController.textGuest": "Invitat",
   "DE.ApplicationController.textLoadingDocument": "Încărcare document",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formularul a fost remis cu succes</b><br>Faceţi clic pentru a închide sfatul",
   "DE.ApplicationController.txtClose": "Închidere",
   "DE.ApplicationController.txtEmpty": "(Gol)",
-  "DE.ApplicationController.txtPressLink": "Apăsați Ctrl și faceți clic pe linkul",
+  "DE.ApplicationController.txtPressLink": "Apăsați %1 ș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...",

apps/documenteditor/embed/locale/ru.json

@@ -19,13 +19,14 @@
   "DE.ApplicationController.errorLoadingFont": "Шрифты не загружены.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.ApplicationController.errorSubmit": "Не удалось отправить.",
   "DE.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Соединение было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.ApplicationController.notcriticalErrorTitle": "Внимание",
   "DE.ApplicationController.openErrorText": "При открытии файла произошла ошибка.",
   "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",
   "DE.ApplicationController.textAnonymous": "Анонимный пользователь",
   "DE.ApplicationController.textClear": "Очистить все поля",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "ОК",
   "DE.ApplicationController.textGuest": "Гость",
   "DE.ApplicationController.textLoadingDocument": "Загрузка документа",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>Форма успешно отправлена</b><br>Нажмите, чтобы закрыть подсказку",
   "DE.ApplicationController.txtClose": "Закрыть",
   "DE.ApplicationController.txtEmpty": "(Пусто)",
-  "DE.ApplicationController.txtPressLink": "Нажмите CTRL и щелкните по ссылке",
+  "DE.ApplicationController.txtPressLink": "Нажмите %1 и щелкните по ссылке",
   "DE.ApplicationController.unknownErrorText": "Неизвестная ошибка.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.",
   "DE.ApplicationController.waitText": "Пожалуйста, подождите...",

apps/documenteditor/embed/locale/sk.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>Formulár bol úspešne predložený</b><br>Kliknite, aby ste tip zatvorili",
   "DE.ApplicationController.txtClose": "Zatvoriť",
   "DE.ApplicationController.txtEmpty": "(Prázdne)",
-  "DE.ApplicationController.txtPressLink": "Stlačte CTRL a kliknite na odkaz",
+  "DE.ApplicationController.txtPressLink": "Stlačte %1 a kliknite na odkaz",
   "DE.ApplicationController.unknownErrorText": "Neznáma chyba.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Váš prehliadač nie je podporovaný.",
   "DE.ApplicationController.waitText": "Prosím čakajte...",

apps/documenteditor/embed/locale/sl.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Višina",
   "common.view.modals.txtShare": "Deli povezavo",
   "common.view.modals.txtWidth": "Širina",
+  "common.view.SearchBar.textFind": "Najdi",
   "DE.ApplicationController.convertationErrorText": "Pogovor ni uspel.",
   "DE.ApplicationController.convertationTimeoutText": "Pretvorbena prekinitev presežena.",
   "DE.ApplicationController.criticalErrorTitle": "Napaka",
@@ -14,18 +15,29 @@
   "DE.ApplicationController.errorEditingDownloadas": "Med delom z dokumentom je prišlo do napake.<br>S funkcijo »Prenesi kot ...« shranite varnostno kopijo datoteke na trdi disk računalnika.",
   "DE.ApplicationController.errorFilePassProtect": "Dokument je zaščiten z geslom in ga ni mogoče odpreti.",
   "DE.ApplicationController.errorFileSizeExceed": "Velikost datoteke presega omejitev, nastavljeno za vaš strežnik. <br> Za podrobnosti se obrnite na skrbnika strežnika dokumentov.",
+  "DE.ApplicationController.errorForceSave": "Med shranjevanjem datoteke je prišlo do napake. Uporabite možnost »Prenesi kot«, da shranite datoteko na trdi disk računalnika ali poskusite znova pozneje.",
+  "DE.ApplicationController.errorLoadingFont": "Pisave niso naložene.<br>Prosimo kontaktirajte administratorja.",
   "DE.ApplicationController.errorSubmit": "Pošiljanje je spodletelo",
+  "DE.ApplicationController.errorTokenExpire": "Varnostni žeton dokumenta je potekel.<br>Obrnite se na skrbnika dokumentnega strežnika.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Povezava s spletom je bila obnovljena in spremenjena je različica datoteke. <br> Preden nadaljujete z delom, morate datoteko prenesti ali kopirati njeno vsebino, da se prepričate, da se nič ne izgubi, in nato znova naložite to stran.",
   "DE.ApplicationController.errorUserDrop": "Do datoteke v tem trenutku ni možno dostopati.",
   "DE.ApplicationController.notcriticalErrorTitle": "Opozorilo",
+  "DE.ApplicationController.openErrorText": "Prišlo je do težave med odpiranjem datoteke.",
   "DE.ApplicationController.scriptLoadError": "Povezava je počasna, nekatere komponente niso pravilno naložene.Prosimo osvežite stran.",
+  "DE.ApplicationController.textAnonymous": "Anonimno",
   "DE.ApplicationController.textClear": "Počisti vsa polja",
+  "DE.ApplicationController.textCtrl": "Ctrl",
+  "DE.ApplicationController.textGotIt": "Razumem",
+  "DE.ApplicationController.textGuest": "Gost",
   "DE.ApplicationController.textLoadingDocument": "Nalaganje dokumenta",
   "DE.ApplicationController.textNext": "Naslednje polje",
   "DE.ApplicationController.textOf": "od",
+  "DE.ApplicationController.textRequired": "Izpolnite vsa obvezna polja za pošiljanje obrazca.",
   "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.txtEmpty": "(Prazno)",
+  "DE.ApplicationController.txtPressLink": "Pritisnite %1 in pritisnite povezavo",
   "DE.ApplicationController.unknownErrorText": "Neznana napaka.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Vaš brskalnik ni podprt.",
   "DE.ApplicationController.waitText": "Prosimo počakajte ...",
@@ -36,5 +48,6 @@
   "DE.ApplicationView.txtFileLocation": "Odpri lokacijo dokumenta",
   "DE.ApplicationView.txtFullScreen": "Celozaslonski",
   "DE.ApplicationView.txtPrint": "Natisni",
+  "DE.ApplicationView.txtSearch": "Iskanje",
   "DE.ApplicationView.txtShare": "Deli"
 }

apps/documenteditor/embed/locale/sv.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b> Formulär skickat </b><br> Klicka för att stänga tipset",
   "DE.ApplicationController.txtClose": "Stäng",
   "DE.ApplicationController.txtEmpty": "(Tom)",
-  "DE.ApplicationController.txtPressLink": "Tryck på CTRL och klicka på länken",
+  "DE.ApplicationController.txtPressLink": "Tryck på %1 och klicka på länken",
   "DE.ApplicationController.unknownErrorText": "Okänt fel.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Din webbläsare stöds ej.",
   "DE.ApplicationController.waitText": "Vänligen vänta...",

apps/documenteditor/embed/locale/tr.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Yükseklik",
   "common.view.modals.txtShare": "Bağlantıyı Paylaş",
   "common.view.modals.txtWidth": "Genişlik",
+  "common.view.SearchBar.textFind": "Bul",
   "DE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.",
   "DE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.",
   "DE.ApplicationController.criticalErrorTitle": "Hata",
@@ -35,7 +36,7 @@
   "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.txtEmpty": "(Boş)",
-  "DE.ApplicationController.txtPressLink": "CTRL'ye basın ve bağlantıya tıklayın",
+  "DE.ApplicationController.txtPressLink": "%1'ye basın ve bağlantıya tıklayın",
   "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.",
   "DE.ApplicationController.waitText": "Lütfen bekleyin...",
@@ -46,5 +47,6 @@
   "DE.ApplicationView.txtFileLocation": "Dosya konumunu aç",
   "DE.ApplicationView.txtFullScreen": "Tam Ekran",
   "DE.ApplicationView.txtPrint": "Yazdır",
+  "DE.ApplicationView.txtSearch": "Arama",
   "DE.ApplicationView.txtShare": "Paylaş"
 }

apps/documenteditor/embed/locale/uk.json

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>Форму успішно відправлено</b><br>Натисніть, щоб закрити підказку",
   "DE.ApplicationController.txtClose": "Закрити",
   "DE.ApplicationController.txtEmpty": "(Пусто)",
-  "DE.ApplicationController.txtPressLink": "Натисніть CTRL та клацніть по посиланню",
+  "DE.ApplicationController.txtPressLink": "Натисніть %1 та клацніть по посиланню",
   "DE.ApplicationController.unknownErrorText": "Невідома помилка.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не підтримується",
   "DE.ApplicationController.waitText": "Будь ласка, зачекайте...",

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

@@ -35,7 +35,7 @@
   "DE.ApplicationController.textSubmited": "<b>表格傳送成功</b><br>點此關閉提示",
   "DE.ApplicationController.txtClose": "結束",
   "DE.ApplicationController.txtEmpty": "（空）",
-  "DE.ApplicationController.txtPressLink": "按Ctrl並點擊連結",
+  "DE.ApplicationController.txtPressLink": "按%1並點擊連結",
   "DE.ApplicationController.unknownErrorText": "未知錯誤。",
   "DE.ApplicationController.unsupportedBrowserErrorText": "不支援您的瀏覽器",
   "DE.ApplicationController.waitText": "請耐心等待...",

apps/documenteditor/embed/locale/zh.json

@@ -26,6 +26,7 @@
   "DE.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。",
   "DE.ApplicationController.textAnonymous": "匿名",
   "DE.ApplicationController.textClear": "清除所有字段",
+  "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "知道了",
   "DE.ApplicationController.textGuest": "访客",
   "DE.ApplicationController.textLoadingDocument": "文件加载中…",
@@ -36,7 +37,7 @@
   "DE.ApplicationController.textSubmited": "<b>表单提交成功</b><br>点击以关闭提示",
   "DE.ApplicationController.txtClose": "关闭",
   "DE.ApplicationController.txtEmpty": "（空）",
-  "DE.ApplicationController.txtPressLink": "按CTRL并单击链接",
+  "DE.ApplicationController.txtPressLink": "按%1并单击链接",
   "DE.ApplicationController.unknownErrorText": "未知错误。",
   "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持",
   "DE.ApplicationController.waitText": "请稍候...",

apps/documenteditor/forms/app.js

@@ -126,6 +126,8 @@ require([
     'gateway',
     'locale'
 ], function (Backbone, Bootstrap, Core) {
+    if (Backbone.History && Backbone.History.started)
+        return;
     Backbone.history.start();
 
     /**

apps/documenteditor/forms/app_dev.js

@@ -116,6 +116,8 @@ require([
     'sockjs',
     'underscore'
 ], function (Backbone, Bootstrap, Core) {
+    if (Backbone.History && Backbone.History.started)
+        return;
     Backbone.history.start();
 
     /**

apps/documenteditor/forms/locale/ca.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "dt.",
   "Common.UI.Calendar.textShortWednesday": "dc.",
   "Common.UI.Calendar.textYears": "Anys",
+  "Common.UI.SearchBar.textFind": "Cercar",
+  "Common.UI.SearchBar.tipCloseSearch": "Tanca la cerca",
+  "Common.UI.SearchBar.tipNextResult": "El resultat següent",
+  "Common.UI.SearchBar.tipPreviousResult": "El resultat anterior",
   "Common.UI.Themes.txtThemeClassicLight": "Llum clàssica",
   "Common.UI.Themes.txtThemeDark": "Fosc",
   "Common.UI.Themes.txtThemeLight": "Clar",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Obre la ubicació del fitxer",
   "DE.Views.ApplicationView.txtFullScreen": "Pantalla sencera",
   "DE.Views.ApplicationView.txtPrint": "Imprimeix",
+  "DE.Views.ApplicationView.txtSearch": "Cerca",
   "DE.Views.ApplicationView.txtShare": "Comparteix",
   "DE.Views.ApplicationView.txtTheme": "Tema de la interfície"
 }

apps/documenteditor/forms/locale/cs.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "út",
   "Common.UI.Calendar.textShortWednesday": "st",
   "Common.UI.Calendar.textYears": "roky",
+  "Common.UI.SearchBar.textFind": "Najít",
+  "Common.UI.SearchBar.tipCloseSearch": "Zavřít hledání",
+  "Common.UI.SearchBar.tipNextResult": "Následující",
+  "Common.UI.SearchBar.tipPreviousResult": "Předchozí",
   "Common.UI.Themes.txtThemeClassicLight": "Standartní světlost",
   "Common.UI.Themes.txtThemeDark": "Tmavé",
   "Common.UI.Themes.txtThemeLight": "Světlé",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Otevřít umístění souboru",
   "DE.Views.ApplicationView.txtFullScreen": "Na celou obrazovku",
   "DE.Views.ApplicationView.txtPrint": "Tisk",
+  "DE.Views.ApplicationView.txtSearch": "Hledat",
   "DE.Views.ApplicationView.txtShare": "Sdílet",
   "DE.Views.ApplicationView.txtTheme": "Vzhled prostředí"
 }

apps/documenteditor/forms/locale/en.json

@@ -103,7 +103,7 @@
   "DE.Controllers.ApplicationController.errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
-  "DE.Controllers.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.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Connection has been restored, and the file version has been changed.<br>Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.",
   "DE.Controllers.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Image from File",

apps/documenteditor/forms/locale/es.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Ma",
   "Common.UI.Calendar.textShortWednesday": "Mié",
   "Common.UI.Calendar.textYears": "años",
+  "Common.UI.SearchBar.textFind": "Buscar",
+  "Common.UI.SearchBar.tipCloseSearch": "Cerrar búsqueda",
+  "Common.UI.SearchBar.tipNextResult": "Resultado siguiente",
+  "Common.UI.SearchBar.tipPreviousResult": "Resultado anterior",
   "Common.UI.Themes.txtThemeClassicLight": "Clásico claro",
   "Common.UI.Themes.txtThemeDark": "Oscuro",
   "Common.UI.Themes.txtThemeLight": "Claro",
@@ -99,7 +103,7 @@
   "DE.Controllers.ApplicationController.errorToken": "El token de seguridad de documento tiene un formato incorrecto.<br>Por favor, contacte con el Administrador del Servidor de Documentos.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado.<br>Por favor, póngase en contacto con el administrador del Servidor de Documentos.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
-  "DE.Controllers.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.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo.<br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
   "DE.Controllers.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Se ha perdido la conexión. Usted todavía puede visualizar el documento,<br>pero no puede descargar o imprimirlo hasta que la conexión sea restaurada y la página esté recargada.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Imagen desde archivo",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Abrir ubicación del archivo",
   "DE.Views.ApplicationView.txtFullScreen": "Pantalla Completa",
   "DE.Views.ApplicationView.txtPrint": "Imprimir",
+  "DE.Views.ApplicationView.txtSearch": "Búsqueda",
   "DE.Views.ApplicationView.txtShare": "Compartir",
   "DE.Views.ApplicationView.txtTheme": "Tema de interfaz"
 }

apps/documenteditor/forms/locale/fr.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Mar.",
   "Common.UI.Calendar.textShortWednesday": "Mer.",
   "Common.UI.Calendar.textYears": "Années",
+  "Common.UI.SearchBar.textFind": "Rechercher",
+  "Common.UI.SearchBar.tipCloseSearch": "Fermer la recherche",
+  "Common.UI.SearchBar.tipNextResult": "Résultat suivant",
+  "Common.UI.SearchBar.tipPreviousResult": "Résultat précédent",
   "Common.UI.Themes.txtThemeClassicLight": "Classique clair",
   "Common.UI.Themes.txtThemeDark": "Sombre",
   "Common.UI.Themes.txtThemeLight": "Clair",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier",
   "DE.Views.ApplicationView.txtFullScreen": "Plein écran",
   "DE.Views.ApplicationView.txtPrint": "Imprimer",
+  "DE.Views.ApplicationView.txtSearch": "Recherche",
   "DE.Views.ApplicationView.txtShare": "Partager",
   "DE.Views.ApplicationView.txtTheme": "Thème d’interface"
 }

apps/documenteditor/forms/locale/hu.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Ke",
   "Common.UI.Calendar.textShortWednesday": "Sze",
   "Common.UI.Calendar.textYears": "Évek",
+  "Common.UI.SearchBar.textFind": "Keres",
+  "Common.UI.SearchBar.tipCloseSearch": "Keresés bezárása",
+  "Common.UI.SearchBar.tipNextResult": "Következő eredmény",
+  "Common.UI.SearchBar.tipPreviousResult": "Előző eredmény",
   "Common.UI.Themes.txtThemeClassicLight": "Klasszikus Világos",
   "Common.UI.Themes.txtThemeDark": "Sötét",
   "Common.UI.Themes.txtThemeLight": "Világos",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Fájl helyének megnyitása",
   "DE.Views.ApplicationView.txtFullScreen": "Teljes képernyő",
   "DE.Views.ApplicationView.txtPrint": "Nyomtatás",
+  "DE.Views.ApplicationView.txtSearch": "Keresés",
   "DE.Views.ApplicationView.txtShare": "Megosztás",
   "DE.Views.ApplicationView.txtTheme": "Felhasználói felület témája"
 }

apps/documenteditor/forms/locale/it.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Mar",
   "Common.UI.Calendar.textShortWednesday": "Mer",
   "Common.UI.Calendar.textYears": "anni",
+  "Common.UI.SearchBar.textFind": "Trova",
+  "Common.UI.SearchBar.tipCloseSearch": "Chiudi la ricerca",
+  "Common.UI.SearchBar.tipNextResult": "Successivo",
+  "Common.UI.SearchBar.tipPreviousResult": "Precedente",
   "Common.UI.Themes.txtThemeClassicLight": "Classico chiaro",
   "Common.UI.Themes.txtThemeDark": "Scuro",
   "Common.UI.Themes.txtThemeLight": "Chiaro",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Apri percorso file",
   "DE.Views.ApplicationView.txtFullScreen": "Schermo intero",
   "DE.Views.ApplicationView.txtPrint": "Stampa",
+  "DE.Views.ApplicationView.txtSearch": "Cerca",
   "DE.Views.ApplicationView.txtShare": "Condividi",
   "DE.Views.ApplicationView.txtTheme": "Tema dell'interfaccia"
 }

apps/documenteditor/forms/locale/ja.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "火",
   "Common.UI.Calendar.textShortWednesday": "水",
   "Common.UI.Calendar.textYears": "年",
+  "Common.UI.SearchBar.textFind": "検索",
+  "Common.UI.SearchBar.tipCloseSearch": "検索を閉じる",
+  "Common.UI.SearchBar.tipNextResult": "次の結果",
+  "Common.UI.SearchBar.tipPreviousResult": "前の結果",
   "Common.UI.Themes.txtThemeClassicLight": "ライト(クラシック)",
   "Common.UI.Themes.txtThemeDark": "ダーク",
   "Common.UI.Themes.txtThemeLight": "ライト",
@@ -99,7 +103,7 @@
   "DE.Controllers.ApplicationController.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。<br>ドキュメントサーバーの管理者にご連絡ください。",
   "DE.Controllers.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "ファイルが変更されました。ページがリロードされます。",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして、変更が消えてしまわないようにしてからページを再読み込みしてください。",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして変更が失われていないことを確認してから、このページを再読み込みしてください。",
   "DE.Controllers.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "接続が失われました。文書の表示は可能ですが、<br>再度接続されてページが再ロードされるまで、ダウンロードまたは印刷することはできません。",
   "DE.Controllers.ApplicationController.mniImageFromFile": "ファイルからの画像",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "ファイルを開く",
   "DE.Views.ApplicationView.txtFullScreen": "全画面表示",
   "DE.Views.ApplicationView.txtPrint": "印刷する",
+  "DE.Views.ApplicationView.txtSearch": "検索",
   "DE.Views.ApplicationView.txtShare": "シェア",
   "DE.Views.ApplicationView.txtTheme": "インターフェイスのテーマ"
 }

apps/documenteditor/forms/locale/pt-PT.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Ter",
   "Common.UI.Calendar.textShortWednesday": "Qua",
   "Common.UI.Calendar.textYears": "Anos",
+  "Common.UI.SearchBar.textFind": "Localizar",
+  "Common.UI.SearchBar.tipCloseSearch": "Fechar pesquisa",
+  "Common.UI.SearchBar.tipNextResult": "Resultado seguinte",
+  "Common.UI.SearchBar.tipPreviousResult": "Resultado anterior",
   "Common.UI.Themes.txtThemeClassicLight": "Clássico claro",
   "Common.UI.Themes.txtThemeDark": "Escuro",
   "Common.UI.Themes.txtThemeLight": "Claro",
@@ -55,10 +59,10 @@
   "Common.Views.EmbedDialog.textTitle": "Incorporar",
   "Common.Views.EmbedDialog.textWidth": "Largura",
   "Common.Views.EmbedDialog.txtCopy": "Copiar para a área de transferência",
-  "Common.Views.EmbedDialog.warnCopy": "Erro do navegador! Use a tecla de atalho [Ctrl] + [C]",
+  "Common.Views.EmbedDialog.warnCopy": "Erro do navegador! Utilize a tecla de atalho [Ctrl] + [C]",
-  "Common.Views.ImageFromUrlDialog.textUrl": "Colar um URL de imagem:",
+  "Common.Views.ImageFromUrlDialog.textUrl": "Colar URL de uma imagem:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo é obrigatório",
-  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo deve ser um URL no formato \"http://www.example.com\"",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo deve ser um URL no formato \"http://www.exemplo.com\"",
   "Common.Views.OpenDialog.closeButtonText": "Fechar ficheiro",
   "Common.Views.OpenDialog.txtEncoding": "Codificação",
   "Common.Views.OpenDialog.txtIncorrectPwd": "A palavra-passe está incorreta.",
@@ -66,15 +70,15 @@
   "Common.Views.OpenDialog.txtPassword": "Palavra-passe",
   "Common.Views.OpenDialog.txtPreview": "Pré-visualizar",
   "Common.Views.OpenDialog.txtProtected": "Assim que introduzir a palavra-passe e abrir o ficheiro, a palavra-passe atual será reposta.",
-  "Common.Views.OpenDialog.txtTitle": "Escolha opções para %1",
+  "Common.Views.OpenDialog.txtTitle": "Escolha as opções para %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Ficheiro protegido",
   "Common.Views.SaveAsDlg.textLoading": "A carregar",
   "Common.Views.SaveAsDlg.textTitle": "Pasta para guardar",
   "Common.Views.SelectFileDlg.textLoading": "A carregar",
-  "Common.Views.SelectFileDlg.textTitle": "Selecionar fonte de dados",
+  "Common.Views.SelectFileDlg.textTitle": "Selecione a origem dos dados",
   "Common.Views.ShareDialog.textTitle": "Partilhar ligação",
   "Common.Views.ShareDialog.txtCopy": "Copiar para a área de transferência",
-  "Common.Views.ShareDialog.warnCopy": "Erro do navegador! Use a tecla de atalho [Ctrl] + [C]",
+  "Common.Views.ShareDialog.warnCopy": "Erro do navegador! Utilize a tecla de atalho [Ctrl] + [C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Falha na conversão.",
   "DE.Controllers.ApplicationController.convertationTimeoutText": "Excedeu o tempo limite de conversão.",
   "DE.Controllers.ApplicationController.criticalErrorTitle": "Erro",
@@ -82,24 +86,24 @@
   "DE.Controllers.ApplicationController.downloadTextText": "A descarregar documento...",
   "DE.Controllers.ApplicationController.errorAccessDeny": "Está a tentar executar uma ação para a qual não tem permissões.<br>Por favor contacte o administrador do servidor de documentos.",
   "DE.Controllers.ApplicationController.errorBadImageUrl": "O URL da imagem está incorreto",
-  "DE.Controllers.ApplicationController.errorConnectToServer": "Não foi possível guardar o documento. Verifique as definições de ligação ou contacte o administrador.<br>Quando clicar no botão 'OK', ser-lhe-á pedido para descarregar o documento.",
+  "DE.Controllers.ApplicationController.errorConnectToServer": "Não foi possível guardar o documento. Verifique a sua ligação de rede ou contacte o seu administrador.<br>Ao clicar no botão OK, ser-lhe-á pedido para descarregar o documento.",
   "DE.Controllers.ApplicationController.errorDataEncrypted": "Foram recebidas alterações cifradas que não puderam ser decifradas.",
-  "DE.Controllers.ApplicationController.errorDefaultMessage": "Código do erro: %1",
+  "DE.Controllers.ApplicationController.errorDefaultMessage": "Código de erro: %1",
   "DE.Controllers.ApplicationController.errorEditingDownloadas": "Ocorreu um erro ao trabalhar no documento.<br>Utilize a opção 'Descarregar como...' para guardar uma cópia do ficheiro no computador.",
   "DE.Controllers.ApplicationController.errorEditingSaveas": "Ocorreu um erro ao trabalhar no documento.<br>Utilize a opção 'Guardar como...' para guardar uma cópia do ficheiro no seu computador.",
   "DE.Controllers.ApplicationController.errorFilePassProtect": "O ficheiro está protegido por palavra-passe e não pode ser aberto.",
-  "DE.Controllers.ApplicationController.errorFileSizeExceed": "O tamanho do ficheiro excede o limite do servidor.<br>Contacte o administrador do servidor de documentos para mais detalhes.",
+  "DE.Controllers.ApplicationController.errorFileSizeExceed": "O tamanho do documento excede o limite permitido pelo servidor.<br>Contacte o administrador do servidor de documentos para mais informações.",
-  "DE.Controllers.ApplicationController.errorForceSave": "Ocorreu um erro ao guardar o ficheiro. Utilize a opção 'Descarregar como' para guardar o ficheiro no computador ou tente novamente mais tarde.",
+  "DE.Controllers.ApplicationController.errorForceSave": "Ocorreu um erro ao guardar o ficheiro. Utilize a opção 'Descarregar como' para guardar o ficheiro no computador ou tente mais tarde.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Os tipos de letra não foram carregados.<br>Contacte o administrador do servidor de documentos.",
   "DE.Controllers.ApplicationController.errorServerVersion": "A versão do editor foi atualizada. A página será recarregada para aplicar as alterações.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "A sessão de edição expirou. Tente recarregar a página.",
-  "DE.Controllers.ApplicationController.errorSessionIdle": "O documento não foi editado durante muito tempo. Por favor, recarregue a página.",
+  "DE.Controllers.ApplicationController.errorSessionIdle": "Este documento não foi editado durante muito tempo. Tente recarregar a página.",
   "DE.Controllers.ApplicationController.errorSessionToken": "A ligação ao servidor foi interrompida. Tente recarregar a página.",
-  "DE.Controllers.ApplicationController.errorSubmit": "Falha no envio.",
+  "DE.Controllers.ApplicationController.errorSubmit": "Falha ao submeter.",
-  "DE.Controllers.ApplicationController.errorToken": "O token do documento não está correctamente formado.<br>Por favor contacte o seu administrador do Servidor de Documentos.",
+  "DE.Controllers.ApplicationController.errorToken": "O 'token' de segurança do documento não foi formatado corretamente.<br>Entre em contato com o administrador do servidor de documentos.",
-  "DE.Controllers.ApplicationController.errorTokenExpire": "O token de segurança do documento expirou.<br>Entre em contacto com o administrador do Servidor de Documentos.",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "O 'token' de segurança do documento expirou.<br>Entre em contacto com o administrador do servidor de documentos.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "A versão do ficheiro foi alterada. A página será recarregada.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "A ligação à Internet foi restaurada e a versão do ficheiro alterada.<br>Antes de continuar o seu trabalho, descarregue o ficheiro ou copie o seu conteúdo para ter a certeza de que não perde os seus elementos e recarregue a página.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "A ligação foi restaurada e a versão do ficheiro foi alterada.<br>Antes de poder continuar a trabalhar, é necessário descarregar o ficheiro ou copiar o seu conteúdo para garantir que nada se perde e depois voltar a carregar esta página.",
   "DE.Controllers.ApplicationController.errorUserDrop": "De momento, não é possível aceder ao ficheiro.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Ligação perdida. Ainda pode ver o documento mas<br>não o conseguirá descarregar até que a ligação seja restaurada e a página recarregada.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Imagem de um ficheiro",
@@ -108,10 +112,10 @@
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Aviso",
   "DE.Controllers.ApplicationController.openErrorText": "Ocorreu um erro ao abrir o ficheiro.",
   "DE.Controllers.ApplicationController.saveErrorText": "Ocorreu um erro ao guardar o ficheiro.",
-  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Este ficheiro não pode ser guardado ou criado.<br>Os motivos podem ser: <br>1. O ficheiro é apenas de leitura. <br>2. O ficheiro está a ser editado por outro utilizador.<br>3. O disco está cheio ou corrompido.",
+  "DE.Controllers.ApplicationController.saveErrorTextDesktop": "Este ficheiro não pode ser guardado ou criado.<br>Os motivos podem ser: <br>1. O ficheiro é apenas de leitura. <br>2. O ficheiro está a ser editado por outro utilizador.<br>3. O disco está cheio ou danificado.",
   "DE.Controllers.ApplicationController.scriptLoadError": "A ligação está muito lenta e alguns dos componentes não foram carregados. Tente recarregar a página.",
   "DE.Controllers.ApplicationController.textAnonymous": "Anónimo",
-  "DE.Controllers.ApplicationController.textBuyNow": "Visitar website",
+  "DE.Controllers.ApplicationController.textBuyNow": "Visitar site",
   "DE.Controllers.ApplicationController.textCloseTip": "Clique para fechar a dica.",
   "DE.Controllers.ApplicationController.textContactUs": "Contacte a equipa comercial",
   "DE.Controllers.ApplicationController.textGotIt": "Percebi",
@@ -119,10 +123,10 @@
   "DE.Controllers.ApplicationController.textLoadingDocument": "A carregar documento",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Limite de licença atingido",
   "DE.Controllers.ApplicationController.textOf": "de",
-  "DE.Controllers.ApplicationController.textRequired": "Preencha todos os campos obrigatórios para enviar o formulário.",
+  "DE.Controllers.ApplicationController.textRequired": "Preencha todos os campos obrigatório para submeter o formulário.",
   "DE.Controllers.ApplicationController.textSaveAs": "Guardar como PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Guardar como...",
-  "DE.Controllers.ApplicationController.textSubmited": "<b>Formulário submetido com êxito</b><br>Clique para fechar a dica",
+  "DE.Controllers.ApplicationController.textSubmited": "<b>Formulário submetido com sucesso</b><br>Clique para fechar a dica",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Licença expirada",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor atualizado",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versão alterada",
@@ -138,11 +142,11 @@
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "O seu navegador não é suportado.",
   "DE.Controllers.ApplicationController.uploadImageExtMessage": "Formato de imagem desconhecido.",
   "DE.Controllers.ApplicationController.uploadImageSizeMessage": "A imagem é demasiado grande. O tamanho máximo é de 25 MB.",
-  "DE.Controllers.ApplicationController.waitText": "Por favor, aguarde...",
+  "DE.Controllers.ApplicationController.waitText": "Aguarde...",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "Atingiu o limite de ligações simultâneas a %1 editores. Este documento será aberto no modo de leitura.<br>Contacte o administrador para obter mais detalhes.",
   "DE.Controllers.ApplicationController.warnLicenseExp": "A sua licença expirou.<br>Deve atualizar a licença e recarregar a página.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Licença expirada.<br>Não pode editar o documento.<br>Por favor contacte o administrador de sistemas.",
-  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Tem que renovar a sua licença.<br>A edição de documentos está limitada.<br>Contacte o administrador de sistemas para obter acesso completo.",
+  "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Tem que renovar a sua licença.<br>A edição de documentos está limitada.<br>Contacte o administrador de sistemas para obter acesso total.",
   "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Atingiu o limite de %1 editores. Contacte o seu administrador para obter detalhes.",
   "DE.Controllers.ApplicationController.warnNoLicense": "Atingiu o limite de ligações simultâneas a %1 editores. Este documento será aberto no modo de leitura.<br>Contacte a equipa comercial %1 para saber mais sobre os termos de licenciamento.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Atingiu o limite de %1 editores. Contacte a equipa comercial %1 para obter mais informações.",
@@ -155,7 +159,7 @@
   "DE.Views.ApplicationView.textPaste": "Colar",
   "DE.Views.ApplicationView.textPrintSel": "Imprimir seleção",
   "DE.Views.ApplicationView.textRedo": "Refazer",
-  "DE.Views.ApplicationView.textSubmit": "Enviar",
+  "DE.Views.ApplicationView.textSubmit": "Submeter",
   "DE.Views.ApplicationView.textUndo": "Desfazer",
   "DE.Views.ApplicationView.textZoom": "Ampliação",
   "DE.Views.ApplicationView.txtDarkMode": "Modo escuro",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Abrir localização do ficheiro",
   "DE.Views.ApplicationView.txtFullScreen": "Ecrã completo",
   "DE.Views.ApplicationView.txtPrint": "Imprimir",
-  "DE.Views.ApplicationView.txtShare": "Compartilhar",
+  "DE.Views.ApplicationView.txtSearch": "Pesquisar",
+  "DE.Views.ApplicationView.txtShare": "Partilhar",
   "DE.Views.ApplicationView.txtTheme": "Tema da interface"
 }

apps/documenteditor/forms/locale/pt.json

@@ -32,6 +32,10 @@
   "Common.UI.Calendar.textShortTuesday": "Ter",
   "Common.UI.Calendar.textShortWednesday": "Qua",
   "Common.UI.Calendar.textYears": "anos",
+  "Common.UI.SearchBar.textFind": "Localizar",
+  "Common.UI.SearchBar.tipCloseSearch": "Fechar pesquisa",
+  "Common.UI.SearchBar.tipNextResult": "Próximo resultado",
+  "Common.UI.SearchBar.tipPreviousResult": "Resultado anterior",
   "Common.UI.Themes.txtThemeClassicLight": "Clássico claro",
   "Common.UI.Themes.txtThemeDark": "Escuro",
   "Common.UI.Themes.txtThemeLight": "Claro",
@@ -166,6 +170,7 @@
   "DE.Views.ApplicationView.txtFileLocation": "Local do arquivo aberto",
   "DE.Views.ApplicationView.txtFullScreen": "Tela cheia",
   "DE.Views.ApplicationView.txtPrint": "Imprimir",
+  "DE.Views.ApplicationView.txtSearch": "Pesquisar",
   "DE.Views.ApplicationView.txtShare": "Compartilhar",
   "DE.Views.ApplicationView.txtTheme": "Tema de interface"
 }

apps/documenteditor/forms/locale/ro.json

@@ -103,7 +103,7 @@
   "DE.Controllers.ApplicationController.errorToken": "Token de securitate din document este format în mod incorect.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Versiunea fișierului s-a modificat. Pagina va fi reîmprospătată.",
-  "DE.Controllers.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.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea 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.Controllers.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Conexiunea a fost pierdută. Încă mai puteți vizualiza documentul,<br>dar nu și să-l descărcați sau imprimați până când conexiunea se restabilește și pagina se reîmprospătează.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Imaginea din fișier",

apps/documenteditor/forms/locale/ru.json

@@ -103,7 +103,7 @@
   "DE.Controllers.ApplicationController.errorToken": "Токен безопасности документа имеет неправильный формат.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Истек срок действия токена безопасности документа.<br>Пожалуйста, обратитесь к администратору Сервера документов.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
-  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
+  "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "Соединение было восстановлено, и версия файла изменилась.<br>Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.",
   "DE.Controllers.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.",
   "DE.Controllers.ApplicationController.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.",
   "DE.Controllers.ApplicationController.mniImageFromFile": "Изображение из файла",

apps/documenteditor/main/app.js

@@ -133,6 +133,8 @@ require([
     'gateway',
     'locale'
 ], function (Backbone, Bootstrap, Core) {
+    if (Backbone.History && Backbone.History.started)
+        return;
     Backbone.history.start();
 
     /**

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

@@ -1000,7 +1000,7 @@ define([
                         ToolTip = Common.Utils.String.htmlEncode(ToolTip);
 
                     if (screenTip.tipType !== type || screenTip.tipLength !== ToolTip.length || screenTip.strTip.indexOf(ToolTip)<0 ) {
-                        screenTip.toolTip.setTitle((type==Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? (ToolTip + '<br><b>' + me.documentHolder.txtPressLink + '</b>') : ToolTip);
+                        screenTip.toolTip.setTitle((type==Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? (ToolTip + '<br><b>' + Common.Utils.String.platformKey('Ctrl', me.documentHolder.txtPressLink) + '</b>') : ToolTip);
                         screenTip.tipLength = ToolTip.length;
                         screenTip.strTip = ToolTip;
                         screenTip.tipType = type;

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

@@ -140,7 +140,7 @@ define([
             var in_control = this.api.asc_IsContentControl();
             var control_props = in_control ? this.api.asc_GetContentControlProperties() : null,
                 lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,
-                control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false;
+                control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()===Asc.c_oAscSdtLevelType.Inline && !control_props.get_ComplexFormPr()) : false;
             (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked);
             var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked;
             var arr = [ this.view.btnTextField, this.view.btnComboBox, this.view.btnDropDown, this.view.btnCheckBox,

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

@@ -57,10 +57,7 @@ define([
                 'Navigation': {
                     'show': function() {
                         if (!this.canUseViwerNavigation) {
-                            var obj = me.api.asc_ShowDocumentOutline();
+                            me.api.asc_ShowDocumentOutline();
-                            if (!me._navigationObject)
-                                me._navigationObject = obj;
-                            me.updateNavigation();
                         } else {
                             if (me.panelNavigation && me.panelNavigation.viewNavigationList && me.panelNavigation.viewNavigationList.scroller)
                                 me.panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
@@ -131,6 +128,9 @@ define([
         },
 
         updateNavigation: function() {
+            if (!this._navigationObject)
+                this._navigationObject = this.api.asc_GetDocumentOutlineManager();
+
             if (!this._navigationObject) return;
 
             var count = this._navigationObject.get_ElementsCount(),
@@ -163,11 +163,37 @@ define([
                 arr[0].set('name', this.txtBeginning);
                 arr[0].set('tip', this.txtGotoBeginning);
             }
-            this.getApplication().getCollection('Navigation').reset(arr);
+
-            this.onChangeOutlinePosition(this._navigationObject.get_CurrentPosition());
+            var me = this;
+            var store = this.getApplication().getCollection('Navigation');
+            store.reset(arr.splice(0, 50));
+
+            this._currentPos = this._navigationObject.get_CurrentPosition();
+
+            function addToPanel() {
+                if (arr.length<1) {
+                    me.panelNavigation.viewNavigationList.scroller && me.panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
+                    if (me._currentPos>-1 && me._currentPos<store.length)
+                        me.onChangeOutlinePosition(me._currentPos);
+                    me._currentPos = -1;
+                    return;
+                }
+                setTimeout(function () {
+                    store.add(arr.splice(0, 100));
+                    if (me._currentPos>-1 && me._currentPos<store.length) {
+                        me.onChangeOutlinePosition(me._currentPos);
+                        me._currentPos = -1;
+                    }
+                    addToPanel();
+                }, 1);
+            }
+            addToPanel();
         },
 
         updateChangeNavigation: function(index) {
+            if (!this._navigationObject)
+                this._navigationObject = this.api.asc_GetDocumentOutlineManager();
+
             if (!this._navigationObject) return;
 
             var item = this.getApplication().getCollection('Navigation').at(index);
@@ -182,7 +208,10 @@ define([
         },
 
         onChangeOutlinePosition: function(index) {
+            if (index<this.panelNavigation.viewNavigationList.store.length)
                 this.panelNavigation.viewNavigationList.scrollToRecord(this.panelNavigation.viewNavigationList.selectByIndex(index));
+            else
+                this._currentPos = index;
         },
 
         onItemContextMenu: function(picker, item, record, e){

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

@@ -57,7 +57,13 @@ define([
                 'SearchBar': {
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
                     'search:next': _.bind(this.onSearchNext, this, 'next'),
-                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:input': _.bind(function (text) {
+                        if (this._state.searchText === text) {
+                            Common.NotificationCenter.trigger('search:updateresults', this._state.currentResult, this._state.resultsNumber);
+                            return;
+                        }
+                        this.onInputSearchChange(text);
+                    }, this),
                     'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
                     'show': _.bind(this.onSelectSearchingResults, this, true),
                     'hide': _.bind(this.onSelectSearchingResults, this, false)
@@ -100,6 +106,8 @@ define([
                 this.api.asc_registerCallback('asc_onEndTextAroundSearch', _.bind(this.onEndTextAroundSearch, this));
                 this.api.asc_registerCallback('asc_onGetTextAroundSearchPack', _.bind(this.onApiGetTextAroundSearch, this));
                 this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this));
+                this.api.asc_registerCallback('asc_onSearchEnd', _.bind(this.onApiSearchEnd, this));
+                this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this));
             }
             return this;
         },
@@ -168,6 +176,7 @@ define([
                             me.view.disableReplaceButtons(false);
                         } else if (me._state.newSearchText === '') {
                             me.view.updateResultsNumber('no-results');
+                            me.view.disableNavButtons();
                             me.view.disableReplaceButtons(true);
                         }
                         clearInterval(me.searchTimer);
@@ -199,14 +208,16 @@ define([
                 var me = this;
                 var str = this.api.asc_GetErrorForReplaceString(textReplace);
                 if (str) {
+                    setTimeout(function() {
                         Common.UI.warning({
-                        title: this.notcriticalErrorTitle,
+                            title: me.notcriticalErrorTitle,
-                        msg: Common.Utils.String.format(this.warnReplaceString, str),
+                            msg: Common.Utils.String.format(me.warnReplaceString, str),
                             buttons: ['ok'],
                             callback: function(){
                                 me.view.focus('replace');
                             }
                         });
+                    }, 1);
                     return;
                 }
 
@@ -215,7 +226,7 @@ define([
                 searchSettings.put_MatchCase(this._state.matchCase);
                 searchSettings.put_WholeWords(this._state.matchWord);
                 if (!this.api.asc_replaceText(searchSettings, textReplace, false)) {
-                    this.allResultsWasRemoved();
+                    this.removeResultItems();
                 }
             }
         },
@@ -225,14 +236,16 @@ define([
                 var me = this;
                 var str = this.api.asc_GetErrorForReplaceString(textReplace);
                 if (str) {
+                    setTimeout(function() {
                         Common.UI.warning({
-                        title: this.notcriticalErrorTitle,
+                            title: me.notcriticalErrorTitle,
-                        msg: Common.Utils.String.format(this.warnReplaceString, str),
+                            msg: Common.Utils.String.format(me.warnReplaceString, str),
                             buttons: ['ok'],
                             callback: function(){
                                 me.view.focus('replace');
                             }
                         });
+                    }, 1);
                     return;
                 }
 
@@ -242,14 +255,14 @@ define([
                 searchSettings.put_WholeWords(this._state.matchWord);
                 this.api.asc_replaceText(searchSettings, textReplace, true);
 
-                this.allResultsWasRemoved();
+                this.removeResultItems();
             }
         },
 
-        allResultsWasRemoved: function () {
+        removeResultItems: function (type) {
             this.resultItems = [];
             this.hideResults();
-            this.view.updateResultsNumber(undefined, 0);
+            this.view.updateResultsNumber(type, 0); // type === undefined, count === 0 -> no matches
             this.view.disableReplaceButtons(true);
             this._state.currentResult = 0;
             this._state.resultsNumber = 0;
@@ -359,7 +372,8 @@ define([
                 viewport.searchBar.hide();
             }
 
-            var text = typeof findText === 'string' ? findText : (this.api.asc_GetSelectedText() || this._state.searchText);
+            var selectedText = this.api.asc_GetSelectedText(),
+                text = typeof findText === 'string' ? findText : (selectedText && selectedText.trim() || this._state.searchText);
             if (this.resultItems && this.resultItems.length > 0 &&
                 (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
                     this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
@@ -420,8 +434,29 @@ define([
             }
         },
 
+        onApiSearchEnd: function () {
+            this.removeResultItems('stop');
+        },
+
+        onApiTextReplaced: function(found, replaced) {
+            if (found) {
+                !(found - replaced > 0) ?
+                    Common.UI.info( {msg: Common.Utils.String.format(this.textReplaceSuccess, replaced)} ) :
+                    Common.UI.warning( {msg: Common.Utils.String.format(this.textReplaceSkipped, found-replaced)} );
+            } else {
+                Common.UI.info({msg: this.textNoTextFound});
+            }
+        },
+
+        getSearchText: function () {
+            return this._state.searchText;
+        },
+
         notcriticalErrorTitle: 'Warning',
-        warnReplaceString: '{0} is not a valid special character for the Replace With box.'
+        warnReplaceString: '{0} is not a valid special character for the Replace With box.',
+        textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
+        textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',
+        textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.'
 
     }, DE.Controllers.Search || {}));
 });

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

@@ -268,8 +268,10 @@ define([
             toolbar.btnUndo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'undo:disabled'));
             toolbar.btnRedo.on('click',                                 _.bind(this.onRedo, this));
             toolbar.btnRedo.on('disabled',                              _.bind(this.onBtnChangeState, this, 'redo:disabled'));
-            toolbar.btnCopy.on('click',                                 _.bind(this.onCopyPaste, this, true));
+            toolbar.btnCopy.on('click',                                 _.bind(this.onCopyPaste, this, 'copy'));
-            toolbar.btnPaste.on('click',                                _.bind(this.onCopyPaste, this, false));
+            toolbar.btnPaste.on('click',                                _.bind(this.onCopyPaste, this, 'paste'));
+            toolbar.btnCut.on('click',                                  _.bind(this.onCopyPaste, this, 'cut'));
+            toolbar.btnSelectAll.on('click',                            _.bind(this.onSelectAll, this));
             toolbar.btnIncFontSize.on('click',                          _.bind(this.onIncrease, this));
             toolbar.btnDecFontSize.on('click',                          _.bind(this.onDecrease, this));
             toolbar.mnuChangeCase.on('item:click',                      _.bind(this.onChangeCase, this));
@@ -493,8 +495,8 @@ define([
 
         onApiVerticalAlign: function(typeBaseline) {
             if (this._state.valign !== typeBaseline) {
-                this.toolbar.btnSuperscript.toggle(typeBaseline==1, true);
+                this.toolbar.btnSuperscript.toggle(typeBaseline==Asc.vertalign_SuperScript, true);
-                this.toolbar.btnSubscript.toggle(typeBaseline==2, true);
+                this.toolbar.btnSubscript.toggle(typeBaseline==Asc.vertalign_SubScript, true);
                 this._state.valign = typeBaseline;
             }
         },
@@ -515,7 +517,7 @@ define([
 
         onApiCanCopyCut: function(can) {
             if (this._state.can_copycut !== can) {
-                this.toolbar.lockToolbar(Common.enumLock.copyLock, !can, {array: [this.toolbar.btnCopy]});
+                this.toolbar.lockToolbar(Common.enumLock.copyLock, !can, {array: [this.toolbar.btnCopy, this.toolbar.btnCut]});
                 this._state.can_copycut = can;
             }
         },
@@ -567,6 +569,11 @@ define([
                                 idx = 7;
                                 break;
                         }
+                        if ('{{DEFAULT_LANG}}' === 'ru') {
+                            if (this._state.bullets.subtype>7 && this._state.bullets.subtype<=11) {
+                                idx = this._state.bullets.subtype;
+                            }
+                        }
                         this.toolbar.btnNumbers.toggle(true, true);
                         if (idx!==undefined)
                             this.toolbar.mnuNumbersPicker.selectByIndex(idx, true);
@@ -1101,10 +1108,10 @@ define([
             Common.component.Analytics.trackEvent('ToolBar', 'Redo');
         },
 
-        onCopyPaste: function(copy, e) {
+        onCopyPaste: function(type, e) {
             var me = this;
             if (me.api) {
-                var res = (copy) ? me.api.Copy() : me.api.Paste();
+                var res = (type === 'cut') ? me.api.Cut() : ((type === 'copy') ? me.api.Copy() : me.api.Paste());
                 if (!res) {
                     if (!Common.localStorage.getBool("de-hide-copywarning")) {
                         (new Common.Views.CopyWarningDialog({
@@ -1120,6 +1127,14 @@ define([
             Common.NotificationCenter.trigger('edit:complete', me.toolbar);
         },
 
+        onSelectAll: function(e) {
+            if (this.api)
+                this.api.asc_EditSelectAll();
+
+            Common.NotificationCenter.trigger('edit:complete', this.toolbar);
+            Common.component.Analytics.trackEvent('ToolBar', 'Select All');
+        },
+
         onIncrease: function(e) {
             if (this.api)
                 this.api.FontSizeIn();
@@ -1176,7 +1191,7 @@ define([
             if (!this.toolbar.btnSubscript.pressed) {
                 this._state.valign = undefined;
                 if (this.api)
-                    this.api.put_TextPrBaseline(btn.pressed ? 1 : 0);
+                    this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SuperScript : Asc.vertalign_Baseline);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
                 Common.component.Analytics.trackEvent('ToolBar', 'Superscript');
@@ -1187,7 +1202,7 @@ define([
             if (!this.toolbar.btnSuperscript.pressed) {
                 this._state.valign = undefined;
                 if (this.api)
-                    this.api.put_TextPrBaseline(btn.pressed ? 2 : 0);
+                    this.api.put_TextPrBaseline(btn.pressed ? Asc.vertalign_SubScript : Asc.vertalign_Baseline);
 
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
                 Common.component.Analytics.trackEvent('ToolBar', 'Subscript');
@@ -2883,7 +2898,7 @@ define([
             this.toolbar.lockToolbar(Common.enumLock.disableOnStart, false);
             this.toolbar.lockToolbar(Common.enumLock.undoLock, this._state.can_undo!==true, {array: [this.toolbar.btnUndo]});
             this.toolbar.lockToolbar(Common.enumLock.redoLock, this._state.can_redo!==true, {array: [this.toolbar.btnRedo]});
-            this.toolbar.lockToolbar(Common.enumLock.copyLock, this._state.can_copycut!==true, {array: [this.toolbar.btnCopy]});
+            this.toolbar.lockToolbar(Common.enumLock.copyLock, this._state.can_copycut!==true, {array: [this.toolbar.btnCopy, this.toolbar.btnCut]});
             this.toolbar.lockToolbar(Common.enumLock.mmergeLock, !!this._state.mmdisable, {array: [this.toolbar.btnMailRecepients]});
             if (!this._state.mmdisable) {
                 this.toolbar.mnuMailRecepients.items[2].setVisible(this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients);
@@ -3180,6 +3195,7 @@ define([
                     me.toolbar.btnPaste.$el.detach().appendTo($box);
                     me.toolbar.btnPaste.$el.find('button').attr('data-hint-direction', 'bottom');
                     me.toolbar.btnCopy.$el.removeClass('split');
+                    me.toolbar.processPanelVisible(null, true, true);
                 }
 
                 if ( config.isDesktopApp ) {

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

@@ -293,7 +293,8 @@ define([
                 }, this));
             }
             if (this.header.btnSearch.pressed) {
-                this.searchBar.show(this.api.asc_GetSelectedText());
+                var selectedText = this.api.asc_GetSelectedText();
+                this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
             } else {
                 this.searchBar.hide();
             }

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

@@ -25,6 +25,14 @@
                     <span class="btn-slot" id="slot-btn-redo"></span>
                 </div>
             </div>
+            <div class="group small">
+                <div class="elset">
+                    <span class="btn-slot" id="slot-btn-cut"></span>
+                </div>
+                <div class="elset">
+                    <span class="btn-slot" id="slot-btn-select-all"></span>
+                </div>
+            </div>
             <div class="separator long"></div>
         </section>
         <section class="box-panels">
@@ -78,6 +86,7 @@
                         <span class="btn-slot" id="slot-btn-mailrecepients" data-layout-name="toolbar-home-mailmerge"></span>
                     </div>
                 </div>
+                <div class="separator long invisible"></div>
                 <div class="group small flex field-styles" id="slot-field-styles" style="min-width: 160px;width: 100%; " data-group-width="100%"></div>
             </section>
             <section class="panel" data-tab="ins">

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

@@ -46,7 +46,7 @@ define([
     DE.Views.CrossReferenceDialog = Common.UI.Window.extend(_.extend({
         options: {
             width: 400,
-            height: 407,
+            height: 410,
             style: 'min-width: 240px;',
             cls: 'modal-dlg',
             modal: false

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

@@ -3020,7 +3020,7 @@ define([
         styleText               : 'Formatting as Style',
         saveStyleText           : 'Create new style',
         updateStyleText         : 'Update %1 style',
-        txtPressLink            : 'Press CTRL and click link',
+        txtPressLink            : 'Press {0} and click link',
         selectText              : 'Select',
         insertRowText           : 'Insert Row',
         insertColumnText        : 'Insert Column',

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

@@ -560,7 +560,10 @@ define([
             this.rbChangesTip = new Common.UI.RadioBox({
                 el          :$markup.findById('#fms-rb-show-track-tooltips'),
                 name        : 'show-track-changes',
-                labelText   : this.txtChangesTip
+                labelText   : this.txtChangesTip,
+                dataHint: '2',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
             });
 
             this.rbShowChangesNone = new Common.UI.RadioBox({
@@ -963,10 +966,8 @@ define([
         txtAll: 'View All',
         txtNone: 'View Nothing',
         txtLast: 'View Last',
-        txtLiveComment: 'Live Commenting',
         /** coauthoring end **/
         okButtonText: 'Apply',
-        txtInput: 'Alternate Input',
         txtWin: 'as Windows',
         txtMac: 'as OS X',
         txtNative: 'Native',
@@ -976,9 +977,7 @@ define([
         txtPt: 'Point',
         textAutoSave: 'Autosave',
         txtSpellCheck: 'Spell Checking',
-        strSpellCheckMode: 'Turn on spell checking option',
         textAlignGuides: 'Alignment Guides',
-        strAlignGuides: 'Turn on alignment guides',
         strCoAuthMode: 'Co-editing mode',
         strFast: 'Fast',
         strStrict: 'Strict',
@@ -987,8 +986,6 @@ define([
         txtFitPage: 'Fit to Page',
         txtFitWidth: 'Fit to Width',
         textForceSave: 'Save to Server',
-        strForcesave: 'Always save to server (otherwise save to server on document close)',
-        textCompatible: 'Compatibility',
         textOldVersions: 'Make the files compatible with older MS Word versions when saved as DOCX',
         txtCacheMode: 'Default cache mode',
         strMacrosSettings: 'Macros Settings',
@@ -998,7 +995,6 @@ define([
         txtWarnMacrosDesc: 'Disable all macros with notification',
         txtRunMacrosDesc: 'Enable all macros without notification',
         txtStopMacrosDesc: 'Disable all macros without notification',
-        strPaste: 'Cut, copy and paste',
         strPasteButton: 'Show Paste Options button when content is pasted',
         txtProofing: 'Proofing',
         strTheme: 'Theme',
@@ -1385,7 +1381,7 @@ define([
             this.lblApplication = $markup.findById('#id-info-appname');
             this.tblAuthor = $markup.findById('#id-info-author table');
             this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
-            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}"></div><div class="tool close img-commonctrl" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
+            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}"></div><div class="tool close img-commonctrl img-colored" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
 
             this.tblAuthor.on('click', function(e) {
                 var btn = $markup.find(e.target);
@@ -2093,7 +2089,7 @@ define([
                                 else {
                                     store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang;
                                     me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + lang + '/';
-                                    store.url = me.urlPref + '/Contents.json';
+                                    store.url = me.urlPref + 'Contents.json';
                                     store.fetch(config);
                                 }
                             } else {