Merge branch 'release/v7.3.0' into develop

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;
@@ -165,7 +166,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 +202,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,6 +218,24 @@ define([
             }
         }
 
+        const _onApplySettings = function (menu) {
+            if ( !!titlebuttons.quickprint ) {
+                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 ( titlebuttons.quickprint.visible != is_btn_visible ) {
+                    titlebuttons.quickprint.visible = is_btn_visible;
+                    const obj = {
+                        visible: {
+                            quickprint: is_btn_visible,
+                        }
+                    };
+                    native.execCommand('title:button', JSON.stringify(obj));
+                }
+            }
+        }
+
         return {
             init: function (opts) {
                 _.extend(config, opts);
@@ -232,9 +253,33 @@ define([
 
                     Common.NotificationCenter.on('document:ready', 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();
                             }
                         }
                     });
@@ -291,6 +336,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};
 
@@ -346,6 +398,7 @@ define([
                                     menu.hide();
                                 }
                             },
+                            'settings:apply': _onApplySettings.bind(this),
                         },
                     }, {id: 'desktop'});
 
@@ -403,7 +456,10 @@ define([
                 }
 
                 return undefined;
-            }
+            },
+            getDefaultPrinterName: function () {
+                return nativevars ? nativevars.defaultPrinterName : '';
+            },
         };
     };
 

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/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/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);
+                }
+                f7.views.current.router.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,27 +1,29 @@
-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 storeAppOptions = props.storeAppOptions;
+    const sharingSettingsUrl = props.sharingSettingsUrl;
-    const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl;
     const _t = t('Common.Collaboration', {returnObjects: true});
 
-    function resizeHeightIframe(iFrame) {
+    function resizeHeightIframe(selector) {
+        const iFrame = document.querySelector(selector);
         iFrame.height = iFrame.contentWindow.document.body.scrollHeight;
-    }
+    };
+
+    useEffect(() => {
+        resizeHeightIframe('#sharing-placeholder iframe');
+    }, []);
 
     return (
         <Page>
             <Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} />
             <div id="sharing-placeholder" className="sharing-placeholder">
-                <iframe width="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl} onLoad={resizeHeightIframe(this)}></iframe>
+                <iframe width="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe>
             </div>
         </Page>
     )
-}
+};
 
-export default inject("storeAppOptions")(observer(SharingSettings));
+export default ViewSharingSettings;

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

@@ -1,18 +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 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}>
@@ -83,7 +84,7 @@ const routes = [
     },
     {
         path: '/sharing-settings/',
-        component: SharingSettings
+        component: SharingSettingsController
     }
 ];
 
@@ -131,8 +132,8 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
             </Page>
         </View>
     )
-
 }));
+
 class CollaborationView extends Component {
     constructor(props) {
         super(props);

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/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/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/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

@@ -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

@@ -156,6 +156,7 @@ require([
             'ViewTab',
             'Search',
             'DocProtection',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -191,6 +192,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/DocumentHolder.js

@@ -1283,15 +1283,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();

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);
@@ -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

@@ -1509,6 +1509,9 @@ 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.editorConfig.customization && this.editorConfig.customization.compactHeader);
                 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 +1685,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));
@@ -2289,7 +2295,7 @@ define([
 
                 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 !== buildVersion) {
+                if (!window.compareVersions && (!cropped_version || cropped_version[1] !== buildVersion)) {
                     this.changeServerVersion = true;
                     Common.UI.warning({
                         title: this.titleServerVersion,
@@ -2504,6 +2510,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) {
@@ -2658,9 +2665,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');
             },
 
@@ -2693,6 +2698,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;
             },
@@ -3345,7 +3383,8 @@ define([
             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.',
-            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.'
+            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
+            });
+
+            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);
+            }
+            this.printSettings.menu.hide();
+        },
+
+        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/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();
                     },
@@ -1066,9 +1070,7 @@ define([
         },
 
         onPrint: function(e) {
-            if (this.api)
+            Common.NotificationCenter.trigger('file:print', this.toolbar);
-                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('edit:complete', this.toolbar);
 
             Common.component.Analytics.trackEvent('Print');
@@ -1784,15 +1786,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/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);

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

@@ -161,6 +161,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 +306,7 @@ define([
                 this.miSaveCopyAs,
                 this.miSaveAs,
                 this.miPrint,
+                this.miPrintWithPreview,
                 this.miRename,
                 this.miProtect,
                 this.miRecent,
@@ -385,7 +397,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 +480,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

@@ -397,6 +397,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>',
@@ -755,6 +761,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');
@@ -819,9 +836,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 ? '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();
@@ -892,6 +909,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()) {
@@ -961,6 +979,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();
 
@@ -1059,7 +1078,9 @@ define([
         strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
         strIgnoreWordsWithNumbers: 'Ignore words with numbers',
         strShowOthersChanges: 'Show changes from other users',
-        txtAdvancedSettings: 'Advanced Settings'
+        txtAdvancedSettings: 'Advanced Settings',
+        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({
@@ -2463,4 +2484,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,59cm x 27,94cm)', caption: 'US Letter', size: [215.9, 279.4]},
+                    { value: 1, displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal', size: [215.9, 355.6]},
+                    { value: 2, displayValue:'A4 (21cm x 29,7cm)', caption: 'A4', size: [210, 297]},
+                    { value: 3, displayValue:'A5 (14,8cm x 21cm)', caption: 'A5', size: [148, 210]},
+                    { value: 4, displayValue:'B5 (17,6cm x 25cm)', caption: 'B5', size: [176, 250]},
+                    { value: 5, displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10', size: [104.8, 241.3]},
+                    { value: 6, displayValue:'Envelope DL (11cm x 22cm)', caption: 'Envelope DL', size: [110, 220]},
+                    { value: 7, displayValue:'Tabloid (27,94cm x 43,18cm)', caption: 'Tabloid', size: [279.4, 431.8]},
+                    { value: 8, displayValue:'A3 (29,7cm x 42cm)', caption: 'A3', size: [297, 420]},
+                    { value: 9, displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize', size: [304.8, 457.1]},
+                    { value: 10, displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K', size: [196.8, 273]},
+                    { value: 11, displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
+                    { value: 12, displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3', size: [330.2, 482.5]},
+                    { value: 13, displayValue:'A4 (84,1cm x 118,9cm)', caption: 'A0', size: [841, 1189]},
+                    { value: 14, displayValue:'A4 (59,4cm x 84,1cm)', caption: 'A1', size: [594, 841]},
+                    { value: 16, displayValue:'A4 (42cm x 59,4cm)', caption: 'A2', size: [420, 594]},
+                    { value: 17, displayValue:'A4 (10,5cm x 14,8cm)', 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/Toolbar.js

@@ -1645,17 +1645,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 )
@@ -2742,6 +2733,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);
             },

apps/documenteditor/main/app_dev.js

@@ -147,6 +147,7 @@ require([
             'ViewTab',
             'Search',
             'DocProtection',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -182,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/en.json

@@ -285,6 +285,8 @@
   "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",
@@ -478,6 +480,8 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.Header.tipPrintQuick": "Quick print",
+  "Common.Views.Header.textReadOnly": "Read only",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
@@ -731,6 +735,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. ",
@@ -775,7 +780,6 @@
   "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
   "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
-  "DE.Controllers.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.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "DE.Controllers.Main.leavePageTextOnClose": "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.Main.loadFontsTextText": "Loading data...",
@@ -1106,6 +1110,7 @@
   "DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
   "DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+  "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.Navigation.txtBeginning": "Beginning of document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
   "DE.Controllers.Search.notcriticalErrorTitle": "Warning",
@@ -1119,6 +1124,10 @@
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.tipReview": "Track changes",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
+  "DE.Controllers.Print.txtCustom": "Custom",
+  "DE.Controllers.Print.txtPrintRangeInvalid": "Invalid print range",
+  "DE.Controllers.Print.textMarginsLast": "Last Custom",
+  "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.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "DE.Controllers.Toolbar.dataUrl": "Paste a data URL",
   "DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
@@ -2048,6 +2057,8 @@
   "DE.Views.FileMenuPanels.ViewSaveAs.textDownloadAs": "Download as",
   "DE.Views.FileMenuPanels.ViewSaveCopy.textSaveCopyAs": "Save Copy as",
   "DE.Views.FileMenuPanels.RecentFiles.txtOpenRecent": "Open Recent",
+  "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.FormSettings.textAlways": "Always",
   "DE.Views.FormSettings.textAspect": "Lock aspect ratio",
   "DE.Views.FormSettings.textAtLeast": "At least",
@@ -2604,6 +2615,33 @@
   "DE.Views.ProtectDialog.txtRepeat": "Repeat password",
   "DE.Views.ProtectDialog.txtTitle": "Protect",
   "DE.Views.ProtectDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.",
+  "DE.Views.PrintWithPreview.txtPrint": "Print",
+  "DE.Views.PrintWithPreview.txtPrintPdf": "Print to PDF",
+  "DE.Views.PrintWithPreview.txtPrintRange": "Print range",
+  "DE.Views.PrintWithPreview.txtCurrentPage": "Current page",
+  "DE.Views.PrintWithPreview.txtAllPages": "All pages",
+  "DE.Views.PrintWithPreview.txtSelection": "Selection",
+  "DE.Views.PrintWithPreview.txtCustomPages": "Custom print",
+  "DE.Views.PrintWithPreview.txtPageSize": "Page size",
+  "DE.Views.PrintWithPreview.txtPageOrientation": "Page orientation",
+  "DE.Views.PrintWithPreview.txtPortrait": "Portrait",
+  "DE.Views.PrintWithPreview.txtLandscape": "Landscape",
+  "DE.Views.PrintWithPreview.txtCustom": "Custom",
+  "DE.Views.PrintWithPreview.txtMargins": "Margins",
+  "DE.Views.PrintWithPreview.txtTop": "Top",
+  "DE.Views.PrintWithPreview.txtBottom": "Bottom",
+  "DE.Views.PrintWithPreview.txtLeft": "Left",
+  "DE.Views.PrintWithPreview.txtRight": "Right",
+  "DE.Views.PrintWithPreview.txtPage": "Page",
+  "DE.Views.PrintWithPreview.txtOf": "of {0}",
+  "DE.Views.PrintWithPreview.txtPageNumInvalid": "Page number invalid",
+  "DE.Views.PrintWithPreview.txtPages": "Pages",
+  "DE.Views.PrintWithPreview.textMarginsLast": "Last Custom",
+  "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
+  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "DE.Views.PrintWithPreview.textMarginsNarrow": "Narrow",
+  "DE.Views.PrintWithPreview.textMarginsModerate": "Moderate",
+  "DE.Views.PrintWithPreview.textMarginsWide": "Wide",
   "DE.Views.RightMenu.txtChartSettings": "Chart settings",
   "DE.Views.RightMenu.txtFormSettings": "Form Settings",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",
@@ -3126,7 +3164,7 @@
   "DE.Views.Toolbar.tipPageSize": "Page size",
   "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.tipRedo": "Redo",
   "DE.Views.Toolbar.tipSave": "Save",

apps/documenteditor/main/locale/eu.json

@@ -125,6 +125,136 @@
   "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.warnFileLocked": "Ezin duzu fitxategi hau editatu, beste aplikazio batean editatzen ari direlako.",
   "Common.Translation.warnFileLockedBtnEdit": "Sortu kopia",
@@ -288,6 +418,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:",
@@ -354,6 +486,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 +632,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 +712,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 +779,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",
@@ -1329,11 +1469,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 +1579,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 +1605,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 +1619,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 +1634,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",
@@ -2066,6 +2231,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 +2539,16 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Ezarri goiko ertza soilik",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatikoa",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Ertzik gabe",
+  "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 +2739,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 +2887,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 +3034,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 +3115,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/hu.json

@@ -180,6 +180,110 @@
   "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.warnFileLocked": "Nem szerkesztheti ezt a fájlt, mert egy másik alkalmazásban szerkesztik.",
   "Common.Translation.warnFileLockedBtnEdit": "Másolat létrehozása",
@@ -508,6 +612,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",
@@ -611,6 +716,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",
@@ -621,6 +727,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.",
@@ -648,6 +755,7 @@
   "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.",
@@ -725,6 +833,7 @@
   "DE.Controllers.Main.textStrict": "Biztonságos mód",
   "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",
@@ -1508,6 +1617,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",
@@ -1841,6 +1957,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statisztika",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Tárgy",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Szimbólumok",
+  "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",
@@ -2463,8 +2580,17 @@
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Nincsenek szegélyek",
   "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",
@@ -2803,6 +2929,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",
@@ -2949,13 +3076,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",
@@ -3027,8 +3157,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/ja.json

@@ -439,8 +439,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": "貼り付のため",
@@ -742,6 +742,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>ドキュメントサーバーの管理者に連絡してください。",
@@ -3150,8 +3155,10 @@
   "DE.Views.ViewTab.textFitToPage": "ページに合わせる",
   "DE.Views.ViewTab.textFitToWidth": "幅に合わせる",
   "DE.Views.ViewTab.textInterfaceTheme": "インターフェイスのテーマ",
+  "DE.Views.ViewTab.textLeftMenu": "左パネル",
   "DE.Views.ViewTab.textNavigation": "ナビゲーション",
   "DE.Views.ViewTab.textOutline": "見出し",
+  "DE.Views.ViewTab.textRightMenu": "右パネル",
   "DE.Views.ViewTab.textRulers": "ルーラー",
   "DE.Views.ViewTab.textStatusBar": "ステータスバー",
   "DE.Views.ViewTab.textZoom": "ズーム",

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

@@ -2994,6 +2994,7 @@
   "DE.Views.ViewTab.textFitToPage": "Ajustar à página",
   "DE.Views.ViewTab.textFitToWidth": "Ajustar à Largura",
   "DE.Views.ViewTab.textInterfaceTheme": "Tema da interface",
+  "DE.Views.ViewTab.textLeftMenu": "Painel esquerdo",
   "DE.Views.ViewTab.textNavigation": "Navegação",
   "DE.Views.ViewTab.textOutline": "Títulos",
   "DE.Views.ViewTab.textRulers": "Réguas",

apps/documenteditor/main/locale/pt.json

@@ -612,6 +612,7 @@
   "Common.Views.ReviewPopover.textCancel": "Cancelar",
   "Common.Views.ReviewPopover.textClose": "Fechar",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Insira seu comentário aqui",
   "Common.Views.ReviewPopover.textFollowMove": "Seguir movimento",
   "Common.Views.ReviewPopover.textMention": "+menção fornecerá acesso ao documento e enviará um e-mail",
   "Common.Views.ReviewPopover.textMentionNotify": "+menção notificará o usuário por e-mail",
@@ -726,6 +727,7 @@
   "DE.Controllers.Main.downloadTitleText": "Baixando documento",
   "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos. <br> Contate o administrador do Servidor de Documentos.",
   "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta",
+  "DE.Controllers.Main.errorCannotPasteImg": "Não podemos colar esta imagem da área de transferência, mas você pode salvá-la em seu dispositivo e\ninsira-o a partir daí ou copie a imagem sem texto e cole-a no documento.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.",
   "DE.Controllers.Main.errorComboSeries": "Para criar uma tabela de combinação, selecione pelo menos duas séries de dados.",
   "DE.Controllers.Main.errorCompare": "O recurso Comparar documentos não está disponível durante a coedição.",

apps/documenteditor/main/locale/ro.json

@@ -125,6 +125,165 @@
   "Common.define.chartData.textScatterSmoothMarker": "Diagramă prin puncte cu linii netede și marcatori",
   "Common.define.chartData.textStock": "Bursiere",
   "Common.define.chartData.textSurface": "Suprafața",
+  "Common.define.smartArt.textAccentedPicture": "Imagine cu accent",
+  "Common.define.smartArt.textAccentProcess": "Proces accent",
+  "Common.define.smartArt.textAlternatingFlow": "Flux alternativ",
+  "Common.define.smartArt.textAlternatingHexagons": "Hexagoane alternante",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Blocuri de imagini alternative",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Cercuri de imagini alternative",
+  "Common.define.smartArt.textArchitectureLayout": "Aspect arhitectură",
+  "Common.define.smartArt.textArrowRibbon": "Panglică săgeată",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Proces de imagini ascendent cu accent",
+  "Common.define.smartArt.textBalance": "Balanță",
+  "Common.define.smartArt.textBasicBendingProcess": "Proces de îndoire de bază",
+  "Common.define.smartArt.textBasicBlockList": "Listă de blocare de bază",
+  "Common.define.smartArt.textBasicChevronProcess": "Proces zigzag de bază",
+  "Common.define.smartArt.textBasicCycle": "Ciclu de bază",
+  "Common.define.smartArt.textBasicMatrix": "Matrice de bază",
+  "Common.define.smartArt.textBasicPie": "Structură radială de bază",
+  "Common.define.smartArt.textBasicProcess": "Proces de bază",
+  "Common.define.smartArt.textBasicPyramid": "Piramidă de bază",
+  "Common.define.smartArt.textBasicRadial": "Radială de bază",
+  "Common.define.smartArt.textBasicTarget": "Țintă de bază",
+  "Common.define.smartArt.textBasicTimeline": "Cronologie de bază",
+  "Common.define.smartArt.textBasicVenn": "Venn de bază",
+  "Common.define.smartArt.textBendingPictureAccentList": "Listă de accentuare imagini",
+  "Common.define.smartArt.textBendingPictureBlocks": "Blocuri de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureCaption": "Legendă de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Listă de legende de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Imagini cu îndoire și text semitransparent",
+  "Common.define.smartArt.textBlockCycle": "Ciclu în bloc",
+  "Common.define.smartArt.textBubblePictureList": "Listă de imagini cu bule",
+  "Common.define.smartArt.textCaptionedPictures": "Imagini cu legendă",
+  "Common.define.smartArt.textChevronAccentProcess": "Proces accent zigzag",
+  "Common.define.smartArt.textChevronList": "Listă zigzag",
+  "Common.define.smartArt.textCircleAccentTimeline": "Cronologie accent circular",
+  "Common.define.smartArt.textCircleArrowProcess": "Proces cu săgeți circular",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Ierarhie cu imagini circulare",
+  "Common.define.smartArt.textCircleProcess": "Proces circular",
+  "Common.define.smartArt.textCircleRelationship": "Relație circulară",
+  "Common.define.smartArt.textCircularBendingProcess": "Proces de îndoire circulară",
+  "Common.define.smartArt.textCircularPictureCallout": "Explicație cu imagini circulare",
+  "Common.define.smartArt.textClosedChevronProcess": "Proces zigzag închis",
+  "Common.define.smartArt.textContinuousArrowProcess": "Săgeți de proces continuu",
+  "Common.define.smartArt.textContinuousBlockProcess": "Proces de blocare continuu",
+  "Common.define.smartArt.textContinuousCycle": "Ciclu continuu",
+  "Common.define.smartArt.textContinuousPictureList": "Listă continuă de imagini",
+  "Common.define.smartArt.textConvergingArrows": "Săgeți convergente",
+  "Common.define.smartArt.textConvergingRadial": "Radială convergentă",
+  "Common.define.smartArt.textConvergingText": "Text convergent",
+  "Common.define.smartArt.textCounterbalanceArrows": "Săgeți contrabalansate",
+  "Common.define.smartArt.textCycle": "Ciclu",
+  "Common.define.smartArt.textCycleMatrix": "Matrice ciclică",
+  "Common.define.smartArt.textDescendingBlockList": "Listă de blocuri descrescătoare",
+  "Common.define.smartArt.textDescendingProcess": "Proces descendent",
+  "Common.define.smartArt.textDetailedProcess": "Proces detaliat",
+  "Common.define.smartArt.textDivergingArrows": "Săgeți divergente",
+  "Common.define.smartArt.textDivergingRadial": "Radială divergentă",
+  "Common.define.smartArt.textEquation": "Ecuație",
+  "Common.define.smartArt.textFramedTextPicture": "Imagine cu text încadrat",
+  "Common.define.smartArt.textFunnel": "Extrage",
+  "Common.define.smartArt.textGear": "Roată dințată",
+  "Common.define.smartArt.textGridMatrix": "Matrice grilă",
+  "Common.define.smartArt.textGroupedList": "Listă grupată",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Organigramă semicirculară",
+  "Common.define.smartArt.textHexagonCluster": "Cluster hexagonal",
+  "Common.define.smartArt.textHexagonRadial": "Hexagoane radiale",
+  "Common.define.smartArt.textHierarchy": "Ierarhie",
+  "Common.define.smartArt.textHierarchyList": "Listă ierarhică",
+  "Common.define.smartArt.textHorizontalBulletList": "Listă orizontală cu marcatori",
+  "Common.define.smartArt.textHorizontalHierarchy": "Ierarhie orizontală",
+  "Common.define.smartArt.textHorizontalLabeledHierarchy": "Ierarhie orizontală etichetată",
+  "Common.define.smartArt.textHorizontalMultiLevelHierarchy": "Ierarhie orizontală pe mai multe niveluri",
+  "Common.define.smartArt.textHorizontalOrganizationChart": "Organigramă orizontală",
+  "Common.define.smartArt.textHorizontalPictureList": "Listă orizontală de imagini",
+  "Common.define.smartArt.textIncreasingArrowProcess": "Proces cu săgeți crescător",
+  "Common.define.smartArt.textIncreasingCircleProcess": "Proces circular crescător",
+  "Common.define.smartArt.textInterconnectedBlockProcess": "Proces cu blocuri interconectate",
+  "Common.define.smartArt.textInterconnectedRings": "Inele interconectate",
+  "Common.define.smartArt.textInvertedPyramid": "Piramidă inversată",
+  "Common.define.smartArt.textLabeledHierarchy": "Ierarhie etichetată",
+  "Common.define.smartArt.textLinearVenn": "Venn liniar",
+  "Common.define.smartArt.textLinedList": "Listă liniată",
+  "Common.define.smartArt.textList": "Listă",
+  "Common.define.smartArt.textMatrix": "Matrice",
+  "Common.define.smartArt.textMultidirectionalCycle": "Ciclu multidirecțional",
+  "Common.define.smartArt.textNameAndTitleOrganizationChart": "Organigramă nume și titlu",
+  "Common.define.smartArt.textNestedTarget": "Țintă imbricată",
+  "Common.define.smartArt.textNondirectionalCycle": "Ciclu nondirecțional",
+  "Common.define.smartArt.textOpposingArrows": "Săgeți opuse",
+  "Common.define.smartArt.textOpposingIdeas": "Idei opuse",
+  "Common.define.smartArt.textOrganizationChart": "Organigramă",
+  "Common.define.smartArt.textOther": "Altele",
+  "Common.define.smartArt.textPhasedProcess": "Proces în etape",
+  "Common.define.smartArt.textPicture": "Imagine",
+  "Common.define.smartArt.textPictureAccentBlocks": "Blocuri de imagini cu accent",
+  "Common.define.smartArt.textPictureAccentList": "Listă de accentuare imagini",
+  "Common.define.smartArt.textPictureAccentProcess": "Proces accent imagine",
+  "Common.define.smartArt.textPictureCaptionList": "Listă legendă imagine",
+  "Common.define.smartArt.textPictureFrame": "RamăDeFotografie",
+  "Common.define.smartArt.textPictureGrid": "Grilă de imagini",
+  "Common.define.smartArt.textPictureLineup": "Aliniere imagini",
+  "Common.define.smartArt.textPictureOrganizationChart": "Organigramă cu imagini",
+  "Common.define.smartArt.textPictureStrips": "Benzi cu imagini",
+  "Common.define.smartArt.textPieProcess": "Proces structură radială",
+  "Common.define.smartArt.textPlusAndMinus": "Plus și minus",
+  "Common.define.smartArt.textProcess": "Proces",
+  "Common.define.smartArt.textProcessArrows": "Săgeți proces",
+  "Common.define.smartArt.textProcessList": "Listă proces",
+  "Common.define.smartArt.textPyramid": "Piramidă",
+  "Common.define.smartArt.textPyramidList": "Listă piramidală",
+  "Common.define.smartArt.textRadialCluster": "Cluster radial",
+  "Common.define.smartArt.textRadialCycle": "Ciclu radial",
+  "Common.define.smartArt.textRadialList": "Listă radială",
+  "Common.define.smartArt.textRadialPictureList": "Listă radială de imagini",
+  "Common.define.smartArt.textRadialVenn": "Venn radială",
+  "Common.define.smartArt.textRandomToResultProcess": "Proces de idei aleatoare cu rezultat",
+  "Common.define.smartArt.textRelationship": "Relație",
+  "Common.define.smartArt.textRepeatingBendingProcess": "Proces de îndoire repetată",
+  "Common.define.smartArt.textReverseList": "Inversare listă",
+  "Common.define.smartArt.textSegmentedCycle": "Ciclu segmentat",
+  "Common.define.smartArt.textSegmentedProcess": "Proces segmentat",
+  "Common.define.smartArt.textSegmentedPyramid": "Piramidă segmentată",
+  "Common.define.smartArt.textSnapshotPictureList": "Listă imagini instantanee",
+  "Common.define.smartArt.textSpiralPicture": "Imagini în spirală",
+  "Common.define.smartArt.textSquareAccentList": "Listă accent pătrat",
+  "Common.define.smartArt.textStackedList": "Listă suprapusă",
+  "Common.define.smartArt.textStackedVenn": "Venn suprapus",
+  "Common.define.smartArt.textStaggeredProcess": "Proces decalat",
+  "Common.define.smartArt.textStepDownProcess": "Proces descendent",
+  "Common.define.smartArt.textStepUpProcess": "Proces ascendent",
+  "Common.define.smartArt.textSubStepProcess": "Proces cu subpași",
+  "Common.define.smartArt.textTabbedArc": "Arc cu file",
+  "Common.define.smartArt.textTableHierarchy": "Ierarhie tabel",
+  "Common.define.smartArt.textTableList": "Listă tabel",
+  "Common.define.smartArt.textTabList": "Listă file",
+  "Common.define.smartArt.textTargetList": "Listă ținte",
+  "Common.define.smartArt.textTextCycle": "Ciclu text",
+  "Common.define.smartArt.textThemePictureAccent": "Imagini cu accent și temă",
+  "Common.define.smartArt.textThemePictureAlternatingAccent": "Imagini cu accent alternativ și temă",
+  "Common.define.smartArt.textThemePictureGrid": "Grilă de imagini cu temă",
+  "Common.define.smartArt.textTitledMatrix": "Matrice cu titlu",
+  "Common.define.smartArt.textTitledPictureAccentList": "Listă imagini cu titlu și accent",
+  "Common.define.smartArt.textTitledPictureBlocks": "Blocuri de imagini cu titlu",
+  "Common.define.smartArt.textTitlePictureLineup": "Imagini aliniate cu titlu",
+  "Common.define.smartArt.textTrapezoidList": "Listă trapezoidală",
+  "Common.define.smartArt.textUpwardArrow": "Săgeată ascendentă",
+  "Common.define.smartArt.textVaryingWidthList": "Listă de lățime variabilă",
+  "Common.define.smartArt.textVerticalAccentList": "Listă verticală cu accent",
+  "Common.define.smartArt.textVerticalArrowList": "Listă săgeți verticale",
+  "Common.define.smartArt.textVerticalBendingProcess": "Proces de îndoire verticală",
+  "Common.define.smartArt.textVerticalBlockList": "Listă bloc vertical",
+  "Common.define.smartArt.textVerticalBoxList": "Listă de blocuri verticală",
+  "Common.define.smartArt.textVerticalBracketList": "Listă paranteze verticale",
+  "Common.define.smartArt.textVerticalBulletList": "Listă verticală cu marcatori",
+  "Common.define.smartArt.textVerticalChevronList": "Listă zigzag verticală",
+  "Common.define.smartArt.textVerticalCircleList": "Listă cercuri verticale",
+  "Common.define.smartArt.textVerticalCurvedList": "Listă curbată verticală",
+  "Common.define.smartArt.textVerticalEquation": "Ecuație verticală",
+  "Common.define.smartArt.textVerticalPictureAccentList": "Listă accent imagine verticală",
+  "Common.define.smartArt.textVerticalPictureList": "Listă verticală imagine",
+  "Common.define.smartArt.textVerticalProcess": "Proces vertical",
   "Common.Translation.textMoreButton": "Mai multe",
   "Common.Translation.warnFileLocked": "Nu puteți edita fișierul deoarece el este editat într-o altă aplicație. ",
   "Common.Translation.warnFileLockedBtnEdit": "Crează o copie",
@@ -288,6 +447,8 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Se incarca...",
   "Common.Views.DocumentAccessDialog.textTitle": "Setări partajare",
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor diagramă",
+  "Common.Views.ExternalEditor.textClose": "Închidere",
+  "Common.Views.ExternalEditor.textSave": "Salvare și ieșire",
   "Common.Views.ExternalMergeEditor.textTitle": "Destinatari pentru îmbinare corespondență",
   "Common.Views.ExternalOleEditor.textTitle": "Editor de foi de calcul",
   "Common.Views.Header.labelCoUsersDescr": "Fișierul este editat de către:",
@@ -307,7 +468,7 @@
   "Common.Views.Header.tipRedo": "Refacere",
   "Common.Views.Header.tipSave": "Salvează",
   "Common.Views.Header.tipSearch": "Căutare",
-  "Common.Views.Header.tipUndo": "Anulează",
+  "Common.Views.Header.tipUndo": "Anulare",
   "Common.Views.Header.tipUsers": "Vizualizare utilizatori",
   "Common.Views.Header.tipViewSettings": "Setări vizualizare",
   "Common.Views.Header.tipViewUsers": "Vizualizare utilizatori și gestionare permisiuni de acces",
@@ -341,11 +502,11 @@
   "Common.Views.OpenDialog.txtTitle": "Selectare opțiuni %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Fișierul protejat",
   "Common.Views.PasswordDialog.txtDescription": "Setați o parolă pentru protejarea documentului",
-  "Common.Views.PasswordDialog.txtIncorrectPwd": "Parolă introdusă pentru confirmare nu este indentică cu prima",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "Parola și Confirmare parola nu este indentice",
   "Common.Views.PasswordDialog.txtPassword": "Parola",
   "Common.Views.PasswordDialog.txtRepeat": "Reintroduceți parola",
   "Common.Views.PasswordDialog.txtTitle": "Setare parolă",
-  "Common.Views.PasswordDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să îl păstrați într-un loc sigur.",
+  "Common.Views.PasswordDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să o păstrați într-un loc sigur.",
   "Common.Views.PluginDlg.textLoading": "Încărcare",
   "Common.Views.Plugins.groupCaption": "Plugin-uri",
   "Common.Views.Plugins.strPlugins": "Plugin-uri",
@@ -354,6 +515,7 @@
   "Common.Views.Plugins.textStart": "Pornire",
   "Common.Views.Plugins.textStop": "Oprire",
   "Common.Views.Protection.hintAddPwd": "Criptare utilizând o parolă",
+  "Common.Views.Protection.hintDelPwd": "Ștergere parola",
   "Common.Views.Protection.hintPwd": "Modificarea sau eliminarea parolei",
   "Common.Views.Protection.hintSignature": "Adăugarea semnăturii digitale sau liniei de semnătură",
   "Common.Views.Protection.txtAddPwd": "Adăugare parola",
@@ -444,12 +606,13 @@
   "Common.Views.ReviewChangesDialog.txtPrev": "Modificarea anterioară",
   "Common.Views.ReviewChangesDialog.txtReject": "Respingere",
   "Common.Views.ReviewChangesDialog.txtRejectAll": "Se resping toate modificările",
-  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Respinge modificare",
+  "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Se respinge modificarea curentă",
   "Common.Views.ReviewPopover.textAdd": "Adaugă",
   "Common.Views.ReviewPopover.textAddReply": "Adăugare răspuns",
   "Common.Views.ReviewPopover.textCancel": "Revocare",
   "Common.Views.ReviewPopover.textClose": "Închidere",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Comentați aici",
   "Common.Views.ReviewPopover.textFollowMove": "Urmărirea mutării",
   "Common.Views.ReviewPopover.textMention": "+mentionare pentru a furniza accesul la document și a trimite un e-mail",
   "Common.Views.ReviewPopover.textMentionNotify": "+mentionare pentru a notifica utilizatorul prin e-mail",
@@ -465,6 +628,7 @@
   "Common.Views.SaveAsDlg.textTitle": "Folderul de salvare",
   "Common.Views.SearchPanel.textCaseSensitive": "Sensibil la litere mari și mici",
   "Common.Views.SearchPanel.textCloseSearch": "Închide căutare",
+  "Common.Views.SearchPanel.textContentChanged": "Documentul a fost modificat.",
   "Common.Views.SearchPanel.textFind": "Găsire",
   "Common.Views.SearchPanel.textFindAndReplace": "Găsire și înlocuire",
   "Common.Views.SearchPanel.textMatchUsingRegExp": "Potrivire expresie regulată",
@@ -473,6 +637,7 @@
   "Common.Views.SearchPanel.textReplace": "Înlocuire",
   "Common.Views.SearchPanel.textReplaceAll": "Înlocuire peste tot",
   "Common.Views.SearchPanel.textReplaceWith": "Înlocuire cu",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Efectuați o nouă căutare{1} pentru rezultate mai precise.",
   "Common.Views.SearchPanel.textSearchHasStopped": "Сăutarea s-a oprit",
   "Common.Views.SearchPanel.textSearchResults": "Rezultatele căutării: {0}/{1}",
   "Common.Views.SearchPanel.textTooManyResults": "Prea multe rezultate ca să fie afișate aici",
@@ -480,7 +645,7 @@
   "Common.Views.SearchPanel.tipNextResult": "Următorul rezultat",
   "Common.Views.SearchPanel.tipPreviousResult": "Rezultatul anterior",
   "Common.Views.SelectFileDlg.textLoading": "Încărcare",
-  "Common.Views.SelectFileDlg.textTitle": "Selectați sursa de date",
+  "Common.Views.SelectFileDlg.textTitle": "Selectare sursă de date",
   "Common.Views.SignDialog.textBold": "Aldin",
   "Common.Views.SignDialog.textCertificate": "Certificat",
   "Common.Views.SignDialog.textChange": "Modificare",
@@ -489,7 +654,7 @@
   "Common.Views.SignDialog.textNameError": "Numele semnatarului trebuie completat.",
   "Common.Views.SignDialog.textPurpose": "Scopul semnării acestui document",
   "Common.Views.SignDialog.textSelect": "Selectare",
-  "Common.Views.SignDialog.textSelectImage": "Selectați imaginea",
+  "Common.Views.SignDialog.textSelectImage": "Selectare imagine",
   "Common.Views.SignDialog.textSignature": "Semnătura arată ca",
   "Common.Views.SignDialog.textTitle": "Semnare document",
   "Common.Views.SignDialog.textUseImage": "sau faceți clic pe Selectare imagine pentru a selecta o imagine de utilizat ca semnătură",
@@ -497,9 +662,10 @@
   "Common.Views.SignDialog.tipFontName": "Denumire font",
   "Common.Views.SignDialog.tipFontSize": "Dimensiune font",
   "Common.Views.SignSettingsDialog.textAllowComment": "Se permite semnatarului să adauge comentarii în dialogul Semnare",
-  "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Înninte de semnarea documentului, verificați corectitudinea conținutului acestuia.",
-  "Common.Views.SignSettingsDialog.textInfoName": "Nume",
+  "Common.Views.SignSettingsDialog.textInfoEmail": "Adresa e-mail a semnatarului sugerat",
-  "Common.Views.SignSettingsDialog.textInfoTitle": "Funcția semnatarului",
+  "Common.Views.SignSettingsDialog.textInfoName": "Semnatar sugerat",
+  "Common.Views.SignSettingsDialog.textInfoTitle": "Funcția semnatarului sugerat",
   "Common.Views.SignSettingsDialog.textInstructions": "Sugestie pentru semnatar",
   "Common.Views.SignSettingsDialog.textShowDate": "Se afișează data semnării în linia semnăturii",
   "Common.Views.SignSettingsDialog.textTitle": "Configurare semnătură",
@@ -550,6 +716,7 @@
   "DE.Controllers.LeftMenu.warnReplaceString": "{0} nu este un caracter special pe care îl puteți introduce în câmpul pentru înlocuire.",
   "DE.Controllers.Main.applyChangesTextText": "Încărcarea modificărilor...",
   "DE.Controllers.Main.applyChangesTitleText": "Încărcare modificări",
+  "DE.Controllers.Main.confirmMaxChangesSize": "Numărul comenzilor depășește limita prevăzută pentru serverul dvs.<br>Apăsați butonul Anulare pentru a anula ultima comanda dvs. sau apăsați butonul Continuare pentru a executa comanda în mod local (încărcați fișierul sau copiați conținutul pentru a se asigura că nu se pierde nimic).",
   "DE.Controllers.Main.convertationTimeoutText": "Timpul de așteptare pentru conversie a expirat.",
   "DE.Controllers.Main.criticalErrorExtText": "Apăsați OK pentru a vă întoarce la lista cu documente",
   "DE.Controllers.Main.criticalErrorTitle": "Eroare",
@@ -560,6 +727,7 @@
   "DE.Controllers.Main.downloadTitleText": "Descărcarea fișierului",
   "DE.Controllers.Main.errorAccessDeny": "Nu aveți dreptul să efectuați acțiunea pe care doriți.<br>Contactați administratorul dumneavoastră de Server Documente.",
   "DE.Controllers.Main.errorBadImageUrl": "URL-ul imaginii incorectă",
+  "DE.Controllers.Main.errorCannotPasteImg": "Imposibil de lipit imaginea din clipboardul, dar puteți să o salvați pe dispozitivul dvs și să o inserați de acolo, sau puteți să copiați imaginea fără text și să o lipiți în documentul.",
   "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexiunea la server a fost pierdută. Deocamdată, imposibil de editat documentul.",
   "DE.Controllers.Main.errorComboSeries": "Pentru a crea o diagramă combinație, trebuie să selectați cel puțin două serii de date.",
   "DE.Controllers.Main.errorCompare": "Opțiunea Comparare documente nu este disponibilă în timpul coeditării. ",
@@ -576,12 +744,18 @@
   "DE.Controllers.Main.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "DE.Controllers.Main.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "DE.Controllers.Main.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.Main.errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+  "DE.Controllers.Main.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.Main.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.Main.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.Main.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.Main.errorKeyEncrypt": "Descriptor cheie nerecunoscut",
   "DE.Controllers.Main.errorKeyExpire": "Descriptor cheie a expirat",
   "DE.Controllers.Main.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "DE.Controllers.Main.errorMailMergeLoadFile": "Încărcarea fișierului eșuată. Selectați un alt fișier.",
   "DE.Controllers.Main.errorMailMergeSaveFile": "Îmbinarea eșuată.",
   "DE.Controllers.Main.errorNoTOC": "Nu există niciun cuprins de actualizat. Accesați fila Referințe ca să puteți insera un cuprins.",
+  "DE.Controllers.Main.errorPasswordIsNotCorrect": "Parola introdusă este incorectă.<br>Verificaţi dacă nu este activată tasta CAPS LOCK și vă asigurați că utilizați introducerea corectă a majusculelor.",
   "DE.Controllers.Main.errorProcessSaveResult": "Salvarea nu a reușit.",
   "DE.Controllers.Main.errorServerVersion": "Editorul a fost actualizat. Pagina va fi reîmprospătată pentru a aplica această actualizare.",
   "DE.Controllers.Main.errorSessionAbsolute": "Sesiunea de editare a expirat. Încercați să reîmprospătați pagina.",
@@ -590,6 +764,7 @@
   "DE.Controllers.Main.errorSetPassword": "Setarea parolei eșuată.",
   "DE.Controllers.Main.errorStockChart": "Sortarea rândurilor în ordinea incorectă. Pentru crearea unei diagrame de stoc, datele în foaie trebuie sortate în ordinea următoare:<br> prețul de deschidere, prețul maxim, prețul minim, prețul de închidere.",
   "DE.Controllers.Main.errorSubmit": "Remiterea eșuată.",
+  "DE.Controllers.Main.errorTextFormWrongFormat": "Ați introdus o valoare care nu corespunde cu formatul câmpului.",
   "DE.Controllers.Main.errorToken": "Token de securitate din document este format în mod incorect.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.Main.errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
   "DE.Controllers.Main.errorUpdateVersion": "Versiunea fișierului s-a modificat. Pagina va fi reîmprospătată.",
@@ -637,6 +812,7 @@
   "DE.Controllers.Main.textClose": "Închidere",
   "DE.Controllers.Main.textCloseTip": "Faceți clic pentru a închide sfatul",
   "DE.Controllers.Main.textContactUs": "Contactați Departamentul de Vânzări",
+  "DE.Controllers.Main.textContinue": "Continuare",
   "DE.Controllers.Main.textConvertEquation": "Această ecuație a fost creată în versiunea mai veche a editorului de ecuații, care nu mai este acceptată. Dacă doriți să o editați, trebuie să o convertiți în formatul Office Math ML.<br>Doriți să o convertiți acum?",
   "DE.Controllers.Main.textCustomLoader": "Vă rugăm să rețineți că conform termenilor de licență nu aveți dreptul să modificați programul de încărcare.<br>Pentru obținerea unei cotații de preț vă rugăm să contactați Departamentul de Vânzari.",
   "DE.Controllers.Main.textDisconnect": "Conexiune pierdută",
@@ -657,6 +833,7 @@
   "DE.Controllers.Main.textStrict": "Modul strict",
   "DE.Controllers.Main.textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.<br>Faceți clic pe Modul strict ca să comutați la modul Strict de editare colaborativă și să nu intrați în conflict cu alte persoane. Toate modificările vor fi trimise numai după ce le salvați. Ulilizati Setări avansate ale editorului ca să comutați între moduri de editare colaborativă. ",
   "DE.Controllers.Main.textTryUndoRedoWarn": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.",
+  "DE.Controllers.Main.textUndo": "Anulare",
   "DE.Controllers.Main.titleLicenseExp": "Licența a expirat",
   "DE.Controllers.Main.titleServerVersion": "Editorul a fost actualizat",
   "DE.Controllers.Main.titleUpdateVersion": "Versiunea s-a modificat",
@@ -736,7 +913,7 @@
   "DE.Controllers.Main.txtShape_callout2": "Rând de explicație 2 (fără bordură)",
   "DE.Controllers.Main.txtShape_callout3": "Rând de explicație 3 (fără bordură)",
   "DE.Controllers.Main.txtShape_can": "Cilindru",
-  "DE.Controllers.Main.txtShape_chevron": "Chevron",
+  "DE.Controllers.Main.txtShape_chevron": "Zigzag",
   "DE.Controllers.Main.txtShape_chord": "Acord",
   "DE.Controllers.Main.txtShape_circularArrow": "Săgeată circulară",
   "DE.Controllers.Main.txtShape_cloud": "Nor",
@@ -1246,7 +1423,7 @@
   "DE.Controllers.Toolbar.txtSymbol_ni": "Conținut în",
   "DE.Controllers.Toolbar.txtSymbol_not": "Semn negativ",
   "DE.Controllers.Toolbar.txtSymbol_notexists": "Nu există",
-  "DE.Controllers.Toolbar.txtSymbol_nu": "Niu",
+  "DE.Controllers.Toolbar.txtSymbol_nu": "Nu",
   "DE.Controllers.Toolbar.txtSymbol_o": "Omicron",
   "DE.Controllers.Toolbar.txtSymbol_omega": "Omega",
   "DE.Controllers.Toolbar.txtSymbol_partial": "Diferențială parțială",
@@ -1326,16 +1503,31 @@
   "DE.Views.CellsAddDialog.textRow": "Rânduri",
   "DE.Views.CellsAddDialog.textTitle": "Inserare mai multe",
   "DE.Views.CellsAddDialog.textUp": "Deasupra cursorului",
+  "DE.Views.ChartSettings.text3dDepth": "Adâncime (% din bază)",
+  "DE.Views.ChartSettings.text3dHeight": "Înălțime (% din bază)",
+  "DE.Views.ChartSettings.text3dRotation": "Rotație 3D",
   "DE.Views.ChartSettings.textAdvanced": "Afișare setări avansate",
+  "DE.Views.ChartSettings.textAutoscale": "Autoscalare",
   "DE.Views.ChartSettings.textChartType": "Modificare tip diagramă",
+  "DE.Views.ChartSettings.textDefault": "Rotație implicită",
+  "DE.Views.ChartSettings.textDown": "În jos",
   "DE.Views.ChartSettings.textEditData": "Editare date",
   "DE.Views.ChartSettings.textHeight": "Înălțime",
+  "DE.Views.ChartSettings.textLeft": "Stânga",
+  "DE.Views.ChartSettings.textNarrow": "Unghi de vizualizare îngust",
   "DE.Views.ChartSettings.textOriginalSize": "Dimensiunea reală",
+  "DE.Views.ChartSettings.textPerspective": "Perspectivă",
+  "DE.Views.ChartSettings.textRight": "Dreapta",
+  "DE.Views.ChartSettings.textRightAngle": "Axe în unghi drept",
   "DE.Views.ChartSettings.textSize": "Dimensiune",
   "DE.Views.ChartSettings.textStyle": "Stil",
   "DE.Views.ChartSettings.textUndock": "Detașare de panou",
+  "DE.Views.ChartSettings.textUp": "În sus",
+  "DE.Views.ChartSettings.textWiden": "Unghi de vizualizare larg",
   "DE.Views.ChartSettings.textWidth": "Lățime",
   "DE.Views.ChartSettings.textWrap": "Stil de încadrare",
+  "DE.Views.ChartSettings.textX": "Axa de rotație X",
+  "DE.Views.ChartSettings.textY": "Axa de rotație Y",
   "DE.Views.ChartSettings.txtBehind": "În spatele textului",
   "DE.Views.ChartSettings.txtInFront": "În fața textului",
   "DE.Views.ChartSettings.txtInline": "În linie cu textul",
@@ -1426,15 +1618,23 @@
   "DE.Views.DateTimeDialog.textUpdate": "Actualizarea automată",
   "DE.Views.DateTimeDialog.txtTitle": "Dată și oră",
   "DE.Views.DocProtection.hintProtectDoc": "Protejare document",
+  "DE.Views.DocProtection.txtDocProtectedComment": "Documentul a fost protejat.<br>Puteți numai să-l comentați.",
+  "DE.Views.DocProtection.txtDocProtectedForms": "Documentul a fost protejat.<br>Documentul este diponibil numai pentru completarea formularelor.",
+  "DE.Views.DocProtection.txtDocProtectedTrack": "Documentul a fost protejat.<br>Puteți modifica acest document, dar toate modificările vor fi urmărite.",
+  "DE.Views.DocProtection.txtDocProtectedView": "Documentul a fost protejat.<br>Documentul este disponibil numai pentru vizualizare..",
+  "DE.Views.DocProtection.txtDocUnlockDescription": "Introduceți parola pentru anularea protecției documentului",
   "DE.Views.DocProtection.txtProtectDoc": "Protejare document",
   "DE.Views.DocumentHolder.aboveText": "Deasupra",
   "DE.Views.DocumentHolder.addCommentText": "Adaugă comentariu",
   "DE.Views.DocumentHolder.advancedDropCapText": "Setări majusculă încorporată",
+  "DE.Views.DocumentHolder.advancedEquationText": "Setări ecuație",
   "DE.Views.DocumentHolder.advancedFrameText": "Setări avansate cadru",
   "DE.Views.DocumentHolder.advancedParagraphText": "Setări avansate paragraf ",
   "DE.Views.DocumentHolder.advancedTableText": "Setări avansate tabel",
   "DE.Views.DocumentHolder.advancedText": "Setări avansate",
   "DE.Views.DocumentHolder.alignmentText": "Aliniere",
+  "DE.Views.DocumentHolder.allLinearText": "Tot - Linear",
+  "DE.Views.DocumentHolder.allProfText": "Tot - Profesional",
   "DE.Views.DocumentHolder.belowText": "Dedesubt",
   "DE.Views.DocumentHolder.breakBeforeText": "Sfârsit pagină inainte",
   "DE.Views.DocumentHolder.bulletsText": "Marcatori și numerotare",
@@ -1443,6 +1643,8 @@
   "DE.Views.DocumentHolder.centerText": "La centru",
   "DE.Views.DocumentHolder.chartText": "Setări avansate diagrama",
   "DE.Views.DocumentHolder.columnText": "Coloană",
+  "DE.Views.DocumentHolder.currLinearText": "Curent - Linear",
+  "DE.Views.DocumentHolder.currProfText": "Curent - Profesional",
   "DE.Views.DocumentHolder.deleteColumnText": "Ștergere coloana",
   "DE.Views.DocumentHolder.deleteRowText": "Ștergere rând",
   "DE.Views.DocumentHolder.deleteTableText": "Ștergere tabel",
@@ -1455,6 +1657,7 @@
   "DE.Views.DocumentHolder.editFooterText": "Editare notă de subsol",
   "DE.Views.DocumentHolder.editHeaderText": "Editare antet",
   "DE.Views.DocumentHolder.editHyperlinkText": "Editare Hyperlink",
+  "DE.Views.DocumentHolder.eqToInlineText": "Modificăre pentru încadrare în linie",
   "DE.Views.DocumentHolder.guestText": "Invitat",
   "DE.Views.DocumentHolder.hyperlinkText": "Hyperlink",
   "DE.Views.DocumentHolder.ignoreAllSpellText": "Ignorare totală",
@@ -1469,6 +1672,7 @@
   "DE.Views.DocumentHolder.insertText": "Inserare",
   "DE.Views.DocumentHolder.keepLinesText": "Păstrare linii împreună",
   "DE.Views.DocumentHolder.langText": "Selectați limba",
+  "DE.Views.DocumentHolder.latexText": "LaTeX",
   "DE.Views.DocumentHolder.leftText": "Stânga",
   "DE.Views.DocumentHolder.loadSpellText": "Încărcarea variantelor...",
   "DE.Views.DocumentHolder.mergeCellsText": "Îmbinare celule",
@@ -1556,10 +1760,10 @@
   "DE.Views.DocumentHolder.textShapeAlignTop": "Aliniere sus",
   "DE.Views.DocumentHolder.textStartNewList": "Pornire listă nouă",
   "DE.Views.DocumentHolder.textStartNumberingFrom": "Setare valoare de numerotare",
-  "DE.Views.DocumentHolder.textTitleCellsRemove": "Eliminarea celulelor",
+  "DE.Views.DocumentHolder.textTitleCellsRemove": "Ștergere celule",
   "DE.Views.DocumentHolder.textTOC": "Cuprins",
   "DE.Views.DocumentHolder.textTOCSettings": "Setări cuprins",
-  "DE.Views.DocumentHolder.textUndo": "Anulează",
+  "DE.Views.DocumentHolder.textUndo": "Anulare",
   "DE.Views.DocumentHolder.textUpdateAll": "Actualizare tabel întreg",
   "DE.Views.DocumentHolder.textUpdatePages": "Actualizare numai numere de pagină",
   "DE.Views.DocumentHolder.textUpdateTOC": "Actualizare cuprins",
@@ -1630,7 +1834,7 @@
   "DE.Views.DocumentHolder.txtOverwriteCells": "Suprascriere celule",
   "DE.Views.DocumentHolder.txtPasteSourceFormat": "Păstrare formatare sursă",
   "DE.Views.DocumentHolder.txtPressLink": "Apăsați {0} și faceți clic pe linkul",
-  "DE.Views.DocumentHolder.txtPrintSelection": "Imprimare selecție",
+  "DE.Views.DocumentHolder.txtPrintSelection": "Imprimarea selecției",
   "DE.Views.DocumentHolder.txtRemFractionBar": "Eliminare bară de fracție",
   "DE.Views.DocumentHolder.txtRemLimit": "Eliminare limită",
   "DE.Views.DocumentHolder.txtRemoveAccentChar": "Eliminare caracter cu accent",
@@ -1656,6 +1860,7 @@
   "DE.Views.DocumentHolder.txtUnderbar": "Bară dedesubt textului",
   "DE.Views.DocumentHolder.txtUngroup": "Anularea grupării",
   "DE.Views.DocumentHolder.txtWarnUrl": "Un clic pe acest link ar putea căuza daune dispozitivului și datelor dvs.<br>Sunteți sigur că doriți să continuați?",
+  "DE.Views.DocumentHolder.unicodeText": "Unicode",
   "DE.Views.DocumentHolder.updateStyleText": "Actualizare stil %1",
   "DE.Views.DocumentHolder.vertAlignText": "Aliniere verticală",
   "DE.Views.DropcapSettingsAdvanced.strBorders": "Borduri și umplere",
@@ -1665,9 +1870,9 @@
   "DE.Views.DropcapSettingsAdvanced.textAtLeast": "Cel puțin",
   "DE.Views.DropcapSettingsAdvanced.textAuto": "Auto",
   "DE.Views.DropcapSettingsAdvanced.textBackColor": "Culoare de fundal",
-  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Culoare bordura",
+  "DE.Views.DropcapSettingsAdvanced.textBorderColor": "Culoare bordură",
   "DE.Views.DropcapSettingsAdvanced.textBorderDesc": "Faceți clic pe diagramă sau selectați borduri cu butoane",
-  "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Dimensiune bordura",
+  "DE.Views.DropcapSettingsAdvanced.textBorderWidth": "Dimensiune bordură",
   "DE.Views.DropcapSettingsAdvanced.textBottom": "Jos",
   "DE.Views.DropcapSettingsAdvanced.textCenter": "La centru",
   "DE.Views.DropcapSettingsAdvanced.textColumn": "Coloană",
@@ -1752,6 +1957,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistică",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subiect",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simboluri",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtTags": "Etichete",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titlu",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "S-a încărcat",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Cuvinte",
@@ -1839,26 +2045,34 @@
   "DE.Views.FormSettings.textColor": "Culoare bordura",
   "DE.Views.FormSettings.textComb": "Câmp de pieptene",
   "DE.Views.FormSettings.textCombobox": "Casetă combo",
+  "DE.Views.FormSettings.textComplex": "Câmp complex",
   "DE.Views.FormSettings.textConnected": "Câmpurile conexe",
   "DE.Views.FormSettings.textDelete": "Ștergere",
+  "DE.Views.FormSettings.textDigits": "Cifre",
   "DE.Views.FormSettings.textDisconnect": "Deconectare",
   "DE.Views.FormSettings.textDropDown": "Derulant",
   "DE.Views.FormSettings.textExact": "Exact",
   "DE.Views.FormSettings.textField": "Câmp text",
   "DE.Views.FormSettings.textFixed": "Câmpul cu dimensiunea fixă ",
+  "DE.Views.FormSettings.textFormat": "Formatare",
+  "DE.Views.FormSettings.textFormatSymbols": "Simboluri permise",
   "DE.Views.FormSettings.textFromFile": "Din fișier",
   "DE.Views.FormSettings.textFromStorage": "Din serviciul stocare",
   "DE.Views.FormSettings.textFromUrl": "Prin URL-ul",
   "DE.Views.FormSettings.textGroupKey": "Cheie de grup",
   "DE.Views.FormSettings.textImage": "Imagine",
   "DE.Views.FormSettings.textKey": "Cheie",
+  "DE.Views.FormSettings.textLetters": "Litere",
   "DE.Views.FormSettings.textLock": "Blocare",
+  "DE.Views.FormSettings.textMask": "Mascare arbitrară",
   "DE.Views.FormSettings.textMaxChars": "Numărul limită de caractere",
   "DE.Views.FormSettings.textMulti": "Câmp cu mai multe linii de text",
   "DE.Views.FormSettings.textNever": "Niciodată",
   "DE.Views.FormSettings.textNoBorder": "Fără bordură",
+  "DE.Views.FormSettings.textNone": "Niciunul",
   "DE.Views.FormSettings.textPlaceholder": "Substituent",
   "DE.Views.FormSettings.textRadiobox": "Buton opțiune",
+  "DE.Views.FormSettings.textReg": "Expresie uzuală",
   "DE.Views.FormSettings.textRequired": "Obligatoriu",
   "DE.Views.FormSettings.textScale": "Scalare",
   "DE.Views.FormSettings.textSelectImage": "Selectați imaginea",
@@ -1875,10 +2089,13 @@
   "DE.Views.FormSettings.textWidth": "Lățimea celulei",
   "DE.Views.FormsTab.capBtnCheckBox": "Caseta de selectare",
   "DE.Views.FormsTab.capBtnComboBox": "Casetă combo",
+  "DE.Views.FormsTab.capBtnComplex": "Câmp complex",
   "DE.Views.FormsTab.capBtnDownloadForm": "Descărcare în formatul oform",
   "DE.Views.FormsTab.capBtnDropDown": "Derulant",
+  "DE.Views.FormsTab.capBtnEmail": "Adresă de e-mail",
   "DE.Views.FormsTab.capBtnImage": "Imagine",
   "DE.Views.FormsTab.capBtnNext": "Câmpul următor",
+  "DE.Views.FormsTab.capBtnPhone": "Număr de telefon",
   "DE.Views.FormsTab.capBtnPrev": "Câmpul anterior",
   "DE.Views.FormsTab.capBtnRadioBox": "Buton opțiune",
   "DE.Views.FormsTab.capBtnSaveForm": "Salvare ca un formular OFORM",
@@ -1893,12 +2110,15 @@
   "DE.Views.FormsTab.textNoHighlight": "Fără evidențiere",
   "DE.Views.FormsTab.textRequired": "Toate câmpurile din formular trebuie completate înainte de a-l trimite.",
   "DE.Views.FormsTab.textSubmited": "Formularul a fost remis cu succes",
-  "DE.Views.FormsTab.tipCheckBox": "Se inserează un control casetă de selectare",
+  "DE.Views.FormsTab.tipCheckBox": "Inserare casetă de selectare",
   "DE.Views.FormsTab.tipComboBox": "Se inserează un control casetă combo",
+  "DE.Views.FormsTab.tipComplexField": "Inserare câmp complex",
   "DE.Views.FormsTab.tipDownloadForm": "Descărcare ca un fișer OFORM spre completare",
   "DE.Views.FormsTab.tipDropDown": "Se inserează un control listă verticală",
+  "DE.Views.FormsTab.tipEmailField": "Inserare adresă e-mail",
   "DE.Views.FormsTab.tipImageField": "Se inserează un control imagine",
   "DE.Views.FormsTab.tipNextForm": "Salt la câmpul următor",
+  "DE.Views.FormsTab.tipPhoneField": "Inserare număr de telefon",
   "DE.Views.FormsTab.tipPrevForm": "Salt la câmpul anterior",
   "DE.Views.FormsTab.tipRadioBox": "Se inserează un control buton opțiune",
   "DE.Views.FormsTab.tipSaveForm": "Salvare ca un fișer OFORM spre completare",
@@ -1995,7 +2215,7 @@
   "DE.Views.ImageSettingsAdvanced.textColumn": "Coloană",
   "DE.Views.ImageSettingsAdvanced.textDistance": "Distanță de la text",
   "DE.Views.ImageSettingsAdvanced.textEndSize": "Dimensiune sfârșit",
-  "DE.Views.ImageSettingsAdvanced.textEndStyle": "Tip sfârșit",
+  "DE.Views.ImageSettingsAdvanced.textEndStyle": "Stil sfârșit",
   "DE.Views.ImageSettingsAdvanced.textFlat": "Plat",
   "DE.Views.ImageSettingsAdvanced.textFlipped": "Răsturnat",
   "DE.Views.ImageSettingsAdvanced.textHeight": "Înălțime",
@@ -2021,11 +2241,11 @@
   "DE.Views.ImageSettingsAdvanced.textRelativeWH": "Relativ",
   "DE.Views.ImageSettingsAdvanced.textResizeFit": "Redimensionare formă pentru a se portivi cu textul",
   "DE.Views.ImageSettingsAdvanced.textRight": "Dreapta",
-  "DE.Views.ImageSettingsAdvanced.textRightMargin": "Marginea dreapta",
+  "DE.Views.ImageSettingsAdvanced.textRightMargin": "Marginea dreaptă",
   "DE.Views.ImageSettingsAdvanced.textRightOf": "în partea dreapta a",
   "DE.Views.ImageSettingsAdvanced.textRotation": "Rotație",
   "DE.Views.ImageSettingsAdvanced.textRound": "Rotund",
-  "DE.Views.ImageSettingsAdvanced.textShape": "Setări forma",
+  "DE.Views.ImageSettingsAdvanced.textShape": "Setări formă",
   "DE.Views.ImageSettingsAdvanced.textSize": "Dimensiune",
   "DE.Views.ImageSettingsAdvanced.textSquare": "Pătrat",
   "DE.Views.ImageSettingsAdvanced.textTextBox": "Casetă text",
@@ -2051,6 +2271,7 @@
   "DE.Views.LeftMenu.tipComments": "Comentarii",
   "DE.Views.LeftMenu.tipNavigation": "Navigare",
   "DE.Views.LeftMenu.tipOutline": "Titluri",
+  "DE.Views.LeftMenu.tipPageThumbnails": "Miniaturi Pagini",
   "DE.Views.LeftMenu.tipPlugins": "Plugin-uri",
   "DE.Views.LeftMenu.tipSearch": "Căutare",
   "DE.Views.LeftMenu.tipSupport": "Feedback și asistența",
@@ -2127,7 +2348,7 @@
   "DE.Views.ListSettingsDialog.txtNone": "Niciunul",
   "DE.Views.ListSettingsDialog.txtSize": "Dimensiune",
   "DE.Views.ListSettingsDialog.txtSymbol": "Simbol",
-  "DE.Views.ListSettingsDialog.txtTitle": "Setări lista",
+  "DE.Views.ListSettingsDialog.txtTitle": "Setări listă",
   "DE.Views.ListSettingsDialog.txtType": "Tip",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Trimitere",
@@ -2303,9 +2524,9 @@
   "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiplu",
   "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Culoare de fundal",
   "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Text de bază",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Culoare bordura",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Culoare bordură",
   "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Faceți clic pe diagramă sau selectați borduri cu butoane și aplicați stilul selectat",
-  "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Dimensiune bordura",
+  "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Dimensiune bordură",
   "DE.Views.ParagraphSettingsAdvanced.textBottom": "Jos",
   "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centrat",
   "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Spațierea caracterelor",
@@ -2358,6 +2579,18 @@
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Adăugare numai bordură de sus",
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Fără borduri",
+  "DE.Views.ProtectDialog.textComments": "Comentarii",
+  "DE.Views.ProtectDialog.textForms": "Completarea formularelor",
+  "DE.Views.ProtectDialog.textReview": "Modificări urmărite",
+  "DE.Views.ProtectDialog.textView": "Fără modificări (Doar în citire)",
+  "DE.Views.ProtectDialog.txtAllow": "Se permite numai acest tip de editare în document",
+  "DE.Views.ProtectDialog.txtIncorrectPwd": "Parola și Confirmare parola nu este indentice",
+  "DE.Views.ProtectDialog.txtOptional": "opțional",
+  "DE.Views.ProtectDialog.txtPassword": "Parola",
+  "DE.Views.ProtectDialog.txtProtect": "Protejare",
+  "DE.Views.ProtectDialog.txtRepeat": "Reintroduceți parola",
+  "DE.Views.ProtectDialog.txtTitle": "Protejare",
+  "DE.Views.ProtectDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să o păstrați într-un loc sigur.",
   "DE.Views.RightMenu.txtChartSettings": "Setări diagramă",
   "DE.Views.RightMenu.txtFormSettings": "Setări Formular",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Setări antet și subsol",
@@ -2468,8 +2701,8 @@
   "DE.Views.TableFormulaDialog.textBookmark": "Lipire marcaj",
   "DE.Views.TableFormulaDialog.textFormat": "Formatul de număr",
   "DE.Views.TableFormulaDialog.textFormula": "Formula",
-  "DE.Views.TableFormulaDialog.textInsertFunction": "Lipire funcție",
+  "DE.Views.TableFormulaDialog.textInsertFunction": "Funcție de lipire ",
-  "DE.Views.TableFormulaDialog.textTitle": "Setări formula",
+  "DE.Views.TableFormulaDialog.textTitle": "Setări formulă",
   "DE.Views.TableOfContentsSettings.strAlign": "Alinierea numărul de pagină la dreapta",
   "DE.Views.TableOfContentsSettings.strFullCaption": "Cu etichetă și număr",
   "DE.Views.TableOfContentsSettings.strLinks": "Formatare cuprins utilizând linkuri",
@@ -2548,12 +2781,20 @@
   "DE.Views.TableSettings.tipOuter": "Adăugare numai bordură exterioară",
   "DE.Views.TableSettings.tipRight": "Adăugare numai bordură exterioară dreapta",
   "DE.Views.TableSettings.tipTop": "Adăugare numai bordură exterioară de sus",
+  "DE.Views.TableSettings.txtGroupTable_BorderedAndLined": "Tqbele cu bordiră și liniate",
+  "DE.Views.TableSettings.txtGroupTable_Custom": "Particularizat",
+  "DE.Views.TableSettings.txtGroupTable_Grid": "Tabele grilă",
+  "DE.Views.TableSettings.txtGroupTable_List": "Tabele de tip listă",
+  "DE.Views.TableSettings.txtGroupTable_Plain": "Tabele simple",
   "DE.Views.TableSettings.txtNoBorders": "Fără borduri",
   "DE.Views.TableSettings.txtTable_Accent": "Accent",
+  "DE.Views.TableSettings.txtTable_Bordered": "Cu bordură",
+  "DE.Views.TableSettings.txtTable_BorderedAndLined": "Cu bordură și liniat",
   "DE.Views.TableSettings.txtTable_Colorful": "Colorat",
   "DE.Views.TableSettings.txtTable_Dark": "Întunecat",
   "DE.Views.TableSettings.txtTable_GridTable": "Grilă de tabel",
   "DE.Views.TableSettings.txtTable_Light": "Luminozitate",
+  "DE.Views.TableSettings.txtTable_Lined": "Liniat",
   "DE.Views.TableSettings.txtTable_ListTable": "Listă tabel",
   "DE.Views.TableSettings.txtTable_PlainTable": "Tabel simplu",
   "DE.Views.TableSettings.txtTable_TableGrid": "Linii de grilă tabel",
@@ -2568,14 +2809,14 @@
   "DE.Views.TableSettingsAdvanced.textAutofit": "Redimensionarea automată cu potrivire conținut",
   "DE.Views.TableSettingsAdvanced.textBackColor": "Fundal celulă",
   "DE.Views.TableSettingsAdvanced.textBelow": "dedesubt",
-  "DE.Views.TableSettingsAdvanced.textBorderColor": "Culoare bordura",
+  "DE.Views.TableSettingsAdvanced.textBorderColor": "Culoare bordură",
   "DE.Views.TableSettingsAdvanced.textBorderDesc": "Faceți clic pe diagramă sau selectați borduri cu butoane și aplicați stilul selectat",
   "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Borduri și fundal",
-  "DE.Views.TableSettingsAdvanced.textBorderWidth": "Dimensiune bordura",
+  "DE.Views.TableSettingsAdvanced.textBorderWidth": "Dimensiune bordură",
   "DE.Views.TableSettingsAdvanced.textBottom": "Jos",
-  "DE.Views.TableSettingsAdvanced.textCellOptions": "Opțiuni celula",
+  "DE.Views.TableSettingsAdvanced.textCellOptions": "Opțiuni celulă",
   "DE.Views.TableSettingsAdvanced.textCellProps": "Celula",
-  "DE.Views.TableSettingsAdvanced.textCellSize": "Dimensiune celula",
+  "DE.Views.TableSettingsAdvanced.textCellSize": "Dimensiune celulă",
   "DE.Views.TableSettingsAdvanced.textCenter": "La centru",
   "DE.Views.TableSettingsAdvanced.textCenterTooltip": "La centru",
   "DE.Views.TableSettingsAdvanced.textCheckMargins": "Se aplică margini implicite",
@@ -2688,6 +2929,7 @@
   "DE.Views.Toolbar.capBtnInsImage": "Imagine",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Întreruperi",
   "DE.Views.Toolbar.capBtnInsShape": "Forma",
+  "DE.Views.Toolbar.capBtnInsSmartArt": "SmartArt",
   "DE.Views.Toolbar.capBtnInsSymbol": "Simbol",
   "DE.Views.Toolbar.capBtnInsTable": "Tabel",
   "DE.Views.Toolbar.capBtnInsTextart": "TextArt",
@@ -2834,13 +3076,16 @@
   "DE.Views.Toolbar.tipIncPrLeft": "Creștere nivel indentare",
   "DE.Views.Toolbar.tipInsertChart": "Inserare diagramă",
   "DE.Views.Toolbar.tipInsertEquation": "Inserare ecuație",
+  "DE.Views.Toolbar.tipInsertHorizontalText": "Inserare casetă text orizontală",
   "DE.Views.Toolbar.tipInsertImage": "Inserare imagine",
   "DE.Views.Toolbar.tipInsertNum": "Inserare număr de pagină",
   "DE.Views.Toolbar.tipInsertShape": "Inserare formă automată",
+  "DE.Views.Toolbar.tipInsertSmartArt": "Inserare SmartArt",
   "DE.Views.Toolbar.tipInsertSymbol": "Inserare simbol",
   "DE.Views.Toolbar.tipInsertTable": "Inserare tabel",
   "DE.Views.Toolbar.tipInsertText": "Inserare casetă text",
   "DE.Views.Toolbar.tipInsertTextArt": "Inserare TextArt",
+  "DE.Views.Toolbar.tipInsertVerticalText": "Inserare casetă text verticală",
   "DE.Views.Toolbar.tipLineNumbers": "Afișare numere de linie",
   "DE.Views.Toolbar.tipLineSpace": "Spațiere interlinie paragraf ",
   "DE.Views.Toolbar.tipMailRecepients": "Îmbinare corespondență",
@@ -2853,6 +3098,10 @@
   "DE.Views.Toolbar.tipMarkersFSquare": "Listă cu marcatori pătrat umplut",
   "DE.Views.Toolbar.tipMarkersHRound": "Listă cu marcatori cerc gol ",
   "DE.Views.Toolbar.tipMarkersStar": "Listă cu marcatori stele",
+  "DE.Views.Toolbar.tipMultiLevelArticl": "Articole multinivel numerotate ",
+  "DE.Views.Toolbar.tipMultiLevelChapter": "Capitole multinivel numerotate ",
+  "DE.Views.Toolbar.tipMultiLevelHeadings": "Titluri multinivel numerotate ",
+  "DE.Views.Toolbar.tipMultiLevelHeadVarious": "Titluri multinivel cu numerotare diversă ",
   "DE.Views.Toolbar.tipMultiLevelNumbered": "Listă multinivel numerotată",
   "DE.Views.Toolbar.tipMultilevels": "Listă multinivel",
   "DE.Views.Toolbar.tipMultiLevelSymbols": "Listă multinivel cu marcatori",
@@ -2864,7 +3113,7 @@
   "DE.Views.Toolbar.tipPageSize": "Dimensiune pagină",
   "DE.Views.Toolbar.tipParagraphStyle": "Stil paragraf",
   "DE.Views.Toolbar.tipPaste": "Lipire",
-  "DE.Views.Toolbar.tipPrColor": "Culoare fundal paragraf",
+  "DE.Views.Toolbar.tipPrColor": "Umbrire",
   "DE.Views.Toolbar.tipPrint": "Imprimare",
   "DE.Views.Toolbar.tipRedo": "Refacere",
   "DE.Views.Toolbar.tipSave": "Salvează",
@@ -2874,7 +3123,7 @@
   "DE.Views.Toolbar.tipSendForward": "Aducere în plan apropiat",
   "DE.Views.Toolbar.tipShowHiddenChars": "Caractere neimprimate",
   "DE.Views.Toolbar.tipSynchronize": "Documentul a fost modificat de către un alt utilizator. Salvați modificările făcute de dumneavoastră și reîmprospătați documentul.",
-  "DE.Views.Toolbar.tipUndo": "Anulează",
+  "DE.Views.Toolbar.tipUndo": "Anulare",
   "DE.Views.Toolbar.tipWatermark": "Editare inscripționare",
   "DE.Views.Toolbar.txtDistribHor": "Distribuire pe orizontală",
   "DE.Views.Toolbar.txtDistribVert": "Distribuire pe verticală",
@@ -2908,8 +3157,10 @@
   "DE.Views.ViewTab.textFitToPage": "Portivire la pagina",
   "DE.Views.ViewTab.textFitToWidth": "Potrivire lățime",
   "DE.Views.ViewTab.textInterfaceTheme": "Tema interfeței",
+  "DE.Views.ViewTab.textLeftMenu": "Panou stânga",
   "DE.Views.ViewTab.textNavigation": "Navigare",
   "DE.Views.ViewTab.textOutline": "Titluri",
+  "DE.Views.ViewTab.textRightMenu": "Panou dreapta",
   "DE.Views.ViewTab.textRulers": "Rigle",
   "DE.Views.ViewTab.textStatusBar": "Bară de stare",
   "DE.Views.ViewTab.textZoom": "Zoom",
@@ -2933,7 +3184,7 @@
   "DE.Views.WatermarkSettingsDialog.textLayout": "Aspect",
   "DE.Views.WatermarkSettingsDialog.textNone": "Niciunul",
   "DE.Views.WatermarkSettingsDialog.textScale": "Scară",
-  "DE.Views.WatermarkSettingsDialog.textSelect": "Selectați imaginea",
+  "DE.Views.WatermarkSettingsDialog.textSelect": "Selectare imagine",
   "DE.Views.WatermarkSettingsDialog.textStrikeout": "Tăiere cu o linie",
   "DE.Views.WatermarkSettingsDialog.textText": "Text",
   "DE.Views.WatermarkSettingsDialog.textTextW": "Inscripționare text",

apps/documenteditor/main/locale/ru.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": "Открыть на просмотр",
@@ -462,6 +464,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": "Масштаб",
@@ -469,6 +472,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": "Поиск",
@@ -731,6 +735,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": "Функция сравнения документов недоступна в режиме совместного редактирования.",
@@ -834,6 +839,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": "Отменить",
@@ -1107,6 +1113,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}.",
@@ -2025,6 +2035,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": "Показывать изменения при рецензировании",
@@ -2594,6 +2606,33 @@
   "DE.Views.ProtectDialog.txtRepeat": "Повторить пароль",
   "DE.Views.ProtectDialog.txtTitle": "Защитить",
   "DE.Views.ProtectDialog.txtWarning": "Внимание: Если пароль забыт или утерян, его нельзя восстановить. Храните его в надежном месте.",
+  "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.RightMenu.txtChartSettings": "Параметры диаграммы",
   "DE.Views.RightMenu.txtFormSettings": "Параметры формы",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Параметры верхнего и нижнего колонтитулов",
@@ -3116,7 +3155,7 @@
   "DE.Views.Toolbar.tipPageSize": "Размер страницы",
   "DE.Views.Toolbar.tipParagraphStyle": "Стиль абзаца",
   "DE.Views.Toolbar.tipPaste": "Вставить",
-  "DE.Views.Toolbar.tipPrColor": "Цвет фона абзаца",
+  "DE.Views.Toolbar.tipPrColor": "Заливка",
   "DE.Views.Toolbar.tipPrint": "Печать",
   "DE.Views.Toolbar.tipRedo": "Повторить",
   "DE.Views.Toolbar.tipSave": "Сохранить",

apps/documenteditor/main/locale/tr.json

@@ -565,6 +565,7 @@
   "DE.Controllers.Main.errorFilePassProtect": "Dosya parola korumalıdır ve açılamaz.",
   "DE.Controllers.Main.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.Main.errorForceSave": "Dosya kaydedilirken bir hata oluştu. Dosyayı bilgisayarınızın sabit diskine kaydetmek için lütfen 'Farklı indir' seçeneğini kullanın veya daha sonra tekrar deneyin.",
+  "DE.Controllers.Main.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.Main.errorKeyEncrypt": "Bilinmeyen anahtar tanımlayıcı",
   "DE.Controllers.Main.errorKeyExpire": "Anahtar tanımlayıcının süresi doldu",
   "DE.Controllers.Main.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
@@ -905,7 +906,7 @@
   "DE.Controllers.Main.uploadImageTitleText": "Resim Yükleniyor",
   "DE.Controllers.Main.waitText": "Lütfen bekleyin...",
   "DE.Controllers.Main.warnBrowserIE9": "Uygulama IE9'da düşük yeteneklere sahip. IE10 yada daha yükseğini kullanınız",
-  "DE.Controllers.Main.warnBrowserZoom": "Tarayıcınızın mevcut zum ayarı tam olarak desteklenmiyor. Ctrl+0'a basarak varsayılan zumu sıfırlayınız.",
+  "DE.Controllers.Main.warnBrowserZoom": "Tarayıcınızın mevcut yakınlaştırma ayarı tam olarak desteklenmiyor. Ctrl+0'a basarak varsayılan yakınlaştırmayı sıfırlayınız.",
   "DE.Controllers.Main.warnLicenseExceeded": "%1 düzenleyiciye eşzamanlı bağlantı sınırına ulaştınız. Bu doküman yalnızca görüntüleme için açılacaktır.<br>Daha fazla bilgi için yöneticinizle iletişime geçin.",
   "DE.Controllers.Main.warnLicenseExp": "Lisansınızın süresi doldu. <br> Lütfen lisansınızı güncelleyin ve sayfayı yenileyin.",
   "DE.Controllers.Main.warnLicenseLimitedNoAccess": "Lisansın süresi doldu.<br>Belge düzenleme işlevine erişiminiz yok.<br>Lütfen yöneticinizle iletişime geçin.",
@@ -1697,7 +1698,7 @@
   "DE.Views.FileMenu.btnHistoryCaption": "Versiyon geçmişi",
   "DE.Views.FileMenu.btnInfoCaption": "Döküman Bilgisi",
   "DE.Views.FileMenu.btnPrintCaption": "Yazdır",
-  "DE.Views.FileMenu.btnProtectCaption": "Koru",
+  "DE.Views.FileMenu.btnProtectCaption": "Belgeyi Şifre ile Koru",
   "DE.Views.FileMenu.btnRecentFilesCaption": "En sonunucuyu aç",
   "DE.Views.FileMenu.btnRenameCaption": "Yeniden adlandır",
   "DE.Views.FileMenu.btnReturnCaption": "Dökümana Geri Dön",
@@ -1778,9 +1779,9 @@
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Devre Dışı",
   "DE.Views.FileMenuPanels.Settings.textForceSave": "Ara sürümleri kaydet",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Her Dakika",
-  "DE.Views.FileMenuPanels.Settings.textOldVersions": "DOCX olarak kaydedildiğinde dosyaları eski MS Word sürümleriyle uyumlu hale getirin",
+  "DE.Views.FileMenuPanels.Settings.textOldVersions": ".docx olarak kaydedildiğinde dosyaları eski MS Word sürümleriyle uyumlu hale getirin",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Tümünü göster",
-  "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Otomatik Düzeltme seçenekleri",
+  "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Otomatik Düzeltme Seçenekleri",
   "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Varsayılan önbellek modu",
   "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Balonlarda tıklayarak göster",
   "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Araç ipuçlarında üzerine gelindiğinde göster ",

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

@@ -601,4 +601,111 @@
     padding-left: 12px;
     padding-right: 12px;
   }
-}
+}
+
+#file-menu-panel {
+  #panel-print {
+    padding: 0;
+
+    #id-print-settings {
+      position: absolute;
+      width:280px;
+      top: 0;
+      bottom: 0;
+    }
+    .print-settings {
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      border-right: @scaled-one-px-value-ie solid @border-toolbar-ie;
+      border-right: @scaled-one-px-value solid @border-toolbar;
+      label.header {
+        font-weight: 700;
+      }
+      .footer {
+        .btn.primary {
+          margin-right: 8px;
+        }
+      }
+      .settings-container {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        padding: 12px 16px;
+        .padding-small {
+          padding-bottom: 8px;
+        }
+        .padding-large {
+          padding-bottom: 16px;
+        }
+
+        #print-apply-all {
+          margin-top: 5px;
+        }
+        .link {
+          margin-top: 9px;
+        }
+        .footer {
+          margin-top: 24px;
+        }
+      }
+    }
+    #print-navigation {
+      height: 50px;
+      padding-left: 20px;
+      padding-top: 10px;
+      display: flex;
+      .btn-prev-page, .btn-next-page {
+        background-color: transparent;
+        padding: 0;
+        height: 20px;
+        width: 20px;
+        i.arrow {
+          display: inline-block;
+          width: 10px;
+          height: 10px;
+
+          border: solid @scaled-one-px-value-ie @icon-normal-ie;
+          border: solid @scaled-one-px-value @icon-normal;
+          border-bottom: none;
+          border-right: none;
+        }
+        &.disabled {
+          opacity: @component-disabled-opacity;
+        }
+
+        &:hover:not(:disabled):not(.disabled) {
+          background-color: @highlight-button-hover-ie;
+          background-color: @highlight-button-hover;
+        }
+      }
+      .btn-prev-page {
+        i {
+          transform: rotate(-45deg) translate(-1px, 3px);
+        }
+      }
+      .btn-next-page {
+        i {
+          transform: rotate(135deg) translate(4px, 0px);
+        }
+      }
+      .page-number {
+        display: flex;
+        align-items: center;
+        height: 20px;
+        margin-left: 10px;
+        label {
+          .font-weight-bold();
+        }
+        #print-count-page, #print-number-page {
+          margin-left: 4px;
+        }
+      }
+    }
+    #print-preview {
+      height: calc(100% - 50px);
+    }
+  }
+}

apps/documenteditor/mobile/locale/az.json

@@ -292,7 +292,6 @@
     "textRemoveChart": "Diaqramı Silin",
     "textRemoveShape": "Formanı Silin",
     "textRemoveTable": "Cədvəli Silin",
-    "textReorder": "Yenidən sırala",
     "textRepeatAsHeaderRow": "Başlıq Sətri kimi təkrarlayın",
     "textReplace": "Əvəz edin",
     "textReplaceImage": "Təsviri Əvəz edin",
@@ -323,6 +322,7 @@
     "textWrap": "Keçirin",
     "textAmountOfLevels": "Amount of Levels",
     "textApril": "April",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textClassic": "Classic",
     "textCreateTextStyle": "Create new text style",
@@ -360,7 +360,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSa": "Sa",

apps/documenteditor/mobile/locale/be.json

@@ -301,7 +301,6 @@
     "textRemoveChart": "Выдаліць дыяграму",
     "textRemoveShape": "Выдаліць фігуру",
     "textRemoveTable": "Выдаліць табліцу",
-    "textReorder": "Перапарадкаваць",
     "textRepeatAsHeaderRow": "Паўтараць як загаловак",
     "textReplace": "Замяніць",
     "textReplaceImage": "Замяніць выяву",
@@ -335,6 +334,7 @@
     "textWe": "Сер",
     "textWrap": "Абцяканне",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textBehind": "Behind Text",
     "textBulletsAndNumbers": "Bullets & Numbers",
     "textCancel": "Cancel",
@@ -364,7 +364,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSameCreatedNewStyle": "Same as created new style",

apps/documenteditor/mobile/locale/ca.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Suprimeix la forma",
     "textRemoveTable": "Suprimeix la taula",
     "textRemoveTableContent": "Suprimeix la taula de continguts",
-    "textReorder": "Torna a ordenar",
     "textRepeatAsHeaderRow": "Repeteix com a fila de capçalera",
     "textReplace": "Substitueix",
     "textReplaceImage": "Substitueix la imatge",

apps/documenteditor/mobile/locale/cs.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Odstranit obrazec",
     "textRemoveTable": "Odstranit tabulku",
     "textRemoveTableContent": "Odebrat obsah",
-    "textReorder": "Změnit řazení",
     "textRepeatAsHeaderRow": "Opakujte jako řádek záhlaví",
     "textReplace": "Nahradit",
     "textReplaceImage": "Nahradit obrázek",

apps/documenteditor/mobile/locale/de.json

@@ -222,6 +222,7 @@
     "textAllowOverlap": "Überlappung zulassen",
     "textAmountOfLevels": "Anzahl der Ebenen",
     "textApril": "April",
+    "textArrange": "Arrangieren",
     "textAugust": "August",
     "textAuto": "Auto",
     "textAutomatic": "Automatisch",
@@ -331,7 +332,6 @@
     "textRemoveShape": "Form entfernen",
     "textRemoveTable": "Tabelle entfernen",
     "textRemoveTableContent": "Inhaltsverzeichnis entfernen",
-    "textReorder": "Neu ordnen",
     "textRepeatAsHeaderRow": "Als Überschriftenzeile wiederholen",
     "textReplace": "Ersetzen",
     "textReplaceImage": "Bild ersetzen",
@@ -376,8 +376,7 @@
     "textType": "Typ",
     "textWe": "Mi",
     "textWrap": "Umbrechen",
-    "textWrappingStyle": "Textumbruch",
+    "textWrappingStyle": "Textumbruch"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.",

apps/documenteditor/mobile/locale/el.json

@@ -326,7 +326,6 @@
     "textRemoveShape": "Αφαίρεση Σχήματος",
     "textRemoveTable": "Αφαίρεση Πίνακα",
     "textRemoveTableContent": "Αφαίρεση πίνακα περιεχομένων",
-    "textReorder": "Αναδιάταξη",
     "textRepeatAsHeaderRow": "Επανάληψη ως Σειράς Κεφαλίδας",
     "textReplace": "Αντικατάσταση",
     "textReplaceImage": "Αντικατάσταση Εικόνας",
@@ -369,12 +368,12 @@
     "textType": "Τύπος",
     "textWe": "Τετ",
     "textWrap": "Αναδίπλωση",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
     "textDeleteImage": "Delete Image",
     "textDeleteLink": "Delete Link",
     "textRecommended": "Recommended",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textTextWrapping": "Text Wrapping",
     "textWrappingStyle": "Wrapping Style"

apps/documenteditor/mobile/locale/en.json

@@ -222,6 +222,7 @@
     "textAllowOverlap": "Allow overlap",
     "textAmountOfLevels": "Amount of Levels",
     "textApril": "April",
+    "textArrange": "Arrange",
     "textAugust": "August",
     "textAuto": "Auto",
     "textAutomatic": "Automatic",
@@ -331,8 +332,6 @@
     "textRemoveShape": "Remove Shape",
     "textRemoveTable": "Remove Table",
     "textRemoveTableContent": "Remove table of contents",
-    "del_textReorder": "Reorder",
-    "textArrange": "Arrange",
     "textRepeatAsHeaderRow": "Repeat as Header Row",
     "textReplace": "Replace",
     "textReplaceImage": "Replace Image",

apps/documenteditor/mobile/locale/es.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Eliminar forma",
     "textRemoveTable": "Eliminar tabla",
     "textRemoveTableContent": "Eliminar la tabla de contenidos",
-    "textReorder": "Reordenar",
     "textRepeatAsHeaderRow": "Repetir como fila de encabezado",
     "textReplace": "Reemplazar",
     "textReplaceImage": "Reemplazar imagen",

apps/documenteditor/mobile/locale/eu.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Orri jarraitua",
     "textCurrentPosition": "Uneko kokapena",
     "textDisplay": "Bistaratzea",
+    "textDone": "Eginda",
     "textEmptyImgUrl": "Irudiaren URLa zehaztu behar duzu.",
     "textEvenPage": "Orrialde bikoitia",
     "textFootnote": "Oin-oharra",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Irudia liburutegitik",
     "textPictureFromURL": "Irudia URL-tik",
     "textPosition": "Posizioa",
+    "textRecommended": "Gomendatua",
+    "textRequired": "Nahitaezkoa",
     "textRightBottom": "Behean eskuinean",
     "textRightTop": "Goian eskuinean",
     "textRows": "Errenkadak",
@@ -61,10 +64,7 @@
     "textTableSize": "Taularen tamaina",
     "textWithBlueLinks": "Esteka urdinekin",
     "textWithPageNumbers": "Orri-zenbakiekin",
-    "txtNotUrl": "Eremu hau URL helbide bat izan behar da \"http://www.adibidea.eus\" bezalakoa",
+    "txtNotUrl": "Eremu hau URL helbide bat izan behar da \"http://www.adibidea.eus\" bezalakoa"
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Berrikusi aldaketa",
       "textRight": "Lerrokatu eskuinean",
       "textShape": "Forma",
+      "textSharingSettings": "Partekatzearen ezarpenak",
       "textShd": "Atzeko planoaren kolorea",
       "textSmallCaps": "Maiuskula txikiak",
       "textSpacing": "Tartea",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Desegin/Berregin funtzioak desgaituta daude batera azkar editatzeko moduan.",
       "textUnderline": "Azpimarra",
       "textUsers": "Erabiltzaileak",
-      "textWidow": "Lerro solteen kontrola",
+      "textWidow": "Lerro solteen kontrola"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Betegarririk ez"
@@ -184,6 +184,7 @@
     "menuDelete": "Ezabatu",
     "menuDeleteTable": "Ezabatu taula",
     "menuEdit": "Editatu",
+    "menuEditLink": "Editatu esteka",
     "menuJoinList": "Batu aurreko zerrendarekin",
     "menuMerge": "Konbinatu",
     "menuMore": "Gehiago",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Freskatu taula osoa",
     "textRefreshPageNumbersOnly": "Freskatu orri-zenbakiak soilik",
     "textRows": "Errenkadak",
-    "txtWarnUrl": "Esteka honetan klik egitea kaltegarria izan daiteke zure gailu eta datuentzat<br>Ziur zaude jarraitu nahi duzula?",
+    "txtWarnUrl": "Esteka honetan klik egitea kaltegarria izan daiteke zure gailu eta datuentzat<br>Ziur zaude jarraitu nahi duzula?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Abisua",
@@ -222,6 +222,7 @@
     "textAllowOverlap": "Onartu teilakatzea",
     "textAmountOfLevels": "Maila kopurua",
     "textApril": "Apirila",
+    "textArrange": "Antolatu",
     "textAugust": "Abuztua",
     "textAuto": "Auto",
     "textAutomatic": "Automatikoa",
@@ -238,6 +239,7 @@
     "textCancel": "Utzi",
     "textCellMargins": "Gelaxkaren marjinak",
     "textCentered": "Erdian",
+    "textChangeShape": "Aldatu forma",
     "textChart": "Diagrama",
     "textClassic": "Klasikoa",
     "textClose": "Itxi",
@@ -246,7 +248,10 @@
     "textCreateTextStyle": "Sortu testu-estilo berria",
     "textCurrent": "Unekoa",
     "textCustomColor": "Kolore pertsonalizatua",
+    "textCustomStyle": "Estilo pertsonalizatua",
     "textDecember": "Abendua",
+    "textDeleteImage": "Ezabatu irudia",
+    "textDeleteLink": "Ezabatu esteka",
     "textDesign": "Diseinua",
     "textDifferentFirstPage": "Lehen orri desberdina",
     "textDifferentOddAndEvenPages": "Orri bakoiti-bikoitiak desberdin",
@@ -319,6 +324,7 @@
     "textPictureFromLibrary": "Irudia liburutegitik",
     "textPictureFromURL": "Irudia URL-tik",
     "textPt": "pt",
+    "textRecommended": "Gomendatua",
     "textRefresh": "Freskatu",
     "textRefreshEntireTable": "Freskatu taula osoa",
     "textRefreshPageNumbersOnly": "Freskatu orri-zenbakiak soilik",
@@ -326,10 +332,10 @@
     "textRemoveShape": "Kendu forma",
     "textRemoveTable": "Kendu taula",
     "textRemoveTableContent": "Kendu aurkibidea",
-    "textReorder": "Berrordenatu",
     "textRepeatAsHeaderRow": "Errepikatu goiburuko lerro bezala",
     "textReplace": "Ordeztu",
     "textReplaceImage": "Ordeztu irudia",
+    "textRequired": "Nahitaezkoa",
     "textResizeToFitContent": "Aldatu tamaina edukira egokitzeko",
     "textRightAlign": "Lerrokatu eskuinean",
     "textSa": "lr.",
@@ -359,6 +365,7 @@
     "textTableOfCont": "Aurkibidea",
     "textTableOptions": "Taularen aukerak",
     "textText": "Testua",
+    "textTextWrapping": "Testu-egokitzea",
     "textTh": "og.",
     "textThrough": "Zeharkatu",
     "textTight": "Estua",
@@ -369,15 +376,7 @@
     "textType": "Mota",
     "textWe": "az.",
     "textWrap": "Doikuntza",
-    "textChangeShape": "Change Shape",
+    "textWrappingStyle": "Egokitze-estiloa"
-    "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
-    "textRecommended": "Recommended",
-    "textArrange": "Arrange",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "Bihurketaren denbora-muga gainditu da.",
@@ -391,10 +390,16 @@
     "errorDataEncrypted": "Enkriptatutako aldaketak jaso dira, ezin dira deszifratu.",
     "errorDataRange": "Datu-barruti okerra.",
     "errorDefaultMessage": "Errore-kodea: %1",
+    "errorDirectUrl": "Egiaztatu dokumenturako esteka.<br>Esteka honek deskargarako esteka zuzen bat izan behar du.",
     "errorEditingDownloadas": "Errore bat gertatu da fitxategiarekin lan egitean.<br>Deskargatu dokumentua fitxategiaren kopia lokalean gordetzeko.",
     "errorEmptyTOC": "Hasi aurkibide bat sortzen hautatutako testuari Estiloak galeriako goiburu-estilo bat aplikatuz.",
     "errorFilePassProtect": "Fitxategia pasahitzez babestua dago eta ezin izan da ireki.",
     "errorFileSizeExceed": "Fitxategiaren tamainak zerbitzariak onartzen duena gainditzen du.<br>Mesedez, jarri harremanetan kudeatzailearekin.",
+    "errorInconsistentExt": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia eta luzapena ez datoz bat.",
+    "errorInconsistentExtDocx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia testu-dokumentu bati dagokio (adibidez, docx), baina fitxategiaren luzapena ez dator bat: %1.",
+    "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.",
+    "errorInconsistentExtPptx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia aurkezpen bati dagokio (adibidez, pptx), baina fitxategiaren luzapena ez dator bat: %1.",
+    "errorInconsistentExtXlsx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia kalkulu-orri bati dagokio (adibidez, xlsx), baina fitxategiaren luzapena ez dator bat: %1.",
     "errorKeyEncrypt": "Gako-deskriptore ezezaguna",
     "errorKeyExpire": "Gakoaren deskriptorea iraungi da",
     "errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
@@ -406,6 +411,8 @@
     "errorSessionToken": "Zerbitzarira konexioa eten egin da. Mesedez, kargatu berriro orria.",
     "errorStockChart": "Errenkaden ordena okerra. Kotizazio-diagrama bat sortzeko, sartu datuak orrian ordena honetan:<br> irekierako prezioa, gehienezko prezioa, gutxieneko prezioa, itxierako prezioa.",
     "errorTextFormWrongFormat": "Sartutako balioa ez dator bat eremuaren formatuarekin.",
+    "errorToken": "Dokumentuaren segurtasun tokena ez dago ondo osatua.<br>Jarri harremanetan zure zerbitzariaren administratzailearekin.",
+    "errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
     "errorUpdateVersionOnDisconnect": "Konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",
     "errorUserDrop": "Une honetan ezin da fitxategia eskuratu.",
     "errorUsersExceed": "Ordainketa planak onartzen duen erabiltzaile kopurua gainditu da",
@@ -420,19 +427,12 @@
     "unknownErrorText": "Errore ezezaguna.",
     "uploadImageExtMessage": "Irudi-formatu ezezaguna.",
     "uploadImageFileCountMessage": "Ez da irudirik kargatu.",
-    "uploadImageSizeMessage": "Irudia handiegia da. Gehienezko tamaina 25 MB da.",
+    "uploadImageSizeMessage": "Irudia handiegia da. Gehienezko tamaina 25 MB da."
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
-    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
-    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
-    "errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
-    "errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator."
   },
   "LongActions": {
     "applyChangesTextText": "Datuak kargatzen...",
     "applyChangesTitleText": "Datuak kargatzen",
+    "confirmMaxChangesSize": "Ekintzen tamainak zure zerbitzariak ezarritako muga gainditzen du.<br>Sakatu \"Desegin\" azken ekintza ezeztatzeko edo sakatu \"Jarraitu\" ekintza lokalki mantentzeko (fitxategia deskargatu edo bere edukia kopiatu behar duzu ezer ez dela galtzen ziurtatzeko).",
     "downloadMergeText": "Deskargatzen...",
     "downloadMergeTitle": "Deskargatzen",
     "downloadTextText": "Dokumentua deskargatzen...",
@@ -459,14 +459,13 @@
     "saveTitleText": "Dokumentua gordetzen",
     "sendMergeText": "Konbinazioa bidaltzen...",
     "sendMergeTitle": "Konbinazioa bidaltzen",
+    "textContinue": "Jarraitu",
     "textLoadingDocument": "Dokumentua kargatzen",
+    "textUndo": "Desegin",
     "txtEditingMode": "Ezarri edizio modua...",
     "uploadImageTextText": "Irudia kargatzen...",
     "uploadImageTitleText": "Irudia kargatzen",
-    "waitText": "Mesedez, itxaron...",
+    "waitText": "Mesedez, itxaron..."
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Errorea",

apps/documenteditor/mobile/locale/fr.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Supprimer la forme",
     "textRemoveTable": "Supprimer le tableau",
     "textRemoveTableContent": "Supprimer la table des matières",
-    "textReorder": "Réorganiser",
     "textRepeatAsHeaderRow": "Répéter la ligne d'en-tête",
     "textReplace": "Remplacer",
     "textReplaceImage": "Remplacer l’image",

apps/documenteditor/mobile/locale/gl.json

@@ -326,7 +326,6 @@
     "textRemoveShape": "Eliminar forma",
     "textRemoveTable": "Eliminar táboa",
     "textRemoveTableContent": "Elimine a táboa de contidos",
-    "textReorder": "Reordenar",
     "textRepeatAsHeaderRow": "Repetir como fila da cabeceira",
     "textReplace": "Substituír",
     "textReplaceImage": "Substituír imaxe",
@@ -369,12 +368,12 @@
     "textType": "Tipo",
     "textWe": "Me",
     "textWrap": "Axuste",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
     "textDeleteImage": "Delete Image",
     "textDeleteLink": "Delete Link",
     "textRecommended": "Recommended",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textTextWrapping": "Text Wrapping",
     "textWrappingStyle": "Wrapping Style"

apps/documenteditor/mobile/locale/hu.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Alakzat eltávolítása",
     "textRemoveTable": "Táblázat eltávolítása",
     "textRemoveTableContent": "Tartalomjegyzék eltávolítása",
-    "textReorder": "Újrarendez",
     "textRepeatAsHeaderRow": "Ismételje meg fejlécként",
     "textReplace": "Csere",
     "textReplaceImage": "Kép cseréje",

apps/documenteditor/mobile/locale/hy.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "Հեռացնել պատկերը",
     "textRemoveTable": "Հեռացնել աղյուսակը",
     "textRemoveTableContent": "Հեռացնել բովանդակության ցանկը",
-    "textReorder": "Վերադասավորել",
     "textRepeatAsHeaderRow": "Կրկնել որպես գլխամասի տող",
     "textReplace": "Փոխարինել",
     "textReplaceImage": "Փոխարինել նկարը",

apps/documenteditor/mobile/locale/id.json

@@ -222,6 +222,7 @@
     "textAllowOverlap": "Ijinkan menumpuk",
     "textAmountOfLevels": "Jumlah Level",
     "textApril": "April",
+    "textArrange": "Atur",
     "textAugust": "Agustus",
     "textAuto": "Otomatis",
     "textAutomatic": "Otomatis",
@@ -331,7 +332,6 @@
     "textRemoveShape": "Hilangkan Bentuk",
     "textRemoveTable": "Hilangkan Tabel",
     "textRemoveTableContent": "Hapus daftar isi",
-    "textReorder": "Reorder",
     "textRepeatAsHeaderRow": "Ulangi sebagai Baris Header",
     "textReplace": "Ganti",
     "textReplaceImage": "Ganti Gambar",
@@ -376,8 +376,7 @@
     "textType": "Ketik",
     "textWe": "Rab",
     "textWrap": "Wrap",
-    "textWrappingStyle": "Gaya Pembungkusan",
+    "textWrappingStyle": "Gaya Pembungkusan"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "Waktu konversi habis.",

apps/documenteditor/mobile/locale/it.json

@@ -328,7 +328,6 @@
     "textRemoveShape": "Eliminare forma",
     "textRemoveTable": "Eliminare tabella",
     "textRemoveTableContent": "Elimina sommario",
-    "textReorder": "Riordinare",
     "textRepeatAsHeaderRow": "Ripetere come riga di intestazione",
     "textReplace": "Sostituire",
     "textReplaceImage": "Sostituire l'immagine",
@@ -374,10 +373,10 @@
     "textWe": "Mer",
     "textWrap": "Avvolgere",
     "textWrappingStyle": "Stile di disposizione testo",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
+    "textDeleteImage": "Delete Image"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "È stato superato il tempo massimo della conversione.",

apps/documenteditor/mobile/locale/ja.json

@@ -1,6 +1,6 @@
 {
   "About": {
-    "textAbout": "情報",
+    "textAbout": "詳細情報",
     "textAddress": "アドレス",
     "textBack": "戻る",
     "textEditor": "ドキュメントエディター",
@@ -176,7 +176,7 @@
     }
   },
   "ContextMenu": {
-    "errorCopyCutPaste": "コンテキストメニューを使う中コピーしたり切り取り貼り付きたりするの操作がこのファイルだけに実行されます。",
+    "errorCopyCutPaste": "コンテキストメニューを使用したコピー、切り取り、貼り付けの操作は、現在のファイル内でのみ実行されます。",
     "menuAddComment": "コメントを追加",
     "menuAddLink": "リンクを追加",
     "menuCancel": "キャンセル",
@@ -198,7 +198,7 @@
     "menuViewComment": "コメントを見る",
     "textCancel": "キャンセル",
     "textColumns": "列",
-    "textCopyCutPasteActions": "コピー,切り取り,貼り付けの操作",
+    "textCopyCutPasteActions": "コピー,切り取り,貼り付け",
     "textDoNotShowAgain": "再度表示しない",
     "textNumberingValue": "番号",
     "textOk": "OK",
@@ -214,14 +214,15 @@
     "textAdditional": "追加",
     "textAdditionalFormatting": "追加の書式設定",
     "textAddress": "アドレス",
-    "textAdvanced": "詳細",
+    "textAdvanced": "追加情報",
     "textAdvancedSettings": "詳細設定",
-    "textAfter": "後に",
+    "textAfter": "後",
     "textAlign": "並べる",
     "textAllCaps": "全ての大字",
     "textAllowOverlap": "オーバーラップさせる",
     "textAmountOfLevels": "レベル数",
     "textApril": "4月",
+    "textArrange": "整列",
     "textAugust": "8月",
     "textAuto": "自動",
     "textAutomatic": "自動",
@@ -331,7 +332,6 @@
     "textRemoveShape": "形を削除する",
     "textRemoveTable": "表を削除する",
     "textRemoveTableContent": "目次を削除する",
-    "textReorder": "並べ替え",
     "textRepeatAsHeaderRow": "ヘッダー行として繰り返す",
     "textReplace": "置換する",
     "textReplaceImage": "イメージを置換する",
@@ -376,8 +376,7 @@
     "textType": "タイプ",
     "textWe": "水",
     "textWrap": "折り返す",
-    "textWrappingStyle": "折り返しの種類",
+    "textWrappingStyle": "折り返しの種類"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "変換のタイムアウトを超過しました。",
@@ -396,6 +395,11 @@
     "errorEmptyTOC": "スタイルギャラリーからの見出しスタイルを選択したテキストに適用して、目次の作成を開始します",
     "errorFilePassProtect": "ファイルはパスワードで保護されており、開けませんでした。",
     "errorFileSizeExceed": "ファイルのサイズがサーバの制限を超過します。アドミニストレータを連絡してください。",
+    "errorInconsistentExt": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容がファイルの拡張子と一致しません。",
+    "errorInconsistentExtDocx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はドキュメント (docx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+    "errorInconsistentExtPdf": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容は次のいずれかの形式に対応しています: pdf/djvu/xps/oxps が、ファイルの拡張子が一致していません: %1",
+    "errorInconsistentExtPptx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はプレゼンテーション (pptx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+    "errorInconsistentExtXlsx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はスプレッドシート (xlsx など) に対応していますが、ファイルの拡張子が一致していません: %1",
     "errorKeyEncrypt": "不明なキーの記述子",
     "errorKeyExpire": "キーの記述子の有効期間が満期した",
     "errorLoadingFont": "フォントがダウンロードしませんでした。<br>文書のサーバのアドミ二ストレータを連絡してください。",
@@ -407,6 +411,8 @@
     "errorSessionToken": "サーバの接続が中断されました。ページを再びお読み込みしてください。",
     "errorStockChart": "行の順序が正しくありません。株価チャートを作るようにシートにこのようにデータを配置してください：<br>始値、最高価格、最小価格、終値。",
     "errorTextFormWrongFormat": "入力された値がフィールドのフォーマットと一致しません。",
+    "errorToken": "ドキュメントセキュリティトークンが正しく形成されていません。<br>ドキュメントサーバーの管理者にご連絡ください。",
+    "errorTokenExpire": "ドキュメントセキュリティトークンの有効期限が切れています。<br>ドキュメントサーバーの管理者に連絡してください。",
     "errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。<br>作業を継続する前に、ファイルをダウンロードするか内容をコピーして変更が失われていないことを確認してから、このページを再読み込みしてください。",
     "errorUserDrop": "今、ファイルにアクセスすることはできません。",
     "errorUsersExceed": "料金プランで許可されているユーザー数を超えました。",
@@ -421,14 +427,7 @@
     "unknownErrorText": "不明なエラー",
     "uploadImageExtMessage": "不明なイメージの形式",
     "uploadImageFileCountMessage": "アップロードしたイメージがない",
-    "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。",
+    "uploadImageSizeMessage": "イメージのサイズの上限が超えさせました。サイズの上限が２５MB。"
-    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
-    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
-    "errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
-    "errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator."
   },
   "LongActions": {
     "applyChangesTextText": "データの読み込み中...",
@@ -479,7 +478,7 @@
     "notcriticalErrorTitle": " 警告",
     "SDK": {
       " -Section ": "-セクション",
-      "above": "上に",
+      "above": "上",
       "below": "下に",
       "Caption": "標題",
       "Choose an item": "アイテムを選択してください",
@@ -573,7 +572,7 @@
     "advTxtOptions": "TXTオプションを選択する",
     "closeButtonText": "ファイルを閉じる",
     "notcriticalErrorTitle": " 警告",
-    "textAbout": "情報",
+    "textAbout": "詳細情報",
     "textApplication": "アプリ",
     "textApplicationSettings": "アプリ設定",
     "textAuthor": "作成者",

apps/documenteditor/mobile/locale/ko.json

@@ -305,7 +305,6 @@
     "textRemoveChart": "차트 제거",
     "textRemoveShape": "도형 제거",
     "textRemoveTable": "표 제거",
-    "textReorder": "재정렬",
     "textRepeatAsHeaderRow": "헤더 행으로 반복",
     "textReplace": "바꾸기",
     "textReplaceImage": "이미지 바꾸기",
@@ -341,6 +340,7 @@
     "textWe": "수요일",
     "textWrap": "줄 바꾸기",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textCancel": "Cancel",
     "textCentered": "Centered",
     "textChangeShape": "Change Shape",
@@ -366,7 +366,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSameCreatedNewStyle": "Same as created new style",

apps/documenteditor/mobile/locale/lo.json

@@ -305,7 +305,6 @@
     "textRemoveChart": "ລົບແຜນວາດ",
     "textRemoveShape": "ລົບຮ່າງ",
     "textRemoveTable": "ລົບຕາຕະລາງ",
-    "textReorder": "ຈັດຮຽງໃໝ່",
     "textRepeatAsHeaderRow": "ເຮັດລື້ມຄືນ ຕາມ ແຖວຫົວເລື່ອງ",
     "textReplace": "ປ່ຽນແທນ",
     "textReplaceImage": "ປ່ຽນແທນຮູບ",
@@ -341,6 +340,7 @@
     "textWe": "ພວກເຮົາ",
     "textWrap": "ຫໍ່",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textCancel": "Cancel",
     "textCentered": "Centered",
     "textChangeShape": "Change Shape",
@@ -366,7 +366,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSameCreatedNewStyle": "Same as created new style",

apps/documenteditor/mobile/locale/ms.json

@@ -326,7 +326,6 @@
     "textRemoveShape": "Alih Keluar Bentuk",
     "textRemoveTable": "Alih Keluar Jadual",
     "textRemoveTableContent": "Alih keluar senarai kandungan",
-    "textReorder": "Order Semula",
     "textRepeatAsHeaderRow": "Ulang sebagai Baris Pengepala",
     "textReplace": "Gantikan",
     "textReplaceImage": "Gantikan Imej",
@@ -368,12 +367,12 @@
     "textType": "Jenis",
     "textWe": "Kami",
     "textWrap": "Balut",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
     "textDeleteImage": "Delete Image",
     "textDeleteLink": "Delete Link",
     "textRecommended": "Recommended",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textTableOfCont": "TOC",
     "textTextWrapping": "Text Wrapping",

apps/documenteditor/mobile/locale/nl.json

@@ -289,7 +289,6 @@
     "textRemoveChart": "Grafiek verwijderen",
     "textRemoveShape": "Vorm verwijderen",
     "textRemoveTable": "Tabel verwijderen",
-    "textReorder": "Opnieuw ordenen",
     "textRepeatAsHeaderRow": "Als koprij herhalen",
     "textReplace": "Vervangen",
     "textReplaceImage": "Afbeelding vervangen",
@@ -320,6 +319,7 @@
     "textWrap": "Wikkel",
     "textAmountOfLevels": "Amount of Levels",
     "textApril": "April",
+    "textArrange": "Arrange",
     "textAugust": "August",
     "textCancel": "Cancel",
     "textCentered": "Centered",
@@ -360,7 +360,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSa": "Sa",

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

@@ -331,7 +331,6 @@
     "textRemoveShape": "Remover forma",
     "textRemoveTable": "Remover tabela",
     "textRemoveTableContent": "Remover índice remissivo",
-    "textReorder": "Reordenar",
     "textRepeatAsHeaderRow": "Repetir como linha de cabeçalho",
     "textReplace": "Substituir",
     "textReplaceImage": "Substituir imagem",

apps/documenteditor/mobile/locale/pt.json

@@ -222,6 +222,7 @@
     "textAllowOverlap": "Permitir sobreposição",
     "textAmountOfLevels": "Quantidade de níveis",
     "textApril": "Abril",
+    "textArrange": "Organizar",
     "textAugust": "Agosto",
     "textAuto": "Automático",
     "textAutomatic": "Automático",
@@ -331,7 +332,6 @@
     "textRemoveShape": "Remover forma",
     "textRemoveTable": "Remover tabela",
     "textRemoveTableContent": "Excluir tabela de conteúdo",
-    "textReorder": "Reordenar",
     "textRepeatAsHeaderRow": "Repetir como linha de cabeçalho",
     "textReplace": "Substituir",
     "textReplaceImage": "Substituir imagem",
@@ -376,8 +376,7 @@
     "textType": "Tipo",
     "textWe": "Qua",
     "textWrap": "Encapsulamento",
-    "textWrappingStyle": "Estilo da quebra",
+    "textWrappingStyle": "Estilo da quebra"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "Tempo limite de conversão excedido.",
@@ -412,6 +411,8 @@
     "errorSessionToken": "A conexão com o servidor foi interrompida. Por favor recarregue a página.",
     "errorStockChart": "Ordem incorreta das linhas. Para construir um gráfico de ações, coloque os dados na folha na seguinte ordem: <br> preço de abertura, preço máximo, preço mínimo, preço de fechamento.",
     "errorTextFormWrongFormat": "O valor inserido não corresponde ao formato do campo.",
+    "errorToken": "O token de segurança do documento não foi formado corretamente.<br>Entre em contato com o administrador do Document Server.",
+    "errorTokenExpire": "O token de segurança do documento expirou.<br>Entre em contato com o administrador do Document Server.",
     "errorUpdateVersionOnDisconnect": "A conexão à internet foi restabelecida, e a versão do arquivo foi alterada. <br> Antes de continuar seu trabalho, transfira o arquivo ou copie seu conteúdo para assegurar que nada seja perdido, e então, recarregue esta página.",
     "errorUserDrop": "O arquivo não pode ser acessado no momento.",
     "errorUsersExceed": "O número de usuários permitidos pelo plano de preços foi excedido",
@@ -426,9 +427,7 @@
     "unknownErrorText": "Erro desconhecido.",
     "uploadImageExtMessage": "Formato de imagem desconhecido.",
     "uploadImageFileCountMessage": "Sem imagens carregadas.",
-    "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB.",
+    "uploadImageSizeMessage": "Tamanho limite máximo da imagem excedido. O tamanho máximo é de 25 MB."
-    "errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
-    "errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator."
   },
   "LongActions": {
     "applyChangesTextText": "Carregando dados...",

apps/documenteditor/mobile/locale/ro.json

@@ -26,6 +26,7 @@
     "textContinuousPage": "Continuu",
     "textCurrentPosition": "Poziția curentă",
     "textDisplay": "Afișare",
+    "textDone": "Gata",
     "textEmptyImgUrl": "Trebuie specificată adresa URL a imaginii.",
     "textEvenPage": "Pagină pară",
     "textFootnote": "Notă de subsol",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Imagine dintr-o bibliotecă ",
     "textPictureFromURL": "Imaginea prin URL",
     "textPosition": "Poziție",
+    "textRecommended": "Recomandate",
+    "textRequired": "Obligatoriu",
     "textRightBottom": "Dreapta jos",
     "textRightTop": "Dreapta sus",
     "textRows": "Rânduri",
@@ -61,10 +64,7 @@
     "textTableSize": "Dimensiune tabel",
     "textWithBlueLinks": "Cu linkuri albastre",
     "textWithPageNumbers": "Cu numere de pagină",
-    "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\"",
+    "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\""
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required"
   },
   "Common": {
     "Collaboration": {
@@ -147,6 +147,7 @@
       "textReviewChange": "Revizuire modificări",
       "textRight": "Aliniere la dreapta",
       "textShape": "Forma",
+      "textSharingSettings": "Setări partajare",
       "textShd": "Culoare de fundal",
       "textSmallCaps": "Majuscule reduse",
       "textSpacing": "Spațiere",
@@ -163,8 +164,7 @@
       "textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.",
       "textUnderline": "Subliniat",
       "textUsers": "Utilizatori",
-      "textWidow": "Control văduvă",
+      "textWidow": "Control văduvă"
-      "textSharingSettings": "Sharing Settings"
     },
     "HighlightColorPalette": {
       "textNoFill": "Fără umplere"
@@ -184,6 +184,7 @@
     "menuDelete": "Șterge",
     "menuDeleteTable": "Ștergere tabel",
     "menuEdit": "Editare",
+    "menuEditLink": "Editare link",
     "menuJoinList": "Continuare de la lista precedentă",
     "menuMerge": "Îmbinare",
     "menuMore": "Mai multe",
@@ -204,8 +205,7 @@
     "textRefreshEntireTable": "Reîmprospătarea întregului tabel",
     "textRefreshPageNumbersOnly": "Actualizare numai numere de pagină",
     "textRows": "Rânduri",
-    "txtWarnUrl": "Un clic pe acest link ar putea căuza daune dispozitivului și datelor dvs.<br>Sunteți sigur că doriți să continuați?",
+    "txtWarnUrl": "Un clic pe acest link ar putea căuza daune dispozitivului și datelor dvs.<br>Sunteți sigur că doriți să continuați?"
-    "menuEditLink": "Edit Link"
   },
   "Edit": {
     "notcriticalErrorTitle": "Avertisment",
@@ -222,6 +222,7 @@
     "textAllowOverlap": "Se permite suprapunerea",
     "textAmountOfLevels": "Număr de niveluri",
     "textApril": "Aprilie",
+    "textArrange": "Aranjare",
     "textAugust": "August",
     "textAuto": "Auto",
     "textAutomatic": "Automat",
@@ -238,6 +239,7 @@
     "textCancel": "Anulare",
     "textCellMargins": "Margini de celulă",
     "textCentered": "Centrat",
+    "textChangeShape": "Modificare formă",
     "textChart": "Diagramă",
     "textClassic": "Clasic",
     "textClose": "Închide",
@@ -246,7 +248,10 @@
     "textCreateTextStyle": "Crearea unui nou stil de text",
     "textCurrent": "Curent",
     "textCustomColor": "Culoare particularizată",
+    "textCustomStyle": "Stil particularizat",
     "textDecember": "Decembrie",
+    "textDeleteImage": "Ștergere imagine",
+    "textDeleteLink": "Ștergere link",
     "textDesign": "Proiectare",
     "textDifferentFirstPage": "Prima pagina diferită",
     "textDifferentOddAndEvenPages": "Pagini pare și impare diferite",
@@ -319,6 +324,7 @@
     "textPictureFromLibrary": "Imagine dintr-o bibliotecă ",
     "textPictureFromURL": "Imaginea prin URL",
     "textPt": "pt",
+    "textRecommended": "Recomandate",
     "textRefresh": "Actualizare",
     "textRefreshEntireTable": "Reîmprospătarea întregului tabel",
     "textRefreshPageNumbersOnly": "Actualizare numai numere de pagină",
@@ -326,10 +332,10 @@
     "textRemoveShape": "Stergere forma",
     "textRemoveTable": "Ștergere tabel",
     "textRemoveTableContent": "Eliminare cuprins",
-    "textReorder": "Reordonare",
     "textRepeatAsHeaderRow": "Repetare rânduri antet",
     "textReplace": "Înlocuire",
     "textReplaceImage": "Înlocuire imagine",
+    "textRequired": "Obligatoriu",
     "textResizeToFitContent": "Potrivire conținut",
     "textRightAlign": "Aliniere la dreapta",
     "textSa": "S",
@@ -359,6 +365,7 @@
     "textTableOfCont": "TOC",
     "textTableOptions": "Opțiuni tabel",
     "textText": "Text",
+    "textTextWrapping": "Incadrare text",
     "textTh": "J",
     "textThrough": "Printre",
     "textTight": "Strâns",
@@ -369,15 +376,7 @@
     "textType": "Tip",
     "textWe": "Mi",
     "textWrap": "Încadrare",
-    "textChangeShape": "Change Shape",
+    "textWrappingStyle": "Stil de încadrare"
-    "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
-    "textRecommended": "Recommended",
-    "textArrange": "Arrange",
-    "textRequired": "Required",
-    "textTextWrapping": "Text Wrapping",
-    "textWrappingStyle": "Wrapping Style"
   },
   "Error": {
     "convertationTimeoutText": "Timpul de așteptare pentru conversie a expirat.",
@@ -391,10 +390,16 @@
     "errorDataEncrypted": "Modificările primite sunt criptate, decriptarea este imposibilă.",
     "errorDataRange": "Zonă de date incorectă.",
     "errorDefaultMessage": "Codul de eroare: %1",
+    "errorDirectUrl": "Verificați linkul la document.<br>Trebuie să fie un link direct spre fișierul de încărcat.",
     "errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.<br>Încărcați documentul pentru copierea de rezervă locală. ",
     "errorEmptyTOC": "Începeți să creați un cuprins prin aplicarea stilurilor de titlu din Galeria de stiluri la textul selectat.",
     "errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
     "errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dvs.",
+    "errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+    "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.",
+    "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.",
+    "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.",
+    "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.",
     "errorKeyEncrypt": "Descriptor cheie nerecunoscut",
     "errorKeyExpire": "Descriptor cheie a expirat",
     "errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
@@ -405,6 +410,9 @@
     "errorSessionIdle": "Acțiunile de editare a documentului nu s-au efectuat de ceva timp. Încercați să reîmprospătați pagina.",
     "errorSessionToken": "Conexeunea la server s-a întrerupt. Încercați să reîmprospătati pagina.",
     "errorStockChart": "Sortarea rândurilor în ordinea incorectă. Pentru crearea unei diagrame de stoc, datele în foaie trebuie sortate în ordinea următoare:<br> prețul de deschidere, prețul maxim, prețul minim, prețul de închidere.",
+    "errorTextFormWrongFormat": "Ați introdus o valoare care nu corespunde cu formatul câmpului.",
+    "errorToken": "Token de securitate din document este format în mod incorect.<br>Contactați administratorul dvs. de Server Documente.",
+    "errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
     "errorUpdateVersionOnDisconnect": "Conexiunea s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",
     "errorUserDrop": "Fișierul nu poate fi accesat deocamdată.",
     "errorUsersExceed": "Limita de utilizatori stipulată de planul tarifar a fost depășită",
@@ -419,20 +427,12 @@
     "unknownErrorText": "Eroare necunoscută.",
     "uploadImageExtMessage": "Format de imagine nerecunoscut.",
     "uploadImageFileCountMessage": "Nicio imagine nu a fost încărcată.",
-    "uploadImageSizeMessage": "Imaginea este prea mare. Limita de dimensiune este de 25 MB.",
+    "uploadImageSizeMessage": "Imaginea este prea mare. Limita de dimensiune este de 25 MB."
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
-    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
-    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
-    "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
-    "errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
-    "errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator."
   },
   "LongActions": {
     "applyChangesTextText": "Încărcarea datelor...",
     "applyChangesTitleText": "Încărcare date",
+    "confirmMaxChangesSize": "Numărul comenzilor depășește limita prevăzută pentru serverul dvs.<br>Apăsați butonul Anulare pentru a anula ultima comanda dvs. sau apăsați butonul Continuare pentru a executa comanda în mod local (încărcați fișierul sau copiați conținutul pentru a se asigura că nu se pierde nimic).",
     "downloadMergeText": "Progres descărcare...",
     "downloadMergeTitle": "Progres descărcare",
     "downloadTextText": "Descărcarea documentului...",
@@ -459,14 +459,13 @@
     "saveTitleText": "Salvare document",
     "sendMergeText": "Trimitere îmbinare a corespondenței...",
     "sendMergeTitle": "Trimitere îmbinare a corespondenței ",
+    "textContinue": "Continuare",
     "textLoadingDocument": "Încărcare document",
+    "textUndo": "Anulare",
     "txtEditingMode": "Setare modul de editare...",
     "uploadImageTextText": "Încărcarea imaginii...",
     "uploadImageTitleText": "Încărcarea imaginii",
-    "waitText": "Vă rugăm să așteptați...",
+    "waitText": "Vă rugăm să așteptați..."
-    "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
-    "textUndo": "Undo"
   },
   "Main": {
     "criticalErrorTitle": "Eroare",
@@ -630,6 +629,7 @@
     "textMargins": "Margini",
     "textMarginsH": "Marginile sus și jos sunt prea ridicate pentru această pagină",
     "textMarginsW": "Marginile stânga și dreapta sunt prea late pentru această pagină",
+    "textMobileView": "Vizualizare mobilă",
     "textNavigation": "Navigare",
     "textNo": "Nu",
     "textNoCharacters": "Caractere neimprimate",
@@ -693,8 +693,7 @@
     "txtScheme6": "Concurență",
     "txtScheme7": "Echilibru",
     "txtScheme8": "Flux",
-    "txtScheme9": "Forjă",
+    "txtScheme9": "Forjă"
-    "textMobileView": "Mobile View"
   },
   "Toolbar": {
     "dlgLeaveMsgText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și așteptați la salvare automată. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.",
@@ -702,7 +701,7 @@
     "leaveButtonText": "Părăsește această pagina",
     "stayButtonText": "Rămâi în pagină",
     "textOk": "OK",
-    "textSwitchedMobileView": "Switched to Mobile view",
+    "textSwitchedMobileView": "Comutat la vizualizarea mobilă",
-    "textSwitchedStandardView": "Switched to Standard view"
+    "textSwitchedStandardView": "Comutat la vizualizarea standard"
   }
 }

apps/documenteditor/mobile/locale/ru.json

@@ -222,6 +222,7 @@
     "textAllowOverlap": "Разрешить перекрытие",
     "textAmountOfLevels": "Количество уровней",
     "textApril": "Апрель",
+    "textArrange": "Порядок",
     "textAugust": "Август",
     "textAuto": "Авто",
     "textAutomatic": "Автоматический",
@@ -331,7 +332,6 @@
     "textRemoveShape": "Удалить фигуру",
     "textRemoveTable": "Удалить таблицу",
     "textRemoveTableContent": "Удалить оглавление",
-    "textReorder": "Порядок",
     "textRepeatAsHeaderRow": "Повторять как заголовок",
     "textReplace": "Заменить",
     "textReplaceImage": "Заменить рисунок",
@@ -376,8 +376,7 @@
     "textType": "Тип",
     "textWe": "Ср",
     "textWrap": "Стиль обтекания",
-    "textWrappingStyle": "Стиль обтекания",
+    "textWrappingStyle": "Стиль обтекания"
-    "textArrange": "Arrange"
   },
   "Error": {
     "convertationTimeoutText": "Превышено время ожидания конвертации.",

apps/documenteditor/mobile/locale/sk.json

@@ -305,7 +305,6 @@
     "textRemoveChart": "Odstrániť graf",
     "textRemoveShape": "Odstrániť tvar",
     "textRemoveTable": "Odstrániť tabuľku",
-    "textReorder": "Znovu usporiadať/zmena poradia",
     "textRepeatAsHeaderRow": "Opakovať ako riadok hlavičky",
     "textReplace": "Nahradiť",
     "textReplaceImage": "Nahradiť obrázok",
@@ -341,6 +340,7 @@
     "textWe": "st",
     "textWrap": "Zabaliť",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textCancel": "Cancel",
     "textCentered": "Centered",
     "textChangeShape": "Change Shape",
@@ -366,7 +366,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSameCreatedNewStyle": "Same as created new style",

apps/documenteditor/mobile/locale/sl.json

@@ -231,6 +231,7 @@
     "textAllCaps": "All caps",
     "textAllowOverlap": "Allow overlap",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textBandedColumn": "Banded column",
     "textBandedRow": "Banded row",
     "textBefore": "Before",
@@ -331,8 +332,6 @@
     "textRemoveShape": "Remove Shape",
     "textRemoveTable": "Remove Table",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
-    "textReorder": "Reorder",
     "textRepeatAsHeaderRow": "Repeat as Header Row",
     "textReplace": "Replace",
     "textReplaceImage": "Replace Image",

apps/documenteditor/mobile/locale/tr.json

@@ -1,18 +1,18 @@
 {
   "About": {
     "textAbout": "Hakkında",
-    "textAddress": "adres",
+    "textAddress": "Adres",
     "textBack": "Geri",
+    "textEditor": "\nBelge Düzenleyici",
     "textEmail": "E-posta",
     "textPoweredBy": "Tarafından",
     "textTel": "Telefon",
-    "textVersion": "Sürüm",
+    "textVersion": "Sürüm"
-    "textEditor": "Document Editor"
   },
   "Add": {
     "notcriticalErrorTitle": "Dikkat",
     "textAddLink": "Bağlantı Ekle",
-    "textAddress": "adres",
+    "textAddress": "Adres",
     "textBack": "Geri",
     "textBelowText": "Alt Metin",
     "textBottomOfPage": "Sayfanın alt kısmı",
@@ -26,6 +26,7 @@
     "textContinuousPage": "Devam Eden Sayfa",
     "textCurrentPosition": "Mevcut Pozisyon",
     "textDisplay": "Görünüm",
+    "textDone": "Tamamlandı",
     "textEmptyImgUrl": "Resim URL'si belirtmelisiniz.",
     "textEvenPage": "Çift Sayfa",
     "textFootnote": "Dipnot",
@@ -49,6 +50,8 @@
     "textPictureFromLibrary": "Kütüphaneden Resim",
     "textPictureFromURL": "URL'den resim",
     "textPosition": "Pozisyon",
+    "textRecommended": "Tavsiye edilen",
+    "textRequired": "Gerekli",
     "textRightBottom": "Sağ Alt",
     "textRightTop": "Sağ Üst",
     "textRows": "Satırlar",
@@ -57,12 +60,9 @@
     "textShape": "Şekil",
     "textStartAt": "Başlangıç",
     "textTable": "Tablo",
+    "textTableContents": "İçindekiler Tablosu",
     "textTableSize": "Tablo Boyutu",
     "txtNotUrl": "Bu alan \"http://www.example.com\" formatında bir URL olmak zorundadır",
-    "textDone": "Done",
-    "textRecommended": "Recommended",
-    "textRequired": "Required",
-    "textTableContents": "Table of Contents",
     "textWithBlueLinks": "With Blue Links",
     "textWithPageNumbers": "With Page Numbers"
   },
@@ -147,6 +147,7 @@
       "textReviewChange": "Değişikliği İncele",
       "textRight": "Sağa Hizala",
       "textShape": "Şekil",
+      "textSharingSettings": "Paylaşım Ayarları",
       "textShd": "Arka plan rengi",
       "textSmallCaps": "Küçük harfler",
       "textSpacing": "Aralık",
@@ -163,16 +164,15 @@
       "textTryUndoRedo": "Hızlı birlikte düzenleme modunda geri al/ileri al fonksiyonları devre dışıdır.",
       "textUnderline": "Altı çizili",
       "textUsers": "Kullanıcılar",
-      "textSharingSettings": "Sharing Settings",
       "textWidow": "Widow control"
     },
+    "HighlightColorPalette": {
+      "textNoFill": "Dolgu Yok"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "Özel Renkler",
       "textStandartColors": "Standart Renkler",
       "textThemeColors": "Tema Renkleri"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -184,6 +184,7 @@
     "menuDelete": "Sil",
     "menuDeleteTable": "Tabloyu Sil",
     "menuEdit": "Düzenle",
+    "menuEditLink": "Bağlantıyı Düzenle",
     "menuJoinList": "Bir önceki listeye bağlan",
     "menuMerge": "Birleştir",
     "menuMore": "Daha fazla",
@@ -201,11 +202,10 @@
     "textDoNotShowAgain": "Tekrar gösterme",
     "textNumberingValue": "Numaralandırma değeri",
     "textOk": "Tamam",
+    "textRefreshEntireTable": "Tüm tabloyu yenile",
+    "textRefreshPageNumbersOnly": "Yalnızca sayfa numaralarını yenile",
     "textRows": "Satırlar",
-    "menuEditLink": "Edit Link",
+    "txtWarnUrl": "Bu bağlantıyı tıklamak cihazınıza ve verilerinize zarar verebilir.<br>Devam etmek istediğinizden emin misiniz?"
-    "textRefreshEntireTable": "Refresh entire table",
-    "textRefreshPageNumbersOnly": "Refresh page numbers only",
-    "txtWarnUrl": "Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?"
   },
   "Edit": {
     "notcriticalErrorTitle": "Dikkat",
@@ -213,14 +213,16 @@
     "textAddCustomColor": "Özel Renk Ekle",
     "textAdditional": "Ek",
     "textAdditionalFormatting": "Ek biçimlendirme",
-    "textAddress": "adres",
+    "textAddress": "Adres",
     "textAdvanced": "Gelişmiş",
     "textAdvancedSettings": "Gelişmiş Ayarlar",
     "textAfter": "sonra",
     "textAlign": "Hizala",
     "textAllCaps": "Tümü büyük harf",
     "textAllowOverlap": "Çakışmaya izin ver",
+    "textAmountOfLevels": "Seviye Miktarı",
     "textApril": "Nisan",
+    "textArrange": "Düzenle",
     "textAugust": "Ağustos",
     "textAuto": "Otomatik",
     "textAutomatic": "Otomatik",
@@ -234,22 +236,35 @@
     "textBringToForeground": "Önplana Getir",
     "textBullets": "İmler",
     "textBulletsAndNumbers": "madde imleri ve numaralandırma",
+    "textCancel": "İptal",
     "textCellMargins": "Hücre Kenar Boşluğu",
+    "textCentered": "Ortalanmış",
+    "textChangeShape": "Şekli değiştir",
     "textChart": "Grafik",
+    "textClassic": "Klasik",
     "textClose": "Kapat",
     "textColor": "Renk",
     "textContinueFromPreviousSection": "Önceki bölümden devam et",
+    "textCreateTextStyle": "Yeni metin stili oluştur",
+    "textCurrent": "Mevcut",
     "textCustomColor": "Özel Renk",
     "textDecember": "Aralık",
+    "textDeleteImage": "Resmi Sil",
+    "textDeleteLink": "Bağlantıyı Sil",
     "textDesign": "Tasarım",
     "textDifferentFirstPage": "Farklı ilk sayfa",
     "textDifferentOddAndEvenPages": "Farklı tek ve çift sayfalar",
     "textDisplay": "Görüntüle",
     "textDistanceFromText": "Metinden mesafe",
+    "textDistinctive": "Belirgin",
+    "textDone": "Tamamlandı",
     "textDoubleStrikethrough": "Üstü çift çizili",
     "textEditLink": "Bağlantıyı Düzenle",
     "textEffects": "Efektler",
+    "textEmpty": "Boş",
     "textEmptyImgUrl": "Resim URL'si belirtmelisiniz.",
+    "textEnterTitleNewStyle": "Yeni stilin başlığını girin",
+    "textFebruary": "Şubat",
     "textFill": "Doldur",
     "textFirstColumn": "İlk Sütun",
     "textFirstLine": "İlk Satır",
@@ -258,6 +273,8 @@
     "textFontColors": "Yazı Tipi Renkleri",
     "textFonts": "Yazı Tipleri",
     "textFooter": "Altbilgi",
+    "textFormal": "Resmi",
+    "textFr": "Cum",
     "textHeader": "Üst Başlık",
     "textHeaderRow": "Üstbilgi Satırı",
     "textHighlightColor": "Vurgu Rengi",
@@ -266,114 +283,96 @@
     "textImageURL": "Resim URL'si",
     "textInFront": "Önde",
     "textInline": "Satıriçi",
+    "textJanuary": "Ocak",
+    "textJuly": "Temmuz",
+    "textJune": "Haziran",
     "textKeepLinesTogether": "Satırları birlikte tut",
     "textKeepWithNext": "Sonrakiyle tut",
     "textLastColumn": "Son Sütun",
+    "textLeader": "Lider",
     "textLetterSpacing": "Harf Boşlukları",
+    "textLevels": "Seviyeler",
     "textLineSpacing": "Satır Aralığı",
     "textLink": "Bağlantı",
     "textLinkSettings": "Bağlantı Ayarları",
     "textLinkToPrevious": "Öncekine bağlantıla",
+    "textMarch": "Mart",
+    "textMay": "May",
+    "textMo": "Pzt",
+    "textModern": "Modern",
     "textMoveBackward": "Geri Taşı",
     "textMoveForward": "İleri Taşı",
     "textMoveWithText": "Metinle taşı",
+    "textNextParagraphStyle": "Sonraki paragraf stili",
     "textNone": "Hiçbiri",
     "textNoStyles": "Bu tip çizelge için stil yok!",
     "textNotUrl": "Bu alan \"http://www.example.com\" formatında bir URL olmak zorundadır",
+    "textNovember": "Kasım",
     "textNumbers": "Sayılar",
+    "textOctober": "Ekim",
     "textOk": "Tamam",
+    "textOnline": "Çevrimiçi",
     "textOpacity": "Opaklık",
     "textOptions": "Seçenekler",
     "textOrphanControl": "Tek satır denetimi",
     "textPageBreakBefore": "Sayfa Sonu Öncesi",
     "textPageNumbering": "Sayfa Numaralandırma",
+    "textPageNumbers": "Sayfa numaraları",
     "textParagraph": "Paragraf",
+    "textParagraphStyle": "Paragraf Stili",
     "textPictureFromLibrary": "Kütüphaneden Resim",
     "textPictureFromURL": "URL'den resim",
     "textPt": "pt",
+    "textRecommended": "Tavsiye edilen",
+    "textRefresh": "Yenile",
+    "textRefreshEntireTable": "Tüm tabloyu yenile",
+    "textRefreshPageNumbersOnly": "Yalnızca sayfa numaralarını yenile",
     "textRemoveChart": "Grafiği Kaldır",
     "textRemoveShape": "Şekli Kaldır",
     "textRemoveTable": "Tabloyu Kaldır",
-    "textReorder": "Yeniden Sırala",
+    "textRemoveTableContent": "İçindekiler tablosunu kaldır",
     "textRepeatAsHeaderRow": "Başlık Satır olarak Tekrarla",
     "textReplace": "Değiştir",
     "textReplaceImage": "Resmi Değiştir",
+    "textRequired": "Gerekli",
     "textResizeToFitContent": "İçereğe Göre Yeniden Boyutlandır",
+    "textRightAlign": "Sağa Hizala",
+    "textSa": "Cmt",
+    "textSameCreatedNewStyle": "Oluşturulan yeni stil ile aynı",
     "textScreenTip": "Ekran İpucu",
     "textSelectObjectToEdit": "Düzenlenecek nesneyi seçin",
     "textSendToBackground": "Arkaplana gönder",
+    "textSeptember": "Eylül",
     "textSettings": "Ayarlar",
     "textShape": "Şekil",
+    "textSimple": "Basit",
     "textSize": "Boyut",
     "textSmallCaps": "Küçük harfler",
     "textSpaceBetweenParagraphs": "Paragraf Arası Boşluklar",
     "textSquare": "Kare",
+    "textStandard": "Standart",
     "textStartAt": "Başlangıç",
     "textStrikethrough": "Üstü çizili",
+    "textStructure": "Yapı",
     "textStyle": "Stil",
     "textStyleOptions": "Stil Seçenekleri",
+    "textStyles": "Stiller",
+    "textSu": "Paz",
     "textSubscript": "Alt Simge",
     "textSuperscript": "Üst Simge",
     "textTable": "Tablo",
     "textTableOptions": "Tablo Seçenekleri",
     "textText": "Metin",
+    "textTextWrapping": "Metin Kaydırma",
+    "textTh": "Pe",
     "textThrough": "Aracılığıyla",
     "textTight": "Sıkı",
     "textTopAndBottom": "Üst ve alt",
     "textTotalRow": "Toplam Satır",
     "textType": "Tip",
     "textWrap": "Metni Kaydır",
-    "textAmountOfLevels": "Amount of Levels",
-    "textCancel": "Cancel",
-    "textCentered": "Centered",
-    "textChangeShape": "Change Shape",
-    "textClassic": "Classic",
-    "textCreateTextStyle": "Create new text style",
-    "textCurrent": "Current",
     "textCustomStyle": "Custom Style",
-    "textDeleteImage": "Delete Image",
-    "textDeleteLink": "Delete Link",
-    "textDistinctive": "Distinctive",
-    "textDone": "Done",
-    "textEmpty": "Empty",
-    "textEnterTitleNewStyle": "Enter title of a new style",
-    "textFebruary": "February",
-    "textFormal": "Formal",
-    "textFr": "Fr",
-    "textJanuary": "January",
-    "textJuly": "July",
-    "textJune": "June",
-    "textLeader": "Leader",
-    "textLevels": "Levels",
-    "textMarch": "March",
-    "textMay": "May",
-    "textMo": "Mo",
-    "textModern": "Modern",
-    "textNextParagraphStyle": "Next paragraph style",
-    "textNovember": "November",
-    "textOctober": "October",
-    "textOnline": "Online",
-    "textPageNumbers": "Page Numbers",
-    "textParagraphStyle": "Paragraph Style",
-    "textRecommended": "Recommended",
-    "textRefresh": "Refresh",
-    "textRefreshEntireTable": "Refresh entire table",
-    "textRefreshPageNumbersOnly": "Refresh page numbers only",
-    "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
-    "textRequired": "Required",
-    "textRightAlign": "Right Align",
-    "textSa": "Sa",
-    "textSameCreatedNewStyle": "Same as created new style",
-    "textSeptember": "September",
-    "textSimple": "Simple",
-    "textStandard": "Standard",
-    "textStructure": "Structure",
-    "textStyles": "Styles",
-    "textSu": "Su",
     "textTableOfCont": "TOC",
-    "textTextWrapping": "Text Wrapping",
-    "textTh": "Th",
     "textTitle": "Title",
     "textTu": "Tu",
     "textWe": "We",
@@ -391,9 +390,16 @@
     "errorDataEncrypted": "Şifreli değişiklikler algılandı, çözülemiyor.",
     "errorDataRange": "Yanlış veri aralığı.",
     "errorDefaultMessage": "Hata kodu: %1",
+    "errorDirectUrl": "Lütfen belgenin bağlantısını doğrulayın.<br>Bu bağlantı, indirilecek dosyaya doğrudan bir bağlantı olmalıdır.",
     "errorEditingDownloadas": "Dokümanla çalışma sırasında hata oluştu.<br> Lokal olarak dosyayı kaydetmek için dokümanı indirin.",
+    "errorEmptyTOC": "Seçilen metne Stiller galerisinden bir başlık stili uygulayarak içindekiler tablosu oluşturmaya başlayın.",
     "errorFilePassProtect": "Dosya parola korumalı ve açılamadı.",
     "errorFileSizeExceed": "Dosya boyutu sunucu sınırınızı aşıyor.<br>Lütfen yöneticinizle iletişime geçin.",
+    "errorInconsistentExt": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği, dosya uzantısıyla eşleşmiyor.",
+    "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.",
+    "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.",
+    "errorInconsistentExtPptx": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği sunumlara karşılık geliyor (örn. pptx), ancak dosyanın uzantısı tutarsız: %1.",
+    "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.",
     "errorKeyEncrypt": "Bilinmeyen anahtar tanımlayıcı",
     "errorKeyExpire": "Anahtar tanımlayıcının süresi doldu",
     "errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
@@ -403,6 +409,8 @@
     "errorSessionIdle": "Belge uzun süredir düzenlenmemiştir. Lütfen sayfayı yenileyin.",
     "errorSessionToken": "Sunucuyla bağlantı kesildi. Lütfen sayfayı yenileyin.",
     "errorStockChart": "Yanlış satır sırası. Stok çizelgesi oluşturmak içi, verilen sıralamada veriyi yerleştirmek gereklidir: <br>  ücret açma, max ücret, minimum ücret ve ücret kapama",
+    "errorToken": "Belge güvenlik belirteci doğru şekilde oluşturulmamış <br> <br> Lütfen Document Server yöneticinize başvurun.",
+    "errorTokenExpire": "Belge güvenlik belirteci doldu. <br> Lütfen Document Server yöneticinize başvurun.",
     "errorUpdateVersionOnDisconnect": "Internet bağlantısı sağlandı, dosya versiyonu değiştirildi. <br>Çalışmaya devam etmeden önce, dosyayı indirin veya içeriğini kopyalayıp herhangi bir kayıp olmadığından emin olun ve sayfayı yenileyin.",
     "errorUserDrop": "Dosyaya şu anda erişilemiyor.",
     "errorUsersExceed": "Fiyat planının izin verdiği kullanıcı sayısı aşıldı",
@@ -418,17 +426,8 @@
     "uploadImageExtMessage": "Bilinmeyen resim formatı.",
     "uploadImageFileCountMessage": "Resim yüklenmedi.",
     "uploadImageSizeMessage": "Görüntü çok büyük. Maksimum boyut 25 MB'dir.",
-    "errorDirectUrl": "Please verify the link to the document.<br>This link must be a direct link to the file for downloading.",
-    "errorEmptyTOC": "Start creating a table of contents by applying a heading style from the Styles gallery to the selected text.",
-    "errorInconsistentExt": "An error has occurred while opening the file.<br>The file content does not match the file extension.",
-    "errorInconsistentExtDocx": "An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPdf": "An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtPptx": "An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.",
-    "errorInconsistentExtXlsx": "An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.",
     "errorNoTOC": "There's no table of contents to update. You can insert one from the References tab.",
-    "errorTextFormWrongFormat": "The value entered does not match the format of the field.",
+    "errorTextFormWrongFormat": "The value entered does not match the format of the field."
-    "errorToken": "The document security token is not correctly formed.<br>Please contact your Document Server administrator.",
-    "errorTokenExpire": "The document security token has expired.<br>Please contact your Document Server administrator."
   },
   "LongActions": {
     "applyChangesTextText": "Veri yükleniyor...",
@@ -459,13 +458,13 @@
     "saveTitleText": "Belge Kaydediliyor",
     "sendMergeText": "Birleştirme Gönderiliyor...",
     "sendMergeTitle": "Birleştirme Gönderiliyor",
+    "textContinue": "Devam",
     "textLoadingDocument": "Belge yükleniyor",
     "txtEditingMode": "Düzenleme modunu belirle...",
     "uploadImageTextText": "Resim yükleniyor...",
     "uploadImageTitleText": "Resim Yükleniyor",
     "waitText": "Lütfen bekleyin...",
     "confirmMaxChangesSize": "The size of actions exceeds the limitation set for your server.<br>Press \"Undo\" to cancel your last action or press \"Continue\" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).",
-    "textContinue": "Continue",
     "textUndo": "Undo"
   },
   "Main": {
@@ -548,8 +547,12 @@
     "textHasMacros": "Dosya otomatik makrolar içeriyor.<br>Makroları çalıştırmak istiyor musunuz?",
     "textNo": "Hayır",
     "textNoLicenseTitle": "Lisans limitine ulaşıldı.",
+    "textNoTextFound": "Metin Bulunamadı",
     "textPaidFeature": "Ücretli Özellik",
     "textRemember": "Seçimimi hatırla",
+    "textReplaceSkipped": "Değiştirme yapıldı. {0} olay atlandı.",
+    "textReplaceSuccess": "Arama yapıldı. {0} olay değiştirildi.",
+    "textRequestMacros": "Bir makro, URL'ye istekte bulunur.  %1 isteğine izin vermek istiyor musunuz?",
     "textYes": "Evet",
     "titleLicenseExp": "Lisans süresi doldu",
     "titleServerVersion": "Editör güncellendi",
@@ -561,11 +564,7 @@
     "warnLicenseUsersExceeded": "%1 düzenleyici için kullanıcı sınırına ulaştınız. Daha fazla bilgi edinmek için yöneticinizle iletişime geçin.",
     "warnNoLicense": "%1 düzenleyiciye eşzamanlı bağlantı sınırına ulaştınız. Bu belge yalnızca görüntüleme için açılacaktır. Kişisel yükseltme koşulları için %1 satış ekibiyle iletişime geçin.",
     "warnNoLicenseUsers": "%1 düzenleyici için kullanıcı sınırına ulaştınız. Kişisel yükseltme koşulları için %1 satış ekibiyle iletişime geçin.",
-    "warnProcessRightsChange": "Bu dosyayı düzenleme izniniz yok.",
+    "warnProcessRightsChange": "Bu dosyayı düzenleme izniniz yok."
-    "textNoTextFound": "Text not found",
-    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
-    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
-    "textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?"
   },
   "Settings": {
     "advDRMOptions": "Korumalı dosya",
@@ -578,6 +577,7 @@
     "textApplicationSettings": "Uygulama Ayarları",
     "textAuthor": "Sahibi",
     "textBack": "Geri",
+    "textBeginningDocument": "Döküman başlangıcı",
     "textBottom": "Alt",
     "textCancel": "İptal Et",
     "textCaseSensitive": "Büyük küçük harfe duyarlı",
@@ -591,6 +591,7 @@
     "textCommentsDisplay": "Yorum Görünümü",
     "textCreated": "Olusturuldu",
     "textCustomSize": "Özel Boyut",
+    "textDirection": "Yön",
     "textDisableAll": "Tümünü Devre Dışı Bırak",
     "textDisableAllMacrosWithNotification": "Makroları bildirim ile pasifleştir",
     "textDisableAllMacrosWithoutNotification": "Tüm makroları bildirimsiz devre dışı bırak",
@@ -602,9 +603,12 @@
     "textDownloadAs": "Olarak indir",
     "textDownloadRtf": "Bu biçimde kaydetmeye devam ederseniz, bazı biçimler kaybolabilir. Devam etmek istediğinize emin misiniz?",
     "textDownloadTxt": "Bu biçimde kayıt etmeye devam ederseniz, metin dışında tüm özellikler kaybolacaktır. Devam etmek istediğinize emin misiniz?",
+    "textEmptyHeading": "Boş Başlık",
     "textEnableAll": "Hepsini Etkinleştir",
     "textEnableAllMacrosWithoutNotification": "Tüm makroları bildirimsiz etkinleştir",
     "textEncoding": "Kodlama",
+    "textFastWV": "Hızlı Web Görünümü",
+    "textFeedback": "Geri Bildirim & Destek",
     "textFind": "Bul",
     "textFindAndReplace": "Bul ve Değiştir",
     "textFindAndReplaceAll": " Bul ve Hepsini Değiştir",
@@ -617,12 +621,16 @@
     "textLastModified": "Son Düzenleme",
     "textLastModifiedBy": "Son Düzenleyen",
     "textLeft": "Sol",
+    "textLeftToRight": "Soldan sağa",
     "textLoading": "Yükleniyor...",
     "textLocation": "Konum",
     "textMacrosSettings": "Makro Ayarları",
     "textMargins": "Kenar Boşlukları",
     "textMarginsH": "Belirli bir sayfa yüksekliği için üst ve alt kenar boşlukları çok yüksek",
     "textMarginsW": "Sağ ve Sol çizelgeler verilen sayfa genişliği için çok geniş",
+    "textMobileView": "Mobil Görünüm",
+    "textNavigation": "Gezinti",
+    "textNo": "Hayır",
     "textNoCharacters": "Basılmaz Karakterler",
     "textNoTextFound": "Metin Bulunamadı",
     "textOk": "Tamam",
@@ -630,7 +638,11 @@
     "textOrientation": "Oryantasyon",
     "textOwner": "Sahip",
     "textPages": "Sayfalar",
+    "textPageSize": "Sayfa Boyutu",
     "textParagraphs": "Paragraflar",
+    "textPdfProducer": "PDF Üreticisi",
+    "textPdfTagged": "Etiketli PDF",
+    "textPdfVer": "PDF Sürümü",
     "textPoint": "Nokta",
     "textPortrait": "Dikey",
     "textPrint": "Yazdır",
@@ -638,7 +650,9 @@
     "textReplace": "Değiştir",
     "textReplaceAll": "Tümünü Değiştir",
     "textResolvedComments": "Çözümlenmiş Yorumlar",
+    "textRestartApplication": "Değişikliklerin geçerli olması için lütfen uygulamayı yeniden başlatın",
     "textRight": "Sağ",
+    "textRightToLeft": "Sağdan Sola",
     "textSearch": "Ara",
     "textSettings": "Ayarlar",
     "textShowNotification": "Bildirim Göster",
@@ -661,6 +675,7 @@
     "txtScheme11": "Metro",
     "txtScheme12": "Modül",
     "txtScheme13": "Zengin",
+    "txtScheme14": "Sıkma",
     "txtScheme15": "Orjin",
     "txtScheme16": "Kağıt",
     "txtScheme17": "Gündönümü",
@@ -676,24 +691,8 @@
     "txtScheme7": "Net Değer",
     "txtScheme8": "Yayılma",
     "txtScheme9": "Döküm",
-    "textBeginningDocument": "Beginning of document",
-    "textDirection": "Direction",
-    "textEmptyHeading": "Empty Heading",
     "textEmptyScreens": "There are no headings in the document. Apply a headings style to the text so that it appears in the table of contents.",
-    "textFastWV": "Fast Web View",
-    "textFeedback": "Feedback & Support",
-    "textLeftToRight": "Left To Right",
-    "textMobileView": "Mobile View",
-    "textNavigation": "Navigation",
-    "textNo": "No",
-    "textPageSize": "Page Size",
-    "textPdfProducer": "PDF Producer",
-    "textPdfTagged": "Tagged PDF",
-    "textPdfVer": "PDF Version",
-    "textRestartApplication": "Please restart the application for the changes to take effect",
-    "textRightToLeft": "Right To Left",
     "textYes": "Yes",
-    "txtScheme14": "Oriel",
     "txtScheme19": "Trek"
   },
   "Toolbar": {
@@ -701,8 +700,8 @@
     "dlgLeaveTitleText": "Uygulamadan çıktınız",
     "leaveButtonText": "Bu Sayfadan Ayrıl",
     "stayButtonText": "Bu Sayfada Kal",
-    "textOk": "OK",
+    "textOk": "Tamam",
-    "textSwitchedMobileView": "Switched to Mobile view",
+    "textSwitchedMobileView": "Mobil görünüme geçildi",
-    "textSwitchedStandardView": "Switched to Standard view"
+    "textSwitchedStandardView": "Standart görünüme geçildi"
   }
 }

apps/documenteditor/mobile/locale/uk.json

@@ -305,7 +305,6 @@
     "textRemoveChart": "Видалити діаграму",
     "textRemoveShape": "Видалити форму",
     "textRemoveTable": "Видалити таблицю",
-    "textReorder": "Порядок",
     "textRepeatAsHeaderRow": "Повторювати як заголовок",
     "textReplace": "Замінити",
     "textReplaceImage": "Замінити зображення",
@@ -341,6 +340,7 @@
     "textWe": "Ср",
     "textWrap": "Стиль обтікання",
     "textAmountOfLevels": "Amount of Levels",
+    "textArrange": "Arrange",
     "textCancel": "Cancel",
     "textCentered": "Centered",
     "textChangeShape": "Change Shape",
@@ -366,7 +366,6 @@
     "textRefreshEntireTable": "Refresh entire table",
     "textRefreshPageNumbersOnly": "Refresh page numbers only",
     "textRemoveTableContent": "Remove table of contents",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textRightAlign": "Right Align",
     "textSameCreatedNewStyle": "Same as created new style",

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

@@ -326,7 +326,6 @@
     "textRemoveShape": "刪除形狀",
     "textRemoveTable": "刪除表格",
     "textRemoveTableContent": "刪除目錄",
-    "textReorder": "重新排序",
     "textRepeatAsHeaderRow": "重複作為標題行",
     "textReplace": "取代",
     "textReplaceImage": "取代圖片",
@@ -369,12 +368,12 @@
     "textType": "類型",
     "textWe": "We",
     "textWrap": "包覆",
+    "textArrange": "Arrange",
     "textChangeShape": "Change Shape",
     "textCustomStyle": "Custom Style",
     "textDeleteImage": "Delete Image",
     "textDeleteLink": "Delete Link",
     "textRecommended": "Recommended",
-    "textArrange": "Arrange",
     "textRequired": "Required",
     "textTextWrapping": "Text Wrapping",
     "textWrappingStyle": "Wrapping Style"

apps/documenteditor/mobile/locale/zh.json

@@ -331,7 +331,6 @@
     "textRemoveShape": "删除图形",
     "textRemoveTable": "删除表",
     "textRemoveTableContent": "删除目录",
-    "textReorder": "重新订购",
     "textRepeatAsHeaderRow": "重复标题行",
     "textReplace": "替换",
     "textReplaceImage": "替换图像",

apps/documenteditor/mobile/src/store/appOptions.js

@@ -95,6 +95,7 @@ export class storeAppOptions {
         this.lang = config.lang;
         this.location = (typeof (config.location) == 'string') ? config.location.toLowerCase() : '';
         this.sharingSettingsUrl = config.sharingSettingsUrl;
+        this.canRequestSharingSettings = config.canRequestSharingSettings;
         this.fileChoiceUrl = config.fileChoiceUrl;
         this.mergeFolderUrl = config.mergeFolderUrl;
         this.canAnalytics = false;

apps/presentationeditor/embed/locale/eu.json

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "Fitxategia pasahitzez babestua dago eta ezin da ireki.",
   "PE.ApplicationController.errorFileSizeExceed": "Fitxategiaren tamainak zure zerbitzarirako ezarritako muga gainditzen du.<br>Jarri harremanetan dokumentu-zerbitzariaren administratzailearekin informazio gehiago lortzeko.",
   "PE.ApplicationController.errorForceSave": "Errore bat gertatu da dokumentua gordetzean.<br>Erabili 'Deskargatu honela' aukera fitxategia zure ordenagailuko disko gogorrean gordetzeko edo saiatu berriro geroago.",
+  "PE.ApplicationController.errorInconsistentExt": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia eta luzapena ez datoz bat.",
+  "PE.ApplicationController.errorInconsistentExtDocx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia testu-dokumentu bati dagokio (adibidez, docx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "PE.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.",
+  "PE.ApplicationController.errorInconsistentExtPptx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia aurkezpen bati dagokio (adibidez, pptx), baina fitxategiaren luzapena ez dator bat: %1.",
+  "PE.ApplicationController.errorInconsistentExtXlsx": "Errore bat gertatu da fitxategia irekitzean.<br>Fitxategiaren edukia kalkulu-orri bati dagokio (adibidez, xlsx), baina fitxategiaren luzapena ez dator bat: %1.",
   "PE.ApplicationController.errorLoadingFont": "Letra-tipoak ez dira kargatu.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
   "PE.ApplicationController.errorTokenExpire": "Dokumentuaren segurtasun-tokena iraungi da.<br>Jarri zure dokumentu-zerbitzariaren administratzailearekin harremanetan.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Konexioa berrezarri da eta fitxategiaren bertsioa aldatu da.<br>Lanean jarraitu aurretik, beharrezkoa da fitxategia deskargatzea edo edukia kopiatzea, ezer ez dela galduko ziurtatzeko, eta gero orri hau berriro kargatzea.",

apps/presentationeditor/embed/locale/ja.json

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

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

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "O documento está protegido por palavra-passe e não pode ser aberto.",
   "PE.ApplicationController.errorFileSizeExceed": "O tamanho do documento excede o limite permitido pelo servidor.<br>Contacte o administrador do servidor de documentos para mais informações.",
   "PE.ApplicationController.errorForceSave": "Ocorreu um erro ao guardar o ficheiro. Utilize a opção 'Descarregar como' para guardar o ficheiro no computador ou tente novamente mais tarde.",
+  "PE.ApplicationController.errorInconsistentExt": "Ocorreu um erro ao abrir o ficheiro.<br>O conteúdo do ficheiro não coincide com a sua extensão.",
+  "PE.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",
+  "PE.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",
+  "PE.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",
+  "PE.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",
   "PE.ApplicationController.errorLoadingFont": "Tipos de letra não carregados.<br>Por favor contacte o administrador do servidor de documentos.",
   "PE.ApplicationController.errorTokenExpire": "O 'token' de segurança do documento expirou.<br>Entre em contacto com o administrador do servidor de documentos.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "A ligação foi restaurada e a versão do ficheiro foi alterada.<br>Antes de poder continuar a trabalhar, é necessário descarregar o ficheiro ou copiar o seu conteúdo para garantir que nada se perde e depois voltar a carregar esta página.",

apps/presentationeditor/embed/locale/ro.json

@@ -15,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "PE.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "PE.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.",
+  "PE.ApplicationController.errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
   "PE.ApplicationController.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
   "PE.ApplicationController.errorTokenExpire": "Token de securitate din document a expirat.<br>Contactați administratorul dvs. de Server Documente.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea s-a restabilit și versiunea fișierului s-a schimbat.<br>Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.",

apps/presentationeditor/embed/locale/tr.json

@@ -4,6 +4,7 @@
   "common.view.modals.txtHeight": "Yükseklik",
   "common.view.modals.txtShare": "Bağlantıyı Paylaş",
   "common.view.modals.txtWidth": "Genişlik",
+  "common.view.SearchBar.textFind": "Bulmak",
   "PE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.",
   "PE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.",
   "PE.ApplicationController.criticalErrorTitle": "Hata",
@@ -14,6 +15,11 @@
   "PE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı",
   "PE.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.",
   "PE.ApplicationController.errorForceSave": "Dosya kaydedilirken 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.",
+  "PE.ApplicationController.errorInconsistentExt": "Dosya açılırken bir hata oluştu.<br>Dosya içeriği, dosya uzantısıyla eşleşmiyor.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
   "PE.ApplicationController.errorLoadingFont": "Yazı tipleri yüklenmedi.<br>Lütfen Doküman Sunucusu yöneticinize başvurun.",
   "PE.ApplicationController.errorTokenExpire": "Belge güvenlik belirtecinin süresi doldu.<br>Lütfen Belge Sunucusu yöneticinize başvurun.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "İnternet bağlantısı tekrar sağlandı, ve dosya versiyon değişti.<br>Çalışmanıza devam etmeden önce, veri kaybını önlemeniz için dosyasının bir kopyasını indirmeniz ya da dosya içeriğini kopyalamanız ve sonrasında sayfayı yenilemeniz gerekmektedir.",
@@ -34,5 +40,6 @@
   "PE.ApplicationView.txtFileLocation": "Dosya konumunu aç",
   "PE.ApplicationView.txtFullScreen": "Tam Ekran",
   "PE.ApplicationView.txtPrint": "Yazdır",
+  "PE.ApplicationView.txtSearch": "Arama",
   "PE.ApplicationView.txtShare": "Paylaş"
 }

apps/presentationeditor/main/app.js

@@ -151,6 +151,7 @@ require([
             'Main',
             'ViewTab',
             'Search',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -181,6 +182,7 @@ require([
             'presentationeditor/main/app/controller/Main',
             'presentationeditor/main/app/controller/ViewTab',
             'presentationeditor/main/app/controller/Search',
+            'presentationeditor/main/app/controller/Print',
             'presentationeditor/main/app/view/FileMenuPanels',
             'presentationeditor/main/app/view/ParagraphSettings',
             'presentationeditor/main/app/view/ImageSettings',

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

@@ -110,6 +110,7 @@ define([
                 if ( !this.leftMenu.panelHistory.isVisible() )
                     this.clickMenuFileItem(null, 'history');
             }, this));
+            Common.NotificationCenter.on('file:print', _.bind(this.clickToolbarPrint, this));
         },
 
         onLaunch: function() {
@@ -717,6 +718,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 {
@@ -798,6 +800,13 @@ define([
                 this.onLeftMenuHide(null, true);
         },
 
+        clickToolbarPrint: function () {
+            if (this.mode.canPreviewPrint)
+                this.leftMenu.showMenu('file:printpreview');
+            else if (this.mode.canPrint)
+                this.clickMenuFileItem(null, 'print');
+        },
+
         textNoTextFound         : 'Text not found',
         newDocumentTitle        : 'Unnamed document',
         requestEditRightsText   : 'Requesting editing rights...',

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

@@ -1190,6 +1190,9 @@ define([
                     console.log("Obsolete: The 'chat' parameter of the 'customization' section is deprecated. Please use 'chat' parameter in the permissions instead.");
                 }
                 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.editorConfig.customization && this.editorConfig.customization.compactHeader);
                 this.appOptions.canRename      = this.editorConfig.canRename;
                 this.appOptions.canForcesave   = this.appOptions.isEdit && !this.appOptions.isOffline && (typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
                 this.appOptions.forcesave      = this.appOptions.canForcesave;
@@ -1323,6 +1326,9 @@ define([
                 documentHolder.setMode(this.appOptions);
                 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_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
@@ -1874,7 +1880,7 @@ define([
 
                 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 !== buildVersion) {
+                if (!window.compareVersions && (!cropped_version || cropped_version[1] !== buildVersion)) {
                     this.changeServerVersion = true;
                     Common.UI.warning({
                         title: this.titleServerVersion,
@@ -1971,6 +1977,7 @@ define([
                 Common.Utils.InternalSettings.set("pe-settings-unit", value);
                 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.appOptions.canPreviewPrint && this.getApplication().getController('Print').getView('PrintWithPreview').updateMetricUnit();
             },
 
             updateThemeColors: function() {
@@ -2224,9 +2231,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');
             },
 
@@ -2259,6 +2264,39 @@ define([
                 if (url) this.iframePrint.src = url;
             },
 
+            onPrintQuick: function() {
+                if (!this.appOptions.canQuickPrint) return;
+
+                var value = Common.localStorage.getBool("pe-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("pe-hide-quick-print-warning", true);
+                            if (btn === 'yes') {
+                                setTimeout(handler, 1);
+                            }
+                        }
+                    });
+                }
+            },
+
             onAdvancedOptions: function(type, advOptions) {
                 if (this._state.openDlg) return;
 
@@ -3075,7 +3113,8 @@ define([
             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.',
-            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 presentation.'
+            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 presentation.',
+            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?'
         }
     })(), PE.Controllers.Main || {}))
 });

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

@@ -0,0 +1,348 @@
+/*
+ *
+ * (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',
+    'presentationeditor/main/app/view/FileMenuPanels'
+], function () {
+    'use strict';
+
+    PE.Controllers.Print = Backbone.Controller.extend(_.extend({
+        views: [
+            'PrintWithPreview'
+        ],
+
+        initialize: function() {
+            this.adjPrintParams = new Asc.asc_CAdjustPrint();
+
+            this._state = {};
+            this._paperSize = undefined;
+            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.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) {
+                        return true;
+                    }
+                }
+
+                return me.txtPrintRangeInvalid;
+            };
+            this.printSettings.cmbPaperSize.on('selected', _.bind(this.onPaperSizeSelect, this));
+            this._paperSize = this.printSettings.cmbPaperSize.getSelectedRecord().size;
+
+            Common.NotificationCenter.on('window:resize', _.bind(function () {
+                if (this._isPreviewVisible) {
+                    this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+                }
+            }, 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_onCountPages',   _.bind(this.onCountPages, this));
+            this.api.asc_registerCallback('asc_onCurrentPage',  _.bind(this.onCurrentPage, this));
+
+            return this;
+        },
+
+        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.printSettings.isVisible()) {
+                this.printSettings.$previewBox.toggleClass('hidden', !this._navigationPreview.pageCount);
+                this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount);
+            }
+            if (!!this._navigationPreview.pageCount) {
+                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._paperSize);
+                    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._paperSize);
+                this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+            }
+        },
+
+        onShowMainSettingsPrint: function() {
+            var me = this;
+            this.printSettings.$previewBox.removeClass('hidden');
+
+            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.printSettings.$previewBox.toggleClass('hidden', !this._navigationPreview.pageCount);
+            this.printSettings.$previewEmpty.toggleClass('hidden', !!this._navigationPreview.pageCount);
+            if (!!this._navigationPreview.pageCount) {
+                this._navigationPreview.currentPreviewPage = this._navigationPreview.currentPage = this.api.getCurrentPage();
+                this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+                this.updateNavigationButtons(this._navigationPreview.currentPreviewPage, this._navigationPreview.pageCount);
+                this.SetDisabled();
+            }
+            this._isPreviewVisible = 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._navigationPreview.pageCount<1)
+                return;
+
+            var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
+            this.adjPrintParams.asc_setNativeOptions({
+                pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
+                paperSize: {
+                    w: rec ? rec.size[0] : undefined,
+                    h: rec ? rec.size[1] : undefined,
+                    preset: rec ? rec.caption : undefined
+                }
+            });
+
+            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);
+            }
+            this.printSettings.menu.hide();
+        },
+
+        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);
+        },
+
+        onPaperSizeSelect: function(combo, record) {
+            if (record) {
+                this._paperSize = record.size;
+                this.api.asc_drawPrintPreview(this._navigationPreview.currentPreviewPage, this._paperSize);
+            }
+        },
+
+        SetDisabled: function() {
+            if (this.printSettings.isVisible()) {
+                var disable = !this.mode.isEdit;
+            }
+        },
+
+        txtPrintRangeInvalid: 'Invalid print range',
+        txtPrintRangeSingleRange: 'Enter either a single slide number or a single slide range (for example, 5-12). Or you can Print to PDF.'
+    }, PE.Controllers.Print || {}));
+});

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

@@ -151,6 +151,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();
                     },
@@ -1079,9 +1083,7 @@ define([
         },
         
         onPrint: function(e) {
-            if (this.api)
+            Common.NotificationCenter.trigger('file:print', this.toolbar);
-                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('edit:complete', this.toolbar);
 
             Common.component.Analytics.trackEvent('Print');

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

@@ -72,7 +72,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) {
@@ -80,6 +81,10 @@ 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("pe-settings-quick-print-button", true);
+                        Common.Utils.InternalSettings.set("pe-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 ?
@@ -102,6 +107,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 )
@@ -312,6 +319,13 @@ define([
             me.header.lockHeaderBtns( 'users', _need_disable );
         },
 
+        applySettings: function () {
+            var value = Common.localStorage.getBool("pe-settings-quick-print-button", true);
+            Common.Utils.InternalSettings.set("pe-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)
@@ -320,6 +334,8 @@ define([
                     this.header.btnPrint.hide();
                 if (this.header.btnEdit)
                     this.header.btnEdit.hide();
+                if (this.header.btnPrintQuick && !enableDownload)
+                    this.header.btnPrintQuick.hide();
                 this.header.lockHeaderBtns( 'rename-user', true);
             }
         },
@@ -345,8 +361,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/presentationeditor/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/presentationeditor/main/app/view/FileMenu.js

@@ -171,6 +171,17 @@ define([
                 dataHintTitle: 'P'
             });
 
+            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.miRename = new Common.UI.MenuItem({
                 el      : $markup.elementById('#fm-btn-rename'),
                 action  : 'rename',
@@ -292,6 +303,7 @@ define([
                 this.miSaveCopyAs,
                 this.miSaveAs,
                 this.miPrint,
+                this.miPrintWithPreview,
                 this.miRename,
                 this.miProtect,
                 this.miRecent,
@@ -381,7 +393,8 @@ define([
             this.miSaveAs[(this.mode.canDownload && 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.isEdit && Common.UI.LayoutManager.isElementVisible('toolbar-file-save') || this.mode.canPrint || this.mode.canProtect ||
@@ -462,6 +475,12 @@ define([
                 this.panels['help'].setLangConfig(this.mode.lang);
             }
 
+            if (this.mode.canPreviewPrint) {
+                var printPanel = PE.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/presentationeditor/main/app/view/FileMenuPanels.js

@@ -323,7 +323,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><span id="fms-cmb-theme"></span></td>',
@@ -593,6 +598,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');
@@ -654,6 +670,7 @@ define([
             $('tr.live-viewer', this.el)[mode.canLiveView && !mode.isOffline && mode.canChangeCoAuthoring ? 'show' : 'hide']();
             $('tr.macros', this.el)[(mode.customization && mode.customization.macros===false) ? 'hide' : 'show']();
             $('tr.spellcheck', this.el)[mode.isEdit && Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
+            $('tr.quick-print', this.el)[mode.canQuickPrint ? 'show' : 'hide']();
 
             if ( !Common.UI.Themes.available() ) {
                 $('tr.themes, tr.themes + tr.divider', this.el).hide();
@@ -715,6 +732,7 @@ define([
             this.lblMacrosDesc.text(item ? item.get('descValue') : this.txtWarnMacrosDesc);
 
             this.chPaste.setValue(Common.Utils.InternalSettings.get("pe-settings-paste-button"));
+            this.chQuickPrint.setValue(Common.Utils.InternalSettings.get("pe-settings-quick-print-button"));
 
             var data = [];
             for (var t in Common.UI.Themes.map()) {
@@ -761,6 +779,7 @@ define([
             Common.Utils.InternalSettings.set("pe-macros-mode", this.cmbMacros.getValue());
 
             Common.localStorage.setItem("pe-settings-paste-button", this.chPaste.isChecked() ? 1 : 0);
+            Common.localStorage.setBool("pe-settings-quick-print-button", this.chQuickPrint.isChecked());
 
             Common.localStorage.save();
 
@@ -837,7 +856,9 @@ define([
         strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE',
         strIgnoreWordsWithNumbers: 'Ignore words with numbers',
         strShowOthersChanges: 'Show changes from other users',
-        txtAdvancedSettings: 'Advanced Settings'
+        txtAdvancedSettings: 'Advanced Settings',
+        txtQuickPrint: 'Show the Quick Print button in the editor header',
+        txtQuickPrintTip: 'The document will be printed on the last selected or default printer'
     }, PE.Views.FileMenuPanels.Settings || {}));
 
     PE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
@@ -1933,4 +1954,280 @@ define([
 
     }, PE.Views.FileMenuPanels.ProtectDoc || {}));
 
+    PE.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.txtPaperSize %></label></td></tr>',
+                                    '<tr><td class="padding-large"><div id="print-combo-pages" 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 id="print-preview-empty" class="hidden">',
+                    '<div><%= scope.txtEmptyTable %></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,59cm x 27,94cm)', caption: 'US Letter', size: [215.9, 279.4]},
+                    { value: 1, displayValue:'US Legal (21,59cm x 35,56cm)', caption: 'US Legal', size: [215.9, 355.6]},
+                    { value: 2, displayValue:'A4 (21cm x 29,7cm)', caption: 'A4', size: [210, 297]},
+                    { value: 3, displayValue:'A5 (14,8cm x 21cm)', caption: 'A5', size: [148, 210]},
+                    { value: 4, displayValue:'B5 (17,6cm x 25cm)', caption: 'B5', size: [176, 250]},
+                    { value: 5, displayValue:'Envelope #10 (10,48cm x 24,13cm)', caption: 'Envelope #10', size: [104.8, 241.3]},
+                    { value: 6, displayValue:'Envelope DL (11cm x 22cm)', caption: 'Envelope DL', size: [110, 220]},
+                    { value: 7, displayValue:'Tabloid (27,94cm x 43,18cm)', caption: 'Tabloid', size: [279.4, 431.8]},
+                    { value: 8, displayValue:'A3 (29,7cm x 42cm)', caption: 'A3', size: [297, 420]},
+                    { value: 9, displayValue:'Tabloid Oversize (30,48cm x 45,71cm)', caption: 'Tabloid Oversize', size: [304.8, 457.1]},
+                    { value: 10, displayValue:'ROC 16K (19,68cm x 27,3cm)', caption: 'ROC 16K', size: [196.8, 273]},
+                    { value: 11, displayValue:'Envelope Choukei 3 (11,99cm x 23,49cm)', caption: 'Envelope Choukei 3', size: [119.9, 234.9]},
+                    { value: 12, displayValue:'Super B/A3 (33,02cm x 48,25cm)', caption: 'Super B/A3', size: [330.2, 482.5]},
+                    { value: 13, displayValue:'A4 (84,1cm x 118,9cm)', caption: 'A0', size: [841, 1189]},
+                    { value: 14, displayValue:'A4 (59,4cm x 84,1cm)', caption: 'A1', size: [594, 841]},
+                    { value: 16, displayValue:'A4 (42cm x 59,4cm)', caption: 'A2', size: [420, 594]},
+                    { value: 17, displayValue:'A4 (10,5cm x 14,8cm)', caption: 'A6', size: [105, 148]}
+                ],
+                dataHint: '2',
+                dataHintDirection: 'bottom',
+                dataHintOffset: 'big'
+            });
+            this.cmbPaperSize.setValue(2);
+
+            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');
+            this.$previewEmpty = $('#print-preview-empty');
+
+            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) {
+
+        },
+
+        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);
+        },
+
+        updateMetricUnit: function() {
+            if (!this.cmbPaperSize) return;
+            var store = this.cmbPaperSize.store;
+            for (var i=0; i<store.length; 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() + ')');
+            }
+            var value = this.cmbPaperSize.getValue();
+            this.cmbPaperSize.onResetItems();
+            this.cmbPaperSize.setValue(value);
+        },
+
+        txtPrint: 'Print',
+        txtPrintPdf: 'Print to PDF',
+        txtPrintRange: 'Print range',
+        txtCurrentPage: 'Current slide',
+        txtAllPages: 'All slides',
+        txtCustomPages: 'Custom print',
+        txtPage: 'Slide',
+        txtOf: 'of {0}',
+        txtPageNumInvalid: 'Slide number invalid',
+        txtEmptyTable: 'There is nothing to print because the presentation is empty',
+        txtPages: 'Slides',
+        txtPaperSize: 'Paper size'
+
+    }, PE.Views.PrintWithPreview || {}));
 });

apps/presentationeditor/main/app_dev.js

@@ -142,6 +142,7 @@ require([
             'Main',
             'ViewTab',
             'Search',
+            'Print',
             'Common.Controllers.Fonts',
             'Common.Controllers.History'
             /** coauthoring begin **/
@@ -172,6 +173,7 @@ require([
             'presentationeditor/main/app/controller/Main',
             'presentationeditor/main/app/controller/ViewTab',
             'presentationeditor/main/app/controller/Search',
+            'presentationeditor/main/app/controller/Print',
             'presentationeditor/main/app/view/FileMenuPanels',
             'presentationeditor/main/app/view/ParagraphSettings',
             'presentationeditor/main/app/view/ImageSettings',

apps/presentationeditor/main/locale/en.json

@@ -410,6 +410,8 @@
   "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": "The file is being edited in another app. You can continue editing and save it as a copy.",
   "Common.Translation.warnFileLockedBtnEdit": "Create a copy",
   "Common.Translation.warnFileLockedBtnView": "Open for viewing",
@@ -575,6 +577,8 @@
   "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
   "Common.Views.Header.txtAccessRights": "Change access rights",
   "Common.Views.Header.txtRename": "Rename",
+  "Common.Views.Header.tipPrintQuick": "Quick print",
+  "Common.Views.Header.textReadOnly": "Read only",
   "Common.Views.History.textCloseHistory": "Close History",
   "Common.Views.History.textHide": "Collapse",
   "Common.Views.History.textHideAll": "Hide detailed changes",
@@ -811,6 +815,7 @@
   "PE.Controllers.Main.downloadTitleText": "Downloading Presentation",
   "PE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
   "PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
+  "PE.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 presentation.",
   "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
   "PE.Controllers.Main.errorComboSeries": "To create a combination chart, select at least two series of data.",
   "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.",
@@ -847,7 +852,6 @@
   "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
   "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
   "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print it until the connection is restored and page is reloaded.",
-  "PE.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 presentation.",
   "PE.Controllers.Main.leavePageText": "You have unsaved changes in this presentation. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
   "PE.Controllers.Main.leavePageTextOnClose": "All unsaved changes in this presentation will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "PE.Controllers.Main.loadFontsTextText": "Loading data...",
@@ -1182,6 +1186,9 @@
   "PE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
   "PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
   "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+  "PE.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?",
+  "PE.Controllers.Print.txtPrintRangeInvalid": "Invalid print range",
+  "PE.Controllers.Print.txtPrintRangeSingleRange": "Enter either a single slide number or a single slide range (for example, 5-12). Or you can Print to PDF.",
   "PE.Controllers.Search.notcriticalErrorTitle": "Warning",
   "PE.Controllers.Search.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
   "PE.Controllers.Search.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
@@ -1934,6 +1941,8 @@
   "PE.Views.GridSettings.textCustom": "Custom",
   "PE.Views.GridSettings.textSpacing": "Spacing",
   "PE.Views.GridSettings.textTitle": "Grid settings",
+  "PE.Views.FileMenuPanels.Settings.txtQuickPrint": "Show the Quick Print button in the editor header",
+  "PE.Views.FileMenuPanels.Settings.txtQuickPrintTip": "The document will be printed on the last selected or default printer",
   "PE.Views.HeaderFooterDialog.applyAllText": "Apply to all",
   "PE.Views.HeaderFooterDialog.applyText": "Apply",
   "PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.<br>To change the master, click 'Apply to all' instead of 'Apply'",
@@ -2073,6 +2082,18 @@
   "PE.Views.ParagraphSettingsAdvanced.textTabRight": "Right",
   "PE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced settings",
   "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
+  "PE.Views.PrintWithPreview.txtPrint": "Print",
+  "PE.Views.PrintWithPreview.txtPrintPdf": "Print to PDF",
+  "PE.Views.PrintWithPreview.txtPrintRange": "Print range",
+  "PE.Views.PrintWithPreview.txtCurrentPage": "Current slide",
+  "PE.Views.PrintWithPreview.txtAllPages": "All slides",
+  "PE.Views.PrintWithPreview.txtCustomPages": "Custom print",
+  "PE.Views.PrintWithPreview.txtPage": "Slide",
+  "PE.Views.PrintWithPreview.txtOf": "of {0}",
+  "PE.Views.PrintWithPreview.txtPageNumInvalid": "Slide number invalid",
+  "PE.Views.PrintWithPreview.txtEmptyTable": "There is nothing to print because the presentation is empty",
+  "PE.Views.PrintWithPreview.txtPages": "Slides",
+  "PE.Views.PrintWithPreview.txtPaperSize": "Paper size",
   "PE.Views.RightMenu.txtChartSettings": "Chart settings",
   "PE.Views.RightMenu.txtImageSettings": "Image settings",
   "PE.Views.RightMenu.txtParagraphSettings": "Paragraph settings",

apps/presentationeditor/main/locale/eu.json

@@ -1377,6 +1377,7 @@
   "PE.Views.Animation.txtSec": "s",
   "PE.Views.AnimationDialog.textPreviewEffect": "Efektuaren aurrebista",
   "PE.Views.AnimationDialog.textTitle": "Efektu gehiago",
+  "PE.Views.ChartSettings.text3dRotation": "3D biraketa",
   "PE.Views.ChartSettings.textAdvanced": "Erakutsi ezarpen aurreratuak",
   "PE.Views.ChartSettings.textChartType": "Aldatu diagrama-mota",
   "PE.Views.ChartSettings.textEditData": "Editatu datuak",

apps/presentationeditor/main/locale/hu.json

@@ -248,6 +248,12 @@
   "Common.define.effectData.textWipe": "Törlés",
   "Common.define.effectData.textZigzag": "Cikcakk",
   "Common.define.effectData.textZoom": "Nagyítás",
+  "Common.define.smartArt.textAccentedPicture": "Hangsúlyos kép",
+  "Common.define.smartArt.textAccentProcess": "Akcentus eljárás",
+  "Common.define.smartArt.textAlternatingFlow": "Váltakozó folyamat",
+  "Common.define.smartArt.textAlternatingHexagons": "Váltakozó hatszögek",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Váltakozó képblokkok",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Váltakozó képkörök",
   "Common.Translation.textMoreButton": "További",
   "Common.Translation.warnFileLocked": "A fájlt egy másik alkalmazásban szerkesztik. Folytathatja a szerkesztést és elmentheti másolatként.",
   "Common.Translation.warnFileLockedBtnEdit": "Másolat létrehozása",
@@ -658,6 +664,11 @@
   "PE.Controllers.Main.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.",
   "PE.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.",
   "PE.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 a fájl meghajtóra mentéséhez, vagy próbálja meg később újra.",
+  "PE.Controllers.Main.errorInconsistentExt": "Hiba történt a fájl megnyitásakor.<br>A fájl tartalma nem felel meg a fájlkiterjesztésnek.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
+  "PE.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.",
   "PE.Controllers.Main.errorKeyEncrypt": "Ismeretlen kulcsleíró",
   "PE.Controllers.Main.errorKeyExpire": "Lejárt kulcsleíró",
   "PE.Controllers.Main.errorLoadingFont": "A betűtípusok nincsenek betöltve.<br>Kérjük forduljon a dokumentumszerver rendszergazdájához.",
@@ -1436,6 +1447,8 @@
   "PE.Views.DocumentHolder.advancedShapeText": "Haladó alakzatbeállítások",
   "PE.Views.DocumentHolder.advancedTableText": "Haladó táblázatbeállítások",
   "PE.Views.DocumentHolder.alignmentText": "Elrendezés",
+  "PE.Views.DocumentHolder.allLinearText": "Mind - Lineáris",
+  "PE.Views.DocumentHolder.allProfText": "Minden - Professzionális",
   "PE.Views.DocumentHolder.belowText": "alatt",
   "PE.Views.DocumentHolder.cellAlignText": "Cella vízszintes elrendezése",
   "PE.Views.DocumentHolder.cellText": "Cella",
@@ -1477,6 +1490,8 @@
   "PE.Views.DocumentHolder.splitCellsText": "Cella felosztása...",
   "PE.Views.DocumentHolder.splitCellTitleText": "Cella felosztása",
   "PE.Views.DocumentHolder.tableText": "Táblázat",
+  "PE.Views.DocumentHolder.textAddHGuides": "Horizontális útmutató hozzáadása",
+  "PE.Views.DocumentHolder.textAddVGuides": "Vertikális útmutató hozzáadása",
   "PE.Views.DocumentHolder.textArrangeBack": "Háttérbe küld",
   "PE.Views.DocumentHolder.textArrangeBackward": "Visszafelé küld",
   "PE.Views.DocumentHolder.textArrangeForward": "Előre hoz",
@@ -2394,6 +2409,8 @@
   "PE.Views.Transitions.txtParameters": "Paraméterek",
   "PE.Views.Transitions.txtPreview": "Előnézet",
   "PE.Views.Transitions.txtSec": "s",
+  "PE.Views.ViewTab.textAddHGuides": "Horizontális útmutató hozzáadása",
+  "PE.Views.ViewTab.textAddVGuides": "Vertikális útmutató hozzáadása",
   "PE.Views.ViewTab.textAlwaysShowToolbar": "Az eszköztár állandó megjelenítése",
   "PE.Views.ViewTab.textFitToSlide": "A diához igazít",
   "PE.Views.ViewTab.textFitToWidth": "Szélességhez igazít",

apps/presentationeditor/main/locale/ja.json

@@ -531,8 +531,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": "貼り付け",
@@ -731,7 +731,7 @@
   "Common.Views.SearchPanel.tipNextResult": "次の結果",
   "Common.Views.SearchPanel.tipPreviousResult": "前の結果",
   "Common.Views.SelectFileDlg.textLoading": "読み込み中",
-  "Common.Views.SelectFileDlg.textTitle": "データ・ソースを選択する",
+  "Common.Views.SelectFileDlg.textTitle": "データソースを選択する",
   "Common.Views.SignDialog.textBold": "太字",
   "Common.Views.SignDialog.textCertificate": "証明書",
   "Common.Views.SignDialog.textChange": "変更する",
@@ -820,6 +820,11 @@
   "PE.Controllers.Main.errorFilePassProtect": "文書がパスワードで保護されているため、開くことができません。",
   "PE.Controllers.Main.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。<br>Documentサーバー管理者に詳細をお問い合わせください。",
   "PE.Controllers.Main.errorForceSave": "文書の保存中にエラーが発生しました。コンピューターにファイルを保存するために、「名前を付けてダウンロード」を使用するか、または後で再度お試しください。",
+  "PE.Controllers.Main.errorInconsistentExt": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容がファイルの拡張子と一致しません。",
+  "PE.Controllers.Main.errorInconsistentExtDocx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はドキュメント (docx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "PE.Controllers.Main.errorInconsistentExtPdf": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容は次のいずれかの形式に対応しています: pdf/djvu/xps/oxps が、ファイルの拡張子が一致していません: %1",
+  "PE.Controllers.Main.errorInconsistentExtPptx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はプレゼンテーション (pptx など) に対応していますが、ファイルの拡張子が一致していません: %1",
+  "PE.Controllers.Main.errorInconsistentExtXlsx": "ファイルを開くときにエラーが発生しました。<br>ファイルの内容はスプレッドシート (xlsx など) に対応していますが、ファイルの拡張子が一致していません: %1",
   "PE.Controllers.Main.errorKeyEncrypt": "不明なキーの記述子",
   "PE.Controllers.Main.errorKeyExpire": "キー記述子の有効期限が切れました",
   "PE.Controllers.Main.errorLoadingFont": "フォントが読み込まれていません。<br>ドキュメントサーバーの管理者に連絡してください。",
@@ -1680,6 +1685,7 @@
   "PE.Views.DocumentHolder.textRotate270": "反時計回りに90度回転",
   "PE.Views.DocumentHolder.textRotate90": "時計回りに90度回転",
   "PE.Views.DocumentHolder.textRulers": "ルーラー",
+  "PE.Views.DocumentHolder.textSaveAsPicture": "画像として保存",
   "PE.Views.DocumentHolder.textShapeAlignBottom": "下揃え",
   "PE.Views.DocumentHolder.textShapeAlignCenter": "中央揃え\t",
   "PE.Views.DocumentHolder.textShapeAlignLeft": "左揃え",
@@ -2599,7 +2605,9 @@
   "PE.Views.ViewTab.textGridlines": "グリッド線",
   "PE.Views.ViewTab.textGuides": "ガイド",
   "PE.Views.ViewTab.textInterfaceTheme": "インターフェイスのテーマ",
+  "PE.Views.ViewTab.textLeftMenu": "左パネル",
   "PE.Views.ViewTab.textNotes": "ノート",
+  "PE.Views.ViewTab.textRightMenu": "右パネル",
   "PE.Views.ViewTab.textRulers": "ルーラー",
   "PE.Views.ViewTab.textShowGridlines": "枠線を表示する",
   "PE.Views.ViewTab.textShowGuides": "ガイドを表示",

apps/presentationeditor/main/locale/ro.json

@@ -248,6 +248,70 @@
   "Common.define.effectData.textWipe": "Ștergere",
   "Common.define.effectData.textZigzag": "Zigzag",
   "Common.define.effectData.textZoom": "Zoom",
+  "Common.define.gridlineData.txtCm": "cm",
+  "Common.define.smartArt.textAccentedPicture": "Imagine cu accent",
+  "Common.define.smartArt.textAccentProcess": "Proces accent",
+  "Common.define.smartArt.textAlternatingFlow": "Flux alternativ",
+  "Common.define.smartArt.textAlternatingHexagons": "Hexagoane alternante",
+  "Common.define.smartArt.textAlternatingPictureBlocks": "Blocuri de imagini alternative",
+  "Common.define.smartArt.textAlternatingPictureCircles": "Cercuri de imagini alternative",
+  "Common.define.smartArt.textArchitectureLayout": "Aspect arhitectură",
+  "Common.define.smartArt.textArrowRibbon": "Panglică săgeată",
+  "Common.define.smartArt.textAscendingPictureAccentProcess": "Proces de imagini ascendent cu accent",
+  "Common.define.smartArt.textBalance": "Balanță",
+  "Common.define.smartArt.textBasicBendingProcess": "Proces de îndoire de bază",
+  "Common.define.smartArt.textBasicBlockList": "Listă de blocare de bază",
+  "Common.define.smartArt.textBasicChevronProcess": "Proces zigzag de bază",
+  "Common.define.smartArt.textBasicCycle": "Ciclu de bază",
+  "Common.define.smartArt.textBasicMatrix": "Matrice de bază",
+  "Common.define.smartArt.textBasicPie": "Structură radială de bază",
+  "Common.define.smartArt.textBasicProcess": "Proces de bază",
+  "Common.define.smartArt.textBasicPyramid": "Piramidă de bază",
+  "Common.define.smartArt.textBasicRadial": "Radială de bază",
+  "Common.define.smartArt.textBasicTarget": "Țintă de bază",
+  "Common.define.smartArt.textBasicTimeline": "Cronologie de bază",
+  "Common.define.smartArt.textBasicVenn": "Venn de bază",
+  "Common.define.smartArt.textBendingPictureAccentList": "Listă de accentuare imagini",
+  "Common.define.smartArt.textBendingPictureBlocks": "Blocuri de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureCaption": "Legendă de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureCaptionList": "Listă de legende de imagini cu îndoire",
+  "Common.define.smartArt.textBendingPictureSemiTranparentText": "Imagini cu îndoire și text semitransparent",
+  "Common.define.smartArt.textBlockCycle": "Ciclu în bloc",
+  "Common.define.smartArt.textBubblePictureList": "Listă de imagini cu bule",
+  "Common.define.smartArt.textCaptionedPictures": "Imagini cu legendă",
+  "Common.define.smartArt.textChevronAccentProcess": "Proces accent zigzag",
+  "Common.define.smartArt.textChevronList": "Listă zigzag",
+  "Common.define.smartArt.textCircleAccentTimeline": "Cronologie accent circular",
+  "Common.define.smartArt.textCircleArrowProcess": "Proces cu săgeți circular",
+  "Common.define.smartArt.textCirclePictureHierarchy": "Ierarhie cu imagini circulare",
+  "Common.define.smartArt.textCircleProcess": "Proces circular",
+  "Common.define.smartArt.textCircleRelationship": "Relație circulară",
+  "Common.define.smartArt.textCircularBendingProcess": "Proces de îndoire circulară",
+  "Common.define.smartArt.textCircularPictureCallout": "Explicație cu imagini circulare",
+  "Common.define.smartArt.textClosedChevronProcess": "Proces zigzag închis",
+  "Common.define.smartArt.textContinuousArrowProcess": "Săgeți de proces continuu",
+  "Common.define.smartArt.textContinuousBlockProcess": "Proces de blocare continuu",
+  "Common.define.smartArt.textContinuousCycle": "Ciclu continuu",
+  "Common.define.smartArt.textContinuousPictureList": "Listă continuă de imagini",
+  "Common.define.smartArt.textConvergingArrows": "Săgeți convergente",
+  "Common.define.smartArt.textConvergingRadial": "Radială convergentă",
+  "Common.define.smartArt.textConvergingText": "Text convergent",
+  "Common.define.smartArt.textCounterbalanceArrows": "Săgeți contrabalansate",
+  "Common.define.smartArt.textCycle": "Ciclu",
+  "Common.define.smartArt.textCycleMatrix": "Matrice ciclică",
+  "Common.define.smartArt.textDescendingBlockList": "Listă de blocuri descrescătoare",
+  "Common.define.smartArt.textDescendingProcess": "Proces descendent",
+  "Common.define.smartArt.textDetailedProcess": "Proces detaliat",
+  "Common.define.smartArt.textDivergingArrows": "Săgeți divergente",
+  "Common.define.smartArt.textDivergingRadial": "Radială divergentă",
+  "Common.define.smartArt.textEquation": "Ecuație",
+  "Common.define.smartArt.textFramedTextPicture": "Imagine cu text încadrat",
+  "Common.define.smartArt.textFunnel": "Extrage",
+  "Common.define.smartArt.textGear": "Roată dințată",
+  "Common.define.smartArt.textGridMatrix": "Matrice grilă",
+  "Common.define.smartArt.textGroupedList": "Listă grupată",
+  "Common.define.smartArt.textHalfCircleOrganizationChart": "Organigramă semicirculară",
+  "Common.define.smartArt.textVerticalChevronList": "Listă zigzag verticală",
   "Common.Translation.textMoreButton": "Mai multe",
   "Common.Translation.warnFileLocked": "Fișierul este editat într-o altă aplicație. Puteți continua să editați și să-l salvați ca o copie.",
   "Common.Translation.warnFileLockedBtnEdit": "Crează o copie",
@@ -378,6 +442,7 @@
   "Common.Views.DocumentAccessDialog.textLoading": "Se incarca...",
   "Common.Views.DocumentAccessDialog.textTitle": "Setări partajare",
   "Common.Views.ExternalDiagramEditor.textTitle": "Editor diagramă",
+  "Common.Views.ExternalEditor.textClose": "Închidere",
   "Common.Views.ExternalOleEditor.textTitle": "Editor de foi de calcul",
   "Common.Views.Header.labelCoUsersDescr": "Fișierul este editat de către:",
   "Common.Views.Header.textAddFavorite": "Marcare ca preferat",
@@ -401,7 +466,7 @@
   "Common.Views.Header.tipRedo": "Refacere",
   "Common.Views.Header.tipSave": "Salvează",
   "Common.Views.Header.tipSearch": "Căutare",
-  "Common.Views.Header.tipUndo": "Anulează",
+  "Common.Views.Header.tipUndo": "Anulare",
   "Common.Views.Header.tipUndock": "Detașare într-o fereastră separată",
   "Common.Views.Header.tipUsers": "Vizualizare utilizatori",
   "Common.Views.Header.tipViewSettings": "Setări vizualizare",
@@ -452,11 +517,11 @@
   "Common.Views.OpenDialog.txtTitle": "Selectare opțiuni %1",
   "Common.Views.OpenDialog.txtTitleProtected": "Fișierul protejat",
   "Common.Views.PasswordDialog.txtDescription": "Setați o parolă pentru protejarea documentului",
-  "Common.Views.PasswordDialog.txtIncorrectPwd": "Parolă introdusă pentru confirmare nu este indentică cu prima",
+  "Common.Views.PasswordDialog.txtIncorrectPwd": "Parola și Confirmare parola nu este indentice",
   "Common.Views.PasswordDialog.txtPassword": "Parola",
   "Common.Views.PasswordDialog.txtRepeat": "Reintroduceți parola",
   "Common.Views.PasswordDialog.txtTitle": "Setare parolă",
-  "Common.Views.PasswordDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să îl păstrați într-un loc sigur.",
+  "Common.Views.PasswordDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să o păstrați într-un loc sigur.",
   "Common.Views.PluginDlg.textLoading": "Încărcare",
   "Common.Views.Plugins.groupCaption": "Plugin-uri",
   "Common.Views.Plugins.strPlugins": "Plugin-uri",
@@ -465,6 +530,7 @@
   "Common.Views.Plugins.textStart": "Pornire",
   "Common.Views.Plugins.textStop": "Oprire",
   "Common.Views.Protection.hintAddPwd": "Criptare utilizând o parolă",
+  "Common.Views.Protection.hintDelPwd": "Ștergere parola",
   "Common.Views.Protection.hintPwd": "Modificarea sau eliminarea parolei",
   "Common.Views.Protection.hintSignature": "Adăugarea semnăturii digitale sau liniei de semnătură",
   "Common.Views.Protection.txtAddPwd": "Adăugare parola",
@@ -535,6 +601,7 @@
   "Common.Views.ReviewPopover.textCancel": "Revocare",
   "Common.Views.ReviewPopover.textClose": "Închidere",
   "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textEnterComment": "Comentați aici",
   "Common.Views.ReviewPopover.textMention": "+mentionare pentru a furniza accesul la document și a trimite un e-mail",
   "Common.Views.ReviewPopover.textMentionNotify": "+mentionare pentru a notifica utilizatorul prin e-mail",
   "Common.Views.ReviewPopover.textOpenAgain": "Deschidere din nou",
@@ -547,6 +614,7 @@
   "Common.Views.SaveAsDlg.textTitle": "Folderul de salvare",
   "Common.Views.SearchPanel.textCaseSensitive": "Sensibil la litere mari și mici",
   "Common.Views.SearchPanel.textCloseSearch": "Închide căutare",
+  "Common.Views.SearchPanel.textContentChanged": "Documentul a fost modificat.",
   "Common.Views.SearchPanel.textFind": "Găsire",
   "Common.Views.SearchPanel.textFindAndReplace": "Găsire și înlocuire",
   "Common.Views.SearchPanel.textMatchUsingRegExp": "Potrivire expresie regulată",
@@ -555,6 +623,7 @@
   "Common.Views.SearchPanel.textReplace": "Înlocuire",
   "Common.Views.SearchPanel.textReplaceAll": "Înlocuire peste tot",
   "Common.Views.SearchPanel.textReplaceWith": "Înlocuire cu",
+  "Common.Views.SearchPanel.textSearchAgain": "{0}Efectuați o nouă căutare{1} pentru rezultate mai precise.",
   "Common.Views.SearchPanel.textSearchHasStopped": "Сăutarea s-a oprit",
   "Common.Views.SearchPanel.textSearchResults": "Rezultatele căutării: {0}/{1}",
   "Common.Views.SearchPanel.textTooManyResults": "Prea multe rezultate ca să fie afișate aici",
@@ -579,6 +648,7 @@
   "Common.Views.SignDialog.tipFontName": "Denumire font",
   "Common.Views.SignDialog.tipFontSize": "Dimensiune font",
   "Common.Views.SignSettingsDialog.textAllowComment": "Se permite semnatarului să adauge comentarii în dialogul Semnare",
+  "Common.Views.SignSettingsDialog.textDefInstruction": "Înninte de semnarea documentului, verificați corectitudinea conținutului acestuia.",
   "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
   "Common.Views.SignSettingsDialog.textInfoName": "Nume",
   "Common.Views.SignSettingsDialog.textInfoTitle": "Funcția semnatarului",
@@ -648,6 +718,11 @@
   "PE.Controllers.Main.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.",
   "PE.Controllers.Main.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.<br>Pentru detalii, contactați administratorul dumneavoastră de Server Documente.",
   "PE.Controllers.Main.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.",
+  "PE.Controllers.Main.errorInconsistentExt": "Eroare la deschiderea fișierului.<br>Conținutul fișierului nu corespunde cu extensia numelui de fișier.",
+  "PE.Controllers.Main.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.",
+  "PE.Controllers.Main.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.",
+  "PE.Controllers.Main.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.",
+  "PE.Controllers.Main.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.",
   "PE.Controllers.Main.errorKeyEncrypt": "Descriptor cheie nerecunoscut",
   "PE.Controllers.Main.errorKeyExpire": "Descriptor cheie a expirat",
   "PE.Controllers.Main.errorLoadingFont": "Fonturile nu sunt încărcate.<br>Contactați administratorul dvs de Server Documente.",
@@ -703,6 +778,7 @@
   "PE.Controllers.Main.textClose": "Închidere",
   "PE.Controllers.Main.textCloseTip": "Faceți clic pentru a închide sfatul",
   "PE.Controllers.Main.textContactUs": "Contactați Departamentul de Vânzări",
+  "PE.Controllers.Main.textContinue": "Continuare",
   "PE.Controllers.Main.textConvertEquation": "Această ecuație a fost creată în versiunea mai veche a editorului de ecuații, care nu mai este acceptată. Dacă doriți să o editați, trebuie să o convertiți în formatul Office Math ML.<br>Doriți să o convertiți acum?",
   "PE.Controllers.Main.textCustomLoader": "Vă rugăm să rețineți că conform termenilor de licență nu aveți dreptul să modificați programul de încărcare.<br>Pentru obținerea unei cotații de preț vă rugăm să contactați Departamentul de Vânzari.",
   "PE.Controllers.Main.textDisconnect": "Conexiune pierdută",
@@ -785,7 +861,7 @@
   "PE.Controllers.Main.txtShape_callout2": "Rând de explicație 2 (fără bordură)",
   "PE.Controllers.Main.txtShape_callout3": "Rând de explicație 3 (fără bordură)",
   "PE.Controllers.Main.txtShape_can": "Cilindru",
-  "PE.Controllers.Main.txtShape_chevron": "Chevron",
+  "PE.Controllers.Main.txtShape_chevron": "Zigzag",
   "PE.Controllers.Main.txtShape_chord": "Acord",
   "PE.Controllers.Main.txtShape_circularArrow": "Săgeată circulară",
   "PE.Controllers.Main.txtShape_cloud": "Nor",
@@ -1372,8 +1448,13 @@
   "PE.Views.Animation.txtSec": "s",
   "PE.Views.AnimationDialog.textPreviewEffect": "Previzualizare efect",
   "PE.Views.AnimationDialog.textTitle": "Mai multe efecte",
+  "PE.Views.ChartSettings.text3dDepth": "Adâncime (% din bază)",
+  "PE.Views.ChartSettings.text3dRotation": "Rotație 3D",
   "PE.Views.ChartSettings.textAdvanced": "Afișare setări avansate",
+  "PE.Views.ChartSettings.textAutoscale": "Autoscalare",
   "PE.Views.ChartSettings.textChartType": "Modificare tip diagramă",
+  "PE.Views.ChartSettings.textDefault": "Rotație implicită",
+  "PE.Views.ChartSettings.textDown": "În jos",
   "PE.Views.ChartSettings.textEditData": "Editare date",
   "PE.Views.ChartSettings.textHeight": "Înălțime",
   "PE.Views.ChartSettings.textKeepRatio": "Dimensiuni constante",
@@ -1405,16 +1486,22 @@
   "PE.Views.DocumentHolder.aboveText": "Deasupra",
   "PE.Views.DocumentHolder.addCommentText": "Adaugă comentariu",
   "PE.Views.DocumentHolder.addToLayoutText": "Adăugare aspect",
+  "PE.Views.DocumentHolder.advancedChartText": "Setări avansate diagrama",
+  "PE.Views.DocumentHolder.advancedEquationText": "Setări ecuație",
   "PE.Views.DocumentHolder.advancedImageText": "Setări avansate imagine",
   "PE.Views.DocumentHolder.advancedParagraphText": "Setări avansate paragraf ",
   "PE.Views.DocumentHolder.advancedShapeText": "Setări avansate forma",
   "PE.Views.DocumentHolder.advancedTableText": "Setări avansate tabel",
   "PE.Views.DocumentHolder.alignmentText": "Aliniere",
+  "PE.Views.DocumentHolder.allLinearText": "Tot - Linear",
+  "PE.Views.DocumentHolder.allProfText": "Tot - Profesional",
   "PE.Views.DocumentHolder.belowText": "Dedesubt",
   "PE.Views.DocumentHolder.cellAlignText": "Alinierea pe verticală celulă",
   "PE.Views.DocumentHolder.cellText": "Celula",
   "PE.Views.DocumentHolder.centerText": "La centru",
   "PE.Views.DocumentHolder.columnText": "Coloană",
+  "PE.Views.DocumentHolder.currLinearText": "Curent - Linear",
+  "PE.Views.DocumentHolder.currProfText": "Curent - Profesional",
   "PE.Views.DocumentHolder.deleteColumnText": "Ștergere coloana",
   "PE.Views.DocumentHolder.deleteRowText": "Ștergere rând",
   "PE.Views.DocumentHolder.deleteTableText": "Ștergere tabel",
@@ -1451,15 +1538,21 @@
   "PE.Views.DocumentHolder.splitCellsText": "Scindarea celulei...",
   "PE.Views.DocumentHolder.splitCellTitleText": "Scindarea celulei",
   "PE.Views.DocumentHolder.tableText": "Tabel",
+  "PE.Views.DocumentHolder.textAddHGuides": "Adăugare ghid orizontal",
+  "PE.Views.DocumentHolder.textAddVGuides": "Adăugare ghid vertical",
   "PE.Views.DocumentHolder.textArrangeBack": "Trimitere în plan secundar",
   "PE.Views.DocumentHolder.textArrangeBackward": "Trimitere în ultimul plan",
   "PE.Views.DocumentHolder.textArrangeForward": "Aducere în plan apropiat",
   "PE.Views.DocumentHolder.textArrangeFront": "Aducere în prim plan",
+  "PE.Views.DocumentHolder.textClearGuides": "Golire ghiduri",
+  "PE.Views.DocumentHolder.textCm": "cm",
   "PE.Views.DocumentHolder.textCopy": "Copiere",
   "PE.Views.DocumentHolder.textCrop": "Trunchiere",
   "PE.Views.DocumentHolder.textCropFill": "Umplere",
   "PE.Views.DocumentHolder.textCropFit": "Potrivire",
+  "PE.Views.DocumentHolder.textCustom": "Particularizat",
   "PE.Views.DocumentHolder.textCut": "Decupare",
+  "PE.Views.DocumentHolder.textDeleteGuide": "Ștergere ghidaj",
   "PE.Views.DocumentHolder.textDistributeCols": "Distribuire coloane",
   "PE.Views.DocumentHolder.textDistributeRows": "Distribuire rânduri",
   "PE.Views.DocumentHolder.textEditPoints": "Editare puncte",
@@ -1468,6 +1561,8 @@
   "PE.Views.DocumentHolder.textFromFile": "Din Fișier",
   "PE.Views.DocumentHolder.textFromStorage": "Din serviciul stocare",
   "PE.Views.DocumentHolder.textFromUrl": "Prin URL-ul",
+  "PE.Views.DocumentHolder.textGridlines": "Linii de grilă",
+  "PE.Views.DocumentHolder.textGuides": "Ghiduri",
   "PE.Views.DocumentHolder.textNextPage": "Diapozitivul următor",
   "PE.Views.DocumentHolder.textPaste": "Lipire",
   "PE.Views.DocumentHolder.textPrevPage": "Diapozitivul anterior",
@@ -1482,7 +1577,7 @@
   "PE.Views.DocumentHolder.textShapeAlignRight": "Aliniere la dreapta",
   "PE.Views.DocumentHolder.textShapeAlignTop": "Aliniere sus",
   "PE.Views.DocumentHolder.textSlideSettings": "Setări diapozitiv",
-  "PE.Views.DocumentHolder.textUndo": "Anulează",
+  "PE.Views.DocumentHolder.textUndo": "Anulare",
   "PE.Views.DocumentHolder.tipIsLocked": "La moment acest obiect este editat de către un alt utilizator.",
   "PE.Views.DocumentHolder.toDictionaryText": "Adăugare la dicționar",
   "PE.Views.DocumentHolder.txtAddBottom": "Adăugare bordură de jos",
@@ -1697,6 +1792,9 @@
   "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare   ",
   "PE.Views.FileMenuPanels.Settings.txtWin": "ca Windows",
   "PE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace",
+  "PE.Views.GridSettings.textCm": "cm",
+  "PE.Views.GridSettings.textCustom": "Particularizat",
+  "PE.Views.GridSettings.textTitle": "Setări pentru grilă",
   "PE.Views.HeaderFooterDialog.applyAllText": "Se aplică pentru toate",
   "PE.Views.HeaderFooterDialog.applyText": "Aplicare",
   "PE.Views.HeaderFooterDialog.diffLanguage": "Forrmatul de dată trebuie să se portivească cu setările coordonatorului de diapozitive.<br>Pentru a modifica setările coordonatorului faceți clic pe 'Se aplică pentru toate' în loc de 'Se aplică'",
@@ -2084,6 +2182,9 @@
   "PE.Views.TableSettings.tipOuter": "Adăugare numai bordură exterioară",
   "PE.Views.TableSettings.tipRight": "Adăugare numai bordură exterioară dreapta",
   "PE.Views.TableSettings.tipTop": "Adăugare numai bordură exterioară de sus",
+  "PE.Views.TableSettings.txtGroupTable_Custom": "Particularizat",
+  "PE.Views.TableSettings.txtGroupTable_Dark": "Întunecat",
+  "PE.Views.TableSettings.txtGroupTable_Optimal": "Cea mai bună potrivire pentru document",
   "PE.Views.TableSettings.txtNoBorders": "Fără borduri",
   "PE.Views.TableSettings.txtTable_Accent": "Accent",
   "PE.Views.TableSettings.txtTable_DarkStyle": "Modul întunecat",
@@ -2294,7 +2395,7 @@
   "PE.Views.Toolbar.tipSlideNum": "Inserare număr diapozitiv",
   "PE.Views.Toolbar.tipSlideSize": "Selectați dimensiunea diapozitivului",
   "PE.Views.Toolbar.tipSlideTheme": "Temă diapozitiv",
-  "PE.Views.Toolbar.tipUndo": "Anulează",
+  "PE.Views.Toolbar.tipUndo": "Anulare",
   "PE.Views.Toolbar.tipVAligh": "Aliniere verticală",
   "PE.Views.Toolbar.tipViewSettings": "Setări vizualizare",
   "PE.Views.Toolbar.txtDistribHor": "Distribuire pe orizontală",
@@ -2362,9 +2463,16 @@
   "PE.Views.Transitions.txtParameters": "Opțiuni",
   "PE.Views.Transitions.txtPreview": "Previzualizare",
   "PE.Views.Transitions.txtSec": "s",
+  "PE.Views.ViewTab.textAddHGuides": "Adăugare ghid orizontal",
+  "PE.Views.ViewTab.textAddVGuides": "Adăugare ghid vertical",
   "PE.Views.ViewTab.textAlwaysShowToolbar": "Afișează bară de instrumente permanent",
+  "PE.Views.ViewTab.textClearGuides": "Golire ghiduri",
+  "PE.Views.ViewTab.textCm": "cm",
+  "PE.Views.ViewTab.textCustom": "Particularizat",
   "PE.Views.ViewTab.textFitToSlide": "Se aliniază la diapozitiv",
   "PE.Views.ViewTab.textFitToWidth": "Potrivire lățime",
+  "PE.Views.ViewTab.textGridlines": "Linii de grilă",
+  "PE.Views.ViewTab.textGuides": "Ghiduri",
   "PE.Views.ViewTab.textInterfaceTheme": "Tema interfeței",
   "PE.Views.ViewTab.textNotes": "Note",
   "PE.Views.ViewTab.textRulers": "Rigle",