diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8ea0acf3c..3d84e1e3e 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -667,7 +667,7 @@ app = appMap[config.documentType.toLowerCase()]; } else if (!!config.document && typeof config.document.fileType === 'string') { - var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp))$/ + var type = /^(?:(xls|xlsx|ods|csv|xlst|xlsy|gsheet|xlsm|xlt|xltm|xltx|fods|ots)|(pps|ppsx|ppt|pptx|odp|pptt|ppty|gslides|pot|potm|potx|ppsm|pptm|fodp|otp))$/ .exec(config.document.fileType); if (type) { if (typeof type[1] === 'string') app = appMap['spreadsheet']; else diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 1991dc18b..faf8989a9 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -69,7 +69,7 @@ define([ return { template: _.template([ '
', - '', + ' ', '
', '', '
@@ -84,9 +84,9 @@
<% if (!android) { %><% } %>

- <% if (android) { %><% } else { %>-<% } %> + <% if (android) { %><% } else { %>-<% } %> <% if (android) { %><% } %> - <% if (android) { %><% } else { %>+<% } %> + <% if (android) { %><% } else { %>+<% } %>

diff --git a/apps/documenteditor/mobile/app/template/EditText.template b/apps/documenteditor/mobile/app/template/EditText.template index 3b0c09fb1..7bd4f253e 100644 --- a/apps/documenteditor/mobile/app/template/EditText.template +++ b/apps/documenteditor/mobile/app/template/EditText.template @@ -123,9 +123,9 @@
<% if (!android) { %><% } %>

- <% if (android) { %><% } else { %>-<% } %> + <% if (android) { %><% } else { %>-<% } %> <% if (android) { %><% } %> - <% if (android) { %><% } else { %>+<% } %> + <% if (android) { %><% } else { %>+<% } %>

@@ -266,9 +266,9 @@
<% if (!android) { %><% } %>

- <% if (android) { %><% } else { %>-<% } %> + <% if (android) { %><% } else { %>-<% } %> <% if (android) { %><% } %> - <% if (android) { %><% } else { %>+<% } %> + <% if (android) { %><% } else { %>+<% } %>

diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 139688442..520d4c747 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -225,6 +225,71 @@ +
<%= scope.textMargins %>
+
+ +
@@ -424,6 +489,30 @@ +
  • + +
    +
    + +
    +
    +
    DOTX
    +
    +
    +     +
    • +
  • + +
    +
    + +
    +
    +
    OTT
    +
    +
    +     +
    • diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index 1eef246b7..d6cac7c18 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -268,7 +268,12 @@ define([ textPoweredBy: 'Powered by', textSpellcheck: 'Spell Checking', textPrint: 'Print', - textReview: 'Review' + textReview: 'Review', + textMargins: 'Margins', + textTop: 'Top', + textLeft: 'Left', + textBottom: 'Bottom', + textRight: 'Right' } })(), DE.Views.Settings || {})) diff --git a/apps/documenteditor/mobile/app/view/edit/EditHeader.js b/apps/documenteditor/mobile/app/view/edit/EditHeader.js new file mode 100644 index 000000000..8b53efa7b --- /dev/null +++ b/apps/documenteditor/mobile/app/view/edit/EditHeader.js @@ -0,0 +1,120 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * 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 + * + */ + +/** + * EditHeader.js + * Document Editor + * + * Created by Julia Radzhabova on 2/15/19 + * Copyright (c) 2019 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'text!documenteditor/mobile/app/template/EditHeader.template', + 'jquery', + 'underscore', + 'backbone' +], function (editTemplate, $, _, Backbone) { + 'use strict'; + + DE.Views.EditHeader = Backbone.View.extend(_.extend((function() { + // private + + return { + template: _.template(editTemplate), + + events: { + }, + + initialize: function () { + Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); + }, + + initEvents: function () { + var me = this; + + DE.getController('EditHeader').initSettings(); + }, + + // Render layout + render: function () { + this.layout = $('
    ').append(this.template({ + android : Common.SharedSettings.get('android'), + phone : Common.SharedSettings.get('phone'), + scope : this + })); + + return this; + }, + + rootLayout: function () { + if (this.layout) { + return this.layout + .find('#edit-header-root') + .html(); + } + + return ''; + }, + + showPage: function (templateId, customFireEvent) { + var rootView = DE.getController('EditContainer').rootView; + + if (rootView && this.layout) { + var $content = this.layout.find(templateId); + + // Android fix for navigation + if (Framework7.prototype.device.android) { + $content.find('.page').append($content.find('.navbar')); + } + + rootView.router.load({ + content: $content.html() + }); + + if (customFireEvent !== true) { + this.fireEvent('page:show', [this, templateId]); + } + } + }, + + textDiffFirst: 'Different first page', + textDiffOdd: 'Different odd and even pages', + textSameAs: 'Link to Previous', + textPageNumbering: 'Page Numbering', + textPrev: 'Continue from previous section', + textFrom: 'Start at' + } + })(), DE.Views.EditHeader || {})) +}); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json new file mode 100644 index 000000000..e4a52a7e6 --- /dev/null +++ b/apps/documenteditor/mobile/locale/bg.json @@ -0,0 +1,411 @@ +{ + "Common.UI.ThemeColorPalette.textStandartColors": "Стандартни цветове", + "Common.UI.ThemeColorPalette.textThemeColors": "Цветовете на темата", + "Common.Utils.Metric.txtCm": "см", + "Common.Utils.Metric.txtPt": "pt", + "DE.Controllers.AddContainer.textImage": "Изображение", + "DE.Controllers.AddContainer.textOther": "Друг", + "DE.Controllers.AddContainer.textShape": "форма", + "DE.Controllers.AddContainer.textTable": "маса", + "DE.Controllers.AddImage.textEmptyImgUrl": "Трябва да посочите URL адреса на изображението.", + "DE.Controllers.AddImage.txtNotUrl": "Това поле трябва да бъде URL адрес във формата „http://www.example.com“", + "DE.Controllers.AddOther.txtNotUrl": "Това поле трябва да бъде URL адрес във формата „http://www.example.com“", + "DE.Controllers.AddTable.textCancel": "Отказ", + "DE.Controllers.AddTable.textColumns": "колони", + "DE.Controllers.AddTable.textRows": "Редове", + "DE.Controllers.AddTable.textTableSize": "Размер на таблицата", + "DE.Controllers.DocumentHolder.menuAccept": "Приемам", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Приемам всичко", + "DE.Controllers.DocumentHolder.menuAddLink": "Добавяне на връзка", + "DE.Controllers.DocumentHolder.menuCopy": "копие", + "DE.Controllers.DocumentHolder.menuCut": "Изрежи", + "DE.Controllers.DocumentHolder.menuDelete": "Изтрий", + "DE.Controllers.DocumentHolder.menuEdit": "редактиране", + "DE.Controllers.DocumentHolder.menuMore": "| Повече ▼", + "DE.Controllers.DocumentHolder.menuOpenLink": "Отвори линк", + "DE.Controllers.DocumentHolder.menuPaste": "паста", + "DE.Controllers.DocumentHolder.menuReject": "Отхвърляне", + "DE.Controllers.DocumentHolder.menuRejectAll": "Отхвърли всички", + "DE.Controllers.DocumentHolder.menuReview": "преглед", + "DE.Controllers.DocumentHolder.sheetCancel": "Отказ", + "DE.Controllers.DocumentHolder.textGuest": "гост", + "DE.Controllers.EditContainer.textChart": "диаграма", + "DE.Controllers.EditContainer.textFooter": "долния", + "DE.Controllers.EditContainer.textHeader": "Заглавие", + "DE.Controllers.EditContainer.textHyperlink": "Хипервръзка", + "DE.Controllers.EditContainer.textImage": "Изображение", + "DE.Controllers.EditContainer.textParagraph": "параграф", + "DE.Controllers.EditContainer.textSettings": "Настройки", + "DE.Controllers.EditContainer.textShape": "форма", + "DE.Controllers.EditContainer.textTable": "маса", + "DE.Controllers.EditContainer.textText": "Текст", + "DE.Controllers.EditImage.textEmptyImgUrl": "Трябва да посочите URL адреса на изображението.", + "DE.Controllers.EditImage.txtNotUrl": "Това поле трябва да бъде URL адрес във формата „http://www.example.com“", + "DE.Controllers.EditText.textAuto": "Автоматичен", + "DE.Controllers.EditText.textFonts": "Шрифт", + "DE.Controllers.EditText.textPt": "pt", + "DE.Controllers.Main.advDRMEnterPassword": "Въведете паролата си:", + "DE.Controllers.Main.advDRMOptions": "Защитен файл", + "DE.Controllers.Main.advDRMPassword": "Парола", + "DE.Controllers.Main.advTxtOptions": "Изберете опциите за TXT", + "DE.Controllers.Main.applyChangesTextText": "Данните се зареждат ...", + "DE.Controllers.Main.applyChangesTitleText": "Зареждане на данни", + "DE.Controllers.Main.closeButtonText": "Затвори файла", + "DE.Controllers.Main.convertationTimeoutText": "Превишава се времето на изтичане на реализация.", + "DE.Controllers.Main.criticalErrorExtText": "Натиснете 'OK', за да се върнете към списъка с документи.", + "DE.Controllers.Main.criticalErrorTitle": "Грешка", + "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Редактор на документи", + "DE.Controllers.Main.downloadErrorText": "Изтеглянето се провали.", + "DE.Controllers.Main.downloadMergeText": "Изтегля се ...", + "DE.Controllers.Main.downloadMergeTitle": "Изтеглянето", + "DE.Controllers.Main.downloadTextText": "Документът се изтегли ...", + "DE.Controllers.Main.downloadTitleText": "Изтегляне на документ", + "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
    Моля, свържете се с администратора на сървъра за документи.", + "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен", + "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Вече не можете да редактирате.", + "DE.Controllers.Main.errorConnectToServer": "Документът не можа да бъде запазен. Моля, проверете настройките за връзка или се свържете с администратора си.
    Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

    Намерете повече информация за свързването на сървъра за документи тук ", + "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка.
    Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка.", + "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да се дефинират.", + "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.", + "DE.Controllers.Main.errorDefaultMessage": "Код на грешка: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Възникна грешка по време на работата с документа.
    Използвайте опцията 'Download', за да запишете архивното копие на файла на твърдия диск на компютъра.", + "DE.Controllers.Main.errorFilePassProtect": "Файлът е защитен с парола и не може да бъде отворен.", + "DE.Controllers.Main.errorKeyEncrypt": "Дескриптор на неизвестен ключ", + "DE.Controllers.Main.errorKeyExpire": "Дескрипторът на ключовете е изтекъл", + "DE.Controllers.Main.errorMailMergeLoadFile": "Неуспешно зареждане", + "DE.Controllers.Main.errorMailMergeSaveFile": "Сливането не бе успешно.", + "DE.Controllers.Main.errorProcessSaveResult": "Запазването е неуспешно.", + "DE.Controllers.Main.errorServerVersion": "Версията на редактора е актуализирана. Страницата ще бъде презаредена, за да приложи промените.", + "DE.Controllers.Main.errorStockChart": "Неправилен ред на ред. За изграждане на борсова карта поставете данните на листа в следния ред:
    цена на отваряне, максимална цена, мин. Цена, цена на затваряне.", + "DE.Controllers.Main.errorUpdateVersion": "Версията на файла е променена. Страницата ще бъде презаредена.", + "DE.Controllers.Main.errorUserDrop": "Файлът не може да бъде достъпен в момента.", + "DE.Controllers.Main.errorUsersExceed": "Превишен е броят на потребителите", + "DE.Controllers.Main.errorViewerDisconnect": "Връзката е загубена. Все още можете да прегледате документа, но не можете да го изтеглите, докато връзката не бъде възстановена.", + "DE.Controllers.Main.leavePageText": "Имате незапазени промени в този документ. Кликнете върху „Остани на тази страница“, за да изчакате за автоматично запаметяване на документа. Кликнете върху „Оставете тази страница“, за да отхвърлите всички незапазени промени.", + "DE.Controllers.Main.loadFontsTextText": "Данните се зареждат ...", + "DE.Controllers.Main.loadFontsTitleText": "Зареждане на данни", + "DE.Controllers.Main.loadFontTextText": "Данните се зареждат ...", + "DE.Controllers.Main.loadFontTitleText": "Зареждане на данни", + "DE.Controllers.Main.loadImagesTextText": "Изображенията се зареждат ...", + "DE.Controllers.Main.loadImagesTitleText": "Зареждане на изображения", + "DE.Controllers.Main.loadImageTextText": "Изображението се зарежда ...", + "DE.Controllers.Main.loadImageTitleText": "Зареждане на изображението", + "DE.Controllers.Main.loadingDocumentTextText": "Документът се зарежда ...", + "DE.Controllers.Main.loadingDocumentTitleText": "Зареждане на документ", + "DE.Controllers.Main.mailMergeLoadFileText": "Зареждане на източници на данни ...", + "DE.Controllers.Main.mailMergeLoadFileTitle": "Зареждане на източници на данни", + "DE.Controllers.Main.notcriticalErrorTitle": "Внимание", + "DE.Controllers.Main.openErrorText": "Възникна грешка при отварянето на файла", + "DE.Controllers.Main.openTextText": "Отваряне на документа ...", + "DE.Controllers.Main.openTitleText": "Отваряне на документ", + "DE.Controllers.Main.printTextText": "Отпечатване на документ ...", + "DE.Controllers.Main.printTitleText": "Отпечатване на документ", + "DE.Controllers.Main.saveErrorText": "Въздушна грешка при запазване на файла", + "DE.Controllers.Main.savePreparingText": "Подготовка за запазване", + "DE.Controllers.Main.savePreparingTitle": "Подготовка за запазване. Моля Изчакай ... ", + "DE.Controllers.Main.saveTextText": "Документът се запазва ...", + "DE.Controllers.Main.saveTitleText": "Запазване на документа", + "DE.Controllers.Main.scriptLoadError": "Моля, презаредете страницата.", + "DE.Controllers.Main.sendMergeText": "Сливането се изпраща ...", + "DE.Controllers.Main.sendMergeTitle": "Изпращане на обединяване", + "DE.Controllers.Main.splitDividerErrorText": "Брой на редовете трябва да бъде делител на %1", + "DE.Controllers.Main.splitMaxColsErrorText": "Броят на колоните трябва да бъде по-малък от %1", + "DE.Controllers.Main.splitMaxRowsErrorText": "Брой на редовете трябва да бъде по-малък от %1", + "DE.Controllers.Main.textAnonymous": "Анонимен", + "DE.Controllers.Main.textBack": "обратно", + "DE.Controllers.Main.textBuyNow": "Посетете уебсайта", + "DE.Controllers.Main.textCancel": "Отказ", + "DE.Controllers.Main.textClose": "Близо", + "DE.Controllers.Main.textContactUs": "Свържете се с продажбите", + "DE.Controllers.Main.textDone": "Завършен", + "DE.Controllers.Main.textLoadingDocument": "Зареждане на документ", + "DE.Controllers.Main.textNoLicenseTitle": "Ограничение за връзка ONLYOFFICE", + "DE.Controllers.Main.textOK": "Добре", + "DE.Controllers.Main.textPassword": "Парола", + "DE.Controllers.Main.textPreloader": "Зареждане ...", + "DE.Controllers.Main.textTryUndoRedo": "Функциите Undo / Redo са забранени за режима Fast co-edit.", + "DE.Controllers.Main.textUsername": "Потребител", + "DE.Controllers.Main.titleLicenseExp": "Лицензът е изтекъл", + "DE.Controllers.Main.titleServerVersion": "Редакторът е актуализиран", + "DE.Controllers.Main.titleUpdateVersion": "Версията е променена", + "DE.Controllers.Main.txtArt": "Вашият текст тук", + "DE.Controllers.Main.txtDiagramTitle": "Заглавие на диалог", + "DE.Controllers.Main.txtEditingMode": "Задаване на режим на редактиране ...", + "DE.Controllers.Main.txtFooter": "долния", + "DE.Controllers.Main.txtHeader": "Заглавие", + "DE.Controllers.Main.txtProtected": "След като въведете паролата и отворите файла, текущата парола за файла ще бъде нулирана", + "DE.Controllers.Main.txtSeries": "серия", + "DE.Controllers.Main.txtStyle_footnote_text": "Текст на бележка", + "DE.Controllers.Main.txtStyle_Heading_1": "Заглавие 1", + "DE.Controllers.Main.txtStyle_Heading_2": "Функция 2", + "DE.Controllers.Main.txtStyle_Heading_3": "Функция 3", + "DE.Controllers.Main.txtStyle_Heading_4": "Функция 4", + "DE.Controllers.Main.txtStyle_Heading_5": "Функция 5", + "DE.Controllers.Main.txtStyle_Heading_6": "Функция 6", + "DE.Controllers.Main.txtStyle_Heading_7": "Функция 7", + "DE.Controllers.Main.txtStyle_Heading_8": "Функция 8", + "DE.Controllers.Main.txtStyle_Heading_9": "Функция 9", + "DE.Controllers.Main.txtStyle_Intense_Quote": "Интензивен цитат", + "DE.Controllers.Main.txtStyle_List_Paragraph": "Параграф Списък", + "DE.Controllers.Main.txtStyle_No_Spacing": "Без интервал", + "DE.Controllers.Main.txtStyle_Normal": "Нормален", + "DE.Controllers.Main.txtStyle_Quote": "цитат", + "DE.Controllers.Main.txtStyle_Subtitle": "подзаглавие", + "DE.Controllers.Main.txtStyle_Title": "Заглавие", + "DE.Controllers.Main.txtXAxis": "X ос", + "DE.Controllers.Main.txtYAxis": "Y ос", + "DE.Controllers.Main.unknownErrorText": "Неизвестна грешка.", + "DE.Controllers.Main.unsupportedBrowserErrorText": "Вашият браузър не се поддържа.", + "DE.Controllers.Main.uploadImageExtMessage": "Неизвестен формат на изображението.", + "DE.Controllers.Main.uploadImageFileCountMessage": "Няма качени изображения.", + "DE.Controllers.Main.uploadImageSizeMessage": "Превишено е ограничението за максимален размер на изображението.", + "DE.Controllers.Main.uploadImageTextText": "Качва се изображението ...", + "DE.Controllers.Main.uploadImageTitleText": "Качване на изображение", + "DE.Controllers.Main.warnLicenseExceeded": "Броят на едновременните връзки към сървъра за документи е превишен и документът ще бъде отворен само за преглед.
    За повече информация се обърнете към администратора.", + "DE.Controllers.Main.warnLicenseExp": "Вашият лиценз е изтекъл.
    Моля, актуализирайте лиценза си и опреснете страницата.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Броят на едновременните потребители е надхвърлен и документът ще бъде отворен само за преглед.
    За повече информация се свържете с администратора си.", + "DE.Controllers.Main.warnNoLicense": "Тази версия на редакторите на ONLYOFFICE има някои ограничения за едновременни връзки към сървъра за документи.", + "DE.Controllers.Main.warnNoLicenseUsers": "Тази версия на редакторите на ONLYOFFICE има определени ограничения за едновременни потребители.", + "DE.Controllers.Main.warnProcessRightsChange": "На вас е отказано правото да редактирате файла.", + "DE.Controllers.Search.textNoTextFound": "Текстът не е намерен", + "DE.Controllers.Search.textReplaceAll": "Замяна на всички", + "DE.Controllers.Settings.notcriticalErrorTitle": "Внимание", + "DE.Controllers.Settings.txtLoading": "Зареждане ...", + "DE.Controllers.Settings.unknownText": "неизвестен", + "DE.Controllers.Settings.warnDownloadAs": "Ако продължите да записвате в този формат, всички функции, с изключение на текста, ще бъдат загубени.
    Сигурни ли сте, че искате да продължите?", + "DE.Controllers.Toolbar.dlgLeaveMsgText": "Имате незапазени промени в този документ. Кликнете върху „Остани на тази страница“, за да изчакате за автоматично запаметяване на документа. Кликнете върху „Оставете тази страница“, за да отхвърлите всички незапазени промени.", + "DE.Controllers.Toolbar.dlgLeaveTitleText": "Оставяте заявлението", + "DE.Controllers.Toolbar.leaveButtonText": "Излезете от тази страница", + "DE.Controllers.Toolbar.stayButtonText": "Остани на тази страница", + "DE.Views.AddImage.textAddress": "адрес", + "DE.Views.AddImage.textBack": "обратно", + "DE.Views.AddImage.textFromLibrary": "Картина от библиотеката", + "DE.Views.AddImage.textFromURL": "Картина от URL адрес", + "DE.Views.AddImage.textImageURL": "URL адрес на изображение", + "DE.Views.AddImage.textInsertImage": "Вмъкване на изображение", + "DE.Views.AddImage.textLinkSettings": "Настройки на връзката", + "DE.Views.AddOther.textAddLink": "Добавяне на връзка", + "DE.Views.AddOther.textBack": "обратно", + "DE.Views.AddOther.textCenterBottom": "Централно доло", + "DE.Views.AddOther.textCenterTop": "Център горе", + "DE.Views.AddOther.textColumnBreak": "Прекъсване на колони", + "DE.Views.AddOther.textContPage": "Непрекъсната страница", + "DE.Views.AddOther.textCurrentPos": "Текущата позиция", + "DE.Views.AddOther.textDisplay": "показ", + "DE.Views.AddOther.textEvenPage": "Дори страница", + "DE.Views.AddOther.textInsert": "Вмъкни", + "DE.Views.AddOther.textLeftBottom": "Ляво долу", + "DE.Views.AddOther.textLeftTop": "Ляво отгоре", + "DE.Views.AddOther.textLink": "връзка", + "DE.Views.AddOther.textNextPage": "Следваща страница", + "DE.Views.AddOther.textOddPage": "Нечетна страница", + "DE.Views.AddOther.textPageBreak": "Разделител на страница", + "DE.Views.AddOther.textPageNumber": "Номер на страницата", + "DE.Views.AddOther.textPosition": "позиция", + "DE.Views.AddOther.textRightBottom": "Отдясно долу", + "DE.Views.AddOther.textRightTop": "Вдясно отгоре", + "DE.Views.AddOther.textSectionBreak": "Разделителна секция", + "DE.Views.AddOther.textTip": "Съвет на екрана", + "DE.Views.EditChart.textAlign": "Изравнете", + "DE.Views.EditChart.textBack": "обратно", + "DE.Views.EditChart.textBackward": "Преместване назад", + "DE.Views.EditChart.textBehind": "зад", + "DE.Views.EditChart.textBorder": "граница", + "DE.Views.EditChart.textColor": "цвят", + "DE.Views.EditChart.textDistanceText": "Разстояние от текста", + "DE.Views.EditChart.textFill": "Напълнете", + "DE.Views.EditChart.textForward": "Продължавай напред", + "DE.Views.EditChart.textInFront": "Отпред", + "DE.Views.EditChart.textInline": "В текста", + "DE.Views.EditChart.textMoveText": "Преместване с текст", + "DE.Views.EditChart.textOverlap": "Разрешаване на припокриване", + "DE.Views.EditChart.textRemoveChart": "Премахване на диаграмата", + "DE.Views.EditChart.textReorder": "Пренареждане", + "DE.Views.EditChart.textSize": "Размер", + "DE.Views.EditChart.textSquare": "Квадрат", + "DE.Views.EditChart.textStyle": "стил", + "DE.Views.EditChart.textThrough": "През", + "DE.Views.EditChart.textTight": "стегнат", + "DE.Views.EditChart.textToBackground": "Изпращане до фона", + "DE.Views.EditChart.textToForeground": "Доведете до преден план", + "DE.Views.EditChart.textTopBottom": "Отгоре и отдолу", + "DE.Views.EditChart.textType": "Тип", + "DE.Views.EditChart.textWrap": "обвивка", + "DE.Views.EditHeader.textDiffFirst": "Различна първа страница", + "DE.Views.EditHeader.textDiffOdd": "Различни страници", + "DE.Views.EditHeader.textFrom": "Започни от", + "DE.Views.EditHeader.textPageNumbering": "Номериране на страници", + "DE.Views.EditHeader.textPrev": "Продължете от предишния раздел", + "DE.Views.EditHeader.textSameAs": "Връзка към предишна", + "DE.Views.EditHyperlink.textDisplay": "показ", + "DE.Views.EditHyperlink.textEdit": "Редактиране на връзката", + "DE.Views.EditHyperlink.textLink": "връзка", + "DE.Views.EditHyperlink.textRemove": "Премахване на връзката", + "DE.Views.EditHyperlink.textTip": "Съвет на екрана", + "DE.Views.EditImage.textAddress": "адрес", + "DE.Views.EditImage.textAlign": "Изравнете", + "DE.Views.EditImage.textBack": "обратно", + "DE.Views.EditImage.textBackward": "Преместване назад", + "DE.Views.EditImage.textBehind": "зад", + "DE.Views.EditImage.textDefault": "Размер по подразбиране", + "DE.Views.EditImage.textDistanceText": "Разстояние от текста", + "DE.Views.EditImage.textForward": "Продължавай напред", + "DE.Views.EditImage.textFromLibrary": "Картина от библиотеката", + "DE.Views.EditImage.textFromURL": "Картина от URL адрес", + "DE.Views.EditImage.textImageURL": "URL адрес на изображението", + "DE.Views.EditImage.textInFront": "Отпред", + "DE.Views.EditImage.textInline": "В текста", + "DE.Views.EditImage.textLinkSettings": "Настройки на връзката", + "DE.Views.EditImage.textMoveText": "Преместване с текст", + "DE.Views.EditImage.textOverlap": "Разрешаване на припокриване", + "DE.Views.EditImage.textRemove": "Премахване на изображението", + "DE.Views.EditImage.textReorder": "Пренареждане", + "DE.Views.EditImage.textReplace": "Заменете", + "DE.Views.EditImage.textReplaceImg": "Замяна на изображението", + "DE.Views.EditImage.textSquare": "Квадрат", + "DE.Views.EditImage.textThrough": "През", + "DE.Views.EditImage.textTight": "стегнат", + "DE.Views.EditImage.textToBackground": "Изпращане до фона", + "DE.Views.EditImage.textToForeground": "Доведете до преден план", + "DE.Views.EditImage.textTopBottom": "Отгоре и отдолу", + "DE.Views.EditImage.textWrap": "обвивка", + "DE.Views.EditParagraph.textAdvanced": "напреднал", + "DE.Views.EditParagraph.textAdvSettings": "Разширени настройки", + "DE.Views.EditParagraph.textAfter": "След", + "DE.Views.EditParagraph.textAuto": "Автоматичен", + "DE.Views.EditParagraph.textBack": "обратно", + "DE.Views.EditParagraph.textBackground": "Заден план", + "DE.Views.EditParagraph.textBefore": "Преди", + "DE.Views.EditParagraph.textFromText": "Разстояние от текста", + "DE.Views.EditParagraph.textKeepLines": "Поддържайте линиите заедно", + "DE.Views.EditParagraph.textKeepNext": "Продължете със следващия", + "DE.Views.EditParagraph.textOrphan": "Контрол на сираци", + "DE.Views.EditParagraph.textPageBreak": "Страницата е прекъсната преди", + "DE.Views.EditParagraph.textPrgStyles": "Стилове на абзаци", + "DE.Views.EditParagraph.textSpaceBetween": "Пространство между параграфи", + "DE.Views.EditShape.textAlign": "Изравнете", + "DE.Views.EditShape.textBack": "обратно", + "DE.Views.EditShape.textBackward": "Преместване назад", + "DE.Views.EditShape.textBehind": "зад", + "DE.Views.EditShape.textBorder": "граница", + "DE.Views.EditShape.textColor": "цвят", + "DE.Views.EditShape.textEffects": "вещи", + "DE.Views.EditShape.textFill": "Напълнете", + "DE.Views.EditShape.textForward": "Продължавай напред", + "DE.Views.EditShape.textFromText": "Разстояние от текста", + "DE.Views.EditShape.textInFront": "Отпред", + "DE.Views.EditShape.textInline": "В текста", + "DE.Views.EditShape.textOpacity": "непрозрачност", + "DE.Views.EditShape.textOverlap": "Разрешаване на припокриване", + "DE.Views.EditShape.textRemoveShape": "Премахване на формата", + "DE.Views.EditShape.textReorder": "Пренареждане", + "DE.Views.EditShape.textReplace": "Заменете", + "DE.Views.EditShape.textSize": "Размер", + "DE.Views.EditShape.textSquare": "Квадрат", + "DE.Views.EditShape.textStyle": "стил", + "DE.Views.EditShape.textThrough": "През", + "DE.Views.EditShape.textTight": "стегнат", + "DE.Views.EditShape.textToBackground": "Изпращане до фона", + "DE.Views.EditShape.textToForeground": "Доведете до преден план", + "DE.Views.EditShape.textTopAndBottom": "Отгоре и отдолу", + "DE.Views.EditShape.textWithText": "Преместване с текст", + "DE.Views.EditShape.textWrap": "обвивка", + "DE.Views.EditTable.textAlign": "Изравнете", + "DE.Views.EditTable.textBack": "обратно", + "DE.Views.EditTable.textBandedColumn": "Колонна лента", + "DE.Views.EditTable.textBandedRow": "Обвързан ред", + "DE.Views.EditTable.textBorder": "граница", + "DE.Views.EditTable.textCellMargins": "Маржове на клетките", + "DE.Views.EditTable.textColor": "цвят", + "DE.Views.EditTable.textFill": "Напълнете", + "DE.Views.EditTable.textFirstColumn": "Първа колона", + "DE.Views.EditTable.textFlow": "Поток", + "DE.Views.EditTable.textFromText": "Разстояние от текста", + "DE.Views.EditTable.textHeaderRow": "Ред", + "DE.Views.EditTable.textInline": "В редица", + "DE.Views.EditTable.textLastColumn": "Последна колона", + "DE.Views.EditTable.textOptions": "Настроики", + "DE.Views.EditTable.textRemoveTable": "Премахване на таблицата", + "DE.Views.EditTable.textRepeatHeader": "Повторете като ред ред", + "DE.Views.EditTable.textResizeFit": "Преоразмерете, за да поберете съдържанието", + "DE.Views.EditTable.textSize": "Размер", + "DE.Views.EditTable.textStyle": "стил", + "DE.Views.EditTable.textStyleOptions": "Опции за стил", + "DE.Views.EditTable.textTableOptions": "Опции на таблицата", + "DE.Views.EditTable.textTotalRow": "Общо ред", + "DE.Views.EditTable.textWithText": "Преместване с текст", + "DE.Views.EditTable.textWrap": "обвивка", + "DE.Views.EditText.textAdditional": "Допълнителен", + "DE.Views.EditText.textAdditionalFormat": "Допълнително форматиране", + "DE.Views.EditText.textAllCaps": "Всички шапки", + "DE.Views.EditText.textAutomatic": "автоматичен", + "DE.Views.EditText.textBack": "обратно", + "DE.Views.EditText.textBullets": "Маркиран списък", + "DE.Views.EditText.textDblStrikethrough": "Двойно зачертаване", + "DE.Views.EditText.textDblSuperscript": "Горен индекс", + "DE.Views.EditText.textFontColor": "Цвят на шрифта", + "DE.Views.EditText.textFontColors": "Цветове на шрифта", + "DE.Views.EditText.textFonts": "Шрифт", + "DE.Views.EditText.textHighlightColor": "Маркирайте Цвят", + "DE.Views.EditText.textHighlightColors": "Маркирайте Цветове", + "DE.Views.EditText.textLetterSpacing": "Разстояние между буквите", + "DE.Views.EditText.textLineSpacing": "Интервал между редовете", + "DE.Views.EditText.textNone": "Нито един", + "DE.Views.EditText.textNumbers": "численост", + "DE.Views.EditText.textSize": "Размер", + "DE.Views.EditText.textSmallCaps": "Малки букви", + "DE.Views.EditText.textStrikethrough": "зачеркване", + "DE.Views.EditText.textSubscript": "Долен", + "DE.Views.Search.textCase": "Различаващ главни от малки букви", + "DE.Views.Search.textDone": "Завършен", + "DE.Views.Search.textFind": "намирам", + "DE.Views.Search.textFindAndReplace": "Намерете и заменете", + "DE.Views.Search.textHighlight": "Маркирайте резултатите", + "DE.Views.Search.textReplace": "Заменете", + "DE.Views.Search.textSearch": "Търсене", + "DE.Views.Settings.textAbout": "Относно", + "DE.Views.Settings.textAddress": "адрес", + "DE.Views.Settings.textAuthor": "Автор", + "DE.Views.Settings.textBack": "обратно", + "DE.Views.Settings.textBottom": "отдоло", + "DE.Views.Settings.textCreateDate": "Дата на създаване ", + "DE.Views.Settings.textCustom": "Персонализиран", + "DE.Views.Settings.textCustomSize": "Потребителски размер", + "DE.Views.Settings.textDocInfo": "Информация за документа", + "DE.Views.Settings.textDocTitle": "Заглавие на документ", + "DE.Views.Settings.textDocumentFormats": "Формати на документа", + "DE.Views.Settings.textDocumentSettings": "Настройки на документа", + "DE.Views.Settings.textDone": "Завършен", + "DE.Views.Settings.textDownload": "Изтегли", + "DE.Views.Settings.textDownloadAs": "Изтеглете като ...", + "DE.Views.Settings.textEditDoc": "Редактиране на документ", + "DE.Views.Settings.textEmail": "електронна поща", + "DE.Views.Settings.textFind": "намирам", + "DE.Views.Settings.textFindAndReplace": "Намерете и заменете", + "DE.Views.Settings.textFormat": "формат", + "DE.Views.Settings.textHelp": "Помощ", + "DE.Views.Settings.textLandscape": "пейзаж", + "DE.Views.Settings.textLeft": "Наляво", + "DE.Views.Settings.textLoading": "Зареждане ...", + "DE.Views.Settings.textMargins": "Полета", + "DE.Views.Settings.textOrientation": "ориентация", + "DE.Views.Settings.textPages": "Страници", + "DE.Views.Settings.textParagraphs": "Параграфи", + "DE.Views.Settings.textPortrait": "Портрет", + "DE.Views.Settings.textPoweredBy": "Задвижвани от", + "DE.Views.Settings.textPrint": "печат", + "DE.Views.Settings.textReader": "Режим на четене", + "DE.Views.Settings.textReview": "Проследяване на промените", + "DE.Views.Settings.textRight": "прав", + "DE.Views.Settings.textSettings": "Настройки", + "DE.Views.Settings.textSpaces": "Spaces", + "DE.Views.Settings.textSpellcheck": "Проверка на правописа", + "DE.Views.Settings.textStatistic": "Статистика", + "DE.Views.Settings.textSymbols": "Символи", + "DE.Views.Settings.textTel": "тел", + "DE.Views.Settings.textTop": "Отгоре", + "DE.Views.Settings.textVersion": "версия", + "DE.Views.Settings.textWords": "Думи", + "DE.Views.Settings.unknownText": "неизвестен", + "DE.Views.Toolbar.textBack": "обратно" +} \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index f634fd356..3d7345af1 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Spalten", "DE.Controllers.AddTable.textRows": "Zeilen", "DE.Controllers.AddTable.textTableSize": "Tabellengröße", + "DE.Controllers.DocumentHolder.menuAccept": "Annehmen", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Alles annehmen", "DE.Controllers.DocumentHolder.menuAddLink": "Link hinzufügen", "DE.Controllers.DocumentHolder.menuCopy": "Kopieren", "DE.Controllers.DocumentHolder.menuCut": "Ausschneiden", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Mehr", "DE.Controllers.DocumentHolder.menuOpenLink": "Link öffnen", "DE.Controllers.DocumentHolder.menuPaste": "Einfügen", + "DE.Controllers.DocumentHolder.menuReject": "Ablehnen", + "DE.Controllers.DocumentHolder.menuRejectAll": "Alles ablehnen", + "DE.Controllers.DocumentHolder.menuReview": "Review", "DE.Controllers.DocumentHolder.sheetCancel": "Abbrechen", "DE.Controllers.DocumentHolder.textGuest": "Gast", "DE.Controllers.EditContainer.textChart": "Diagramm", + "DE.Controllers.EditContainer.textFooter": "Fußzeile", + "DE.Controllers.EditContainer.textHeader": "Kopfzeile", "DE.Controllers.EditContainer.textHyperlink": "Hyperlink", "DE.Controllers.EditContainer.textImage": "Bild", "DE.Controllers.EditContainer.textParagraph": "Absatz", @@ -61,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", "DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten.
    Verwenden Sie die Option \"Herunterladen\", um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.", "DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", "DE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor", "DE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen", @@ -223,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Oben und unten", "DE.Views.EditChart.textType": "Typ", "DE.Views.EditChart.textWrap": "Umbrechen", + "DE.Views.EditHeader.textDiffFirst": "Erste Seite anders", + "DE.Views.EditHeader.textDiffOdd": "Untersch. gerade/ungerade Seiten", + "DE.Views.EditHeader.textFrom": "Starten mit", + "DE.Views.EditHeader.textPageNumbering": "Seitennummerierung", + "DE.Views.EditHeader.textPrev": "Vom vorherigen Abschnitt fortsetzen", + "DE.Views.EditHeader.textSameAs": "Mit vorheriger verknüpfen", "DE.Views.EditHyperlink.textDisplay": "Anzeigen", "DE.Views.EditHyperlink.textEdit": "Link bearbeiten", "DE.Views.EditHyperlink.textLink": "Link", @@ -353,6 +367,7 @@ "DE.Views.Settings.textAddress": "Adresse", "DE.Views.Settings.textAuthor": "Autor", "DE.Views.Settings.textBack": "Zurück", + "DE.Views.Settings.textBottom": "Unten", "DE.Views.Settings.textCreateDate": "Erstellungsdatum", "DE.Views.Settings.textCustom": "Benutzerdefiniert", "DE.Views.Settings.textCustomSize": "Benutzerdefinierte Größe", @@ -370,18 +385,25 @@ "DE.Views.Settings.textFormat": "Format", "DE.Views.Settings.textHelp": "Hilfe", "DE.Views.Settings.textLandscape": "Querformat", + "DE.Views.Settings.textLeft": "Links", "DE.Views.Settings.textLoading": "Ladevorgang...", + "DE.Views.Settings.textMargins": "Ränder", "DE.Views.Settings.textOrientation": "Orientierung", "DE.Views.Settings.textPages": "Seiten", "DE.Views.Settings.textParagraphs": "Absätze", "DE.Views.Settings.textPortrait": "Hochformat", "DE.Views.Settings.textPoweredBy": "Betrieben von", + "DE.Views.Settings.textPrint": "Drucken", "DE.Views.Settings.textReader": "Lesemodus", + "DE.Views.Settings.textReview": "Nachverfolgen von Änderungen", + "DE.Views.Settings.textRight": "Rechts", "DE.Views.Settings.textSettings": "Einstellungen", "DE.Views.Settings.textSpaces": "Abstände", + "DE.Views.Settings.textSpellcheck": "Rechtschreibprüfung", "DE.Views.Settings.textStatistic": "Statistik", "DE.Views.Settings.textSymbols": "Symbole", "DE.Views.Settings.textTel": "Tel.", + "DE.Views.Settings.textTop": "Oben", "DE.Views.Settings.textVersion": "Version", "DE.Views.Settings.textWords": "Wörter", "DE.Views.Settings.unknownText": "Unbekannt", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 3a437dfa8..e42c3cef7 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textRows": "Rows", "DE.Controllers.AddTable.textTableSize": "Table Size", + "DE.Controllers.DocumentHolder.menuAccept": "Accept", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Accept All", "DE.Controllers.DocumentHolder.menuAddLink": "Add Link", "DE.Controllers.DocumentHolder.menuCopy": "Copy", "DE.Controllers.DocumentHolder.menuCut": "Cut", @@ -22,14 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "More", "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "DE.Controllers.DocumentHolder.menuPaste": "Paste", - "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", - "DE.Controllers.DocumentHolder.textGuest": "Guest", - "DE.Controllers.DocumentHolder.menuReview": "Review", - "DE.Controllers.DocumentHolder.menuAccept": "Accept", - "DE.Controllers.DocumentHolder.menuAcceptAll": "Accept All", "DE.Controllers.DocumentHolder.menuReject": "Reject", "DE.Controllers.DocumentHolder.menuRejectAll": "Reject All", + "DE.Controllers.DocumentHolder.menuReview": "Review", + "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", + "DE.Controllers.DocumentHolder.textGuest": "Guest", "DE.Controllers.EditContainer.textChart": "Chart", + "DE.Controllers.EditContainer.textFooter": "Footer", + "DE.Controllers.EditContainer.textHeader": "Header", "DE.Controllers.EditContainer.textHyperlink": "Hyperlink", "DE.Controllers.EditContainer.textImage": "Image", "DE.Controllers.EditContainer.textParagraph": "Paragraph", @@ -66,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Error code: %1", + "DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.
    Use the 'Download' option to save the file backup copy to your computer hard drive.", "DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", "DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "DE.Controllers.Main.errorKeyExpire": "Key descriptor expired", @@ -228,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Top and Bottom", "DE.Views.EditChart.textType": "Type", "DE.Views.EditChart.textWrap": "Wrap", + "DE.Views.EditHeader.textDiffFirst": "Different first page", + "DE.Views.EditHeader.textDiffOdd": "Different odd and even pages", + "DE.Views.EditHeader.textFrom": "Start at", + "DE.Views.EditHeader.textPageNumbering": "Page Numbering", + "DE.Views.EditHeader.textPrev": "Continue from previous section", + "DE.Views.EditHeader.textSameAs": "Link to Previous", "DE.Views.EditHyperlink.textDisplay": "Display", "DE.Views.EditHyperlink.textEdit": "Edit Link", "DE.Views.EditHyperlink.textLink": "Link", @@ -358,6 +367,7 @@ "DE.Views.Settings.textAddress": "address", "DE.Views.Settings.textAuthor": "Author", "DE.Views.Settings.textBack": "Back", + "DE.Views.Settings.textBottom": "Bottom", "DE.Views.Settings.textCreateDate": "Creation date", "DE.Views.Settings.textCustom": "Custom", "DE.Views.Settings.textCustomSize": "Custom Size", @@ -375,23 +385,27 @@ "DE.Views.Settings.textFormat": "Format", "DE.Views.Settings.textHelp": "Help", "DE.Views.Settings.textLandscape": "Landscape", + "DE.Views.Settings.textLeft": "Left", "DE.Views.Settings.textLoading": "Loading...", + "DE.Views.Settings.textMargins": "Margins", "DE.Views.Settings.textOrientation": "Orientation", "DE.Views.Settings.textPages": "Pages", "DE.Views.Settings.textParagraphs": "Paragraphs", "DE.Views.Settings.textPortrait": "Portrait", "DE.Views.Settings.textPoweredBy": "Powered by", + "DE.Views.Settings.textPrint": "Print", "DE.Views.Settings.textReader": "Reader Mode", + "DE.Views.Settings.textReview": "Track Changes", + "DE.Views.Settings.textRight": "Right", "DE.Views.Settings.textSettings": "Settings", "DE.Views.Settings.textSpaces": "Spaces", + "DE.Views.Settings.textSpellcheck": "Spell Checking", "DE.Views.Settings.textStatistic": "Statistic", "DE.Views.Settings.textSymbols": "Symbols", "DE.Views.Settings.textTel": "tel", + "DE.Views.Settings.textTop": "Top", "DE.Views.Settings.textVersion": "Version", "DE.Views.Settings.textWords": "Words", "DE.Views.Settings.unknownText": "Unknown", - "DE.Views.Settings.textSpellcheck": "Spell Checking", - "DE.Views.Settings.textPrint": "Print", - "DE.Views.Settings.textReview": "Track Changes", "DE.Views.Toolbar.textBack": "Back" } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json index f7180f7b7..1831c3e17 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Columnas", "DE.Controllers.AddTable.textRows": "Filas", "DE.Controllers.AddTable.textTableSize": "Tamaño de tabla", + "DE.Controllers.DocumentHolder.menuAccept": "Aceptar", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Aceptar todo", "DE.Controllers.DocumentHolder.menuAddLink": "Añadir enlace ", "DE.Controllers.DocumentHolder.menuCopy": "Copiar ", "DE.Controllers.DocumentHolder.menuCut": "Cortar", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Más", "DE.Controllers.DocumentHolder.menuOpenLink": "Abrir enlace", "DE.Controllers.DocumentHolder.menuPaste": "Pegar", + "DE.Controllers.DocumentHolder.menuReject": "Rechazar", + "DE.Controllers.DocumentHolder.menuRejectAll": "Rechazar todo", + "DE.Controllers.DocumentHolder.menuReview": "Revista", "DE.Controllers.DocumentHolder.sheetCancel": "Cancelar", "DE.Controllers.DocumentHolder.textGuest": "Visitante", "DE.Controllers.EditContainer.textChart": "Gráfico", + "DE.Controllers.EditContainer.textFooter": "Pie de página", + "DE.Controllers.EditContainer.textHeader": "Encabezado", "DE.Controllers.EditContainer.textHyperlink": "Hiperenlace", "DE.Controllers.EditContainer.textImage": "Imagen", "DE.Controllers.EditContainer.textParagraph": "Párrafo", @@ -61,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", "DE.Controllers.Main.errorDefaultMessage": "Código de error: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.
    Use la opción 'Descargar' para guardar la copia de seguridad de archivo en el disco duro de su computadora.", "DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.", "DE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido", "DE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado", @@ -223,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Superior e inferior", "DE.Views.EditChart.textType": "Tipo", "DE.Views.EditChart.textWrap": "Envoltura", + "DE.Views.EditHeader.textDiffFirst": "Primera página diferente", + "DE.Views.EditHeader.textDiffOdd": "Páginas impares y pares diferentes", + "DE.Views.EditHeader.textFrom": "Empezar con", + "DE.Views.EditHeader.textPageNumbering": "Numeración de páginas", + "DE.Views.EditHeader.textPrev": "Continuar desde la sección anterior", + "DE.Views.EditHeader.textSameAs": "Vincular al anterior", "DE.Views.EditHyperlink.textDisplay": "Mostrar", "DE.Views.EditHyperlink.textEdit": "Editar enlace", "DE.Views.EditHyperlink.textLink": "Enlace", @@ -353,6 +367,7 @@ "DE.Views.Settings.textAddress": "dirección", "DE.Views.Settings.textAuthor": "Autor", "DE.Views.Settings.textBack": "Atrás", + "DE.Views.Settings.textBottom": "Abajo ", "DE.Views.Settings.textCreateDate": "Fecha de creación", "DE.Views.Settings.textCustom": "Personalizado", "DE.Views.Settings.textCustomSize": "Tamaño personalizado", @@ -370,18 +385,25 @@ "DE.Views.Settings.textFormat": "Formato", "DE.Views.Settings.textHelp": "Ayuda", "DE.Views.Settings.textLandscape": "Horizontal", + "DE.Views.Settings.textLeft": "A la izquierda", "DE.Views.Settings.textLoading": "Cargando...", + "DE.Views.Settings.textMargins": "Márgenes", "DE.Views.Settings.textOrientation": "Orientación ", "DE.Views.Settings.textPages": "Páginas", "DE.Views.Settings.textParagraphs": "Párrafos", "DE.Views.Settings.textPortrait": "Vertical", "DE.Views.Settings.textPoweredBy": "Desarrollado por", + "DE.Views.Settings.textPrint": "Imprimir", "DE.Views.Settings.textReader": "Modo de lectura", + "DE.Views.Settings.textReview": "Seguimiento de cambios", + "DE.Views.Settings.textRight": "A la derecha", "DE.Views.Settings.textSettings": "Ajustes", "DE.Views.Settings.textSpaces": "Espacios", + "DE.Views.Settings.textSpellcheck": "Сorrección ortográfica", "DE.Views.Settings.textStatistic": "Estadística", "DE.Views.Settings.textSymbols": "Símbolos", "DE.Views.Settings.textTel": "Tel.", + "DE.Views.Settings.textTop": "Superior", "DE.Views.Settings.textVersion": "Versión ", "DE.Views.Settings.textWords": "Palabras", "DE.Views.Settings.unknownText": "Desconocido", diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json index bafbc74b2..b3dd0d811 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Colonnes", "DE.Controllers.AddTable.textRows": "Lignes", "DE.Controllers.AddTable.textTableSize": "Taille du tableau", + "DE.Controllers.DocumentHolder.menuAccept": "Accepter", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Accepter tout", "DE.Controllers.DocumentHolder.menuAddLink": "Ajouter le lien", "DE.Controllers.DocumentHolder.menuCopy": "Copier", "DE.Controllers.DocumentHolder.menuCut": "Couper", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Plus", "DE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien", "DE.Controllers.DocumentHolder.menuPaste": "Coller", + "DE.Controllers.DocumentHolder.menuReject": "Rejeter", + "DE.Controllers.DocumentHolder.menuRejectAll": "Rejeter tout", + "DE.Controllers.DocumentHolder.menuReview": "Révision", "DE.Controllers.DocumentHolder.sheetCancel": "Annuler", "DE.Controllers.DocumentHolder.textGuest": "Invité", "DE.Controllers.EditContainer.textChart": "Graphique", + "DE.Controllers.EditContainer.textFooter": "Pied de page", + "DE.Controllers.EditContainer.textHeader": "En-tête", "DE.Controllers.EditContainer.textHyperlink": "Lien hypertexte", "DE.Controllers.EditContainer.textImage": "Image", "DE.Controllers.EditContainer.textParagraph": "Paragraphe", @@ -53,6 +60,7 @@ "DE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours", "DE.Controllers.Main.downloadTextText": "Téléchargement du document...", "DE.Controllers.Main.downloadTitleText": "Téléchargement du document", + "DE.Controllers.Main.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.
    Veuillez contacter l'administrateur de Document Server.", "DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte", "DE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.", "DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.
    Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.

    Trouvez plus d'informations sur la connexion au Serveur de Documents ici", @@ -60,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.", "DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.", "DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail sur le document.
    Utilisez l'option \"Télécharger\" pour enregistrer la copie de sauvegarde sur le disque dur de votre ordinateur.", "DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.", "DE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu", "DE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré", @@ -222,6 +231,11 @@ "DE.Views.EditChart.textTopBottom": "Haut et bas", "DE.Views.EditChart.textType": "Type", "DE.Views.EditChart.textWrap": "Enveloppant", + "DE.Views.EditHeader.textDiffFirst": "Première page différente", + "DE.Views.EditHeader.textDiffOdd": "Pages paires et impaires différentes", + "DE.Views.EditHeader.textPageNumbering": "Numérotation des pages", + "DE.Views.EditHeader.textPrev": "Continuer à partir de la section précédente", + "DE.Views.EditHeader.textSameAs": "Lier au précédent", "DE.Views.EditHyperlink.textDisplay": "Afficher", "DE.Views.EditHyperlink.textEdit": "Modifier le lien", "DE.Views.EditHyperlink.textLink": "Lien", @@ -352,6 +366,7 @@ "DE.Views.Settings.textAddress": "adresse", "DE.Views.Settings.textAuthor": "Auteur", "DE.Views.Settings.textBack": "Retour", + "DE.Views.Settings.textBottom": "En bas", "DE.Views.Settings.textCreateDate": "Date de création", "DE.Views.Settings.textCustom": "Personnalisé", "DE.Views.Settings.textCustomSize": "Taille personnalisée", @@ -369,18 +384,25 @@ "DE.Views.Settings.textFormat": "Format", "DE.Views.Settings.textHelp": "Aide", "DE.Views.Settings.textLandscape": "Paysage", + "DE.Views.Settings.textLeft": "A gauche", "DE.Views.Settings.textLoading": "Chargement en cours...", + "DE.Views.Settings.textMargins": "Marges", "DE.Views.Settings.textOrientation": "Orientation", "DE.Views.Settings.textPages": "Pages", "DE.Views.Settings.textParagraphs": "Paragraphes", "DE.Views.Settings.textPortrait": "Portrait", "DE.Views.Settings.textPoweredBy": "Propulsé par ", + "DE.Views.Settings.textPrint": "Imprimer", "DE.Views.Settings.textReader": "Mode de lecture", + "DE.Views.Settings.textReview": "Suivre des modifications", + "DE.Views.Settings.textRight": "A droite", "DE.Views.Settings.textSettings": "Paramètres", "DE.Views.Settings.textSpaces": "Espaces", + "DE.Views.Settings.textSpellcheck": "Vérification de l'orthographe", "DE.Views.Settings.textStatistic": "Statistique", "DE.Views.Settings.textSymbols": "Symboles", "DE.Views.Settings.textTel": "Tél.", + "DE.Views.Settings.textTop": "En haut", "DE.Views.Settings.textVersion": "Version", "DE.Views.Settings.textWords": "Mots", "DE.Views.Settings.unknownText": "Inconnu", diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json index ecb06e53c..431f07e04 100644 --- a/apps/documenteditor/mobile/locale/hu.json +++ b/apps/documenteditor/mobile/locale/hu.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Oszlopok", "DE.Controllers.AddTable.textRows": "Sorok", "DE.Controllers.AddTable.textTableSize": "Táblázat méret", + "DE.Controllers.DocumentHolder.menuAccept": "Elfogad", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Mindent elfogad", "DE.Controllers.DocumentHolder.menuAddLink": "Link hozzáadása", "DE.Controllers.DocumentHolder.menuCopy": "Másol", "DE.Controllers.DocumentHolder.menuCut": "Kivág", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Még", "DE.Controllers.DocumentHolder.menuOpenLink": "Link megnyitása", "DE.Controllers.DocumentHolder.menuPaste": "Beilleszt", + "DE.Controllers.DocumentHolder.menuReject": "Elutasít", + "DE.Controllers.DocumentHolder.menuRejectAll": "Elutasít mindent", + "DE.Controllers.DocumentHolder.menuReview": "Összefoglaló", "DE.Controllers.DocumentHolder.sheetCancel": "Mégse", "DE.Controllers.DocumentHolder.textGuest": "Vendég", "DE.Controllers.EditContainer.textChart": "Diagram", + "DE.Controllers.EditContainer.textFooter": "Lábléc", + "DE.Controllers.EditContainer.textHeader": "Fejléc", "DE.Controllers.EditContainer.textHyperlink": "Hivatkozás", "DE.Controllers.EditContainer.textImage": "Kép", "DE.Controllers.EditContainer.textParagraph": "Bekezdés", @@ -61,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.", "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.", "DE.Controllers.Main.errorDefaultMessage": "Hibakód: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Hiba történt a dokumentummal végzett munka során.
    Használja a 'Letölt' opciót, hogy elmentse a fájl biztonsági másolatát a számítógép merevlemezére.", "DE.Controllers.Main.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.", "DE.Controllers.Main.errorKeyEncrypt": "Ismeretlen kulcsleíró", "DE.Controllers.Main.errorKeyExpire": "Lejárt kulcsleíró", @@ -223,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Felül - alul", "DE.Views.EditChart.textType": "Típus", "DE.Views.EditChart.textWrap": "Tördel", + "DE.Views.EditHeader.textDiffFirst": "Eltérő első oldal", + "DE.Views.EditHeader.textDiffOdd": "Páros és páratlan oldalak eltérőek", + "DE.Views.EditHeader.textFrom": "Kezdés", + "DE.Views.EditHeader.textPageNumbering": "Oldalszámozás", + "DE.Views.EditHeader.textPrev": "Folytás az előző résztől", + "DE.Views.EditHeader.textSameAs": "Korábbira hivatkozás", "DE.Views.EditHyperlink.textDisplay": "Megmutat", "DE.Views.EditHyperlink.textEdit": "Hivatkozás szerkesztése", "DE.Views.EditHyperlink.textLink": "Link", @@ -353,6 +367,7 @@ "DE.Views.Settings.textAddress": "Cím", "DE.Views.Settings.textAuthor": "Szerző", "DE.Views.Settings.textBack": "Vissza", + "DE.Views.Settings.textBottom": "Alsó", "DE.Views.Settings.textCreateDate": "Létrehozás dátuma", "DE.Views.Settings.textCustom": "Egyéni", "DE.Views.Settings.textCustomSize": "Egyéni méret", @@ -370,18 +385,25 @@ "DE.Views.Settings.textFormat": "Formátum", "DE.Views.Settings.textHelp": "Segítség", "DE.Views.Settings.textLandscape": "Tájkép", + "DE.Views.Settings.textLeft": "Bal", "DE.Views.Settings.textLoading": "Betöltés...", + "DE.Views.Settings.textMargins": "Margók", "DE.Views.Settings.textOrientation": "Tájolás", "DE.Views.Settings.textPages": "Oldalak", "DE.Views.Settings.textParagraphs": "Bekezdések", "DE.Views.Settings.textPortrait": "Portré", "DE.Views.Settings.textPoweredBy": "Powered by", + "DE.Views.Settings.textPrint": "Nyomtat", "DE.Views.Settings.textReader": "Olvasási mód", + "DE.Views.Settings.textReview": "Módosítások követése", + "DE.Views.Settings.textRight": "Jobb", "DE.Views.Settings.textSettings": "Beállítások", "DE.Views.Settings.textSpaces": "Térközök", + "DE.Views.Settings.textSpellcheck": "Helyesírás-ellenőrzés", "DE.Views.Settings.textStatistic": "Statisztika", "DE.Views.Settings.textSymbols": "Szimbólumok", "DE.Views.Settings.textTel": "Tel.", + "DE.Views.Settings.textTop": "Felső", "DE.Views.Settings.textVersion": "Verzió", "DE.Views.Settings.textWords": "Szavak", "DE.Views.Settings.unknownText": "Ismeretlen", diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index ddab981bf..ca2219929 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Colonne", "DE.Controllers.AddTable.textRows": "Righe", "DE.Controllers.AddTable.textTableSize": "Dimensioni tabella", + "DE.Controllers.DocumentHolder.menuAccept": "Accetta", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Accetta tutto", "DE.Controllers.DocumentHolder.menuAddLink": "Aggiungi collegamento", "DE.Controllers.DocumentHolder.menuCopy": "Copia", "DE.Controllers.DocumentHolder.menuCut": "Taglia", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Altro", "DE.Controllers.DocumentHolder.menuOpenLink": "Apri collegamento", "DE.Controllers.DocumentHolder.menuPaste": "Incolla", + "DE.Controllers.DocumentHolder.menuReject": "Respingi", + "DE.Controllers.DocumentHolder.menuRejectAll": "Respingi tutti", + "DE.Controllers.DocumentHolder.menuReview": "Revisione", "DE.Controllers.DocumentHolder.sheetCancel": "Annulla", "DE.Controllers.DocumentHolder.textGuest": "Ospite", "DE.Controllers.EditContainer.textChart": "Grafico", + "DE.Controllers.EditContainer.textFooter": "Piè di pagina", + "DE.Controllers.EditContainer.textHeader": "Intestazione", "DE.Controllers.EditContainer.textHyperlink": "Collegamento ipertestuale", "DE.Controllers.EditContainer.textImage": "Immagine", "DE.Controllers.EditContainer.textParagraph": "Paragrafo", @@ -61,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", "DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Si è verificato un errore mentre si lavorava sul documento.
    Utilizzare l'opzione 'Scarica' per salvare la copia di backup del file sul disco rigido del computer.", "DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", "DE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto", "DE.Controllers.Main.errorKeyExpire": "Descrittore di chiave scaduto", @@ -223,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Sopra e sotto", "DE.Views.EditChart.textType": "Tipo", "DE.Views.EditChart.textWrap": "Racchiudi", + "DE.Views.EditHeader.textDiffFirst": "Diverso per la prima pagina", + "DE.Views.EditHeader.textDiffOdd": "Diversi per pagine pari e dispari", + "DE.Views.EditHeader.textFrom": "Inizia da", + "DE.Views.EditHeader.textPageNumbering": "Numerazione pagina", + "DE.Views.EditHeader.textPrev": "Continua dalla selezione precedente", + "DE.Views.EditHeader.textSameAs": "Collega a precedente", "DE.Views.EditHyperlink.textDisplay": "Visualizza", "DE.Views.EditHyperlink.textEdit": "Modifica collegamento", "DE.Views.EditHyperlink.textLink": "Collegamento", @@ -353,6 +367,7 @@ "DE.Views.Settings.textAddress": "indirizzo", "DE.Views.Settings.textAuthor": "Autore", "DE.Views.Settings.textBack": "Indietro", + "DE.Views.Settings.textBottom": "In basso", "DE.Views.Settings.textCreateDate": "Data di creazione", "DE.Views.Settings.textCustom": "Personalizzato", "DE.Views.Settings.textCustomSize": "Dimensione personalizzata", @@ -370,18 +385,25 @@ "DE.Views.Settings.textFormat": "Formato", "DE.Views.Settings.textHelp": "Guida", "DE.Views.Settings.textLandscape": "Orizzontale", + "DE.Views.Settings.textLeft": "A sinistra", "DE.Views.Settings.textLoading": "Caricamento in corso...", + "DE.Views.Settings.textMargins": "Margini", "DE.Views.Settings.textOrientation": "Orientamento", "DE.Views.Settings.textPages": "Pagine", "DE.Views.Settings.textParagraphs": "Paragrafi", "DE.Views.Settings.textPortrait": "Verticale", "DE.Views.Settings.textPoweredBy": "Con tecnologia", + "DE.Views.Settings.textPrint": "Stampa", "DE.Views.Settings.textReader": "Modalità Lettore", + "DE.Views.Settings.textReview": "Traccia cambiamenti", + "DE.Views.Settings.textRight": "A destra", "DE.Views.Settings.textSettings": "Impostazioni", "DE.Views.Settings.textSpaces": "Spazi", + "DE.Views.Settings.textSpellcheck": "Controllo ortografia", "DE.Views.Settings.textStatistic": "Statistica", "DE.Views.Settings.textSymbols": "Simboli", "DE.Views.Settings.textTel": "Tel.", + "DE.Views.Settings.textTop": "In alto", "DE.Views.Settings.textVersion": "Versione", "DE.Views.Settings.textWords": "Parole", "DE.Views.Settings.unknownText": "Sconosciuto", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 3723fd3b7..cd1fff1cf 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -14,6 +14,8 @@ "DE.Controllers.AddTable.textColumns": "Столбцы", "DE.Controllers.AddTable.textRows": "Строки", "DE.Controllers.AddTable.textTableSize": "Размер таблицы", + "DE.Controllers.DocumentHolder.menuAccept": "Принять", + "DE.Controllers.DocumentHolder.menuAcceptAll": "Принять все", "DE.Controllers.DocumentHolder.menuAddLink": "Добавить ссылку", "DE.Controllers.DocumentHolder.menuCopy": "Копировать", "DE.Controllers.DocumentHolder.menuCut": "Вырезать", @@ -22,9 +24,14 @@ "DE.Controllers.DocumentHolder.menuMore": "Ещё", "DE.Controllers.DocumentHolder.menuOpenLink": "Перейти", "DE.Controllers.DocumentHolder.menuPaste": "Вставить", + "DE.Controllers.DocumentHolder.menuReject": "Отклонить", + "DE.Controllers.DocumentHolder.menuRejectAll": "Отклонить все", + "DE.Controllers.DocumentHolder.menuReview": "Рецензирование", "DE.Controllers.DocumentHolder.sheetCancel": "Отмена", "DE.Controllers.DocumentHolder.textGuest": "Гость", "DE.Controllers.EditContainer.textChart": "Диаграмма", + "DE.Controllers.EditContainer.textFooter": "Колонтитул", + "DE.Controllers.EditContainer.textHeader": "Колонтитул", "DE.Controllers.EditContainer.textHyperlink": "Гиперссылка", "DE.Controllers.EditContainer.textImage": "Изображение", "DE.Controllers.EditContainer.textParagraph": "Абзац", @@ -61,6 +68,7 @@ "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", + "DE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.
    Используйте опцию 'Скачать', чтобы сохранить резервную копию файла на жестком диске компьютера.", "DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", "DE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа", "DE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек", @@ -223,6 +231,12 @@ "DE.Views.EditChart.textTopBottom": "Сверху и снизу", "DE.Views.EditChart.textType": "Тип", "DE.Views.EditChart.textWrap": "Стиль обтекания", + "DE.Views.EditHeader.textDiffFirst": "Особый для первой страницы", + "DE.Views.EditHeader.textDiffOdd": "Разные для четных и нечетных", + "DE.Views.EditHeader.textFrom": "Начать с", + "DE.Views.EditHeader.textPageNumbering": "Нумерация страниц", + "DE.Views.EditHeader.textPrev": "Продолжить", + "DE.Views.EditHeader.textSameAs": "Связать с предыдущим", "DE.Views.EditHyperlink.textDisplay": "Отобразить", "DE.Views.EditHyperlink.textEdit": "Редактировать ссылку", "DE.Views.EditHyperlink.textLink": "Ссылка", @@ -353,6 +367,7 @@ "DE.Views.Settings.textAddress": "адрес", "DE.Views.Settings.textAuthor": "Автор", "DE.Views.Settings.textBack": "Назад", + "DE.Views.Settings.textBottom": "Нижнее", "DE.Views.Settings.textCreateDate": "Дата создания", "DE.Views.Settings.textCustom": "Особый", "DE.Views.Settings.textCustomSize": "Особый размер", @@ -370,18 +385,25 @@ "DE.Views.Settings.textFormat": "Формат", "DE.Views.Settings.textHelp": "Справка", "DE.Views.Settings.textLandscape": "Альбомная", + "DE.Views.Settings.textLeft": "Левое", "DE.Views.Settings.textLoading": "Загрузка...", + "DE.Views.Settings.textMargins": "Поля", "DE.Views.Settings.textOrientation": "Ориентация страницы", "DE.Views.Settings.textPages": "Страницы", "DE.Views.Settings.textParagraphs": "Абзацы", "DE.Views.Settings.textPortrait": "Книжная", "DE.Views.Settings.textPoweredBy": "Powered by", + "DE.Views.Settings.textPrint": "Печать", "DE.Views.Settings.textReader": "Режим чтения", + "DE.Views.Settings.textReview": "Отслеживать изменения", + "DE.Views.Settings.textRight": "Правое", "DE.Views.Settings.textSettings": "Настройки", "DE.Views.Settings.textSpaces": "Пробелы", + "DE.Views.Settings.textSpellcheck": "Проверка орфографии", "DE.Views.Settings.textStatistic": "Статистика", "DE.Views.Settings.textSymbols": "Символы", "DE.Views.Settings.textTel": "Телефон", + "DE.Views.Settings.textTop": "Верхнее", "DE.Views.Settings.textVersion": "Версия", "DE.Views.Settings.textWords": "Слова", "DE.Views.Settings.unknownText": "Неизвестно", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 43214bec2..f6f3024c8 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6680,6 +6680,11 @@ i.icon.icon-format-docx { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2266px%22%20height%3D%2266px%22%20viewBox%3D%2222.015%2020.75%2066%2066%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22g3103%22%20transform%3D%22translate(-21.015556%2C0)%22%20display%3D%22none%22%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M78.521%2C0h7.475c0%2C3.337%2C0%2C6.663%2C0%2C10%20%20%20c13.375%2C0.075%2C26.738-0.138%2C40.101%2C0.075c2.85-0.288%2C5.087%2C1.925%2C4.825%2C4.775c0.212%2C24.625-0.051%2C49.262%2C0.125%2C73.887%20%20%20c-0.125%2C2.525%2C0.25%2C5.325-1.213%2C7.563c-1.825%2C1.3-4.188%2C1.138-6.313%2C1.237C111.008%2C97.475%2C98.508%2C97.5%2C85.996%2C97.5%20%20%20c0%2C3.338%2C0%2C6.662%2C0%2C10h-7.813c-19.024-3.475-38.1-6.662-57.162-10c-0.013-29.162%2C0-58.325%2C0-87.475%20%20%20C40.183%2C6.675%2C59.359%2C3.413%2C78.521%2C0z%22%20%2F%3E%3Cpath%20class%3D%22cls-2%22%20d%3D%22M85.996%2C13.75c13.75%2C0%2C27.5%2C0%2C41.25%2C0%20%20%20c0%2C26.663%2C0%2C53.338%2C0%2C80c-13.75%2C0-27.5%2C0-41.25%2C0c0-3.338%2C0-6.662%2C0-10c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5%20%20%20c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.088%2C0-4.162%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0%20%20%20c0-2.088%2C0-4.162%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25%20%20%20c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.663%2C0-3.337%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0%20%20%20c0-1.663%2C0-3.337%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.663%2C0-3.337%2C0-5%20%20%20c-10.837%2C0-21.662%2C0-32.5%2C0C85.996%2C19.587%2C85.996%2C16.663%2C85.996%2C13.75z%22%20%2F%3E%3Cpath%20class%3D%22cls-2%22%20d%3D%22M46.846%2C35.837%20%20%20c2.375-0.137%2C4.75-0.237%2C7.125-0.362c1.662%2C8.438%2C3.362%2C16.862%2C5.162%2C25.262c1.413-8.675%2C2.976-17.325%2C4.487-25.987%20%20%20c2.5-0.087%2C5-0.225%2C7.488-0.375c-2.825%2C12.112-5.301%2C24.325-8.388%2C36.362c-2.088%2C1.088-5.213-0.05-7.688%2C0.125%20%20%20c-1.663-8.274-3.601-16.5-5.088-24.813c-1.462%2C8.075-3.362%2C16.075-5.037%2C24.101c-2.4-0.125-4.813-0.275-7.226-0.438%20%20%20c-2.074-11-4.512-21.925-6.449-32.95c2.137-0.1%2C4.287-0.188%2C6.425-0.263c1.287%2C7.962%2C2.75%2C15.888%2C3.875%2C23.862%20%20%20C43.297%2C52.188%2C45.096%2C44.013%2C46.846%2C35.837z%22%20%2F%3E%3C%2Fg%3E%3Cpath%20class%3D%22cls-3%22%20d%3D%22M50.69%2C36.792c2.375-0.137%2C4.75-0.237%2C7.125-0.362%20%20c1.662%2C8.438%2C3.362%2C16.862%2C5.162%2C25.262c1.413-8.675%2C2.976-17.325%2C4.487-25.987c2.5-0.087%2C5-0.225%2C7.488-0.375%20%20c-2.825%2C12.112-5.301%2C24.325-8.388%2C36.362c-2.088%2C1.088-5.213-0.05-7.688%2C0.125c-1.663-8.274-3.601-16.5-5.088-24.813%20%20c-1.462%2C8.075-3.362%2C16.075-5.037%2C24.101c-2.4-0.125-4.813-0.275-7.226-0.438c-2.074-11-4.512-21.925-6.449-32.95%20%20c2.137-0.1%2C4.287-0.188%2C6.425-0.263c1.287%2C7.962%2C2.75%2C15.888%2C3.875%2C23.862C47.14%2C53.143%2C48.94%2C44.968%2C50.69%2C36.792z%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-dotx { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-txt { width: 30px; height: 30px; @@ -6700,11 +6705,19 @@ i.icon.icon-format-odt { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%20193.631%20193.63%22%20height%3D%22193.63px%22%20width%3D%22193.631px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20d%3D%22M193.16%2C59.725v-0.006%20%20c-0.334-0.173-0.671-0.334-1.004-0.497c-5.357-2.586-11.257-4.287-17.526-4.88c-11.083-1.049-21.673%2C1.496-30.622%2C6.678%20%20c-6.13-3.477-13.072-5.741-20.542-6.448c-10.298-0.974-20.17%2C1.16-28.697%2C5.629c-0.084%2C0.044-0.17%2C0.095-0.251%2C0.135%20%20c-0.207%2C0.162-0.347%2C0.414-0.347%2C0.697c0%2C0.492%2C0.392%2C0.89%2C0.889%2C0.89c0.046%2C0%2C0.091-0.007%2C0.139-0.017%20%20c0.021-0.002%2C0.042-0.011%2C0.061-0.015c4.586-0.848%2C9.368-1.088%2C14.243-0.627c13.683%2C1.293%2C25.609%2C5.521%2C33.975%2C15.011%20%20c0.436%2C0.455%2C0.822%2C0.427%2C1.265-0.024c10.524-12.2%2C26.663-17.021%2C44.006-15.382c0.968%2C0.094%2C1.921%2C0.213%2C2.871%2C0.355%20%20c0.33%2C0.05%2C0.836%2C0.134%2C1.133%2C0.167c0.572%2C0.063%2C0.88-0.397%2C0.88-0.891C193.629%2C60.166%2C193.486%2C59.886%2C193.16%2C59.725L193.16%2C59.725z%22%20class%3D%22cls-1%22%20%2F%3E%3Cpath%20d%3D%22M173.053%2C102.654c-0.056-0.029-0.106-0.046-0.154-0.066%20%20c-10.517-4.349-22.02-6.758-34.093-6.758c-19.293%2C0-37.155%2C6.127-51.757%2C16.524c-11.146-4.993-23.497-7.776-36.496-7.776%20%20c-18.485%2C0-35.648%2C5.617-49.895%2C15.237c-0.047%2C0.029-0.095%2C0.066-0.149%2C0.104C0.205%2C120.154%2C0%2C120.528%2C0%2C120.957%20%20c0%2C0.729%2C0.592%2C1.324%2C1.323%2C1.324c0.086%2C0%2C0.174-0.013%2C0.259-0.03c0.058-0.015%2C0.107-0.028%2C0.161-0.048%20%20c8.166-2.456%2C16.832-3.791%2C25.798-3.791c23.836%2C0%2C45.083%2C5.633%2C61.08%2C20.68c0.038%2C0.029%2C0.071%2C0.066%2C0.111%2C0.104%20%20c0.232%2C0.205%2C0.53%2C0.325%2C0.863%2C0.325c0.412%2C0%2C0.774-0.189%2C1.018-0.486c0.006%2C0.004%2C0.515-0.72%2C0.773-1.07%20%20c16.246-22.216%2C43.03-33.172%2C72.846-33.172c2.128%2C0%2C4.246%2C0.08%2C6.337%2C0.225c0.602%2C0.047%2C1.874%2C0.144%2C1.903%2C0.144%20%20c0.726%2C0%2C1.322-0.591%2C1.322-1.324C173.796%2C103.313%2C173.492%2C102.862%2C173.053%2C102.654L173.053%2C102.654z%22%20class%3D%22cls-1%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-ott { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-ott%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ott%22%20clip-path%3D%22url(%23clip-ott)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-html { width: 30px; height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2262px%22%20height%3D%2262px%22%20viewBox%3D%220%200%2062%2062%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M24.993%2C38.689L11.34%2C32.753v-3.288l13.653-5.91v3.872l-9.523%2C3.641l9.523%2C3.777V38.689z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M27.09%2C41.298l4.931-20.596h2.867l-4.986%2C20.596H27.09z%22%20%2F%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M36.986%2C38.703v-3.845l9.536-3.75L36.986%2C27.4v-3.817l13.666%2C5.91v3.261L36.986%2C38.703z%22%20%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E"); } +.label-switch input[type="checkbox"]:checked + .checkbox { + background: #446995; +} #editor_sdk { position: absolute; left: 0; diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 722222c5a..5658703b3 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6169,6 +6169,11 @@ i.icon.icon-format-docx { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2266px%22%20height%3D%2266px%22%20viewBox%3D%2222.015%2020.75%2066%2066%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22g3103%22%20transform%3D%22translate(-21.015556%2C0)%22%20display%3D%22none%22%3E%3Cpath%20class%3D%22cls-1%22%20d%3D%22M78.521%2C0h7.475c0%2C3.337%2C0%2C6.663%2C0%2C10%20%20%20c13.375%2C0.075%2C26.738-0.138%2C40.101%2C0.075c2.85-0.288%2C5.087%2C1.925%2C4.825%2C4.775c0.212%2C24.625-0.051%2C49.262%2C0.125%2C73.887%20%20%20c-0.125%2C2.525%2C0.25%2C5.325-1.213%2C7.563c-1.825%2C1.3-4.188%2C1.138-6.313%2C1.237C111.008%2C97.475%2C98.508%2C97.5%2C85.996%2C97.5%20%20%20c0%2C3.338%2C0%2C6.662%2C0%2C10h-7.813c-19.024-3.475-38.1-6.662-57.162-10c-0.013-29.162%2C0-58.325%2C0-87.475%20%20%20C40.183%2C6.675%2C59.359%2C3.413%2C78.521%2C0z%22%20%2F%3E%3Cpath%20class%3D%22cls-2%22%20d%3D%22M85.996%2C13.75c13.75%2C0%2C27.5%2C0%2C41.25%2C0%20%20%20c0%2C26.663%2C0%2C53.338%2C0%2C80c-13.75%2C0-27.5%2C0-41.25%2C0c0-3.338%2C0-6.662%2C0-10c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5%20%20%20c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.088%2C0-4.162%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0%20%20%20c0-2.088%2C0-4.162%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.662%2C0-3.338%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25%20%20%20c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.663%2C0-3.337%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0%20%20%20c0-1.663%2C0-3.337%2C0-5c-10.837%2C0-21.662%2C0-32.5%2C0c0-2.087%2C0-4.163%2C0-6.25c10.838%2C0%2C21.663%2C0%2C32.5%2C0c0-1.663%2C0-3.337%2C0-5%20%20%20c-10.837%2C0-21.662%2C0-32.5%2C0C85.996%2C19.587%2C85.996%2C16.663%2C85.996%2C13.75z%22%20%2F%3E%3Cpath%20class%3D%22cls-2%22%20d%3D%22M46.846%2C35.837%20%20%20c2.375-0.137%2C4.75-0.237%2C7.125-0.362c1.662%2C8.438%2C3.362%2C16.862%2C5.162%2C25.262c1.413-8.675%2C2.976-17.325%2C4.487-25.987%20%20%20c2.5-0.087%2C5-0.225%2C7.488-0.375c-2.825%2C12.112-5.301%2C24.325-8.388%2C36.362c-2.088%2C1.088-5.213-0.05-7.688%2C0.125%20%20%20c-1.663-8.274-3.601-16.5-5.088-24.813c-1.462%2C8.075-3.362%2C16.075-5.037%2C24.101c-2.4-0.125-4.813-0.275-7.226-0.438%20%20%20c-2.074-11-4.512-21.925-6.449-32.95c2.137-0.1%2C4.287-0.188%2C6.425-0.263c1.287%2C7.962%2C2.75%2C15.888%2C3.875%2C23.862%20%20%20C43.297%2C52.188%2C45.096%2C44.013%2C46.846%2C35.837z%22%20%2F%3E%3C%2Fg%3E%3Cpath%20class%3D%22cls-3%22%20d%3D%22M50.69%2C36.792c2.375-0.137%2C4.75-0.237%2C7.125-0.362%20%20c1.662%2C8.438%2C3.362%2C16.862%2C5.162%2C25.262c1.413-8.675%2C2.976-17.325%2C4.487-25.987c2.5-0.087%2C5-0.225%2C7.488-0.375%20%20c-2.825%2C12.112-5.301%2C24.325-8.388%2C36.362c-2.088%2C1.088-5.213-0.05-7.688%2C0.125c-1.663-8.274-3.601-16.5-5.088-24.813%20%20c-1.462%2C8.075-3.362%2C16.075-5.037%2C24.101c-2.4-0.125-4.813-0.275-7.226-0.438c-2.074-11-4.512-21.925-6.449-32.95%20%20c2.137-0.1%2C4.287-0.188%2C6.425-0.263c1.287%2C7.962%2C2.75%2C15.888%2C3.875%2C23.862C47.14%2C53.143%2C48.94%2C44.968%2C50.69%2C36.792z%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-dotx { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D.cls-2%7Bfill%3A%23fff%3B%7D.cls-3%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3CclipPath%20id%3D%22clip-dotx%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3Cg%20id%3D%22dotx%22%20clip-path%3D%22url(%23clip-dotx)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_38%22%20data-name%3D%22Path%2038%22%20d%3D%22M12.223%2C119.714c1.251-.066%2C2.5-.115%2C3.752-.177.875%2C4.123%2C1.771%2C8.239%2C2.718%2C12.343.744-4.239%2C1.567-8.464%2C2.363-12.7%2C1.317-.042%2C2.633-.109%2C3.944-.183-1.488%2C5.917-2.792%2C11.886-4.417%2C17.767-1.1.531-2.745-.026-4.049.06-.876-4.042-1.9-8.061-2.679-12.123-.77%2C3.945-1.771%2C7.854-2.653%2C11.775-1.264-.06-2.535-.134-3.805-.213C6.3%2C130.892%2C5.02%2C125.553%2C4%2C120.167c1.125-.049%2C2.258-.093%2C3.384-.129.678%2C3.889%2C1.448%2C7.762%2C2.041%2C11.659C10.353%2C127.7%2C11.3%2C123.708%2C12.223%2C119.714Z%22%20transform%3D%22translate(-2%20-117)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20class%3D%22cls-2%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-txt { width: 30px; height: 30px; @@ -6189,6 +6194,11 @@ i.icon.icon-format-odt { height: 30px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20viewBox%3D%220%200%20193.631%20193.63%22%20height%3D%22193.63px%22%20width%3D%22193.631px%22%20y%3D%220px%22%20x%3D%220px%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cpath%20d%3D%22M193.16%2C59.725v-0.006%20%20c-0.334-0.173-0.671-0.334-1.004-0.497c-5.357-2.586-11.257-4.287-17.526-4.88c-11.083-1.049-21.673%2C1.496-30.622%2C6.678%20%20c-6.13-3.477-13.072-5.741-20.542-6.448c-10.298-0.974-20.17%2C1.16-28.697%2C5.629c-0.084%2C0.044-0.17%2C0.095-0.251%2C0.135%20%20c-0.207%2C0.162-0.347%2C0.414-0.347%2C0.697c0%2C0.492%2C0.392%2C0.89%2C0.889%2C0.89c0.046%2C0%2C0.091-0.007%2C0.139-0.017%20%20c0.021-0.002%2C0.042-0.011%2C0.061-0.015c4.586-0.848%2C9.368-1.088%2C14.243-0.627c13.683%2C1.293%2C25.609%2C5.521%2C33.975%2C15.011%20%20c0.436%2C0.455%2C0.822%2C0.427%2C1.265-0.024c10.524-12.2%2C26.663-17.021%2C44.006-15.382c0.968%2C0.094%2C1.921%2C0.213%2C2.871%2C0.355%20%20c0.33%2C0.05%2C0.836%2C0.134%2C1.133%2C0.167c0.572%2C0.063%2C0.88-0.397%2C0.88-0.891C193.629%2C60.166%2C193.486%2C59.886%2C193.16%2C59.725L193.16%2C59.725z%22%20class%3D%22cls-1%22%20%2F%3E%3Cpath%20d%3D%22M173.053%2C102.654c-0.056-0.029-0.106-0.046-0.154-0.066%20%20c-10.517-4.349-22.02-6.758-34.093-6.758c-19.293%2C0-37.155%2C6.127-51.757%2C16.524c-11.146-4.993-23.497-7.776-36.496-7.776%20%20c-18.485%2C0-35.648%2C5.617-49.895%2C15.237c-0.047%2C0.029-0.095%2C0.066-0.149%2C0.104C0.205%2C120.154%2C0%2C120.528%2C0%2C120.957%20%20c0%2C0.729%2C0.592%2C1.324%2C1.323%2C1.324c0.086%2C0%2C0.174-0.013%2C0.259-0.03c0.058-0.015%2C0.107-0.028%2C0.161-0.048%20%20c8.166-2.456%2C16.832-3.791%2C25.798-3.791c23.836%2C0%2C45.083%2C5.633%2C61.08%2C20.68c0.038%2C0.029%2C0.071%2C0.066%2C0.111%2C0.104%20%20c0.232%2C0.205%2C0.53%2C0.325%2C0.863%2C0.325c0.412%2C0%2C0.774-0.189%2C1.018-0.486c0.006%2C0.004%2C0.515-0.72%2C0.773-1.07%20%20c16.246-22.216%2C43.03-33.172%2C72.846-33.172c2.128%2C0%2C4.246%2C0.08%2C6.337%2C0.225c0.602%2C0.047%2C1.874%2C0.144%2C1.903%2C0.144%20%20c0.726%2C0%2C1.322-0.591%2C1.322-1.324C173.796%2C103.313%2C173.492%2C102.862%2C173.053%2C102.654L173.053%2C102.654z%22%20class%3D%22cls-1%22%20%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-format-ott { + width: 30px; + height: 30px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20width%3D%2233%22%20height%3D%2233%22%20viewBox%3D%220%200%2033%2033%22%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip-ott%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%23446995%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ott%22%20clip-path%3D%22url(%23clip-ott)%22%3E%3Crect%20id%3D%22Rectangle_20%22%20data-name%3D%22Rectangle%2020%22%20width%3D%2233%22%20height%3D%2233%22%20fill%3D%22none%22%2F%3E%3Cpath%20id%3D%22Path_33%22%20data-name%3D%22Path%2033%22%20d%3D%22M125.173%2C121h0c-.046-.03-.093-.059-.141-.088a6.133%2C6.133%2C0%2C0%2C0-2.467-.869%2C6.014%2C6.014%2C0%2C0%2C0-4.309%2C1.188%2C6.223%2C6.223%2C0%2C0%2C0-2.892-1.147%2C5.965%2C5.965%2C0%2C0%2C0-4.039%2C1l-.036.024a.176.176%2C0%2C0%2C0-.049.125.145.145%2C0%2C0%2C0%2C.126.158l.019%2C0a.019.019%2C0%2C0%2C0%2C.009%2C0%2C5.781%2C5.781%2C0%2C0%2C1%2C2.005-.111%2C6.41%2C6.41%2C0%2C0%2C1%2C4.782%2C2.669c.06.081.115.076.178%2C0a6.288%2C6.288%2C0%2C0%2C1%2C6.194-2.735c.136.017.27.038.4.064.047.009.119.024.161.03.08.011.123-.071.123-.159A.155.155%2C0%2C0%2C0%2C125.173%2C121Z%22%20transform%3D%22translate(-94.24%20-116)%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_34%22%20data-name%3D%22Path%2034%22%20d%3D%22M126.894%2C125.978a.175.175%2C0%2C0%2C0-.022-.011%2C11.686%2C11.686%2C0%2C0%2C0-4.905-1.082%2C11.924%2C11.924%2C0%2C0%2C0-7.444%2C2.647%2C11.725%2C11.725%2C0%2C0%2C0-5.251-1.245%2C11.884%2C11.884%2C0%2C0%2C0-7.176%2C2.441.229.229%2C0%2C0%2C0-.022.016.217.217%2C0%2C0%2C0-.073.167.2.2%2C0%2C0%2C0%2C.191.211.167.167%2C0%2C0%2C0%2C.037%2C0%2C.118.118%2C0%2C0%2C0%2C.023-.008%2C11.679%2C11.679%2C0%2C0%2C1%2C3.71-.608c3.429%2C0%2C6.486.9%2C8.787%2C3.315a.093.093%2C0%2C0%2C1%2C.016.016.172.172%2C0%2C0%2C0%2C.123.052.18.18%2C0%2C0%2C0%2C.147-.078s.075-.115.111-.171a12.1%2C12.1%2C0%2C0%2C1%2C10.479-5.315c.306%2C0%2C.611.014.912.037l.273.022a.2.2%2C0%2C0%2C0%2C.191-.211A.211.211%2C0%2C0%2C0%2C126.894%2C125.978Z%22%20transform%3D%22translate(-100%20-115.885)%22%20class%3D%22cls-1%22%2F%3E%3Cg%20id%3D%22Group_5%22%20data-name%3D%22Group%205%22%20transform%3D%22translate(16%2016)%22%3E%3Cpath%20id%3D%22Path_44%22%20data-name%3D%22Path%2044%22%20d%3D%22M1.011%2C0H13.989A1.011%2C1.011%2C0%2C0%2C1%2C15%2C1.011V13.989A1.011%2C1.011%2C0%2C0%2C1%2C13.989%2C15H1.011A1.011%2C1.011%2C0%2C0%2C1%2C0%2C13.989V1.011A1.011%2C1.011%2C0%2C0%2C1%2C1.011%2C0Z%22%20class%3D%22cls-1%22%2F%3E%3Cpath%20id%3D%22Path_39%22%20data-name%3D%22Path%2039%22%20d%3D%22M5.794%2C13.25V3.911H9.258V2.25h-9V3.911H3.729V13.25Z%22%20transform%3D%22translate(2.742%20-0.25)%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"); +} i.icon.icon-format-html { width: 30px; height: 30px; diff --git a/apps/documenteditor/mobile/resources/less/app-ios.less b/apps/documenteditor/mobile/resources/less/app-ios.less index 67725e2b6..2c7ace91f 100644 --- a/apps/documenteditor/mobile/resources/less/app-ios.less +++ b/apps/documenteditor/mobile/resources/less/app-ios.less @@ -75,6 +75,10 @@ input, textarea { @import url('ios/_search.less'); @import url('ios/_icons.less'); +.label-switch input[type="checkbox"]:checked + .checkbox { + background: @themeColor; +} + // Top offset #editor_sdk { diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 9202d27cb..33b506ad7 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -375,6 +375,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-dotx { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-txt { width: 30px; height: 30px; @@ -395,6 +400,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-ott { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-html { width: 30px; height: 30px; diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 9410cc70a..2f4d150c3 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -297,6 +297,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-dotx { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-txt { width: 30px; height: 30px; @@ -317,6 +322,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-ott { + width: 30px; + height: 30px; + .encoded-svg-background(''); + } &.icon-format-html { width: 30px; height: 30px; diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 59a776d9b..55024b657 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -307,6 +307,10 @@ define([ } /** coauthoring end **/ + value = Common.localStorage.getItem("pe-settings-fontrender"); + Common.Utils.InternalSettings.set("pe-settings-fontrender", value); + this.api.SetFontRenderingMode(parseInt(value)); + if (this.mode.isEdit) { value = parseInt(Common.localStorage.getItem("pe-settings-autosave")); Common.Utils.InternalSettings.set("pe-settings-autosave", value); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index ba9782286..65fc053c6 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -121,6 +121,10 @@ define([ return; } + var value = Common.localStorage.getItem("pe-settings-fontrender"); + if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3'; + Common.Utils.InternalSettings.set("pe-settings-fontrender", value); + // Initialize api window["flat_desine"] = true; @@ -161,6 +165,7 @@ define([ if (this.api){ this.api.SetDrawingFreeze(true); this.api.SetThemesPath("../../../../sdkjs/slide/themes/"); + this.api.SetFontRenderingMode(parseInt(value)); this.api.asc_registerCallback('asc_onError', _.bind(this.onError, this)); this.api.asc_registerCallback('asc_onDocumentContentReady', _.bind(this.onDocumentContentReady, this)); @@ -228,6 +233,15 @@ define([ event.dataTransfer.dropEffect ="none"; return false; } + }).on('dragstart', function(e) { + var event = e.originalEvent; + if (event.target ) { + var target = $(event.target); + if (target.closest('.combobox').length>0 || target.closest('.dropdown-menu').length>0 || + target.closest('.ribtab').length>0 || target.closest('.combo-dataview').length>0) { + event.preventDefault(); + } + } }); Common.NotificationCenter.on({ @@ -398,7 +412,9 @@ define([ Asc.c_oAscFileType.PPTX, Asc.c_oAscFileType.ODP, Asc.c_oAscFileType.PDF, - Asc.c_oAscFileType.PDFA + Asc.c_oAscFileType.PDFA, + Asc.c_oAscFileType.POTX, + Asc.c_oAscFileType.OTP ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -1180,6 +1196,10 @@ define([ config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas; break; + case Asc.c_oAscError.ID.MailToClientMissing: + config.msg = this.errorEmailClient; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2290,7 +2310,8 @@ define([ txtShape_curvedConnector3WithTwoArrows: 'Curved Double-Arrow Connector', txtShape_spline: 'Curve', txtShape_polyline1: 'Scribble', - txtShape_polyline2: 'Freeform' + txtShape_polyline2: 'Freeform', + errorEmailClient: 'No email client could be found' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 57420d6a8..b48f04afb 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -151,7 +151,9 @@ define([ var _supported = [ Asc.c_oAscFileType.PPTX, Asc.c_oAscFileType.ODP, - Asc.c_oAscFileType.PDFA + Asc.c_oAscFileType.PDFA, + Asc.c_oAscFileType.POTX, + Asc.c_oAscFileType.OTP ]; if ( !_format || _supported.indexOf(_format) < 0 ) @@ -307,6 +309,8 @@ define([ toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this)); toolbar.listTheme.on('click', _.bind(this.onListThemeSelect, this)); toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); + + this.onSetupCopyStyleButton(); }, setApi: function(api) { @@ -352,8 +356,6 @@ define([ this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPages, this)); this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this)); this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); - - this.onSetupCopyStyleButton(); }, onChangeCompactView: function(view, compact) { @@ -1380,7 +1382,7 @@ define([ fileChoiceUrl: me.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") })).on('selectfile', function(obj, file){ me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(file.url); + me.api.AddImageUrl(file.url, undefined, true);// for loading from storage; Common.component.Analytics.trackEvent('ToolBar', 'Image'); }).show(); } @@ -1938,18 +1940,12 @@ define([ onSetupCopyStyleButton: function () { this.modeAlwaysSetStyle = false; - var acsCopyFmtStyleState = { - kOff : 0, - kOn : 1, - kMultiple : 2 - }; - var me = this; Common.NotificationCenter.on({ 'edit:complete': function () { if (me.api && me.modeAlwaysSetStyle) { - me.api.SetPaintFormat(acsCopyFmtStyleState.kOff); + me.api.SetPaintFormat(AscCommon.c_oAscFormatPainterState.kOff); me.toolbar.btnCopyStyle.toggle(false, true); me.modeAlwaysSetStyle = false; } @@ -1960,7 +1956,7 @@ define([ if (me.api) { me.modeAlwaysSetStyle = true; me.toolbar.btnCopyStyle.toggle(true, true); - me.api.SetPaintFormat(acsCopyFmtStyleState.kMultiple); + me.api.SetPaintFormat(AscCommon.c_oAscFormatPainterState.kMultiple); } }); }, diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 64694a9a9..ca8d9c08c 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2777,6 +2777,49 @@ define([ }) }); + var onImgRotate = function(item) { + var properties = new Asc.asc_CShapeProperty(); + properties.asc_putRotAdd((item.value==1 ? 90 : 270) * 3.14159265358979 / 180); + me.api.ShapeApply(properties); + me.fireEvent('editcomplete', me); + }; + + var onImgFlip = function(item) { + var properties = new Asc.asc_CShapeProperty(); + if (item.value==1) + properties.asc_putFlipHInvert(true); + else + properties.asc_putFlipVInvert(true); + me.api.ShapeApply(properties); + me.fireEvent('editcomplete', me); + }; + + var menuImgShapeRotate = new Common.UI.MenuItem({ + caption : me.textRotate, + menu : new Common.UI.Menu({ + menuAlign: 'tl-tr', + items: [ + new Common.UI.MenuItem({ + caption: me.textRotate90, + value : 1 + }).on('click', _.bind(onImgRotate, me)), + new Common.UI.MenuItem({ + caption: me.textRotate270, + value : 0 + }).on('click', _.bind(onImgRotate, me)), + { caption: '--' }, + new Common.UI.MenuItem({ + caption: me.textFlipH, + value : 1 + }).on('click', _.bind(onImgFlip, me)), + new Common.UI.MenuItem({ + caption: me.textFlipV, + value : 0 + }).on('click', _.bind(onImgFlip, me)) + ] + }) + }); + /** coauthoring begin **/ var menuAddCommentPara = new Common.UI.MenuItem({ caption : me.addCommentText @@ -3178,6 +3221,10 @@ define([ disabled = imgdisabled || shapedisabled || chartdisabled || (value.slideProps!==undefined && value.slideProps.locked), pluginGuid = (value.imgProps) ? value.imgProps.value.asc_getPluginGuid() : null; + menuImgShapeRotate.setVisible(_.isUndefined(value.chartProps) && (pluginGuid===null || pluginGuid===undefined)); + if (menuImgShapeRotate.isVisible()) + menuImgShapeRotate.setDisabled(disabled); + // image properties menuImgOriginalSize.setVisible(isimage); if (menuImgOriginalSize.isVisible()) @@ -3218,6 +3265,7 @@ define([ { caption: '--' }, menuImgShapeArrange, menuImgShapeAlign, + menuImgShapeRotate, menuImgShapeSeparator, menuImgOriginalSize, menuImgReplace, @@ -3263,12 +3311,13 @@ define([ _.each(langs, function(lang, index){ me.langParaMenu.menu.addItem(new Common.UI.MenuItem({ caption : lang.displayValue, + value : lang.value, checkable : true, toggleGroup : 'popupparalang', langid : lang.code, spellcheck : lang.spellcheck, template: _.template([ - '', + '', '', '<%= caption %>', '' @@ -3287,12 +3336,13 @@ define([ me.langTableMenu.menu.addItem(new Common.UI.MenuItem({ caption : lang.displayValue, + value : lang.value, checkable : true, toggleGroup : 'popuptablelang', langid : lang.code, spellcheck : lang.spellcheck, template: _.template([ - '', + '', '', '<%= caption %>', '' @@ -3479,7 +3529,12 @@ define([ textDistributeCols: 'Distribute columns', textReplace: 'Replace image', textFromUrl: 'From URL', - textFromFile: 'From File' + textFromFile: 'From File', + textRotate270: 'Rotate 90° Counterclockwise', + textRotate90: 'Rotate 90° Clockwise', + textFlipV: 'Flip Vertically', + textFlipH: 'Flip Horizontally', + textRotate: 'Rotate' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index dd84ebf0c..c3d19f6ce 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -55,8 +55,11 @@ define([ formats: [[ {name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, - {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP} + ],[ + {name: 'POTX', imgCls: 'potx', type: Asc.c_oAscFileType.POTX}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, + {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP} ]], @@ -109,8 +112,11 @@ define([ formats: [[ {name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX, ext: '.pptx'}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF, ext: '.pdf'}, - {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'}, {name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP, ext: '.odp'} + ],[ + {name: 'POTX', imgCls: 'potx', type: Asc.c_oAscFileType.POTX, ext: '.potx'}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA, ext: '.pdf'}, + {name: 'OTP', imgCls: 'otp', type: Asc.c_oAscFileType.OTP, ext: '.otp'} ]], template: _.template([ @@ -194,6 +200,10 @@ define([ '', '
    ', '','', + '', + '', + '', + '','', '', '', '', @@ -287,6 +297,18 @@ define([ labelText: this.strAlignGuides }); + this.cmbFontRender = new Common.UI.ComboBox({ + el : $('#fms-cmb-font-render'), + style : 'width: 160px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: Asc.c_oAscFontRenderingModeType.hintingAndSubpixeling, displayValue: this.txtWin }, + { value: Asc.c_oAscFontRenderingModeType.noHinting, displayValue: this.txtMac }, + { value: Asc.c_oAscFontRenderingModeType.hinting, displayValue: this.txtNative } + ] + }); + this.cmbUnit = new Common.UI.ComboBox({ el : $('#fms-cmb-unit'), style : 'width: 160px;', @@ -352,6 +374,10 @@ define([ this.lblCoAuthMode.text(item ? item.get('descValue') : this.strCoAuthModeDescFast); /** coauthoring end **/ + value = Common.Utils.InternalSettings.get("pe-settings-fontrender"); + item = this.cmbFontRender.store.findWhere({value: parseInt(value)}); + this.cmbFontRender.setValue(item ? item.get('value') : (window.devicePixelRatio > 1 ? Asc.c_oAscFontRenderingModeType.noHinting : Asc.c_oAscFontRenderingModeType.hintingAndSubpixeling)); + value = Common.Utils.InternalSettings.get("pe-settings-unit"); item = this.cmbUnit.store.findWhere({value: value}); this.cmbUnit.setValue(item ? parseInt(item.get('value')) : Common.Utils.Metric.getDefaultMetric()); @@ -377,6 +403,7 @@ define([ Common.localStorage.setItem("pe-settings-coauthmode", this.cmbCoAuthMode.getValue()); } /** coauthoring end **/ + Common.localStorage.setItem("pe-settings-fontrender", this.cmbFontRender.getValue()); Common.localStorage.setItem("pe-settings-unit", this.cmbUnit.getValue()); Common.localStorage.setItem("pe-settings-autosave", this.chAutosave.isChecked() ? 1 : 0); if (this.mode.canForcesave) @@ -398,6 +425,10 @@ define([ okButtonText: 'Apply', txtFitSlide: 'Fit to Slide', txtInput: 'Alternate Input', + txtWin: 'as Windows', + txtMac: 'as OS X', + txtNative: 'Native', + strFontRender: 'Font Hinting', strUnit: 'Unit of Measurement', txtCm: 'Centimeter', txtPt: 'Point', diff --git a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js index ca7b49481..7f004ceb0 100644 --- a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js @@ -236,8 +236,11 @@ define([ this.isTextChanged = false; this.inputTip.setValue(props.get_ToolTip()); - if (type==c_oHyperlinkType.WebLink) - me.inputUrl.cmpEl.find('input').focus(); + if (type==c_oHyperlinkType.WebLink) { + _.delay(function(){ + me.inputUrl.cmpEl.find('input').focus(); + },50); + } } }, diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 43cde79ac..274cac1ab 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -220,6 +220,10 @@ define([ this.btnInsertFromFile.setVisible(!value); this.btnEditObject.setVisible(value); this.lblReplace.text(value ? this.textEditObject : this.textInsert); + this.btnRotate270.setDisabled(value); + this.btnRotate90.setDisabled(value); + this.btnFlipV.setDisabled(value); + this.btnFlipH.setDisabled(value); this._state.isOleObject=value; } @@ -354,10 +358,10 @@ define([ textRotation: 'Rotation', textRotate90: 'Rotate 90°', textFlip: 'Flip', - textHint270: 'Rotate Left 90°', - textHint90: 'Rotate Right 90°', - textHintFlipV: 'Flip Vertical', - textHintFlipH: 'Flip Horizontal' + textHint270: 'Rotate 90° Counterclockwise', + textHint90: 'Rotate 90° Clockwise', + textHintFlipV: 'Flip Vertically', + textHintFlipH: 'Flip Horizontally' }, PE.Views.ImageSettings || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 0c731a4d4..32ce9c75e 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1710,7 +1710,7 @@ define([ textFlip: 'Flip', textHint270: 'Rotate Left 90°', textHint90: 'Rotate Right 90°', - textHintFlipV: 'Flip Vertical', - textHintFlipH: 'Flip Horizontal' + textHintFlipV: 'Flip Vertically', + textHintFlipH: 'Flip Horizontally' }, PE.Views.ShapeSettings || {})); }); diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index 903103335..2225935f6 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -337,6 +337,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem }); this.btnBeginStyleMenu = (new Common.UI.Menu({ style: 'min-width: 105px;', + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
    ') } ] @@ -363,6 +364,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem }); this.btnBeginSizeMenu = (new Common.UI.Menu({ style: 'min-width: 160px;', + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
    ') } ] @@ -395,6 +397,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem }); this.btnEndStyleMenu = (new Common.UI.Menu({ style: 'min-width: 105px;', + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
    ') } ] @@ -421,6 +424,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem }); this.btnEndSizeMenu = (new Common.UI.Menu({ style: 'min-width: 160px;', + additionalAlign: this.menuAddAlign, items: [ { template: _.template('
    ') } ] diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index d3f45ce2e..d40f227f9 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -268,7 +268,7 @@ define([ maxHeight: 300, restoreHeight: 300, itemTemplate: _.template([ - '', + '', '', '<%= caption %>', '' diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 340badc67..27f64755b 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -262,9 +262,11 @@ + + + +