Merge branch 'release/v7.3.0' into feature/de-forms

apps/api/wopi/convert-and-edit-wopi.ejs

@@ -28,12 +28,12 @@
 html {
     height: 100%;
     width: 100%;
+    font-family: Arial, Helvetica, "Helvetica Neue", sans-serif;
 }
 
 body {
     background: #fff;
     color: #333;
-    font-family: Arial, Tahoma,sans-serif;
     font-size: 12px;
     font-weight: normal;
     height: 100%;
@@ -45,58 +45,157 @@ body {
 
 .form {
     height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
-div {
+.content {
-    margin: 0;
+    display: flex;
-    padding: 0;
+    flex-direction: column;
-}
+    align-items: center;
-
+    justify-content: flex-end;
-.app-error-panel {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    background-color: #f4f4f4;
-    z-index: 10;
-}
-
-.message-block {
-    display: inline-block;
-    vertical-align: middle;
-    width: 100%;
-}
-
-.message-inner {
-    width: 550px;
-    margin: auto;
-    padding: 30px;
-    background-color: #e3e3e3;
-    text-align: center;
 }
 
 .title {
-    font-size: 24px;
+    font-style: normal;
-    margin: 0 0 14px;
+    font-weight: 400;
+    font-size: 18px;
+    line-height: 160%;
+    display: flex;
+    align-items: center;
+    text-align: center;
+
+    color: #333333;
 }
 
-.text {
+.description {
-    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 160%;
+
+    display: flex;
+    align-items: center;
+    text-align: center;
+
+    margin-top: 8px;
+
+    color: #333333;
 }
 
+.icon {
+    margin-top: 49px;
+    width: 34px;
+    height: 48px;
+}
+
+.icon-succes {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAwCAYAAAB0WahSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAENSURBVHgB7ZnBDYJAEEX/oN4pQTvQmxcTO7EEsQLtQKyA2AF2QOLFm5ZAB3InZB0WRDOJXCQbNPMSkmX3wGMyn8NAYEywHMMUES+nfPlwRwzKNxReUqolro4F3slYZjZkib2VIByBQUBhksEBtgAodjBYwYwiMuuFsSeUT8oSwSEs43Mh7rzMvOema4nqmU31fQ89QUUkKiLpjciw7bD5xnQEHc706ew3KtL2Bl2jzSrR1Eg0NRJtVommRqKpkWizSjQ1Ek2NRJtV8n+p+bafNDUSbVaJikhURFKK2FmnHb46ppo+v0Ru1W6xN8F8DEfUU+dtdYNTb34KeDyGTkGDGWvFcAu3hElKiXL8/gBwm2fFT+wjuQAAAABJRU5ErkJggg==");
+
+}
+
+.icon-error {
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAwCAYAAAB0WahSAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEBSURBVHgB7ZfRDYIwEIavtAM4QkfpA3uoE6gTiJswCIl99NEJSNyAAUhqz0BiGoOoVyjmvoTk6EP7c/ffAQDM0snz3OEFkciAiQBF2bg0DBmfGPIb8yZjVgEz02cuo5gBFHsomJmqqt5XhepFN2YfnqzMYhC9m1+1EfWn4dAZyXTN4EAbNWyISCYjLCRk0CNTdE0Pd00ImzXk/7rmVz9x14SwWUNYSAgLCUEhDQbGmBVMzPOZKOSKgVJqDxMjpVx3ocXfCeODc7dwaNu2tNY2EBHMhH/wnQ8LvHfObR6T04vBhSPMw8lP8EJiVNe11VrfhBBYMw3xwYxf/LX1IkpcuAMGtltNGCBFYAAAAABJRU5ErkJggg==");
+}
+
+#error .icon {
+    margin-bottom: 107px;
+}
+
+.spiner-image {
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMCAyMCI+PGNpcmNsZSBjeD0iMTAiIGN5PSIxMCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjNDQ0IiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iNy4yNSIgc3Ryb2tlLWRhc2hhcnJheT0iMTYwJSwgNDAlIiAvPjwvc3ZnPg==");
+    margin-top: 49px;
+    width: 48px;
+    height: 48px;
+}
+
+#spiner {
+    animation-duration: .8s;
+    animation-name: rotation;
+    animation-iteration-count: infinite;
+    animation-timing-function: linear;
+}
+
+@keyframes rotation {
+    from {
+        transform: rotate(0);
+    }
+
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.button {
+    margin-top: 50px;
+    cursor: pointer;
+    display: inline-block;
+    border-width: 0px;
+    border-radius: 3px;
+    font-weight: 600;
+    line-height: 133%;
+    letter-spacing: 0.04em;
+    padding: 19px 24px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+button:disabled, button[disabled]{
+    cursor: default;
+}
+
+.button.gray {
+    color: #AAAAAA;
+    background: #444444;
+}
+
+
+.button.orange {
+    color: #FFFFFF;
+    border: 1px solid #FF6F3D;
+    background: #FF6F3D;
+}
+
+.button.orange:not(:disabled):hover {
+    background: #ff7a4b;
+}
+
+.button.orange:disabled, .button.orange[disabled]{
+    background: #EDC2B3;
+    border: 1px solid #EDC2B3;
+    cursor: default;
+}
+
+
+
 </style>
 </head>
 <body>
+    <div class="form">
         <div id="progress">
-		Converting your file so you can edit it...
+            <div class="content">
-        <a id="btn_end" style="display: none;">
+                <div class="title">Converting your file so you can edit it...</div>
-            <button type="button">Click here to open the converted file</button>
+                <i id="spiner" class="spiner-image"></i>
-        </a>
+                <button class="button orange" disabled>Open converted file</button>
-
+            </div>
+        </div>
+        <div id="success" style="display: none;">
+            <div class="content">
+                <div class="title">Converting your file so you can edit it...</div>
+                <i class="icon icon-succes"></i>
+                <button class="button orange" id="btn_end">Open converted file</button>
+            </div>
         </div>
         <div id="error" style="display: none;">
-		Conversion failed<br/>Sorry, we weren't able to convert the file for editing.<br/>Try again Go back
+            <div class="content">
+                <div class="title">Conversion failed</div>
+                <div class="description">Sorry, we weren't able to convert the file for editing.</div>
+                <i class="icon icon-error"></i>
             </div>
+        </div>
+    </div>
+
     <script type="text/javascript" language="javascript">
 
 		function redirect(url) {
@@ -140,10 +239,9 @@ div {
 		}
 		
 		function success(url) {
-//            redirect(url);
+            document.getElementById('progress').style.display = 'none';
-            let btn = document.getElementById('btn_end');
+            document.getElementById('success').style.display = 'block';
-            btn.style.display = 'block';
+            document.getElementById('btn_end').onclick = function() {
-            btn.onclick = function() {
                 redirect(url);
             };
 		}

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

@@ -713,8 +713,8 @@ define([
                 this.options.updateFormControl.call(this, this._selectedItem);
         },
 
-        setValue: function(value) {
+        setValue: function(value, defValue) {
-            Common.UI.ComboBox.prototype.setValue.call(this, value);
+            Common.UI.ComboBox.prototype.setValue.call(this, value, defValue);
             if (this.options.updateFormControl)
                 this.options.updateFormControl.call(this, this._selectedItem);
         },

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

@@ -399,7 +399,9 @@ define([
                             _btns = data.buttons,
                             _flex = data.flex;
                         var more_section = $active.find('.more-box');
-
+                        if (more_section.length===0) {
+                            me.setMoreButton($active.attr('data-tab'), $active);
+                        }
                         if ( !_rightedge ) {
                             _rightedge = $active.get(0).getBoundingClientRect().right;
                         }
@@ -527,10 +529,30 @@ define([
                 this.$moreBar = btnsMore[tab].panel;
             },
 
+            clearMoreButton: function(tab) {
+                var panel = this.$panels.filter('[data-tab=' + tab + ']');
+                if ( panel.length ) {
+                    var data = panel.data();
+                    data.buttons = data.flex = data.rightedge = undefined;
+                    panel.find('.more-box').remove();
+                }
+                if (btnsMore[tab]) {
+                    var moreContainer = optsFold.$bar.find('.more-container[data-tab="' + tab + '"]');
+                    moreContainer.remove();
+                    btnsMore[tab].remove();
+                    delete btnsMore[tab];
+                }
+            },
+
             resizeToolbar: function(reset) {
                 var $active = this.$panels.filter('.active'),
-                    more_section = $active.find('.more-box'),
+                    more_section = $active.find('.more-box');
-                    more_section_width = parseInt(more_section.css('width')) || 0,
+
+                if (more_section.length===0) {
+                    this.setMoreButton($active.attr('data-tab'), $active);
+                }
+
+                var more_section_width = parseInt(more_section.css('width')) || 0,
                     box_controls_width = $active.parents('.box-controls').width(),
                     _maxright = box_controls_width,
                     _rightedge = $active.get(0).getBoundingClientRect().right,

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

@@ -56,7 +56,8 @@ define([
                 maxlength   : undefined,
                 placeHolder : '',
                 spellcheck  : false,
-                disabled: false
+                disabled: false,
+                resize: false
             },
 
             template: _.template([
@@ -133,6 +134,7 @@ define([
                     this._input.on('blur',   _.bind(this.onInputChanged, this));
                     this._input.on('keydown',    _.bind(this.onKeyDown, this));
                     if (this.maxLength) this._input.attr('maxlength', this.maxLength);
+                    if (!this.resize) this._input.css('resize', 'none');
 
                     if (this.disabled)
                         this.setDisabled(this.disabled);
@@ -140,6 +142,9 @@ define([
 
                 me.rendered = true;
 
+                if (me.value)
+                    me.setValue(me.value);
+
                 return this;
             },
 

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

@@ -47,6 +47,7 @@ define([
         titlebuttons: true,
         uithemes: true,
         btnhome: true,
+        quickprint: true
     };
 
     var native = window.desktop || window.AscDesktopEditor;
@@ -61,7 +62,8 @@ define([
             'btn-save-coauth': 'coauth',
             'btn-synch': 'synch' };
 
-        var nativevars;
+        var nativevars,
+            helpUrl;
 
         if ( !!native ) {
             native.features = native.features || {};
@@ -165,7 +167,8 @@ define([
                 action: action,
                 icon: config.icon || undefined,
                 hint: config.btn.options.hint,
-                disabled: config.btn.isDisabled()
+                disabled: config.btn.isDisabled(),
+                visible: config.visible,
             };
         };
 
@@ -200,6 +203,7 @@ define([
             if ( !!titlebuttons ) {
                 info.hints = {};
                 !!titlebuttons['print'] && (info.hints['print'] = titlebuttons['print'].btn.btnEl.attr('data-hint-title'));
+                !!titlebuttons['quickprint'] && (info.hints['quickprint'] = titlebuttons['quickprint'].btn.btnEl.attr('data-hint-title'));
                 !!titlebuttons['undo'] && (info.hints['undo'] = titlebuttons['undo'].btn.btnEl.attr('data-hint-title'));
                 !!titlebuttons['redo'] && (info.hints['redo'] = titlebuttons['redo'].btn.btnEl.attr('data-hint-title'));
                 !!titlebuttons['save'] && (info.hints['save'] = titlebuttons['save'].btn.btnEl.attr('data-hint-title'));
@@ -215,31 +219,120 @@ define([
             }
         }
 
-        return {
+        const _onApplySettings = function (menu) {
-            init: function (opts) {
+            if ( !!titlebuttons.quickprint ) {
-                _.extend(config, opts);
+                const var_name = window.SSE ? 'sse-settings-quick-print-button' :
+                                    window.PE ? 'pe-settings-quick-print-button' : 'de-settings-quick-print-button';
+                const is_btn_visible = Common.localStorage.getBool(var_name, false);
 
-                if ( config.isDesktopApp ) {
+                if ( titlebuttons.quickprint.visible != is_btn_visible ) {
-                    let is_win_xp = nativevars && nativevars.os === 'winxp';
+                    titlebuttons.quickprint.visible = is_btn_visible;
+                    const obj = {
+                        visible: {
+                            quickprint: is_btn_visible,
+                        }
+                    };
+                    native.execCommand('title:button', JSON.stringify(obj));
+                }
+            }
+        }
 
-                    Common.UI.Themes.setAvailable(!is_win_xp);
+        const _checkHelpAvailable = function () {
-                    Common.NotificationCenter.on('app:ready', function (opts) {
+            const me = this;
+            const build_url = function (arg1, arg2, arg3) {
+                const re_ls = /\/$/;
+                return (re_ls.test(arg1) ? arg1 : arg1 + '/') + arg2 + arg3;
+            }
+
+            fetch(build_url('resources/help/', Common.Locale.getDefaultLanguage(), '/Contents.json'))
+                .then(function (response) {
+                    if ( response.ok ) {
+                        /* local help avail */
+                        fetch(build_url('resources/help/', Common.Locale.getCurrentLanguage(), '/Contents.json'))
+                            .then(function (response){
+                                if ( response.ok )
+                                    helpUrl = build_url('resources/help/', Common.Locale.getCurrentLanguage(), '');
+                            })
+                            .catch(function (e) {
+                                helpUrl = build_url('resources/help/', Common.Locale.getDefaultLanguage(), '');
+                            })
+                    }
+                }).catch(function (e) {
+                    if ( me.helpUrl() ) {
+                        fetch(build_url(me.helpUrl(), Common.Locale.getDefaultLanguage(), '/Contents.json'))
+                            .then(function (response) {
+                                if ( response.ok ) {
+                                    /* remote help avail */
+                                    fetch(build_url(me.helpUrl(), Common.Locale.getCurrentLanguage(), '/Contents.json'))
+                                        .then(function (response) {
+                                            if ( response.ok ) {
+                                                helpUrl = build_url(me.helpUrl(), Common.Locale.getCurrentLanguage(), '');
+                                            }
+                                        })
+                                        .catch(function (e) {
+                                            helpUrl = build_url(me.helpUrl(), Common.Locale.getDefaultLanguage(), '');
+                                        });
+                                }
+                            })
+                    }
+                });
+        }
+
+        const _onAppReady = function (opts) {
             _.extend(config, opts);
             !!native && native.execCommand('doc:onready', '');
 
             $('.toolbar').addClass('editor-native-color');
-                    });
+        }
 
-                    Common.NotificationCenter.on('document:ready', function () {
+        const _onDocumentReady = function () {
             if ( config.isEdit ) {
-                            var maincontroller = webapp.getController('Main');
+                function get_locked_message (t) {
-                            if (maincontroller.api.asc_isReadOnly && maincontroller.api.asc_isReadOnly()) {
+                    switch (t) {
-                                maincontroller.warningDocumentIsLocked();
+                        // case Asc.c_oAscLocalRestrictionType.Nosafe:
+                        case Asc.c_oAscLocalRestrictionType.ReadOnly:
+                            return Common.Locale.get("tipFileReadOnly",{name:"Common.Translation", default: "Document is read only. You can make changes and save its local copy later."});
+                        default: return Common.Locale.get("tipFileLocked",{name:"Common.Translation", default: "Document is locked for editing. You can make changes and save its local copy later."});
+                    }
+                }
+
+                const header = webapp.getController('Viewport').getView('Common.Views.Header');
+                const api = webapp.getController('Main').api;
+                const locktype = api.asc_getLocalRestrictions ? api.asc_getLocalRestrictions() : Asc.c_oAscLocalRestrictionType.None;
+                if ( Asc.c_oAscLocalRestrictionType.None !== locktype ) {
+                    features.readonly = true;
+
+                    header.setDocumentReadOnly(true);
+                    api.asc_setLocalRestrictions(Asc.c_oAscLocalRestrictionType.None);
+
+                    (new Common.UI.SynchronizeTip({
+                        extCls: 'no-arrow',
+                        placement: 'bottom',
+                        target: $('.toolbar'),
+                        text: get_locked_message(locktype),
+                        showLink: false,
+                    })).on('closeclick', function () {
+                        this.close();
+                    }).show();
+
+                    native.execCommand('webapps:features', JSON.stringify(features));
+
+                    api.asc_registerCallback('asc_onDocumentName', function () {
+                        if ( features.readonly ) {
+                            if ( api.asc_getLocalRestrictions() == Asc.c_oAscLocalRestrictionType.None ) {
+                                features.readonly = false;
+                                header.setDocumentReadOnly(false);
+                                native.execCommand('webapps:features', JSON.stringify(features));
                             }
                         }
                     });
+                }
 
-                    Common.NotificationCenter.on('app:face', function (mode) {
+                _checkHelpAvailable.call(this);
+            }
+        }
+
+        const _onHidePreloader = function (mode) {
             features.viewmode = !mode.isEdit;
             features.crypted = mode.isCrypted;
             native.execCommand('webapps:features', JSON.stringify(features));
@@ -291,6 +384,13 @@ define([
                 if (!!header.btnPrint)
                     titlebuttons['print'] = {btn: header.btnPrint};
 
+                if (!!header.btnPrintQuick) {
+                    titlebuttons['quickprint'] = {
+                        btn: header.btnPrintQuick,
+                        visible: header.btnPrintQuick.isVisible(),
+                    };
+                }
+
                 if (!!header.btnUndo)
                     titlebuttons['undo'] = {btn: header.btnUndo};
 
@@ -317,11 +417,23 @@ define([
                 // $('#box-document-title .hedset')[native.features.singlewindow ? 'hide' : 'show']();
                 !!titlebuttons.home && titlebuttons.home.btn.setVisible(native.features.singlewindow);
             }
-                    });
+        }
 
+        return {
+            init: function (opts) {
+                _.extend(config, opts);
+
+                if ( config.isDesktopApp ) {
+                    let is_win_xp = nativevars && nativevars.os === 'winxp';
+
+                    Common.UI.Themes.setAvailable(!is_win_xp);
                     Common.NotificationCenter.on({
+                        'app:ready': _onAppReady,
+                        'document:ready': _onDocumentReady.bind(this),
+                        'app:face': _onHidePreloader.bind(this),
                         'modal:show': _onModalDialog.bind(this, 'open'),
                         'modal:close': _onModalDialog.bind(this, 'close'),
+                        'modal:hide': _onModalDialog.bind(this, 'hide'),
                         'uitheme:changed' : function (name) {
                             if (Common.localStorage.getBool('ui-theme-use-system', false)) {
                                 native.execCommand("uitheme:changed", JSON.stringify({name:'theme-system'}));
@@ -346,6 +458,7 @@ define([
                                     menu.hide();
                                 }
                             },
+                            'settings:apply': _onApplySettings.bind(this),
                         },
                     }, {id: 'desktop'});
 
@@ -396,6 +509,9 @@ define([
                 }
             },
             helpUrl: function () {
+                if ( helpUrl )
+                    return helpUrl;
+
                 if ( !!nativevars && nativevars.helpUrl ) {
                     var webapp = window.SSE ? 'spreadsheeteditor' :
                                     window.PE ? 'presentationeditor' : 'documenteditor';
@@ -403,7 +519,13 @@ define([
                 }
 
                 return undefined;
-            }
+            },
+            isHelpAvailable: function () {
+                return !!helpUrl;
+            },
+            getDefaultPrinterName: function () {
+                return nativevars ? nativevars.defaultPrinterName : '';
+            },
         };
     };
 

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

@@ -120,7 +120,9 @@ define([
                                 }
                                 externalEditor.attachMouseEvents();
                             } else {
+                                require(['api'], function () {
                                     createExternalEditor.apply(this);
+                                }.bind(this));
                             }
                             this.isExternalEditorVisible = true;
                             this.isHandlerCalled = false;

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

@@ -118,7 +118,9 @@ define([
                                 }
                                 externalEditor.attachMouseEvents();
                             } else {
+                                require(['api'], function () {
                                     createExternalEditor.apply(this);
+                                }.bind(this))
                             }
                             this.isExternalEditorVisible = true;
                             this.isHandlerCalled = false;

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

@@ -120,7 +120,9 @@ define([
                                 }
                                 externalEditor.attachMouseEvents();
                             } else {
+                                require(['api'], function () {
                                     createExternalEditor.apply(this);
+                                }.bind(this));
                             }
                             this.isExternalEditorVisible = true;
                             this.isHandlerCalled = false;

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

@@ -324,7 +324,7 @@ Common.UI.HintManager = new(function() {
                 index++;
             }
             var title = el.attr('data-hint-title');
-            if (!title) {
+            if (!title && !(index > _arrLetters.length)) {
                 el.attr('data-hint-title', _arrLetters[index].toUpperCase());
                 index++;
             }

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

@@ -66,7 +66,7 @@ define([
                         if ( !appOptions.isEditMailMerge && !appOptions.isEditDiagram && !appOptions.isEditOle ) {
                             var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption, dataHintTitle: 'E', layoutname: 'toolbar-plugins'};
                             me.$toolbarPanelPlugins = me.panelPlugins.getPanel();
-
+                            me.toolbar = toolbar;
                             toolbar.addTab(tab, me.$toolbarPanelPlugins, 10);     // TODO: clear plugins list in left panel
                         }
                     }
@@ -248,6 +248,7 @@ define([
             me.appOptions.canPlugins = !collection.isEmpty();
             if ( me.$toolbarPanelPlugins ) {
                 me.$toolbarPanelPlugins.empty();
+                me.toolbar && me.toolbar.clearMoreButton('plugins');
 
                 var _group = $('<div class="group"></div>'),
                     rank = -1,
@@ -274,6 +275,7 @@ define([
                     rank = new_rank;
                 });
                 _group.appendTo(me.$toolbarPanelPlugins);
+                me.toolbar && me.toolbar.isTabActive('plugins') && me.toolbar.processPanelVisible(null, true, true);
                 var docProtection = me.panelPlugins._state.docProtection;
                 Common.Utils.lockControls(Common.enumLock.docLockView, docProtection.isReadOnly, {array: me.panelPlugins.lockedControls});
                 Common.Utils.lockControls(Common.enumLock.docLockForms, docProtection.isFormsOnly, {array: me.panelPlugins.lockedControls});

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

@@ -147,6 +147,23 @@ define([
         },
 
         onAppReady: function (config) {
+            var me = this;
+            (new Promise(function (accept, reject) {
+                accept();
+            })).then(function(){
+                me.onChangeProtectDocument();
+                Common.NotificationCenter.on('protect:doclock', _.bind(me.onChangeProtectDocument, me));
+            });
+        },
+
+        onChangeProtectDocument: function(props) {
+            if (!props) {
+                var docprotect = this.getApplication().getController('DocProtection');
+                props = docprotect ? docprotect.getDocProps() : null;
+            }
+            if (props && this.view) {
+                this.view._state.docProtection = props;
+            }
         },
 
         addPassword: function() {

apps/common/main/lib/core/keymaster.js

@@ -30,7 +30,8 @@
       '`': 192, '-': 189, '=': 187,
       ';': 186, '\'': 222,
       '[': 219, ']': 221, '\\': 220,
-      'ff-': 173, 'ff=': 61
+      'ff-': 173, 'ff=': 61,
+      numplus: 107, numminus: 109
     },
     code = function(x){
       return _MAP[x] || x.toUpperCase().charCodeAt(0);

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

@@ -3,6 +3,7 @@
         <label id="search-adv-title"></label>
         <div id="search-btn-close"></div>
     </div>
+    <div id="search-container">
     <div id="search-adv-settings">
         <table cols="1">
             <tbody>
@@ -60,4 +61,5 @@
     </div>
     <div id="search-results" class="ps-container oo">
     </div>
+    </div>
 </div>

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

@@ -979,7 +979,7 @@ Common.Utils.warningDocumentIsLocked = function (opts) {
         callback: function(btn){
             if (btn == 'edit') {
                 if ( opts.disablefunc ) opts.disablefunc(false);
-                app.getController('Main').api.asc_setIsReadOnly(false);
+                app.getController('Main').api.asc_setLocalRestrictions(Asc.c_oAscLocalRestrictionType.None);
             }
         }
     });

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

@@ -402,9 +402,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
             var arr = [
                     this.chReplaceType, this.inputReplace, this.inputBy, this.mathList, this.btnReset, this.btnEdit, this.btnDelete, // 0 tab
                     this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec, // 1 tab
-                    this.chHyperlink // 2 tab
                 ];
-            arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]);
+            arr = arr.concat(this.chNewRows ? [this.chHyperlink, this.chNewRows] : [this.chQuotes, this.chHyphens, this.chHyperlink, this.chDoubleSpaces, this.chBulleted, this.chNumbered]);
             arr = arr.concat(this.chFLSentence ? [this.chFLSentence, this.chFLCells] : []);
             return arr;
         },
@@ -487,22 +486,30 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
 
         onDelete: function() {
             var rec = this.mathList.getSelectedRec();
+            var path = '';
+            var val;
             if (rec) {
                 if (rec.get('defaultValue')) {
-                    var path = this.appPrefix + "settings-math-correct-rem";
+                    path = this.appPrefix + "settings-math-correct-rem";
                     var disabled = !rec.get('defaultDisabled');
                     rec.set('defaultDisabled', disabled);
                     if (disabled)
                         this.arrRem.push(rec.get('replaced'));
                     else
                         this.arrRem.splice(this.arrRem.indexOf(rec.get('replaced')), 1);
-                    var val = JSON.stringify(this.arrRem);
+                    val = JSON.stringify(this.arrRem);
                     Common.Utils.InternalSettings.set(path, val);
                     Common.localStorage.setItem(path, val);
                     this.btnDelete.setCaption(disabled ? this.textRestore : this.textDelete);
                     disabled ? this.api.asc_deleteFromAutoCorrectMathSymbols(rec.get('replaced')) : this.api.asc_AddOrEditFromAutoCorrectMathSymbols(rec.get('replaced'), rec.get('defaultValue'));
                 } else {
                     _mathStore.remove(rec);
+
+                    this.arrAdd.splice(this.arrAdd.indexOf(rec.get('replaced')), 1);
+                    path = this.appPrefix + "settings-math-correct-add";
+                    val = JSON.stringify(this.arrAdd);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
                     this.mathList.scroller && this.mathList.scroller.update({});
                     this.api.asc_deleteFromAutoCorrectMathSymbols(rec.get('replaced'));
                 }
@@ -746,22 +753,30 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template',
 
         onDeleteRec: function() {
             var rec = this.mathRecList.getSelectedRec();
+            var path;
+            var val;
             if (rec) {
                 if (rec.get('defaultValue')) {
-                    var path = this.appPrefix + "settings-rec-functions-rem";
+                    path = this.appPrefix + "settings-rec-functions-rem";
                     var disabled = !rec.get('defaultDisabled');
                     rec.set('defaultDisabled', disabled);
                     if (disabled)
                         this.arrRemRec.push(rec.get('value'));
                     else
                         this.arrRemRec.splice(this.arrRemRec.indexOf(rec.get('value')), 1);
-                    var val = JSON.stringify(this.arrRemRec);
+                    val = JSON.stringify(this.arrRemRec);
                     Common.Utils.InternalSettings.set(path, val);
                     Common.localStorage.setItem(path, val);
                     this.btnDeleteRec.setCaption(disabled ? this.textRestore : this.textDelete);
                     disabled ? this.api.asc_deleteFromAutoCorrectMathFunctions(rec.get('value')) : this.api.asc_AddFromAutoCorrectMathFunctions(rec.get('value'));
                 } else {
                     _functionsStore.remove(rec);
+
+                    this.arrAddRec.splice(this.arrAddRec.indexOf(rec.get('value')), 1);
+                    path = this.appPrefix + "settings-rec-functions-add";
+                    val = JSON.stringify(this.arrAddRec);
+                    Common.Utils.InternalSettings.set(path, val);
+                    Common.localStorage.setItem(path, val);
                     this.mathRecList.scroller && this.mathRecList.scroller.update({});
                     this.api.asc_deleteFromAutoCorrectMathFunctions(rec.get('value'));
                 }

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

@@ -81,6 +81,7 @@ define([
                                 '<div class="hedset">' +
                                     '<div class="btn-slot" id="slot-hbtn-edit"></div>' +
                                     '<div class="btn-slot" id="slot-hbtn-print"></div>' +
+                                    '<div class="btn-slot" id="slot-hbtn-print-quick"></div>' +
                                     '<div class="btn-slot" id="slot-hbtn-download"></div>' +
                                 '</div>' +
                                 '<div class="hedset" data-layout-name="header-users">' +
@@ -129,6 +130,7 @@ define([
                                     '<div class="btn-slot" id="slot-btn-dt-home"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-save" data-layout-name="header-save"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-print"></div>' +
+                                    '<div class="btn-slot" id="slot-btn-dt-print-quick"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-undo"></div>' +
                                     '<div class="btn-slot" id="slot-btn-dt-redo"></div>' +
                                 '</div>' +
@@ -333,6 +335,13 @@ define([
                 });
             }
 
+            if ( me.btnPrintQuick ) {
+                me.btnPrintQuick.updateHint(me.tipPrintQuick);
+                me.btnPrintQuick.on('click', function (e) {
+                    me.fireEvent('print-quick', me);
+                });
+            }
+
             if ( me.btnSave ) {
                 me.btnSave.updateHint(me.tipSave + Common.Utils.String.platformKey('Ctrl+S'));
                 me.btnSave.on('click', function (e) {
@@ -573,6 +582,9 @@ define([
                         if ( config.canPrint )
                             this.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-hbtn-print'), undefined, 'bottom', 'big', 'P');
 
+                        if ( config.canQuickPrint )
+                            this.btnPrintQuick = createTitleButton('toolbar__icon icon--inverse btn-quick-print', $html.findById('#slot-hbtn-print-quick'), undefined, 'bottom', 'big', 'Q');
+
                         if ( config.canEdit && config.canRequestEditRights )
                             this.btnEdit = createTitleButton('toolbar__icon icon--inverse btn-edit', $html.findById('#slot-hbtn-edit'), undefined, 'bottom', 'big');
                     }
@@ -647,6 +659,8 @@ define([
                     if ( config.canPrint && config.isEdit ) {
                         me.btnPrint = createTitleButton('toolbar__icon icon--inverse btn-print', $html.findById('#slot-btn-dt-print'), true, undefined, undefined, 'P');
                     }
+                    if ( config.canQuickPrint && config.isEdit )
+                        me.btnPrintQuick = createTitleButton('toolbar__icon icon--inverse btn-quick-print', $html.findById('#slot-btn-dt-print-quick'), true, undefined, undefined, 'Q');
 
                     me.btnSave = createTitleButton('toolbar__icon icon--inverse btn-save', $html.findById('#slot-btn-dt-save'), true, undefined, undefined, 'S');
                     me.btnUndo = createTitleButton('toolbar__icon icon--inverse btn-undo', $html.findById('#slot-btn-dt-undo'), true, undefined, undefined, 'Z');
@@ -696,6 +710,7 @@ define([
                 if (idx>0)
                     this.fileExtention = this.documentCaption.substring(idx);
                 this.isModified && (value += '*');
+                this.readOnly && (value += ' (' + this.textReadOnly + ')');
                 if ( $labelDocName ) {
                     this.setDocTitle( value );
                 }
@@ -888,6 +903,11 @@ define([
                 return initials;
             },
 
+            setDocumentReadOnly: function (readonly) {
+                this.readOnly = readonly;
+                this.setDocumentCaption(this.documentCaption);
+            },
+
             textBack: 'Go to Documents',
             txtRename: 'Rename',
             txtAccessRights: 'Change access rights',
@@ -911,7 +931,9 @@ define([
             textAddFavorite: 'Mark as favorite',
             textHideNotes: 'Hide Notes',
             tipSearch: 'Search',
-            textShare: 'Share'
+            textShare: 'Share',
+            tipPrintQuick: 'Quick print',
+            textReadOnly: 'Read only'
         }
     }(), Common.Views.Header || {}))
 });

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

@@ -87,10 +87,17 @@ define([
             }
 
             if (me.appConfig.isSignatureSupport) {
-                if (this.btnSignature.menu)
+                if (this.btnSignature.menu) {
                     this.btnSignature.menu.on('item:click', function (menu, item, e) {
                         me.fireEvent('protect:signature', [item.value, false]);
                     });
+                    this.btnSignature.menu.on('show:after', function (menu, e) {
+                        if (me._state) {
+                            var isProtected = me._state.docProtection ? me._state.docProtection.isReadOnly || me._state.docProtection.isFormsOnly || me._state.docProtection.isCommentsOnly : false;
+                            menu.items && menu.items[1].setDisabled(isProtected || me._state.disabled);
+                        }
+                    });
+                }
 
                 this.btnsInvisibleSignature.forEach(function(button) {
                     button.on('click', function (b, e) {
@@ -314,13 +321,14 @@ define([
             SetDisabled: function (state, canProtect) {
                 this._state.disabled = state;
                 this._state.invisibleSignDisabled = state && !canProtect;
+                var isProtected = this._state.docProtection ? this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly : false;
                 this.btnsInvisibleSignature && this.btnsInvisibleSignature.forEach(function(button) {
                     if ( button ) {
                         button.setDisabled(state && !canProtect);
                     }
                 }, this);
                 if (this.btnSignature && this.btnSignature.menu) {
-                    this.btnSignature.menu.items && this.btnSignature.menu.items[1].setDisabled(state); // disable adding signature line
+                    this.btnSignature.menu.items && this.btnSignature.menu.items[1].setDisabled(state || isProtected); // disable adding signature line
                     this.btnSignature.setDisabled(state && !canProtect); // disable adding any signature
                 }
                 this.btnsAddPwd.concat(this.btnsDelPwd, this.btnsChangePwd).forEach(function(button) {

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

@@ -176,6 +176,13 @@ define([
                 this.$resultsContainer = $('#search-results');
                 this.$resultsContainer.hide();
 
+                this.$searchContainer = $('#search-container');
+                this.$searchContainer.scroller = new Common.UI.Scroller({
+                    el              : $('#search-container'),
+                    useKeyboard     : true,
+                    minScrollbarLength: 40
+                });
+
                 Common.NotificationCenter.on('search:updateresults', _.bind(this.disableNavButtons, this));
                 if (window.SSE) {
                     this.cmbWithin = new Common.UI.ComboBox({
@@ -327,10 +334,23 @@ define([
         ChangeSettings: function(props) {
         },
 
+        updateScrollers: function () {
+            this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+            this.$searchContainer.scroller.update({alwaysVisibleY: true});
+
+            setTimeout(_.bind(function () {
+                if (this.$searchContainer.find('> .ps-scrollbar-y-rail').is(':visible')) {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').addClass('set-left');
+                } else {
+                    this.$resultsContainer.find('.ps-scrollbar-y-rail').removeClass('set-left');
+                }
+            }, this), 100);
+        },
+
         updateResultsContainerHeight: function () {
             if (this.$resultsContainer) {
-                this.$resultsContainer.outerHeight($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight());
+                this.$resultsContainer.outerHeight(Math.max($('#search-box').outerHeight() - $('#search-header').outerHeight() - $('#search-adv-settings').outerHeight(), 112));
-                this.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.updateScrollers();
             }
         },
 

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

@@ -79,7 +79,7 @@ define([
                     '<div class="input-row">',
                         '<label>' + this.textInstructions + '</label>',
                     '</div>',
-                    '<textarea id="id-dlg-sign-settings-instructions" class="form-control" style="width: 100%;height: 35px;margin-bottom: 10px;resize: none;"></textarea>',
+                    '<div id="id-dlg-sign-settings-instructions">',
                     '<div id="id-dlg-sign-settings-date"></div>',
                 '</div>',
                 '<div class="footer center">',
@@ -121,15 +121,12 @@ define([
                 disabled    : this.type=='view'
             });
 
-            me.textareaInstructions = this.$window.find('textarea');
+            me.textareaInstructions = new Common.UI.TextareaField({
-            me.textareaInstructions.val(this.textDefInstruction);
+                el          : $window.find('#id-dlg-sign-settings-instructions'),
-            me.textareaInstructions.keydown(function (event) {
+                style       : 'width: 100%; height: 35px;margin-bottom: 10px;',
-                if (event.keyCode == Common.UI.Keys.RETURN) {
+                value       : this.textDefInstruction,
-                    event.stopPropagation();
+                disabled    : this.type=='view'
-                }
             });
-            (this.type=='view') ? this.textareaInstructions.attr('disabled', 'disabled') : this.textareaInstructions.removeAttr('disabled');
-            this.textareaInstructions.toggleClass('disabled', this.type=='view');
 
             this.chDate = new Common.UI.CheckBox({
                 el: $('#id-dlg-sign-settings-date'),
@@ -160,7 +157,7 @@ define([
                 value = props.asc_getEmail();
                 me.inputEmail.setValue(value ? value : '');
                 value = props.asc_getInstructions();
-                me.textareaInstructions.val(value ? value : '');
+                me.textareaInstructions.setValue(value ? value : '');
                 me.chDate.setValue(props.asc_getShowDate());
 
                 me._currentGuid = props.asc_getGuid();
@@ -174,7 +171,7 @@ define([
             props.asc_setSigner1(me.inputName.getValue());
             props.asc_setSigner2(me.inputTitle.getValue());
             props.asc_setEmail(me.inputEmail.getValue());
-            props.asc_setInstructions(me.textareaInstructions.val());
+            props.asc_setInstructions(me.textareaInstructions.getValue());
             props.asc_setShowDate(me.chDate.getValue()=='checked');
             (me._currentGuid!==undefined) && props.asc_setGuid(me._currentGuid);
 

apps/common/main/resources/less/language-dialog.less

@@ -105,4 +105,5 @@ li {
   &.zh, &.zh-CN                     {background-position: -32px      -180px;}
   &.ja, &.ja-JP                     {background-position: 0          -192px;}
   &.es-MX                           {background-position: -16px      -192px;}
+  &.zh-TW                           {background-position: -32px      -192px;}
 }

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

@@ -136,10 +136,7 @@
     }
 
     #search-adv-settings {
-        position: absolute;
+        position: relative;
-        left: 0;
-        right: 0;
-        top: 45px;
         padding: 10px 15px 0 15px;
 
         table {
@@ -238,10 +235,7 @@
     }
 
     #search-results {
-        position: absolute;
+        position: relative;
-        left: 0;
-        right: 0;
-        bottom: 0;
         width: 100%;
         border-top: @scaled-one-px-value-ie solid @border-toolbar-ie;
         border-top: @scaled-one-px-value solid @border-toolbar;
@@ -268,6 +262,21 @@
                 font-style: italic;
             }
         }
+
+        .ps-scrollbar-y-rail {
+            &.set-left {
+                right: 11px !important;
+            }
+        }
+    }
+
+    #search-container {
+        position: absolute;
+        overflow: hidden;
+        top: 45px;
+        left: 0;
+        right: 0;
+        bottom: 0;
     }
 
 }

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

@@ -704,6 +704,10 @@
             margin: 0;
             -webkit-box-shadow: none;
             box-shadow: none;
+        }
+
+        &:not(.disabled) {
+            .item {
                 &:hover {
                     background-color: @highlight-button-hover-ie;
                     background-color: @highlight-button-hover;
@@ -719,6 +723,7 @@
                 }
             }
         }
+    }
     .button {
         width: 14px;
         .caret {

apps/common/mobile/lib/controller/SharingSettings.jsx

@@ -0,0 +1,73 @@
+import React, {useEffect} from 'react';
+import ViewSharingSettings from "../view/SharingSettings";
+import {observer, inject} from "mobx-react";
+import { f7 } from 'framework7-react';
+
+const SharingSettingsController = props => {
+    const appOptions = props.storeAppOptions;
+    const canRequestSharingSettings = appOptions.canRequestSharingSettings;
+    const sharingSettingsUrl = appOptions.sharingSettingsUrl;
+
+    const changeAccessRights = () => {
+        if (canRequestSharingSettings) {
+            Common.Gateway.requestSharingSettings();
+        }
+    };
+
+    const setSharingSettings = data => {
+        if (data) {
+            Common.Notifications.trigger('collaboration:sharingupdate', data.sharingSettings);
+        }
+    }
+
+    const onMessage = msg => {
+        if(msg) {
+            const msgData = JSON.parse(msg.data);
+
+            if (msgData && msgData?.Referer == "onlyoffice") {
+                if (msgData?.needUpdate) {
+                    setSharingSettings(msgData.sharingSettings);
+                }
+                props.f7router.back();
+            }
+        }
+    };
+
+    const bindWindowEvents = () => {
+        if (window.addEventListener) {
+            window.addEventListener("message", onMessage, false);
+        } else if (window.attachEvent) {
+            window.attachEvent("onmessage", onMessage);
+        }
+    };
+
+    const unbindWindowEvents = () => {
+        if (window.removeEventListener) {
+            window.removeEventListener("message", onMessage);
+        } else if (window.detachEvent) {
+            window.detachEvent("onmessage", onMessage);
+        }
+    };
+
+    useEffect(() => {
+        bindWindowEvents();
+        Common.Notifications.on('collaboration:sharing', changeAccessRights);
+
+        if (!!sharingSettingsUrl && sharingSettingsUrl.length || canRequestSharingSettings) {
+            Common.Gateway.on('showsharingsettings', changeAccessRights);
+            Common.Gateway.on('setsharingsettings', setSharingSettings);
+        }
+
+        return () => {
+            unbindWindowEvents();
+        }
+    }, []);
+
+    return (
+        <ViewSharingSettings
+            sharingSettingsUrl={sharingSettingsUrl}
+        />
+    );
+};
+
+export default inject('storeAppOptions')(observer(SharingSettingsController));

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

@@ -1,22 +1,20 @@
-import React, { Component, useEffect } from 'react';
+import React, { useEffect } from 'react';
-import { observer, inject } from "mobx-react";
+import { Navbar, Page } from 'framework7-react';
-import { f7, Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, View, Icon, Link } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
-import { Device } from "../../utils/device";
 
-const SharingSettings = props => {
+const ViewSharingSettings = props => {
     const { t } = useTranslation();
+    const sharingSettingsUrl = props.sharingSettingsUrl;
     const _t = t('Common.Collaboration', {returnObjects: true});
-    const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278';
 
     return (
         <Page>
             <Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} />
             <div id="sharing-placeholder" className="sharing-placeholder">
-                <iframe width="100%" height="100%" frameBorder={0} scrolling="0" align="top" src={url}></iframe>
+                <iframe width="100%" height="500" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe>
             </div>
         </Page>
     )
-}
+};
 
-export default SharingSettings;
+export default ViewSharingSettings;

apps/common/mobile/lib/view/collaboration/Collaboration.jsx

@@ -1,19 +1,19 @@
 import React, { Component, useEffect } from 'react';
 import { observer, inject } from "mobx-react";
-import { Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, View, Icon, Link } from 'framework7-react';
+import { Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, View, Icon, Link, f7 } from 'framework7-react';
-import { f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
 import {Device} from "../../../utils/device";
-
 import {ReviewController, ReviewChangeController} from "../../controller/collaboration/Review";
 import {PageDisplayMode} from "./Review";
-
 import {ViewCommentsController, ViewCommentsSheetsController} from "../../controller/collaboration/Comments";
+// import SharingSettings from "../SharingSettings";
+import SharingSettingsController from "../../controller/SharingSettings";
 
 const PageUsers = inject("users")(observer(props => {
     const { t } = useTranslation();
     const _t = t('Common.Collaboration', {returnObjects: true});
     const storeUsers = props.users;
+
     return (
         <Page name="collab__users" className='page-users'>
             <Navbar title={_t.textUsers} backLink={_t.textBack}>
@@ -81,6 +81,10 @@ const routes = [
                 allComments: true
             }
         }
+    },
+    {
+        path: '/sharing-settings/',
+        component: SharingSettingsController
     }
 ];
 
@@ -88,6 +92,10 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
     const { t } = useTranslation();
     const _t = t('Common.Collaboration', {returnObjects: true});
     const appOptions = props.storeAppOptions;
+    const documentInfo = props.documentInfo;
+    const dataDoc = documentInfo && documentInfo.dataDoc;
+    const fileType = dataDoc && dataDoc.fileType;
+    const sharingSettingsUrl = appOptions.sharingSettingsUrl;
     const isViewer = appOptions.isViewer;
 
     return (
@@ -103,6 +111,11 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
                     }
                 </Navbar>
                 <List>
+                    {(sharingSettingsUrl && fileType !== 'oform') &&
+                        <ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/">
+                            <Icon slot="media" icon="icon-sharing-settings"></Icon>
+                        </ListItem>
+                    }
                     {props.users.editUsers.length > 0 &&
                         <ListItem link={'/users/'} title={_t.textUsers}>
                             <Icon slot="media" icon="icon-users"></Icon>
@@ -122,8 +135,8 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
             </Page>
         </View>
     )
-
 }));
+
 class CollaborationView extends Component {
     constructor(props) {
         super(props);
@@ -138,10 +151,10 @@ class CollaborationView extends Component {
         return (
             show_popover ?
                 <Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()} closeByOutsideClick={false}>
-                    <PageCollaboration style={{height: '410px'}} page={this.props.page}/>
+                    <PageCollaboration documentInfo={this.props.documentInfo} style={{height: '410px'}} page={this.props.page}/>
                 </Popover> :
                 <Sheet className="coauth__sheet" push onSheetClosed={() => this.props.onclosed()}>
-                    <PageCollaboration page={this.props.page}/>
+                    <PageCollaboration documentInfo={this.props.documentInfo} page={this.props.page}/>
                 </Sheet>
         )
     }
@@ -167,9 +180,9 @@ const Collaboration = props => {
     };
 
     return (
-        <CollaborationView usePopover={!Device.phone} onclosed={onviewclosed} page={props.page}/>
+        <CollaborationView usePopover={!Device.phone} documentInfo={props.storeDocumentInfo} onclosed={onviewclosed} page={props.page}/>
     )
 };
 
-export {PageCollaboration}
+const CollaborationDocument = inject('storeDocumentInfo')(observer(Collaboration));
-export default Collaboration;
+export {Collaboration, CollaborationDocument};

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

@@ -127,7 +127,9 @@ body.theme-type-dark {
 
 :root .theme-type-dark {
     --f7-navbar-bg-color: #232323;
+    --f7-bars-bg-color-rgb: 35,35,35;
     --f7-subnavbar-bg-color: #232323;
+    --f7-bars-translucent-opacity: 1;
 }
 
 .md .word-editor {

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

@@ -1101,6 +1101,19 @@ input[type="number"]::-webkit-inner-spin-button {
     padding-bottom: 60px;
 }
 
+// Picker
+.picker-columns {
+    justify-content: space-around;
+}
+
+.row-picker {
+    .col-50 {
+        color: @text-secondary;
+        text-align: center;
+    }
+}
+
+
 
 
 

apps/common/mobile/utils/LocalStorage.mjs

@@ -9,6 +9,7 @@ class LocalStorage {
 
         this._store = {};
         this._prefix = 'mobile-';
+        this._common_keys = ['guest-id', 'guest-username'];
 
         try {
             this._isAllowed = !!window.localStorage;
@@ -52,7 +53,9 @@ class LocalStorage {
     }
 
     setItem(name, value, just) {
+        if ( !this._common_keys.includes(value) )
             name = this._prefix + name;
+
         if ( this._isAllowed ) {
             try {
                 localStorage.setItem(name, value);
@@ -67,7 +70,9 @@ class LocalStorage {
     }
 
     getItem(name) {
+        if ( !this._common_keys.includes(name) )
             name = this._prefix + name;
+
         if ( this._isAllowed )
             return localStorage.getItem(name);
         else return this._store[name]===undefined ? null : this._store[name];

apps/documenteditor/embed/locale/ca.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
   "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert per al servidor.<br>Contacteu amb l'administrador del servidor de documents per a obtenir més informació.",
   "DE.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció «Anomena i baixa» per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.ApplicationController.errorInconsistentExt": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer no es correspon amb la seva extensió.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a documents de text (per exemple, docx), però el fitxer té l'extensió incoherent: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a un dels formats següents: pdf/djvu/xps/oxps, però el fitxer té l'extensió incoherent: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a presentacions (per exemple, pptx), però el fitxer té l'extensió incongruent: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a full de càlcul (per exemple, xlsx), però el fitxer té l'extensió incoherent: %1.",
   "DE.ApplicationController.errorLoadingFont": "No s'han carregat les lletres tipogràfiques.<br> Contacteu amb l'administrador del Servidor de Documents.",
   "DE.ApplicationController.errorSubmit": "No s'ha pogut enviar.",
   "DE.ApplicationController.errorTokenExpire": "El testimoni de seguretat del document ha caducat.<br>Contacteu amb l'administrador del servidor de documents.",

apps/documenteditor/embed/locale/el.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Το αρχείο προστατεύεται με συνθηματικό και δεν μπορεί να ανοίξει.",
   "DE.ApplicationController.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων για λεπτομέρειες.",
   "DE.ApplicationController.errorForceSave": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου. Χρησιμοποιήστε την επιλογή «Λήψη ως» για να αποθηκεύσετε το αρχείο στον σκληρό δίσκο του υπολογιστή σας ή δοκιμάστε ξανά αργότερα.",
+  "DE.ApplicationController.errorInconsistentExt": "Συνέβη ένα σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου δεν αντιστοιχούν στην κατάληξή του ονόματός του.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Συνέβη ένα σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε αρχεία κειμένου (π.χ. docx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Συνέβη ένα σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε μια από τις ακόλουθες μορφές: pdf/djvu/xps/oxps, αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Συνέβη ένα σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε παρουσιάσεις (π.χ. pptx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Συνέβη ένα σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε παρουσιάσεις (π.χ. xlsx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
   "DE.ApplicationController.errorLoadingFont": "Οι γραμματοσειρές δεν έχουν φορτωθεί.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων σας.",
   "DE.ApplicationController.errorSubmit": "Η υποβολή απέτυχε.",
   "DE.ApplicationController.errorTokenExpire": "Το κλειδί ασφαλείας του εγγράφου έληξε.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων.",

apps/documenteditor/embed/locale/eu.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Fitxategia pasahitzez babestua dago eta ezin da ireki.",
   "DE.ApplicationController.errorFileSizeExceed": "Fitxategiaren tamainak zure zerbitzarirako ezarritako muga gainditzen du.<br>Jarri harremanetan dokumentu-zerbitzariaren administratzailearekin informazio gehiago lortzeko.",
   "DE.ApplicationController.errorForceSave": "Errore bat gertatu da dokumentua gordetzean.<br>Erabili 'Deskargatu honela' aukera fitxategia zure ordenagailuko disko gogorrean gordetzeko edo saiatu berriro geroago.",
+  "DE.ApplicationController.errorInconsistentExt": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia eta luzapena ez datoz bat.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia testu-dokumentu bati dagokio (adibidez, docx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia ondorengo formatuetako bati dagokio: pdf/djvu/xps/oxps, baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia aurkezpen bati dagokio (adibidez, pptx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia kalkulu-orri bati dagokio (adibidez, xlsx), baina fitxategiaren luzapena ez dator bat: %1.",
   "DE.ApplicationController.errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
   "DE.ApplicationController.errorSubmit": "Huts egin du bidaltzean.",
   "DE.ApplicationController.errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",

apps/documenteditor/embed/locale/id.json

@@ -16,23 +16,28 @@
   "DE.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.",
   "DE.ApplicationController.errorFileSizeExceed": "Ukuran file melewati batas server Anda.<br>Silakan hubungi admin Server Dokumen Anda untuk detail.",
   "DE.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+  "DE.ApplicationController.errorInconsistentExt": "Terjadi kesalahan saat membuka file.<br>Isi file tidak cocok dengan ekstensi file.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan dokumen teks (mis. docx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Sebuah kesalahan terjadi ketika membuka file.<br>Isi file berhubungan dengan satu dari format berikut: pdf/djvu/xps/oxps, tapi file memiliki ekstensi yang tidak konsisten: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan presentasi (mis. pptx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan spreadsheet (mis. xlsx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
   "DE.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
   "DE.ApplicationController.errorSubmit": "Submit gagal.",
   "DE.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Koneksi internet sudah kembali dan versi file sudah diganti.<br>Sebelum Anda bisa melanjutkan kerja, Anda perlu mengunduh file atau salin konten untuk memastikan tidak ada yang hilang, lalu muat ulang halaman ini.",
   "DE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
   "DE.ApplicationController.notcriticalErrorTitle": "Peringatan",
-  "DE.ApplicationController.openErrorText": "Eror ketika membuka file.",
+  "DE.ApplicationController.openErrorText": "Kesalahan terjadi ketika membuka file.",
   "DE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat dan beberapa komponen tidak bisa dibuka. Silakan muat ulang halaman.",
   "DE.ApplicationController.textAnonymous": "Anonim",
-  "DE.ApplicationController.textClear": "Bersihkan Semua Area",
+  "DE.ApplicationController.textClear": "Bersihkan Semua Ruas",
   "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textGotIt": "Mengerti",
   "DE.ApplicationController.textGuest": "Tamu",
   "DE.ApplicationController.textLoadingDocument": "Memuat dokumen",
-  "DE.ApplicationController.textNext": "Area Berikutnya",
+  "DE.ApplicationController.textNext": "Ruas Berikutnya",
   "DE.ApplicationController.textOf": "dari",
-  "DE.ApplicationController.textRequired": "Isi semua area yang dibutuhkan untuk mengirim form.",
+  "DE.ApplicationController.textRequired": "Isi semua ruas yang dibutuhkan untuk mengirim formulir.",
   "DE.ApplicationController.textSubmit": "Submit",
   "DE.ApplicationController.textSubmited": "<b>Form berhasil disubmit</b><br>Klik untuk menutup tips",
   "DE.ApplicationController.txtClose": "Tutup",

apps/documenteditor/embed/locale/ja.json

@@ -16,9 +16,14 @@
   "DE.ApplicationController.errorFilePassProtect": "ドキュメントがパスワードで保護されているため開くことができません",
   "DE.ApplicationController.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。<br>Documentサーバー管理者に詳細をお問い合わせください。",
   "DE.ApplicationController.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「...としてダウンロード」を使用し、または後で再お試しください。",
+  "DE.ApplicationController.errorInconsistentExt": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容がファイルの拡張子と一致しません。",
+  "DE.ApplicationController.errorInconsistentExtDocx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はドキュメント (docx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.ApplicationController.errorInconsistentExtPdf": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容は次のいずれかの形式に対応しています: pdf/djvu/xps/oxps が、ファイルの拡張子が一致していません: %1",
+  "DE.ApplicationController.errorInconsistentExtPptx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はプレゼンテーション (pptx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はスプレッドシート (xlsx など) に対応していますが、ファイルの拡張子が一致していません: %1",
   "DE.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。<br>文書サーバのアドミニストレータを連絡してください。",
   "DE.ApplicationController.errorSubmit": "送信に失敗しました。",
-  "DE.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
+  "DE.ApplicationController.errorTokenExpire": "ドキュメントセキュリティトークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されました。<br>作業を継続する前に、ファイルをダウンロードするか、内容をコピーして、変更が消えてしまわないように確認してから、ページを再びお読み込みください。",
   "DE.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
   "DE.ApplicationController.notcriticalErrorTitle": "警告",

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

@@ -16,6 +16,11 @@
   "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 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 mais tarde.",
+  "DE.ApplicationController.errorInconsistentExt": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro não coincide com a sua extensão.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a um documento de texto (doc, docx...), mas a extensão de ficheiro não é consistente: %1",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a um dos seguintes formatos: pdf/djvu/xps/oxps, mas a extensão de ficheiro não é consistente: %1",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a uma apresentação (ppt, pptx...), mas a extensão de ficheiro não é consistente: %1",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a uma folha de cálculo (xls, xlsx...), mas a extensão de ficheiro não é consistente: %1",
   "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.",

apps/documenteditor/embed/locale/ro.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "DE.ApplicationController.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
+  "DE.ApplicationController.errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de document text (ex. docx), dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unuia dintre următoarele formate: pdf/djvu/xps/oxps, dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de prezentare (ex. pptx), dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de foaie de calcul (ex. xlsx), dar extensia numelui de fișier nu se potrivește: %1.",
   "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.",

apps/documenteditor/embed/locale/tr.json

@@ -16,6 +16,11 @@
   "DE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
   "DE.ApplicationController.errorFileSizeExceed": "Dosya boyutu, sunucunuz için belirlenen limiti aşıyor.<br>Ayrıntılar için lütfen Doküman Sunucusu yöneticinizle iletişime geçin.",
   "DE.ApplicationController.errorForceSave": "Dosya kaydedilirken bir hata oluştu. Dosyayı bilgisayarınıza kaydetmek için lütfen 'Farklı İndir' seçeneğini kullanın veya daha sonra tekrar deneyin.",
+  "DE.ApplicationController.errorInconsistentExt": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği, dosya uzantısıyla eşleşmiyor.",
+  "DE.ApplicationController.errorInconsistentExtDocx": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği metin belgelerine (örn. docx) karşılık geliyor, ancak dosyanın uzantısı tutarsız: %1.",
+  "DE.ApplicationController.errorInconsistentExtPdf": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği şu biçimlerden birine karşılık geliyor: pdf/djvu/xps/oxps, ancak dosyanın uzantısı tutarsız: %1.",
+  "DE.ApplicationController.errorInconsistentExtPptx": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği sunumlara karşılık geliyor (ör. pptx), ancak dosyanın uzantısı tutarsız: %1.",
+  "DE.ApplicationController.errorInconsistentExtXlsx": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği e-tablolara (örn. xlsx) karşılık geliyor, ancak dosyanın uzantısı tutarsız: %1.",
   "DE.ApplicationController.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
   "DE.ApplicationController.errorSubmit": "Kaydetme başarısız oldu.",
   "DE.ApplicationController.errorTokenExpire": "Belge güvenlik belirtecinin süresi doldu.<br>Lütfen Belge Sunucusu yöneticinize başvurun.",
@@ -26,6 +31,7 @@
   "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.",
   "DE.ApplicationController.textAnonymous": "Anonim",
   "DE.ApplicationController.textClear": "Tüm alanları temizle",
+  "DE.ApplicationController.textCtrl": "Kontrol",
   "DE.ApplicationController.textGotIt": "Anladım",
   "DE.ApplicationController.textGuest": "Misafir",
   "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor",

apps/documenteditor/forms/locale/ca.json

@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel servidor. Contacteu amb l'administrador del servidor de documents per obtenir més informació.",
   "DE.Controllers.ApplicationController.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer no es correspon amb la seva extensió.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a documents de text (per exemple, docx), però el fitxer té l'extensió incoherent: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a un dels formats següents: pdf/djvu/xps/oxps, però el fitxer té l'extensió incoherent: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a presentacions (per exemple, pptx), però el fitxer té l'extensió incongruent: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a full de càlcul (per exemple, xlsx), però el fitxer té l'extensió incoherent: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "No s'han carregat les lletres tipogràfiques.<br> Contacteu amb l'administrador del Servidor de Documents.",
   "DE.Controllers.ApplicationController.errorServerVersion": "S'ha actualitzat la versió de l'editor. Es tornarà a carregar la pàgina per aplicar els canvis.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "La sessió d’edició del document ha caducat. Torneu a carregar la pàgina.",

apps/documenteditor/forms/locale/el.json

@@ -73,12 +73,12 @@
   "Common.Views.OpenDialog.txtPreview": "Προεπισκόπηση",
   "Common.Views.OpenDialog.txtProtected": "Μόλις βάλετε το συνθηματικό και ανοίξετε το αρχείο, το τρέχον συνθηματικό αρχείου θα αρχικοποιηθεί.",
   "Common.Views.OpenDialog.txtTitle": "Διαλέξτε %1 επιλογές",
-  "Common.Views.OpenDialog.txtTitleProtected": "Προστατευμένο Αρχείο",
+  "Common.Views.OpenDialog.txtTitleProtected": "Προστατευμένο αρχείο",
   "Common.Views.SaveAsDlg.textLoading": "Γίνεται φόρτωση",
   "Common.Views.SaveAsDlg.textTitle": "Φάκελος για αποθήκευση",
   "Common.Views.SelectFileDlg.textLoading": "Γίνεται φόρτωση",
-  "Common.Views.SelectFileDlg.textTitle": "Επιλογή Πηγής Δεδομένων",
+  "Common.Views.SelectFileDlg.textTitle": "Επιλογή πηγής δεδομένων",
-  "Common.Views.ShareDialog.textTitle": "Διαμοιρασμός Συνδέσμου",
+  "Common.Views.ShareDialog.textTitle": "Διαμοιρασμός συνδέσμου",
   "Common.Views.ShareDialog.txtCopy": "Αντιγραφή στο πρόχειρο",
   "Common.Views.ShareDialog.warnCopy": "Σφάλμα φυλλομετρητή! Χρησιμοποιείστε τη συντόμευση [Ctrl]+[C]",
   "DE.Controllers.ApplicationController.convertationErrorText": "Αποτυχία μετατροπής.",
@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Το αρχείο προστατεύεται με συνθηματικό και δεν μπορεί να ανοίξει.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων για λεπτομέρειες.",
   "DE.Controllers.ApplicationController.errorForceSave": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου. Χρησιμοποιήστε την επιλογή «Λήψη ως» για να αποθηκεύσετε το αρχείο στον σκληρό δίσκο του υπολογιστή σας ή δοκιμάστε ξανά αργότερα.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου δεν αντιστοιχούν στην κατάληξή του ονόματός του.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε αρχεία κειμένου (π.χ. docx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε μια από τις ακόλουθες μορφές: pdf/djvu/xps/oxps, αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε παρουσιάσεις (π.χ. pptx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε υπολογιστικά φύλλα (π.χ. xlsx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Οι γραμματοσειρές δεν έχουν φορτωθεί.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων σας.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Αναβαθμίστηκε η έκδοση του συντάκτη. Η σελίδα θα φορτωθεί ξανά για να εφαρμοστούν οι αλλαγές.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Η σύνοδος επεξεργασίας του εγγράφου έληξε. Παρακαλούμε φορτώστε ξανά τη σελίδα.",

apps/documenteditor/forms/locale/eu.json

@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Fitxategia pasahitzez babestua dago eta ezin da ireki.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Fitxategiaren tamainak zure zerbitzarirako ezarritako muga gainditzen du.<br>Jarri harremanetan dokumentu-zerbitzariaren administratzailearekin informazio gehiago lortzeko.",
   "DE.Controllers.ApplicationController.errorForceSave": "Errore bat gertatu da dokumentua gordetzean.<br>Erabili 'Deskargatu honela' aukera fitxategia zure ordenagailuko disko gogorrera gordetzeko edo saiatu berriro geroago.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia eta luzapena ez datoz bat.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia testu-dokumentu bati dagokio (adibidez, docx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia ondorengo formatuetako bati dagokio: pdf/djvu/xps/oxps, baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia aurkezpen bati dagokio (adibidez, pptx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia kalkulu-orri bati dagokio (adibidez, xlsx), baina fitxategiaren luzapena ez dator bat: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Editorearen bertsioa eguneratu da. Orria berriz kargatuko da aldaketak aplikatzeko.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Dokumentua editatzeko saioa iraungi da. Kargatu berriro orria.",

apps/documenteditor/forms/locale/id.json

@@ -53,7 +53,7 @@
   "Common.UI.Window.yesButtonText": "Ya",
   "Common.Views.CopyWarningDialog.textDontShow": "Jangan tampilkan pesan ini lagi",
   "Common.Views.CopyWarningDialog.textMsg": "Copy, cut, dan paste hanya akan dilakukan di tab editor ini.<br><br>Untuk copy atau paste dari dan ke aplikasi luar tab editor, gunakan kombinasi keyboard ini:",
-  "Common.Views.CopyWarningDialog.textTitle": "Salin, Potong dan Tempel",
+  "Common.Views.CopyWarningDialog.textTitle": "Aksi Salin, Potong, dan Tempel",
   "Common.Views.CopyWarningDialog.textToCopy": "untuk Salin",
   "Common.Views.CopyWarningDialog.textToCut": "untuk Potong",
   "Common.Views.CopyWarningDialog.textToPaste": "untuk Tempel",
@@ -63,9 +63,9 @@
   "Common.Views.EmbedDialog.txtCopy": "Disalin ke papan klip",
   "Common.Views.EmbedDialog.warnCopy": "Browser eror! Gunakan shortcut keyboard [Ctrl] + [C]",
   "Common.Views.ImageFromUrlDialog.textUrl": "Tempel URL gambar:",
-  "Common.Views.ImageFromUrlDialog.txtEmpty": "Kolom ini harus diisi",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Ruas ini diperlukan",
-  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Bagian ini harus berupa URL dengn format \"http://www.contoh.com\"",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Ruas ini harus berupa URL dengan format \"http://www.contoh.com\"",
-  "Common.Views.OpenDialog.closeButtonText": "Tutup File",
+  "Common.Views.OpenDialog.closeButtonText": "Tutup file",
   "Common.Views.OpenDialog.txtEncoding": "Enkoding",
   "Common.Views.OpenDialog.txtIncorrectPwd": "Password salah.",
   "Common.Views.OpenDialog.txtOpenFile": "Masukkan kata sandi untuk buka file",
@@ -73,7 +73,7 @@
   "Common.Views.OpenDialog.txtPreview": "Pratinjau",
   "Common.Views.OpenDialog.txtProtected": "Jika Anda memasukkan password dan membuka file, password file saat ini akan di reset.",
   "Common.Views.OpenDialog.txtTitle": "Pilih %1 opsi",
-  "Common.Views.OpenDialog.txtTitleProtected": "File yang Diproteksi",
+  "Common.Views.OpenDialog.txtTitleProtected": "File terproteksi",
   "Common.Views.SaveAsDlg.textLoading": "Memuat",
   "Common.Views.SaveAsDlg.textTitle": "Folder untuk simpan",
   "Common.Views.SelectFileDlg.textLoading": "Memuat",
@@ -96,14 +96,18 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Dokumen dilindungi dengan kata sandi dan tidak dapat dibuka.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Ukuran file melewati batas server Anda.<br>Silakan hubungi admin Server Dokumen Anda untuk detail.",
   "DE.Controllers.ApplicationController.errorForceSave": "Ada kesalahan saat menyimpan file. Silakan gunakan opsi 'Download sebagai' untuk menyimpan file ke komputer Anda dan coba lagi.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Terjadi kesalahan saat membuka file.<br>Isi file tidak cocok dengan ekstensi file.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan dokumen teks (mis. docx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
   "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Sebuah kesalahan terjadi ketika membuka file.<br>Isi file berhubungan dengan satu dari format berikut: pdf/djvu/xps/oxps, tapi file memiliki ekstensi yang tidak konsisten: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan presentasi (mis. pptx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Terjadi kesalahan saat membuka file.<br>Isi file berhubungan dengan spreadsheet (mis. xlsx), tapi file memiliki ekstensi yang tidak konsisten: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Font tidak bisa dimuat.<br>Silakan kontak admin Server Dokumen Anda.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Versi editor sudah di update. Halaman akan dimuat ulang untuk menerapkan perubahan.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Waktu edit dokumen sudah selesai. Silakan muat ulang halaman.",
   "DE.Controllers.ApplicationController.errorSessionIdle": "Dokumen sudah lama tidak diedit. Silakan muat ulang halaman.",
   "DE.Controllers.ApplicationController.errorSessionToken": "Koneksi ke server terganggu. Silakan muat ulang halaman.",
   "DE.Controllers.ApplicationController.errorSubmit": "Submit gagal.",
-  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Nilai yang dimasukkan tidak cocok dengan format bidang.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Nilai yang dimasukkan tidak cocok dengan format ruas.",
   "DE.Controllers.ApplicationController.errorToken": "Token keamanan dokumen tidak dibentuk dengan tepat.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.Controllers.ApplicationController.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "Versi file telah diubah. Halaman tidak akan dimuat ulang.",
@@ -114,11 +118,11 @@
   "DE.Controllers.ApplicationController.mniImageFromStorage": "Gambar dari Penyimpanan",
   "DE.Controllers.ApplicationController.mniImageFromUrl": "Gambar dari URL",
   "DE.Controllers.ApplicationController.notcriticalErrorTitle": "Peringatan",
-  "DE.Controllers.ApplicationController.openErrorText": "Eror ketika membuka file.",
+  "DE.Controllers.ApplicationController.openErrorText": "Kesalahan terjadi ketika membuka file.",
-  "DE.Controllers.ApplicationController.saveErrorText": "Eror ketika menyimpan file.",
+  "DE.Controllers.ApplicationController.saveErrorText": "Terjadi kesalahan ketika menyimpan file.",
   "DE.Controllers.ApplicationController.saveErrorTextDesktop": "File tidak bisa disimpan atau dibuat.<br>Alasan yang mungkin adalah: <br>1. File hanya bisa dibaca. <br>2. File sedang diedit user lain. <br>3. Memori penuh atau terkorupsi.",
   "DE.Controllers.ApplicationController.scriptLoadError": "Koneksi terlalu lambat dan beberapa komponen tidak bisa dibuka. Silakan muat ulang halaman.",
-  "DE.Controllers.ApplicationController.textAnonymous": "Tamu",
+  "DE.Controllers.ApplicationController.textAnonymous": "Anonim",
   "DE.Controllers.ApplicationController.textBuyNow": "Kunjungi website",
   "DE.Controllers.ApplicationController.textCloseTip": "Klik untuk menutup tip.",
   "DE.Controllers.ApplicationController.textContactUs": "Hubungi sales",
@@ -127,10 +131,10 @@
   "DE.Controllers.ApplicationController.textLoadingDocument": "Memuat dokumen",
   "DE.Controllers.ApplicationController.textNoLicenseTitle": "Batas lisensi sudah tercapai",
   "DE.Controllers.ApplicationController.textOf": "dari",
-  "DE.Controllers.ApplicationController.textRequired": "Isi semua area yang dibutuhkan untuk mengirim form.",
+  "DE.Controllers.ApplicationController.textRequired": "Isi semua ruas yang dibutuhkan untuk mengirim formulir.",
   "DE.Controllers.ApplicationController.textSaveAs": "Simpan sebagai PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Simpan sebagai",
-  "DE.Controllers.ApplicationController.textSubmited": "<b>Form berhasil disubmit</b><br>Klik untuk menutup tips",
+  "DE.Controllers.ApplicationController.textSubmited": "<b>Formulir berhasil dikirim</b><br>Klik untuk menutup tips",
   "DE.Controllers.ApplicationController.titleLicenseExp": "Lisensi kadaluwarsa",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor mengupdate",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Versi telah diubah",
@@ -154,12 +158,12 @@
   "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Anda sudah mencapai batas user untuk %1 editor. Hubungi admin Anda untuk mempelajari lebih lanjut.",
   "DE.Controllers.ApplicationController.warnNoLicense": "Anda sudah mencapai batas untuk koneksi bersamaan ke %1 editor. Dokumen ini akan dibuka untuk dilihat saja.<br>Hubungi %1 tim sales untuk syarat personal upgrade.",
   "DE.Controllers.ApplicationController.warnNoLicenseUsers": "Anda sudah mencapai batas user untuk %1 editor. Hubungi %1 tim sales untuk syarat personal upgrade.",
-  "DE.Views.ApplicationView.textClear": "Bersihkan Semua Area",
+  "DE.Views.ApplicationView.textClear": "Bersihkan Semua Ruas",
   "DE.Views.ApplicationView.textCopy": "Salin",
   "DE.Views.ApplicationView.textCut": "Potong",
   "DE.Views.ApplicationView.textFitToPage": "Sesuaikan Halaman",
   "DE.Views.ApplicationView.textFitToWidth": "Sesuaikan Lebar",
-  "DE.Views.ApplicationView.textNext": "Area Berikutnya",
+  "DE.Views.ApplicationView.textNext": "Ruas Berikutnya",
   "DE.Views.ApplicationView.textPaste": "Tempel",
   "DE.Views.ApplicationView.textPrintSel": "Print Pilihan",
   "DE.Views.ApplicationView.textRedo": "Ulangi",

apps/documenteditor/forms/locale/ja.json

@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "ドキュメントがパスワードで保護されているため開くことができません",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。<br>Documentサーバー管理者に詳細をお問い合わせください。",
   "DE.Controllers.ApplicationController.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「...としてダウンロード」を使用し、または後で再お試しください。",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容がファイルの拡張子と一致しません。",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はドキュメント (docx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容は次のいずれかの形式に対応しています: pdf/djvu/xps/oxps が、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はプレゼンテーション (pptx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はスプレッドシート (xlsx など) に対応していますが、ファイルの拡張子が一致していません: %1",
   "DE.Controllers.ApplicationController.errorLoadingFont": "フォントがダウンロードされませんでした。<br>文書サーバのアドミニストレータを連絡してください。",
   "DE.Controllers.ApplicationController.errorServerVersion": "エディターのバージョンが更新されました。 変更を適用するために、ページが再読み込みされます。",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "ドキュメント編集セッションが終了しました。 ページをリロードしてください。",
@@ -103,8 +108,8 @@
   "DE.Controllers.ApplicationController.errorSessionToken": "サーバーとの接続が中断されました。このページをリロードしてください。",
   "DE.Controllers.ApplicationController.errorSubmit": "送信に失敗しました。",
   "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "入力された値がフィールドのフォーマットと一致しません。",
-  "DE.Controllers.ApplicationController.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。<br>ドキュメントサーバーの管理者にご連絡ください。",
+  "DE.Controllers.ApplicationController.errorToken": "ドキュメントセキュリティトークンが正しく形成されていません。<br>ドキュメントサーバーの管理者にご連絡ください。",
-  "DE.Controllers.ApplicationController.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
+  "DE.Controllers.ApplicationController.errorTokenExpire": "ドキュメントセキュリティトークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
   "DE.Controllers.ApplicationController.errorUpdateVersion": "ファイルが変更されました。ページがリロードされます。",
   "DE.Controllers.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして変更が失われていないことを確認してから、このページを再読み込みしてください。",
   "DE.Controllers.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。",
@@ -139,7 +144,7 @@
   "DE.Controllers.ApplicationController.txtClose": "閉じる",
   "DE.Controllers.ApplicationController.txtEmpty": "(空)",
   "DE.Controllers.ApplicationController.txtEnterDate": "日付を入力します",
-  "DE.Controllers.ApplicationController.txtPressLink": "リンクをクリックしてCTRLを押してください",
+  "DE.Controllers.ApplicationController.txtPressLink": "Ctrlを押しながらリンクをクリック",
   "DE.Controllers.ApplicationController.txtUntitled": "無題",
   "DE.Controllers.ApplicationController.unknownErrorText": "不明なエラー",
   "DE.Controllers.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザはサポートされていません。",

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

@@ -77,7 +77,7 @@
   "Common.Views.SaveAsDlg.textLoading": "A carregar",
   "Common.Views.SaveAsDlg.textTitle": "Pasta para guardar",
   "Common.Views.SelectFileDlg.textLoading": "A carregar",
-  "Common.Views.SelectFileDlg.textTitle": "Selecione a origem dos dados",
+  "Common.Views.SelectFileDlg.textTitle": "Selecione a fonte 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! Utilize a tecla de atalho [Ctrl] + [C]",
@@ -96,6 +96,11 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "O ficheiro está protegido por palavra-passe e não pode ser aberto.",
   "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 mais tarde.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro não coincide com a sua extensão.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a um documento de texto (doc, docx...), mas a extensão de ficheiro não é consistente: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a um dos seguintes formatos: pdf/djvu/xps/oxps, mas a extensão de ficheiro não é consistente: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a uma apresentação (ppt, pptx...), mas a extensão de ficheiro não é consistente: %1",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro corresponde a uma folha de cálculo (xls, xlsx...), mas a extensão de ficheiro não é consistente: %1",
   "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.",

apps/documenteditor/forms/locale/ro.json

@@ -96,12 +96,18 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "DE.Controllers.ApplicationController.errorForceSave": "S-a produs o eroare în timpul salvării fișierului. Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca... sau încercați din nou mai târziu.",
+  "DE.Controllers.ApplicationController.errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de document text (ex. docx), dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPdf": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unuia dintre următoarele formate: pdf/djvu/xps/oxps, dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtPptx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de prezentare (ex. pptx), dar extensia numelui de fișier nu se potrivește: %1.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtXlsx": "Eroare la deschiderea fișierului.<br>Conținutul fișierului corespunde unui format de foaie de calcul (ex. xlsx), dar extensia numelui de fișier nu se potrivește: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Editorul a fost actualizat. Pagina va fi reîmprospătată pentru a aplica această actualizare.",
   "DE.Controllers.ApplicationController.errorSessionAbsolute": "Sesiunea de editare a expirat. Încercați să reîmprospătați pagina.",
   "DE.Controllers.ApplicationController.errorSessionIdle": "Acțiunile de editare a documentului nu s-au efectuat de ceva timp. Încercați să reîmprospătați pagina.",
   "DE.Controllers.ApplicationController.errorSessionToken": "Conexeunea la server s-a întrerupt. Încercați să reîmprospătati pagina.",
   "DE.Controllers.ApplicationController.errorSubmit": "Remiterea eșuată.",
+  "DE.Controllers.ApplicationController.errorTextFormWrongFormat": "Ați introdus o valoare care nu corespunde cu formatul câmpului.",
   "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ă.",
@@ -162,7 +168,7 @@
   "DE.Views.ApplicationView.textPrintSel": "Imprimare selecție",
   "DE.Views.ApplicationView.textRedo": "Refacere",
   "DE.Views.ApplicationView.textSubmit": "Remitere",
-  "DE.Views.ApplicationView.textUndo": "Anulează",
+  "DE.Views.ApplicationView.textUndo": "Anulare",
   "DE.Views.ApplicationView.textZoom": "Zoom",
   "DE.Views.ApplicationView.txtDarkMode": "Modul Întunecat",
   "DE.Views.ApplicationView.txtDownload": "Descărcare",

apps/documenteditor/forms/locale/tr.json

@@ -88,6 +88,7 @@
   "DE.Controllers.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
   "DE.Controllers.ApplicationController.errorFileSizeExceed": "Dosya boyutu, sunucunuz için belirlenen limiti aşıyor.<br>Ayrıntılar için lütfen Doküman Sunucusu yöneticinizle iletişime geçin.",
   "DE.Controllers.ApplicationController.errorForceSave": "Dosya indirilirken bir hata oluştu. Dosyayı bilgisayarınıza kaydetmek için lütfen 'Farklı Kaydet' seçeneğini kullanın veya daha sonra tekrar deneyin.",
+  "DE.Controllers.ApplicationController.errorInconsistentExtDocx": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği metin belgelerine (örn. docx) karşılık geliyor, ancak dosyanın uzantısı tutarsız: %1.",
   "DE.Controllers.ApplicationController.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
   "DE.Controllers.ApplicationController.errorServerVersion": "Editör versiyonu güncellendi. Değişikliklerin uygulanabilmesi için sayfa yenilenecek.",
   "DE.Controllers.ApplicationController.errorSessionToken": "Sunucu bağlantısı yarıda kesildi. Lütfen sayfayı yeniden yükleyin.",
@@ -150,9 +151,10 @@
   "DE.Views.ApplicationView.textRedo": "Yinele",
   "DE.Views.ApplicationView.textSubmit": "Kaydet",
   "DE.Views.ApplicationView.textUndo": "Geri Al",
+  "DE.Views.ApplicationView.textZoom": "Yakınlaştırma",
   "DE.Views.ApplicationView.txtDarkMode": "Karanlık mod",
   "DE.Views.ApplicationView.txtDownload": "İndir",
-  "DE.Views.ApplicationView.txtDownloadDocx": "docx olarak indir",
+  "DE.Views.ApplicationView.txtDownloadDocx": ".docx olarak indir",
   "DE.Views.ApplicationView.txtDownloadPdf": "Pdf olarak indir",
   "DE.Views.ApplicationView.txtEmbed": "Gömülü",
   "DE.Views.ApplicationView.txtFileLocation": "Dosya konumunu aç",

apps/documenteditor/main/app.js

@@ -104,7 +104,7 @@ require.config({
         sdk: {
             deps: [
                 'jquery',
-                'underscore',
+                // 'underscore',
                 'allfonts',
                 'xregexp',
                 'socketio'
@@ -124,15 +124,14 @@ require.config({
 });
 
 require([
+    'sdk',
     'backbone',
     'bootstrap',
     'core',
-    'sdk',
-    'api',
     'analytics',
     'gateway',
     'locale'
-], function (Backbone, Bootstrap, Core) {
+], function (Sdk, Backbone, Bootstrap, Core) {
     if (Backbone.History && Backbone.History.started)
         return;
     Backbone.history.start();
@@ -158,6 +157,7 @@ require([
             'ViewTab',
             'Search',
             'DocProtection',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -193,6 +193,7 @@ require([
                 'documenteditor/main/app/controller/ViewTab',
                 'documenteditor/main/app/controller/Search',
                 'documenteditor/main/app/controller/DocProtection',
+                'documenteditor/main/app/controller/Print',
                 'documenteditor/main/app/view/FileMenuPanels',
                 'documenteditor/main/app/view/ParagraphSettings',
                 'documenteditor/main/app/view/HeaderFooterSettings',

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

@@ -86,6 +86,7 @@ define([
             this.setApi(api);
         },
         setApi: function (api) {
+            this.userCollection = this.getApplication().getCollection('Common.Collections.Users');
             if (api) {
                 this.api = api;
                 this.api.asc_registerCallback('asc_onChangeDocumentProtection',_.bind(this.onChangeProtectDocument, this));
@@ -95,6 +96,7 @@ define([
 
         setMode: function(mode) {
             this.appConfig = mode;
+            this.currentUserId = mode.user.id;
 
             this.appConfig.isEdit && (this.view = this.createView('DocProtection', {
                 mode: mode
@@ -116,12 +118,10 @@ define([
         onProtectDocClick: function(state) {
             this.view.btnProtectDoc.toggle(!state, true);
             if (state) {
-                var me = this,
+                var me = this;
-                    btn,
+                    me._docProtectDlg  = new DE.Views.ProtectDialog({
-                    win = new DE.Views.ProtectDialog({
                         props: me.appConfig,
                         handler: function(result, value, props) {
-                            btn = result;
                             if (result == 'ok') {
                                 var protection = me.api.asc_getDocumentProtection() || new AscCommonWord.CDocProtect();
                                 protection.asc_setEditType(props);
@@ -131,25 +131,22 @@ define([
                             Common.NotificationCenter.trigger('edit:complete');
                         }
                     }).on('close', function() {
-                        if (btn!=='ok')
+                        me._docProtectDlg = undefined;
-                            me.view.btnProtectDoc.toggle(false, true);
                     });
 
-                win.show();
+                me._docProtectDlg.show();
             } else {
                 var me = this,
-                    btn,
                     props = me.api.asc_getDocumentProtection();
                 if (props && props.asc_getIsPassword()) {
                     var win = new Common.Views.OpenDialog({
-                        title: me.view.txtWBUnlockTitle,
+                        title: me.view.txtUnlockTitle,
                         closable: true,
                         type: Common.Utils.importTextType.DRM,
-                        txtOpenFile: me.view.txtWBUnlockDescription,
+                        txtOpenFile: me.view.txtDocUnlockDescription,
                         validatePwd: false,
                         maxPasswordLength: 15,
                         handler: function (result, value) {
-                            btn = result;
                             if (result == 'ok') {
                                 if (me.api) {
                                     props.asc_setEditType(Asc.c_oAscEDocProtect.None);
@@ -160,8 +157,6 @@ define([
                             }
                         }
                     }).on('close', function() {
-                        if (btn!=='ok')
-                            me.view.btnProtectDoc.toggle(true, true);
                     });
 
                     win.show();
@@ -175,7 +170,7 @@ define([
         },
 
         onAppReady: function (config) {
-            if (!this.view) return;
+            if (!this.api) return;
             
             var me = this;
             (new Promise(function (resolve) {
@@ -185,12 +180,47 @@ define([
                     type = props ? props.asc_getEditType() : Asc.c_oAscEDocProtect.None,
                     isProtected = (type === Asc.c_oAscEDocProtect.ReadOnly || type === Asc.c_oAscEDocProtect.Comments ||
                                    type === Asc.c_oAscEDocProtect.TrackedChanges || type === Asc.c_oAscEDocProtect.Forms);
-                me.view.btnProtectDoc.toggle(!!isProtected, true);
+                me.view && me.view.btnProtectDoc.toggle(!!isProtected, true);
+
+                if (isProtected) {
+                    var str;
+                    switch (type) {
+                        case Asc.c_oAscEDocProtect.ReadOnly:
+                            str = me.txtIsProtectedView;
+                            break;
+                        case Asc.c_oAscEDocProtect.Comments:
+                            str = me.txtIsProtectedComment;
+                            break;
+                        case Asc.c_oAscEDocProtect.Forms:
+                            str = me.txtIsProtectedForms;
+                            break;
+                        case Asc.c_oAscEDocProtect.TrackedChanges:
+                            str = me.txtIsProtectedTrack;
+                            break;
+                    }
+                    me._protectionTip = new Common.UI.SynchronizeTip({
+                        extCls: 'no-arrow',
+                        placement: 'bottom',
+                        target: $('.toolbar'),
+                        text: str,
+                        showLink: false,
+                        style: 'max-width: 400px;'
+                    });
+                    me._protectionTip.on('closeclick', function () {
+                        this.close();
+                    }).show();
+                }
+
                 props && me.applyRestrictions(type);
             });
         },
 
-        onChangeProtectDocument: function() {
+        onChangeProtectDocument: function(userId) {
+            if (this._protectionTip && this._protectionTip.isVisible()) {
+                this._protectionTip.close();
+                this._protectionTip = undefined;
+            }
+
             var props = this.getDocProps(true),
                 isProtected = props && (props.isReadOnly || props.isCommentsOnly || props.isFormsOnly || props.isReviewOnly);
             this.view && this.view.btnProtectDoc.toggle(isProtected, true);
@@ -208,7 +238,30 @@ define([
             }
 
             props && this.applyRestrictions(props.type);
+            if (this._docProtectDlg && this._docProtectDlg.isVisible())
+                this._docProtectDlg.SetDisabled(!!this._state.lockDocProtect || isProtected);
             Common.NotificationCenter.trigger('protect:doclock', props);
+            if (userId && this.userCollection) {
+                var recUser = this.userCollection.findOriginalUser(userId);
+                if (recUser && (recUser.get('idOriginal') !== this.currentUserId)) {
+                    var str = this.txtWasUnprotected;
+                    switch (this._state.docProtection.type) {
+                        case Asc.c_oAscEDocProtect.ReadOnly:
+                            str = this.txtWasProtectedView;
+                            break;
+                        case Asc.c_oAscEDocProtect.Comments:
+                            str = this.txtWasProtectedComment;
+                            break;
+                        case Asc.c_oAscEDocProtect.Forms:
+                            str = this.txtWasProtectedForms;
+                            break;
+                        case Asc.c_oAscEDocProtect.TrackedChanges:
+                            str = this.txtWasProtectedTrack;
+                            break;
+                    }
+                    str && Common.NotificationCenter.trigger('showmessage', {msg: str}, {timeout: 5000, hideCloseTip: true});
+                }
+            }
         },
 
         getDocProps: function(update) {
@@ -246,8 +299,22 @@ define([
         },
 
         onLockDocumentProtection: function(state) {
+            this._state.lockDocProtect = state;
             this.view && Common.Utils.lockControls(Common.enumLock.protectLock, state, {array: [this.view.btnProtectDoc]});
-        }
+            if (this._docProtectDlg && this._docProtectDlg.isVisible())
+                this._docProtectDlg.SetDisabled(state || this._state.docProtection && (this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly ||
+                                                                                    this._state.docProtection.isCommentsOnly || this._state.docProtection.isReviewOnly));
+        },
+
+        txtWasProtectedView: 'Document has been protected by another user.\nYou may only view this document.',
+        txtWasProtectedTrack: 'Document has been protected by another user.\nYou may edit this document, but all changes will be tracked.',
+        txtWasProtectedComment: 'Document has been protected by another user.\nYou may only insert comments to this document.',
+        txtWasProtectedForms: 'Document has been protected by another user.\nYou may only fill in forms in this document.',
+        txtWasUnprotected: 'Document has been unprotected.',
+        txtIsProtectedView: 'Document is protected. You may only view this document.',
+        txtIsProtectedTrack: 'Document is protected. You may edit this document, but all changes will be tracked.',
+        txtIsProtectedComment: 'Document is protected. You may only insert comments to this document.',
+        txtIsProtectedForms: 'Document is protected. You may only fill in forms in this document.'
 
     }, DE.Controllers.DocProtection || {}));
 });

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

@@ -214,6 +214,9 @@ define([
                     this.api.asc_registerCallback('asc_onUnLockDocumentProps',      _.bind(this.onApiUnLockDocumentProps, this));
                     this.api.asc_registerCallback('asc_onShowMathTrack',            _.bind(this.onShowMathTrack, this));
                     this.api.asc_registerCallback('asc_onHideMathTrack',            _.bind(this.onHideMathTrack, this));
+                    this.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(this.onInsertImage, this));
+                    this.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(this.onInsertImageUrl, this));
+
                 }
                 this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',        _.bind(this.onCoAuthoringDisconnect, this));
                 Common.NotificationCenter.on('api:disconnect',                      _.bind(this.onCoAuthoringDisconnect, this));
@@ -1283,15 +1286,11 @@ define([
                     handler: function(dlg, result) {
                         if (result == 'ok') {
                             var props = dlg.getSettings();
-                            var mnu = DE.getController('Toolbar').toolbar.btnPageMargins.menu.items[0];
-                            mnu.setVisible(true);
-                            mnu.setChecked(true);
-                            mnu.options.value = mnu.value = [props.get_TopMargin(), props.get_LeftMargin(), props.get_BottomMargin(), props.get_RightMargin()];
-                            $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
                             Common.localStorage.setItem("de-pgmargins-top", props.get_TopMargin());
                             Common.localStorage.setItem("de-pgmargins-left", props.get_LeftMargin());
                             Common.localStorage.setItem("de-pgmargins-bottom", props.get_BottomMargin());
                             Common.localStorage.setItem("de-pgmargins-right", props.get_RightMargin());
+                            Common.NotificationCenter.trigger('margins:update', props);
 
                             me.api.asc_SetSectionProps(props);
                             me.editComplete();
@@ -2499,6 +2498,29 @@ define([
             }
         },
 
+        onInsertImage: function(obj, x, y) {
+            if (this.api)
+                this.api.asc_addImage(obj);
+            this.editComplete();
+        },
+
+        onInsertImageUrl: function(obj, x, y) {
+            var me = this;
+            (new Common.Views.ImageFromUrlDialog({
+                handler: function(result, value) {
+                    if (result == 'ok') {
+                        if (me.api) {
+                            var checkUrl = value.replace(/ /g, '');
+                            if (!_.isEmpty(checkUrl)) {
+                                me.api.AddImageUrl([checkUrl], undefined, undefined, obj);
+                            }
+                        }
+                    }
+                    me.editComplete();
+                }
+            })).show();
+        },
+
         editComplete: function() {
             this.documentHolder && this.documentHolder.fireEvent('editcomplete', this.documentHolder);
         }

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

@@ -133,7 +133,8 @@ define([
 
             var pr, i = -1, type,
                 paragraph_locked = false,
-                header_locked = false;
+                header_locked = false,
+                shape_pr = undefined;
 
             while (++i < selectedObjects.length) {
                 type = selectedObjects[i].get_ObjectType();
@@ -143,6 +144,9 @@ define([
                     paragraph_locked = pr.get_Locked();
                 } else if (type === Asc.c_oAscTypeSelectElement.Header) {
                     header_locked = pr.get_Locked();
+                } else if (type === Asc.c_oAscTypeSelectElement.Image) {
+                    if (pr && pr.get_ShapeProperties())
+                        shape_pr = pr.get_ShapeProperties();
                 }
             }
             var in_control = this.api.asc_IsContentControl();
@@ -159,6 +163,11 @@ define([
             Common.Utils.lockControls(Common.enumLock.controlPlain,  control_plain,      {array: arr});
             Common.Utils.lockControls(Common.enumLock.contentLock,   content_locked,     {array: arr});
             Common.Utils.lockControls(Common.enumLock.complexForm,   in_control && !!control_props && !!control_props.get_ComplexFormPr(),     {array: [this.view.btnComplexField, this.view.btnImageField]});
+
+            var in_smart_art = shape_pr && shape_pr.asc_getFromSmartArt(),
+                in_smart_art_internal = shape_pr && shape_pr.asc_getFromSmartArtInternal();
+            Common.Utils.lockControls(Common.enumLock.inSmartart, in_smart_art, {array: arr});
+            Common.Utils.lockControls(Common.enumLock.inSmartartInternal, in_smart_art_internal, {array: arr});
         },
 
         // onChangeSpecialFormsGlobalSettings: function() {

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

@@ -115,6 +115,7 @@ define([
                     this.clickMenuFileItem(null, 'history');
             }, this));
             Common.NotificationCenter.on('protect:doclock', _.bind(this.onChangeProtectDocument, this));
+            Common.NotificationCenter.on('file:print', _.bind(this.clickToolbarPrint, this));
         },
 
         onLaunch: function() {
@@ -558,6 +559,13 @@ define([
                 this.leftMenu.menuFile.hide();
         },
 
+        clickToolbarPrint: function () {
+            if (this.mode.canPreviewPrint)
+                this.leftMenu.showMenu('file:printpreview');
+            else if (this.mode.canPrint)
+                this.clickMenuFileItem(null, 'print');
+        },
+
         changeToolbarSaveState: function (state) {
             var btnSave = this.leftMenu.menuFile.getButton('save');
             btnSave && btnSave.setDisabled(state);
@@ -594,7 +602,7 @@ define([
         },
 
         updatePreviewMode: function() {
-            var viewmode = this._state.disableEditing || this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly;
+            var viewmode = this._state.disableEditing || this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly;
             if (this.viewmode === viewmode) return;
             this.viewmode = viewmode;
 
@@ -881,6 +889,7 @@ define([
         onShowHideSearch: function (state, findText) {
             if (state) {
                 Common.UI.Menu.Manager.hideAll();
+                this.tryToShowLeftMenu();
                 this.leftMenu.showMenu('advancedsearch', undefined, true);
                 this.leftMenu.fireEvent('search:aftershow', this.leftMenu, findText);
             } else {

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

@@ -207,6 +207,14 @@ define([
                         case '2': this.api.SetFontRenderingMode(2); break;
                     }
 
+                    if ( !Common.Utils.isIE ) {
+                        if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_DE}}') ) {
+                            const _url_obj = new URL('{{HELP_CENTER_WEB_DE}}');
+                            _url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
+                            Common.Utils.InternalSettings.set("url-help-center", _url_obj.toString());
+                        }
+                    }
+
                     this.api.asc_registerCallback('asc_onError',                    _.bind(this.onError, this));
                     this.api.asc_registerCallback('asc_onDocumentContentReady',     _.bind(this.onDocumentContentReady, this));
                     this.api.asc_registerCallback('asc_onOpenDocumentProgress',     _.bind(this.onOpenDocument, this));
@@ -1509,6 +1517,8 @@ define([
                 }
                 this.appOptions.canEditStyles  = this.appOptions.canLicense && this.appOptions.canEdit;
                 this.appOptions.canPrint       = (this.permissions.print !== false);
+                this.appOptions.canPreviewPrint = this.appOptions.canPrint && !Common.Utils.isMac && this.appOptions.isDesktopApp;
+                this.appOptions.canQuickPrint = this.appOptions.canPrint && !Common.Utils.isMac && this.appOptions.isDesktopApp;
                 this.appOptions.canRename      = this.editorConfig.canRename;
                 this.appOptions.buildVersion   = params.asc_getBuildVersion();
                 this.appOptions.canForcesave   = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
@@ -1682,6 +1692,9 @@ define([
 
                 viewport.applyCommonMode();
 
+                var printController = app.getController('Print');
+                printController && this.api && printController.setApi(this.api).setMode(this.appOptions);
+
                 this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
                 this.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(this.onDownloadUrl, this));
                 this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
@@ -1787,6 +1800,9 @@ define([
                     this.showTips([this.scriptLoadError]);
                     this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
                     return;
+                } else if (id == Asc.c_oAscError.ID.CanNotPasteImage) {
+                    this.showTips([this.errorCannotPasteImg], {timeout: 7000, hideCloseTip: true});
+                    return;
                 }
 
                 this.hidePreloader();
@@ -2284,7 +2300,9 @@ define([
             onServerVersion: function(buildVersion) {
                 if (this.changeServerVersion) return true;
 
-                if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) {
+                const cur_version = this.getApplication().getController('LeftMenu').leftMenu.getMenu('about').txtVersionNum;
+                const cropped_version = cur_version.match(/^(\d+.\d+.\d+)/);
+                if (!window.compareVersions && (!cropped_version || cropped_version[1] !== buildVersion)) {
                     this.changeServerVersion = true;
                     Common.UI.warning({
                         title: this.titleServerVersion,
@@ -2499,6 +2517,7 @@ define([
                 this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? Asc.c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? Asc.c_oAscDocumentUnits.Point : Asc.c_oAscDocumentUnits.Millimeter));
                 this.getApplication().getController('RightMenu').updateMetricUnit();
                 this.getApplication().getController('Toolbar').getView().updateMetricUnit();
+                this.appOptions.canPreviewPrint && this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit();
             },
 
             onAdvancedOptions: function(type, advOptions, mode, formatOptions) {
@@ -2653,9 +2672,7 @@ define([
 
             onPrint: function() {
                 if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return;
-                
+                Common.NotificationCenter.trigger('file:print');
-                if (this.api)
-                    this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isOpera == true use asc_onPrintUrl event
                 Common.component.Analytics.trackEvent('Print');
             },
 
@@ -2688,6 +2705,39 @@ define([
                 if (url) this.iframePrint.src = url;
             },
 
+            onPrintQuick: function() {
+                if (!this.appOptions.canQuickPrint) return;
+
+                var value = Common.localStorage.getBool("de-hide-quick-print-warning"),
+                    me = this,
+                    handler = function () {
+                        var printopt = new Asc.asc_CAdjustPrint();
+                        printopt.asc_setNativeOptions({quickPrint: true});
+                        var opts = new Asc.asc_CDownloadOptions();
+                        opts.asc_setAdvancedOptions(printopt);
+                        me.api.asc_Print(opts);
+                        Common.component.Analytics.trackEvent('Print');
+                    };
+
+                if (value) {
+                    handler.call(this);
+                } else {
+                    Common.UI.warning({
+                        msg: this.textTryQuickPrint,
+                        buttons: ['yes', 'no'],
+                        primary: 'yes',
+                        dontshow: true,
+                        maxwidth: 500,
+                        callback: function(btn, dontshow){
+                            dontshow && Common.localStorage.setBool("de-hide-quick-print-warning", true);
+                            if (btn === 'yes') {
+                                setTimeout(handler, 1);
+                            }
+                        }
+                    });
+                }
+            },
+
             onClearDummyComment: function() {
                 this.dontCloseDummyComment = false;
             },
@@ -3320,7 +3370,9 @@ define([
             errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
             errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
             errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
-            errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
+            errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.',
+            errorCannotPasteImg: 'We can\'t paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the document.',
+            textTryQuickPrint: 'You have selected Quick print: the entire document will be printed on the last selected or default printer.<br>Do you want to continue?'
         }
     })(), DE.Controllers.Main || {}))
 });

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

@@ -0,0 +1,574 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+define([
+    'core',
+    'documenteditor/main/app/view/FileMenuPanels'
+], function () {
+    'use strict';
+
+    DE.Controllers.Print = Backbone.Controller.extend(_.extend({
+        views: [
+            'PrintWithPreview'
+        ],
+
+        initialize: function() {
+            this.adjPrintParams = new Asc.asc_CAdjustPrint();
+            this._state = {
+                lock_doc: false,
+                firstPrintPage: 0
+            };
+
+            this._navigationPreview = {
+                pageCount: false,
+                currentPage: 0,
+                currentPreviewPage: 0
+            };
+
+            this._isPreviewVisible = false;
+
+            this.addListeners({
+                'PrintWithPreview': {
+                    'show': _.bind(this.onShowMainSettingsPrint, this),
+                    'render:after': _.bind(this.onAfterRender, this)
+                }
+            });
+        },
+
+        onLaunch: function() {
+            this.printSettings = this.createView('PrintWithPreview');
+        },
+
+        onAfterRender: function(view) {
+            var me = this;
+            this.printSettings.menu.on('menu:hide', _.bind(this.onHidePrintMenu, this));
+            this.printSettings.btnPrint.on('click', _.bind(this.onBtnPrint, this, true));
+            this.printSettings.btnPrintPdf.on('click', _.bind(this.onBtnPrint, this, false));
+            this.printSettings.btnPrevPage.on('click', _.bind(this.onChangePreviewPage, this, false));
+            this.printSettings.btnNextPage.on('click', _.bind(this.onChangePreviewPage, this, true));
+            this.printSettings.txtNumberPage.on({
+                'keypress:after':  _.bind(this.onKeypressPageNumber, this),
+                'keyup:after': _.bind(this.onKeyupPageNumber, this)
+            });
+            this.printSettings.txtNumberPage.cmpEl.find('input').on('blur', _.bind(this.onBlurPageNumber, this));
+            this.printSettings.cmbPaperSize.on('selected', _.bind(this.onPaperSizeSelect, this));
+            this.printSettings.cmbPaperOrientation.on('selected', _.bind(this.onPaperOrientSelect, this));
+            this.printSettings.cmbPaperMargins.on('selected', _.bind(this.onPaperMarginsSelect, this));
+            this.printSettings.cmbRange.on('selected', _.bind(this.comboRangeChange, this));
+            this.printSettings.inputPages.on('changing', _.bind(this.inputPagesChanging, this));
+            this.printSettings.inputPages.validation = function(value) {
+                if (!_.isEmpty(value) && /[0-9,\-]/.test(value)) {
+                    var res = [],
+                        arr = value.split(',');
+                    if (me._isPrint && arr.length>1)
+                        return me.txtPrintRangeSingleRange;
+
+                    for (var i=0; i<arr.length; i++) {
+                        var item = arr[i];
+                        if (!item) // empty
+                            return me.txtPrintRangeInvalid;
+                        var str = item.match(/\-/g);
+                        if (str && str.length>1) // more than 1 symbol '-'
+                            return me.txtPrintRangeInvalid;
+                        if (!str) {// one number
+                            var num = parseInt(item)-1;
+                            (num>=0) && res.push(num);
+                        } else { // range
+                            var pages = item.split('-'),
+                                start = (pages[0] ? parseInt(pages[0])-1 : 0),
+                                end = (pages[1] ? parseInt(pages[1])-1 : me._navigationPreview.pageCount-1);
+                            if (start>end) {
+                                var num = start;
+                                start = end;
+                                end = num;
+                            }
+                            for (var j=start; j<=end; j++) {
+                                (j>=0) && res.push(j);
+                            }
+                        }
+                    }
+                    if (res.length>0) {
+                        me._state.firstPrintPage = res[0];
+                        return true;
+                    }
+                }
+
+                return me.txtPrintRangeInvalid;
+            };
+
+            Common.NotificationCenter.on('window:resize', _.bind(function () {
+                if (this._isPreviewVisible) {
+                    this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+                }
+            }, this));
+            Common.NotificationCenter.on('margins:update', _.bind(this.onUpdateLastCustomMargins, this));
+
+            var eventname = (/Firefox/i.test(navigator.userAgent))? 'DOMMouseScroll' : 'mousewheel';
+            this.printSettings.$previewBox.on(eventname, _.bind(this.onPreviewWheel, this));
+        },
+
+        setMode: function (mode) {
+            this.mode = mode;
+            this.printSettings && this.printSettings.setMode(mode);
+        },
+
+        setApi: function(o) {
+            this.api = o;
+            this.api.asc_registerCallback('asc_onDocSize', _.bind(this.onApiPageSize, this));
+            this.api.asc_registerCallback('asc_onPageOrient', _.bind(this.onApiPageOrient, this));
+            this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
+            this.api.asc_registerCallback('asc_onCountPages',   _.bind(this.onCountPages, this));
+            this.api.asc_registerCallback('asc_onCurrentPage',  _.bind(this.onCurrentPage, this));
+            this.api.asc_registerCallback('asc_onLockDocumentProps', _.bind(this.onApiLockDocumentProps, this));
+            this.api.asc_registerCallback('asc_onUnLockDocumentProps', _.bind(this.onApiUnLockDocumentProps, this));
+
+            return this;
+        },
+
+        findPagePreset: function(w, h) {
+            var width = (w<h) ? w : h,
+                height = (w<h) ? h : w;
+            var panel = this.printSettings;
+            var store = panel.cmbPaperSize.store,
+                item = null;
+            for (var i=0; i<store.length-1; i++) {
+                var rec = store.at(i),
+                    size = rec.get('size'),
+                    pagewidth = size[0],
+                    pageheight = size[1];
+                if (Math.abs(pagewidth - width) < 0.1 && Math.abs(pageheight - height) < 0.1) {
+                    item = rec;
+                    break;
+                }
+            }
+            return item ? item.get('caption') : undefined;
+        },
+
+        onApiPageSize: function(w, h) {
+            this._state.pgsize = [w, h];
+            if (this.printSettings.isVisible()) {
+                var width = this._state.pgorient ? w : h,
+                    height = this._state.pgorient ? h : w;
+                var panel = this.printSettings;
+                var store = panel.cmbPaperSize.store,
+                    item = null;
+                for (var i=0; i<store.length-1; i++) {
+                    var rec = store.at(i),
+                        size = rec.get('size'),
+                        pagewidth = size[0],
+                        pageheight = size[1];
+                    if (Math.abs(pagewidth - width) < 0.1 && Math.abs(pageheight - height) < 0.1) {
+                        item = rec;
+                        break;
+                    }
+                }
+                if (item)
+                    panel.cmbPaperSize.setValue(item.get('value'));
+                else
+                    panel.cmbPaperSize.setValue(this.txtCustom + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(width).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
+                        parseFloat(Common.Utils.Metric.fnRecalcFromMM(height).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')');
+            } else {
+                this.isFillProps = false;
+            }
+        },
+
+        onApiPageOrient: function(isportrait) {
+            this._state.pgorient = !!isportrait;
+            if (this.printSettings.isVisible()) {
+                var item = this.printSettings.cmbPaperOrientation.store.findWhere({value: this._state.pgorient ? Asc.c_oAscPageOrientation.PagePortrait : Asc.c_oAscPageOrientation.PageLandscape});
+                if (item) this.printSettings.cmbPaperOrientation.setValue(item.get('value'));
+            }
+        },
+
+        onSectionProps: function(props) {
+            if (!props) return;
+
+            this._state.sectionprops = props;
+            if (this.printSettings.isVisible()) {
+                var left = props.get_LeftMargin(),
+                    top = props.get_TopMargin(),
+                    right = props.get_RightMargin(),
+                    bottom = props.get_BottomMargin();
+
+                this._state.pgmargins = [top, left, bottom, right];
+                var store = this.printSettings.cmbPaperMargins.store,
+                    item = null;
+                for (var i=0; i<store.length-1; i++) {
+                    var rec = store.at(i),
+                        size = rec.get('size');
+                    if (typeof(size) == 'object' &&
+                        Math.abs(size[0] - top) < 0.1 && Math.abs(size[1] - left) < 0.1 &&
+                        Math.abs(size[2] - bottom) < 0.1 && Math.abs(size[3] - right) < 0.1) {
+                        item = rec;
+                        break;
+                    }
+                }
+                if (item)
+                    this.printSettings.cmbPaperMargins.setValue(item.get('value'));
+                else
+                    this.printSettings.cmbPaperMargins.setValue(this.txtCustom);
+
+            }
+        },
+
+        comboRangeChange: function(combo, record) {
+            if (record.value === -1) {
+                var me = this;
+                setTimeout(function(){
+                    me.printSettings.inputPages.focus();
+                }, 50);
+            } else {
+                this.printSettings.inputPages.setValue('');
+            }
+            this.printSettings.inputPages.showError();
+        },
+
+        onCountPages: function(count) {
+            this._navigationPreview.pageCount = count;
+            if (this._navigationPreview.currentPreviewPage > count - 1) {
+                this._navigationPreview.currentPreviewPage = Math.max(0, count - 1);
+                if (this.printSettings.isVisible()) {
+                    this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+                    this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, count);
+                }
+            }
+        },
+
+        onCurrentPage: function(number) {
+            this._navigationPreview.currentPreviewPage = number;
+            if (this.printSettings.isVisible()) {
+                this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+                this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+            }
+        },
+
+        onShowMainSettingsPrint: function() {
+            var me = this;
+            this.printSettings.$previewBox.removeClass('hidden');
+
+            this.onUpdateLastCustomMargins(this._state.lastmargins);
+            this._state.pgsize && this.onApiPageSize(this._state.pgsize[0], this._state.pgsize[1]);
+            this.onApiPageOrient(this._state.pgorient);
+            this._state.sectionprops && this.onSectionProps(this._state.sectionprops);
+
+            var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+            opts.asc_setAdvancedOptions(this.adjPrintParams);
+            this.api.asc_initPrintPreview('print-preview', opts);
+
+            this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage();
+            this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage);
+            this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+            this.SetDisabled();
+            this._isPreviewVisible = true;
+        },
+
+        onPaperSizeSelect: function(combo, record) {
+            this._state.pgsize = [0, 0];
+            if (record.value !== -1) {
+                if (this.checkPageSize(record.size[0], record.size[1])) {
+                    var section = this.api.asc_GetSectionProps();
+                    this.onApiPageSize(section.get_W(), section.get_H());
+                    return;
+                } else
+                    this.api.change_DocSize(record.size[0], record.size[1]);
+            } else {
+                var win, props,
+                    me = this;
+                win = new DE.Views.PageSizeDialog({
+                    checkPageSize: _.bind(this.checkPageSize, this),
+                    handler: function(dlg, result) {
+                        if (result == 'ok') {
+                            props = dlg.getSettings();
+                            me.api.change_DocSize(props[0], props[1]);
+                            Common.NotificationCenter.trigger('edit:complete');
+                        }
+                    }
+                });
+                win.show();
+                win.setSettings(me.api.asc_GetSectionProps());
+            }
+
+            Common.NotificationCenter.trigger('edit:complete');
+        },
+
+        onPaperMarginsSelect: function(combo, record) {
+            this._state.pgmargins = undefined;
+            if (record.value !== -1) {
+                if (this.checkPageSize(undefined, undefined, record.size[1], record.size[3], record.size[0], record.size[2])) {
+                    this.onSectionProps(this.api.asc_GetSectionProps());
+                    return;
+                } else {
+                    var props = new Asc.CDocumentSectionProps();
+                    props.put_TopMargin(record.size[0]);
+                    props.put_LeftMargin(record.size[1]);
+                    props.put_BottomMargin(record.size[2]);
+                    props.put_RightMargin(record.size[3]);
+                    this.api.asc_SetSectionProps(props);
+                }
+            } else {
+                var win, props,
+                    me = this;
+                win = new DE.Views.PageMarginsDialog({
+                    api: me.api,
+                    handler: function(dlg, result) {
+                        if (result == 'ok') {
+                            props = dlg.getSettings();
+                            Common.localStorage.setItem("de-pgmargins-top", props.get_TopMargin());
+                            Common.localStorage.setItem("de-pgmargins-left", props.get_LeftMargin());
+                            Common.localStorage.setItem("de-pgmargins-bottom", props.get_BottomMargin());
+                            Common.localStorage.setItem("de-pgmargins-right", props.get_RightMargin());
+                            Common.NotificationCenter.trigger('margins:update', props);
+
+                            me.api.asc_SetSectionProps(props);
+                            Common.NotificationCenter.trigger('edit:complete');
+                        }
+                    }
+                });
+                win.show();
+                win.setSettings(me.api.asc_GetSectionProps());
+            }
+
+            Common.NotificationCenter.trigger('edit:complete');
+        },
+
+        onUpdateLastCustomMargins: function(props) {
+            this._state.lastmargins = props;
+            if (this.printSettings.isVisible()) {
+                var top = props ? props.get_TopMargin() : Common.localStorage.getItem("de-pgmargins-top"),
+                    left = props ? props.get_LeftMargin() : Common.localStorage.getItem("de-pgmargins-left"),
+                    bottom = props ? props.get_BottomMargin() : Common.localStorage.getItem("de-pgmargins-bottom"),
+                    right = props ? props.get_RightMargin() : Common.localStorage.getItem("de-pgmargins-right");
+                if ( top!==null && left!==null && bottom!==null && right!==null ) {
+                    var rec = this.printSettings.cmbPaperMargins.store.at(0);
+                    if (rec.get('value')===-2)
+                        rec.set('size', [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)]);
+                    else
+                        this.printSettings.cmbPaperMargins.store.unshift({ value: -2, displayValue: this.textMarginsLast, size: [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)]});
+                    this.printSettings.cmbPaperMargins.onResetItems();
+                }
+            }
+        },
+
+        onPaperOrientSelect: function(combo, record) {
+            this._state.pgorient = undefined;
+            if (this.api) {
+                this.api.change_PageOrient(record.value === Asc.c_oAscPageOrientation.PagePortrait);
+            }
+
+            Common.NotificationCenter.trigger('edit:complete');
+        },
+
+        checkPageSize: function(width, height, left, right, top, bottom) {
+            var section = this.api.asc_GetSectionProps();
+            (width===undefined) && (width = parseFloat(section.get_W().toFixed(4)));
+            (height===undefined) && (height = parseFloat(section.get_H().toFixed(4)));
+            (left===undefined) && (left = parseFloat(section.get_LeftMargin().toFixed(4)));
+            (right===undefined) && (right = parseFloat(section.get_RightMargin().toFixed(4)));
+            (top===undefined) && (top = parseFloat(section.get_TopMargin().toFixed(4)));
+            (bottom===undefined) && (bottom = parseFloat(section.get_BottomMargin().toFixed(4)));
+            var gutterLeft = section.get_GutterAtTop() ? 0 : parseFloat(section.get_Gutter().toFixed(4)),
+                gutterTop = section.get_GutterAtTop() ? parseFloat(section.get_Gutter().toFixed(4)) : 0;
+
+            var errmsg = null;
+            if (left + right + gutterLeft > width-12.7 )
+                errmsg = this.txtMarginsW;
+            else if (top + bottom + gutterTop > height-2.6 )
+                errmsg = this.txtMarginsH;
+            if (errmsg) {
+                Common.UI.warning({
+                    title: this.notcriticalErrorTitle,
+                    msg  : errmsg,
+                    callback: function() {
+                        Common.NotificationCenter.trigger('edit:complete');
+                    }
+                });
+                return true;
+            }
+        },
+
+        getPrintParams: function() {
+            return this.adjPrintParams;
+        },
+
+        onHidePrintMenu: function () {
+            if (this._isPreviewVisible) {
+                this.api.asc_closePrintPreview && this.api.asc_closePrintPreview();
+                this._isPreviewVisible = false;
+            }
+        },
+
+        onChangePreviewPage: function (next) {
+            var index = this._navigationPreview.currentPreviewPage;
+            if (next) {
+                index++;
+                index = Math.min(index, this._navigationPreview.pageCount - 1);
+            } else {
+                index--;
+                index = Math.max(index, 0);
+            }
+            this.api.goToPage(index);
+        },
+
+        onKeypressPageNumber: function (input, e) {
+            if (e.keyCode === Common.UI.Keys.RETURN) {
+                var box = this.printSettings.$el.find('#print-number-page'),
+                    edit = box.find('input[type=text]'), page = parseInt(edit.val());
+                if (!page || page > this._navigationPreview.pageCount || page < 0) {
+                    edit.select();
+                    this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+                    this.printSettings.txtNumberPage.checkValidate();
+                    return false;
+                }
+
+                box.focus(); // for IE
+
+                this.api.goToPage(page-1);
+                this.api.asc_enableKeyEvents(true);
+                return false;
+            }
+        },
+
+        onKeyupPageNumber: function (input, e) {
+            if (e.keyCode === Common.UI.Keys.ESC) {
+                var box = this.printSettings.$el.find('#print-number-page');
+                box.focus(); // for IE
+                this.api.asc_enableKeyEvents(true);
+                return false;
+            }
+        },
+
+        onBlurPageNumber: function () {
+            if (this.printSettings.txtNumberPage.getValue() != this._navigationPreview.currentPreviewPage + 1) {
+                this.printSettings.txtNumberPage.setValue(this._navigationPreview.currentPreviewPage + 1);
+                this.printSettings.txtNumberPage.checkValidate();
+            }
+        },
+
+        onPreviewWheel: function (e) {
+            if (e.ctrlKey) {
+                e.preventDefault();
+                e.stopImmediatePropagation();
+            }
+            var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
+            this.onChangePreviewPage(forward);
+        },
+
+        updateNavigationButtons: function (page, count) {
+            this._navigationPreview.currentPage = page;
+            this.printSettings.updateCurrentPage(page);
+            this._navigationPreview.pageCount = count;
+            this.printSettings.updateCountOfPages(count);
+            this.disableNavButtons();
+        },
+
+        disableNavButtons: function (force) {
+            if (force) {
+                this.printSettings.btnPrevPage.setDisabled(true);
+                this.printSettings.btnNextPage.setDisabled(true);
+                return;
+            }
+            var curPage = this._navigationPreview.currentPage,
+                pageCount = this._navigationPreview.pageCount;
+            this.printSettings.btnPrevPage.setDisabled(curPage < 1);
+            this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
+        },
+
+        onBtnPrint: function(print) {
+            this._isPrint = print;
+            if (this.printSettings.cmbRange.getValue()===-1 && this.printSettings.inputPages.checkValidate() !== true)  {
+                this.printSettings.inputPages.focus();
+                this.isInputFirstChange = true;
+                return;
+            }
+            if (this.printSettings.cmbRange.getValue()==='all')
+                this._state.firstPrintPage = 0;
+            else if (this.printSettings.cmbRange.getValue()==='current')
+                this._state.firstPrintPage = this._navigationPreview.currentPage;
+
+            var size = this.api.asc_getPageSize(this._state.firstPrintPage);
+            this.adjPrintParams.asc_setNativeOptions({
+                pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
+                paperSize: {
+                    w: size ? size['W'] : undefined,
+                    h: size ? size['H'] : undefined,
+                    preset: size ? this.findPagePreset(size['W'], size['H']) : undefined
+                },
+                paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
+            });
+
+            this.printSettings.menu.hide();
+            if ( print ) {
+                var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
+                opts.asc_setAdvancedOptions(this.adjPrintParams);
+                this.api.asc_Print(opts);
+            } else {
+                var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF);
+                opts.asc_setAdvancedOptions(this.adjPrintParams);
+                this.api.asc_DownloadAs(opts);
+            }
+        },
+
+        inputPagesChanging: function (input, value) {
+            this.isInputFirstChange && this.printSettings.inputPages.showError();
+            this.isInputFirstChange = false;
+
+            if (value.length<1)
+                this.printSettings.cmbRange.setValue('all');
+            else if (this.printSettings.cmbRange.getValue()!==-1)
+                this.printSettings.cmbRange.setValue(-1);
+        },
+
+        onApiLockDocumentProps: function() {
+            this._state.lock_doc = true;
+            this.SetDisabled();
+        },
+
+        onApiUnLockDocumentProps: function() {
+            this._state.lock_doc = false;
+            this.SetDisabled();
+        },
+
+        SetDisabled: function() {
+            if (this.printSettings.isVisible()) {
+                var disable = !this.mode.isEdit || this._state.lock_doc;
+                this.printSettings.cmbPaperSize.setDisabled(disable);
+                this.printSettings.cmbPaperMargins.setDisabled(disable);
+                this.printSettings.cmbPaperOrientation.setDisabled(disable);
+            }
+        },
+
+        txtCustom: 'Custom',
+        txtPrintRangeInvalid: 'Invalid print range',
+        textMarginsLast: 'Last Custom',
+        txtPrintRangeSingleRange: 'Enter either a single page number or a single page range (for example, 5-12). Or you can Print to PDF.'
+    }, DE.Controllers.Print || {}));
+});

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

@@ -214,7 +214,7 @@ define([
                 if (!this._settings[Common.Utils.documentSettingsType.MailMerge].locked) // lock MailMerge-InsertField, если хотя бы один объект locked
                     this._settings[Common.Utils.documentSettingsType.MailMerge].locked = value.get_Locked() || isProtected;
                 if (!this._settings[Common.Utils.documentSettingsType.Signature].locked) // lock Signature, если хотя бы один объект locked
-                    this._settings[Common.Utils.documentSettingsType.Signature].locked = value.get_Locked() || isProtected;
+                    this._settings[Common.Utils.documentSettingsType.Signature].locked = value.get_Locked();
             }
 
             if (control_props && control_props.get_FormPr() && this.rightmenu.formSettings) {
@@ -266,6 +266,9 @@ define([
             if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden)
                 this._settings[Common.Utils.documentSettingsType.MailMerge].panel.setLocked(this._settings[Common.Utils.documentSettingsType.MailMerge].locked);
 
+            if (!this._settings[Common.Utils.documentSettingsType.Signature].hidden)
+                this._settings[Common.Utils.documentSettingsType.Signature].panel.setProtected(isProtected);
+
             if (!this.rightmenu.minimizedMode || open) {
                 var active;
 
@@ -429,6 +432,7 @@ define([
             this._settings[type].hidden = disabled ? 1 : 0;
             this._settings[type].btn.setDisabled(disabled);
             this._settings[type].panel.setLocked(this._settings[type].locked);
+            this._settings[type].panel.setProtected(this._state.docProtection ? this._state.docProtection.isReadOnly || this._state.docProtection.isFormsOnly || this._state.docProtection.isCommentsOnly : false);
         },
 
         SetDisabled: function(disabled, allowMerge, allowSignature) {
@@ -464,7 +468,8 @@ define([
                 } else {
                     var selectedElements = this.api.getSelectedElements();
                     if (selectedElements.length > 0)
-                        this.onFocusObject(selectedElements, false, !Common.Utils.InternalSettings.get("de-hide-right-settings"));
+                        this.onFocusObject(selectedElements, false, !Common.Utils.InternalSettings.get("de-hide-right-settings") && // user didn't close panel
+                                                                                            !Common.Utils.InternalSettings.get("de-hidden-rightmenu")); // user didn't hide right menu
                 }
             }
         },
@@ -497,11 +502,17 @@ define([
             }
         },
 
-        onRightMenuHide: function (view, status) {
+        onRightMenuHide: function (view, status) { // status = true when show panel
             if (this.rightmenu) {
                 !status && this.rightmenu.clearSelection();
                 status ? this.rightmenu.show() : this.rightmenu.hide();
                 Common.localStorage.setBool('de-hidden-rightmenu', !status);
+                Common.Utils.InternalSettings.set("de-hidden-rightmenu", !status);
+                if (status) {
+                    var selectedElements = this.api.getSelectedElements();
+                    if (selectedElements.length > 0)
+                        this.onFocusObject(selectedElements, false, !Common.Utils.InternalSettings.get("de-hide-right-settings"));
+                }
             }
 
             Common.NotificationCenter.trigger('layout:changed', 'main');

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

@@ -124,7 +124,7 @@ define([
                 for (var l = 0; l < text.length; l++) {
                     var charCode = text.charCodeAt(l),
                         char = text.charAt(l);
-                    if (AscCommon.IsPunctuation(charCode) !== undefined || char.trim() === '') {
+                    if (AscCommon.IsPunctuation(charCode) || char.trim() === '') {
                         isPunctuation = true;
                         break;
                     }
@@ -333,7 +333,7 @@ define([
         onEndTextAroundSearch: function () {
             if (this.view) {
                 this._state.isStartedAddingResults = false;
-                this.view.$resultsContainer.scroller.update({alwaysVisibleY: true});
+                this.view.updateScrollers();
             }
         },
 

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

@@ -131,6 +131,10 @@ define([
                         var _main = this.getApplication().getController('Main');
                         _main.onPrint();
                     },
+                    'print-quick': function (opts) {
+                        var _main = this.getApplication().getController('Main');
+                        _main.onPrintQuick();
+                    },
                     'save': function (opts) {
                         this.api.asc_Save();
                     },
@@ -373,6 +377,7 @@ define([
             Common.Gateway.on('setmailmergerecipients',                 _.bind(this.setMailMergeRecipients, this));
             $('#id-toolbar-menu-new-control-color').on('click',         _.bind(this.onNewControlsColor, this));
             toolbar.listStylesAdditionalMenuItem.on('click', this.onMenuSaveStyle.bind(this));
+            toolbar.btnPrint.menu && toolbar.btnPrint.menu.on('item:click', _.bind(this.onPrintMenu, this));
 
             this.onSetupCopyStyleButton();
             this.onBtnChangeState('undo:disabled', toolbar.btnUndo, toolbar.btnUndo.isDisabled());
@@ -839,8 +844,8 @@ define([
                                                                                     toolbar.btnInsDateTime, toolbar.btnBlankPage, toolbar.btnInsertEquation, toolbar.btnInsertSymbol ])});
 
             this.toolbar.lockToolbar(Common.enumLock.inChart,       in_chart,           {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnInsertEquation])});
-            this.toolbar.lockToolbar(Common.enumLock.inSmartart,    in_smart_art,       {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle])});
+            this.toolbar.lockToolbar(Common.enumLock.inSmartart,    in_smart_art,       {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnContentControls])});
-            this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smart_art_internal,    {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnDecLeftOffset, toolbar.btnIncLeftOffset])});
+            this.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, in_smart_art_internal,    {array: toolbar.textOnlyControls.concat([toolbar.btnClearStyle, toolbar.btnDecLeftOffset, toolbar.btnIncLeftOffset, toolbar.btnContentControls])});
             this.toolbar.lockToolbar(Common.enumLock.inEquation,    in_equation,        {array: toolbar.btnsPageBreak.concat([toolbar.btnDropCap, toolbar.btnInsertTable, toolbar.btnBlankPage, toolbar.btnInsertShape,
                     toolbar.btnInsertText, toolbar.btnInsertTextArt, toolbar.btnInsertImage, toolbar.btnInsertSmartArt, toolbar.btnSuperscript, toolbar.btnSubscript, toolbar.btnEditHeader])});
 
@@ -1066,13 +1071,31 @@ define([
         },
 
         onPrint: function(e) {
-            if (this.api)
+            if (this.toolbar.btnPrint.options.printType == 'print') {
-                this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isOpera == true use asc_onPrintUrl event
+                Common.NotificationCenter.trigger('file:print', this.toolbar);
-
                 Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-
+            } else {
+                var _main = this.getApplication().getController('Main');
+                _main.onPrintQuick();
+            }
             Common.component.Analytics.trackEvent('Print');
             Common.component.Analytics.trackEvent('ToolBar', 'Print');
+
+        },
+
+        onPrintMenu: function (btn, e){
+            var oldType = this.toolbar.btnPrint.options.printType;
+            var newType = e.value;
+
+            if(newType != oldType) {
+                this.toolbar.btnPrint.changeIcon({
+                    next: e.options.iconClsForMainBtn,
+                    curr: this.toolbar.btnPrint.menu.items.filter(function(item){return item.value == oldType;})[0].options.iconClsForMainBtn
+                });
+                this.toolbar.btnPrint.updateHint([e.caption + e.options.platformKey]);
+                this.toolbar.btnPrint.options.printType = newType;
+            }
+            this.onPrint(e);
         },
 
         onSave: function(e) {
@@ -1784,15 +1807,11 @@ define([
                         handler: function(dlg, result) {
                             if (result == 'ok') {
                                 props = dlg.getSettings();
-                                var mnu = me.toolbar.btnPageMargins.menu.items[0];
-                                mnu.setVisible(true);
-                                mnu.setChecked(true);
-                                mnu.options.value = mnu.value = [props.get_TopMargin(), props.get_LeftMargin(), props.get_BottomMargin(), props.get_RightMargin()];
-                                $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
                                 Common.localStorage.setItem("de-pgmargins-top", props.get_TopMargin());
                                 Common.localStorage.setItem("de-pgmargins-left", props.get_LeftMargin());
                                 Common.localStorage.setItem("de-pgmargins-bottom", props.get_BottomMargin());
                                 Common.localStorage.setItem("de-pgmargins-right", props.get_RightMargin());
+                                Common.NotificationCenter.trigger('margins:update', props);
 
                                 me.api.asc_SetSectionProps(props);
                                 Common.NotificationCenter.trigger('edit:complete', me.toolbar);

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

@@ -71,7 +71,8 @@ define([
             this.addListeners({
                 'FileMenu': {
                     'menu:hide': me.onFileMenu.bind(me, 'hide'),
-                    'menu:show': me.onFileMenu.bind(me, 'show')
+                    'menu:show': me.onFileMenu.bind(me, 'show'),
+                    'settings:apply': me.applySettings.bind(me)
                 },
                 'Toolbar': {
                     'render:before' : function (toolbar) {
@@ -79,6 +80,11 @@ define([
                         toolbar.setExtra('right', me.header.getPanel('right', config));
                         if (!config.isEdit || config.customization && !!config.customization.compactHeader)
                             toolbar.setExtra('left', me.header.getPanel('left', config));
+
+                        var value = Common.localStorage.getBool("de-settings-quick-print-button", true);
+                        Common.Utils.InternalSettings.set("de-settings-quick-print-button", value);
+                        if (me.header && me.header.btnPrintQuick)
+                            me.header.btnPrintQuick[value ? 'show' : 'hide']();
                     },
                     'view:compact'  : function (toolbar, state) {
                         me.viewport.vlayout.getItem('toolbar').height = state ?
@@ -100,6 +106,8 @@ define([
                     'print:disabled' : function (state) {
                         if ( me.header.btnPrint )
                             me.header.btnPrint.setDisabled(state);
+                        if ( me.header.btnPrintQuick )
+                            me.header.btnPrintQuick.setDisabled(state);
                     },
                     'save:disabled' : function (state) {
                         if ( me.header.btnSave )
@@ -255,12 +263,21 @@ define([
             me.header.lockHeaderBtns( 'users', _need_disable );
         },
 
+        applySettings: function () {
+            var value = Common.localStorage.getBool("de-settings-quick-print-button", true);
+            Common.Utils.InternalSettings.set("de-settings-quick-print-button", value);
+            if (this.header && this.header.btnPrintQuick)
+                this.header.btnPrintQuick[value ? 'show' : 'hide']();
+        },
+
         onApiCoAuthoringDisconnect: function(enableDownload) {
             if (this.header) {
                 if (this.header.btnDownload && !enableDownload)
                     this.header.btnDownload.hide();
                 if (this.header.btnPrint && !enableDownload)
                     this.header.btnPrint.hide();
+                if (this.header.btnPrintQuick && !enableDownload)
+                    this.header.btnPrintQuick.hide();
                 if (this.header.btnEdit)
                     this.header.btnEdit.hide();
                 this.header.lockHeaderBtns( 'rename-user', true);
@@ -283,8 +300,9 @@ define([
                 return;
             }
             if (!this.searchBar) {
-                var isVisible = leftMenu && leftMenu.leftMenu && leftMenu.leftMenu.isVisible();
+                var hideLeftPanel = this.appConfig.canBrandingExt &&
-                this.searchBar = new Common.UI.SearchBar( !isVisible ? {
+                    (!Common.UI.LayoutManager.isElementVisible('leftMenu') || this.appConfig.customization && this.appConfig.customization.leftMenu === false);
+                this.searchBar = new Common.UI.SearchBar( hideLeftPanel ? {
                     showOpenPanel: false,
                     width: 303
                 } : {});

apps/documenteditor/main/app/template/FileMenu.template

@@ -8,6 +8,7 @@
     <li id="fm-btn-save-copy" class="fm-btn"></li>
     <li id="fm-btn-save-desktop" class="fm-btn"></li>
     <li id="fm-btn-print" class="fm-btn"></li>
+    <li id="fm-btn-print-with-preview" class="fm-btn"></li>
     <li id="fm-btn-rename" class="fm-btn"></li>
     <li id="fm-btn-protect" class="fm-btn"></li>
     <li class="devider"></li>
@@ -34,4 +35,5 @@
     <div id="panel-settings" class="content-box"></div>
     <div id="panel-help" class="content-box"></div>
     <div id="panel-protect" class="content-box"></div>
+    <div id="panel-print" class="content-box"></div>
 </div>

apps/documenteditor/main/app/template/StatusBar.template

@@ -7,6 +7,10 @@
             <div id="status-goto-page" style="display:inline-block;"></div>
         </div>
     </div>
+    <div class="separator short"></div>
+    <div class="status-group">
+        <div id="slot-status-btn-info" style="display: inline-block;" class="margin-top-small"></div>
+    </div>
     <div class="status-group" style="width:100%; text-align:center;">
         <label id="label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
     </div>

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

@@ -357,7 +357,7 @@ define([
             });
             this.lockedControls.push(this.btnLeft);
             this.btnLeft.on('click', _.bind(function() {
-                this.spnX.setValue(this.spnX.getNumberValue() - 10);
+                this.spnX.setValue(Math.ceil((this.spnX.getNumberValue() - 10)/10)*10);
             }, this));
 
             this.btnRight = new Common.UI.Button({
@@ -370,7 +370,7 @@ define([
             });
             this.lockedControls.push(this.btnRight);
             this.btnRight.on('click', _.bind(function() {
-                this.spnX.setValue(this.spnX.getNumberValue() + 10);
+                this.spnX.setValue(Math.floor((this.spnX.getNumberValue() + 10)/10)*10);
             }, this));
 
             this.spnY = new Common.UI.MetricSpinner({
@@ -399,7 +399,7 @@ define([
             });
             this.lockedControls.push(this.btnUp);
             this.btnUp.on('click', _.bind(function() {
-                this.spnY.setValue(this.spnY.getNumberValue() - 10);
+                this.spnY.setValue(Math.ceil((this.spnY.getNumberValue() - 10)/10)*10);
             }, this));
 
             this.btnDown= new Common.UI.Button({
@@ -412,7 +412,7 @@ define([
             });
             this.lockedControls.push(this.btnDown);
             this.btnDown.on('click', _.bind(function() {
-                this.spnY.setValue(this.spnY.getNumberValue() + 10);
+                this.spnY.setValue(Math.floor((this.spnY.getNumberValue() + 10)/10)*10);
             }, this));
 
             this.spnPerspective = new Common.UI.MetricSpinner({
@@ -441,7 +441,7 @@ define([
             });
             this.lockedControls.push(this.btnNarrow);
             this.btnNarrow.on('click', _.bind(function() {
-                this.spnPerspective.setValue(this.spnPerspective.getNumberValue() - 5);
+                this.spnPerspective.setValue(Math.ceil((this.spnPerspective.getNumberValue() - 5)/5)*5);
             }, this));
 
             this.btnWiden= new Common.UI.Button({
@@ -454,7 +454,7 @@ define([
             });
             this.lockedControls.push(this.btnWiden);
             this.btnWiden.on('click', _.bind(function() {
-                this.spnPerspective.setValue(this.spnPerspective.getNumberValue() + 5);
+                this.spnPerspective.setValue(Math.floor((this.spnPerspective.getNumberValue() + 5)/5)*5);
             }, this));
 
             this.chRightAngle = new Common.UI.CheckBox({

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

@@ -205,7 +205,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
             // date picker
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
                 { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
-                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }, { value: 0x0404 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
                 item.displayValue = langinfo[1];

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

@@ -90,7 +90,7 @@ define([
 
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
                 { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
-                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
+                { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }, { value: 0x0404 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);
                 item.displayValue = langinfo[1];

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

@@ -141,7 +141,8 @@ define([
             txtDocProtectedComment: 'Document is protected.<br>You may only insert comments to this document.',
             txtDocProtectedForms: 'Document is protected.<br>You may only fill in forms in this document.',
             hintProtectDoc: 'Protect document',
-            txtDocUnlockDescription: 'Enter a password to unprotect document'
+            txtDocUnlockDescription: 'Enter a password to unprotect document',
+            txtUnlockTitle: 'Unprotect Document'
         }
     }()), DE.Views.DocProtection || {}));
 });

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

@@ -738,9 +738,9 @@ define([
                     me.menuImgPrint.setDisabled(!cancopy);
 
                     var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
-                    me.menuImgAccept.setVisible(!lockreview);
+                    me.menuImgAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    me.menuImgReject.setVisible(!lockreview);
+                    me.menuImgReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    menuImgReviewSeparator.setVisible(!lockreview);
+                    menuImgReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
 
                     var signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
                         isInSign = !!signGuid;
@@ -1313,9 +1313,9 @@ define([
                     me.menuTablePrint.setDisabled(!cancopy);
 
                     var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
-                    me.menuTableAccept.setVisible(!lockreview);
+                    me.menuTableAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    me.menuTableReject.setVisible(!lockreview);
+                    me.menuTableReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    menuTableReviewSeparator.setVisible(!lockreview);
+                    menuTableReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
 
                     // bullets & numbering
                     var listId = me.api.asc_GetCurrentNumberingId(),
@@ -1939,9 +1939,9 @@ define([
                     me.menuParaPrint.setDisabled(!cancopy);
 
                     var lockreview = Common.Utils.InternalSettings.get("de-accept-reject-lock");
-                    me.menuParaAccept.setVisible(!lockreview);
+                    me.menuParaAccept.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    me.menuParaReject.setVisible(!lockreview);
+                    me.menuParaReject.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
-                    menuParaReviewSeparator.setVisible(!lockreview);
+                    menuParaReviewSeparator.setVisible(me.mode.canReview && !me.mode.isReviewOnly && !lockreview);
 
                     // spellCheck
                     var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false);
@@ -2931,7 +2931,7 @@ define([
 
         SetDisabled: function(state, canProtect, fillFormMode) {
             this._isDisabled = state;
-            this._canProtect = canProtect;
+            this._canProtect =  state ? canProtect : true;
             this._fillFormMode = state ? fillFormMode : false;
         },
 

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

@@ -69,7 +69,8 @@ define([
                         if (item.options.action === 'help') {
                             if ( panel.noHelpContents === true && navigator.onLine ) {
                                 this.fireEvent('item:click', [this, 'external-help', true]);
-                                !!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
+                                const helpCenter = Common.Utils.InternalSettings.get('url-help-center');
+                                !!helpCenter && window.open(helpCenter, '_blank');
                                 return;
                             }
                         }
@@ -161,6 +162,17 @@ define([
                 dataHintOffset: [2, 14]
             });
 
+            this.miPrintWithPreview = new Common.UI.MenuItem({
+                el      : $markup.elementById('#fm-btn-print-with-preview'),
+                action  : 'printpreview',
+                caption : this.btnPrintCaption,
+                canFocused: false,
+                dataHint: 1,
+                dataHintDirection: 'left-top',
+                dataHintOffset: [2, 14],
+                dataHintTitle: 'P'
+            });
+
             this.miPrint = new Common.UI.MenuItem({
                 el      : $markup.elementById('#fm-btn-print'),
                 action  : 'print',
@@ -295,6 +307,7 @@ define([
                 this.miSaveCopyAs,
                 this.miSaveAs,
                 this.miPrint,
+                this.miPrintWithPreview,
                 this.miRename,
                 this.miProtect,
                 this.miRecent,
@@ -385,7 +398,8 @@ define([
             this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
             this.miSave[this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') ?'show':'hide']();
             this.miEdit[!this.mode.isEdit && this.mode.canEdit && this.mode.canRequestEditRights ?'show':'hide']();
-            this.miPrint[this.mode.canPrint?'show':'hide']();
+            this.miPrint[this.mode.canPrint && !this.mode.canPreviewPrint ?'show':'hide']();
+            this.miPrintWithPreview[this.mode.canPreviewPrint?'show':'hide']();
             this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
             this.miProtect[this.mode.canProtect ?'show':'hide']();
             separatorVisible = (this.mode.canDownload || this.mode.canDownloadOrigin || this.mode.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || this.mode.canProtect ||
@@ -467,6 +481,12 @@ define([
                 this.panels['help'].setLangConfig(this.mode.lang);
             }
 
+            if (this.mode.canPreviewPrint) {
+                var printPanel = DE.getController('Print').getView('PrintWithPreview');
+                printPanel.menu = this;
+                !this.panels['printpreview'] && (this.panels['printpreview'] = printPanel.render(this.$el.find('#panel-print')));
+            }
+
             if ( Common.Controllers.Desktop.isActive() ) {
                 $('<li id="fm-btn-local-open" class="fm-btn"/>').insertAfter($('#fm-btn-recent', this.$el));
                 this.items.push(

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

@@ -341,6 +341,12 @@ define([
                 '<tr>',
                     '<td colspan="2"><div id="fms-chb-use-alt-key"></div></td>',
                 '</tr>',
+                '<tr class="quick-print">',
+                    '<td colspan="2"><div style="display: flex;"><div id="fms-chb-quick-print"></div>',
+                    '<span style ="display: flex; flex-direction: column;"><label><%= scope.txtQuickPrint %></label>',
+                    '<label class="comment-text"><%= scope.txtQuickPrintTip %></label></span></div>',
+                    '</td>',
+                '</tr>',
                 '<tr class="themes">',
                     '<td><label><%= scope.strTheme %></label></td>',
                     '<td>',
@@ -699,6 +705,17 @@ define([
                 })).on('click', _.bind(me.applySettings, me));
             });
 
+            this.chQuickPrint = new Common.UI.CheckBox({
+                el: $markup.findById('#fms-chb-quick-print'),
+                labelText: '',
+                dataHint: '2',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
+            });
+            this.chQuickPrint.$el.parent().on('click', function (){
+                me.chQuickPrint.setValue(!me.chQuickPrint.isChecked());
+            });
+
             this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
             this.pnlApply = $markup.find('.fms-flex-apply').addBack().filter('.fms-flex-apply');
             this.pnlTable = this.pnlSettings.find('table');
@@ -763,9 +780,9 @@ define([
             $('tr.view-review', this.el)[mode.canViewReview ? 'show' : 'hide']();
             $('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
             $('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide']();
-
             /** coauthoring end **/
 
+            $('tr.quick-print', this.el)[mode.canQuickPrint && !(mode.customization && mode.customization.compactHeader && mode.isEdit) ? 'show' : 'hide']();
             $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
             if ( !Common.UI.Themes.available() ) {
                 $('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -836,6 +853,7 @@ define([
             this.cmbMacros.setValue(item ? item.get('value') : 0);
 
             this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button"));
+            this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("de-settings-quick-print-button"));
 
             var data = [];
             for (var t in Common.UI.Themes.map()) {
@@ -905,6 +923,7 @@ define([
             }
 
             Common.localStorage.setItem("de-settings-paste-button", this.chPaste.isChecked() ? 1 : 0);
+            Common.localStorage.setBool("de-settings-quick-print-button", this.chQuickPrint.isChecked());
 
             Common.localStorage.save();
 
@@ -1002,7 +1021,9 @@ define([
         txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make',
         strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
         strIgnoreWordsWithNumbers: 'Ignore words with numbers',
-        strShowOthersChanges: 'Show changes from other users'
+        strShowOthersChanges: 'Show changes from other users',
+        txtQuickPrint: 'Show the Quick Print button in the editor header',
+        txtQuickPrintTip: 'The document will be printed on the last selected or default printer'
     }, DE.Views.FileMenuPanels.Settings || {}));
 
     DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -2020,14 +2041,6 @@ define([
             this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
             this.openUrl = null;
 
-            if ( !Common.Utils.isIE ) {
-                if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_DE}}') ) {
-                    const _url_obj = new URL('{{HELP_CENTER_WEB_DE}}');
-                    _url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
-                    this.urlHelpCenter = _url_obj.toString();
-                }
-            }
-
             this.en_data = [
                 {"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Document Editor user interface", "headername": "Program Interface"},
                 {"src": "ProgramInterface/FileTab.htm", "name": "File tab"},
@@ -2147,22 +2160,10 @@ define([
                             me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
                             store.url = 'resources/help/{{DEFAULT_LANG}}/Contents.json';
                             store.fetch(config);
-                        } else {
-                            if ( Common.Controllers.Desktop.isActive() ) {
-                                if ( store.contentLang === '{{DEFAULT_LANG}}' || !Common.Controllers.Desktop.helpUrl() ) {
-                                    me.noHelpContents = true;
-                                    me.iFrame.src = '../../common/main/resources/help/download.html';
-                                } else {
-                                    store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang;
-                                    me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + store.contentLang + '/';
-                                    store.url = me.urlPref + 'Contents.json';
-                                    store.fetch(config);
-                                }
                         } else {
                             me.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
                             store.reset(me.en_data);
                         }
-                        }
                     },
                     success: function () {
                         var rec = me.openUrl ? store.find(function(record){
@@ -2175,10 +2176,22 @@ define([
                         me.onSelectItem(me.openUrl ? me.openUrl : rec.get('src'));
                     }
                 };
+
+                if ( Common.Controllers.Desktop.isActive() ) {
+                    if ( !Common.Controllers.Desktop.isHelpAvailable() ) {
+                        me.noHelpContents = true;
+                        me.iFrame.src = '../../common/main/resources/help/download.html';
+                    } else {
+                        me.urlPref = Common.Controllers.Desktop.helpUrl() + '/';
+                        store.url = me.urlPref + 'Contents.json';
+                        store.fetch(config);
+                    }
+                } else {
                     store.url = 'resources/help/' + lang + '/Contents.json';
                     store.fetch(config);
                     this.urlPref = 'resources/help/' + lang + '/';
                 }
+            }
         },
 
         show: function (url) {
@@ -2380,4 +2393,340 @@ define([
 
     }, DE.Views.FileMenuPanels.ProtectDoc || {}));
 
+    DE.Views.PrintWithPreview = Common.UI.BaseView.extend(_.extend({
+        el: '#panel-print',
+        menu: undefined,
+
+        template: _.template([
+            '<div style="width:100%; height:100%; position: relative;">',
+                '<div id="id-print-settings" class="no-padding">',
+                    '<div class="print-settings">',
+                        '<div class="flex-settings ps-container oo settings-container">',
+                            '<table style="width: 100%;">',
+                            '<tbody>',
+                                '<tr><td><label class="header"><%= scope.txtPrintRange %></label></td></tr>',
+                                '<tr><td class="padding-small"><div id="print-combo-range" style="width: 248px;"></div></td></tr>',
+                                '<tr><td class="padding-large">',
+                                    '<table style="width: 100%;"><tbody><tr>',
+                                        '<td><%= scope.txtPages %></td><td><div id="print-txt-pages" style="width: 100%;padding-left: 5px;"></div></td>',
+                                    '</tr></tbody></table>',
+                                '</td></tr>',
+                                '<tr><td><label class="header"><%= scope.txtPageSize %></label></td></tr>',
+                                '<tr><td class="padding-large"><div id="print-combo-pages" style="width: 248px;"></div></td></tr>',
+                                '<tr><td><label class="header"><%= scope.txtPageOrientation %></label></td></tr>',
+                                '<tr><td class="padding-large"><div id="print-combo-orient" style="width: 150px;"></div></td></tr>',
+                                '<tr><td><label class="header"><%= scope.txtMargins %></label></td></tr>',
+                                '<tr><td class="padding-large"><div id="print-combo-margins" style="width: 248px;"></div></td></tr>',
+                                '<tr class="fms-btn-apply"><td>',
+                                    '<div class="footer justify">',
+                                        '<button id="print-btn-print" class="btn normal dlg-btn primary" result="print" style="width: 96px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtPrint %></button>',
+                                        '<button id="print-btn-print-pdf" class="btn normal dlg-btn" result="pdf" style="width: 96px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtPrintPdf %></button>',
+                                    '</div>',
+                                '</td></tr>',
+                            '</tbody>',
+                            '</table>',
+                        '</div>',
+                    '</div>',
+                '</div>',
+                '<div id="print-preview-box" style="position: absolute; left: 280px; top: 0; right: 0; bottom: 0;" class="no-padding">',
+                    '<div id="print-preview"></div>',
+                    '<div id="print-navigation">',
+                        '<div id="print-prev-page" style="display: inline-block; margin-right: 4px;"></div>',
+                        '<div id="print-next-page" style="display: inline-block;"></div>',
+                        '<div class="page-number">',
+                            '<label><%= scope.txtPage %></label>',
+                            '<div id="print-number-page"></div>',
+                            '<label id="print-count-page"><%= scope.txtOf %></label>',
+                        '</div>',
+                    '</div>',
+                '</div>',
+            '</div>'
+        ].join('')),
+
+        initialize: function(options) {
+            Common.UI.BaseView.prototype.initialize.call(this,arguments);
+
+            this.menu = options.menu;
+
+            this._initSettings = true;
+        },
+
+        render: function(node) {
+            var me = this;
+
+            var $markup = $(this.template({scope: this}));
+
+            this.cmbRange = new Common.UI.ComboBox({
+                el: $markup.findById('#print-combo-range'),
+                menuStyle: 'min-width: 248px;max-height: 280px;',
+                editable: false,
+                takeFocusOnClose: true,
+                cls: 'input-group-nr',
+                data: [
+                    { value: 'all', displayValue: this.txtAllPages },
+                    { value: 'current', displayValue: this.txtCurrentPage },
+                    { value: -1, displayValue: this.txtCustomPages }
+                ],
+                dataHint: '2',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.cmbRange.setValue('all');
+
+            this.inputPages = new Common.UI.InputField({
+                el: $markup.findById('#print-txt-pages'),
+                allowBlank: true,
+                validateOnChange: true,
+                validateOnBlur: false,
+                maskExp: /[0-9,\-]/,
+                dataHint: '2',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
+            });
+
+            this.cmbPaperSize = new Common.UI.ComboBox({
+                el: $markup.findById('#print-combo-pages'),
+                menuStyle: 'max-height: 280px; min-width: 248px;',
+                editable: false,
+                takeFocusOnClose: true,
+                cls: 'input-group-nr',
+                data: [
+                    { value: 0, displayValue:'US Letter (21,59 cm x 27,94 cm)', caption: 'US Letter', size: [215.9, 279.4]},
+                    { value: 1, displayValue:'US Legal (21,59 cm x 35,56 cm)', caption: 'US Legal', size: [215.9, 355.6]},
+                    { value: 2, displayValue:'A4 (21 cm x 29,7 cm)', caption: 'A4', size: [210, 297]},
+                    { value: 3, displayValue:'A5 (14,8 cm x 21 cm)', caption: 'A5', size: [148, 210]},
+                    { value: 4, displayValue:'B5 (17,6 cm x 25 cm)', caption: 'B5', size: [176, 250]},
+                    { value: 5, displayValue:'Envelope #10 (10,48 cm x 24,13 cm)', caption: 'Envelope #10', size: [104.8, 241.3]},
+                    { value: 6, displayValue:'Envelope DL (11 cm x 22 cm)', caption: 'Envelope DL', size: [110, 220]},
+                    { value: 7, displayValue:'Tabloid (27,94 cm x 43,18 cm)', caption: 'Tabloid', size: [279.4, 431.8]},
+                    { value: 8, displayValue:'A3 (29,7 cm x 42 cm)', caption: 'A3', size: [297, 420]},
+                    { value: 9, displayValue:'Tabloid Oversize (30,48 cm x 45,71 cm)', caption: 'Tabloid Oversize', size: [304.8, 457.1]},
+                    { value: 10, displayValue:'ROC 16K (19,68 cm x 27,3 cm)', caption: 'ROC 16K', size: [196.8, 273]},
+                    { value: 11, displayValue:'Envelope Choukei 3 (11,99 cm x 23,49 cm)', caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
+                    { value: 12, displayValue:'Super B/A3 (33,02 cm x 48,25 cm)', caption: 'Super B/A3', size: [330.2, 482.5]},
+                    { value: 13, displayValue:'A4 (84,1 cm x 118,9 cm)', caption: 'A0', size: [841, 1189]},
+                    { value: 14, displayValue:'A4 (59,4 cm x 84,1 cm)', caption: 'A1', size: [594, 841]},
+                    { value: 16, displayValue:'A4 (42 cm x 59,4 cm)', caption: 'A2', size: [420, 594]},
+                    { value: 17, displayValue:'A4 (10,5 cm x 14,8 cm)', caption: 'A6', size: [105, 148]},
+                    { value: -1, displayValue: this.txtCustom, caption: this.txtCustom, size: []}
+                ],
+                dataHint: '2',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+
+            this.cmbPaperOrientation = new Common.UI.ComboBox({
+                el          : $markup.findById('#print-combo-orient'),
+                menuStyle   : 'min-width: 150px;',
+                editable    : false,
+                takeFocusOnClose: true,
+                cls         : 'input-group-nr',
+                data        : [
+                    { value: Asc.c_oAscPageOrientation.PagePortrait, displayValue: this.txtPortrait },
+                    { value: Asc.c_oAscPageOrientation.PageLandscape, displayValue: this.txtLandscape }
+                ],
+                dataHint: '2',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+
+            this.cmbPaperMargins = new Common.UI.ComboBox({
+                el: $markup.findById('#print-combo-margins'),
+                menuStyle: 'max-height: 280px; min-width: 248px;',
+                editable: false,
+                takeFocusOnClose: true,
+                cls: 'input-group-nr',
+                data: [
+                    { value: 0, displayValue: this.textMarginsNormal, size: [20, 30, 20, 15]},
+                    { value: 1, displayValue: this.textMarginsUsNormal, size: [25.4, 25.4, 25.4, 25.4]},
+                    { value: 2, displayValue: this.textMarginsNarrow, size: [12.7, 12.7, 12.7, 12.7]},
+                    { value: 3, displayValue: this.textMarginsModerate, size: [25.4, 19.1, 25.4, 19.1]},
+                    { value: 4, displayValue: this.textMarginsWide, size: [25.4, 50.8, 25.4, 50.8]},
+                    { value: -1, displayValue: this.txtCustom, size: null}
+                ],
+                itemsTemplate: _.template([
+                    '<% _.each(items, function(item) { %>',
+                        '<li id="<%= item.id %>" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem">',
+                        '<div><b><%= scope.getDisplayValue(item) %></b></div>',
+                        '<% if (item.size !== null) { %><div style="display: inline-block;margin-right: 20px;min-width: 80px;">' +
+                        '<label style="display: block;">' + this.txtTop + ': <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.size[0]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
+                        '<label style="display: block;">' + this.txtLeft + ': <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.size[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div><div style="display: inline-block;">' +
+                        '<label style="display: block;">' + this.txtBottom + ': <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.size[2]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label>' +
+                        '<label style="display: block;">' + this.txtRight + ': <%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.size[3]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></label></div>' +
+                        '<% } %>',
+                    '<% }); %>'
+                ].join('')),
+                dataHint: '2',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+
+            this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
+            this.pnlTable = $(this.pnlSettings.find('table')[0]);
+            this.trApply = $markup.find('.fms-btn-apply');
+
+            this.btnPrint = new Common.UI.Button({
+                el: $markup.findById('#print-btn-print')
+            });
+            this.btnPrintPdf = new Common.UI.Button({
+                el: $markup.findById('#print-btn-print-pdf')
+            });
+
+            this.btnPrevPage = new Common.UI.Button({
+                parentEl: $markup.findById('#print-prev-page'),
+                cls: 'btn-prev-page',
+                iconCls: 'arrow',
+                dataHint: '2',
+                dataHintDirection: 'top'
+            });
+
+            this.btnNextPage = new Common.UI.Button({
+                parentEl: $markup.findById('#print-next-page'),
+                cls: 'btn-next-page',
+                iconCls: 'arrow',
+                dataHint: '2',
+                dataHintDirection: 'top'
+            });
+
+            this.countOfPages = $markup.findById('#print-count-page');
+
+            this.txtNumberPage = new Common.UI.InputField({
+                el: $markup.findById('#print-number-page'),
+                allowBlank: true,
+                validateOnChange: true,
+                style: 'width: 50px;',
+                maskExp: /[0-9]/,
+                validation: function(value) {
+                    if (/(^[0-9]+$)/.test(value)) {
+                        value = parseInt(value);
+                        if (undefined !== value && value > 0 && value <= me.pageCount)
+                            return true;
+                    }
+
+                    return me.txtPageNumInvalid;
+                },
+                dataHint: '2',
+                dataHintDirection: 'left',
+                dataHintOffset: 'small'
+            });
+
+           this.$el = $(node).html($markup);
+            this.$previewBox = $('#print-preview-box');
+
+            if (_.isUndefined(this.scroller)) {
+                this.scroller = new Common.UI.Scroller({
+                    el: this.pnlSettings,
+                    suppressScrollX: true,
+                    alwaysVisibleY: true
+                });
+            }
+
+            Common.NotificationCenter.on({
+                'window:resize': function() {
+                    me.isVisible() && me.updateScroller();
+                }
+            });
+
+            this.updateMetricUnit();
+
+            this.fireEvent('render:after', this);
+
+            return this;
+        },
+
+        show: function() {
+            Common.UI.BaseView.prototype.show.call(this,arguments);
+            if (this._initSettings) {
+                this.updateMetricUnit();
+                this._initSettings = false;
+            }
+            this.updateScroller();
+            this.fireEvent('show', this);
+        },
+
+        updateScroller: function() {
+            if (this.scroller) {
+                Common.UI.Menu.Manager.hideAll();
+                var scrolled = this.$el.height()< this.pnlTable.height();
+                this.pnlSettings.css('overflow', scrolled ? 'hidden' : 'visible');
+                this.scroller.update();
+            }
+        },
+
+        setMode: function(mode) {
+            this.mode = mode;
+        },
+
+        setApi: function(api) {
+
+        },
+
+        updateMetricUnit: function() {
+            if (!this.cmbPaperSize) return;
+            var store = this.cmbPaperSize.store;
+            for (var i=0; i<store.length-1; i++) {
+                var item = store.at(i),
+                    size = item.get('size'),
+                    pagewidth = size[0],
+                    pageheight = size[1];
+
+                item.set('displayValue', item.get('caption') + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(pagewidth).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
+                    parseFloat(Common.Utils.Metric.fnRecalcFromMM(pageheight).toFixed(2)) + ' ' + Common.Utils.Metric.getCurrentMetricName() + ')');
+            }
+            this.cmbPaperSize.onResetItems();
+            this.cmbPaperMargins.onResetItems();
+        },
+
+        isVisible: function() {
+            return (this.$el || $(this.el)).is(":visible");
+        },
+
+        setRange: function(value) {
+            this.cmbRange.setValue(value);
+        },
+
+        getRange: function() {
+            return this.cmbRange.getValue();
+        },
+
+        updateCountOfPages: function (count) {
+            this.countOfPages.text(
+                Common.Utils.String.format(this.txtOf, count)
+            );
+            this.pageCount = count;
+        },
+
+        updateCurrentPage: function (index) {
+            this.txtNumberPage.setValue(index + 1);
+        },
+
+        txtPrint: 'Print',
+        txtPrintPdf: 'Print to PDF',
+        txtPrintRange: 'Print range',
+        txtCurrentPage: 'Current page',
+        txtAllPages: 'All pages',
+        txtSelection: 'Selection',
+        txtCustomPages: 'Custom print',
+        txtPageSize: 'Page size',
+        txtPageOrientation: 'Page orientation',
+        txtPortrait: 'Portrait',
+        txtLandscape: 'Landscape',
+        txtCustom: 'Custom',
+        txtMargins: 'Margins',
+        txtTop: 'Top',
+        txtBottom: 'Bottom',
+        txtLeft: 'Left',
+        txtRight: 'Right',
+        txtPage: 'Page',
+        txtOf: 'of {0}',
+        txtPageNumInvalid: 'Page number invalid',
+        txtPages: 'Pages',
+        textMarginsLast: 'Last Custom',
+        textMarginsNormal: 'Normal',
+        textMarginsUsNormal: 'US Normal',
+        textMarginsNarrow: 'Narrow',
+        textMarginsModerate: 'Moderate',
+        textMarginsWide: 'Wide'
+
+    }, DE.Views.PrintWithPreview || {}));
 });

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

@@ -198,7 +198,7 @@ define([
                     this.btnTextField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon ' + (isfixed ? 'btn-fixed-field' : 'btn-text-field'),
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnText,
                         fieldType: isfixed ? 'fixed' : 'inline',
                         split: true,
@@ -212,7 +212,7 @@ define([
                     this.btnComboBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-combo-box',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnComboBox,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -223,7 +223,7 @@ define([
                     this.btnDropDown = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-dropdown',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnDropDown,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -234,7 +234,7 @@ define([
                     this.btnCheckBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-checkbox',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnCheckBox,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -245,7 +245,7 @@ define([
                     this.btnRadioBox = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-radio-button',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnRadioBox,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -256,7 +256,7 @@ define([
                     this.btnImageField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-insertimage',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.complexForm, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.complexForm, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnImage,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -278,7 +278,7 @@ define([
                     this.btnEmailField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-email',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnEmail,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -289,7 +289,7 @@ define([
                     this.btnPhoneField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-phone',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnPhone,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -300,7 +300,7 @@ define([
                     this.btnZipCode = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-zip-code',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capZipCode,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -311,7 +311,7 @@ define([
                     this.btnCreditCard = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-credit-card',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capCreditCard,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -322,7 +322,7 @@ define([
                     this.btnDateTime = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-datetime',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capDateTime,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
@@ -333,7 +333,7 @@ define([
                     this.btnComplexField = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon complex-field',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.complexForm, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.controlPlain, _set.contentLock, _set.complexForm, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: this.capBtnComplex,
                         dataHint: '1',
                         dataHintDirection: 'bottom',

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

@@ -114,7 +114,10 @@ define([
                 maxLength: 15,
                 validateOnBlur: false,
                 repeatInput: this.repeatPwd,
-                showPwdOnClick: true
+                showPwdOnClick: true,
+                validation  : function(value) {
+                    return (value.length>15) ? me.txtLimit : true;
+                }
             });
 
             this.rbView = new Common.UI.RadioBox({
@@ -146,6 +149,10 @@ define([
                 value: Asc.c_oAscEDocProtect.Comments
             });
 
+            this.btnOk = new Common.UI.Button({
+                el: this.$window.find('.primary')
+            });
+
             this.afterRender();
         },
 
@@ -171,8 +178,11 @@ define([
         },
 
         _handleInput: function(state) {
+            if (state === 'ok' && this.btnOk.isDisabled())
+                return;
+
             if (this.handler) {
-                if (state == 'ok') {
+                if (state === 'ok') {
                     if (this.inputPwd.checkValidate() !== true)  {
                         this.inputPwd.focus();
                         return;
@@ -208,6 +218,10 @@ define([
                 return Asc.c_oAscEDocProtect.Comments;
         },
 
+        SetDisabled: function(disabled) {
+            this.btnOk.setDisabled(disabled);
+        },
+
         txtPassword : "Password",
         txtRepeat: 'Repeat password',
         txtOptional: 'optional',
@@ -219,7 +233,8 @@ define([
         textView: 'No changes (Read only)',
         textForms: 'Filling forms',
         textReview: 'Tracked changes',
-        textComments: 'Comments'
+        textComments: 'Comments',
+        txtLimit: 'Password is limited to 15 characters'
 
     }, DE.Views.ProtectDialog || {}));
 });

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

@@ -1215,7 +1215,7 @@ define([
                     this._state.GradColor = color;
                 }
 
-                this.chShadow.setDisabled(!!shapeprops.get_FromChart());
+                this.chShadow.setDisabled(!!shapeprops.get_FromChart() || this._locked);
                 this.chShadow.setValue(!!shapeprops.asc_getShadow(), true);
 
                 this._noApply = false;

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

@@ -71,6 +71,7 @@ define([
                 tip: undefined
             };
             this._locked = false;
+            this._protected = false;
 
             this.render();
         },
@@ -156,6 +157,10 @@ define([
             this._locked = locked;
         },
 
+        setProtected: function (value) {
+            this._protected = value;
+        },
+
         setMode: function(mode) {
             this.mode = mode;
         },
@@ -288,7 +293,7 @@ define([
             menu.items[3].setVisible(!requested);
 
             menu.items[0].setDisabled(this._locked);
-            menu.items[3].setDisabled(this._locked);
+            menu.items[3].setDisabled(this._locked || this._protected);
 
             menu.items[1].cmpEl.attr('data-value', record.get('certificateId')); // view certificate
             menu.items[2].cmpEl.attr('data-value', signed ? 1 : 0); // view or edit signature settings
@@ -307,7 +312,7 @@ define([
                     this.api.asc_ViewCertificate(item.cmpEl.attr('data-value'));
                     break;
                 case 2:
-                    Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature
+                    Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')) || this._protected, guid);// can edit settings for requested signature
                     break;
                 case 3:
                     var me = this;

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

@@ -161,6 +161,8 @@ define([
                 me.fireEvent('zoom:value', [item.value]);
             });
 
+            me.btnDocInfo.menu.on('show:after', _.bind(this.onDocInfoShow, this));
+
             me.onChangeProtectDocument();
         }
 
@@ -289,6 +291,36 @@ define([
                     }
                 });
 
+                var template = _.template(
+                    // '<a id="<%= id %>" tabindex="-1" type="menuitem">' +
+                    '<div style="display: flex;padding: 5px 20px;line-height: 16px;">' +
+                        '<div style="flex-grow: 1;"><%= caption %></div>' +
+                        '<div style="word-break: normal; margin-left: 20px; min-width: 35px;text-align: right;"><%= options.value%></div>' +
+                    '</div>'
+                    // '</a>'
+                );
+
+                this.btnDocInfo = new Common.UI.Button({
+                    cls         : 'btn-toolbar no-caret',
+                    caption     : this.txtWordCount,
+                    iconCls: 'toolbar__icon word-count',
+                    hintAnchor  : 'top-left',
+                    dataHint    : '0',
+                    dataHintDirection: 'top',
+                    menu: new Common.UI.Menu({
+                        style: 'margin-top:-5px;',
+                        menuAlign: 'bl-tl',
+                        itemTemplate: template,
+                        items: [
+                            { caption: this.txtPages, value: 0 },
+                            { caption: this.txtParagraphs, value: 0 },
+                            { caption: this.txtWords, value: 0 },
+                            { caption: this.txtSymbols, value: 0 },
+                            { caption: this.txtSpaces, value: 0 }
+                        ]
+                    })
+                });
+
                 var promise = new Promise(function (accept, reject) {
                     accept();
                 });
@@ -320,6 +352,7 @@ define([
                     me.btnLanguage.setMenu(me.langMenu);
                     me.langMenu.prevTip = 'en';
                 }
+                me.btnDocInfo.render($('#slot-status-btn-info', me.$layout));
 
                 if (config.canUseSelectHandTools) {
                     _btn_render(me.btnSelectTool, $('#btn-select-tool', me.$layout));
@@ -341,11 +374,14 @@ define([
                 if (this.api) {
                     this.api.asc_registerCallback('asc_onCountPages',   _.bind(_onCountPages, this));
                     this.api.asc_registerCallback('asc_onCurrentPage',  _.bind(_onCurrentPage, this));
+                    this.api.asc_registerCallback('asc_onGetDocInfoStart', _.bind(this.onGetDocInfoStart, this));
+                    this.api.asc_registerCallback('asc_onGetDocInfoStop', _.bind(this.onGetDocInfoEnd, this));
+                    this.api.asc_registerCallback('asc_onDocInfo', _.bind(this.onDocInfo, this));
+                    this.api.asc_registerCallback('asc_onGetDocInfoEnd', _.bind(this.onGetDocInfoEnd, this));
                     this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('api:disconnect',      _.bind(this.onApiCoAuthoringDisconnect, this));
                     Common.NotificationCenter.on('protect:doclock', _.bind(this.onChangeProtectDocument, this));
                 }
-
                 return this;
 
             },
@@ -428,6 +464,50 @@ define([
                 }
             },
 
+            onDocInfoShow: function() {
+                this.api && this.api.startGetDocInfo();
+            },
+
+            onGetDocInfoStart: function() {
+                this.infoObj = {PageCount: 0, WordsCount: 0, ParagraphCount: 0, SymbolsCount: 0, SymbolsWSCount:0};
+            },
+
+            onDocInfo: function(obj) {
+                if (obj && this.btnDocInfo && this.btnDocInfo.menu) {
+                    if (obj.get_PageCount()>-1)
+                        this.btnDocInfo.menu.items[0].options.value = obj.get_PageCount();
+                    if (obj.get_ParagraphCount()>-1)
+                        this.btnDocInfo.menu.items[1].options.value = obj.get_ParagraphCount();
+                    if (obj.get_WordsCount()>-1)
+                        this.btnDocInfo.menu.items[2].options.value = obj.get_WordsCount();
+                    if (obj.get_SymbolsCount()>-1)
+                        this.btnDocInfo.menu.items[3].options.value = obj.get_SymbolsCount();
+                    if (obj.get_SymbolsWSCount()>-1)
+                        this.btnDocInfo.menu.items[4].options.value = obj.get_SymbolsWSCount();
+                    if (!this.timerDocInfo) { // start timer for filling info
+                        var me = this;
+                        this.timerDocInfo = setInterval(function(){
+                            me.fillDocInfo();
+                        }, 300);
+                        this.fillDocInfo();
+                    }
+                }
+            },
+
+            onGetDocInfoEnd: function() {
+                clearInterval(this.timerDocInfo);
+                this.timerDocInfo = undefined;
+                this.fillDocInfo();
+            },
+
+            fillDocInfo:  function() {
+                if (!this.btnDocInfo || !this.btnDocInfo.menu || !this.btnDocInfo.menu.isVisible()) return;
+
+                this.btnDocInfo.menu.items.forEach(function(item){
+                    $(item.el).html(item.template({id: item.id, caption : item.caption, options : item.options}));
+                });
+            },
+
             onApiCoAuthoringDisconnect: function() {
                 this.setMode({isDisconnected:true});
                 this.SetDisabled(true);
@@ -445,7 +525,13 @@ define([
             textTrackChanges    : 'Track Changes',
             textChangesPanel    : 'Changes panel',
             tipSelectTool       : 'Select tool',
-            tipHandTool         : 'Hand tool'
+            tipHandTool         : 'Hand tool',
+            txtWordCount: 'Word count',
+            txtPages: 'Pages',
+            txtWords: 'Words',
+            txtParagraphs: 'Paragraphs',
+            txtSymbols: 'Symbols',
+            txtSpaces: 'Symbols with spaces'
         }, DE.Views.Statusbar || {}));
     }
 );

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

@@ -368,7 +368,7 @@ define([
                         template: _.template(['<div class="listview inner" style=""></div>'].join('')),
                         itemTemplate: _.template([
                             '<div id="<%= id %>" class="list-item">',
-                            '<div class="<% if (checked) { %>checked<% } %>"><%= displayValue %></div>',
+                            '<div class="<% if (checked) { %>checked<% } %>"><%= Common.Utils.String.htmlEncode(displayValue) %></div>',
                             '<div>',
                             '<div class="input-field" style="width:40px;"><input type="text" class="form-control" value="<%= value %>" style="text-align: right;" maxLength="1">',
                             '</div>',

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

@@ -192,9 +192,12 @@ define([
                         iconCls: 'toolbar__icon btn-print no-mask',
                         lock: [_set.cantPrint, _set.disableOnStart],
                         signals: ['disabled'],
+                        split: config.canQuickPrint,
+                        menu: config.canQuickPrint,
                         dataHint: '1',
                         dataHintDirection: 'bottom',
-                        dataHintTitle: 'P'
+                        dataHintTitle: 'P',
+                        printType: 'print'
                     });
                     this.toolbarControls.push(this.btnPrint);
 
@@ -875,7 +878,7 @@ define([
                         id: 'tlbtn-controls',
                         cls: 'btn-toolbar x-huge icon-top',
                         iconCls: 'toolbar__icon btn-controls',
-                        lock: [_set.paragraphLock, _set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments],
+                        lock: [_set.paragraphLock, _set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.inSmartart, _set.inSmartartInternal],
                         caption: me.capBtnInsControls,
                         menu: new Common.UI.Menu({
                             cls: 'ppm-toolbar shifted-right',
@@ -1646,17 +1649,8 @@ define([
 
                     me.setTab('home');
 
-                    var top = Common.localStorage.getItem("de-pgmargins-top"),
+                    me.onUpdateLastCustomMargins();
-                        left = Common.localStorage.getItem("de-pgmargins-left"),
+                    Common.NotificationCenter.on('margins:update', _.bind(me.onUpdateLastCustomMargins, me));
-                        bottom = Common.localStorage.getItem("de-pgmargins-bottom"),
-                        right = Common.localStorage.getItem("de-pgmargins-right");
-                    if ( top!==null && left!==null && bottom!==null && right!==null ) {
-                        var mnu = this.btnPageMargins.menu.items[0];
-                        mnu.options.value = mnu.value = [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)];
-                        mnu.setVisible(true);
-                        $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
-                    } else
-                        this.btnPageMargins.menu.items[0].setVisible(false);
                 }
 
                 if ( me.isCompactView )
@@ -1761,7 +1755,7 @@ define([
                         true, true, undefined, '1', 'bottom', 'small');
                 Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak);
                 Array.prototype.push.apply(this.lockControls, this.btnsPageBreak);
-
+                this.btnPrint.menu && this.btnPrint.$el.addClass('split');
                 return $host;
             },
 
@@ -1772,6 +1766,30 @@ define([
                 })).then(function () {
                     if ( !config.isEdit ) return;
 
+                    if(me.btnPrint.menu){
+                        me.btnPrint.setMenu(
+                            new Common.UI.Menu({
+                                items:[
+                                    {
+                                        caption:            me.tipPrint,
+                                        iconCls:            'menu__icon btn-print',
+                                        toggleGroup:        'viewPrint',
+                                        value:              'print',
+                                        iconClsForMainBtn:  'btn-print',
+                                        platformKey:         Common.Utils.String.platformKey('Ctrl+P')
+                                    },
+                                    {
+                                        caption:            me.tipPrintQuick,
+                                        iconCls:            'menu__icon btn-quick-print',
+                                        toggleGroup:        'viewPrint',
+                                        value:              'print-quick',
+                                        iconClsForMainBtn:  'btn-quick-print',
+                                        platformKey:        ''
+                                    }
+                                ]
+                            }));
+                    }
+
                     me.btnsPageBreak.forEach( function(btn) {
                         btn.updateHint( [me.textInsPageBreak, me.tipPageBreak] );
 
@@ -2059,6 +2077,7 @@ define([
                     ids.push('id-toolbar-menu-markers-level-' + i);
                     items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true });
                 }
+
                 this.btnMarkers.setMenu(
                     new Common.UI.Menu({
                         cls: 'shifted-left',
@@ -2743,6 +2762,22 @@ define([
                     this.api.asc_RemoveAllCustomStyles();
             },
 
+            onUpdateLastCustomMargins: function(props) {
+                if (!this.btnPageMargins) return;
+
+                var top = props ? props.get_TopMargin() : Common.localStorage.getItem("de-pgmargins-top"),
+                    left = props ? props.get_LeftMargin() : Common.localStorage.getItem("de-pgmargins-left"),
+                    bottom = props ? props.get_BottomMargin() : Common.localStorage.getItem("de-pgmargins-bottom"),
+                    right = props ? props.get_RightMargin() : Common.localStorage.getItem("de-pgmargins-right");
+                if ( top!==null && left!==null && bottom!==null && right!==null ) {
+                    var mnu = this.btnPageMargins.menu.items[0];
+                    mnu.options.value = mnu.value = [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)];
+                    mnu.setVisible(true);
+                    $(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
+                } else
+                    this.btnPageMargins.menu.items[0].setVisible(false);
+            },
+
             lockToolbar: function (causes, lock, opts) {
                 Common.Utils.lockControls(causes, lock, opts, this.lockControls);
             },
@@ -2762,6 +2797,7 @@ define([
             tipUndo: 'Undo',
             tipRedo: 'Redo',
             tipPrint: 'Print',
+            tipPrintQuick: 'Quick print',
             tipSave: 'Save',
             tipIncFont: 'Increment font size',
             tipDecFont: 'Decrement font size',

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

@@ -144,6 +144,7 @@ define([
             var value = Common.UI.LayoutManager.getInitValue('rightMenu');
             value = (value!==undefined) ? !value : false;
             Common.localStorage.getBool("de-hidden-rightmenu", value) && me._rightMenu.hide();
+            Common.Utils.InternalSettings.set("de-hidden-rightmenu", Common.localStorage.getBool("de-hidden-rightmenu", value));
         },
 
         applyCommonMode: function() {

apps/documenteditor/main/app_dev.js

@@ -116,7 +116,6 @@ require([
     'backbone',
     'bootstrap',
     'core',
-    'api',
     'analytics',
     'gateway',
     'locale',
@@ -148,6 +147,7 @@ require([
             'ViewTab',
             'Search',
             'DocProtection',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -183,6 +183,7 @@ require([
                 'documenteditor/main/app/controller/ViewTab',
                 'documenteditor/main/app/controller/Search',
                 'documenteditor/main/app/controller/DocProtection',
+                'documenteditor/main/app/controller/Print',
                 'documenteditor/main/app/view/FileMenuPanels',
                 'documenteditor/main/app/view/ParagraphSettings',
                 'documenteditor/main/app/view/HeaderFooterSettings',

apps/documenteditor/main/locale/ca.json

@@ -180,7 +180,15 @@
   "Common.define.smartArt.textDetailedProcess": "Procés detallat",
   "Common.define.smartArt.textDivergingArrows": "Fletxes divergents",
   "Common.define.smartArt.textDivergingRadial": "Radial divergent",
+  "Common.define.smartArt.textEquation": "Equació",
+  "Common.define.smartArt.textFramedTextPicture": "Imatge de text emmarcat",
+  "Common.define.smartArt.textFunnel": "Embut",
+  "Common.define.smartArt.textGear": "Engrenatge",
+  "Common.define.smartArt.textGridMatrix": "Matriu de quadrícula",
+  "Common.define.smartArt.textGroupedList": "Llista agrupada",
   "Common.Translation.textMoreButton": "Més",
+  "Common.Translation.tipFileLocked": "El document està bloquejat per editar-lo. Podeu fer canvis i desar-los com a còpia local més tard.",
+  "Common.Translation.tipFileReadOnly": "El document és només de lectura, l'edició està bloquejada. Podeu fer canvis i desar la còpia local més tard.",
   "Common.Translation.warnFileLocked": "No pots editar aquest fitxer perquè és obert en una altra aplicació.",
   "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
   "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització",
@@ -636,6 +644,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.",
   "DE.Controllers.Main.errorFileSizeExceed": "La mida del fitxer supera el límit establert pel servidor. Contacteu amb l'administrador del servidor de documents per obtenir més informació.",
   "DE.Controllers.Main.errorForceSave": "S'ha produït un error en desar el fitxer. Utilitzeu l'opció \"Baixa-ho com a\" per desar el fitxer al disc dur de l’ordinador o torneu-ho a provar més endavant.",
+  "DE.Controllers.Main.errorInconsistentExt": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer no es correspon amb la seva extensió.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a documents de text (per exemple, docx), però el fitxer té l'extensió incoherent: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a un dels formats següents: pdf/djvu/xps/oxps, però el fitxer té l'extensió incoherent: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a presentacions (per exemple, pptx), però el fitxer té l'extensió incongruent: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "S'ha produït un error en obrir el fitxer.<br>El contingut del fitxer correspon a full de càlcul (per exemple, xlsx), però el fitxer té l'extensió incoherent: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de claus desconegut",
   "DE.Controllers.Main.errorKeyExpire": "El descriptor de claus ha caducat",
   "DE.Controllers.Main.errorLoadingFont": "No s'han carregat les lletres tipogràfiques.<br> Contacteu amb l'administrador del Servidor de Documents.",
@@ -989,6 +1002,8 @@
   "DE.Controllers.Main.warnProcessRightsChange": "No tens permís per editar el fitxer.",
   "DE.Controllers.Navigation.txtBeginning": "Inici del document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ves al començament del document",
+  "DE.Controllers.Print.txtCustom": "Personalització",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Introduïu un sol número de pàgina o un sol interval de pàgines (per exemple, 5-12). O podeu imprimir en PDF.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Advertiment",
   "DE.Controllers.Search.textNoTextFound": "No s'han trobat les dades que heu cercat. Ajusteu les opcions de cerca.",
   "DE.Controllers.Search.textReplaceSkipped": "S'ha realitzat la substitució. S'han omès {0} ocurrències.",
@@ -1493,10 +1508,16 @@
   "DE.Views.DateTimeDialog.textUpdate": "Actualitza automàticament",
   "DE.Views.DateTimeDialog.txtTitle": "Hora i data",
   "DE.Views.DocProtection.hintProtectDoc": "Protegir document",
+  "DE.Views.DocProtection.txtDocProtectedComment": "El document està protegit. <br>Només hi podeu inserir comentaris.",
+  "DE.Views.DocProtection.txtDocProtectedForms": "El document està protegit.<br>Només podeu omplir els formularis que hi ha.",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "El document està protegit. <br>Podeu editar aquest document, però es farà un seguiment de tots els canvis.",
+  "DE.Views.DocProtection.txtDocProtectedView": "El document està protegit. <br>Només el podeu veure.",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Introduïu una contrasenya per desbloquejar el document",
   "DE.Views.DocProtection.txtProtectDoc": "Protegir document",
   "DE.Views.DocumentHolder.aboveText": "A dalt",
   "DE.Views.DocumentHolder.addCommentText": "Afegeix un comentari",
   "DE.Views.DocumentHolder.advancedDropCapText": "Configuració de la lletra de caixa alta",
+  "DE.Views.DocumentHolder.advancedEquationText": "Configuració de l'equació",
   "DE.Views.DocumentHolder.advancedFrameText": "Configuració avançada del marc",
   "DE.Views.DocumentHolder.advancedParagraphText": "Configuració avançada del paràgraf",
   "DE.Views.DocumentHolder.advancedTableText": "Configuració avançada de la taula",
@@ -2444,7 +2465,13 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Estableix només la vora superior",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automàtic",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Sense vores",
+  "DE.Views.PrintWithPreview.txtAllPages": "Totes les pàgines",
+  "DE.Views.PrintWithPreview.txtBottom": "Inferior",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Pàgina actual",
+  "DE.Views.PrintWithPreview.txtCustom": "Personalització",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Impressió personalitzada",
   "DE.Views.ProtectDialog.textComments": "Comentaris",
+  "DE.Views.ProtectDialog.textForms": "Omplir formularis",
   "DE.Views.ProtectDialog.txtAllow": "Només permet aquest tipus d'edició del document",
   "DE.Views.ProtectDialog.txtIncorrectPwd": "La contrasenya de confirmació no és idèntica",
   "DE.Views.ProtectDialog.txtProtect": "Protegir",
@@ -2641,6 +2668,7 @@
   "DE.Views.TableSettings.tipTop": "Estableix només la vora superior externa",
   "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Taules amb vores i línies",
   "DE.Views.TableSettings.txtGroupTable_Custom": "personalitzat",
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Taules amb quadrícula",
   "DE.Views.TableSettings.txtNoBorders": "Sense vores",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
   "DE.Views.TableSettings.txtTable_Bordered": "Amb vores",

apps/documenteditor/main/locale/da.json

@@ -125,6 +125,7 @@
   "Common.define.chartData.textScatterSmoothMarker": "Scatter med jævne linjer og markører",
   "Common.define.chartData.textStock": "Aktie",
   "Common.define.chartData.textSurface": "Overflade",
+  "Common.define.smartArt.textAccentProcess": "(intet)",
   "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme en kopi.",
   "Common.Translation.warnFileLockedBtnEdit": "Opret en kopi",
   "Common.Translation.warnFileLockedBtnView": "Åben for visning",

apps/documenteditor/main/locale/de.json

@@ -285,6 +285,8 @@
   "Common.define.smartArt.textVerticalPictureList": "Vertikale Bildliste",
   "Common.define.smartArt.textVerticalProcess": "Vertikaler Prozess",
   "Common.Translation.textMoreButton": "Mehr",
+  "Common.Translation.tipFileLocked": "Das Dokument ist für die Bearbeitung gesperrt. Sie können Änderungen vornehmen und die Datei später als lokale Kopie speichern.",
+  "Common.Translation.tipFileReadOnly": "Das Dokument ist schreibgeschützt und für die Bearbeitung gesperrt. Sie können Änderungen vornehmen und die lokale Kopie später speichern.",
   "Common.Translation.warnFileLocked": "Die Datei wird in einer anderen App bearbeitet. Sie können die Bearbeitung fortsetzen und die Kopie dieser Datei speichern.",
   "Common.Translation.warnFileLockedBtnEdit": "Kopie erstellen",
   "Common.Translation.warnFileLockedBtnView": "Schreibgeschützt öffnen",
@@ -384,7 +386,7 @@
   "Common.Views.AutoCorrectDialog.textAdd": "Hinzufügen",
   "Common.Views.AutoCorrectDialog.textApplyText": "Bei der Eingabe anwenden",
   "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autokorrektur für Text",
-  "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat während der Eingabe",
+  "Common.Views.AutoCorrectDialog.textAutoFormat": "Automatisches Formatieren während der Eingabe",
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatische Aufzählungen",
   "Common.Views.AutoCorrectDialog.textBy": "Nach",
   "Common.Views.AutoCorrectDialog.textDelete": "Löschen",
@@ -458,6 +460,7 @@
   "Common.Views.Header.textCompactView": "Symbolleiste ausblenden",
   "Common.Views.Header.textHideLines": "Lineale verbergen",
   "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen",
+  "Common.Views.Header.textReadOnly": "Schreibgeschützt",
   "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen",
   "Common.Views.Header.textShare": "Freigeben",
   "Common.Views.Header.textZoom": "Zoom",
@@ -465,6 +468,7 @@
   "Common.Views.Header.tipDownload": "Datei herunterladen",
   "Common.Views.Header.tipGoEdit": "Aktuelle Datei bearbeiten",
   "Common.Views.Header.tipPrint": "Datei drucken",
+  "Common.Views.Header.tipPrintQuick": "Schnelldruck",
   "Common.Views.Header.tipRedo": "Wiederholen",
   "Common.Views.Header.tipSave": "Speichern",
   "Common.Views.Header.tipSearch": "Suchen",
@@ -662,7 +666,7 @@
   "Common.Views.SignDialog.tipFontSize": "Schriftgrad",
   "Common.Views.SignSettingsDialog.textAllowComment": "Signaturgeber verfügt über die Möglichkeit, einen Kommentar im Signaturdialog hinzuzufügen",
   "Common.Views.SignSettingsDialog.textDefInstruction": "Überprüfen Sie, ob der signierte Inhalt stimmt, bevor Sie dieses Dokument signieren.",
-  "Common.Views.SignSettingsDialog.textInfoEmail": "Email Adresse",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "E-Mail des vorgeschlagenen Unterzeichners",
   "Common.Views.SignSettingsDialog.textInfoName": "Name",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Titel des Signatureingebers",
   "Common.Views.SignSettingsDialog.textInstructions": "Anweisungen für Signaturgeber",
@@ -687,7 +691,7 @@
   "Common.Views.SymbolTableDialog.textRange": "Bereich",
   "Common.Views.SymbolTableDialog.textRecent": "Kürzlich verwendete Symbole",
   "Common.Views.SymbolTableDialog.textRegistered": "Registered Trade Mark",
-  "Common.Views.SymbolTableDialog.textSCQuote": "Einfache schließende Anführung",
+  "Common.Views.SymbolTableDialog.textSCQuote": "Einfache schließendes Anführungszeichen",
   "Common.Views.SymbolTableDialog.textSection": "Paragraphenzeichen",
   "Common.Views.SymbolTableDialog.textShortcut": "Tastenkombination",
   "Common.Views.SymbolTableDialog.textSHyphen": "Weicher Bindestrich",
@@ -695,7 +699,7 @@
   "Common.Views.SymbolTableDialog.textSpecial": "Sonderzeichen",
   "Common.Views.SymbolTableDialog.textSymbols": "Symbole",
   "Common.Views.SymbolTableDialog.textTitle": "Symbol",
-  "Common.Views.SymbolTableDialog.textTradeMark": "Registered Trade Mark",
+  "Common.Views.SymbolTableDialog.textTradeMark": "Markenzeichen-Symbol",
   "Common.Views.UserNameDialog.textDontShow": "Nicht mehr anzeigen",
   "Common.Views.UserNameDialog.textLabel": "Bezeichnung:",
   "Common.Views.UserNameDialog.textLabelError": "Bezeichnung darf nicht leer sein.",
@@ -829,6 +833,7 @@
   "DE.Controllers.Main.textRequestMacros": "Ein Makro stellt eine Anfrage an die URL. Möchten Sie die Anfrage an die %1 zulassen?",
   "DE.Controllers.Main.textShape": "Form",
   "DE.Controllers.Main.textStrict": "Formaler Modus",
+  "DE.Controllers.Main.textTryQuickPrint": "Sie haben Schnelldruck gewählt: Das gesamte Dokument wird auf dem zuletzt gewählten oder dem Standarddrucker gedruckt.<br>Sollen Sie fortfahren?",
   "DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind  für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Die Optionen Rückgängig/Wiederholen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.",
   "DE.Controllers.Main.textUndo": "Rückgängig",
@@ -1102,6 +1107,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
   "DE.Controllers.Navigation.txtBeginning": "Anfang des Dokuments",
   "DE.Controllers.Navigation.txtGotoBeginning": "Zum Anfang des Dokuments übergehnen",
+  "DE.Controllers.Print.textMarginsLast": " Benutzerdefiniert als letzte",
+  "DE.Controllers.Print.txtCustom": "Benutzerdefiniert",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Ungültiger Druckbereich",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Geben Sie entweder eine einzelne Seitenzahl oder einen einzelnen Seitenbereich ein (z. B. 5-12). Oder Sie können in PDF drucken.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Achtung",
   "DE.Controllers.Search.textNoTextFound": "Die Daten, nach denen Sie gesucht haben, können nicht gefunden werden. Bitte ändern Sie die Suchparameter.",
   "DE.Controllers.Search.textReplaceSkipped": "Der Ersatzvorgang wurde durchgeführt. {0} Vorkommen wurden ausgelassen.",
@@ -1376,7 +1385,7 @@
   "DE.Controllers.Toolbar.txtSymbol_ast": "Stern-Operator",
   "DE.Controllers.Toolbar.txtSymbol_beta": "Beta",
   "DE.Controllers.Toolbar.txtSymbol_beth": "Bet",
-  "DE.Controllers.Toolbar.txtSymbol_bullet": "Aufzählungzeichensoperator",
+  "DE.Controllers.Toolbar.txtSymbol_bullet": "Stichpunktoperator",
   "DE.Controllers.Toolbar.txtSymbol_cap": "Schnittmenge",
   "DE.Controllers.Toolbar.txtSymbol_cbrt": "Kubikwurzel",
   "DE.Controllers.Toolbar.txtSymbol_cdots": "Horizontale Ellipse (Mittellinie)",
@@ -2020,6 +2029,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Keine",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Rechtschreibprüfung",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Punkt",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Die Schaltfläche Schnelldruck in der Kopfzeile des Editors anzeigen",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Das Dokument wird auf dem zuletzt ausgewählten oder dem standardmäßigen Drucker gedruckt",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Alle aktivieren",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Alle Makros ohne Benachrichtigung aktivieren",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Änderungen anzeigen",
@@ -2189,7 +2200,7 @@
   "DE.Views.ImageSettings.txtThrough": "Durchgehend",
   "DE.Views.ImageSettings.txtTight": "Passend",
   "DE.Views.ImageSettings.txtTopAndBottom": "Oben und unten",
-  "DE.Views.ImageSettingsAdvanced.strMargins": "Ränder um den Text",
+  "DE.Views.ImageSettingsAdvanced.strMargins": "Textauffüllung",
   "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolut",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Ausrichtung",
   "DE.Views.ImageSettingsAdvanced.textAlt": "Alternativer Text",
@@ -2577,6 +2588,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Nur obere Rahmenlinie festlegen",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatisch",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Keine Rahmen",
+  "DE.Views.PrintWithPreview.textMarginsLast": " Benutzerdefiniert als letzte",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Mittelmäßig",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Schmal",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "Normal (US)",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Breit",
+  "DE.Views.PrintWithPreview.txtAllPages": "Alle Seiten",
+  "DE.Views.PrintWithPreview.txtBottom": "Unten",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Aktuelle Seite",
+  "DE.Views.PrintWithPreview.txtCustom": "Benutzerdefiniert",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Benutzerdefinierter Druck",
+  "DE.Views.PrintWithPreview.txtLandscape": "Querformat",
+  "DE.Views.PrintWithPreview.txtLeft": "Links",
+  "DE.Views.PrintWithPreview.txtMargins": "Ränder",
+  "DE.Views.PrintWithPreview.txtOf": "von {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Seite",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Ungültige Seitennummer",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Seitenausrichtung",
+  "DE.Views.PrintWithPreview.txtPages": "Seiten",
+  "DE.Views.PrintWithPreview.txtPageSize": "Seitengröße",
+  "DE.Views.PrintWithPreview.txtPortrait": "Hochformat",
+  "DE.Views.PrintWithPreview.txtPrint": "Drucken",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Als PDF-Datei drucken",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Druckbereich",
+  "DE.Views.PrintWithPreview.txtRight": "Rechts",
+  "DE.Views.PrintWithPreview.txtSelection": "Auswahl",
+  "DE.Views.PrintWithPreview.txtTop": "Oben",
   "DE.Views.ProtectDialog.textComments": "Kommentare",
   "DE.Views.ProtectDialog.textForms": "Ausfüllen von Formularen",
   "DE.Views.ProtectDialog.textReview": "Überarbeitungen",
@@ -2851,7 +2889,7 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Textumbruch",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Inline-Tabelle",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Flow-Tabelle",
-  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Umbruch",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Textumbruch",
   "DE.Views.TableSettingsAdvanced.textWrapText": "Zeilenumbruch",
   "DE.Views.TableSettingsAdvanced.tipAll": "Äußere Rahmenlinie und alle inneren Linien festlegen",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Rahmenlinien nur für innere Zellen festlegen",

apps/documenteditor/main/locale/el.json

@@ -123,7 +123,34 @@
   "Common.define.chartData.textScatterSmoothMarker": "Διασπορά με ομαλές γραμμές και δείκτες",
   "Common.define.chartData.textStock": "Μετοχή",
   "Common.define.chartData.textSurface": "Επιφάνεια",
+  "Common.define.smartArt.textAccentedPicture": "Εικόνα με Τόνους",
+  "Common.define.smartArt.textAccentProcess": "Διεργασία Τονισμού",
+  "Common.define.smartArt.textAlternatingFlow": "Εναλλασσόμενη Ροή",
+  "Common.define.smartArt.textAlternatingHexagons": "Εναλλασσόμενα Εξάγωνα",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Εναλλασσόμενα Μπλοκ Εικόνων",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Εναλλασσόμενοι Κύκλοι Εικόνων",
+  "Common.define.smartArt.textArchitectureLayout": "Αρχιτεκτονικό Σχέδιο",
+  "Common.define.smartArt.textArrowRibbon": "Κορδέλα με Βέλος",
+  "Common.define.smartArt.textBalance": "Ισορροπία",
+  "Common.define.smartArt.textBasicBendingProcess": "Βασική Διεργασία Κλίσης",
+  "Common.define.smartArt.textBasicBlockList": "Βασική Λίστα Μπλοκ",
+  "Common.define.smartArt.textBasicCycle": "Βασικός Κύκλος",
+  "Common.define.smartArt.textBasicMatrix": "Βασικός Πίνακας",
+  "Common.define.smartArt.textBasicPie": "Βασική Πίτα",
+  "Common.define.smartArt.textBasicProcess": "Βασική Διεργασία",
+  "Common.define.smartArt.textBasicPyramid": "Βασική Πυραμίδα",
+  "Common.define.smartArt.textBasicRadial": "Βασικό Ακτινικό ",
+  "Common.define.smartArt.textBasicTarget": "Βασικός Στόχος",
+  "Common.define.smartArt.textBasicTimeline": "Βασική Χρονική Ακολουθία",
+  "Common.define.smartArt.textBasicVenn": "Βασικό Venn",
+  "Common.define.smartArt.textBendingPictureBlocks": "Κεκλιμένα Μπλοκ Εικόνων",
+  "Common.define.smartArt.textBendingPictureCaption": "Κεκλιμένη Λεζάντα Εικόνας",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Κεκλιμένη Λίστα Λεζάντων Εικόνας",
+  "Common.define.smartArt.textCaptionedPictures": "Εικόνες με Λεζάντα",
+  "Common.define.smartArt.textConvergingArrows": "Συμβαλλόμενα Βέλη",
+  "Common.define.smartArt.textDivergingArrows": "Αποκλίνοντα Βέλη",
   "Common.Translation.textMoreButton": "Περισσότερα",
+  "Common.Translation.tipFileLocked": "Το έγγραφο είναι κλειδωμένο για επεξεργασία. Μπορείτε να κάνετε αλλαγές και να τις αποθηκεύσετε αργότερα ως τοπικό αντίγραφο.",
   "Common.Translation.warnFileLocked": "Δεν μπορείτε να επεξεργαστείτε αυτό το αρχείο επειδή επεξεργάζεται σε άλλη εφαρμογή.",
   "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου",
   "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή",
@@ -284,6 +311,7 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Φόρτωση ...",
   "Common.Views.DocumentAccessDialog.textTitle": "Ρυθμίσεις Διαμοιρασμού",
   "Common.Views.ExternalDiagramEditor.textTitle": "Συντάκτης Γραφήματος",
+  "Common.Views.ExternalEditor.textClose": "Κλείσιμο",
   "Common.Views.ExternalMergeEditor.textTitle": "Παραλήπτες Συγχωνευμένης Αλληλογραφίας",
   "Common.Views.Header.labelCoUsersDescr": "Οι χρήστες που επεξεργάζονται το αρχείο:",
   "Common.Views.Header.textAddFavorite": "Σημείωση ως αγαπημένο",
@@ -349,6 +377,7 @@
   "Common.Views.Plugins.textStart": "Εκκίνηση",
   "Common.Views.Plugins.textStop": "Διακοπή",
   "Common.Views.Protection.hintAddPwd": "Κρυπτογράφηση με συνθηματικό",
+  "Common.Views.Protection.hintDelPwd": "Διαγραφή συνθηματικού",
   "Common.Views.Protection.hintPwd": "Αλλαγή ή διαγραφή συνθηματικού",
   "Common.Views.Protection.hintSignature": "Προσθήκη ψηφιακής υπογραφής ή γραμμής υπογραφής",
   "Common.Views.Protection.txtAddPwd": "Προσθήκη συνθηματικού",
@@ -460,6 +489,7 @@
   "Common.Views.SaveAsDlg.textTitle": "Φάκελος για αποθήκευση",
   "Common.Views.SearchPanel.textCaseSensitive": "Διάκριση Πεζών-Κεφαλαίων",
   "Common.Views.SearchPanel.textCloseSearch": "Κλείσιμο αναζήτησης",
+  "Common.Views.SearchPanel.textContentChanged": "Το έγγραφο τροποποιήθηκε.",
   "Common.Views.SearchPanel.textFind": "Εύρεση",
   "Common.Views.SearchPanel.textFindAndReplace": "Εύρεση και Αντικατάσταση",
   "Common.Views.SearchPanel.textMatchUsingRegExp": "Ταίριασμα χρησιμοποιώντας κανονικές εκφράσεις (regexp)",
@@ -468,6 +498,7 @@
   "Common.Views.SearchPanel.textReplace": "Αντικατάσταση",
   "Common.Views.SearchPanel.textReplaceAll": "Αντικατάσταση Όλων",
   "Common.Views.SearchPanel.textReplaceWith": "Αντικατάσταση με",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Διενέργεια νέας αναζήτησης{1} για ακριβή αποτελέσματα.",
   "Common.Views.SearchPanel.textSearchResults": "Αποτελέσματα αναζήτησης: {0}/{1}",
   "Common.Views.SearchPanel.textTooManyResults": "Υπάρχουν πάρα πολλά αποτελέσματα για εμφάνιση εδώ",
   "Common.Views.SearchPanel.textWholeWords": "Ολόκληρες λέξεις μόνο",
@@ -491,6 +522,7 @@
   "Common.Views.SignDialog.tipFontName": "Όνομα Γραμματοσειράς",
   "Common.Views.SignDialog.tipFontSize": "Μέγεθος Γραμματοσειράς",
   "Common.Views.SignSettingsDialog.textAllowComment": "Να επιτρέπεται στον υπογράφοντα να προσθέτει σχόλιο στο διάλογο υπογραφής",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Πριν υπογράψετε το έγγραφο, βεβαιωθείτε για την ορθότητα των περιεχομένων.",
   "Common.Views.SignSettingsDialog.textInfoEmail": "Ηλεκτρονική Διεύθυνση",
   "Common.Views.SignSettingsDialog.textInfoName": "Όνομα",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Τίτλος Υπογράφοντος",
@@ -570,6 +602,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "Το αρχείο προστατεύεται με συνθηματικό και δεν μπορεί να ανοίξει.",
   "DE.Controllers.Main.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων για λεπτομέρειες.",
   "DE.Controllers.Main.errorForceSave": "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του αρχείου. Χρησιμοποιήστε την επιλογή «Λήψη ως» για να αποθηκεύσετε το αρχείο στον σκληρό δίσκο του υπολογιστή σας ή δοκιμάστε ξανά αργότερα.",
+  "DE.Controllers.Main.errorInconsistentExt": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου δεν αντιστοιχούν στην κατάληξή του ονόματός του.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε αρχεία κειμένου (π.χ. docx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε μια από τις ακόλουθες μορφές: pdf/djvu/xps/oxps, αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε παρουσιάσεις (π.χ. pptx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "Προέκυψε σφάλμα κατά το άνοιγμα του αρχείου.<br>Τα περιεχόμενα του αρχείου αντιστοιχούν σε υπολογιστικά φύλλα (π.χ. xlsx), αλλά το αρχείο έχει ασύμφωνη κατάληξη: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Άγνωστος περιγραφέας κλειδιού",
   "DE.Controllers.Main.errorKeyExpire": "Ο περιγραφέας κλειδιού έχει λήξει",
   "DE.Controllers.Main.errorLoadingFont": "Οι γραμματοσειρές δεν έχουν φορτωθεί.<br>Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Εξυπηρετητή Εγγράφων σας.",
@@ -631,6 +668,7 @@
   "DE.Controllers.Main.textClose": "Κλείσιμο",
   "DE.Controllers.Main.textCloseTip": "Κάντε κλικ για να κλείσει η υπόδειξη",
   "DE.Controllers.Main.textContactUs": "Επικοινωνήστε με το τμήμα πωλήσεων",
+  "DE.Controllers.Main.textContinue": "Συνέχεια",
   "DE.Controllers.Main.textConvertEquation": "Η εξίσωση αυτή δημιουργήθηκε με παλαιότερη έκδοση του συντάκτη εξισώσεων που δεν υποστηρίζεται πια. Για να την επεξεργαστείτε, μετατρέψτε την σε μορφή Office Math ML.<br>Να μετατραπεί τώρα;",
   "DE.Controllers.Main.textCustomLoader": "Παρακαλούμε λάβετε υπόψη ότι σύμφωνα με τους όρους της άδειας δεν δικαιούστε αλλαγή του φορτωτή.<br>Παρακαλούμε επικοινωνήστε με το Τμήμα Πωλήσεων για να λάβετε μια προσφορά.",
   "DE.Controllers.Main.textDisconnect": "Η σύνδεση χάθηκε",
@@ -921,6 +959,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Σας έχει απαγορευτεί το δικαίωμα επεξεργασίας του αρχείου.",
   "DE.Controllers.Navigation.txtBeginning": "Έναρξη εγγράφου",
   "DE.Controllers.Navigation.txtGotoBeginning": "Μετάβαση στην αρχή του εγγράφου",
+  "DE.Controllers.Print.txtCustom": "Προσαρμοσμένο",
   "DE.Controllers.Search.notcriticalErrorTitle": "Προειδοποίηση",
   "DE.Controllers.Search.warnReplaceString": "{0} δεν είναι ένας έγκυρος ειδικός χαρακτήρας για το πλαίσιο Αντικατάσταση με.",
   "DE.Controllers.Statusbar.textDisconnect": "<b>Η σύνδεση χάθηκε</b><br>Απόπειρα επανασύνδεσης. Παρακαλούμε, ελέγξτε τις ρυθμίσεις σύνδεσης.",
@@ -1317,8 +1356,13 @@
   "DE.Views.CellsAddDialog.textRow": "Γραμμές",
   "DE.Views.CellsAddDialog.textTitle": "Εισαγωγή Πολλών",
   "DE.Views.CellsAddDialog.textUp": "Πάνω από τον δρομέα",
+  "DE.Views.ChartSettings.text3dDepth": "Βάθος (% της βάσης)",
+  "DE.Views.ChartSettings.text3dRotation": "Περιστροφή 3Δ",
   "DE.Views.ChartSettings.textAdvanced": "Εμφάνιση προηγμένων ρυθμίσεων",
+  "DE.Views.ChartSettings.textAutoscale": "Αυτόματη κλιμάκωση",
   "DE.Views.ChartSettings.textChartType": "Αλλαγή Τύπου Γραφήματος",
+  "DE.Views.ChartSettings.textDefault": "Προεπιλεγμένη Περιστροφή",
+  "DE.Views.ChartSettings.textDown": "Κάτω",
   "DE.Views.ChartSettings.textEditData": "Επεξεργασία Δεδομένων",
   "DE.Views.ChartSettings.textHeight": "Ύψος",
   "DE.Views.ChartSettings.textOriginalSize": "Πραγματικό Μέγεθος",
@@ -1416,6 +1460,11 @@
   "DE.Views.DateTimeDialog.textLang": "Γλώσσα",
   "DE.Views.DateTimeDialog.textUpdate": "Αυτόματη ενημέρωση",
   "DE.Views.DateTimeDialog.txtTitle": "Ημερομηνία & Ώρα",
+  "DE.Views.DocProtection.txtDocProtectedComment": "Το έγγραφο προστατεύεται.<br>Μπορείτε μόνο να εισάγετε σχόλια στο έγγραφο.",
+  "DE.Views.DocProtection.txtDocProtectedForms": "Το έγγραφο προστατεύεται.<br>Μπορείτε μόνο να συμπληρώσετε φόρμες μέσα στο έγγραφο.",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "Το έγγραφο προστατεύεται.<br>Μπορείτε να επεξεργαστείτε το έγγραφο, αλλά όλες οι αλλαγές θα καταγραφούν.",
+  "DE.Views.DocProtection.txtDocProtectedView": "Το έγγραφο προστατεύεται.<br>Μπορείτε μόνο να δείτε το έγγραφο.",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Εισάγετε συνθηματικό για αναίρεση της προστασίας εγγράφου",
   "DE.Views.DocumentHolder.aboveText": "Πάνω από",
   "DE.Views.DocumentHolder.addCommentText": "Προσθήκη Σχολίου",
   "DE.Views.DocumentHolder.advancedDropCapText": "Ρυθμίσεις Αρχιγράμματος",
@@ -1424,6 +1473,8 @@
   "DE.Views.DocumentHolder.advancedTableText": "Προηγμένες Ρυθμίσεις Πίνακα",
   "DE.Views.DocumentHolder.advancedText": "Προηγμένες Ρυθμίσεις",
   "DE.Views.DocumentHolder.alignmentText": "Στοίχιση",
+  "DE.Views.DocumentHolder.allLinearText": "Όλα - Γραμμικό",
+  "DE.Views.DocumentHolder.allProfText": "Όλα - Επαγγελματικό",
   "DE.Views.DocumentHolder.belowText": "Παρακάτω",
   "DE.Views.DocumentHolder.breakBeforeText": "Αλλαγή σελίδας πριν",
   "DE.Views.DocumentHolder.bulletsText": "Κουκκίδες και Αρίθμηση",
@@ -1432,6 +1483,8 @@
   "DE.Views.DocumentHolder.centerText": "Κέντρο",
   "DE.Views.DocumentHolder.chartText": "Προηγμένες Ρυθμίσεις Γραφήματος",
   "DE.Views.DocumentHolder.columnText": "Στήλη",
+  "DE.Views.DocumentHolder.currLinearText": "Τρέχον - Γραμμικό",
+  "DE.Views.DocumentHolder.currProfText": "Τρέχον - Επαγγελματικό",
   "DE.Views.DocumentHolder.deleteColumnText": "Διαγραφή Στήλης",
   "DE.Views.DocumentHolder.deleteRowText": "Διαγραφή Γραμμής",
   "DE.Views.DocumentHolder.deleteTableText": "Διαγραφή Πίνακα",
@@ -1444,6 +1497,7 @@
   "DE.Views.DocumentHolder.editFooterText": "Επεξεργασία Υποσέλιδου",
   "DE.Views.DocumentHolder.editHeaderText": "Επεξεργασία Κεφαλίδας",
   "DE.Views.DocumentHolder.editHyperlinkText": "Επεξεργασία Υπερσυνδέσμου",
+  "DE.Views.DocumentHolder.eqToInlineText": "Αλλαγή σε Εντός Κειμένου",
   "DE.Views.DocumentHolder.guestText": "Επισκέπτης",
   "DE.Views.DocumentHolder.hyperlinkText": "Υπερσύνδεσμος",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Αγνόηση Όλων",
@@ -1737,10 +1791,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "Έκδοση PDF",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Τοποθεσία",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Άτομα που έχουν δικαιώματα",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Σύμβολα με διαστήματα",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Χαρακτήρες με διαστήματα",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Στατιστικά",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Θέμα",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Σύμβολα",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Χαρακτήρες",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Τίτλος",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Μεταφορτώθηκε",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Λέξεις",
@@ -1827,12 +1881,15 @@
   "DE.Views.FormSettings.textColor": "Χρώμα περιγράμματος",
   "DE.Views.FormSettings.textComb": "Ξεδιάλεγμα χαρακτήρων",
   "DE.Views.FormSettings.textCombobox": "Πολλαπλές Επιλογές",
+  "DE.Views.FormSettings.textComplex": "Σύνθετο Πεδίο",
   "DE.Views.FormSettings.textConnected": "Συνδεδεμένα πεδία",
   "DE.Views.FormSettings.textDelete": "Διαγραφή",
+  "DE.Views.FormSettings.textDigits": "Ψηφία",
   "DE.Views.FormSettings.textDisconnect": "Αποσύνδεση",
   "DE.Views.FormSettings.textDropDown": "Πτυσσόμενη Λίστα",
   "DE.Views.FormSettings.textField": "Πεδίο Κειμένου",
   "DE.Views.FormSettings.textFixed": "Πεδίο σταθερού μεγέθους",
+  "DE.Views.FormSettings.textFormatSymbols": "Επιτρεπτά Σύμβολα",
   "DE.Views.FormSettings.textFromFile": "Από Αρχείο",
   "DE.Views.FormSettings.textFromStorage": "Από Αποθηκευτικό Χώρο",
   "DE.Views.FormSettings.textFromUrl": "Από διεύθυνση URL",
@@ -1840,6 +1897,7 @@
   "DE.Views.FormSettings.textImage": "Εικόνα",
   "DE.Views.FormSettings.textKey": "Κλειδί",
   "DE.Views.FormSettings.textLock": "Κλείδωμα",
+  "DE.Views.FormSettings.textMask": "Τυχαία Μάσκα",
   "DE.Views.FormSettings.textMaxChars": "Όριο χαρακτήρων",
   "DE.Views.FormSettings.textMulti": "Πεδίο πολλών γραμμών",
   "DE.Views.FormSettings.textNever": "Ποτέ",
@@ -1862,8 +1920,10 @@
   "DE.Views.FormSettings.textWidth": "Πλάτος κελιού",
   "DE.Views.FormsTab.capBtnCheckBox": "Πλαίσιο επιλογής",
   "DE.Views.FormsTab.capBtnComboBox": "Πολλαπλές Επιλογές",
+  "DE.Views.FormsTab.capBtnComplex": "Σύνθετο Πεδίο",
   "DE.Views.FormsTab.capBtnDownloadForm": "Λήψη ως oform",
   "DE.Views.FormsTab.capBtnDropDown": "Πτυσσόμενη Λίστα",
+  "DE.Views.FormsTab.capBtnEmail": "Διεύθυνση email",
   "DE.Views.FormsTab.capBtnImage": "Εικόνα",
   "DE.Views.FormsTab.capBtnNext": "Επόμενο Πεδίο",
   "DE.Views.FormsTab.capBtnPrev": "Προηγούμενο Πεδίο",
@@ -2329,6 +2389,14 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Ορισμός μόνο του πάνω περιγράμματος",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Αυτόματα",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Χωρίς περιγράμματα",
+  "DE.Views.PrintWithPreview.txtAllPages": "Όλες οι σελίδες",
+  "DE.Views.PrintWithPreview.txtBottom": "Κάτω Μέρος",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Τρέχουσα σελίδα",
+  "DE.Views.PrintWithPreview.txtCustom": "Προσαρμοσμένο",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Προσαρμοσμένη εκτύπωση",
+  "DE.Views.ProtectDialog.textComments": "Σχόλια",
+  "DE.Views.ProtectDialog.txtAllow": "Να επιτρέπεται μόνο τέτοια επεξεργασία στο έγγραφο",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "Το συνθηματικό επιβεβαίωσης δεν είναι πανομοιότυπο",
   "DE.Views.RightMenu.txtChartSettings": "Ρυθμίσεις γραφήματος",
   "DE.Views.RightMenu.txtFormSettings": "Ρυθμίσεις Φόρμας",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Ρυθμίσεις κεφαλίδας και υποσέλιδου",
@@ -2519,8 +2587,12 @@
   "DE.Views.TableSettings.tipOuter": "Ορισμός μόνο του εξωτερικού περιγράμματος",
   "DE.Views.TableSettings.tipRight": "Ορισμός μόνο του εξωτερικού δεξιού περιγράμματος",
   "DE.Views.TableSettings.tipTop": "Ορισμός μόνο του εξωτερικού πάνω περιγράμματος",
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Πίνακες με Περιθώρια & Γραμμές",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Προσαρμοσμένο",
   "DE.Views.TableSettings.txtNoBorders": "Χωρίς περιγράμματα",
   "DE.Views.TableSettings.txtTable_Accent": "Τόνος",
+  "DE.Views.TableSettings.txtTable_Bordered": "Με Περιθώρια",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Με Περιθώρια & Γραμμές",
   "DE.Views.TableSettings.txtTable_Colorful": "Πολύχρωμο",
   "DE.Views.TableSettings.txtTable_Dark": "Σκούρο",
   "DE.Views.TableSettings.txtTable_GridTable": "Πίνακας Πλέγματος",
@@ -2788,6 +2860,7 @@
   "DE.Views.Toolbar.tipControls": "Εισαγωγή στοιχείων ελέγχου περιεχομένου",
   "DE.Views.Toolbar.tipCopy": "Αντιγραφή",
   "DE.Views.Toolbar.tipCopyStyle": "Αντιγραφή τεχνοτροπίας",
+  "DE.Views.Toolbar.tipCut": "Αποκοπή",
   "DE.Views.Toolbar.tipDateTime": "Εισαγωγή τρέχουσας ημερομηνίας και ώρας",
   "DE.Views.Toolbar.tipDecFont": "Μείωση μεγέθους γραμματοσειράς",
   "DE.Views.Toolbar.tipDecPrLeft": "Μείωση εσοχής",
@@ -2882,6 +2955,7 @@
   "DE.Views.ViewTab.textRulers": "Χάρακες",
   "DE.Views.ViewTab.textStatusBar": "Γραμμή Κατάστασης",
   "DE.Views.ViewTab.textZoom": "Εστίαση",
+  "DE.Views.ViewTab.tipDarkDocument": "Σκούρο έγγραφο",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Αυτόματα",
   "DE.Views.WatermarkSettingsDialog.textBold": "Έντονα",
   "DE.Views.WatermarkSettingsDialog.textColor": "Χρώμα κειμένου",

apps/documenteditor/main/locale/en.json

@@ -285,11 +285,13 @@
   "Common.define.smartArt.textVerticalPictureList": "Vertical Picture List",
   "Common.define.smartArt.textVerticalProcess": "Vertical Process",
   "Common.Translation.textMoreButton": "More",
+  "Common.Translation.tipFileLocked": "Document is locked for editing. You can make changes and save it as local copy later.",
+  "Common.Translation.tipFileReadOnly": "The file is read-only. To keep your changes, save the file with a new name or in a different location.",
   "Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.",
   "Common.Translation.warnFileLockedBtnEdit": "Create a copy",
   "Common.Translation.warnFileLockedBtnView": "Open for viewing",
   "Common.UI.ButtonColored.textAutoColor": "Automatic",
-  "Common.UI.ButtonColored.textNewColor": "Add New Custom Color",
+  "Common.UI.ButtonColored.textNewColor": "Add new custom color",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "August",
   "Common.UI.Calendar.textDecember": "December",
@@ -351,9 +353,9 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace all",
   "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
   "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br>Please click to save your changes and reload the updates.",
-  "Common.UI.ThemeColorPalette.textRecentColors": "Recent Colors",
+  "Common.UI.ThemeColorPalette.textRecentColors": "Recent colors",
-  "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standard colors",
-  "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Theme colors",
   "Common.UI.Themes.txtThemeClassicLight": "Classic Light",
   "Common.UI.Themes.txtThemeContrastDark": "Contrast Dark",
   "Common.UI.Themes.txtThemeDark": "Dark",
@@ -458,6 +460,7 @@
   "Common.Views.Header.textCompactView": "Hide Toolbar",
   "Common.Views.Header.textHideLines": "Hide Rulers",
   "Common.Views.Header.textHideStatusBar": "Hide Status Bar",
+  "Common.Views.Header.textReadOnly": "Read only",
   "Common.Views.Header.textRemoveFavorite": "Remove from Favorites",
   "Common.Views.Header.textShare": "Share",
   "Common.Views.Header.textZoom": "Zoom",
@@ -465,6 +468,7 @@
   "Common.Views.Header.tipDownload": "Download file",
   "Common.Views.Header.tipGoEdit": "Edit current file",
   "Common.Views.Header.tipPrint": "Print file",
+  "Common.Views.Header.tipPrintQuick": "Quick print",
   "Common.Views.Header.tipRedo": "Redo",
   "Common.Views.Header.tipSave": "Save",
   "Common.Views.Header.tipSearch": "Search",
@@ -561,15 +565,15 @@
   "Common.Views.ReviewChanges.txtChat": "Chat",
   "Common.Views.ReviewChanges.txtClose": "Close",
   "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode",
-  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments",
+  "Common.Views.ReviewChanges.txtCommentRemAll": "Remove all comments",
-  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments",
+  "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove current comments",
-  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments",
+  "Common.Views.ReviewChanges.txtCommentRemMy": "Remove my comments",
   "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments",
   "Common.Views.ReviewChanges.txtCommentRemove": "Remove",
   "Common.Views.ReviewChanges.txtCommentResolve": "Resolve",
-  "Common.Views.ReviewChanges.txtCommentResolveAll": "Resolve All Comments",
+  "Common.Views.ReviewChanges.txtCommentResolveAll": "Resolve all comments",
-  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Resolve Current Comments",
+  "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Resolve current comments",
-  "Common.Views.ReviewChanges.txtCommentResolveMy": "Resolve My Comments",
+  "Common.Views.ReviewChanges.txtCommentResolveMy": "Resolve my comments",
   "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Resolve My Current Comments",
   "Common.Views.ReviewChanges.txtCompare": "Compare",
   "Common.Views.ReviewChanges.txtDocLang": "Language",
@@ -700,6 +704,15 @@
   "Common.Views.UserNameDialog.textDontShow": "Don't ask me again",
   "Common.Views.UserNameDialog.textLabel": "Label:",
   "Common.Views.UserNameDialog.textLabelError": "Label must not be empty.",
+  "DE.Controllers.DocProtection.txtIsProtectedComment": "Document is protected. You may only insert comments to this document.",
+  "DE.Controllers.DocProtection.txtIsProtectedForms": "Document is protected. You may only fill in forms in this document.",
+  "DE.Controllers.DocProtection.txtIsProtectedTrack": "Document is protected. You may edit this document, but all changes will be tracked.",
+  "DE.Controllers.DocProtection.txtIsProtectedView": "Document is protected. You may only view this document.",
+  "DE.Controllers.DocProtection.txtWasProtectedComment": "Document has been protected by another user.\nYou may only insert comments to this document.",
+  "DE.Controllers.DocProtection.txtWasProtectedForms": "Document has been protected by another user.\nYou may only fill in forms in this document.",
+  "DE.Controllers.DocProtection.txtWasProtectedTrack": "Document has been protected by another user.\nYou may edit this document, but all changes will be tracked.",
+  "DE.Controllers.DocProtection.txtWasProtectedView": "Document has been protected by another user.\nYou may only view this document.",
+  "DE.Controllers.DocProtection.txtWasUnprotected": "Document has been unprotected.",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document",
   "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
@@ -727,6 +740,7 @@
   "DE.Controllers.Main.downloadTitleText": "Downloading Document",
   "DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
+  "DE.Controllers.Main.errorCannotPasteImg": "We can't paste this image from the Clipboard, but you can save it to your device and \ninsert it from there, or you can copy the image without text and paste it into the document.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
   "DE.Controllers.Main.errorComboSeries": "To create a combination chart, select at least two series of data.",
   "DE.Controllers.Main.errorCompare": "The Compare Documents feature is not available while co-editing. ",
@@ -830,6 +844,7 @@
   "DE.Controllers.Main.textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?",
   "DE.Controllers.Main.textShape": "Shape",
   "DE.Controllers.Main.textStrict": "Strict mode",
+  "DE.Controllers.Main.textTryQuickPrint": "You have selected Quick print: the entire document will be printed on the last selected or default printer.<br>Do you want to continue?",
   "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
   "DE.Controllers.Main.textUndo": "Undo",
@@ -838,7 +853,7 @@
   "DE.Controllers.Main.titleUpdateVersion": "Version changed",
   "DE.Controllers.Main.txtAbove": "above",
   "DE.Controllers.Main.txtArt": "Your text here",
-  "DE.Controllers.Main.txtBasicShapes": "Basic Shapes",
+  "DE.Controllers.Main.txtBasicShapes": "Basic shapes",
   "DE.Controllers.Main.txtBelow": "below",
   "DE.Controllers.Main.txtBookmarkError": "Error! Bookmark not defined.",
   "DE.Controllers.Main.txtButtons": "Buttons",
@@ -853,7 +868,7 @@
   "DE.Controllers.Main.txtEnterDate": "Enter a date",
   "DE.Controllers.Main.txtErrorLoadHistory": "History loading failed",
   "DE.Controllers.Main.txtEvenPage": "Even Page",
-  "DE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
+  "DE.Controllers.Main.txtFiguredArrows": "Figured arrows",
   "DE.Controllers.Main.txtFirstPage": "First Page",
   "DE.Controllers.Main.txtFooter": "Footer",
   "DE.Controllers.Main.txtFormulaNotInTable": "The Formula Not In Table",
@@ -1051,8 +1066,8 @@
   "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Rounded Rectangular Callout",
   "DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
   "DE.Controllers.Main.txtStyle_Caption": "Caption",
-  "DE.Controllers.Main.txtStyle_endnote_text": "Endnote Text",
+  "DE.Controllers.Main.txtStyle_endnote_text": "Endnote text",
-  "DE.Controllers.Main.txtStyle_footnote_text": "Footnote Text",
+  "DE.Controllers.Main.txtStyle_footnote_text": "Footnote text",
   "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1",
   "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2",
   "DE.Controllers.Main.txtStyle_Heading_3": "Heading 3",
@@ -1103,6 +1118,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
   "DE.Controllers.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
+  "DE.Controllers.Print.textMarginsLast": "Last Custom",
+  "DE.Controllers.Print.txtCustom": "Custom",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Invalid print range",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Enter either a single page number or a single page range (for example, 5-12). Or you can Print to PDF.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Warning",
   "DE.Controllers.Search.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
   "DE.Controllers.Search.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
@@ -1128,7 +1147,7 @@
   "DE.Controllers.Toolbar.textInsert": "Insert",
   "DE.Controllers.Toolbar.textIntegral": "Integrals",
   "DE.Controllers.Toolbar.textLargeOperator": "Large Operators",
-  "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms",
+  "DE.Controllers.Toolbar.textLimitAndLog": "Limits and Logarithms",
   "DE.Controllers.Toolbar.textMatrix": "Matrices",
   "DE.Controllers.Toolbar.textOperator": "Operators",
   "DE.Controllers.Toolbar.textRadical": "Radicals",
@@ -1164,52 +1183,52 @@
   "DE.Controllers.Toolbar.txtAccent_Hat": "Hat",
   "DE.Controllers.Toolbar.txtAccent_Smile": "Breve",
   "DE.Controllers.Toolbar.txtAccent_Tilde": "Tilde",
-  "DE.Controllers.Toolbar.txtBracket_Angle": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Angle": "Angle brackets",
-  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Brackets with separators",
+  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Angle brackets with separator",
-  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Brackets with separators",
+  "DE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Angle brackets with two separators",
-  "DE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Right angle bracket",
-  "DE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Left angle bracket",
-  "DE.Controllers.Toolbar.txtBracket_Curve": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Curve": "Curly brackets",
-  "DE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Brackets with separators",
+  "DE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Curly brackets with separator",
-  "DE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Right curly bracket",
-  "DE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Left curly bracket",
   "DE.Controllers.Toolbar.txtBracket_Custom_1": "Cases (two conditions)",
   "DE.Controllers.Toolbar.txtBracket_Custom_2": "Cases (three conditions)",
   "DE.Controllers.Toolbar.txtBracket_Custom_3": "Stack object",
-  "DE.Controllers.Toolbar.txtBracket_Custom_4": "Stack object",
+  "DE.Controllers.Toolbar.txtBracket_Custom_4": "Stack object in parentheses",
   "DE.Controllers.Toolbar.txtBracket_Custom_5": "Cases example",
   "DE.Controllers.Toolbar.txtBracket_Custom_6": "Binomial coefficient",
-  "DE.Controllers.Toolbar.txtBracket_Custom_7": "Binomial coefficient",
+  "DE.Controllers.Toolbar.txtBracket_Custom_7": "Binomial coefficient in angle brackets",
-  "DE.Controllers.Toolbar.txtBracket_Line": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Line": "Vertical bars",
-  "DE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Right vertical bar",
-  "DE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Left vertical bar",
-  "DE.Controllers.Toolbar.txtBracket_LineDouble": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_LineDouble": "Double vertical bars",
-  "DE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Right double vertical bar",
-  "DE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Left double vertical bar",
-  "DE.Controllers.Toolbar.txtBracket_LowLim": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_LowLim": "Floor",
-  "DE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Right floor",
-  "DE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Left floor",
-  "DE.Controllers.Toolbar.txtBracket_Round": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Round": "Parentheses",
-  "DE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Brackets with separators",
+  "DE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Parentheses with separator",
-  "DE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Right parenthesis",
-  "DE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Left parenthesis",
-  "DE.Controllers.Toolbar.txtBracket_Square": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Square": "Square brackets",
-  "DE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Placeholder between two right square brackets",
-  "DE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Inverted square brackets",
-  "DE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Right square bracket",
-  "DE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Left square bracket",
-  "DE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Placeholder between two left square brackets",
-  "DE.Controllers.Toolbar.txtBracket_SquareDouble": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_SquareDouble": "Double square brackets",
-  "DE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Right double square bracket",
-  "DE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Left double square bracket",
-  "DE.Controllers.Toolbar.txtBracket_UppLim": "Brackets",
+  "DE.Controllers.Toolbar.txtBracket_UppLim": "Ceiling",
-  "DE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Right ceiling",
-  "DE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Single bracket",
+  "DE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Left ceiling",
   "DE.Controllers.Toolbar.txtFractionDiagonal": "Skewed fraction",
-  "DE.Controllers.Toolbar.txtFractionDifferential_1": "Differential",
+  "DE.Controllers.Toolbar.txtFractionDifferential_1": "dx over dy",
-  "DE.Controllers.Toolbar.txtFractionDifferential_2": "Differential",
+  "DE.Controllers.Toolbar.txtFractionDifferential_2": "cap delta y over cap delta x",
-  "DE.Controllers.Toolbar.txtFractionDifferential_3": "Differential",
+  "DE.Controllers.Toolbar.txtFractionDifferential_3": "partial y over partial x",
-  "DE.Controllers.Toolbar.txtFractionDifferential_4": "Differential",
+  "DE.Controllers.Toolbar.txtFractionDifferential_4": "delta y over delta x",
   "DE.Controllers.Toolbar.txtFractionHorizontal": "Linear fraction",
   "DE.Controllers.Toolbar.txtFractionPi_2": "Pi over 2",
   "DE.Controllers.Toolbar.txtFractionSmall": "Small fraction",
@@ -1245,63 +1264,63 @@
   "DE.Controllers.Toolbar.txtIntegral_dtheta": "Differential theta",
   "DE.Controllers.Toolbar.txtIntegral_dx": "Differential x",
   "DE.Controllers.Toolbar.txtIntegral_dy": "Differential y",
-  "DE.Controllers.Toolbar.txtIntegralCenterSubSup": "Integral",
+  "DE.Controllers.Toolbar.txtIntegralCenterSubSup": "Integral with stacked limits",
   "DE.Controllers.Toolbar.txtIntegralDouble": "Double integral",
-  "DE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double integral",
+  "DE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double integral with stacked limits",
-  "DE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double integral",
+  "DE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double integral with limits",
   "DE.Controllers.Toolbar.txtIntegralOriented": "Contour integral",
-  "DE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Contour integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Contour integral with stacked limits",
   "DE.Controllers.Toolbar.txtIntegralOrientedDouble": "Surface integral",
-  "DE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Surface integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Surface integral with stacked limits",
-  "DE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Surface integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Surface integral with limits",
-  "DE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Contour integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Contour integral with limits",
   "DE.Controllers.Toolbar.txtIntegralOrientedTriple": "Volume integral",
-  "DE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume integral with stacked limits",
-  "DE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume integral",
+  "DE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume integral with limits",
-  "DE.Controllers.Toolbar.txtIntegralSubSup": "Integral",
+  "DE.Controllers.Toolbar.txtIntegralSubSup": "Integral with limits",
   "DE.Controllers.Toolbar.txtIntegralTriple": "Triple integral",
-  "DE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple integral",
+  "DE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple integral with stacked limits",
-  "DE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple integral",
+  "DE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple integral with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Wedge",
+  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Logical And",
-  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Wedge",
+  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Logical And with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Wedge",
+  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Logical And with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Wedge",
+  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Logical And with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Wedge",
+  "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Logical And with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-product",
-  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-product",
+  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-product with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-product",
+  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-product with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-product",
+  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-product with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-product",
+  "DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-product with subscript/superscript limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation over k of n choose k",
-  "DE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation from i equal zero to n",
-  "DE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation example using two indices",
-  "DE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Product",
+  "DE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Product example",
-  "DE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union",
+  "DE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union example",
-  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Vee",
+  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Logical Or",
-  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Vee",
+  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Logical Or with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Vee",
+  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Logical Or with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Vee",
+  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Logical Or with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Vee",
+  "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Logical Or with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLargeOperator_Intersection": "Intersection",
-  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection",
+  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection",
+  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection",
+  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection",
+  "DE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLargeOperator_Prod": "Product",
-  "DE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Product",
+  "DE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Product with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Product",
+  "DE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Product with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Product",
+  "DE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Product with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Product",
+  "DE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Product with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLargeOperator_Sum": "Summation",
-  "DE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Summation with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Summation with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Summation with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Summation",
+  "DE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Summation with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLargeOperator_Union": "Union",
-  "DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union",
+  "DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union with lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union",
+  "DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union with limits",
-  "DE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union",
+  "DE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union with subscript lower limit",
-  "DE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union",
+  "DE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union with subscript/superscript limits",
   "DE.Controllers.Toolbar.txtLimitLog_Custom_1": "Limit example",
   "DE.Controllers.Toolbar.txtLimitLog_Custom_2": "Maximum example",
   "DE.Controllers.Toolbar.txtLimitLog_Lim": "Limit",
@@ -1316,10 +1335,10 @@
   "DE.Controllers.Toolbar.txtMatrix_1_3": "1x3 empty matrix",
   "DE.Controllers.Toolbar.txtMatrix_2_1": "2x1 empty matrix",
   "DE.Controllers.Toolbar.txtMatrix_2_2": "2x2 empty matrix",
-  "DE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Empty matrix with brackets",
+  "DE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Empty 2 by 2 matrix in double vertical bars",
-  "DE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Empty matrix with brackets",
+  "DE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Empty 2 by 2 determinant",
-  "DE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Empty matrix with brackets",
+  "DE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Empty 2 by 2 matrix in parentheses",
-  "DE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Empty matrix with brackets",
+  "DE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Empty 2 by 2 matrix in brackets",
   "DE.Controllers.Toolbar.txtMatrix_2_3": "2x3 empty matrix",
   "DE.Controllers.Toolbar.txtMatrix_3_1": "3x1 empty matrix",
   "DE.Controllers.Toolbar.txtMatrix_3_2": "3x2 empty matrix",
@@ -1328,12 +1347,12 @@
   "DE.Controllers.Toolbar.txtMatrix_Dots_Center": "Midline dots",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Diagonal dots",
   "DE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Vertical dots",
-  "DE.Controllers.Toolbar.txtMatrix_Flat_Round": "Sparse matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Flat_Round": "Sparse matrix in parentheses",
-  "DE.Controllers.Toolbar.txtMatrix_Flat_Square": "Sparse matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Flat_Square": "Sparse matrix in brackets",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 identity matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_2": "2x2 identity matrix with zeros",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "3x3 identity matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "2x2 identity matrix with blank off-diagonal cells",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 identity matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3": "3x3 identity matrix with zeros",
-  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 identity matrix",
+  "DE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "3x3 identity matrix with blank off-diagonal cells",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Right-left arrow below",
   "DE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Right-left arrow above",
   "DE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Leftwards arrow below",
@@ -1345,8 +1364,8 @@
   "DE.Controllers.Toolbar.txtOperator_Custom_2": "Delta yields",
   "DE.Controllers.Toolbar.txtOperator_Definition": "Equal to by definition",
   "DE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta equal to",
-  "DE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Right-left arrow below",
+  "DE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Right-left double arrow below",
-  "DE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Right-left arrow above",
+  "DE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Right-left double arrow above",
   "DE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Leftwards arrow below",
   "DE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Leftwards arrow above",
   "DE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Rightwards arrow below",
@@ -1355,16 +1374,16 @@
   "DE.Controllers.Toolbar.txtOperator_MinusEquals": "Minus equal",
   "DE.Controllers.Toolbar.txtOperator_PlusEquals": "Plus equal",
   "DE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Measured by",
-  "DE.Controllers.Toolbar.txtRadicalCustom_1": "Radical",
+  "DE.Controllers.Toolbar.txtRadicalCustom_1": "Right hand side of quadratic formula",
-  "DE.Controllers.Toolbar.txtRadicalCustom_2": "Radical",
+  "DE.Controllers.Toolbar.txtRadicalCustom_2": "Square root of a squared plus b squared",
   "DE.Controllers.Toolbar.txtRadicalRoot_2": "Square root with degree",
   "DE.Controllers.Toolbar.txtRadicalRoot_3": "Cubic root",
   "DE.Controllers.Toolbar.txtRadicalRoot_n": "Radical with degree",
   "DE.Controllers.Toolbar.txtRadicalSqrt": "Square root",
-  "DE.Controllers.Toolbar.txtScriptCustom_1": "Script",
+  "DE.Controllers.Toolbar.txtScriptCustom_1": "x subscript y squared",
-  "DE.Controllers.Toolbar.txtScriptCustom_2": "Script",
+  "DE.Controllers.Toolbar.txtScriptCustom_2": "e to the minus i omega t",
-  "DE.Controllers.Toolbar.txtScriptCustom_3": "Script",
+  "DE.Controllers.Toolbar.txtScriptCustom_3": "x squared",
-  "DE.Controllers.Toolbar.txtScriptCustom_4": "Script",
+  "DE.Controllers.Toolbar.txtScriptCustom_4": "Y left superscript n left subscript one",
   "DE.Controllers.Toolbar.txtScriptSub": "Subscript",
   "DE.Controllers.Toolbar.txtScriptSubSup": "Subscript-superscript",
   "DE.Controllers.Toolbar.txtScriptSubSupLeft": "Left subscript-superscript",
@@ -1623,6 +1642,7 @@
   "DE.Views.DocProtection.txtDocProtectedView": "Document is protected.<br>You may only view this document.",
   "DE.Views.DocProtection.txtDocUnlockDescription": "Enter a password to unprotect document",
   "DE.Views.DocProtection.txtProtectDoc": "Protect Document",
+  "DE.Views.DocProtection.txtUnlockTitle": "Unprotect Document",
   "DE.Views.DocumentHolder.aboveText": "Above",
   "DE.Views.DocumentHolder.addCommentText": "Add comment",
   "DE.Views.DocumentHolder.advancedDropCapText": "Drop Cap Settings",
@@ -1653,8 +1673,8 @@
   "DE.Views.DocumentHolder.directHText": "Horizontal",
   "DE.Views.DocumentHolder.directionText": "Text direction",
   "DE.Views.DocumentHolder.editChartText": "Edit data",
-  "DE.Views.DocumentHolder.editFooterText": "Edit Footer",
+  "DE.Views.DocumentHolder.editFooterText": "Edit footer",
-  "DE.Views.DocumentHolder.editHeaderText": "Edit Header",
+  "DE.Views.DocumentHolder.editHeaderText": "Edit header",
   "DE.Views.DocumentHolder.editHyperlinkText": "Edit Hyperlink",
   "DE.Views.DocumentHolder.eqToInlineText": "Change to Inline",
   "DE.Views.DocumentHolder.guestText": "Guest",
@@ -1719,7 +1739,7 @@
   "DE.Views.DocumentHolder.textDistributeRows": "Distribute rows",
   "DE.Views.DocumentHolder.textEditControls": "Content control settings",
   "DE.Views.DocumentHolder.textEditPoints": "Edit Points",
-  "DE.Views.DocumentHolder.textEditWrapBoundary": "Edit Wrap Boundary",
+  "DE.Views.DocumentHolder.textEditWrapBoundary": "Edit wrap boundary",
   "DE.Views.DocumentHolder.textFlipH": "Flip Horizontally",
   "DE.Views.DocumentHolder.textFlipV": "Flip Vertically",
   "DE.Views.DocumentHolder.textFollow": "Follow move",
@@ -1952,10 +1972,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Version",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persons who have rights",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symbols with spaces",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Characters with spaces",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistics",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subject",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbols",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Characters",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Tags",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded",
@@ -2021,6 +2041,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "View None",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Proofing",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Point",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Show the Quick Print button in the editor header",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "The document will be printed on the last selected or default printer",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Enable All",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Enable all macros without a notification",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Show track changes",
@@ -2329,21 +2351,21 @@
   "DE.Views.Links.capBtnTOF": "Table of Figures",
   "DE.Views.Links.confirmDeleteFootnotes": "Do you want to delete all footnotes?",
   "DE.Views.Links.confirmReplaceTOF": "Do you want to replace the selected table of figures?",
-  "DE.Views.Links.mniConvertNote": "Convert All Notes",
+  "DE.Views.Links.mniConvertNote": "Convert all notes",
-  "DE.Views.Links.mniDelFootnote": "Delete All Notes",
+  "DE.Views.Links.mniDelFootnote": "Delete all notes",
-  "DE.Views.Links.mniInsEndnote": "Insert Endnote",
+  "DE.Views.Links.mniInsEndnote": "Insert endnote",
-  "DE.Views.Links.mniInsFootnote": "Insert Footnote",
+  "DE.Views.Links.mniInsFootnote": "Insert footnote",
-  "DE.Views.Links.mniNoteSettings": "Notes Settings",
+  "DE.Views.Links.mniNoteSettings": "Notes settings",
   "DE.Views.Links.textContentsRemove": "Remove table of contents",
   "DE.Views.Links.textContentsSettings": "Settings",
   "DE.Views.Links.textConvertToEndnotes": "Convert All Footnotes to Endnotes",
   "DE.Views.Links.textConvertToFootnotes": "Convert All Endnotes to Footnotes",
-  "DE.Views.Links.textGotoEndnote": "Go to Endnotes",
+  "DE.Views.Links.textGotoEndnote": "Go to endnotes",
-  "DE.Views.Links.textGotoFootnote": "Go to Footnotes",
+  "DE.Views.Links.textGotoFootnote": "Go to footnotes",
   "DE.Views.Links.textSwapNotes": "Swap Footnotes and Endnotes",
   "DE.Views.Links.textUpdateAll": "Update entire table",
   "DE.Views.Links.textUpdatePages": "Update page numbers only",
-  "DE.Views.Links.tipAddText": "Include heading in the Table of Contents",
+  "DE.Views.Links.tipAddText": "Include heading in the table of contents",
   "DE.Views.Links.tipBookmarks": "Create a bookmark",
   "DE.Views.Links.tipCaption": "Insert caption",
   "DE.Views.Links.tipContents": "Insert table of contents",
@@ -2354,7 +2376,7 @@
   "DE.Views.Links.tipTableFigures": "Insert table of figures",
   "DE.Views.Links.tipTableFiguresUpdate": "Update table of figures",
   "DE.Views.Links.titleUpdateTOF": "Update Table of Figures",
-  "DE.Views.Links.txtDontShowTof": "Do Not Show in Table of Contents",
+  "DE.Views.Links.txtDontShowTof": "Do not show in table of contents",
   "DE.Views.Links.txtLevel": "Level",
   "DE.Views.ListSettingsDialog.textAuto": "Automatic",
   "DE.Views.ListSettingsDialog.textCenter": "Center",
@@ -2602,12 +2624,40 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Last Custom",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Moderate",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Narrow",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Wide",
+  "DE.Views.PrintWithPreview.txtAllPages": "All pages",
+  "DE.Views.PrintWithPreview.txtBottom": "Bottom",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Current page",
+  "DE.Views.PrintWithPreview.txtCustom": "Custom",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Custom print",
+  "DE.Views.PrintWithPreview.txtLandscape": "Landscape",
+  "DE.Views.PrintWithPreview.txtLeft": "Left",
+  "DE.Views.PrintWithPreview.txtMargins": "Margins",
+  "DE.Views.PrintWithPreview.txtOf": "of {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Page",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Page number invalid",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Page orientation",
+  "DE.Views.PrintWithPreview.txtPages": "Pages",
+  "DE.Views.PrintWithPreview.txtPageSize": "Page size",
+  "DE.Views.PrintWithPreview.txtPortrait": "Portrait",
+  "DE.Views.PrintWithPreview.txtPrint": "Print",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Print to PDF",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Print range",
+  "DE.Views.PrintWithPreview.txtRight": "Right",
+  "DE.Views.PrintWithPreview.txtSelection": "Selection",
+  "DE.Views.PrintWithPreview.txtTop": "Top",
   "DE.Views.ProtectDialog.textComments": "Comments",
   "DE.Views.ProtectDialog.textForms": "Filling forms",
   "DE.Views.ProtectDialog.textReview": "Tracked changes",
   "DE.Views.ProtectDialog.textView": "No changes (Read only)",
   "DE.Views.ProtectDialog.txtAllow": "Allow only this type of editing in the document",
   "DE.Views.ProtectDialog.txtIncorrectPwd": "Confirmation password is not identical",
+  "DE.Views.ProtectDialog.txtLimit": "Password is limited to 15 characters",
   "DE.Views.ProtectDialog.txtOptional": "optional",
   "DE.Views.ProtectDialog.txtPassword": "Password",
   "DE.Views.ProtectDialog.txtProtect": "Protect",
@@ -2686,7 +2736,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "Pattern",
   "DE.Views.ShapeSettings.textPosition": "Position",
   "DE.Views.ShapeSettings.textRadial": "Radial",
-  "DE.Views.ShapeSettings.textRecentlyUsed": "Recently Used",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "Recently used",
   "DE.Views.ShapeSettings.textRotate90": "Rotate 90°",
   "DE.Views.ShapeSettings.textRotation": "Rotation",
   "DE.Views.ShapeSettings.textSelectImage": "Select Picture",
@@ -2744,6 +2794,12 @@
   "DE.Views.Statusbar.tipZoomIn": "Zoom in",
   "DE.Views.Statusbar.tipZoomOut": "Zoom out",
   "DE.Views.Statusbar.txtPageNumInvalid": "Page number invalid",
+  "DE.Views.Statusbar.txtPages": "Pages",
+  "DE.Views.Statusbar.txtParagraphs": "Paragraphs",
+  "DE.Views.Statusbar.txtSpaces": "Symbols with spaces",
+  "DE.Views.Statusbar.txtSymbols": "Symbols",
+  "DE.Views.Statusbar.txtWordCount": "Word count",
+  "DE.Views.Statusbar.txtWords": "Words",
   "DE.Views.StyleTitleDialog.textHeader": "Create new style",
   "DE.Views.StyleTitleDialog.textNextStyle": "Next paragraph style",
   "DE.Views.StyleTitleDialog.textTitle": "Title",
@@ -2997,37 +3053,37 @@
   "DE.Views.Toolbar.capImgGroup": "Group",
   "DE.Views.Toolbar.capImgWrapping": "Wrapping",
   "DE.Views.Toolbar.mniCapitalizeWords": "Capitalize Each Word",
-  "DE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
+  "DE.Views.Toolbar.mniCustomTable": "Insert custom table",
-  "DE.Views.Toolbar.mniDrawTable": "Draw Table",
+  "DE.Views.Toolbar.mniDrawTable": "Draw table",
   "DE.Views.Toolbar.mniEditControls": "Control Settings",
   "DE.Views.Toolbar.mniEditDropCap": "Drop Cap Settings",
-  "DE.Views.Toolbar.mniEditFooter": "Edit Footer",
+  "DE.Views.Toolbar.mniEditFooter": "Edit footer",
-  "DE.Views.Toolbar.mniEditHeader": "Edit Header",
+  "DE.Views.Toolbar.mniEditHeader": "Edit header",
-  "DE.Views.Toolbar.mniEraseTable": "Erase Table",
+  "DE.Views.Toolbar.mniEraseTable": "Erase table",
   "DE.Views.Toolbar.mniFromFile": "From File",
   "DE.Views.Toolbar.mniFromStorage": "From Storage",
   "DE.Views.Toolbar.mniFromUrl": "From URL",
-  "DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders",
+  "DE.Views.Toolbar.mniHiddenBorders": "Hidden table borders",
-  "DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters",
+  "DE.Views.Toolbar.mniHiddenChars": "Nonprinting characters",
-  "DE.Views.Toolbar.mniHighlightControls": "Highlight Settings",
+  "DE.Views.Toolbar.mniHighlightControls": "Highlight settings",
   "DE.Views.Toolbar.mniImageFromFile": "Image from File",
   "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage",
   "DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
   "DE.Views.Toolbar.mniInsertSSE": "Insert Spreadsheet",
   "DE.Views.Toolbar.mniLowerCase": "lowercase",
-  "DE.Views.Toolbar.mniRemoveFooter": "Remove Footer",
+  "DE.Views.Toolbar.mniRemoveFooter": "Remove footer",
-  "DE.Views.Toolbar.mniRemoveHeader": "Remove Header",
+  "DE.Views.Toolbar.mniRemoveHeader": "Remove header",
   "DE.Views.Toolbar.mniSentenceCase": "Sentence case.",
-  "DE.Views.Toolbar.mniTextToTable": "Convert Text to Table",
+  "DE.Views.Toolbar.mniTextToTable": "Convert text to table",
   "DE.Views.Toolbar.mniToggleCase": "tOGGLE cASE",
   "DE.Views.Toolbar.mniUpperCase": "UPPERCASE",
-  "DE.Views.Toolbar.strMenuNoFill": "No Fill",
+  "DE.Views.Toolbar.strMenuNoFill": "No fill",
   "DE.Views.Toolbar.textAutoColor": "Automatic",
   "DE.Views.Toolbar.textBold": "Bold",
   "DE.Views.Toolbar.textBottom": "Bottom: ",
   "DE.Views.Toolbar.textChangeLevel": "Change List Level",
   "DE.Views.Toolbar.textCheckboxControl": "Check box",
-  "DE.Views.Toolbar.textColumnsCustom": "Custom Columns",
+  "DE.Views.Toolbar.textColumnsCustom": "Custom columns",
   "DE.Views.Toolbar.textColumnsLeft": "Left",
   "DE.Views.Toolbar.textColumnsOne": "One",
   "DE.Views.Toolbar.textColumnsRight": "Right",
@@ -3035,18 +3091,18 @@
   "DE.Views.Toolbar.textColumnsTwo": "Two",
   "DE.Views.Toolbar.textComboboxControl": "Combo box",
   "DE.Views.Toolbar.textContinuous": "Continuous",
-  "DE.Views.Toolbar.textContPage": "Continuous Page",
+  "DE.Views.Toolbar.textContPage": "Continuous page",
-  "DE.Views.Toolbar.textCustomLineNumbers": "Line Numbering Options",
+  "DE.Views.Toolbar.textCustomLineNumbers": "Line numbering options",
   "DE.Views.Toolbar.textDateControl": "Date",
   "DE.Views.Toolbar.textDropdownControl": "Drop-down list",
-  "DE.Views.Toolbar.textEditWatermark": "Custom Watermark",
+  "DE.Views.Toolbar.textEditWatermark": "Custom watermark",
-  "DE.Views.Toolbar.textEvenPage": "Even Page",
+  "DE.Views.Toolbar.textEvenPage": "Even page",
   "DE.Views.Toolbar.textInMargin": "In Margin",
-  "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
+  "DE.Views.Toolbar.textInsColumnBreak": "Insert column break",
   "DE.Views.Toolbar.textInsertPageCount": "Insert number of pages",
-  "DE.Views.Toolbar.textInsertPageNumber": "Insert page number",
+  "DE.Views.Toolbar.textInsertPageNumber": "Insert Page Number",
-  "DE.Views.Toolbar.textInsPageBreak": "Insert Page Break",
+  "DE.Views.Toolbar.textInsPageBreak": "Insert page break",
-  "DE.Views.Toolbar.textInsSectionBreak": "Insert Section Break",
+  "DE.Views.Toolbar.textInsSectionBreak": "Insert section break",
   "DE.Views.Toolbar.textInText": "In Text",
   "DE.Views.Toolbar.textItalic": "Italic",
   "DE.Views.Toolbar.textLandscape": "Landscape",
@@ -3059,19 +3115,19 @@
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Wide",
   "DE.Views.Toolbar.textNewColor": "Add New Custom Color",
-  "DE.Views.Toolbar.textNextPage": "Next Page",
+  "DE.Views.Toolbar.textNextPage": "Next page",
   "DE.Views.Toolbar.textNoHighlight": "No highlighting",
   "DE.Views.Toolbar.textNone": "None",
-  "DE.Views.Toolbar.textOddPage": "Odd Page",
+  "DE.Views.Toolbar.textOddPage": "Odd page",
-  "DE.Views.Toolbar.textPageMarginsCustom": "Custom Margins",
+  "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
-  "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
+  "DE.Views.Toolbar.textPageSizeCustom": "Custom page size",
   "DE.Views.Toolbar.textPictureControl": "Picture",
   "DE.Views.Toolbar.textPlainControl": "Plain text",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRemoveControl": "Remove Content Control",
-  "DE.Views.Toolbar.textRemWatermark": "Remove Watermark",
+  "DE.Views.Toolbar.textRemWatermark": "Remove watermark",
-  "DE.Views.Toolbar.textRestartEachPage": "Restart Each Page",
+  "DE.Views.Toolbar.textRestartEachPage": "Restart each page",
-  "DE.Views.Toolbar.textRestartEachSection": "Restart Each Section",
+  "DE.Views.Toolbar.textRestartEachSection": "Restart each section",
   "DE.Views.Toolbar.textRichControl": "Rich text",
   "DE.Views.Toolbar.textRight": "Right: ",
   "DE.Views.Toolbar.textStrikeout": "Strikethrough",
@@ -3083,7 +3139,7 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subscript",
   "DE.Views.Toolbar.textSuperscript": "Superscript",
-  "DE.Views.Toolbar.textSuppressForCurrentParagraph": "Suppress for Current Paragraph",
+  "DE.Views.Toolbar.textSuppressForCurrentParagraph": "Suppress for current paragraph",
   "DE.Views.Toolbar.textTabCollaboration": "Collaboration",
   "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Home",
@@ -3130,7 +3186,7 @@
   "DE.Views.Toolbar.tipInsertEquation": "Insert equation",
   "DE.Views.Toolbar.tipInsertHorizontalText": "Insert horizontal text box",
   "DE.Views.Toolbar.tipInsertImage": "Insert image",
-  "DE.Views.Toolbar.tipInsertNum": "Insert Page Number",
+  "DE.Views.Toolbar.tipInsertNum": "Insert page number",
   "DE.Views.Toolbar.tipInsertShape": "Insert autoshape",
   "DE.Views.Toolbar.tipInsertSmartArt": "Insert SmartArt",
   "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol",
@@ -3163,10 +3219,11 @@
   "DE.Views.Toolbar.tipPageMargins": "Page margins",
   "DE.Views.Toolbar.tipPageOrient": "Page orientation",
   "DE.Views.Toolbar.tipPageSize": "Page size",
-  "DE.Views.Toolbar.tipParagraphStyle": "Paragraph Style",
+  "DE.Views.Toolbar.tipParagraphStyle": "Paragraph style",
   "DE.Views.Toolbar.tipPaste": "Paste",
-  "DE.Views.Toolbar.tipPrColor": "Paragraph background color",
+  "DE.Views.Toolbar.tipPrColor": "Shading",
   "DE.Views.Toolbar.tipPrint": "Print",
+  "DE.Views.Toolbar.tipPrintQuick": "Quick print",
   "DE.Views.Toolbar.tipRedo": "Redo",
   "DE.Views.Toolbar.tipSave": "Save",
   "DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.",
@@ -3177,11 +3234,11 @@
   "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
   "DE.Views.Toolbar.tipUndo": "Undo",
   "DE.Views.Toolbar.tipWatermark": "Edit watermark",
-  "DE.Views.Toolbar.txtDistribHor": "Distribute Horizontally",
+  "DE.Views.Toolbar.txtDistribHor": "Distribute horizontally",
-  "DE.Views.Toolbar.txtDistribVert": "Distribute Vertically",
+  "DE.Views.Toolbar.txtDistribVert": "Distribute vertically",
-  "DE.Views.Toolbar.txtMarginAlign": "Align to Margin",
+  "DE.Views.Toolbar.txtMarginAlign": "Align to margin",
   "DE.Views.Toolbar.txtObjectsAlign": "Align Selected Objects",
-  "DE.Views.Toolbar.txtPageAlign": "Align to Page",
+  "DE.Views.Toolbar.txtPageAlign": "Align to page",
   "DE.Views.Toolbar.txtScheme1": "Office",
   "DE.Views.Toolbar.txtScheme10": "Median",
   "DE.Views.Toolbar.txtScheme11": "Metro",

apps/documenteditor/main/locale/es.json

@@ -285,6 +285,7 @@
   "Common.define.smartArt.textVerticalPictureList": "Lista vertical de imágenes",
   "Common.define.smartArt.textVerticalProcess": "Proceso vertical",
   "Common.Translation.textMoreButton": "Más",
+  "Common.Translation.tipFileLocked": "El documento está bloqueado para su edición. Puede hacer cambios y guardarlo como copia local más tarde.",
   "Common.Translation.warnFileLocked": "No puede editar este archivo porque está siendo editado en otra aplicación.",
   "Common.Translation.warnFileLockedBtnEdit": "Crear una copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
@@ -396,7 +397,7 @@
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorrección matemática",
   "Common.Views.AutoCorrectDialog.textNumbered": "Listas con numeración automática",
   "Common.Views.AutoCorrectDialog.textQuotes": "\"Comillas rectas\" con \"comillas tipográficas\"",
-  "Common.Views.AutoCorrectDialog.textRecognized": "Funciones Reconocidas",
+  "Common.Views.AutoCorrectDialog.textRecognized": "Funciones reconocidas",
   "Common.Views.AutoCorrectDialog.textRecognizedDesc": "Las siguientes expresiones son expresiones matemáticas reconocidas. No se pondrán en cursiva automáticamente.",
   "Common.Views.AutoCorrectDialog.textReplace": "Reemplazar",
   "Common.Views.AutoCorrectDialog.textReplaceText": "Reemplazar mientras escribe",
@@ -458,6 +459,7 @@
   "Common.Views.Header.textCompactView": "Esconder barra de herramientas",
   "Common.Views.Header.textHideLines": "Ocultar reglas",
   "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado",
+  "Common.Views.Header.textReadOnly": "Sólo lectura",
   "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos",
   "Common.Views.Header.textShare": "Compartir",
   "Common.Views.Header.textZoom": "Ampliación",
@@ -465,6 +467,7 @@
   "Common.Views.Header.tipDownload": "Descargar archivo",
   "Common.Views.Header.tipGoEdit": "Editar archivo actual",
   "Common.Views.Header.tipPrint": "Imprimir archivo",
+  "Common.Views.Header.tipPrintQuick": "Impresión rápida",
   "Common.Views.Header.tipRedo": "Rehacer",
   "Common.Views.Header.tipSave": "Guardar",
   "Common.Views.Header.tipSearch": "Búsqueda",
@@ -505,7 +508,7 @@
   "Common.Views.PasswordDialog.txtIncorrectPwd": "La contraseña de confirmación es",
   "Common.Views.PasswordDialog.txtPassword": "Contraseña",
   "Common.Views.PasswordDialog.txtRepeat": "Repita la contraseña",
-  "Common.Views.PasswordDialog.txtTitle": "Establezca una contraseña",
+  "Common.Views.PasswordDialog.txtTitle": "Establecer contraseña",
   "Common.Views.PasswordDialog.txtWarning": "Precaución: Si pierde u olvida su contraseña, no podrá recuperarla. Guárdalo en un lugar seguro.",
   "Common.Views.PluginDlg.textLoading": "Cargando",
   "Common.Views.Plugins.groupCaption": "Extensiones",
@@ -605,8 +608,8 @@
   "Common.Views.ReviewChangesDialog.txtNext": "Al siguiente cambio",
   "Common.Views.ReviewChangesDialog.txtPrev": "Al cambio anterior",
   "Common.Views.ReviewChangesDialog.txtReject": "Rechazar",
-  "Common.Views.ReviewChangesDialog.txtRejectAll": "Rechazar todos los cambjios",
+  "Common.Views.ReviewChangesDialog.txtRejectAll": "Rechazar todos los cambios",
-  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Rechazar Cambio Actual",
+  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Rechazar cambio actual",
   "Common.Views.ReviewPopover.textAdd": "Agregar",
   "Common.Views.ReviewPopover.textAddReply": "Agregar respuesta",
   "Common.Views.ReviewPopover.textCancel": "Cancelar",
@@ -644,7 +647,7 @@
   "Common.Views.SearchPanel.tipNextResult": "Resultado siguiente",
   "Common.Views.SearchPanel.tipPreviousResult": "Resultado anterior",
   "Common.Views.SelectFileDlg.textLoading": "Cargando",
-  "Common.Views.SelectFileDlg.textTitle": "Seleccionar fuente de datos",
+  "Common.Views.SelectFileDlg.textTitle": "Seleccionar origen de datos",
   "Common.Views.SignDialog.textBold": "Negrilla",
   "Common.Views.SignDialog.textCertificate": "Certificar",
   "Common.Views.SignDialog.textChange": "Cambiar",
@@ -653,7 +656,7 @@
   "Common.Views.SignDialog.textNameError": "El nombre del firmante no debe estar vacío.",
   "Common.Views.SignDialog.textPurpose": "Propósito al firmar este documento",
   "Common.Views.SignDialog.textSelect": "Seleccionar",
-  "Common.Views.SignDialog.textSelectImage": "Seleccionar Imagen",
+  "Common.Views.SignDialog.textSelectImage": "Seleccionar imagen",
   "Common.Views.SignDialog.textSignature": "La firma se ve como",
   "Common.Views.SignDialog.textTitle": "Firmar documento",
   "Common.Views.SignDialog.textUseImage": "o pulsar 'Seleccionar Imagen' para usar una imagen como firma",
@@ -662,12 +665,12 @@
   "Common.Views.SignDialog.tipFontSize": "Tamaño del tipo de letra",
   "Common.Views.SignSettingsDialog.textAllowComment": "Permitir al firmante agregar comentarios en el diálogo de firma",
   "Common.Views.SignSettingsDialog.textDefInstruction": "Antes de firmar este documento, verifique que el contenido que está firmando es correcto.",
-  "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "Correo electrónico del firmante sugerido",
-  "Common.Views.SignSettingsDialog.textInfoName": "Nombre",
+  "Common.Views.SignSettingsDialog.textInfoName": "Firmante sugerido",
-  "Common.Views.SignSettingsDialog.textInfoTitle": "Título de quien firma",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "Título del firmante sugerido",
   "Common.Views.SignSettingsDialog.textInstructions": "Instrucciones para quien firma",
   "Common.Views.SignSettingsDialog.textShowDate": "Presentar fecha de la firma",
-  "Common.Views.SignSettingsDialog.textTitle": "Preparación de la firma",
+  "Common.Views.SignSettingsDialog.textTitle": "Configuración de firma",
   "Common.Views.SignSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "Common.Views.SymbolTableDialog.textCharacter": "Carácter",
   "Common.Views.SymbolTableDialog.textCode": "Valor HEX de Unicode",
@@ -695,7 +698,7 @@
   "Common.Views.SymbolTableDialog.textSpecial": "Caracteres especiales",
   "Common.Views.SymbolTableDialog.textSymbols": "Símbolos",
   "Common.Views.SymbolTableDialog.textTitle": "Símbolo",
-  "Common.Views.SymbolTableDialog.textTradeMark": "Símbolo de marca comercial",
+  "Common.Views.SymbolTableDialog.textTradeMark": "Símbolo de marca registrada",
   "Common.Views.UserNameDialog.textDontShow": "No volver a preguntarme",
   "Common.Views.UserNameDialog.textLabel": "Etiqueta:",
   "Common.Views.UserNameDialog.textLabelError": "La etiqueta no debe estar vacía.",
@@ -1102,6 +1105,9 @@
   "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado",
   "DE.Controllers.Navigation.txtBeginning": "Principio del documento",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ir al principio de",
+  "DE.Controllers.Print.textMarginsLast": "Último personalizado",
+  "DE.Controllers.Print.txtCustom": "Personalizado",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Intervalo de impresión no válido",
   "DE.Controllers.Search.notcriticalErrorTitle": "Advertencia",
   "DE.Controllers.Search.textNoTextFound": "No se puede encontrar los datos que usted busca. Por favor, ajuste los parámetros de búsqueda.",
   "DE.Controllers.Search.textReplaceSkipped": "Se ha realizado la sustitución. Se han omitido {0} ocurrencias.",
@@ -1951,10 +1957,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "Versión PDF",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Ubicación",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personas que tienen derechos",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Símbolos con espacios",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Caracteres con espacios",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estadísticas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Asunto",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Caracteres",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etiquetas",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Subido",
@@ -2020,6 +2026,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Ver Ningunos",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Revisión",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Punto",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Mostrar el botón Impresión Rápida en el encabezado del editor",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "El documento se imprimirá en la última impresora seleccionada o predeterminada",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Habilitar todo",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Habilitar todas las macros sin notificación ",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Mostrar control de cambios",
@@ -2147,7 +2155,7 @@
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto seleccionado",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Mostrar",
   "DE.Views.HyperlinkSettingsDialog.textExternal": "Enlace externo",
-  "DE.Views.HyperlinkSettingsDialog.textInternal": "Lugar en documento",
+  "DE.Views.HyperlinkSettingsDialog.textInternal": "Lugar del documento",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Ajustes de enlace",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Información en pantalla",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Enlace a",
@@ -2189,7 +2197,7 @@
   "DE.Views.ImageSettings.txtThrough": "A través",
   "DE.Views.ImageSettings.txtTight": "Estrecho",
   "DE.Views.ImageSettings.txtTopAndBottom": "Superior e inferior",
-  "DE.Views.ImageSettingsAdvanced.strMargins": "Márgenes interiores",
+  "DE.Views.ImageSettingsAdvanced.strMargins": "Espaciado del texto",
   "DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Alineación",
   "DE.Views.ImageSettingsAdvanced.textAlt": "Texto alternativo",
@@ -2249,14 +2257,14 @@
   "DE.Views.ImageSettingsAdvanced.textTextBox": "Cuadro de texto",
   "DE.Views.ImageSettingsAdvanced.textTitle": "Imagen - Ajustes avanzados",
   "DE.Views.ImageSettingsAdvanced.textTitleChart": "Gráfico - Ajustes avanzados",
-  "DE.Views.ImageSettingsAdvanced.textTitleShape": "Forma - ajustes avanzados",
+  "DE.Views.ImageSettingsAdvanced.textTitleShape": "Forma - Ajustes avanzados",
   "DE.Views.ImageSettingsAdvanced.textTop": "Superior",
   "DE.Views.ImageSettingsAdvanced.textTopMargin": "Margen superior",
   "DE.Views.ImageSettingsAdvanced.textVertical": "Vertical",
   "DE.Views.ImageSettingsAdvanced.textVertically": "Verticalmente",
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Grosores y flechas",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Ancho",
-  "DE.Views.ImageSettingsAdvanced.textWrap": "Ajuste de texto",
+  "DE.Views.ImageSettingsAdvanced.textWrap": "Estilo de ajuste",
   "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Detrás del texto",
   "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Delante del texto",
   "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "En línea con el texto",
@@ -2358,8 +2366,8 @@
   "DE.Views.MailMergeEmailDlg.textFrom": "De",
   "DE.Views.MailMergeEmailDlg.textHTML": "HTML",
   "DE.Views.MailMergeEmailDlg.textMessage": "Mensaje",
-  "DE.Views.MailMergeEmailDlg.textSubject": "Línea de tema",
+  "DE.Views.MailMergeEmailDlg.textSubject": "Línea de asunto",
-  "DE.Views.MailMergeEmailDlg.textTitle": "Enviar por correo",
+  "DE.Views.MailMergeEmailDlg.textTitle": "Enviar a correo electrónico",
   "DE.Views.MailMergeEmailDlg.textTo": "Para",
   "DE.Views.MailMergeEmailDlg.textWarning": "¡Aviso!",
   "DE.Views.MailMergeEmailDlg.textWarningMsg": "Note, por favor, que no se puede detener el envío, una vez pulsado el botón 'Enviar'.",
@@ -2555,11 +2563,11 @@
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Especificar",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Espaciado",
   "DE.Views.ParagraphSettingsAdvanced.textStandard": "Solamente estándar",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Estándar y contexto",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Estándar y contextual",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Estándar, contexto y discrecionalidad",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Estándar, contextual y discrecional",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Estándar, contexto e histórico",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Estándar, contextual e histórico",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Estándar y discrecionalidad",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Estándar y discrecional",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Estándar, histórico y discrecionalidad",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Estándar, histórico y discrecional",
   "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Estándar e histórico",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Al centro",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Izquierdo",
@@ -2577,6 +2585,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Fijar sólo borde superior",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Sin bordes",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Último personalizado",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Moderado",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Estrecho",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Amplio",
+  "DE.Views.PrintWithPreview.txtAllPages": "Todas las páginas",
+  "DE.Views.PrintWithPreview.txtBottom": "Parte inferior",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Página actual",
+  "DE.Views.PrintWithPreview.txtCustom": "Personalizado",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Impresión personalizada",
+  "DE.Views.PrintWithPreview.txtLandscape": "Horizontal",
+  "DE.Views.PrintWithPreview.txtLeft": "Izquierdo",
+  "DE.Views.PrintWithPreview.txtMargins": "Márgenes",
+  "DE.Views.PrintWithPreview.txtOf": "de {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Página",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Número de página no válido",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Orientación de página",
+  "DE.Views.PrintWithPreview.txtPages": "Páginas",
+  "DE.Views.PrintWithPreview.txtPageSize": "Tamaño de página",
+  "DE.Views.PrintWithPreview.txtPortrait": "Vertical",
+  "DE.Views.PrintWithPreview.txtPrint": "Imprimir",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Imprimir en PDF",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Intervalo de impresión",
+  "DE.Views.PrintWithPreview.txtRight": "Derecho",
+  "DE.Views.PrintWithPreview.txtSelection": "Selección ",
+  "DE.Views.PrintWithPreview.txtTop": "Parte superior",
   "DE.Views.ProtectDialog.textComments": "Comentarios",
   "DE.Views.ProtectDialog.textForms": "Relleno de formularios",
   "DE.Views.ProtectDialog.textReview": "Cambios realizados",
@@ -2841,7 +2876,7 @@
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Derecho",
   "DE.Views.TableSettingsAdvanced.textTable": "Tabla",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Fondo de tabla",
-  "DE.Views.TableSettingsAdvanced.textTablePosition": "Posición de la tabla",
+  "DE.Views.TableSettingsAdvanced.textTablePosition": "Posición de tabla",
   "DE.Views.TableSettingsAdvanced.textTableSize": "Tamaño de tabla",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabla - Ajustes avanzados",
   "DE.Views.TableSettingsAdvanced.textTop": "Superior",
@@ -2851,7 +2886,7 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Ajuste de texto",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabla en línea",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Tabla flujo",
-  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Ajuste de texto",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Estilo de ajuste",
   "DE.Views.TableSettingsAdvanced.textWrapText": "Ajustar texto",
   "DE.Views.TableSettingsAdvanced.tipAll": "Fijar borde exterior y todas líneas interiores ",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Fijar bordes sólo para celdas interiores",
@@ -3182,11 +3217,11 @@
   "DE.Views.WatermarkSettingsDialog.textLayout": "Disposición",
   "DE.Views.WatermarkSettingsDialog.textNone": "Ninguno",
   "DE.Views.WatermarkSettingsDialog.textScale": "Escala",
-  "DE.Views.WatermarkSettingsDialog.textSelect": "Seleccionar Imagen",
+  "DE.Views.WatermarkSettingsDialog.textSelect": "Seleccionar imagen",
   "DE.Views.WatermarkSettingsDialog.textStrikeout": "Tachado",
   "DE.Views.WatermarkSettingsDialog.textText": "Texto",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Marca de agua de texto",
-  "DE.Views.WatermarkSettingsDialog.textTitle": "Ajustes de Marca de agua",
+  "DE.Views.WatermarkSettingsDialog.textTitle": "Ajustes de marca de agua",
   "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente",
   "DE.Views.WatermarkSettingsDialog.textUnderline": "Subrayado",
   "DE.Views.WatermarkSettingsDialog.tipFontName": "Nombre del tipo de letra",

apps/documenteditor/main/locale/eu.json

@@ -125,7 +125,139 @@
   "Common.define.chartData.textScatterSmoothMarker": "Barreiadura lerro leundu eta markatzaileekin",
   "Common.define.chartData.textStock": "Kotizazioak",
   "Common.define.chartData.textSurface": "Gainazala",
+  "Common.define.smartArt.textAccentedPicture": "Enfasidun irudia",
+  "Common.define.smartArt.textAccentProcess": "Enfasi-prozesua",
+  "Common.define.smartArt.textAlternatingFlow": "Txandakako fluxua",
+  "Common.define.smartArt.textAlternatingHexagons": "Hexagono txandakatuak",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Irudi-bloke txandakatuak",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Irudi-zirkulu txandakatuak",
+  "Common.define.smartArt.textArchitectureLayout": "Arkitektura-diseinua",
+  "Common.define.smartArt.textArrowRibbon": "Gezi-zinta",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Goranzko irudi enfasi-prozesua",
+  "Common.define.smartArt.textBalance": "Balantzea",
+  "Common.define.smartArt.textBasicBendingProcess": "Oinarrizko prozesu kateatua",
+  "Common.define.smartArt.textBasicBlockList": "Oinarrizko bloke-zerrenda",
+  "Common.define.smartArt.textBasicChevronProcess": "Oinarrizko xebroi-prozesua",
+  "Common.define.smartArt.textBasicCycle": "Oinarrizko zikloa",
+  "Common.define.smartArt.textBasicMatrix": "Oinarrizko matrizea",
+  "Common.define.smartArt.textBasicPie": "Oinarrizko biribila",
+  "Common.define.smartArt.textBasicProcess": "Oinarrizko prozesua",
+  "Common.define.smartArt.textBasicPyramid": "Oinarrizko piramidea",
+  "Common.define.smartArt.textBasicRadial": "Oinarrizko erradiala",
+  "Common.define.smartArt.textBasicTarget": "Oinarrizko helburua",
+  "Common.define.smartArt.textBasicTimeline": "Oinarrizko denbora-lerroa",
+  "Common.define.smartArt.textBasicVenn": "Oinarrizko Venn diagrama",
+  "Common.define.smartArt.textBendingPictureAccentList": "Irudi kateatuen zerrenda nabarmendua",
+  "Common.define.smartArt.textBendingPictureBlocks": "Irudi kateatuen blokeak",
+  "Common.define.smartArt.textBendingPictureCaption": "Epigrafedun irudi kateatuak",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Epigrafedun irudi kateatuen zerrenda",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Testu erdi-gardeneko irudi kateatuak",
+  "Common.define.smartArt.textBlockCycle": "Bloke-zikloa",
+  "Common.define.smartArt.textBubblePictureList": "Burbuila-irudien zerrenda",
+  "Common.define.smartArt.textCaptionedPictures": "Irudi epigrafedunak",
+  "Common.define.smartArt.textChevronAccentProcess": "Xebroi-enfasiaren prozesua",
+  "Common.define.smartArt.textChevronList": "Xebroi-zerrenda",
+  "Common.define.smartArt.textCircleAccentTimeline": "Zirkuluen denbora-eskala nabarmendua",
+  "Common.define.smartArt.textCircleArrowProcess": "Gezi-prozesu zirkularra",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Irudi-hierarkia zirkularra",
+  "Common.define.smartArt.textCircleProcess": "Prozesu zirkularra",
+  "Common.define.smartArt.textCircleRelationship": "Zirkulu-harremana",
+  "Common.define.smartArt.textCircularBendingProcess": "Prozesu kateatu zirkularra",
+  "Common.define.smartArt.textCircularPictureCallout": "Zirkulu-globoa",
+  "Common.define.smartArt.textClosedChevronProcess": "Xebroi itxiaren prozesua",
+  "Common.define.smartArt.textContinuousArrowProcess": "Gezi-prozesu jarraitua",
+  "Common.define.smartArt.textContinuousBlockProcess": "Bloke-prozesu jarraitua",
+  "Common.define.smartArt.textContinuousCycle": "Ziklo jarraitua",
+  "Common.define.smartArt.textContinuousPictureList": "Irudi-zerrenda jarraitua",
+  "Common.define.smartArt.textConvergingArrows": "Gezi konbergenteak",
+  "Common.define.smartArt.textConvergingRadial": "Erradial konbergentea",
+  "Common.define.smartArt.textConvergingText": "Testu konbergentea",
+  "Common.define.smartArt.textCounterbalanceArrows": "Kontrabalantzearen geziak",
+  "Common.define.smartArt.textCycle": "Zikloa",
+  "Common.define.smartArt.textCycleMatrix": "Zikloaren matrizea",
+  "Common.define.smartArt.textDescendingBlockList": "Beheranzko bloke-zerrenda",
+  "Common.define.smartArt.textDescendingProcess": "Beheranzko prozesua",
+  "Common.define.smartArt.textDetailedProcess": "Prozesu xehatua",
+  "Common.define.smartArt.textDivergingArrows": "Gezi dibergenteak",
+  "Common.define.smartArt.textDivergingRadial": "Erradial dibergentea",
+  "Common.define.smartArt.textEquation": "Ekuazioa",
+  "Common.define.smartArt.textFramedTextPicture": "Testu-irudi markoduna",
+  "Common.define.smartArt.textFunnel": "Inbutua",
+  "Common.define.smartArt.textGear": "Engranajea",
+  "Common.define.smartArt.textGridMatrix": "Saretaren matrizea",
+  "Common.define.smartArt.textGroupedList": "Taldekatutako zerrenda",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Organigrama erdizirkularra",
+  "Common.define.smartArt.textHexagonCluster": "Hexagono multzokatuak",
+  "Common.define.smartArt.textHexagonRadial": "Hexagono erradiala",
+  "Common.define.smartArt.textHierarchy": "Hierarkia",
+  "Common.define.smartArt.textHierarchyList": "Hierarkia-zerrenda",
+  "Common.define.smartArt.textHorizontalBulletList": "Buletdun zerrenda horizontala",
+  "Common.define.smartArt.textHorizontalHierarchy": "Hierarkia horizontala",
+  "Common.define.smartArt.textHorizontalLabeledHierarchy": "Etiketadun hierarkia horizontala",
+  "Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Maila anitzeko hierarkia horizontala",
+  "Common.define.smartArt.textHorizontalOrganizationChart": "Organigrama horizontala",
+  "Common.define.smartArt.textHorizontalPictureList": "Irudi-zerrenda horizontala",
+  "Common.define.smartArt.textIncreasingArrowProcess": "Goranzko gezi-prozesua",
+  "Common.define.smartArt.textIncreasingCircleProcess": "Goranzko zirkulu-prozesua",
+  "Common.define.smartArt.textInterconnectedBlockProcess": "Elkarri lotuta dagoen bloke-prozesua",
+  "Common.define.smartArt.textInterconnectedRings": "Elkarri lotuta dauden uztaiak",
+  "Common.define.smartArt.textInvertedPyramid": "Piramide alderantzikatua",
+  "Common.define.smartArt.textLabeledHierarchy": "Etiketadun hierarkia",
+  "Common.define.smartArt.textLinearVenn": "Venn lineala",
+  "Common.define.smartArt.textLinedList": "Marratxodun zerrenda",
+  "Common.define.smartArt.textList": "Zerrenda",
+  "Common.define.smartArt.textMatrix": "Matrizea",
+  "Common.define.smartArt.textMultidirectionalCycle": "Norabide anitzeko zikloa",
+  "Common.define.smartArt.textNameAndTitleOrganizationChart": "Izena eta lanpostua dituen organigrama",
+  "Common.define.smartArt.textNestedTarget": "Xede habiaratua",
+  "Common.define.smartArt.textNondirectionalCycle": "Norabiderik gabeko zikloa",
+  "Common.define.smartArt.textOpposingArrows": "Aurkako geziak",
+  "Common.define.smartArt.textOpposingIdeas": "Aurkako ideiak",
+  "Common.define.smartArt.textOrganizationChart": "Organigrama",
+  "Common.define.smartArt.textOther": "Beste bat",
+  "Common.define.smartArt.textPhasedProcess": "Fasekako prozesua",
+  "Common.define.smartArt.textPicture": "Irudia",
+  "Common.define.smartArt.textPictureAccentBlocks": "Irudi enfasidunen blokeak",
+  "Common.define.smartArt.textPictureAccentList": "Irudiaren enfasi-zerrenda",
+  "Common.define.smartArt.textPictureAccentProcess": "Irudi enfasidunaren prozesua",
+  "Common.define.smartArt.textPictureCaptionList": "Irudi-epigrafearen zerrenda",
+  "Common.define.smartArt.textPictureFrame": "Irudi-markoa",
+  "Common.define.smartArt.textPictureGrid": "Irudi-sareta",
+  "Common.define.smartArt.textPictureLineup": "Irudi lerrokatuak",
+  "Common.define.smartArt.textPictureOrganizationChart": "Irudien organigrama",
+  "Common.define.smartArt.textPictureStrips": "Irudien marrak",
+  "Common.define.smartArt.textPieProcess": "Prozesu biribila",
+  "Common.define.smartArt.textPlusAndMinus": "Plus eta minus",
+  "Common.define.smartArt.textProcess": "Prozesua",
+  "Common.define.smartArt.textProcessArrows": "Prozesu-geziak",
+  "Common.define.smartArt.textProcessList": "Prozesu-zerrenda",
+  "Common.define.smartArt.textPyramid": "Piramidea",
+  "Common.define.smartArt.textPyramidList": "Piramide-zerrenda",
+  "Common.define.smartArt.textRadialCluster": "Erradial multzokatua",
+  "Common.define.smartArt.textRadialCycle": "Ziklo erradiala",
+  "Common.define.smartArt.textRadialList": "Zerrenda erradiala",
+  "Common.define.smartArt.textRadialPictureList": "Irudi-zerrenda erradiala",
+  "Common.define.smartArt.textRadialVenn": "Venn erradiala",
+  "Common.define.smartArt.textRandomToResultProcess": "Prozesuaren ausazko emaitza",
+  "Common.define.smartArt.textRelationship": "Erlazioa",
+  "Common.define.smartArt.textRepeatingBendingProcess": "Prozesu kateatu errepikaria",
+  "Common.define.smartArt.textReverseList": "Zerrenda alderantzikatua",
+  "Common.define.smartArt.textSegmentedCycle": "Ziklo segmentatua",
+  "Common.define.smartArt.textSegmentedProcess": "Prozesu segmentatua",
+  "Common.define.smartArt.textSegmentedPyramid": "Piramide segmentatua",
+  "Common.define.smartArt.textSnapshotPictureList": "Argazki-zerrenda",
+  "Common.define.smartArt.textSpiralPicture": "Irudi espirala",
+  "Common.define.smartArt.textSquareAccentList": "Enfasi karratuzko zerrenda",
+  "Common.define.smartArt.textStackedList": "Zerrenda pilatua",
+  "Common.define.smartArt.textStackedVenn": "Venn pilatua",
+  "Common.define.smartArt.textStaggeredProcess": "Pilatutako prozesua",
+  "Common.define.smartArt.textStepDownProcess": "Beheranzko prozesua",
+  "Common.define.smartArt.textStepUpProcess": "Goranzko prozesua",
+  "Common.define.smartArt.textSubStepProcess": "Azpi-urratsen prozesua",
+  "Common.define.smartArt.textTabList": "Fitxa-zerrenda",
   "Common.Translation.textMoreButton": "Gehiago",
+  "Common.Translation.tipFileLocked": "Dokumentua editatzeko blokeatuta dago. Aldaketak egin eta kopia lokal bezala gorde dezakezu gero.",
+  "Common.Translation.tipFileReadOnly": "Dokumentua irakurtzeko soilik da eta editatzea blokeatuta dago. Aldaketak egin eta kopia lokal bat gorde dezakezu gero.",
   "Common.Translation.warnFileLocked": "Ezin duzu fitxategi hau editatu, beste aplikazio batean editatzen ari direlako.",
   "Common.Translation.warnFileLockedBtnEdit": "Sortu kopia",
   "Common.Translation.warnFileLockedBtnView": "Ireki ikusteko",
@@ -288,6 +420,8 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Kargatzen...",
   "Common.Views.DocumentAccessDialog.textTitle": "Partekatzearen ezarpenak",
   "Common.Views.ExternalDiagramEditor.textTitle": "Diagrama-editorea",
+  "Common.Views.ExternalEditor.textClose": "Itxi",
+  "Common.Views.ExternalEditor.textSave": "Gorde eta irten",
   "Common.Views.ExternalMergeEditor.textTitle": "Posta-konbinazioaren hartzaileak",
   "Common.Views.ExternalOleEditor.textTitle": "Kalkulu-orri editorea",
   "Common.Views.Header.labelCoUsersDescr": "Fitxategia editatzen ari diren erabiltzaileak:",
@@ -297,6 +431,7 @@
   "Common.Views.Header.textCompactView": "Ezkutatu tresna-barra",
   "Common.Views.Header.textHideLines": "Ezkutatu erregelak",
   "Common.Views.Header.textHideStatusBar": "Ezkutatu egoera-barra",
+  "Common.Views.Header.textReadOnly": "Irakurtzeko soilik",
   "Common.Views.Header.textRemoveFavorite": "Kendu gogokoetatik",
   "Common.Views.Header.textShare": "Partekatu",
   "Common.Views.Header.textZoom": "Zooma",
@@ -304,6 +439,7 @@
   "Common.Views.Header.tipDownload": "Deskargatu fitxategia",
   "Common.Views.Header.tipGoEdit": "Editatu uneko fitxategia",
   "Common.Views.Header.tipPrint": "Inprimatu fitxategia",
+  "Common.Views.Header.tipPrintQuick": "Inprimatze bizkorra",
   "Common.Views.Header.tipRedo": "Berregin",
   "Common.Views.Header.tipSave": "Gorde",
   "Common.Views.Header.tipSearch": "Bilatu",
@@ -354,6 +490,7 @@
   "Common.Views.Plugins.textStart": "Hasi",
   "Common.Views.Plugins.textStop": "Gelditu",
   "Common.Views.Protection.hintAddPwd": "Enkriptatu pasahitzarekin",
+  "Common.Views.Protection.hintDelPwd": "Ezabatu pasahitza",
   "Common.Views.Protection.hintPwd": "Aldatu edo ezabatu pasahitza",
   "Common.Views.Protection.hintSignature": "Gehitu sinadura digitala edo sinadura-lerroa",
   "Common.Views.Protection.txtAddPwd": "Gehitu pasahitza",
@@ -499,6 +636,7 @@
   "Common.Views.SignDialog.tipFontName": "Letra-tipoaren izena",
   "Common.Views.SignDialog.tipFontSize": "Letra-tamaina",
   "Common.Views.SignSettingsDialog.textAllowComment": "Onartu sinatzaileak sinaduraren elkarrizketa-koadroan iruzkina gehitzea",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Dokumentu hau sinatu aurretik, egiaztatu sinatzen ari zaren edukia zuzena dela.",
   "Common.Views.SignSettingsDialog.textInfoEmail": "Posta elektronikoa",
   "Common.Views.SignSettingsDialog.textInfoName": "Izena",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Sinatzailearen titulua",
@@ -578,6 +716,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "Fitxategia pasahitzez babestua dago eta ezin da ireki.",
   "DE.Controllers.Main.errorFileSizeExceed": "Fitxategiaren tamainak zure zerbitzarirako ezarritako muga gainditzen du.<br>Jarri harremanetan dokumentu-zerbitzariaren administratzailearekin informazio gehiago lortzeko.",
   "DE.Controllers.Main.errorForceSave": "Errore bat gertatu da dokumentua gordetzean.<br>Erabili 'Deskargatu honela' aukera fitxategia zure ordenagailuko disko gogorrean gordetzeko edo saiatu berriro geroago.",
+  "DE.Controllers.Main.errorInconsistentExt": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia eta luzapena ez datoz bat.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia testu-dokumentu bati dagokio (adibidez, docx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia ondorengo formatuetako bati dagokio: pdf/djvu/xps/oxps, baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia aurkezpen bati dagokio (adibidez, pptx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia kalkulu-orri bati dagokio (adibidez, xlsx), baina fitxategiaren luzapena ez dator bat: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Gako-deskriptore ezezaguna",
   "DE.Controllers.Main.errorKeyExpire": "Gakoaren deskriptorea iraungi da",
   "DE.Controllers.Main.errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
@@ -640,6 +783,7 @@
   "DE.Controllers.Main.textClose": "Itxi",
   "DE.Controllers.Main.textCloseTip": "Egin klik argibidea ixteko",
   "DE.Controllers.Main.textContactUs": "Jarri harremanetan salmenta-sailarekin",
+  "DE.Controllers.Main.textContinue": "Jarraitu",
   "DE.Controllers.Main.textConvertEquation": "Ekuazio hau dagoeneko euskarririk ez duen ekuazio editorearen bertsio zahar batekin sortu zen. Editatu ahal izateko, bihurtu ekuazioa Office Math ML formatura.<br>Orain bihurtu?",
   "DE.Controllers.Main.textCustomLoader": "Kontuan izan, lizentziaren baldintzen arabera, ez duzula baimenik kargatzailea aldatzeko.<br>Jarri harremanetan gure Salmenta departamentuarekin aurrekontu bat eskatzeko.",
   "DE.Controllers.Main.textDisconnect": "Konexioa galdu da",
@@ -930,6 +1074,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Fitxategi hau editatzeko baimena ukatu zaizu.",
   "DE.Controllers.Navigation.txtBeginning": "Dokumentuaren hasiera",
   "DE.Controllers.Navigation.txtGotoBeginning": "Joan dokumentuaren hasierara",
+  "DE.Controllers.Print.textMarginsLast": "Azken pertsonalizatua",
+  "DE.Controllers.Print.txtCustom": "Pertsonalizatua",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Inprimaketa-bitarte baliogabea",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Sartu orri-zenbaki bat edo orri-tarte bat (adibidez, 5-12). Edo PDFra inprimatu dezakezu.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Abisua",
   "DE.Controllers.Search.textNoTextFound": "Bilatu duzun datua ezin izan da aurkitu. Doitu bilaketaren ezarpenak.",
   "DE.Controllers.Search.textReplaceSkipped": "Ordezkapena burutu da. {0} agerraldi saltatu dira.",
@@ -1329,11 +1477,22 @@
   "DE.Views.CellsAddDialog.textRow": "Errenkadak",
   "DE.Views.CellsAddDialog.textTitle": "Txertatu hainbat",
   "DE.Views.CellsAddDialog.textUp": "Kurtsorearen gainean",
+  "DE.Views.ChartSettings.text3dDepth": "Sakonera (oinarriaren %)",
+  "DE.Views.ChartSettings.text3dHeight": "Altuera (oinarriaren %)",
+  "DE.Views.ChartSettings.text3dRotation": "3D biraketa",
   "DE.Views.ChartSettings.textAdvanced": "Erakutsi ezarpen aurreratuak",
+  "DE.Views.ChartSettings.textAutoscale": "Eskala automatikoa",
   "DE.Views.ChartSettings.textChartType": "Aldatu diagrama-mota",
+  "DE.Views.ChartSettings.textDefault": "Biraketa lehenetsia",
+  "DE.Views.ChartSettings.textDown": "Behera",
   "DE.Views.ChartSettings.textEditData": "Editatu datuak",
   "DE.Views.ChartSettings.textHeight": "Altuera",
+  "DE.Views.ChartSettings.textLeft": "Ezkerra",
+  "DE.Views.ChartSettings.textNarrow": "Ikuspegiaren eremu estua",
   "DE.Views.ChartSettings.textOriginalSize": "Benetako tamaina",
+  "DE.Views.ChartSettings.textPerspective": "Perspektiba",
+  "DE.Views.ChartSettings.textRight": "Eskuina",
+  "DE.Views.ChartSettings.textRightAngle": "Ardatz angeluzuzenak",
   "DE.Views.ChartSettings.textSize": "Tamaina",
   "DE.Views.ChartSettings.textStyle": "Estiloa",
   "DE.Views.ChartSettings.textUndock": "Desatrakatu paneletik",
@@ -1428,14 +1587,24 @@
   "DE.Views.DateTimeDialog.textLang": "Hizkuntza",
   "DE.Views.DateTimeDialog.textUpdate": "Eguneratu automatikoki",
   "DE.Views.DateTimeDialog.txtTitle": "Data eta ordua",
+  "DE.Views.DocProtection.hintProtectDoc": "Babestu dokumentua",
+  "DE.Views.DocProtection.txtDocProtectedComment": "Dokumentua babestuta dago.<br>Iruzkinak soilik txertatu ditzakezu dokumentuan.",
+  "DE.Views.DocProtection.txtDocProtectedForms": "Dokumentua babestuta dago.<br>Dokumentuko formularioak soilik bete ditzakezu.",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "Dokumentua babestuta dago.<br>Dokumentu hau editatu dezakezu, baina aldaketen jarraipena egingo da.",
+  "DE.Views.DocProtection.txtDocProtectedView": "Dokumentua babestuta dago.<br>Dokumentua irakurtzeko soilik da.",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Sartu pasahitza dokumentuari babesa kentzeko",
+  "DE.Views.DocProtection.txtProtectDoc": "Babestu dokumentua",
   "DE.Views.DocumentHolder.aboveText": "Gainean",
   "DE.Views.DocumentHolder.addCommentText": "Gehitu iruzkina",
   "DE.Views.DocumentHolder.advancedDropCapText": "Letra kapitalaren ezarpenak",
+  "DE.Views.DocumentHolder.advancedEquationText": "Ekuazioaren ezarpenak",
   "DE.Views.DocumentHolder.advancedFrameText": "Markoaren ezarpen aurreratuak",
   "DE.Views.DocumentHolder.advancedParagraphText": "Paragrafoaren ezarpen aurreratuak",
   "DE.Views.DocumentHolder.advancedTableText": "Taularen ezarpen aurreratuak",
   "DE.Views.DocumentHolder.advancedText": "Ezarpen aurreratuak",
   "DE.Views.DocumentHolder.alignmentText": "Lerrokatzea",
+  "DE.Views.DocumentHolder.allLinearText": "Guztia - Lineala",
+  "DE.Views.DocumentHolder.allProfText": "Guztia - Profesionala",
   "DE.Views.DocumentHolder.belowText": "Azpian",
   "DE.Views.DocumentHolder.breakBeforeText": "Orri-jauzia aurretik",
   "DE.Views.DocumentHolder.bulletsText": "Buletak eta numerazioa",
@@ -1444,6 +1613,8 @@
   "DE.Views.DocumentHolder.centerText": "Erdia",
   "DE.Views.DocumentHolder.chartText": "Diagramaren ezarpen aurreratuak",
   "DE.Views.DocumentHolder.columnText": "Zutabea",
+  "DE.Views.DocumentHolder.currLinearText": "Unekoa - Lineala",
+  "DE.Views.DocumentHolder.currProfText": "Unekoa - Profesionala",
   "DE.Views.DocumentHolder.deleteColumnText": "Ezabatu zutabea",
   "DE.Views.DocumentHolder.deleteRowText": "Ezabatu errenkada",
   "DE.Views.DocumentHolder.deleteTableText": "Ezabatu taula",
@@ -1456,6 +1627,7 @@
   "DE.Views.DocumentHolder.editFooterText": "Editatu orri-oina",
   "DE.Views.DocumentHolder.editHeaderText": "Editatu goiburua",
   "DE.Views.DocumentHolder.editHyperlinkText": "Editatu hiperesteka",
+  "DE.Views.DocumentHolder.eqToInlineText": "Aldatu txertatura",
   "DE.Views.DocumentHolder.guestText": "Gonbidatua",
   "DE.Views.DocumentHolder.hyperlinkText": "Hiperesteka",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Egin ez ikusia guztiei",
@@ -1470,6 +1642,7 @@
   "DE.Views.DocumentHolder.insertText": "Txertatu",
   "DE.Views.DocumentHolder.keepLinesText": "Mantendu lerroak elkarrekin",
   "DE.Views.DocumentHolder.langText": "Hautatu hizkuntza",
+  "DE.Views.DocumentHolder.latexText": "LaTeX",
   "DE.Views.DocumentHolder.leftText": "Ezkerra",
   "DE.Views.DocumentHolder.loadSpellText": "Aldagaiak kargatzen...",
   "DE.Views.DocumentHolder.mergeCellsText": "Konbinatu gelaxkak",
@@ -1817,6 +1990,7 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Ez ikusi batere",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Zuzenketa",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Puntua",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Erakutsi Inprimatze bizkorra botoia editoreko goiburuan",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Gaitu guztiak",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Gaitu makro guztiak jakinarazpenik gabe",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Erakutsi aldaketen kontrola",
@@ -2066,6 +2240,7 @@
   "DE.Views.LeftMenu.tipComments": "Iruzkinak",
   "DE.Views.LeftMenu.tipNavigation": "Nabigazioa",
   "DE.Views.LeftMenu.tipOutline": "Izenburuak",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Orrien koadro txikiak",
   "DE.Views.LeftMenu.tipPlugins": "Pluginak",
   "DE.Views.LeftMenu.tipSearch": "Bilatu",
   "DE.Views.LeftMenu.tipSupport": "Oharrak eta laguntza",
@@ -2373,6 +2548,40 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Ezarri goiko ertza soilik",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatikoa",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Ertzik gabe",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Azken pertsonalizatua",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Ertaina",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Estua",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normala",
+  "DE.Views.PrintWithPreview.txtAllPages": "Orri guztiak",
+  "DE.Views.PrintWithPreview.txtBottom": "Behean",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Uneko orria",
+  "DE.Views.PrintWithPreview.txtCustom": "Pertsonalizatua",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Inprimatze pertsonalizatua",
+  "DE.Views.PrintWithPreview.txtLandscape": "Horizontala",
+  "DE.Views.PrintWithPreview.txtLeft": "Ezkerra",
+  "DE.Views.PrintWithPreview.txtMargins": "Marjinak",
+  "DE.Views.PrintWithPreview.txtOf": "{0}-(e)tik",
+  "DE.Views.PrintWithPreview.txtPage": "Orria",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Orrialde-zenbaki baliogabea",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Orriaren orientazioa",
+  "DE.Views.PrintWithPreview.txtPages": "Orriak",
+  "DE.Views.PrintWithPreview.txtPageSize": "Orriaren tamaina",
+  "DE.Views.PrintWithPreview.txtPortrait": "Bertikala",
+  "DE.Views.PrintWithPreview.txtPrint": "Inprimatu",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Inprimatu PDFra",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Inprimatu barrutia",
+  "DE.Views.PrintWithPreview.txtRight": "Eskuina",
+  "DE.Views.PrintWithPreview.txtSelection": "Hautapena",
+  "DE.Views.ProtectDialog.textComments": "Iruzkinak",
+  "DE.Views.ProtectDialog.textForms": "Formularioak betetzea",
+  "DE.Views.ProtectDialog.textView": "Aldaketarik ez (irakurtzeko soilik)",
+  "DE.Views.ProtectDialog.txtAllow": "Onartu soilik edizio-mota hau dokumentuan",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "Berrespen-pasahitza ez da berdina",
+  "DE.Views.ProtectDialog.txtOptional": "hautazkoa",
+  "DE.Views.ProtectDialog.txtPassword": "Pasahitza",
+  "DE.Views.ProtectDialog.txtProtect": "Babestu",
+  "DE.Views.ProtectDialog.txtRepeat": "Errepikatu pasahitza",
+  "DE.Views.ProtectDialog.txtTitle": "Babestu",
   "DE.Views.RightMenu.txtChartSettings": "Diagramaren ezarpenak",
   "DE.Views.RightMenu.txtFormSettings": "Formularioaren ezarpenak",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Goiburu eta oinaren ezarpenak",
@@ -2563,12 +2772,20 @@
   "DE.Views.TableSettings.tipOuter": "Ezarri kanpoko ertza soilik",
   "DE.Views.TableSettings.tipRight": "Ezarri kanpoko eskuineko ertza soilik",
   "DE.Views.TableSettings.tipTop": "Ezarri kanpoko goiko ertza soilik",
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Taula ertzdun eta marratuak",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Pertsonalizatua",
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Sareta-taulak",
+  "DE.Views.TableSettings.txtGroupTable_List": "Zerrenda-taulak",
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Taula arruntak",
   "DE.Views.TableSettings.txtNoBorders": "Ertzik gabe",
   "DE.Views.TableSettings.txtTable_Accent": "Azentua",
+  "DE.Views.TableSettings.txtTable_Bordered": "Ertzduna",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Ertzduna eta marratua",
   "DE.Views.TableSettings.txtTable_Colorful": "Koloretsua",
   "DE.Views.TableSettings.txtTable_Dark": "Iluna",
   "DE.Views.TableSettings.txtTable_GridTable": "Sareta-taula",
   "DE.Views.TableSettings.txtTable_Light": "Argia",
+  "DE.Views.TableSettings.txtTable_Lined": "Marratua",
   "DE.Views.TableSettings.txtTable_ListTable": "Zerrenda-taula",
   "DE.Views.TableSettings.txtTable_PlainTable": "Taula arrunta",
   "DE.Views.TableSettings.txtTable_TableGrid": "Saretadun taula",
@@ -2703,6 +2920,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Irudia",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Jauziak",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Ikurra",
   "DE.Views.Toolbar.capBtnInsTable": "Taula",
   "DE.Views.Toolbar.capBtnInsTextart": "Testu-artea",
@@ -2849,13 +3067,16 @@
   "DE.Views.Toolbar.tipIncPrLeft": "Handiagotu koska",
   "DE.Views.Toolbar.tipInsertChart": "Txertatu diagrama",
   "DE.Views.Toolbar.tipInsertEquation": "Txertatu ekuazioa",
+  "DE.Views.Toolbar.tipInsertHorizontalText": "Txertatu testu-koadro horizontala",
   "DE.Views.Toolbar.tipInsertImage": "Txertatu irudia",
   "DE.Views.Toolbar.tipInsertNum": "Txertatu orrialde-zenbakia",
   "DE.Views.Toolbar.tipInsertShape": "Txertatu forma automatikoa",
+  "DE.Views.Toolbar.tipInsertSmartArt": "Txertatu SmartArt-a",
   "DE.Views.Toolbar.tipInsertSymbol": "Txertatu ikurra",
   "DE.Views.Toolbar.tipInsertTable": "Txertatu taula",
   "DE.Views.Toolbar.tipInsertText": "Txertatu testu-koadroa",
   "DE.Views.Toolbar.tipInsertTextArt": "Txertatu testu-artea",
+  "DE.Views.Toolbar.tipInsertVerticalText": "Txertatu testu-koadro bertikala",
   "DE.Views.Toolbar.tipLineNumbers": "Erakutsi lerro zenbakiak",
   "DE.Views.Toolbar.tipLineSpace": "Paragrafoaren lerroartea",
   "DE.Views.Toolbar.tipMailRecepients": "Posta-konbinazioa",
@@ -2927,8 +3148,10 @@
   "DE.Views.ViewTab.textFitToPage": "Doitu orrira",
   "DE.Views.ViewTab.textFitToWidth": "Doitu zabalerara",
   "DE.Views.ViewTab.textInterfaceTheme": "Interfazearen gaia",
+  "DE.Views.ViewTab.textLeftMenu": "Ezkerreko panela",
   "DE.Views.ViewTab.textNavigation": "Nabigazioa",
   "DE.Views.ViewTab.textOutline": "Izenburuak",
+  "DE.Views.ViewTab.textRightMenu": "Eskuineko panela",
   "DE.Views.ViewTab.textRulers": "Erregelak",
   "DE.Views.ViewTab.textStatusBar": "Egoera-barra",
   "DE.Views.ViewTab.textZoom": "Zooma",

apps/documenteditor/main/locale/fi.json

@@ -1045,7 +1045,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphs",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Sijainti",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Henkilöt, joilla ovat oikeudet",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symbolit välilyönneillä",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Merkkiä välilyönneillä",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Tilastot",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbolit",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Asiakirjan otsikko",

apps/documenteditor/main/locale/fr.json

@@ -465,6 +465,7 @@
   "Common.Views.Header.tipDownload": "Télécharger le fichier",
   "Common.Views.Header.tipGoEdit": "Modifier le fichier courant",
   "Common.Views.Header.tipPrint": "Imprimer le fichier",
+  "Common.Views.Header.tipPrintQuick": "Impression rapide",
   "Common.Views.Header.tipRedo": "Rétablir",
   "Common.Views.Header.tipSave": "Enregistrer",
   "Common.Views.Header.tipSearch": "Recherche",
@@ -1102,6 +1103,9 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
   "DE.Controllers.Navigation.txtBeginning": "Début du document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Aller au début du document",
+  "DE.Controllers.Print.textMarginsLast": "Derniers personnalisés",
+  "DE.Controllers.Print.txtCustom": "Personnalisé",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Plage d'impression non valide",
   "DE.Controllers.Search.notcriticalErrorTitle": "Avertissement",
   "DE.Controllers.Search.textNoTextFound": "Les données que vous recherchez n'ont pas pu être trouvées. Veuillez modifier vos options de recherche.",
   "DE.Controllers.Search.textReplaceSkipped": "Le remplacement a été effectué. {0} occurrences ont été sautées.",
@@ -2020,6 +2024,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Surligner aucune modification",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Vérification",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Point",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Afficher le bouton d'impression rapide dans l'en-tête de l'éditeur",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Le document sera imprimé sur la dernière imprimante sélectionnée ou par défaut",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Activer tout",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Activer toutes les macros sans notification",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Afficher le suivi des modifications",
@@ -2577,6 +2583,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Seulement bordure supérieure",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Pas de bordures",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Derniers personnalisés",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Moyennes",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Étroites",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normales",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US normale",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Larges",
+  "DE.Views.PrintWithPreview.txtAllPages": "Toutes les pages",
+  "DE.Views.PrintWithPreview.txtBottom": "Bas",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Page active",
+  "DE.Views.PrintWithPreview.txtCustom": "Personnalisé",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Impression personnalisée",
+  "DE.Views.PrintWithPreview.txtLandscape": "Paysage",
+  "DE.Views.PrintWithPreview.txtLeft": "Gauche",
+  "DE.Views.PrintWithPreview.txtMargins": "Marges",
+  "DE.Views.PrintWithPreview.txtOf": "de {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Page",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Numéro de page non valide",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Orientation de page",
+  "DE.Views.PrintWithPreview.txtPages": "Pages",
+  "DE.Views.PrintWithPreview.txtPageSize": "Taille de page",
+  "DE.Views.PrintWithPreview.txtPortrait": "Portrait",
+  "DE.Views.PrintWithPreview.txtPrint": "Imprimer",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Imprimer au format PDF",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Zone d'impression",
+  "DE.Views.PrintWithPreview.txtRight": "Droite",
+  "DE.Views.PrintWithPreview.txtSelection": "Sélection",
+  "DE.Views.PrintWithPreview.txtTop": "Haut",
   "DE.Views.ProtectDialog.textComments": "Commentaires",
   "DE.Views.ProtectDialog.textForms": "Remplissage des formulaires",
   "DE.Views.ProtectDialog.textReview": "Modifications",

apps/documenteditor/main/locale/hu.json

@@ -145,7 +145,148 @@
   "Common.define.smartArt.textBasicPyramid": "Egyszerű piramis",
   "Common.define.smartArt.textBasicRadial": "Alap sugárirányú",
   "Common.define.smartArt.textBasicTarget": "Alapvető cél",
+  "Common.define.smartArt.textBasicTimeline": "Egyszerű idővonal",
+  "Common.define.smartArt.textBasicVenn": "Alap Venn",
+  "Common.define.smartArt.textBendingPictureAccentList": "Kiemelt lista képekkel",
+  "Common.define.smartArt.textBendingPictureBlocks": "Képekkel ellátott blokkok",
+  "Common.define.smartArt.textBendingPictureCaption": "Kiemelt képek feliratokkal",
+  "Common.define.smartArt.textBendingPictureCaptionList": "kiemelt képaláírások listája",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Kiemelt kép félig átlátszó szöveg",
+  "Common.define.smartArt.textBlockCycle": "Blokkciklus",
+  "Common.define.smartArt.textBubblePictureList": "Buborék kép lista",
+  "Common.define.smartArt.textCaptionedPictures": "Feliratos képek",
+  "Common.define.smartArt.textChevronAccentProcess": "Eltolásos sarokfeldolgozás",
+  "Common.define.smartArt.textChevronList": "Sarok lista",
+  "Common.define.smartArt.textCircleAccentTimeline": "Kiemelt tervezési sáv körökkel",
+  "Common.define.smartArt.textCircleArrowProcess": "Körkörös nyilazási folyamat",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Körképek rangsora",
+  "Common.define.smartArt.textCircleProcess": "Kör folyamat",
+  "Common.define.smartArt.textCircleRelationship": "Körkapcsolat",
+  "Common.define.smartArt.textCircularBendingProcess": "Körkörös hajlítási eljárás",
+  "Common.define.smartArt.textCircularPictureCallout": "Körkörös képhívás",
+  "Common.define.smartArt.textClosedChevronProcess": "Zárt sarok folyamat",
+  "Common.define.smartArt.textContinuousArrowProcess": "Folyamatos nyilas folyamat",
+  "Common.define.smartArt.textContinuousBlockProcess": "Folyamatos blokkfolyamat",
+  "Common.define.smartArt.textContinuousCycle": "Folyamatos ciklus",
+  "Common.define.smartArt.textContinuousPictureList": "Folyamatos képlista",
+  "Common.define.smartArt.textConvergingArrows": "Összefutó nyilak",
+  "Common.define.smartArt.textConvergingRadial": "Összefutó radiális",
+  "Common.define.smartArt.textConvergingText": "Konvergens szöveg",
+  "Common.define.smartArt.textCounterbalanceArrows": "Kiegyensúlyozó nyilak",
+  "Common.define.smartArt.textCycle": "Ciklus",
+  "Common.define.smartArt.textCycleMatrix": "Ciklus mátrix",
+  "Common.define.smartArt.textDescendingBlockList": "Csökkenő blokklista",
+  "Common.define.smartArt.textDescendingProcess": "Csökkenő folyamat",
+  "Common.define.smartArt.textDetailedProcess": "Részletes folyamat",
+  "Common.define.smartArt.textDivergingArrows": "Különböző nyilak",
+  "Common.define.smartArt.textDivergingRadial": "Radiális konvergencia",
+  "Common.define.smartArt.textEquation": "Egyenlet",
+  "Common.define.smartArt.textFramedTextPicture": "Keretezett szöveges kép",
+  "Common.define.smartArt.textFunnel": "Tölcsér",
+  "Common.define.smartArt.textGear": "Fogaskerék",
+  "Common.define.smartArt.textGridMatrix": "Rácsmátrix",
+  "Common.define.smartArt.textGroupedList": "Csoportos lista",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Félkör szervezeti diagram",
+  "Common.define.smartArt.textHexagonCluster": "Hatszög klaszter",
+  "Common.define.smartArt.textHexagonRadial": "Hatszög radiális",
+  "Common.define.smartArt.textHierarchy": "Hierarchia",
+  "Common.define.smartArt.textHierarchyList": "Hierarchikus lista",
+  "Common.define.smartArt.textHorizontalBulletList": "Vízszintes felsorolás",
+  "Common.define.smartArt.textHorizontalHierarchy": "Horizontális hierarchia",
+  "Common.define.smartArt.textHorizontalLabeledHierarchy": "Horizontális címkézett hierarchia",
+  "Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Horizontális többszintű hierarchia",
+  "Common.define.smartArt.textHorizontalOrganizationChart": "Horizontal Organization Chart",
+  "Common.define.smartArt.textHorizontalPictureList": "Horizontális képlista",
+  "Common.define.smartArt.textIncreasingArrowProcess": "Növekvő nyíl folyamat",
+  "Common.define.smartArt.textIncreasingCircleProcess": "Növekvő körfolyamat",
+  "Common.define.smartArt.textInterconnectedBlockProcess": "Kapcsolódó blokkfolyamat",
+  "Common.define.smartArt.textInterconnectedRings": "Kapcsolódó gyűrűk",
+  "Common.define.smartArt.textInvertedPyramid": "Fordított piramis",
+  "Common.define.smartArt.textLabeledHierarchy": "Megcímkézett hierarchia",
+  "Common.define.smartArt.textLinearVenn": "Lineáris Venn",
+  "Common.define.smartArt.textLinedList": "Vonalas lista",
+  "Common.define.smartArt.textList": "Lista",
+  "Common.define.smartArt.textMatrix": "Mátrix",
+  "Common.define.smartArt.textMultidirectionalCycle": "Többirányú kör",
+  "Common.define.smartArt.textNameAndTitleOrganizationChart": "Név és cím Szervezeti ábra",
+  "Common.define.smartArt.textNestedTarget": "Beágyazott cél",
+  "Common.define.smartArt.textNondirectionalCycle": "Irányítatlan ciklus",
+  "Common.define.smartArt.textOpposingArrows": "Szemben álló nyilak",
+  "Common.define.smartArt.textOpposingIdeas": "Ellentétes elképzelések",
+  "Common.define.smartArt.textOrganizationChart": "Szervezeti ábra",
+  "Common.define.smartArt.textOther": "Egyéb",
+  "Common.define.smartArt.textPhasedProcess": "Fokozatos eljárás",
+  "Common.define.smartArt.textPicture": "Kép",
+  "Common.define.smartArt.textPictureAccentBlocks": "Kép kiegészítő blokkok",
+  "Common.define.smartArt.textPictureAccentList": "Kép kísérőjegyzék",
+  "Common.define.smartArt.textPictureAccentProcess": "Kép Akcentus folyamat",
+  "Common.define.smartArt.textPictureCaptionList": "Képaláírások listája",
+  "Common.define.smartArt.textPictureFrame": "Képkeret",
+  "Common.define.smartArt.textPictureGrid": "Képrács",
+  "Common.define.smartArt.textPictureLineup": "Képösszeállítás",
+  "Common.define.smartArt.textPictureOrganizationChart": "Szervezeti ábra",
+  "Common.define.smartArt.textPictureStrips": "Képcsíkok",
+  "Common.define.smartArt.textPieProcess": "Folyamat kördiagrammal",
+  "Common.define.smartArt.textPlusAndMinus": "Plusz és mínusz",
+  "Common.define.smartArt.textProcess": "Folyamat",
+  "Common.define.smartArt.textProcessArrows": "Folyamatnyilak",
+  "Common.define.smartArt.textProcessList": "Folyamatlista",
+  "Common.define.smartArt.textPyramid": "Piramis",
+  "Common.define.smartArt.textPyramidList": "Piramis lista",
+  "Common.define.smartArt.textRadialCluster": "Radiális klaszter",
+  "Common.define.smartArt.textRadialCycle": "Radiális ciklus",
+  "Common.define.smartArt.textRadialList": "Radiális lista",
+  "Common.define.smartArt.textRadialPictureList": "Radiális képlista",
+  "Common.define.smartArt.textRadialVenn": "Radiális Venn",
+  "Common.define.smartArt.textRandomToResultProcess": "Folyamat a véletlentől az eredményig",
+  "Common.define.smartArt.textRelationship": "Kapcsolat",
+  "Common.define.smartArt.textRepeatingBendingProcess": "Ismételt hajlítási folyamat",
+  "Common.define.smartArt.textReverseList": "Fordított lista",
+  "Common.define.smartArt.textSegmentedCycle": "Szegmentált ciklust",
+  "Common.define.smartArt.textSegmentedProcess": "Segmentált ciklus",
+  "Common.define.smartArt.textSegmentedPyramid": "Szegmentált piramis",
+  "Common.define.smartArt.textSnapshotPictureList": "Pillanatkép Képek listája",
+  "Common.define.smartArt.textSpiralPicture": "Spirálkép",
+  "Common.define.smartArt.textSquareAccentList": "Négyzet akcentus lista",
+  "Common.define.smartArt.textStackedList": "Halmozott lista",
+  "Common.define.smartArt.textStackedVenn": "Halmozott Venn",
+  "Common.define.smartArt.textStaggeredProcess": "Fokozatos folyamat",
+  "Common.define.smartArt.textStepDownProcess": "Lépcsőzetes folyamat",
+  "Common.define.smartArt.textStepUpProcess": "Lépcsőzetes folyamat",
+  "Common.define.smartArt.textSubStepProcess": "Részlépéses folyamat",
+  "Common.define.smartArt.textTabbedArc": "Tabulátorlap",
+  "Common.define.smartArt.textTableHierarchy": "Táblázati hierarchia",
+  "Common.define.smartArt.textTableList": "Táblázati lista",
+  "Common.define.smartArt.textTabList": "Laplista",
+  "Common.define.smartArt.textTargetList": "Céllista",
+  "Common.define.smartArt.textTextCycle": "Szövegciklus",
+  "Common.define.smartArt.textThemePictureAccent": "Tematikus kép akcentus",
+  "Common.define.smartArt.textThemePictureAlternatingAccent": "Téma Kép váltakozó akcentus",
+  "Common.define.smartArt.textThemePictureGrid": "Téma képrács",
+  "Common.define.smartArt.textTitledMatrix": "Mátrix címkézve",
+  "Common.define.smartArt.textTitledPictureAccentList": "Címzett kép akcentus lista",
+  "Common.define.smartArt.textTitledPictureBlocks": "Címzett képblokkok",
+  "Common.define.smartArt.textTitlePictureLineup": "Címképek felállása",
+  "Common.define.smartArt.textTrapezoidList": "Trapéz lista",
+  "Common.define.smartArt.textUpwardArrow": "Nyíl felfelé",
+  "Common.define.smartArt.textVaryingWidthList": "Változó széles lista",
+  "Common.define.smartArt.textVerticalAccentList": "Vertikális akcentus lista",
+  "Common.define.smartArt.textVerticalArrowList": "Függőleges nyilak listája",
+  "Common.define.smartArt.textVerticalBendingProcess": "Vertikális hajítási folyamat",
+  "Common.define.smartArt.textVerticalBlockList": "Vertikális blokk lista",
+  "Common.define.smartArt.textVerticalBoxList": "Vertikális box lista",
+  "Common.define.smartArt.textVerticalBracketList": "Vertikális zárójel lista",
+  "Common.define.smartArt.textVerticalBulletList": "Vertikális bullet lista",
+  "Common.define.smartArt.textVerticalChevronList": "Vertikális ékzáras lista",
+  "Common.define.smartArt.textVerticalCircleList": "Vertikális kör lista",
+  "Common.define.smartArt.textVerticalCurvedList": "Vertikális ívelt lista",
+  "Common.define.smartArt.textVerticalEquation": "Vertikális egyenlet",
+  "Common.define.smartArt.textVerticalPictureAccentList": "Vertikális kép akcentus lista",
+  "Common.define.smartArt.textVerticalPictureList": "Vertikális képlista",
+  "Common.define.smartArt.textVerticalProcess": "Vertikális folyamat",
   "Common.Translation.textMoreButton": "Több",
+  "Common.Translation.tipFileLocked": "A dokumentum szerkesztésre zárolt. A módosításokat elvégezheti, és helyi másolatként később is elmentheti.",
+  "Common.Translation.tipFileReadOnly": "A dokumentum csak olvasható, szerkesztésre zárolt. A módosításokat később is elvégezheti és elmentheti a helyi másolatot.",
   "Common.Translation.warnFileLocked": "Nem szerkesztheti ezt a fájlt, mert egy másik alkalmazásban szerkesztik.",
   "Common.Translation.warnFileLockedBtnEdit": "Másolat létrehozása",
   "Common.Translation.warnFileLockedBtnView": "Megnyitva megtekintésre",
@@ -319,6 +460,7 @@
   "Common.Views.Header.textCompactView": "Eszköztár elrejtése",
   "Common.Views.Header.textHideLines": "Vonalzók elrejtése",
   "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése",
+  "Common.Views.Header.textReadOnly": "Csak olvasható",
   "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből",
   "Common.Views.Header.textShare": "Megosztás",
   "Common.Views.Header.textZoom": "Zoom",
@@ -326,6 +468,7 @@
   "Common.Views.Header.tipDownload": "Fájl letöltése",
   "Common.Views.Header.tipGoEdit": "Az aktuális fájl szerkesztése",
   "Common.Views.Header.tipPrint": "Fájl nyomtatása",
+  "Common.Views.Header.tipPrintQuick": "Gyorsnyomtatás",
   "Common.Views.Header.tipRedo": "Újra",
   "Common.Views.Header.tipSave": "Ment",
   "Common.Views.Header.tipSearch": "Keresés",
@@ -473,6 +616,7 @@
   "Common.Views.ReviewPopover.textCancel": "Mégsem",
   "Common.Views.ReviewPopover.textClose": "Bezár",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Megjegyzését itt adja meg",
   "Common.Views.ReviewPopover.textFollowMove": "Mozgás követése",
   "Common.Views.ReviewPopover.textMention": "A +megemlítés hozzáférést biztosít a dokumentumhoz, és e-mailt küld.",
   "Common.Views.ReviewPopover.textMentionNotify": "A +mention e-mailben értesíti a felhasználót",
@@ -576,6 +720,7 @@
   "DE.Controllers.LeftMenu.warnReplaceString": "{0} nem írható be speciális karakterként a \"Csere\" mezőbe.",
   "DE.Controllers.Main.applyChangesTextText": "Módosítások betöltése...",
   "DE.Controllers.Main.applyChangesTitleText": "Módosítások betöltése",
+  "DE.Controllers.Main.confirmMaxChangesSize": "A műveletek mérete meghaladja a szerverre beállított korlátozást.<br> Nyomja meg a \" Mégsem \" gombot az utolsó művelet törléséhez, vagy nyomja meg a \" Folytatás \" gombot a művelet helyben tartásához ( a fájl letöltése vagy tartalmának másolása szükséges, hogy biztosan ne vesszen el semmi).",
   "DE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.",
   "DE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\" gombot a dokumentumlistához való visszatéréshez.",
   "DE.Controllers.Main.criticalErrorTitle": "Hiba",
@@ -586,6 +731,7 @@
   "DE.Controllers.Main.downloadTitleText": "Dokumentum letöltése",
   "DE.Controllers.Main.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.Controllers.Main.errorBadImageUrl": "Hibás kép URL",
+  "DE.Controllers.Main.errorCannotPasteImg": "Ezt a képet nem tudjuk a vágólapról beilleszteni, de elmentheti eszközére, és onnan beillesztheti, vagy másolhatja a képet szöveg nélkül, és a dokumentumba illesztheti.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.",
   "DE.Controllers.Main.errorComboSeries": "Kombinált diagram létrehozásához válasszon legalább két adatsort.",
   "DE.Controllers.Main.errorCompare": "A Dokumentumok összehasonlítása funkció nem érhető el együttes szerkesztés közben.",
@@ -602,12 +748,18 @@
   "DE.Controllers.Main.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "DE.Controllers.Main.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.Controllers.Main.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.Controllers.Main.errorInconsistentExt": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma nem felel meg a fájlkiterjesztésnek.",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma szöveges dokumentumnak (pl. docx) felel meg, de kiterjesztése nem megfelelő: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma a következő formátumok egyikének felel meg: pdf/djvu/xps/oxps, de kiterjesztése nem egyezik meg: %1.",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma megfelel a prezentációknak (pl. pptx), de kiterjesztése nem megfelelő: %1.",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma megfelel a táblázatoknak (pl. xlsx), de kiterjesztése nem megfelelő: %1.",
   "DE.Controllers.Main.errorKeyEncrypt": "Ismeretlen kulcsleíró",
   "DE.Controllers.Main.errorKeyExpire": "Lejárt kulcsleíró",
   "DE.Controllers.Main.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "A dokumentum megnyitása sikertelen. Kérjük, válasszon egy másik fájlt.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Sikertelen összevonás.",
   "DE.Controllers.Main.errorNoTOC": "Nincs frissítendő tartalomjegyzék. A Hivatkozások lapon beilleszthet egyet.",
+  "DE.Controllers.Main.errorPasswordIsNotCorrect": "A megadott jelszó helytelen.<br>Győződjön meg arról, hogy a CAPS LOCK billentyű ki van kapcsolva, és ügyeljen arra, hogy a megfelelő nagybetűket használja.",
   "DE.Controllers.Main.errorProcessSaveResult": "Sikertelen mentés.",
   "DE.Controllers.Main.errorServerVersion": "A szerkesztő verziója frissült. Az oldal újratöltésre kerül a módosítások alkalmazásához.",
   "DE.Controllers.Main.errorSessionAbsolute": "A dokumentumszerkesztési munkamenet lejárt. Kérjük, töltse be újra az oldalt.",
@@ -664,6 +816,7 @@
   "DE.Controllers.Main.textClose": "Bezár",
   "DE.Controllers.Main.textCloseTip": "Kattintson, a tippek bezárásához",
   "DE.Controllers.Main.textContactUs": "Értékesítés elérhetősége",
+  "DE.Controllers.Main.textContinue": "Folytatás",
   "DE.Controllers.Main.textConvertEquation": "Ez az egyenlet az egyenletszerkesztő régi verziójával lett létrehozva, amely már nem támogatott. A szerkesztéshez alakítsa az egyenletet Office Math ML formátumra.<br>Konvertáljuk most?",
   "DE.Controllers.Main.textCustomLoader": "Kérjük, vegye figyelembe, hogy a licence feltételei szerint nem jogosult a betöltő cseréjére.<br>Kérjük, forduljon értékesítési osztályunkhoz, hogy árajánlatot kapjon.",
   "DE.Controllers.Main.textDisconnect": "A kapcsolat megszakadt",
@@ -682,8 +835,10 @@
   "DE.Controllers.Main.textRequestMacros": "A makró kérést intéz az URL-hez. Szeretné engedélyezni a kérést a %1-hoz?",
   "DE.Controllers.Main.textShape": "Alakzat",
   "DE.Controllers.Main.textStrict": "Biztonságos mód",
+  "DE.Controllers.Main.textTryQuickPrint": "Ön a gyorsnyomtatást választotta: a teljes dokumentum az előzőleg kiválasztott vagy alapértelmezett nyomtatóra kerül kinyomtatásra.<br>Szeretné folytatni?",
   "DE.Controllers.Main.textTryUndoRedo": "A Visszavonás / Újra funkciók le vannak tiltva a Gyors együttes szerkesztés módban.<br>A \"Biztonságos mód\" gombra kattintva válthat a Biztonságos együttes szerkesztés módra, hogy a dokumentumot más felhasználókkal való interferencia nélkül tudja szerkeszteni, mentés után küldve el a módosításokat. A szerkesztési módok között a Speciális beállítások segítségével válthat.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "A Visszavonás/Újra funkciók le vannak tiltva a Gyors társszerkesztés módban.",
+  "DE.Controllers.Main.textUndo": "Vissza",
   "DE.Controllers.Main.titleLicenseExp": "Lejárt licenc",
   "DE.Controllers.Main.titleServerVersion": "Szerkesztő frissítve",
   "DE.Controllers.Main.titleUpdateVersion": "A verzió megváltozott",
@@ -954,6 +1109,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Nincs joga szerkeszteni a fájl-t.",
   "DE.Controllers.Navigation.txtBeginning": "Dokumentum eleje",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ugorj a dokumentum elejére",
+  "DE.Controllers.Print.textMarginsLast": "Előző egyéni beállítások",
+  "DE.Controllers.Print.txtCustom": "Egyedi",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Érvénytelen nyomtatási tartomány",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Adjon meg egy oldalszámot vagy az oldalak tartományát (például 5-12). Vagy  PDF-be nyomtathat.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Figyelmeztetés",
   "DE.Controllers.Search.textNoTextFound": "A keresett adatot nem sikerült megtalálni. Kérjük, módosítsa a keresési beállításokat.",
   "DE.Controllers.Search.textReplaceSkipped": "A csere megtörtént. {0} események kihagyásra kerültek.",
@@ -1467,6 +1626,13 @@
   "DE.Views.DateTimeDialog.textLang": "Nyelv",
   "DE.Views.DateTimeDialog.textUpdate": "Automatikus frissítés",
   "DE.Views.DateTimeDialog.txtTitle": "Dátum és idő",
+  "DE.Views.DocProtection.hintProtectDoc": "Dokumentum védelme",
+  "DE.Views.DocProtection.txtDocProtectedComment": "Védett dokumentum.<br>Kizárólag megjegyzéseket fűzhet ehhez a dokumentumhoz.",
+  "DE.Views.DocProtection.txtDocProtectedForms": "Védett dokumentum.<br>Kizárólag a dokumentumban található űrlapokat töltheti ki.",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "Védett dokumentum.<br>A dokumentumot szerkesztheti, de minden változtatás nyomon követhető lesz.",
+  "DE.Views.DocProtection.txtDocProtectedView": "Védett dokumentum.<br>Csak ezt a dokumentumot tekintheti meg.",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Jelszó megadása a dokumentum védelmének feloldásához",
+  "DE.Views.DocProtection.txtProtectDoc": "Dokumentum védelme",
   "DE.Views.DocumentHolder.aboveText": "Felett",
   "DE.Views.DocumentHolder.addCommentText": "Megjegyzés hozzáadása",
   "DE.Views.DocumentHolder.advancedDropCapText": "Iniciálé beállításai",
@@ -1796,10 +1962,11 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Verzió",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Hely",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Jogosult személyek",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Szimbólumlomok szóközökkel",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Karakterek szóközökkel",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statisztika",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Tárgy",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Szimbólumok",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Karakterek",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Címkék",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Cím",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Feltöltve",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Szavak",
@@ -1864,6 +2031,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Semmit nem mutat",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Korrigálás",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Pont",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "A gyorsnyomtatás gomb megjelenítése a szerkesztő fejlécében",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "A dokumentum az utoljára kiválasztott vagy alapértelmezett nyomtatón kerül kinyomtatásra.",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Összes engedélyezése",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Minden értesítés nélküli makró engedélyezése",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Sávváltozások megjelenítése",
@@ -2421,7 +2590,45 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Csak felső szegély beállítása",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Nincsenek szegélyek",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Legutóbbi egyéni beállítás",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Mérsékelt",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Keskeny",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normál",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "Normál (USA)",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Széles",
+  "DE.Views.PrintWithPreview.txtAllPages": "Minden oldal",
+  "DE.Views.PrintWithPreview.txtBottom": "Alul",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Aktuális oldal",
+  "DE.Views.PrintWithPreview.txtCustom": "Egyedi",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Egyedi nyomtatás",
+  "DE.Views.PrintWithPreview.txtLandscape": "Fekvő",
+  "DE.Views.PrintWithPreview.txtLeft": "Bal",
+  "DE.Views.PrintWithPreview.txtMargins": "Margók",
+  "DE.Views.PrintWithPreview.txtOf": "-ból/ből {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Oldal",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Hibás oldalszám",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Lap elrendezés",
+  "DE.Views.PrintWithPreview.txtPages": "Oldalak",
+  "DE.Views.PrintWithPreview.txtPageSize": "Oldal méret",
+  "DE.Views.PrintWithPreview.txtPortrait": "Álló",
+  "DE.Views.PrintWithPreview.txtPrint": "Nyomtatás",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Nyomtatás PDF-be",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Nyomtatási tartomány",
+  "DE.Views.PrintWithPreview.txtRight": "Jobb",
+  "DE.Views.PrintWithPreview.txtSelection": "Választás",
+  "DE.Views.PrintWithPreview.txtTop": "Felső",
+  "DE.Views.ProtectDialog.textComments": "Megjegyzések",
+  "DE.Views.ProtectDialog.textForms": "Nyomtatványok kitöltése",
+  "DE.Views.ProtectDialog.textReview": "Követett változások",
+  "DE.Views.ProtectDialog.textView": "Nincs változás (csak olvasható)",
   "DE.Views.ProtectDialog.txtAllow": "Csak ilyen típusú szerkesztés engedélyezése a dokumentumban",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "A megerősítő jelszó nem egyezik",
+  "DE.Views.ProtectDialog.txtOptional": "opcionális",
+  "DE.Views.ProtectDialog.txtPassword": "Jelszó",
+  "DE.Views.ProtectDialog.txtProtect": "Védelem",
+  "DE.Views.ProtectDialog.txtRepeat": "Jelszó ismétlése",
+  "DE.Views.ProtectDialog.txtTitle": "Védelem",
+  "DE.Views.ProtectDialog.txtWarning": "Figyelem: ha elveszti vagy elfelejti a jelszót, annak visszaállítására nincs mód. Tárolja biztonságos helyen.",
   "DE.Views.RightMenu.txtChartSettings": "Diagram beállítások",
   "DE.Views.RightMenu.txtFormSettings": "Űrlapbeállítások",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Fejléc és lábléc beállítások",
@@ -2760,6 +2967,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Kép",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Szünetek",
   "DE.Views.Toolbar.capBtnInsShape": "Alakzat",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Szimbólum",
   "DE.Views.Toolbar.capBtnInsTable": "Táblázat",
   "DE.Views.Toolbar.capBtnInsTextart": "TextArt",
@@ -2906,13 +3114,16 @@
   "DE.Views.Toolbar.tipIncPrLeft": "Francia bekezdés növelése",
   "DE.Views.Toolbar.tipInsertChart": "Diagram beszúrása",
   "DE.Views.Toolbar.tipInsertEquation": "Egyenlet beszúrása",
+  "DE.Views.Toolbar.tipInsertHorizontalText": "Horizontális szövegdoboz beillesztése",
   "DE.Views.Toolbar.tipInsertImage": "Kép beszúrása",
   "DE.Views.Toolbar.tipInsertNum": "Oldalszám beillesztése",
   "DE.Views.Toolbar.tipInsertShape": "Alakzat beszúrása",
+  "DE.Views.Toolbar.tipInsertSmartArt": "SmartArt beillesztése",
   "DE.Views.Toolbar.tipInsertSymbol": "Szimbólum beszúrása",
   "DE.Views.Toolbar.tipInsertTable": "Táblázat beszúrása",
   "DE.Views.Toolbar.tipInsertText": "Szövegdoboz beszúrása",
   "DE.Views.Toolbar.tipInsertTextArt": "TextArt beszúrása",
+  "DE.Views.Toolbar.tipInsertVerticalText": "Vertikális szövegdoboz beillesztése",
   "DE.Views.Toolbar.tipLineNumbers": "Sorszámok megjelenítése",
   "DE.Views.Toolbar.tipLineSpace": "Bekezdés sortávolság",
   "DE.Views.Toolbar.tipMailRecepients": "E-mail összevonás",
@@ -2984,8 +3195,10 @@
   "DE.Views.ViewTab.textFitToPage": "Oldalhoz igazít",
   "DE.Views.ViewTab.textFitToWidth": "Szélességhez igazít",
   "DE.Views.ViewTab.textInterfaceTheme": "Felhasználói felület témája",
+  "DE.Views.ViewTab.textLeftMenu": "Bal panel",
   "DE.Views.ViewTab.textNavigation": "Navigáció",
   "DE.Views.ViewTab.textOutline": "Címszavak",
+  "DE.Views.ViewTab.textRightMenu": "Jobb panel",
   "DE.Views.ViewTab.textRulers": "Vonalzók",
   "DE.Views.ViewTab.textStatusBar": "Állapotsor",
   "DE.Views.ViewTab.textZoom": "Zoom",

apps/documenteditor/main/locale/hy.json

@@ -285,6 +285,8 @@
   "Common.define.smartArt.textVerticalPictureList": "Ուղղաձիգ նկարի ցուցակ",
   "Common.define.smartArt.textVerticalProcess": "Ուղղաձիգ ընթացք",
   "Common.Translation.textMoreButton": "Ավել",
+  "Common.Translation.tipFileLocked": "Փաստաթուղթը կողպված է խմբագրման համար:Դուք կարող եք փոփոխություններ կատարել և հետագայում պահպանել այն որպես տեղական պատճեն:",
+  "Common.Translation.tipFileReadOnly": "Փաստաթուղթը միայն կարդալու է և կողպված է խմբագրման համար:ուք կարող եք փոփոխություններ կատարել ևպահպանել դրա տեղային պատճենն ավելի ուշ :",
   "Common.Translation.warnFileLocked": "Դուք չեք կարող խմբագրել այս ֆայլը, քանի որ այն խմբագրվում է մեկ այլ հավելվածում:",
   "Common.Translation.warnFileLockedBtnEdit": "Ստեղծել պատճեն",
   "Common.Translation.warnFileLockedBtnView": "Բացել դիտման համար",
@@ -458,6 +460,7 @@
   "Common.Views.Header.textCompactView": "Թաքցնել գործիքագոտին",
   "Common.Views.Header.textHideLines": "Թաքցնել քանոնները",
   "Common.Views.Header.textHideStatusBar": "Թաքցնել վիճակագոտին",
+  "Common.Views.Header.textReadOnly": "Միայն կարդալու",
   "Common.Views.Header.textRemoveFavorite": "Ջնջել ընտրված ցուցակից",
   "Common.Views.Header.textShare": "Տարածել",
   "Common.Views.Header.textZoom": "Խոշորացնել",
@@ -465,6 +468,7 @@
   "Common.Views.Header.tipDownload": "Ներբեռնել ֆայլը",
   "Common.Views.Header.tipGoEdit": "Խմբագրել ընթացիկ ֆայլը",
   "Common.Views.Header.tipPrint": "Տպել ֆայլը",
+  "Common.Views.Header.tipPrintQuick": "Արագ տպում",
   "Common.Views.Header.tipRedo": "Վերարկել",
   "Common.Views.Header.tipSave": "Պահպանել",
   "Common.Views.Header.tipSearch": "Որոնել",
@@ -612,6 +616,7 @@
   "Common.Views.ReviewPopover.textCancel": "Չեղարկել",
   "Common.Views.ReviewPopover.textClose": "Փակել",
   "Common.Views.ReviewPopover.textEdit": "Լավ",
+  "Common.Views.ReviewPopover.textEnterComment": "Այստեղ մուտքագրել Ձեր մեկնաբանությունը",
   "Common.Views.ReviewPopover.textFollowMove": "Վերադառնալ սկզբնական վայր",
   "Common.Views.ReviewPopover.textMention": "+նշումը թույլ կտա մուտք գործել փաստաթուղթ և ուղարկել էլ․ նամակ",
   "Common.Views.ReviewPopover.textMentionNotify": "+նշումը օգտատիրոջը կտեղեկացնի էլ.փոստի միջոցով",
@@ -726,6 +731,7 @@
   "DE.Controllers.Main.downloadTitleText": "Փաստաթղթի ներբեռնում",
   "DE.Controllers.Main.errorAccessDeny": "Դուք փորձում եք կատարել գործողություն, որի իրավունքը չունեք։<br>Դիմեք փաստաթղթերի ձեր սպասարկիչի վարիչին։",
   "DE.Controllers.Main.errorBadImageUrl": "Նկարի URL-ը սխալ է",
+  "DE.Controllers.Main.errorCannotPasteImg": "Մենք չենք կարող տեղադրել այս պատկերը Սեղմատախտակից, բայց դուք կարող եք պահել այն ձեր սարքում և տեղադրել այնտեղից, կամ կարող եք պատճենել պատկերն առանց տեքստի և տեղադրել այն փաստաթղթում:",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Սպասարկիչի հետ կապն ընդհատվել է։ Փաստաթուղթն այս պահին չի կարող խմբագրվել։",
   "DE.Controllers.Main.errorComboSeries": "Համակցված աղյուսակ ստեղծելու համար ընտրել տվյալների առնվազն երկու շարք:",
   "DE.Controllers.Main.errorCompare": "Համեմատել փաստաթղթերի գործառույթը հնարավոր չէ համատեղ խմբագրելիս:",
@@ -829,6 +835,7 @@
   "DE.Controllers.Main.textRequestMacros": "Մակրոն հարցում է անում URL-ին: Ցանկանու՞մ եք թույլ տալ հարցումը %1-ին:",
   "DE.Controllers.Main.textShape": "Պատկեր",
   "DE.Controllers.Main.textStrict": "Խիստ աշխատակարգ",
+  "DE.Controllers.Main.textTryQuickPrint": "Դուք ընտրել եք Արագ տպում` ամբողջ փաստաթուղթը կտպվի վերջին ընտրված կամ սկզբնադիր տպիչի վրա:<br> Ցանկանու՞մ եք շարունակել։",
   "DE.Controllers.Main.textTryUndoRedo": "Համախմբագրման արագ աշխատակարգում հետարկումն ու վերարկումն անջատված են։<br>«Խիստ աշխատակարգ»-ի սեղմումով անցեք համախմբագրման խիստ աշխատակարգին, որպեսզի նիշքը խմբագրեք առանց այլ օգտատերերի միջամտության և փոփոխումներն ուղարկեք միայն դրանք պահպանելուց հետո։ Կարող եք համախմբագրման աշխատակարգերը փոխել լրացուցիչ կարգավորումների միջոցով։",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Հետարկումն ու վերարկումն գործառույթներն անջատված են արագ համատեղ խմբագրման ռեժիմի համար:",
   "DE.Controllers.Main.textUndo": "Հետարկել",
@@ -1102,6 +1109,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Ձեզ թույլ չի տրվում խմբագրել այս ֆայլը։",
   "DE.Controllers.Navigation.txtBeginning": "Փաստաթղթի սկիզբ",
   "DE.Controllers.Navigation.txtGotoBeginning": "Գնալ փաստաթղթի սկիզբ",
+  "DE.Controllers.Print.textMarginsLast": "Վերջին օգտագործումը",
+  "DE.Controllers.Print.txtCustom": "Հարմարեցված",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Տպման անվավեր տիրույթ",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Մուտքագրեք կա՛մ մեկ էջի համար, կա՛մ մեկ էջի տիրույթ (օրինակ՝ 5-12): Կամ կարող եք տպել PDF-ով:",
   "DE.Controllers.Search.notcriticalErrorTitle": "Զգուշացում",
   "DE.Controllers.Search.textNoTextFound": "Ձեր փնտրած տվյալները չեն գտնվել:Խնդրում ենք կարգաբերել Ձեր որոնման ընտրանքները:",
   "DE.Controllers.Search.textReplaceSkipped": "Փոխարինումը կատարված է։{0} դեպք բաց է թողնվել:",
@@ -2020,6 +2031,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Ոչ մեկ չդիտել",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Ստուգում ",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Կետ",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Ցուցադրել «Արագ տպել» կոճակը խմբագրի վերնագրում",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Փաստաթուղթը կտպվի վերջին ընտրված կամ սկզբնադիր տպիչի վրա",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Միացնել բոլորը",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Առանց ծանուցման միացնել բոլոր մակրոները",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Ցույց տալ հետագծի փոփոխությունները",
@@ -2577,6 +2590,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Սահմանել միայն վերին եզրագիծը",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Ինքնաշխատ",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Առանց եզրագծերի",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Վերջին օգտագործումը",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Չափավոր",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Նեղ",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Սովորական",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "ԱՄՆ նորմալ",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Լայն",
+  "DE.Views.PrintWithPreview.txtAllPages": "Բոլոր էջեր",
+  "DE.Views.PrintWithPreview.txtBottom": "Ներքև",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Ընթացիկ էջ",
+  "DE.Views.PrintWithPreview.txtCustom": "Հարմարեցված",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Հարմարեցված տպագրություն",
+  "DE.Views.PrintWithPreview.txtLandscape": "Հորիզոնական",
+  "DE.Views.PrintWithPreview.txtLeft": "Ձախ",
+  "DE.Views.PrintWithPreview.txtMargins": "Լուսանցքներ",
+  "DE.Views.PrintWithPreview.txtOf": "{0}-ից",
+  "DE.Views.PrintWithPreview.txtPage": "Էջ",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Էջի համարն անվավեր է",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Էջի կողմնորոշում",
+  "DE.Views.PrintWithPreview.txtPages": "Էջեր",
+  "DE.Views.PrintWithPreview.txtPageSize": "Էջի չափ",
+  "DE.Views.PrintWithPreview.txtPortrait": "Ուղղաձիգ ",
+  "DE.Views.PrintWithPreview.txtPrint": "Տպել",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Տպել PDF-ով",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Տպման տիրույթ",
+  "DE.Views.PrintWithPreview.txtRight": "Աջ",
+  "DE.Views.PrintWithPreview.txtSelection": "Ընտրություն",
+  "DE.Views.PrintWithPreview.txtTop": "Վերև",
   "DE.Views.ProtectDialog.textComments": "Մեկնաբանություններ",
   "DE.Views.ProtectDialog.textForms": "Լրացվող ձևեր",
   "DE.Views.ProtectDialog.textReview": "Հետագծված փոփոխություններ",

apps/documenteditor/main/locale/id.json

@@ -39,29 +39,29 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Indent kanan",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Disisipkan:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Miring",
-  "Common.Controllers.ReviewChanges.textJustify": "Rata",
+  "Common.Controllers.ReviewChanges.textJustify": "Rata kiri kanan",
   "Common.Controllers.ReviewChanges.textKeepLines": "Pertahankan garis bersama",
   "Common.Controllers.ReviewChanges.textKeepNext": "Satukan dengan berikutnya",
-  "Common.Controllers.ReviewChanges.textLeft": "Sejajar kiri",
+  "Common.Controllers.ReviewChanges.textLeft": "Rata kiri",
   "Common.Controllers.ReviewChanges.textLineSpacing": "Spasi Antar Baris:",
   "Common.Controllers.ReviewChanges.textMultiple": "banyak",
   "Common.Controllers.ReviewChanges.textNoBreakBefore": "Tanpa break halaman sebelum",
-  "Common.Controllers.ReviewChanges.textNoContextual": "Tambah jarak diantara",
+  "Common.Controllers.ReviewChanges.textNoContextual": "Tambah jarak di antara",
   "Common.Controllers.ReviewChanges.textNoKeepLines": "Jangan satukan garis",
   "Common.Controllers.ReviewChanges.textNoKeepNext": "Jangan satukan dengan berikutnya",
   "Common.Controllers.ReviewChanges.textNot": "Tidak ",
   "Common.Controllers.ReviewChanges.textNoWidow": "Tanpa kontrol widow",
   "Common.Controllers.ReviewChanges.textNum": "Ganti penomoran",
   "Common.Controllers.ReviewChanges.textOff": "{0} tidak lagi menggunakan Lacak Perubahan.",
-  "Common.Controllers.ReviewChanges.textOffGlobal": "{0} menonaktifkan Lacak Perubahan untuk semua.",
+  "Common.Controllers.ReviewChanges.textOffGlobal": "{0} menonaktifkan Lacak Perubahan untuk semua orang.",
   "Common.Controllers.ReviewChanges.textOn": "{0} sedang menggunakan Lacak Perubahan.",
-  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} mengaktifkan Lacak Perubahan untuk semua.",
+  "Common.Controllers.ReviewChanges.textOnGlobal": "{0} mengaktifkan Lacak Perubahan untuk semua orang.",
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paragraf Dihapus</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraf Diformat",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraf Disisipkan</b>",
-  "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Pindah ke bawah:</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Dipindah Ke Bawah:</b>",
-  "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Pindah ke atas:</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Dipindah Ke Atas:</b>",
-  "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Pindah:</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Dipindah:</b>",
   "Common.Controllers.ReviewChanges.textPosition": "Posisi",
   "Common.Controllers.ReviewChanges.textRight": "Rata kanan",
   "Common.Controllers.ReviewChanges.textShape": "Bentuk",
@@ -74,9 +74,9 @@
   "Common.Controllers.ReviewChanges.textStrikeout": "Coret ganda",
   "Common.Controllers.ReviewChanges.textSubScript": "Subskrip",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superskrip",
-  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Setelan tabel</b>",
+  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Pengaturan Tabel Diubah</b>",
-  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Baris tabel ditambah</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Baris Tabel Ditambah</b>",
-  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Baris Tabel dihapus</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Baris Tabel Dihapus</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Ganti tab",
   "Common.Controllers.ReviewChanges.textTitleComparison": "Pengaturan Perbandingan",
   "Common.Controllers.ReviewChanges.textUnderline": "Garis bawah",
@@ -105,16 +105,16 @@
   "Common.define.chartData.textHBarNormal": "Grafik batang klaster",
   "Common.define.chartData.textHBarNormal3d": "Diagram Batang Cluster 3-D",
   "Common.define.chartData.textHBarStacked": "Diagram batang bertumpuk",
-  "Common.define.chartData.textHBarStacked3d": "Diagram batang bertumpuk 3-D",
+  "Common.define.chartData.textHBarStacked3d": "Batang bertumpuk 3-D",
-  "Common.define.chartData.textHBarStackedPer": "Diagram batang bertumpuk 100%",
+  "Common.define.chartData.textHBarStackedPer": "Batang bertumpuk 100%",
-  "Common.define.chartData.textHBarStackedPer3d": "Diagram batang bertumpuk 100% 3-D",
+  "Common.define.chartData.textHBarStackedPer3d": "Batang bertumpuk 100% 3-D",
   "Common.define.chartData.textLine": "Garis",
   "Common.define.chartData.textLine3d": "Garis 3-D",
   "Common.define.chartData.textLineMarker": "Garis dengan tanda",
   "Common.define.chartData.textLineStacked": "Diagram garis bertumpuk",
   "Common.define.chartData.textLineStackedMarker": "Diagram garis bertumpuk dengan marker",
   "Common.define.chartData.textLineStackedPer": "Garis bertumpuk 100%",
-  "Common.define.chartData.textLineStackedPerMarker": "Garis bertumpuk 100% dengan marker",
+  "Common.define.chartData.textLineStackedPerMarker": "Garis bertumpuk 100% dengan penanda",
   "Common.define.chartData.textPie": "Diagram Lingkaran",
   "Common.define.chartData.textPie3d": "Pie 3-D",
   "Common.define.chartData.textPoint": "XY (Scatter)",
@@ -285,11 +285,13 @@
   "Common.define.smartArt.textVerticalPictureList": "Daftar Gambar Vertikal",
   "Common.define.smartArt.textVerticalProcess": "Proses Vertikal",
   "Common.Translation.textMoreButton": "Lainnya",
+  "Common.Translation.tipFileLocked": "Dokumen terkunci untuk diedit. Anda dapat membuat perubahan dan menyimpannya sebagai salinan lokal nanti.",
+  "Common.Translation.tipFileReadOnly": "Dokumen hanya dapat dibaca. Untuk menyimpan perubahan Anda, simpan file dengan nama baru atau di tempat lain.",
   "Common.Translation.warnFileLocked": "Anda tidak bisa edit file ini karena sedang di edit di aplikasi lain.",
   "Common.Translation.warnFileLockedBtnEdit": "Buat salinan",
   "Common.Translation.warnFileLockedBtnView": "Buka untuk dilihat",
   "Common.UI.ButtonColored.textAutoColor": "Otomatis",
-  "Common.UI.ButtonColored.textNewColor": "Tambahkan warna khusus baru",
+  "Common.UI.ButtonColored.textNewColor": "Tambahkan Warna Ubahan Baru",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "Agustus",
   "Common.UI.Calendar.textDecember": "Desember",
@@ -384,7 +386,7 @@
   "Common.Views.AutoCorrectDialog.textAdd": "Tambahkan",
   "Common.Views.AutoCorrectDialog.textApplyText": "Terapkan sambil Anda menulis",
   "Common.Views.AutoCorrectDialog.textAutoCorrect": "AutoKoreksi Teks",
-  "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat Sesuai yang Anda Mau",
+  "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat sambil Anda mengetik",
   "Common.Views.AutoCorrectDialog.textBulleted": "Butir list otomatis",
   "Common.Views.AutoCorrectDialog.textBy": "oleh",
   "Common.Views.AutoCorrectDialog.textDelete": "Hapus",
@@ -419,7 +421,7 @@
   "Common.Views.Comments.mniPositionAsc": "Dari atas",
   "Common.Views.Comments.mniPositionDesc": "Dari bawah",
   "Common.Views.Comments.textAdd": "Tambahkan",
-  "Common.Views.Comments.textAddComment": "Tambahkan komentar",
+  "Common.Views.Comments.textAddComment": "Tambahkan Komentar",
   "Common.Views.Comments.textAddCommentToDoc": "Tambahkan Komentar untuk dokumen",
   "Common.Views.Comments.textAddReply": "Tambahkan Balasan",
   "Common.Views.Comments.textAll": "Semua",
@@ -453,11 +455,12 @@
   "Common.Views.ExternalOleEditor.textTitle": "Penyunting Spreadsheet",
   "Common.Views.Header.labelCoUsersDescr": "User yang sedang edit file:",
   "Common.Views.Header.textAddFavorite": "Tandai sebagai favorit",
-  "Common.Views.Header.textAdvSettings": "Pengaturan Lanjut",
+  "Common.Views.Header.textAdvSettings": "Pengaturan lanjut",
   "Common.Views.Header.textBack": "Buka Dokumen",
   "Common.Views.Header.textCompactView": "Sembunyikan Toolbar",
   "Common.Views.Header.textHideLines": "Sembunyikan Mistar",
   "Common.Views.Header.textHideStatusBar": "Sembunyikan Bilah Status",
+  "Common.Views.Header.textReadOnly": "Hanya baca",
   "Common.Views.Header.textRemoveFavorite": "Hilangkan dari Favorit",
   "Common.Views.Header.textShare": "Bagikan",
   "Common.Views.Header.textZoom": "Pembesaran",
@@ -465,6 +468,7 @@
   "Common.Views.Header.tipDownload": "Unduh File",
   "Common.Views.Header.tipGoEdit": "Edit file saat ini",
   "Common.Views.Header.tipPrint": "Print file",
+  "Common.Views.Header.tipPrintQuick": "Cetak cepat",
   "Common.Views.Header.tipRedo": "Ulangi",
   "Common.Views.Header.tipSave": "Simpan",
   "Common.Views.Header.tipSearch": "Cari",
@@ -482,12 +486,12 @@
   "Common.Views.History.textShowAll": "Tampilkan detail perubahan",
   "Common.Views.History.textVer": "ver.",
   "Common.Views.ImageFromUrlDialog.textUrl": "Tempel URL gambar:",
-  "Common.Views.ImageFromUrlDialog.txtEmpty": "Kolom ini harus diisi",
+  "Common.Views.ImageFromUrlDialog.txtEmpty": "Ruas ini diperlukan",
-  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Bagian ini harus berupa URL dengn format \"http://www.contoh.com\"",
+  "Common.Views.ImageFromUrlDialog.txtNotUrl": "Ruas ini harus berupa URL dengan format \"http://www.contoh.com\"",
   "Common.Views.InsertTableDialog.textInvalidRowsCols": "Anda harus menentukan baris dan jumlah kolom yang benar.",
   "Common.Views.InsertTableDialog.txtColumns": "Jumlah kolom",
-  "Common.Views.InsertTableDialog.txtMaxText": "Input maksimal untuk kolom ini adalah {0}.",
+  "Common.Views.InsertTableDialog.txtMaxText": "Nilai maksimal untuk ruas ini adalah {0}.",
-  "Common.Views.InsertTableDialog.txtMinText": "Input minimal untuk kolom ini adalah {0}.",
+  "Common.Views.InsertTableDialog.txtMinText": "Nilai minimal untuk ruas ini adalah {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Jumlah baris",
   "Common.Views.InsertTableDialog.txtTitle": "Ukuran tabel",
   "Common.Views.InsertTableDialog.txtTitleSplit": "Belah sel",
@@ -517,14 +521,14 @@
   "Common.Views.Protection.hintAddPwd": "Enkripsi dengan password",
   "Common.Views.Protection.hintDelPwd": "Hapus kata sandi",
   "Common.Views.Protection.hintPwd": "Ganti atau hapus password",
-  "Common.Views.Protection.hintSignature": "Tambah tanda tangan digital atau garis tanda tangan",
+  "Common.Views.Protection.hintSignature": "Tambah tanda tangan digital atau baris tanda tangan",
   "Common.Views.Protection.txtAddPwd": "Tambah password",
   "Common.Views.Protection.txtChangePwd": "Ubah kata sandi",
   "Common.Views.Protection.txtDeletePwd": "Nama file",
   "Common.Views.Protection.txtEncrypt": "Enkripsi",
   "Common.Views.Protection.txtInvisibleSignature": "Tambah tanda tangan digital",
   "Common.Views.Protection.txtSignature": "Tanda Tangan",
-  "Common.Views.Protection.txtSignatureLine": "Tambah garis tanda tangan",
+  "Common.Views.Protection.txtSignatureLine": "Tambah baris tanda tangan",
   "Common.Views.RenameDialog.textName": "Nama file",
   "Common.Views.RenameDialog.txtInvalidName": "Nama file tidak boleh berisi karakter seperti: ",
   "Common.Views.ReviewChanges.hintNext": "Ke perubahan berikutnya",
@@ -555,7 +559,7 @@
   "Common.Views.ReviewChanges.tipSetSpelling": "Periksa Ejaan",
   "Common.Views.ReviewChanges.tipSharing": "Atur perizinan akses dokumen",
   "Common.Views.ReviewChanges.txtAccept": "Terima",
-  "Common.Views.ReviewChanges.txtAcceptAll": "Terima semua perubahan",
+  "Common.Views.ReviewChanges.txtAcceptAll": "Terima Semua Perubahan",
   "Common.Views.ReviewChanges.txtAcceptChanges": "Terima perubahan",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Terima Perubahan Saat Ini",
   "Common.Views.ReviewChanges.txtChat": "Chat",
@@ -612,6 +616,7 @@
   "Common.Views.ReviewPopover.textCancel": "Batalkan",
   "Common.Views.ReviewPopover.textClose": "Tutup",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Tuliskan komentar Anda di sini",
   "Common.Views.ReviewPopover.textFollowMove": "Ikuti pergerakan",
   "Common.Views.ReviewPopover.textMention": "+mention akan memberikan akses ke dokumen dan mengirimkan email",
   "Common.Views.ReviewPopover.textMentionNotify": "+mention akan mengingatkan user lewat email",
@@ -668,7 +673,7 @@
   "Common.Views.SignSettingsDialog.textInstructions": "Instruksi untuk penandatangan",
   "Common.Views.SignSettingsDialog.textShowDate": "Tampilkan tanggal di garis tandatangan",
   "Common.Views.SignSettingsDialog.textTitle": "Penyiapan tanda tangan",
-  "Common.Views.SignSettingsDialog.txtEmpty": "Area ini dibutuhkan",
+  "Common.Views.SignSettingsDialog.txtEmpty": "Ruas ini diperlukan",
   "Common.Views.SymbolTableDialog.textCharacter": "Karakter",
   "Common.Views.SymbolTableDialog.textCode": "Nilai Unicode HEX",
   "Common.Views.SymbolTableDialog.textCopyright": "Tanda hak cipta",
@@ -682,8 +687,8 @@
   "Common.Views.SymbolTableDialog.textFont": "Huruf",
   "Common.Views.SymbolTableDialog.textNBHyphen": "Tanda sambung tak-putus",
   "Common.Views.SymbolTableDialog.textNBSpace": "Spasi tak-putus",
-  "Common.Views.SymbolTableDialog.textPilcrow": "Simbol Pilcrow",
+  "Common.Views.SymbolTableDialog.textPilcrow": "Tanda pilcrow",
-  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em Space",
+  "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 Em space",
   "Common.Views.SymbolTableDialog.textRange": "Rentang",
   "Common.Views.SymbolTableDialog.textRecent": "Simbol yang baru digunakan",
   "Common.Views.SymbolTableDialog.textRegistered": "Tanda terdaftar",
@@ -712,7 +717,7 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "Jika Anda lanjut simpan dengan format ini, semua fitur kecuali teks akan hilang.<br>Apakah Anda ingin melanjutkan?",
   "DE.Controllers.LeftMenu.warnDownloadAsPdf": "{0} Anda akan dikonversi ke format yang bisa diedit. Hal ini mungkin akan membutuhkan waktu. Dokumen yang dihasilkan akan dioptimalkan untuk memungkinkan Anda mengedit teks, sehingga mungkin tidak terlihat persis seperti aslinya {0}, terutama jika file asli berisi banyak gambar.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Jika Anda lanjut simpan dengan format ini, beberapa format lain mungkin akan terhapus.<br>Apakah Anda ingin melanjutkan?",
-  "DE.Controllers.LeftMenu.warnReplaceString": "{0} bukan karakter khusus yang valid untuk bidang penggantian.",
+  "DE.Controllers.LeftMenu.warnReplaceString": "{0} bukan karakter khusus yang valid untuk ruas penggantian.",
   "DE.Controllers.Main.applyChangesTextText": "Memuat perubahan...",
   "DE.Controllers.Main.applyChangesTitleText": "Memuat Perubahan",
   "DE.Controllers.Main.confirmMaxChangesSize": "Ukuran tindakan melebihi batas yang ditetapkan untuk server Anda.<br>Tekan \"Batalkan\" untuk membatalkan tindakan terakhir Anda atau tekan \"Lanjutkan\" untuk menyimpan tindakan secara lokal (Anda perlu mengunduh file atau menyalin isinya untuk memastikan tidak ada yang hilang).",
@@ -726,6 +731,7 @@
   "DE.Controllers.Main.downloadTitleText": "Mengunduh Dokumen",
   "DE.Controllers.Main.errorAccessDeny": "Anda mencoba melakukan sesuatu yang tidak memiliki izin.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.Controllers.Main.errorBadImageUrl": "URL Gambar salah",
+  "DE.Controllers.Main.errorCannotPasteImg": "Kami tak bisa menempel gambar ini dari Papan Klip, tapi Anda dapat menyimpannya\nke perangkat Anda dan menyisipkannya dari sana, atau Anda dapat menyalin gambar\ntanpa teks dan menempelkannya ke dalam dokumen.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Koneksi server terputus. Saat ini dokumen tidak dapat diedit.",
   "DE.Controllers.Main.errorComboSeries": "Untuk membuat grafik kombinasi, pilih setidaknya dua seri data.",
   "DE.Controllers.Main.errorCompare": "Fitur Membandingkan Dokumen tidak tersedia saat co-editing. ",
@@ -762,7 +768,7 @@
   "DE.Controllers.Main.errorSetPassword": "Password tidak bisa diatur.",
   "DE.Controllers.Main.errorStockChart": "Urutan baris salah. Untuk membuat diagram garis, masukkan data pada lembar kerja dengan urutan berikut ini:<br> harga pembukaan, harga maksimal, harga minimal, harga penutupan.",
   "DE.Controllers.Main.errorSubmit": "Submit gagal.",
-  "DE.Controllers.Main.errorTextFormWrongFormat": "Nilai yang dimasukkan tidak cocok dengan format bidang.",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "Nilai yang dimasukkan tidak cocok dengan format ruas.",
   "DE.Controllers.Main.errorToken": "Token keamanan dokumen tidak dibentuk dengan tepat.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.Controllers.Main.errorTokenExpire": "Token keamanan dokumen sudah kadaluwarsa.<br>Silakan hubungi admin Server Dokumen Anda.",
   "DE.Controllers.Main.errorUpdateVersion": "Versi file telah diubah. Halaman tidak akan dimuat ulang.",
@@ -829,6 +835,7 @@
   "DE.Controllers.Main.textRequestMacros": "Sebuah makro melakukan permintaan ke URL. Apakah Anda akan mengizinkan permintaan ini ke %1?",
   "DE.Controllers.Main.textShape": "Bentuk",
   "DE.Controllers.Main.textStrict": "Mode strict",
+  "DE.Controllers.Main.textTryQuickPrint": "Anda telah memilih Cetak cepat: seluruh dokumen akan dicetak pada printer yang terakhir dipilih atau baku.<br>Apakah Anda hendak melanjutkan?",
   "DE.Controllers.Main.textTryUndoRedo": "Fungsi Undo/Redo dinonaktifkan untuk mode Co-editing Cepat.<br>Klik tombol 'Mode strict' untuk mengganti ke Mode Strict Co-editing untuk edit file tanpa gangguan dari user lain dan kirim perubahan Anda hanya setelah Anda menyimpannya. Anda bisa mengganti mode co-editing menggunakan editor di pengaturan lanjut.",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Fungsi Undo/Redo dinonaktifkan untuk mode Co-editing Cepat.",
   "DE.Controllers.Main.textUndo": "Batalkan",
@@ -1102,6 +1109,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Hak Anda untuk mengedit file ditolak.",
   "DE.Controllers.Navigation.txtBeginning": "Awal dokumen",
   "DE.Controllers.Navigation.txtGotoBeginning": "Pergi ke awal dokumen",
+  "DE.Controllers.Print.textMarginsLast": "Ubahan Terakhir",
+  "DE.Controllers.Print.txtCustom": "Ubahan",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Rentang cetak tidak valid",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "Masukkan satu nomor halaman atau satu rentang halaman (misalnya, 5-12). Atau Anda bisa Cetak ke PDF.",
   "DE.Controllers.Search.notcriticalErrorTitle": "Peringatan",
   "DE.Controllers.Search.textNoTextFound": "Data yang Anda cari tidak ditemukan. Silakan atur opsi pencarian Anda.",
   "DE.Controllers.Search.textReplaceSkipped": "Penggantian telah dilakukan. {0} kemunculan telah dilewatkan.",
@@ -1500,7 +1511,7 @@
   "DE.Views.CellsAddDialog.textRight": "Ke kanan",
   "DE.Views.CellsAddDialog.textRow": "Baris",
   "DE.Views.CellsAddDialog.textTitle": "Sisipkan beberapa",
-  "DE.Views.CellsAddDialog.textUp": "Diatas kursor",
+  "DE.Views.CellsAddDialog.textUp": "Di atas kursor",
   "DE.Views.ChartSettings.text3dDepth": "Kedalaman (% dari dasar)",
   "DE.Views.ChartSettings.text3dHeight": "Tinggi (% dari dasar)",
   "DE.Views.ChartSettings.text3dRotation": "Rotasi 3D",
@@ -1629,7 +1640,7 @@
   "DE.Views.DocumentHolder.advancedFrameText": "Pengaturan Lanjut untuk Kerangka",
   "DE.Views.DocumentHolder.advancedParagraphText": "Pengaturan Lanjut untuk Paragraf",
   "DE.Views.DocumentHolder.advancedTableText": "Pengaturan Lanjut untuk Tabel",
-  "DE.Views.DocumentHolder.advancedText": "Pengaturan Lanjut",
+  "DE.Views.DocumentHolder.advancedText": "Pengaturan lanjut",
   "DE.Views.DocumentHolder.alignmentText": "Perataan",
   "DE.Views.DocumentHolder.allLinearText": "Semua - Linear",
   "DE.Views.DocumentHolder.allProfText": "Semua - Profesional",
@@ -1677,7 +1688,7 @@
   "DE.Views.DocumentHolder.moreText": "Varian lain...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Tidak ada varian",
   "DE.Views.DocumentHolder.notcriticalErrorTitle": "Peringatan",
-  "DE.Views.DocumentHolder.originalSizeText": "Ukuran Sebenarnya",
+  "DE.Views.DocumentHolder.originalSizeText": "Ukuran sebenarnya",
   "DE.Views.DocumentHolder.paragraphText": "Paragraf",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Hapus Hyperlink",
   "DE.Views.DocumentHolder.rightText": "Kanan",
@@ -1732,12 +1743,12 @@
   "DE.Views.DocumentHolder.textNumberingValue": "Penomoran nilai",
   "DE.Views.DocumentHolder.textPaste": "Tempel",
   "DE.Views.DocumentHolder.textPrevPage": "Halaman Sebelumnya",
-  "DE.Views.DocumentHolder.textRefreshField": "Update area",
+  "DE.Views.DocumentHolder.textRefreshField": "Perbarui ruas",
   "DE.Views.DocumentHolder.textReject": "Tolak Perubahan",
   "DE.Views.DocumentHolder.textRemCheckBox": "Hilangkan Checkbox",
   "DE.Views.DocumentHolder.textRemComboBox": "Hilangkan Kotak Combo",
   "DE.Views.DocumentHolder.textRemDropdown": "Hilangkan Dropdown",
-  "DE.Views.DocumentHolder.textRemField": "Hilangkan Area Teks",
+  "DE.Views.DocumentHolder.textRemField": "Hapus Ruas Teks",
   "DE.Views.DocumentHolder.textRemove": "Hapus",
   "DE.Views.DocumentHolder.textRemoveControl": "Hilangkan Kontrol Konten",
   "DE.Views.DocumentHolder.textRemPicture": "Hilangkan Gambar",
@@ -1767,15 +1778,15 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Update daftar isi",
   "DE.Views.DocumentHolder.textWrap": "Bentuk Potongan",
   "DE.Views.DocumentHolder.tipIsLocked": "Elemen ini sedang diedit oleh pengguna lain.",
-  "DE.Views.DocumentHolder.toDictionaryText": "Tambah ke Kamus",
+  "DE.Views.DocumentHolder.toDictionaryText": "Tambahkan ke kamus",
-  "DE.Views.DocumentHolder.txtAddBottom": "Tambah pembatas bawah",
+  "DE.Views.DocumentHolder.txtAddBottom": "Tambah tepi bawah",
-  "DE.Views.DocumentHolder.txtAddFractionBar": "Tambah bar pecahan",
+  "DE.Views.DocumentHolder.txtAddFractionBar": "Tambah batang pecahan",
   "DE.Views.DocumentHolder.txtAddHor": "Tambah garis horizontal",
   "DE.Views.DocumentHolder.txtAddLB": "Tambah garis kiri bawah",
-  "DE.Views.DocumentHolder.txtAddLeft": "Tambah pembatas kiri",
+  "DE.Views.DocumentHolder.txtAddLeft": "Tambah tepi kiri",
   "DE.Views.DocumentHolder.txtAddLT": "Tambah garis kiri atas",
-  "DE.Views.DocumentHolder.txtAddRight": "Tambah pembatas kiri",
+  "DE.Views.DocumentHolder.txtAddRight": "Tambah tepi kanan",
-  "DE.Views.DocumentHolder.txtAddTop": "Tambah pembatas atas",
+  "DE.Views.DocumentHolder.txtAddTop": "Tambah tepi atas",
   "DE.Views.DocumentHolder.txtAddVer": "Tambah garis vertikal",
   "DE.Views.DocumentHolder.txtAlignToChar": "Rata dengan karakter",
   "DE.Views.DocumentHolder.txtBehind": "Di belakang teks",
@@ -1930,8 +1941,8 @@
   "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Dokumen Kosong",
   "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Buat Baru",
   "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Terapkan",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tambahkan penulis",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tambahkan Penulis",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tambah teks",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tambah Teks",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikasi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Penyusun",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Ubah hak akses",
@@ -1951,10 +1962,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "Versi PDF",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Orang yang memiliki hak",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Simbol dengan spasi",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Karakter dengan spasi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistik",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subyek",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simbol",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Karakter",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Tag",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Judul",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Diunggah",
@@ -2020,6 +2031,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "Tidak Ada yang Dilihat",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "Proofing",
   "DE.Views.FileMenuPanels.Settings.txtPt": "Titik",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "Tampilkan tombol Cetak Cepat dalam header editor",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "Dokumen akan",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Aktifkan Semua",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Aktifkan semua macros tanpa notifikasi",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "Tampilkan pelacak perubahan",
@@ -2044,14 +2057,14 @@
   "DE.Views.FormSettings.textComb": "Karakter bersisir",
   "DE.Views.FormSettings.textCombobox": "Kotak combo",
   "DE.Views.FormSettings.textComplex": "Bidang Kompleks",
-  "DE.Views.FormSettings.textConnected": "Area terhubung",
+  "DE.Views.FormSettings.textConnected": "Ruas terhubung",
   "DE.Views.FormSettings.textDelete": "Hapus",
   "DE.Views.FormSettings.textDigits": "Digit",
   "DE.Views.FormSettings.textDisconnect": "Putuskan hubungan",
   "DE.Views.FormSettings.textDropDown": "Dropdown",
   "DE.Views.FormSettings.textExact": "Persis",
-  "DE.Views.FormSettings.textField": "Area Teks",
+  "DE.Views.FormSettings.textField": "Ruas Teks",
-  "DE.Views.FormSettings.textFixed": "Area ukuran tetap",
+  "DE.Views.FormSettings.textFixed": "Ruas ukuran tetap",
   "DE.Views.FormSettings.textFormat": "Format",
   "DE.Views.FormSettings.textFormatSymbols": "Simbol yang Diizinkan",
   "DE.Views.FormSettings.textFromFile": "Dari File",
@@ -2064,7 +2077,7 @@
   "DE.Views.FormSettings.textLock": "Kunci",
   "DE.Views.FormSettings.textMask": "Sebarang Masker",
   "DE.Views.FormSettings.textMaxChars": "Batas karakter",
-  "DE.Views.FormSettings.textMulti": "Area multi-garis",
+  "DE.Views.FormSettings.textMulti": "Ruas multi baris",
   "DE.Views.FormSettings.textNever": "tidak pernah",
   "DE.Views.FormSettings.textNoBorder": "Tanpa pembatas",
   "DE.Views.FormSettings.textNone": "Tidak ada",
@@ -2092,21 +2105,21 @@
   "DE.Views.FormsTab.capBtnDropDown": "Dropdown",
   "DE.Views.FormsTab.capBtnEmail": "Alamat Email",
   "DE.Views.FormsTab.capBtnImage": "Gambar",
-  "DE.Views.FormsTab.capBtnNext": "Area Berikutnya",
+  "DE.Views.FormsTab.capBtnNext": "Ruas Berikutnya",
   "DE.Views.FormsTab.capBtnPhone": "Nomor Telepon",
-  "DE.Views.FormsTab.capBtnPrev": "Area Sebelumnya",
+  "DE.Views.FormsTab.capBtnPrev": "Ruas Sebelumnya",
   "DE.Views.FormsTab.capBtnRadioBox": "Tombol Radio",
   "DE.Views.FormsTab.capBtnSaveForm": "Simpan sebagai oform",
   "DE.Views.FormsTab.capBtnSubmit": "Submit",
-  "DE.Views.FormsTab.capBtnText": "Area Teks",
+  "DE.Views.FormsTab.capBtnText": "Ruas Teks",
   "DE.Views.FormsTab.capBtnView": "Tampilkan form",
-  "DE.Views.FormsTab.textClear": "Bersihkan Area",
+  "DE.Views.FormsTab.textClear": "Bersihkan Ruas",
-  "DE.Views.FormsTab.textClearFields": "Bersihkan Semua Area",
+  "DE.Views.FormsTab.textClearFields": "Bersihkan Semua Ruas",
-  "DE.Views.FormsTab.textCreateForm": "Tambah area dan buat dokumen OFORM yang bisa diisi",
+  "DE.Views.FormsTab.textCreateForm": "Tambah ruas dan buat dokumen OFORM yang bisa diisi",
   "DE.Views.FormsTab.textGotIt": "Mengerti",
   "DE.Views.FormsTab.textHighlight": "Pengaturan Highlight",
   "DE.Views.FormsTab.textNoHighlight": "Tanpa highlight",
-  "DE.Views.FormsTab.textRequired": "Isi semua area yang dibutuhkan untuk mengirim form.",
+  "DE.Views.FormsTab.textRequired": "Isi semua ruas yang dibutuhkan untuk mengirim formulir.",
   "DE.Views.FormsTab.textSubmited": "Form berhasil disubmit",
   "DE.Views.FormsTab.tipCheckBox": "Sisipkan kotak centang",
   "DE.Views.FormsTab.tipComboBox": "Sisipkan kotak kombo",
@@ -2115,13 +2128,13 @@
   "DE.Views.FormsTab.tipDropDown": "Sisipkan list dropdown",
   "DE.Views.FormsTab.tipEmailField": "Sisipkan alamat email",
   "DE.Views.FormsTab.tipImageField": "Sisipkan Gambar",
-  "DE.Views.FormsTab.tipNextForm": "Pergi ke area berikutnya",
+  "DE.Views.FormsTab.tipNextForm": "Pergi ke ruas berikutnya",
   "DE.Views.FormsTab.tipPhoneField": "Sisipkan nomor telepon",
-  "DE.Views.FormsTab.tipPrevForm": "Pergi ke area sebelumnya",
+  "DE.Views.FormsTab.tipPrevForm": "Pergi ke ruas sebelumnya",
   "DE.Views.FormsTab.tipRadioBox": "Sisipkan tombol radio",
   "DE.Views.FormsTab.tipSaveForm": "Simpan file sebagai dokumen OFORM yang bisa diisi",
   "DE.Views.FormsTab.tipSubmit": "Submit form",
-  "DE.Views.FormsTab.tipTextField": "Sisipkan area teks",
+  "DE.Views.FormsTab.tipTextField": "Sisipkan ruas teks",
   "DE.Views.FormsTab.tipViewForm": "Tampilkan form",
   "DE.Views.FormsTab.txtUntitled": "Tanpa Judul",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Bawah Tengah",
@@ -2153,10 +2166,10 @@
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Tautkan dengan",
   "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Awal dokumen",
   "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Bookmarks",
-  "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Area ini dibutuhkan",
+  "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ruas ini diperlukan",
   "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Headings",
-  "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Bagian ini harus berupa URL dengn format \"http://www.contoh.com\"",
+  "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ruas ini harus berupa URL dengan format \"http://www.contoh.com\"",
-  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Area ini dibatasi 2083 karakter",
+  "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Ruas ini dibatasi 2083 karakter",
   "DE.Views.ImageSettings.textAdvanced": "Tampilkan pengaturan lanjut",
   "DE.Views.ImageSettings.textCrop": "Isian",
   "DE.Views.ImageSettings.textCropFill": "Isi",
@@ -2219,7 +2232,7 @@
   "DE.Views.ImageSettingsAdvanced.textHeight": "Tinggi",
   "DE.Views.ImageSettingsAdvanced.textHorizontal": "Horisontal",
   "DE.Views.ImageSettingsAdvanced.textHorizontally": "Secara Horizontal",
-  "DE.Views.ImageSettingsAdvanced.textJoinType": "Gabungkan Tipe",
+  "DE.Views.ImageSettingsAdvanced.textJoinType": "Gabungkan tipe",
   "DE.Views.ImageSettingsAdvanced.textKeepRatio": "Proporsi Konstan",
   "DE.Views.ImageSettingsAdvanced.textLeft": "Kiri",
   "DE.Views.ImageSettingsAdvanced.textLeftMargin": "Margin kiri",
@@ -2279,7 +2292,7 @@
   "DE.Views.LeftMenu.txtLimit": "Batas Akses",
   "DE.Views.LeftMenu.txtTrial": "MODE TRIAL",
   "DE.Views.LeftMenu.txtTrialDev": "Mode Trial Developer",
-  "DE.Views.LineNumbersDialog.textAddLineNumbering": "Tambah nomor garis",
+  "DE.Views.LineNumbersDialog.textAddLineNumbering": "Tambah penomoran baris",
   "DE.Views.LineNumbersDialog.textApplyTo": "Terapkan perubahan ke",
   "DE.Views.LineNumbersDialog.textContinuous": "Kontinyu",
   "DE.Views.LineNumbersDialog.textCountBy": "Dihitung dengan",
@@ -2376,11 +2389,11 @@
   "DE.Views.MailMergeSettings.textEmail": "Email",
   "DE.Views.MailMergeSettings.textFrom": "Dari",
   "DE.Views.MailMergeSettings.textGoToMail": "Pergi ke Email",
-  "DE.Views.MailMergeSettings.textHighlight": "Highlight area merge",
+  "DE.Views.MailMergeSettings.textHighlight": "Sorot ruas gabung",
-  "DE.Views.MailMergeSettings.textInsertField": "Sisipkan Area Merge",
+  "DE.Views.MailMergeSettings.textInsertField": "Sisipkan Ruas Gabung",
   "DE.Views.MailMergeSettings.textMaxRecepients": "Maks 100 penerima.",
   "DE.Views.MailMergeSettings.textMerge": "Merge",
-  "DE.Views.MailMergeSettings.textMergeFields": "Merge Area",
+  "DE.Views.MailMergeSettings.textMergeFields": "Ruas Gabung",
   "DE.Views.MailMergeSettings.textMergeTo": "Merge ke",
   "DE.Views.MailMergeSettings.textPdf": "PDF",
   "DE.Views.MailMergeSettings.textPortal": "Simpan",
@@ -2485,9 +2498,9 @@
   "DE.Views.ParagraphSettings.textExact": "Persis",
   "DE.Views.ParagraphSettings.textFirstLine": "Baris Pertama",
   "DE.Views.ParagraphSettings.textHanging": "Menggantung",
-  "DE.Views.ParagraphSettings.textNoneSpecial": "(tidak ada)",
+  "DE.Views.ParagraphSettings.textNoneSpecial": "(nihil)",
   "DE.Views.ParagraphSettings.txtAutoText": "Otomatis",
-  "DE.Views.ParagraphSettingsAdvanced.noTabs": "Tab yang ditentukan akan muncul pada bagian ini",
+  "DE.Views.ParagraphSettingsAdvanced.noTabs": "Tab yang ditentukan akan muncul pada ruas ini",
   "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Huruf kapital semua",
   "DE.Views.ParagraphSettingsAdvanced.strBorders": "Pembatas & Isian",
   "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Jeda halaman sebelum",
@@ -2529,9 +2542,9 @@
   "DE.Views.ParagraphSettingsAdvanced.textCentered": "Tengah",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Spasi antar karakter",
   "DE.Views.ParagraphSettingsAdvanced.textContext": "Kontekstual",
-  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Kontekstual dan",
+  "DE.Views.ParagraphSettingsAdvanced.textContextDiscret": "Kontekstual dan diskresioner",
-  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Kontekstual, Bersejarah, dan",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistDiscret": "Kontekstual, historis, dan diskresioner",
-  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Kontekstual dan Bersejarah",
+  "DE.Views.ParagraphSettingsAdvanced.textContextHistorical": "Kontekstual dan bersejarah",
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Tab baku",
   "DE.Views.ParagraphSettingsAdvanced.textDiscret": "Diskresional",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efek",
@@ -2539,14 +2552,14 @@
   "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Baris Pertama",
   "DE.Views.ParagraphSettingsAdvanced.textHanging": "Menggantung",
   "DE.Views.ParagraphSettingsAdvanced.textHistorical": "Bersejarah",
-  "DE.Views.ParagraphSettingsAdvanced.textHistoricalDiscret": "Bersejarah dan Diskresional",
+  "DE.Views.ParagraphSettingsAdvanced.textHistoricalDiscret": "Historis dan diskresioner",
   "DE.Views.ParagraphSettingsAdvanced.textJustified": "Rata Kiri-Kanan",
   "DE.Views.ParagraphSettingsAdvanced.textLeader": "Leader",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Kiri",
   "DE.Views.ParagraphSettingsAdvanced.textLevel": "Level",
   "DE.Views.ParagraphSettingsAdvanced.textLigatures": "Ligatur",
   "DE.Views.ParagraphSettingsAdvanced.textNone": "Tidak ada",
-  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(tidak ada)",
+  "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(nihil)",
   "DE.Views.ParagraphSettingsAdvanced.textOpenType": "Fitur OpenType",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Posisi",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Hapus",
@@ -2556,11 +2569,11 @@
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Spasi",
   "DE.Views.ParagraphSettingsAdvanced.textStandard": "Standar saja",
   "DE.Views.ParagraphSettingsAdvanced.textStandardContext": "Standar dan kontekstual",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Standar, Kontekstual, dan Diskresional",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextDiscret": "Standar, kontekstual, dan diskresional",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Standar, Kontekstual, dan Bersejarah",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardContextHist": "Standar, kontekstual, dan historis",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Standar dan Diskresional",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardDiscret": "Standar dan diskresional",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Standar, Bersejarah, dan Diskresional",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistDiscret": "Standar, historis, dan diskresioner",
-  "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Standar dan Bersejarah",
+  "DE.Views.ParagraphSettingsAdvanced.textStandardHistorical": "Standar dan bersejarah",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Tengah",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Kiri",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Posisi tab",
@@ -2577,6 +2590,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Buat Pembatas Atas Saja",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Otomatis",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Tidak ada pembatas",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Ubahan Terakhir",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Moderat",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Sempit",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Lebar",
+  "DE.Views.PrintWithPreview.txtAllPages": "Semua halaman",
+  "DE.Views.PrintWithPreview.txtBottom": "Bawah",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Halaman saat ini",
+  "DE.Views.PrintWithPreview.txtCustom": "Ubahan",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Cetak khusus",
+  "DE.Views.PrintWithPreview.txtLandscape": "Lansekap",
+  "DE.Views.PrintWithPreview.txtLeft": "Kiri",
+  "DE.Views.PrintWithPreview.txtMargins": "Margin",
+  "DE.Views.PrintWithPreview.txtOf": "dari {0}",
+  "DE.Views.PrintWithPreview.txtPage": "Halaman",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Nomor halaman tidak valid",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Orientasi halaman",
+  "DE.Views.PrintWithPreview.txtPages": "Halaman",
+  "DE.Views.PrintWithPreview.txtPageSize": "Ukuran halaman",
+  "DE.Views.PrintWithPreview.txtPortrait": "Potret",
+  "DE.Views.PrintWithPreview.txtPrint": "Cetak",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Cetak ke PDF",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Rentang cetak",
+  "DE.Views.PrintWithPreview.txtRight": "Kanan",
+  "DE.Views.PrintWithPreview.txtSelection": "Pilihan",
+  "DE.Views.PrintWithPreview.txtTop": "Atas",
   "DE.Views.ProtectDialog.textComments": "Komentar",
   "DE.Views.ProtectDialog.textForms": "Formulir isian",
   "DE.Views.ProtectDialog.textReview": "Perubahan terlacak",
@@ -2693,8 +2733,8 @@
   "DE.Views.StyleTitleDialog.textHeader": "Buat gaya baru",
   "DE.Views.StyleTitleDialog.textNextStyle": "Style paragraf berikutnya",
   "DE.Views.StyleTitleDialog.textTitle": "Judul",
-  "DE.Views.StyleTitleDialog.txtEmpty": "Kolom ini harus diisi",
+  "DE.Views.StyleTitleDialog.txtEmpty": "Ruas ini diperlukan",
-  "DE.Views.StyleTitleDialog.txtNotEmpty": "Area tidak boleh kosong",
+  "DE.Views.StyleTitleDialog.txtNotEmpty": "Ruas tidak boleh kosong",
   "DE.Views.StyleTitleDialog.txtSameAs": "Sama seperti membuat style baru",
   "DE.Views.TableFormulaDialog.textBookmark": "Tempel markah",
   "DE.Views.TableFormulaDialog.textFormat": "Format nomor",
@@ -2747,7 +2787,7 @@
   "DE.Views.TableSettings.splitCellsText": "Pisahkan Sel...",
   "DE.Views.TableSettings.splitCellTitleText": "Pisahkan Sel",
   "DE.Views.TableSettings.strRepeatRow": "Ulangi sebagai baris header di bagian atas tiap halaman",
-  "DE.Views.TableSettings.textAddFormula": "Tambah formula",
+  "DE.Views.TableSettings.textAddFormula": "Tambah rumus",
   "DE.Views.TableSettings.textAdvanced": "Tampilkan pengaturan lanjut",
   "DE.Views.TableSettings.textBackColor": "Warna Latar",
   "DE.Views.TableSettings.textBanded": "Bergaris",
@@ -2899,7 +2939,7 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Tambah titik gradien",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Hilangkan titik gradien",
   "DE.Views.TextArtSettings.txtNoBorders": "Tanpa Garis",
-  "DE.Views.TextToTableDialog.textAutofit": "Sifat Autofit",
+  "DE.Views.TextToTableDialog.textAutofit": "Perilaku Autofit",
   "DE.Views.TextToTableDialog.textColumns": "Kolom",
   "DE.Views.TextToTableDialog.textContents": "Autofit ke konten",
   "DE.Views.TextToTableDialog.textEmpty": "Anda harus mengetikkan sebuah karakter untuk pemisah ubahan.",
@@ -2914,7 +2954,7 @@
   "DE.Views.TextToTableDialog.textTitle": "Konversi teks ke tabel",
   "DE.Views.TextToTableDialog.textWindow": "Autofit ke jendela",
   "DE.Views.TextToTableDialog.txtAutoText": "Otomatis",
-  "DE.Views.Toolbar.capBtnAddComment": "Tambahkan komentar",
+  "DE.Views.Toolbar.capBtnAddComment": "Tambahkan Komentar",
   "DE.Views.Toolbar.capBtnBlankPage": "Halaman Kosong",
   "DE.Views.Toolbar.capBtnColumns": "Kolom",
   "DE.Views.Toolbar.capBtnComment": "Komentar",
@@ -3004,7 +3044,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Wide",
-  "DE.Views.Toolbar.textNewColor": "Tambahkan warna khusus baru",
+  "DE.Views.Toolbar.textNewColor": "Tambahkan Warna Ubahan Baru",
   "DE.Views.Toolbar.textNextPage": "Halaman Selanjutnya",
   "DE.Views.Toolbar.textNoHighlight": "Tanpa highlight",
   "DE.Views.Toolbar.textNone": "Tidak ada",
@@ -3043,10 +3083,10 @@
   "DE.Views.Toolbar.textToCurrent": "Ke posisi saat ini",
   "DE.Views.Toolbar.textTop": "Atas: ",
   "DE.Views.Toolbar.textUnderline": "Garis bawah",
-  "DE.Views.Toolbar.tipAlignCenter": "Rata Tengah",
+  "DE.Views.Toolbar.tipAlignCenter": "Rata tengah",
   "DE.Views.Toolbar.tipAlignJust": "Rata Kiri-Kanan",
-  "DE.Views.Toolbar.tipAlignLeft": "Rata Kiri",
+  "DE.Views.Toolbar.tipAlignLeft": "Rata kiri",
-  "DE.Views.Toolbar.tipAlignRight": "Rata Kanan",
+  "DE.Views.Toolbar.tipAlignRight": "Rata kanan",
   "DE.Views.Toolbar.tipBack": "Kembali",
   "DE.Views.Toolbar.tipBlankPage": "Sisipkan halaman kosong",
   "DE.Views.Toolbar.tipChangeCase": "Ubah case",
@@ -3111,7 +3151,7 @@
   "DE.Views.Toolbar.tipPageSize": "Ukuran Halaman",
   "DE.Views.Toolbar.tipParagraphStyle": "Model Paragraf",
   "DE.Views.Toolbar.tipPaste": "Tempel",
-  "DE.Views.Toolbar.tipPrColor": "Warna Latar Paragraf",
+  "DE.Views.Toolbar.tipPrColor": "Bayangan",
   "DE.Views.Toolbar.tipPrint": "Cetak",
   "DE.Views.Toolbar.tipRedo": "Ulangi",
   "DE.Views.Toolbar.tipSave": "Simpan",

apps/documenteditor/main/locale/it.json

@@ -1767,10 +1767,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "‎Versione PDF‎",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Percorso",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persone che hanno diritti",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Simboli compresi spazi",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Caratteri compresi spazi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiche",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Oggetto",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simboli",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Caratteri",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etichette",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titolo documento",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Caricato",

apps/documenteditor/main/locale/ja.json

@@ -285,6 +285,8 @@
   "Common.define.smartArt.textVerticalPictureList": "縦方向画像リスト",
   "Common.define.smartArt.textVerticalProcess": "縦方向ステップ",
   "Common.Translation.textMoreButton": "もっと",
+  "Common.Translation.tipFileLocked": "ドキュメントが編集用にロックされています。後で変更し、ローカルコピーとして保存することができます。",
+  "Common.Translation.tipFileReadOnly": "ドキュメントは閲覧用で、編集はロックされています。後で変更し、そのローカルコピーを保存することができます。",
   "Common.Translation.warnFileLocked": "このファイルは他のアプリで編集されているので、編集できません。",
   "Common.Translation.warnFileLockedBtnEdit": "コピーを作成する",
   "Common.Translation.warnFileLockedBtnView": "閲覧するために開く",
@@ -439,8 +441,8 @@
   "Common.Views.Comments.textViewResolved": "コメントを再開する権限がありません",
   "Common.Views.Comments.txtEmpty": "ドキュメントにはコメントがありません。",
   "Common.Views.CopyWarningDialog.textDontShow": "今後このメッセージを表示しない",
-  "Common.Views.CopyWarningDialog.textMsg": "エディターツールバーのボタンやコンテキストメニューの操作によるコピー、カット、ペーストの動作は、このエディタータブ内でのみ実行されます。<br><br> エディタータブ以外のアプリケーションとの間でコピーまたは貼り付けを行うには、次のキーボードの組み合わせを使用して下さい。",
+  "Common.Views.CopyWarningDialog.textMsg": "エディターツールバーのボタンやコンテキストメニューの操作によるコピー、カット、ペーストの動作は、このエディタータブ内でのみ実行されます。<br><br> エディタータブ以外のアプリケーションとの間でコピーまたは貼り付けを行うには、次のキーボードの組み合わせを使用して下さい:",
-  "Common.Views.CopyWarningDialog.textTitle": "コピー、切り取り、貼り付けの操作",
+  "Common.Views.CopyWarningDialog.textTitle": "コピー,切り取り,貼り付け",
   "Common.Views.CopyWarningDialog.textToCopy": "コピーのため",
   "Common.Views.CopyWarningDialog.textToCut": "切り取りのため",
   "Common.Views.CopyWarningDialog.textToPaste": "貼り付のため",
@@ -458,6 +460,7 @@
   "Common.Views.Header.textCompactView": "ツールバーを表示しない",
   "Common.Views.Header.textHideLines": "ルーラーを表示しない",
   "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない",
+  "Common.Views.Header.textReadOnly": "閲覧のみ",
   "Common.Views.Header.textRemoveFavorite": "お気に入りから削除",
   "Common.Views.Header.textShare": "共有",
   "Common.Views.Header.textZoom": "ズーム",
@@ -465,6 +468,7 @@
   "Common.Views.Header.tipDownload": "ファイルをダウンロード",
   "Common.Views.Header.tipGoEdit": "現在のファイルを編集する",
   "Common.Views.Header.tipPrint": "ファイルを印刷する",
+  "Common.Views.Header.tipPrintQuick": "クイックプリント",
   "Common.Views.Header.tipRedo": "やり直し",
   "Common.Views.Header.tipSave": "保存する",
   "Common.Views.Header.tipSearch": "検索",
@@ -742,6 +746,11 @@
   "DE.Controllers.Main.errorFilePassProtect": "文書がパスワードで保護されているため開くことができません",
   "DE.Controllers.Main.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。<br>Documentサーバー管理者に詳細をお問い合わせください。",
   "DE.Controllers.Main.errorForceSave": "文書の保存中にエラーが発生しました。「名前を付けてダウンロード」オプションを使用して、ファイルのバックアップコピーをコンピューターのハードディスクに保存するか、後で再試行してください。",
+  "DE.Controllers.Main.errorInconsistentExt": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容がファイルの拡張子と一致しません。",
+  "DE.Controllers.Main.errorInconsistentExtDocx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はドキュメント (docx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.Main.errorInconsistentExtPdf": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容は次のいずれかの形式に対応しています: pdf/djvu/xps/oxps が、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.Main.errorInconsistentExtPptx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はプレゼンテーション (pptx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "DE.Controllers.Main.errorInconsistentExtXlsx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はスプレッドシート (xlsx など) に対応していますが、ファイルの拡張子が一致していません: %1",
   "DE.Controllers.Main.errorKeyEncrypt": "不明なキーの記述子",
   "DE.Controllers.Main.errorKeyExpire": "キー記述子は有効期限が切れました",
   "DE.Controllers.Main.errorLoadingFont": "フォントが読み込まれていません。<br>ドキュメントサーバーの管理者に連絡してください。",
@@ -824,6 +833,7 @@
   "DE.Controllers.Main.textRequestMacros": "マクロがURLに対してリクエストを行います。%1へのリクエストを許可しますか？",
   "DE.Controllers.Main.textShape": "図形",
   "DE.Controllers.Main.textStrict": "厳格モード",
+  "DE.Controllers.Main.textTryQuickPrint": "クイックプリントが選択されています。ドキュメント全体が、最後に選択したプリンタまたはデフォルトのプリンタで印刷されます。<br>続行しますか?",
   "DE.Controllers.Main.textTryUndoRedo": "高速共同編集モードでは、元に戻す/やり直し機能は無効になります。<br>「厳格モード」ボタンをクリックすると、他のユーザーの干渉を受けずにファイルを編集し、保存後に変更内容を送信する厳格共同編集モードに切り替わります。共同編集モードの切り替えは、エディタの詳細設定を使用して行うことができます。",
   "DE.Controllers.Main.textTryUndoRedoWarn": "高速共同編集モードでは、元に戻す/やり直し機能が無効になります。",
   "DE.Controllers.Main.textUndo": "元に戻す",
@@ -1097,6 +1107,10 @@
   "DE.Controllers.Main.warnProcessRightsChange": "ファイルを編集する権限を拒否されています。",
   "DE.Controllers.Navigation.txtBeginning": "文書の先頭",
   "DE.Controllers.Navigation.txtGotoBeginning": "文書の先頭に移動する",
+  "DE.Controllers.Print.textMarginsLast": "最後に適用した設定",
+  "DE.Controllers.Print.txtCustom": "ユーザー設定",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "無効な印刷範囲",
+  "DE.Controllers.Print.txtPrintRangeSingleRange": "ページ番号のみ、またはページ範囲のみを入力してください（例: 5-12）。または、PDFに印刷することもできます。",
   "DE.Controllers.Search.notcriticalErrorTitle": " 警告",
   "DE.Controllers.Search.textNoTextFound": "検索データが見つかりませんでした。他の検索設定を選択してください。",
   "DE.Controllers.Search.textReplaceSkipped": "置換が行われました。スキップされた発生回数は{0}です。",
@@ -1946,10 +1960,10 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDFのバージョン",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "場所",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "権利を有する者",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "スペースを含む記号",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "文字数 (スペースを含む)",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "統計",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "件名",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "記号",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "文字数",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "タグ",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "タイトル",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "アップロード済み",
@@ -2015,6 +2029,8 @@
   "DE.Views.FileMenuPanels.Settings.txtNone": "表示なし",
   "DE.Views.FileMenuPanels.Settings.txtProofing": "校正",
   "DE.Views.FileMenuPanels.Settings.txtPt": "ポイント",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrint": "クイックプリントボタンをエディタヘッダーに表示",
+  "DE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "最後に選択した、またはデフォルトのプリンターで印刷されます。",
   "DE.Views.FileMenuPanels.Settings.txtRunMacros": "全てを有効にする",
   "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "全てのマクロを有効にして、通知しない",
   "DE.Views.FileMenuPanels.Settings.txtShowTrackChanges": "変更履歴を表示する",
@@ -2572,6 +2588,33 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "上罫線だけを設定",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "自動",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "罫線なし",
+  "DE.Views.PrintWithPreview.textMarginsLast": "最後に適用した設定",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "中",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "狭い",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "標準",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "ノーマル（アメリカの標準）",
+  "DE.Views.PrintWithPreview.textMarginsWide": "広い",
+  "DE.Views.PrintWithPreview.txtAllPages": "全ページ",
+  "DE.Views.PrintWithPreview.txtBottom": "下",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "現在のページ",
+  "DE.Views.PrintWithPreview.txtCustom": "ユーザー設定",
+  "DE.Views.PrintWithPreview.txtCustomPages": "カスタム印刷",
+  "DE.Views.PrintWithPreview.txtLandscape": "横",
+  "DE.Views.PrintWithPreview.txtLeft": "左",
+  "DE.Views.PrintWithPreview.txtMargins": "余白",
+  "DE.Views.PrintWithPreview.txtOf": "{0}から",
+  "DE.Views.PrintWithPreview.txtPage": "ページ",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "ページ番号が正しくありません。",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "印刷の向き",
+  "DE.Views.PrintWithPreview.txtPages": "ページ",
+  "DE.Views.PrintWithPreview.txtPageSize": "ページのサイズ",
+  "DE.Views.PrintWithPreview.txtPortrait": "縦",
+  "DE.Views.PrintWithPreview.txtPrint": "印刷",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "PDFに印刷",
+  "DE.Views.PrintWithPreview.txtPrintRange": "印刷範囲\t",
+  "DE.Views.PrintWithPreview.txtRight": "右",
+  "DE.Views.PrintWithPreview.txtSelection": "選択",
+  "DE.Views.PrintWithPreview.txtTop": "上",
   "DE.Views.ProtectDialog.textComments": "コメント",
   "DE.Views.ProtectDialog.textForms": "フォームの入力",
   "DE.Views.ProtectDialog.textReview": "変更履歴",
@@ -3150,8 +3193,10 @@
   "DE.Views.ViewTab.textFitToPage": "ページに合わせる",
   "DE.Views.ViewTab.textFitToWidth": "幅に合わせる",
   "DE.Views.ViewTab.textInterfaceTheme": "インターフェイスのテーマ",
+  "DE.Views.ViewTab.textLeftMenu": "左パネル",
   "DE.Views.ViewTab.textNavigation": "ナビゲーション",
   "DE.Views.ViewTab.textOutline": "見出し",
+  "DE.Views.ViewTab.textRightMenu": "右パネル",
   "DE.Views.ViewTab.textRulers": "ルーラー",
   "DE.Views.ViewTab.textStatusBar": "ステータスバー",
   "DE.Views.ViewTab.textZoom": "ズーム",