diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index f18237c3f..ae809e7cb 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -23,9 +23,11 @@ key: 'key', vkey: 'vkey', info: { - author: 'author name', + author: 'author name', // must be deprecated, use owner instead + owner: 'owner name', folder: 'path to document', - created: '', + created: '', // must be deprecated, use uploaded instead + uploaded: '', sharingSettings: [ { user: 'user name', @@ -63,6 +65,7 @@ saveAsUrl: 'folder for saving files' licenseUrl: , customerId: , + region: // can be 'en-us' or lang code user: { id: 'user id', @@ -129,7 +132,6 @@ }, plugins: { autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'], - url: '../../../../sdkjs-plugins/', pluginsData: [ "helloworld/config.json", "chess/config.json", @@ -139,7 +141,6 @@ } }, events: { - 'onReady': , // deprecated 'onAppReady': , 'onBack': , 'onDocumentStateChange': @@ -174,7 +175,6 @@ } }, events: { - 'onReady': , // deprecated 'onAppReady': , 'onBack': , 'onError': , @@ -202,11 +202,11 @@ _config.editorConfig.canRequestUsers = _config.events && !!_config.events.onRequestUsers; _config.editorConfig.canRequestSendNotify = _config.events && !!_config.events.onRequestSendNotify; _config.editorConfig.mergeFolderUrl = _config.editorConfig.mergeFolderUrl || _config.editorConfig.saveAsUrl; + _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs; + _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage; + _config.editorConfig.canRequestMailMergeRecipients = _config.events && !!_config.events.onRequestMailMergeRecipients; _config.frameEditorId = placeholderId; - _config.events && !!_config.events.onReady && console.log("Obsolete: The onReady event is deprecated. Please use onAppReady instead."); - _config.events && (_config.events.onAppReady = _config.events.onAppReady || _config.events.onReady); - var onMouseUp = function (evt) { _processMouse(evt); }; @@ -560,6 +560,20 @@ }); }; + var _insertImage = function(data) { + _sendCommand({ + command: 'insertImage', + data: data + }); + }; + + var _setMailMergeRecipients = function(data) { + _sendCommand({ + command: 'setMailMergeRecipients', + data: data + }); + }; + var _processMouse = function(evt) { var r = iframe.getBoundingClientRect(); var data = { @@ -602,7 +616,9 @@ destroyEditor : _destroyEditor, setUsers : _setUsers, showSharingSettings : _showSharingSettings, - setSharingSettings : _setSharingSettings + setSharingSettings : _setSharingSettings, + insertImage : _insertImage, + setMailMergeRecipients: _setMailMergeRecipients } }; diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index 373c41e58..b8e90ebad 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -110,6 +110,14 @@ if (Common === undefined) { 'setSharingSettings': function(data) { $me.trigger('setsharingsettings', data); + }, + + 'insertImage': function(data) { + $me.trigger('insertimage', data); + }, + + 'setMailMergeRecipients': function(data) { + $me.trigger('setmailmergerecipients', data); } }; @@ -250,6 +258,16 @@ if (Common === undefined) { }); }, + requestSaveAs: function(url, title) { + _postMessage({ + event: 'onRequestSaveAs', + data: { + url: url, + title: title + } + }); + }, + collaborativeChanges: function() { _postMessage({event: 'onCollaborativeChanges'}); }, @@ -282,6 +300,14 @@ if (Common === undefined) { _postMessage({event:'onRequestSendNotify', data: emails}) }, + requestInsertImage: function () { + _postMessage({event:'onRequestInsertImage'}) + }, + + requestMailMergeRecipients: function () { + _postMessage({event:'onRequestMailMergeRecipients'}) + }, + on: function(event, handler){ var localHandler = function(event, data){ handler.call(me, data) diff --git a/apps/common/embed/lib/util/utils.js b/apps/common/embed/lib/util/utils.js index 0637a0450..0ad2ed91e 100644 --- a/apps/common/embed/lib/util/utils.js +++ b/apps/common/embed/lib/util/utils.js @@ -44,7 +44,7 @@ newDocumentPage.focus(); } } - , dialogPrint: function(url) { + , dialogPrint: function(url, api) { $('#id-print-frame').remove(); if ( !!url ) { @@ -59,10 +59,14 @@ document.body.appendChild(iframePrint); iframePrint.onload = function () { - iframePrint.contentWindow.focus(); - iframePrint.contentWindow.print(); - iframePrint.contentWindow.blur(); - window.focus(); + try { + iframePrint.contentWindow.focus(); + iframePrint.contentWindow.print(); + iframePrint.contentWindow.blur(); + window.focus(); + } catch (e) { + api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + } }; iframePrint.src = url; diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index ad97bdf1b..022861d77 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -409,6 +409,10 @@ define([ }, onAfterKeydownMenu: function(e) { + this.trigger('keydown:before', this, e); + if (e.isDefaultPrevented()) + return; + if (e.keyCode == Common.UI.Keys.RETURN) { var li = $(e.target).closest('li'); if (li.length<=0) li = $(e.target).parent().find('li .dataview'); diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index ba690d3ec..96169d94e 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -286,6 +286,7 @@ define([ if ( $tp.length ) { $tp.addClass('active'); } + this.fireEvent('tab:active', [tab]); } }, diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 752da533e..76432c6f2 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -164,7 +164,7 @@ define([ '<% if (closable!==false) %>' + '
' + '<% %>' + - '<%= title %> ' + + '
<%= title %>
' + '' + '<% } %>' + '
<%= tpl %>
' + diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 855e85b5a..b8f30b6c4 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -130,7 +130,6 @@ define([ }); Common.NotificationCenter.on('comments:updatefilter', _.bind(this.onUpdateFilter, this)); - Common.NotificationCenter.on('comments:showaction', _.bind(this.onShowAction, this)); Common.NotificationCenter.on('app:comment:add', _.bind(this.onAppAddComment, this)); Common.NotificationCenter.on('layout:changed', function(area){ Common.Utils.asyncCall(function(e) { @@ -253,6 +252,7 @@ define([ ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putSolved(!comment.get('resolved')); + ascComment.asc_putGuid(comment.get('guid')); if (!_.isUndefined(ascComment.asc_putDocumentFlag)) { ascComment.asc_putDocumentFlag(comment.get('unattached')); @@ -282,12 +282,7 @@ define([ return false; }, onShowComment: function (id, selected) { - var comment; - if (typeof id == 'object') { - comment = id; - id = comment.get('uid'); - } else - comment = this.findComment(id); + var comment = this.findComment(id); if (comment) { if (null !== comment.get('quote')) { if (this.api) { @@ -350,6 +345,7 @@ define([ ascComment.asc_putUserId(t.currentUserId); ascComment.asc_putUserName(t.currentUserName); ascComment.asc_putSolved(comment.get('resolved')); + ascComment.asc_putGuid(comment.get('guid')); if (!_.isUndefined(ascComment.asc_putDocumentFlag)) { ascComment.asc_putDocumentFlag(comment.get('unattached')); @@ -406,6 +402,7 @@ define([ ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putSolved(comment.get('resolved')); + ascComment.asc_putGuid(comment.get('guid')); if (!_.isUndefined(ascComment.asc_putDocumentFlag)) { ascComment.asc_putDocumentFlag(comment.get('unattached')); @@ -468,6 +465,7 @@ define([ ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putSolved(comment.get('resolved')); + ascComment.asc_putGuid(comment.get('guid')); if (!_.isUndefined(ascComment.asc_putDocumentFlag)) { ascComment.asc_putDocumentFlag(comment.get('unattached')); @@ -526,6 +524,7 @@ define([ ascComment.asc_putUserId(comment.get('userid')); ascComment.asc_putUserName(comment.get('username')); ascComment.asc_putSolved(comment.get('resolved')); + ascComment.asc_putGuid(comment.get('guid')); if (!_.isUndefined(ascComment.asc_putDocumentFlag)) { ascComment.asc_putDocumentFlag(comment.get('unattached')); @@ -1528,11 +1527,6 @@ define([ clearCollections: function() { this.collection.reset(); this.groupCollection = []; - }, - - onShowAction: function(id, selected) { - var comment = this.collection.findWhere({guid: id}); - comment && this.onShowComment(comment, selected); } }, Common.Controllers.Comments || {})); diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 8e8978193..056183ee3 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -113,7 +113,7 @@ define([ Common.Gateway.requestRestore(record.get('revision')); else { this.isFromSelectRevision = record.get('revision'); - this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true)); } return; } diff --git a/apps/common/main/lib/extend/Bootstrap.js b/apps/common/main/lib/extend/Bootstrap.js index ab8468c29..b7d4a582f 100755 --- a/apps/common/main/lib/extend/Bootstrap.js +++ b/apps/common/main/lib/extend/Bootstrap.js @@ -41,8 +41,8 @@ function onDropDownKeyDown(e) { var $this = $(this), $parent = $this.parent(), - beforeEvent = jQuery.Event('keydown.before.bs.dropdown'), - afterEvent = jQuery.Event('keydown.after.bs.dropdown'); + beforeEvent = jQuery.Event('keydown.before.bs.dropdown', {keyCode: e.keyCode}), + afterEvent = jQuery.Event('keydown.after.bs.dropdown', {keyCode: e.keyCode}); $parent.trigger(beforeEvent); @@ -110,8 +110,9 @@ function patchDropDownKeyDown(e) { _.delay(function() { var mnu = $('> [role=menu]', li), $subitems = mnu.find('> li:not(.divider):not(.disabled):visible > a'), - $dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'); - if ($subitems.length>0 && $dataviews.length<1) + $dataviews = mnu.find('> li:not(.divider):not(.disabled):visible .dataview'), + $internal_menu = mnu.find('> li:not(.divider):not(.disabled):visible ul.internal-menu'); + if ($subitems.length>0 && $dataviews.length<1 && $internal_menu.length<1) ($subitems.index($subitems.filter(':focus'))<0) && $subitems.eq(0).focus(); }, 250); } diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js index 442a913be..ee19f55bb 100644 --- a/apps/common/main/lib/util/LanguageInfo.js +++ b/apps/common/main/lib/util/LanguageInfo.js @@ -446,9 +446,11 @@ Common.util.LanguageInfo = new(function() { }, getLocalLanguageCode: function(name) { - for (var code in localLanguageName) { - if (localLanguageName[code][0].toLowerCase()===name.toLowerCase()) - return code; + if (name) { + for (var code in localLanguageName) { + if (localLanguageName[code][0].toLowerCase()===name.toLowerCase()) + return code; + } } return null; }, diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index d1c4d2e44..7d5f8a2ba 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -688,16 +688,7 @@ Common.Utils.applyCustomizationPlugins = function(plugins) { Common.Utils.fillUserInfo = function(info, lang, defname) { var _user = info || {}; !_user.id && (_user.id = ('uid-' + Date.now())); - if (_.isEmpty(_user.name)) { - _.isEmpty(_user.firstname) && _.isEmpty(_user.lastname) && (_user.firstname = defname); - if (_.isEmpty(_user.firstname)) - _user.fullname = _user.lastname; - else if (_.isEmpty(_user.lastname)) - _user.fullname = _user.firstname; - else - _user.fullname = /^ru/.test(lang) ? _user.lastname + ' ' + _user.firstname : _user.firstname + ' ' + _user.lastname; - } else - _user.fullname = _user.name; + _user.fullname = _.isEmpty(_user.name) ? defname : _user.name; return _user; }; diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js index 123e38dcb..45a06a46c 100644 --- a/apps/common/main/lib/view/LanguageDialog.js +++ b/apps/common/main/lib/view/LanguageDialog.js @@ -85,7 +85,7 @@ define([ this.cmbLanguage = new Common.UI.ComboBox({ el: $window.find('#id-document-language'), cls: 'input-group-nr', - menuStyle: 'min-width: 318px; max-height: 300px;', + menuStyle: 'min-width: 318px; max-height: 285px;', editable: false, template: _.template([ '', diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index 4e54e1690..aa7a80a92 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -339,14 +339,14 @@ define([ switch (this.type) { case Common.Utils.importTextType.CSV: - this.api.asc_decodeBuffer(this.preview, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this)); + this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this)); break; case Common.Utils.importTextType.TXT: - this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTXTAdvancedOptions(encoding), _.bind(this.previewCallback, this)); + this.api.asc_decodeBuffer(this.preview, new Asc.asc_CTextOptions(encoding), _.bind(this.previewCallback, this)); break; case Common.Utils.importTextType.Paste: case Common.Utils.importTextType.Columns: - this.api.asc_TextImport(new Asc.asc_CCSVAdvancedOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste); + this.api.asc_TextImport(new Asc.asc_CTextOptions(encoding, delimiter, delimiterChar), _.bind(this.previewCallback, this), this.type == Common.Utils.importTextType.Paste); break; } }, diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 3a57c3225..e85961ac6 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -198,6 +198,10 @@ .btn.small; + &.bg-white { + background-color: #fff; + } + &:before, &:after { content: ""; diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 4391584d3..5aa203037 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -16,6 +16,15 @@ } } + &.internal-menu { + border: none; + border-radius: 0; + .box-shadow(none); + margin: 0; + padding: 0; + overflow: hidden; + } + li { & > a { padding: 5px 20px; diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 1d6cc32fc..76220cbc1 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -542,6 +542,10 @@ } } + .img-toolbarmenu.btn-ic-docspell { + .background-ximage('@{common-image-path}/controls/toolbar-menu-ru.png', '@{common-image-path}/controls/toolbar-menu-ru@2x.png', 60px); + } + .button-normal-icon(btn-notes, 77, @toolbar-big-icon-size); .button-normal-icon(btn-controls, 78, @toolbar-big-icon-size); diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index f0661610f..77f8bc5e5 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -85,6 +85,12 @@ &.resizing { cursor: inherit !important; } + + .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } > .body { diff --git a/apps/documenteditor/mobile/app/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js similarity index 70% rename from apps/documenteditor/mobile/app/controller/Collaboration.js rename to apps/common/mobile/lib/controller/Collaboration.js index cbc18da07..673092e46 100644 --- a/apps/documenteditor/mobile/app/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -33,64 +33,78 @@ /** * Collaboration.js - * Document Editor * - * Created by Julia Svinareva on 14/5/19 + * Created by Julia Svinareva on 12/7/19 * Copyright (c) 2019 Ascensio System SIA. All rights reserved. * */ + +if (Common === undefined) + var Common = {}; + +Common.Controllers = Common.Controllers || {}; + define([ 'core', 'jquery', 'underscore', 'backbone', - 'documenteditor/mobile/app/view/Collaboration' + 'common/mobile/lib/view/Collaboration' ], function (core, $, _, Backbone) { 'use strict'; - DE.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() { + Common.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() { // Private - var _settings = [], - _headerType = 1, - rootView, + var rootView, + _userId, + editUsers = [], + editor = !!window.DE ? 'DE' : !!window.PE ? 'PE' : 'SSE', displayMode = "Markup", arrChangeReview = [], dateChange = [], - _fileKey, - _userId, - editUsers = []; + _fileKey; + return { models: [], collections: [], views: [ - 'Collaboration' + 'Common.Views.Collaboration' ], initialize: function() { var me = this; me.addListeners({ - 'Collaboration': { + 'Common.Views.Collaboration': { 'page:show' : me.onPageShow } }); + Common.NotificationCenter.on('comments:filterchange', _.bind(this.onFilterChange, this)); }, setApi: function(api) { this.api = api; - this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.changeReview, this)); this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onChangeEditUsers, this)); + this.api.asc_registerCallback('asc_onAddComment', _.bind(this.onApiAddComment, this)); + this.api.asc_registerCallback('asc_onAddComments', _.bind(this.onApiAddComments, this)); + this.api.asc_registerCallback('asc_onChangeCommentData', _.bind(this.onApiChangeCommentData, this)); + this.api.asc_registerCallback('asc_onRemoveComment', _.bind(this.onApiRemoveComment, this)); + if (editor === 'DE') { + this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.changeReview, this)); + } }, onLaunch: function () { - this.createView('Collaboration').render(); + this.createView('Common.Views.Collaboration').render(); }, setMode: function(mode) { this.appConfig = mode; - _fileKey = mode.fileKey; _userId = mode.user.id; + if (editor === 'DE') { + _fileKey = mode.fileKey; + } return this; }, @@ -99,7 +113,8 @@ define([ var me = this, isAndroid = Framework7.prototype.device.android === true, modalView, - mainView = DE.getController('Editor').getView('Editor').f7View; + appPrefix = !!window.DE ? DE : !!window.PE ? PE : SSE, + mainView = appPrefix.getController('Editor').getView('Editor').f7View; uiApp.closeModal(); @@ -107,7 +122,7 @@ define([ modalView = $$(uiApp.pickerModal( '
' + '
' + - this.getView('Collaboration').rootLayout() + + this.getView('Common.Views.Collaboration').rootLayout() + '
' + '
' )).on('opened', function () { @@ -129,7 +144,7 @@ define([ '
' + '
' + '
' + - this.getView('Collaboration').rootLayout() + + this.getView('Common.Views.Collaboration').rootLayout() + '
' + '
' + '
' + @@ -148,10 +163,26 @@ define([ domCache: true }); - Common.NotificationCenter.trigger('collaborationcontainer:show'); - this.onPageShow(this.getView('Collaboration')); + if (!Common.SharedSettings.get('phone')) { + this.picker = $$(modalView); + var $overlay = $('.modal-overlay'); - DE.getController('Toolbar').getView('Toolbar').hideSearch(); + $$(this.picker).on('opened', function () { + $overlay.on('removeClass', function () { + if (!$overlay.hasClass('modal-overlay-visible')) { + $overlay.addClass('modal-overlay-visible') + } + }); + }).on('close', function () { + $overlay.off('removeClass'); + $overlay.removeClass('modal-overlay-visible') + }); + } + + Common.NotificationCenter.trigger('collaborationcontainer:show'); + this.onPageShow(this.getView('Common.Views.Collaboration')); + + appPrefix.getController('Toolbar').getView('Toolbar').hideSearch(); }, rootView : function() { @@ -173,13 +204,69 @@ define([ } else if('#edit-users-view' == pageId) { me.initEditUsers(); Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content'); + } else if ('#comments-view' == pageId) { + me.initComments(); + Common.Utils.addScrollIfNeed('.page[data-page=comments-view]', '.page[data-page=comments-view] .page-content'); } else { - if(!this.appConfig.canReview) { + if(editor === 'DE' && !this.appConfig.canReview) { $('#reviewing-settings').hide(); } } }, + //Edit users + + onChangeEditUsers: function(users) { + editUsers = users; + }, + + initEditUsers: function() { + var usersArray = []; + _.each(editUsers, function(item){ + var fio = item.asc_getUserName().split(' '); + var initials = fio[0].substring(0, 1).toUpperCase(); + if (fio.length > 1) { + initials += fio[fio.length - 1].substring(0, 1).toUpperCase(); + } + if(!item.asc_getView()) { + var userAttr = { + color: item.asc_getColor(), + id: item.asc_getId(), + idOriginal: item.asc_getIdOriginal(), + name: item.asc_getUserName(), + view: item.asc_getView(), + initial: initials + }; + if(item.asc_getIdOriginal() == _userId) { + usersArray.unshift(userAttr); + } else { + usersArray.push(userAttr); + } + } + }); + var userSort = _.chain(usersArray).groupBy('idOriginal').value(); + var templateUserItem = _.template([ + '<% _.each(users, function (user) { %>', + '
  • ' + + '
    ' + + '
    <%= user[0].initial %>
    '+ + '' + + '<% if (user.length>1) { %><% } %>' + + '
    '+ + '
    • ', + '<% }); %>'].join('')); + var templateUserList = _.template( + '
    ' + + this.textEditUser + + '
    ' + + '
      ' + + templateUserItem({users: userSort}) + + '
    '); + $('#user-list').html(templateUserList()); + }, + + //Review + initReviewingSettingsView: function () { var me = this; $('#settings-review input:checkbox').attr('checked', this.appConfig.isReviewOnly || Common.localStorage.getBool("de-mobile-track-changes-" + (_fileKey || ''))); @@ -204,13 +291,14 @@ define([ $checkbox.attr('checked', true); } else { this.api.asc_SetTrackRevisions(state); - Common.localStorage.setItem("de-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0); + var prefix = !!window.DE ? 'de' : !!window.PE ? 'pe' : 'sse'; + Common.localStorage.setItem(prefix + "-mobile-track-changes-" + (_fileKey || ''), state ? 1 : 0); } }, onAcceptAllClick: function() { if (this.api) { - this.api.asc_AcceptAllChanges(); + this.api.asc_AcceptAllChanges(); } }, @@ -517,15 +605,15 @@ define([ changetext += ''; changetext += proptext; break; - case Asc.c_oAscRevisionsChangeType.TablePr: - changetext = me.textTableChanged; - break; - case Asc.c_oAscRevisionsChangeType.RowsAdd: - changetext = me.textTableRowsAdd; - break; - case Asc.c_oAscRevisionsChangeType.RowsRem: - changetext = me.textTableRowsDel; - break; + case Asc.c_oAscRevisionsChangeType.TablePr: + changetext = me.textTableChanged; + break; + case Asc.c_oAscRevisionsChangeType.RowsAdd: + changetext = me.textTableRowsAdd; + break; + case Asc.c_oAscRevisionsChangeType.RowsRem: + changetext = me.textTableRowsDel; + break; } var date = (item.get_DateTime() == '') ? new Date() : new Date(item.get_DateTime()), @@ -577,56 +665,215 @@ define([ } }, - onChangeEditUsers: function(users) { - editUsers = users; + //Comments + + groupCollectionComments: [], + collectionComments: [], + groupCollectionFilter: [], + filter: [], + + initComments: function() { + this.getView('Common.Views.Collaboration').renderComments((this.groupCollectionFilter.length !== 0) ? this.groupCollectionFilter : (this.collectionComments.length !== 0) ? this.collectionComments : false); + $('.comment-quote').single('click', _.bind(this.onSelectComment, this)); }, - initEditUsers: function() { - var usersArray = []; - _.each(editUsers, function(item){ - var fio = item.asc_getUserName().split(' '); - var initials = fio[0].substring(0, 1).toUpperCase(); - if (fio.length > 1) { - initials += fio[fio.length - 1].substring(0, 1).toUpperCase(); + readSDKReplies: function (data) { + var i = 0, + replies = [], + date = null; + var repliesCount = data.asc_getRepliesCount(); + if (repliesCount) { + for (i = 0; i < repliesCount; ++i) { + date = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) : + ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime()))); + + var user = _.findWhere(editUsers, {idOriginal: data.asc_getReply(i).asc_getUserId()}); + replies.push({ + userid : data.asc_getReply(i).asc_getUserId(), + username : data.asc_getReply(i).asc_getUserName(), + usercolor : (user) ? user.asc_getColor() : null, + date : this.dateToLocaleTimeString(date), + reply : data.asc_getReply(i).asc_getText(), + time : date.getTime() + }); } - if(!item.asc_getView()) { - var userAttr = { - color: item.asc_getColor(), - id: item.asc_getId(), - idOriginal: item.asc_getIdOriginal(), - name: item.asc_getUserName(), - view: item.asc_getView(), - initial: initials - }; - if(item.asc_getIdOriginal() == _userId) { - usersArray.unshift(userAttr); - } else { - usersArray.push(userAttr); + } + return replies; + }, + + readSDKComment: function(id, data) { + var date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) : + ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime()))); + var user = _.findWhere(editUsers, {idOriginal: data.asc_getUserId()}), + groupname = id.substr(0, id.lastIndexOf('_')+1).match(/^(doc|sheet[0-9_]+)_/); + var comment = { + uid : id, + userid : data.asc_getUserId(), + username : data.asc_getUserName(), + usercolor : (user) ? user.asc_getColor() : null, + date : this.dateToLocaleTimeString(date), + quote : data.asc_getQuoteText(), + comment : data.asc_getText(), + resolved : data.asc_getSolved(), + unattached : !_.isUndefined(data.asc_getDocumentFlag) ? data.asc_getDocumentFlag() : false, + time : date.getTime(), + replys : [], + groupName : (groupname && groupname.length>1) ? groupname[1] : null + } + if (comment) { + var replies = this.readSDKReplies(data); + if (replies.length) { + comment.replys = replies; + } + } + return comment; + }, + + onApiChangeCommentData: function(id, data) { + var me = this, + i = 0, + date = null, + replies = null, + repliesCount = 0, + dateReply = null, + comment = _.findWhere(me.collectionComments, {uid: id}) || this.findCommentInGroup(id); + + if (comment) { + + date = (data.asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getOnlyOfficeTime())) : + ((data.asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getTime()))); + + var user = _.findWhere(editUsers, {idOriginal: data.asc_getUserId()}); + comment.comment = data.asc_getText(); + comment.userid = data.asc_getUserId(); + comment.username = data.asc_getUserName(); + comment.usercolor = (user) ? user.asc_getColor() : null; + comment.resolved = data.asc_getSolved(); + comment.quote = data.asc_getQuoteText(); + comment.time = date.getTime(); + comment.date = me.dateToLocaleTimeString(date); + + replies = _.clone(comment.replys); + + replies.length = 0; + + repliesCount = data.asc_getRepliesCount(); + for (i = 0; i < repliesCount; ++i) { + + dateReply = (data.asc_getReply(i).asc_getOnlyOfficeTime()) ? new Date(this.stringOOToLocalDate(data.asc_getReply(i).asc_getOnlyOfficeTime())) : + ((data.asc_getReply(i).asc_getTime() == '') ? new Date() : new Date(this.stringUtcToLocalDate(data.asc_getReply(i).asc_getTime()))); + + user = _.findWhere(editUsers, {idOriginal: data.asc_getReply(i).asc_getUserId()}); + replies.push({ + userid : data.asc_getReply(i).asc_getUserId(), + username : data.asc_getReply(i).asc_getUserName(), + usercolor : (user) ? user.asc_getColor() : null, + date : me.dateToLocaleTimeString(dateReply), + reply : data.asc_getReply(i).asc_getText(), + time : dateReply.getTime() + }); + } + comment.replys = replies; + if($('.page-comments').length > 0) { + this.initComments(); + } + } + }, + + onApiAddComment: function (id, data) { + var comment = this.readSDKComment(id, data); + if (comment) { + comment.groupName ? this.addCommentToGroupCollection(comment) : this.collectionComments.push(comment); + } + if($('.page-comments').length > 0) { + this.initComments(); + } + }, + + onApiAddComments: function (data) { + for (var i = 0; i < data.length; ++i) { + var comment = this.readSDKComment(data[i].asc_getId(), data[i]); + comment.groupName ? this.addCommentToGroupCollection(comment) : this.collectionComments.push(comment); + } + if($('.page-comments').length > 0) { + this.initComments(); + } + }, + + stringOOToLocalDate: function (date) { + if (typeof date === 'string') + return parseInt(date); + return 0; + }, + + addCommentToGroupCollection: function (comment) { + var groupname = comment.groupName; + if (!this.groupCollectionComments[groupname]) + this.groupCollectionComments[groupname] = []; + this.groupCollectionComments[groupname].push(comment); + if (this.filter.indexOf(groupname) != -1) { + this.groupCollectionFilter.push(comment); + } + }, + + findCommentInGroup: function (id) { + for (var name in this.groupCollectionComments) { + var store = this.groupCollectionComments[name], + model = _.findWhere(store, {uid: id}); + if (model) return model; + } + }, + + onApiRemoveComment: function (id) { + function remove (collection, key) { + if(collection instanceof Array) { + var index = collection.indexOf(key); + if(index != -1) { + collection.splice(index, 1); } } - }); - var userSort = _.chain(usersArray).groupBy('idOriginal').value(); - var templateUserItem = _.template([ - '<% _.each(users, function (user) { %>', - '
  • ' + - '
    ' + - '
    <%= user[0].initial %>
    '+ - '' + - '<% if (user.length>1) { %><% } %>' + - '
    '+ - '
    • ', - '<% }); %>'].join('')); - var templateUserList = _.template( - '
    ' + - this.textEditUser + - '
    ' + - '
      ' + - templateUserItem({users: userSort}) + - '
    '); - $('#user-list').html(templateUserList()); + } + if (this.groupCollectionComments) { + for (var name in this.groupCollectionComments) { + var store = this.groupCollectionComments[name], + comment = _.findWhere(store, {uid: id}); + if (comment) { + remove(this.groupCollectionComments[name], comment); + if (this.filter.indexOf(name) != -1) { + remove(this.groupCollectionFilter, comment); + } + } + } + } + if (this.collectionComments.length > 0) { + var comment = _.findWhere(this.collectionComments, {uid: id}); + if (comment) { + remove(this.collectionComments, comment); + } + } + if($('.page-comments').length > 0) { + this.initComments(); + } }, + onFilterChange: function (filter) { + if (filter) { + var me = this, + comments = []; + this.filter = filter; + filter.forEach(function(item){ + if (!me.groupCollectionComments[item]) + me.groupCollectionComments[item] = []; + comments = comments.concat(me.groupCollectionComments[item]); + }); + this.groupCollectionFilter = comments; + } + }, + onSelectComment: function (e) { + var id = $(e.currentTarget).data('id'); + this.api.asc_selectComment(id); + }, textInserted: 'Inserted:', @@ -690,5 +937,5 @@ define([ textEditUser: 'Document is currently being edited by several users.' } - })(), DE.Controllers.Collaboration || {})) + })(), Common.Controllers.Collaboration || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/template/Collaboration.template b/apps/common/mobile/lib/template/Collaboration.template similarity index 82% rename from apps/documenteditor/mobile/app/template/Collaboration.template rename to apps/common/mobile/lib/template/Collaboration.template index 8555c942b..39e076ded 100644 --- a/apps/documenteditor/mobile/app/template/Collaboration.template +++ b/apps/common/mobile/lib/template/Collaboration.template @@ -20,6 +20,16 @@ +
  • + +
    +
    +
    <%= scope.textСomments %>
    +
    +
    +     +
    • + <% if (editor === 'DE') { %>
  • @@ -29,6 +39,7 @@
    • + <% } %> @@ -36,6 +47,25 @@ + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textEditUsers %>
    +
    <% if (phone) { %><% } %>
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -137,14 +167,14 @@
  • - -
    • + +
    @@ -170,7 +200,7 @@ - + @@ -188,19 +218,20 @@
    - -
    + +
    <% if (!android) { %><%= scope.textBack %><% } %>
    -
    <%= scope.textEditUsers %>
    +
    <%= scope.textСomments %>
    <% if (phone) { %><% } %>
    -
    +
    -
    +
    +
      diff --git a/apps/documenteditor/mobile/app/view/Collaboration.js b/apps/common/mobile/lib/view/Collaboration.js similarity index 61% rename from apps/documenteditor/mobile/app/view/Collaboration.js rename to apps/common/mobile/lib/view/Collaboration.js index 22b8db64a..a9d54cd89 100644 --- a/apps/documenteditor/mobile/app/view/Collaboration.js +++ b/apps/common/mobile/lib/view/Collaboration.js @@ -33,22 +33,26 @@ /** * Collaboration.js - * Document Editor * - * Created by Julia Svinareva on 14/5/19 + * Created by Julia Svinareva on 12/7/19 * Copyright (c) 2019 Ascensio System SIA. All rights reserved. * */ +if (Common === undefined) + var Common = {}; + +Common.Views = Common.Views || {}; + define([ - 'text!documenteditor/mobile/app/template/Collaboration.template', + 'text!common/mobile/lib/template/Collaboration.template', 'jquery', 'underscore', 'backbone' ], function (settingsTemplate, $, _, Backbone) { 'use strict'; - DE.Views.Collaboration = Backbone.View.extend(_.extend((function() { + Common.Views.Collaboration = Backbone.View.extend(_.extend((function() { // private return { @@ -81,7 +85,8 @@ define([ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), orthography: Common.SharedSettings.get('sailfish'), - scope : this + scope : this, + editor : !!window.DE ? 'DE' : !!window.PE ? 'PE' : 'SSE' })); return this; @@ -119,7 +124,10 @@ define([ }, showPage: function(templateId, animate) { - var rootView = DE.getController('Collaboration').rootView(); + var me = this; + var prefix = !!window.DE ? DE : !!window.PE ? PE : SSE; + var rootView = prefix.getController('Common.Controllers.Collaboration').rootView(); + if (rootView && this.layout) { var $content = this.layout.find(templateId); @@ -138,6 +146,54 @@ define([ } }, + renderComments: function (comments) { + var $pageComments = $('.page-comments .page-content'); + if (!comments) { + if ($('.comment').length > 0) { + $('.comment').remove(); + } + var template = '
      ' + this.textNoComments + '
      '; + $pageComments.append(_.template(template)); + } else { + if ($('#no-comments').length > 0) { + $('#no-comments').remove(); + } + var $listComments = $('#comments-list'), + items = []; + _.each(comments, function (comment) { + var itemTemplate = [ + '
    • ', + '
      ', + '

      <%= item.username %>

      ', + '

      <%= item.date %>

      ', + '<% if(item.quote) {%>', + '

      <%= item.quote %>

      ', + '<% } %>', + '

      <%= item.comment %>

      ', + '<% if(replys > 0) {%>', + '
        ', + '<% _.each(item.replys, function (reply) { %>', + '
      • ', + '

        <%= reply.username %>

        ', + '

        <%= reply.date %>

        ', + '

        <%= reply.reply %>

        ', + '
        • ', + '<% }); %>', + '
      ', + '<% } %>', + '
      ', + '
      • ' + ].join(''); + items.push(_.template(itemTemplate)({ + android: Framework7.prototype.device.android, + item: comment, + replys: comment.replys.length, + })); + }); + $listComments.html(items); + } + }, + textCollaboration: 'Collaboration', @@ -152,8 +208,8 @@ define([ textFinal: 'Final', textOriginal: 'Original', textChange: 'Review Change', - textEditUsers: 'Users' - + textEditUsers: 'Users', + textNoComments: "This document doesn\'t contain comments" } - })(), DE.Views.Collaboration || {})) + })(), Common.Views.Collaboration || {})) }); \ No newline at end of file diff --git a/apps/common/mobile/resources/less/ios/_collaboration.less b/apps/common/mobile/resources/less/ios/_collaboration.less index ff87fb8b9..37361bc8e 100644 --- a/apps/common/mobile/resources/less/ios/_collaboration.less +++ b/apps/common/mobile/resources/less/ios/_collaboration.less @@ -59,4 +59,99 @@ .page-content .list-block:first-child { margin-top: -1px; } +} + +//Edit users +@initialEditUser: #373737; + +#user-list { + .item-content { + padding-left: 0; + } + .item-inner { + justify-content: flex-start; + padding-left: 15px; + } + .length { + margin-left: 4px; + } + .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: @initialEditUser; + font-weight: 500; + + } + ul:before { + content: none; + } +} + +//Comments +.page-comments { + .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; + } + p { + margin: 0; + } + .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; + } + .comment-date, .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; + } + .comment-text, .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; + } + .reply-item { + margin-top: 15px; + .user-name { + padding-top: 16px; + } + &:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: @listBlockBorderColor; + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; + } + } + .comment-quote { + color: @themeColor; + border-left: 1px solid @themeColor; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; + } +} +.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after { + display: none; } \ No newline at end of file diff --git a/apps/common/mobile/resources/less/material/_collaboration.less b/apps/common/mobile/resources/less/material/_collaboration.less index ba21a8794..ea3cdf0f0 100644 --- a/apps/common/mobile/resources/less/material/_collaboration.less +++ b/apps/common/mobile/resources/less/material/_collaboration.less @@ -57,4 +57,100 @@ .page-content .list-block:first-child { margin-top: -1px; } +} + + +//Edit users +@initialEditUser: #373737; + +#user-list { + .item-content { + padding-left: 0; + } + .item-inner { + justify-content: flex-start; + padding-left: 15px; + } + .length { + margin-left: 4px; + } + .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: @initialEditUser; + font-weight: 400; + } + ul:before { + content: none; + } +} + + +//Comments +.page-comments { + .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; + } + p { + margin: 0; + } + .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; + } + .comment-date, .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; + } + .comment-text, .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; + } + .reply-item { + margin-top: 15px; + .user-name { + padding-top: 16px; + } + &:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: @listBlockBorderColor; + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; + } + } + .comment-quote { + color: @themeColor; + border-left: 1px solid @themeColor; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; + } +} +.settings.popup .list-block ul.list-reply:last-child:after, .settings.popover .list-block ul.list-reply:last-child:after { + display: none; } \ No newline at end of file diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 8492d88f9..07d2debb1 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -204,11 +204,11 @@ DE.ApplicationController = new(function(){ function onPrint() { if ( permissions.print!==false ) - api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); } function onPrintUrl(url) { - common.utils.dialogPrint(url); + common.utils.dialogPrint(url, api); } function hidePreloader() { @@ -259,7 +259,7 @@ DE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (api && permissions.print!==false){ - api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); } Common.Analytics.trackEvent('Save'); @@ -458,7 +458,7 @@ DE.ApplicationController = new(function(){ Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny); return; } - if (api) api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); + if (api) api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true)); } // Helpers diff --git a/apps/documenteditor/embed/locale/hu.json b/apps/documenteditor/embed/locale/hu.json index e20d00001..ee0f1b332 100644 --- a/apps/documenteditor/embed/locale/hu.json +++ b/apps/documenteditor/embed/locale/hu.json @@ -1,6 +1,10 @@ { + "common.view.modals.txtCopy": "Másolás a vágólapra", + "common.view.modals.txtEmbed": "Beágyaz", "common.view.modals.txtHeight": "Magasság", + "common.view.modals.txtShare": "Hivatkozás megosztása", "common.view.modals.txtWidth": "Szélesség", + "DE.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.", "DE.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.", "DE.ApplicationController.criticalErrorTitle": "Hiba", "DE.ApplicationController.downloadErrorText": "Sikertelen letöltés.", @@ -12,10 +16,13 @@ "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés", "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.", "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése", + "DE.ApplicationController.textOf": "of", "DE.ApplicationController.txtClose": "Bezár", "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.", "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.", + "DE.ApplicationController.waitText": "Kérjük várjon...", "DE.ApplicationView.txtDownload": "Letöltés", + "DE.ApplicationView.txtEmbed": "Beágyaz", "DE.ApplicationView.txtFullScreen": "Teljes képernyő", "DE.ApplicationView.txtShare": "Megosztás" } \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/tr.json b/apps/documenteditor/embed/locale/tr.json index 7e4f5129b..709222c29 100644 --- a/apps/documenteditor/embed/locale/tr.json +++ b/apps/documenteditor/embed/locale/tr.json @@ -1,6 +1,8 @@ { "common.view.modals.txtCopy": "Panoya kopyala", + "common.view.modals.txtEmbed": "Gömülü", "common.view.modals.txtHeight": "Yükseklik", + "common.view.modals.txtShare": "Bağlantıyı Paylaş", "common.view.modals.txtWidth": "Genişlik", "DE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.", "DE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.", @@ -12,11 +14,15 @@ "DE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı", "DE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.", "DE.ApplicationController.notcriticalErrorTitle": "Uyarı", + "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.", "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor", "DE.ApplicationController.textOf": "'in", "DE.ApplicationController.txtClose": "Kapat", "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.", "DE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.", + "DE.ApplicationController.waitText": "Lütfen bekleyin...", "DE.ApplicationView.txtDownload": "İndir", + "DE.ApplicationView.txtEmbed": "Gömülü", + "DE.ApplicationView.txtFullScreen": "Tam Ekran", "DE.ApplicationView.txtShare": "Paylaş" } \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 68271c84a..18f1a82d5 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -46,6 +46,19 @@ var c_paragraphLinerule = { LINERULE_EXACT: 2 }; +var c_paragraphSpecial = { + NONE_SPECIAL: 0, + FIRST_LINE: 1, + HANGING: 2 +}; + +var c_paragraphTextAlignment = { + RIGHT: 0, + LEFT: 1, + CENTERED: 2, + JUSTIFIED: 3 +}; + var c_pageNumPosition = { PAGE_NUM_POSITION_TOP: 0x01, PAGE_NUM_POSITION_BOTTOM: 0x02, diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index fb82b1432..fd86037ef 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -237,7 +237,7 @@ define([ if ( isopts ) close_menu = false; else this.clickSaveCopyAsFormat(undefined); break; - case 'print': this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; + case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); @@ -302,13 +302,39 @@ define([ buttons: ['ok', 'cancel'], callback: _.bind(function(btn){ if (btn == 'ok') { - this.api.asc_DownloadAs(format); + if (format == Asc.c_oAscFileType.TXT) + Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); + else + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); menu.hide(); } }, this) }); + } else if (format == Asc.c_oAscFileType.DOCX) { + if (!Common.Utils.InternalSettings.get("de-settings-compatible") && !Common.localStorage.getBool("de-hide-save-compatible") && this.api.asc_isCompatibilityMode()) { + Common.UI.warning({ + closable: false, + width: 600, + title: this.notcriticalErrorTitle, + msg: this.txtCompatible, + buttons: ['ok', 'cancel'], + dontshow: true, + callback: _.bind(function(btn, dontshow){ + if (dontshow) Common.localStorage.setItem("de-hide-save-compatible", 1); + if (btn == 'ok') { + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + menu.hide(); + } + }, this) + }); + } else { + var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX); + opts.asc_setCompatible(!!Common.Utils.InternalSettings.get("de-settings-compatible")); + this.api.asc_DownloadAs(opts); + menu.hide(); + } } else { - this.api.asc_DownloadAs(format); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); menu.hide(); } } else @@ -326,14 +352,42 @@ define([ callback: _.bind(function(btn){ if (btn == 'ok') { this.isFromFileDownloadAs = ext; - this.api.asc_DownloadAs(format, true); + if (format == Asc.c_oAscFileType.TXT) + Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, this.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format, true)); + else + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true)); menu.hide(); } }, this) }); + } else if (format == Asc.c_oAscFileType.DOCX) { + if (!Common.Utils.InternalSettings.get("de-settings-compatible") && !Common.localStorage.getBool("de-hide-save-compatible") && this.api.asc_isCompatibilityMode()) { + Common.UI.warning({ + closable: false, + width: 600, + title: this.notcriticalErrorTitle, + msg: this.txtCompatible, + buttons: ['ok', 'cancel'], + dontshow: true, + callback: _.bind(function(btn, dontshow){ + if (dontshow) Common.localStorage.setItem("de-hide-save-compatible", 1); + if (btn == 'ok') { + this.isFromFileDownloadAs = ext; + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true)); + menu.hide(); + } + }, this) + }); + } else { + this.isFromFileDownloadAs = ext; + var opts = new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true); + opts.asc_setCompatible(!!Common.Utils.InternalSettings.get("de-settings-compatible")); + this.api.asc_DownloadAs(opts); + menu.hide(); + } } else { this.isFromFileDownloadAs = ext; - this.api.asc_DownloadAs(format, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true)); menu.hide(); } } else { @@ -354,27 +408,31 @@ define([ defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs; } - me._saveCopyDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.saveAsUrl, - saveFileUrl: url, - defFileName: defFileName - }); - me._saveCopyDlg.on('saveaserror', function(obj, err){ - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - Common.NotificationCenter.trigger('edit:complete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._saveCopyDlg = undefined; - }); - me._saveCopyDlg.show(); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._saveCopyDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.saveAsUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._saveCopyDlg.on('saveaserror', function(obj, err){ + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._saveCopyDlg = undefined; + }); + me._saveCopyDlg.show(); + } } this.isFromFileDownloadAs = false; }, @@ -822,6 +880,8 @@ define([ leavePageText: 'All unsaved changes in this document will be lost.
      Click \'Cancel\' then \'Save\' to save them. Click \'OK\' to discard all the unsaved changes.', warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
      Are you sure you want to continue?', warnDownloadAsRTF : 'If you continue saving in this format some of the formatting might be lost.
      Are you sure you want to continue?', - txtUntitled: 'Untitled' + txtUntitled: 'Untitled', + txtCompatible: 'The document will be saved to the new format. It will allow to use all the editor features, but might affect the document layout.
      Use the \'Compatibility\' option of the advanced settings if you want to make the files compatible with older MS Word versions.' + }, DE.Controllers.LeftMenu || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index dc1bb9727..3ee3d89b3 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -191,7 +191,7 @@ define([ Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('goback', _.bind(this.goBack, this)); - Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this)); + Common.NotificationCenter.on('download:advanced', _.bind(this.onAdvancedOptions, this)); this.isShowOpenDialog = false; @@ -313,7 +313,7 @@ define([ }); } - me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}'; + me.defaultTitleText = '{{APP_TITLE_TEXT}}'; me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}'); me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}'); @@ -345,6 +345,9 @@ define([ this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink; this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; + this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; + this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; + this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') @@ -460,7 +463,7 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.DOCX; - this.api.asc_DownloadAs(_format, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format, true)); } }, @@ -887,6 +890,9 @@ define([ Common.Utils.InternalSettings.set("de-settings-spellcheck", value); me.api.asc_setSpellCheck(value); + value = Common.localStorage.getBool("de-settings-compatible", false); + Common.Utils.InternalSettings.set("de-settings-compatible", value); + Common.Utils.InternalSettings.set("de-settings-showsnaplines", me.api.get_ShowSnapLines()); function checkWarns() { @@ -1043,12 +1049,6 @@ define([ $('.doc-placeholder').remove(); }, - onDocumentReady: function() { - if (this.editorConfig.actionLink && this.editorConfig.actionLink.action && this.editorConfig.actionLink.action.type == 'comment') { - Common.NotificationCenter.trigger('comments:showaction', this.editorConfig.actionLink.action.data, false); - } - }, - onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && @@ -1950,25 +1950,28 @@ define([ this.getApplication().getController('Toolbar').getView().updateMetricUnit(); }, - onAdvancedOptions: function(advOptions, mode) { + onAdvancedOptions: function(type, advOptions, mode, formatOptions) { if (this._state.openDlg) return; - var type = advOptions.asc_getOptionId(), - me = this; + var me = this; if (type == Asc.c_oAscAdvancedOptionsID.TXT) { me._state.openDlg = new Common.Views.OpenDialog({ title: Common.Views.OpenDialog.prototype.txtTitle.replace('%1', 'TXT'), closable: (mode==2), // if save settings type: Common.Utils.importTextType.TXT, - preview: advOptions.asc_getOptions().asc_getData(), - codepages: advOptions.asc_getOptions().asc_getCodePages(), - settings: advOptions.asc_getOptions().asc_getRecommendedSettings(), + preview: advOptions.asc_getData(), + codepages: advOptions.asc_getCodePages(), + settings: advOptions.asc_getRecommendedSettings(), api: me.api, handler: function (result, encoding) { me.isShowOpenDialog = false; if (result == 'ok') { if (me && me.api) { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding)); + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); + me.api.asc_DownloadAs(formatOptions); + } else + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding)); me.loadMask && me.loadMask.show(); } } @@ -2007,7 +2010,7 @@ define([ }, onTryUndoInFastCollaborative: function() { - if (!window.localStorage.getBool("de-hide-try-undoredo")) + if (!Common.localStorage.getBool("de-hide-try-undoredo")) Common.UI.info({ width: 500, msg: this.textTryUndoRedo, @@ -2017,7 +2020,7 @@ define([ customButtonText: this.textStrict, dontshow: true, callback: _.bind(function(btn, dontshow){ - if (dontshow) window.localStorage.setItem("de-hide-try-undoredo", 1); + if (dontshow) Common.localStorage.setItem("de-hide-try-undoredo", 1); if (btn == 'custom') { Common.localStorage.setItem("de-settings-coauthmode", 0); Common.Utils.InternalSettings.set("de-settings-coauthmode", false); @@ -2075,7 +2078,7 @@ define([ if (!this.appOptions.canPrint || this.isModalShowed) return; if (this.api) - this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.component.Analytics.trackEvent('Print'); }, @@ -2095,10 +2098,14 @@ define([ this.iframePrint.style.bottom = "0"; document.body.appendChild(this.iframePrint); this.iframePrint.onload = function() { + try { me.iframePrint.contentWindow.focus(); me.iframePrint.contentWindow.print(); me.iframePrint.contentWindow.blur(); window.focus(); + } catch (e) { + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + } }; } if (url) this.iframePrint.src = url; diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index d59f63765..6e39cbe57 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -152,7 +152,7 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.PDF; - _main.api.asc_DownloadAs(_format); + _main.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format)); }, 'go:editor': function() { Common.Gateway.requestEditRights(); @@ -323,6 +323,8 @@ define([ toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this)); toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this)); toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this)); + Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); + Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this)); $('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this)); $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this)); @@ -966,7 +968,7 @@ define([ onPrint: function(e) { if (this.api) - this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -1427,13 +1429,23 @@ define([ } })).show(); } else if (item.value === 'storage') { - (new Common.Views.SelectFileDlg({ - fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") - })).on('selectfile', function(obj, file){ - me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(file.url, undefined, true);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); - }).show(); + if (this.toolbar.mode.canRequestInsertImage) { + Common.Gateway.requestInsertImage(); + } else { + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + })).on('selectfile', function(obj, file){ + me.insertImage(file); + }).show(); + } + } + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, @@ -2578,7 +2590,7 @@ define([ this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true); this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true); this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint); - if (this.toolbar.mode.fileChoiceUrl) + if (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients) this.toolbar.btnMailRecepients.setDisabled(false); this._state.activated = true; @@ -2776,22 +2788,28 @@ define([ onSelectRecepientsClick: function() { if (this._mailMergeDlg) return; - var me = this; - me._mailMergeDlg = new Common.Views.SelectFileDlg({ - fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") - }); - me._mailMergeDlg.on('selectfile', function(obj, recepients){ - me.api.asc_StartMailMerge(recepients); - if (!me.mergeEditor) - me.mergeEditor = me.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor'); - if (me.mergeEditor) - me.mergeEditor.setEditMode(false); + if (this.toolbar.mode.canRequestMailMergeRecipients) { + Common.Gateway.requestMailMergeRecipients(); + } else { + var me = this; + me._mailMergeDlg = new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") + }); + me._mailMergeDlg.on('selectfile', function(obj, recepients){ + me.setMailMergeRecipients(recepients); + }).on('close', function(obj){ + me._mailMergeDlg = undefined; + }); + me._mailMergeDlg.show(); + } + }, - }).on('close', function(obj){ - me._mailMergeDlg = undefined; - }); - - me._mailMergeDlg.show(); + setMailMergeRecipients: function(recepients) { + this.api.asc_StartMailMerge(recepients); + if (!this.mergeEditor) + this.mergeEditor = this.getApplication().getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor'); + if (this.mergeEditor) + this.mergeEditor.setEditMode(false); }, createDelayedElements: function() { diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template index 6dc19d04e..603f9d24b 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template @@ -1,23 +1,66 @@
      - - - - - - -
      - -
      -       		+
      +
      + +
      +
      + +
      +
      +
      +
      -
      		+ +
      -
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      -
      +
      +
      @@ -44,15 +87,15 @@
      -
      +
      -
      -
      +
      +
      @@ -70,114 +113,94 @@
      -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - -
      - -
      -
      -       		-
      -
      -
      -       		-
      -
      -
      -       		-
      -
      - -
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      -
      		+ +
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      -
      - -
      -
      -
      - -
      -
      -
      -
      -
      -
      - -
      -
      -
      - -
      -
      -
      -
      - - - -
      +
      + +
      + +
      +
      +
      + +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      + + + +
      - - - - - - - - - -
      +
      +
      -
      		+ +
      -
      + + +
      +
      -
      		+ +
      -
      +
      +
      \ No newline at end of file diff --git a/apps/documenteditor/main/app/template/ShapeSettings.template b/apps/documenteditor/main/app/template/ShapeSettings.template index e6169facb..d080de792 100644 --- a/apps/documenteditor/main/app/template/ShapeSettings.template +++ b/apps/documenteditor/main/app/template/ShapeSettings.template @@ -177,6 +177,16 @@
      + + +
      + + + + +
      + +
      diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index f228b6fe4..b10a09171 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1861,6 +1861,18 @@ define([ me.fireEvent('editcomplete', me); }, + onPrintSelection: function(item){ + if (this.api){ + var printopt = new Asc.asc_CAdjustPrint(); + printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + opts.asc_setAdvancedOptions(printopt); + this.api.asc_Print(opts); + this.fireEvent('editcomplete', this); + Common.component.Analytics.trackEvent('DocumentHolder', 'Print Selection'); + } + }, + onControlsSelect: function(item, e) { var me = this; var props = this.api.asc_GetContentControlProperties(); @@ -2341,6 +2353,10 @@ define([ value : 'cut' }).on('click', _.bind(me.onCutCopyPaste, me)); + var menuImgPrint = new Common.UI.MenuItem({ + caption : me.txtPrintSelection + }).on('click', _.bind(me.onPrintSelection, me)); + var menuSignatureEditSign = new Common.UI.MenuItem({caption: this.strSign, value: 0 }).on('click', _.bind(me.onSignatureClick, me)); var menuSignatureEditSetup = new Common.UI.MenuItem({caption: this.strSetup, value: 2 }).on('click', _.bind(me.onSignatureClick, me)); var menuEditSignSeparator = new Common.UI.MenuItem({ caption: '--' }); @@ -2471,7 +2487,7 @@ define([ if (menuChartEdit.isVisible()) menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts()); - me.pictureMenu.items[16].setVisible(menuChartEdit.isVisible()); + me.pictureMenu.items[17].setVisible(menuChartEdit.isVisible()); me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined); menuImageAdvanced.setDisabled(islocked); @@ -2496,6 +2512,8 @@ define([ menuImgCopy.setDisabled(!cancopy); menuImgCut.setDisabled(islocked || !cancopy); menuImgPaste.setDisabled(islocked); + menuImgPrint.setVisible(me.mode.canPrint); + menuImgPrint.setDisabled(!cancopy); var signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined, isInSign = !!signGuid; @@ -2512,6 +2530,7 @@ define([ menuImgCut, menuImgCopy, menuImgPaste, + menuImgPrint, { caption: '--' }, menuSignatureEditSign, menuSignatureEditSetup, @@ -2719,7 +2738,7 @@ define([ menu : new Common.UI.MenuSimple({ cls: 'lang-menu', menuAlign: 'tl-tr', - restoreHeight: 300, + restoreHeight: 285, items : [], itemTemplate: langTemplate, search: true @@ -2744,6 +2763,13 @@ define([ } }); + var menuToDictionaryTable = new Common.UI.MenuItem({ + caption : me.toDictionaryText + }).on('click', function(item, e) { + me.api.asc_spellCheckAddToDictionary(me._currentSpellObj); + me.fireEvent('editcomplete', me); + }); + var menuIgnoreSpellTableSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -2762,6 +2788,7 @@ define([ menuIgnoreSpellTableSeparator, menuIgnoreSpellTable, menuIgnoreAllSpellTable, + menuToDictionaryTable, { caption: '--' }, me.langTableMenu ] @@ -2783,6 +2810,11 @@ define([ value : 'cut' }).on('click', _.bind(me.onCutCopyPaste, me)); + var menuTablePrint = new Common.UI.MenuItem({ + caption : me.txtPrintSelection + }).on('click', _.bind(me.onPrintSelection, me)); + + var menuEquationSeparatorInTable = new Common.UI.MenuItem({ caption : '--' }); @@ -2888,7 +2920,7 @@ define([ var isEquation= (value.mathProps && value.mathProps.value); - for (var i = 7; i < 24; i++) { + for (var i = 8; i < 25; i++) { me.tableMenu.items[i].setVisible(!isEquation); } @@ -2903,8 +2935,8 @@ define([ me.menuTableDirect270.setChecked(dir == Asc.c_oAscCellTextDirection.BTLR); var disabled = value.tableProps.locked || (value.headerProps!==undefined && value.headerProps.locked); - me.tableMenu.items[10].setDisabled(disabled); me.tableMenu.items[11].setDisabled(disabled); + me.tableMenu.items[12].setDisabled(disabled); if (me.api) { mnuTableMerge.setDisabled(disabled || !me.api.CheckBeforeMergeCells()); @@ -2922,6 +2954,8 @@ define([ menuTableCopy.setDisabled(!cancopy); menuTableCut.setDisabled(disabled || !cancopy); menuTablePaste.setDisabled(disabled); + menuTablePrint.setVisible(me.mode.canPrint); + menuTablePrint.setDisabled(!cancopy); // bullets & numbering var listId = me.api.asc_GetCurrentNumberingId(), @@ -2985,6 +3019,7 @@ define([ menuParagraphAdvancedInTable.setDisabled(disabled); me.menuSpellCheckTable.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + menuToDictionaryTable.setVisible(me.mode.isDesktopApp); menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); me.langTableMenu.setDisabled(disabled); @@ -3004,9 +3039,9 @@ define([ //equation menu var eqlen = 0; if (isEquation) { - eqlen = me.addEquationMenu(false, 6); + eqlen = me.addEquationMenu(false, 7); } else - me.clearEquationMenu(false, 6); + me.clearEquationMenu(false, 7); menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0); var in_toc = me.api.asc_GetTableOfContentsPr(true), @@ -3034,6 +3069,7 @@ define([ menuTableCut, menuTableCopy, menuTablePaste, + menuTablePrint, { caption: '--' }, menuEquationSeparatorInTable, menuTableRefreshField, @@ -3344,7 +3380,7 @@ define([ menu : new Common.UI.MenuSimple({ cls: 'lang-menu', menuAlign: 'tl-tr', - restoreHeight: 300, + restoreHeight: 285, items : [], itemTemplate: langTemplate, search: true @@ -3365,6 +3401,13 @@ define([ me.fireEvent('editcomplete', me); }); + var menuToDictionaryPara = new Common.UI.MenuItem({ + caption : me.toDictionaryText + }).on('click', function(item, e) { + me.api.asc_spellCheckAddToDictionary(me._currentSpellObj); + me.fireEvent('editcomplete', me); + }); + var menuIgnoreSpellParaSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -3388,6 +3431,10 @@ define([ value : 'cut' }).on('click', _.bind(me.onCutCopyPaste, me)); + var menuParaPrint = new Common.UI.MenuItem({ + caption : me.txtPrintSelection + }).on('click', _.bind(me.onPrintSelection, me)); + var menuEquationSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -3550,17 +3597,21 @@ define([ menuParaCopy.setDisabled(!cancopy); menuParaCut.setDisabled(disabled || !cancopy); menuParaPaste.setDisabled(disabled); + menuParaPrint.setVisible(me.mode.canPrint); + menuParaPrint.setDisabled(!cancopy); // spellCheck - me.menuSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuSpellcheckParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuIgnoreSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuIgnoreAllSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - me.langParaMenu.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + me.menuSpellPara.setVisible(spell); + menuSpellcheckParaSeparator.setVisible(spell); + menuIgnoreSpellPara.setVisible(spell); + menuIgnoreAllSpellPara.setVisible(spell); + menuToDictionaryPara.setVisible(spell && me.mode.isDesktopApp); + me.langParaMenu.setVisible(spell); me.langParaMenu.setDisabled(disabled); - menuIgnoreSpellParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + menuIgnoreSpellParaSeparator.setVisible(spell); - if (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) { + if (spell && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) { me.addWordVariants(true); } else { me.menuSpellPara.setCaption(me.loadSpellText, true); @@ -3575,9 +3626,9 @@ define([ //equation menu var eqlen = 0; if (isEquation) { - eqlen = me.addEquationMenu(true, 11); + eqlen = me.addEquationMenu(true, 13); } else - me.clearEquationMenu(true, 11); + me.clearEquationMenu(true, 13); menuEquationSeparator.setVisible(isEquation && eqlen>0); menuFrameAdvanced.setVisible(value.paraProps.value.get_FramePr() !== undefined); @@ -3634,11 +3685,13 @@ define([ menuSpellcheckParaSeparator, menuIgnoreSpellPara, menuIgnoreAllSpellPara, + menuToDictionaryPara, me.langParaMenu, menuIgnoreSpellParaSeparator, menuParaCut, menuParaCopy, menuParaPaste, + menuParaPrint, { caption: '--' }, menuEquationSeparator, menuParaRemoveControl, @@ -4035,7 +4088,9 @@ define([ textCrop: 'Crop', textCropFill: 'Fill', textCropFit: 'Fit', - textFollow: 'Follow move' + textFollow: 'Follow move', + toDictionaryText: 'Add to Dictionary', + txtPrintSelection: 'Print Selection' }, DE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index 5c8293151..c2324e3a1 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/apps/documenteditor/main/app/view/FileMenu.js @@ -284,7 +284,7 @@ define([ this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide'](); this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); - this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide'](); + this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide'](); this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide'](); // this.hkSaveAs[this.mode.canDownload?'enable':'disable'](); @@ -328,7 +328,7 @@ define([ } else if (this.mode.canDownloadOrigin) $('a',this.miDownload.$el).text(this.textDownload); - if (this.mode.canDownload && this.mode.saveAsUrl) { + if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) { !this.panels['save-copy'] && (this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render())); } diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 2618e1d8f..13810adbc 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -198,6 +198,10 @@ define([ '', '', '','', + '', + '', + '', + '','', '', '', '', @@ -271,6 +275,11 @@ define([ labelText: this.strSpellCheckMode }); + this.chCompatible = new Common.UI.CheckBox({ + el: $('#fms-chb-compatible'), + labelText: this.textOldVersions + }); + this.chAutosave = new Common.UI.CheckBox({ el: $markup.findById('#fms-chb-autosave'), labelText: this.strAutosave @@ -450,6 +459,7 @@ define([ this.chSpell.setValue(Common.Utils.InternalSettings.get("de-settings-spellcheck")); this.chAlignGuides.setValue(Common.Utils.InternalSettings.get("de-settings-showsnaplines")); + this.chCompatible.setValue(Common.Utils.InternalSettings.get("de-settings-compatible")); }, applySettings: function() { @@ -471,6 +481,8 @@ define([ if (this.mode.canForcesave) Common.localStorage.setItem("de-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0); Common.localStorage.setItem("de-settings-spellcheck", this.chSpell.isChecked() ? 1 : 0); + Common.localStorage.setItem("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0); + Common.Utils.InternalSettings.set("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0); Common.Utils.InternalSettings.set("de-settings-showsnaplines", this.chAlignGuides.isChecked()); Common.localStorage.save(); @@ -533,7 +545,9 @@ define([ txtFitWidth: 'Fit to Width', textForceSave: 'Save to Server', strForcesave: 'Always save to server (otherwise save to server on document close)', - strResolvedComment: 'Turn on display of the resolved comments' + strResolvedComment: 'Turn on display of the resolved comments', + textCompatible: 'Compatibility', + textOldVersions: 'Make the files compatible with older MS Word versions when saved as DOCX' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ @@ -714,14 +728,14 @@ define([ // '', // '', // '', - '', - '', - '
      ', - '', '', '', '
      ', '', + '', + '', + '
      ', + '', '', '', '
      ', @@ -908,6 +922,11 @@ define([ }, updateInfo: function(doc) { + if (!this.doc && doc && doc.info) { + doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); + doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); + } + this.doc = doc; if (!this.rendered) return; @@ -919,12 +938,14 @@ define([ if (doc.info.folder ) this.lblPlacement.text( doc.info.folder ); visible = this._ShowHideInfoItem(this.lblPlacement, doc.info.folder!==undefined && doc.info.folder!==null) || visible; - if (doc.info.author) - this.lblOwner.text(doc.info.author); - visible = this._ShowHideInfoItem(this.lblOwner, doc.info.author!==undefined && doc.info.author!==null) || visible; - if (doc.info.uploaded) - this.lblUploaded.text(doc.info.uploaded.toLocaleString()); - visible = this._ShowHideInfoItem(this.lblUploaded, doc.info.uploaded!==undefined && doc.info.uploaded!==null) || visible; + var value = doc.info.owner || doc.info.author; + if (value) + this.lblOwner.text(value); + visible = this._ShowHideInfoItem(this.lblOwner, !!value) || visible; + value = doc.info.uploaded || doc.info.created; + if (value) + this.lblUploaded.text(value); + visible = this._ShowHideInfoItem(this.lblUploaded, !!value) || visible; } else this._ShowHideDocInfo(false); $('tr.divider.general', this.el)[visible?'show':'hide'](); diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index 90b5d27d0..fa32bd838 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -365,7 +365,7 @@ define([ this.$el.on('click', '#mmerge-readmore-link', _.bind(this.openHelp, this)); if (this.mode) { - if (!this.mode.mergeFolderUrl) + if (!this.mode.canRequestSaveAs && !this.mode.mergeFolderUrl) this.btnPortal.setVisible(false); if (!this.mode.canSendEmailAddresses) { this._arrMergeSrc.pop(); @@ -426,7 +426,7 @@ define([ if (num>this._state.recipientsCount-1) num = this._state.recipientsCount-1; this.lockControls(DE.enumLockMM.noRecipients, this._state.recipientsCount<1, { - array: (this.mode.mergeFolderUrl) ? [this.btnPortal] : [], + array: (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : [], merge: true }); @@ -537,28 +537,33 @@ define([ if (this._mailMergeDlg) return; var me = this; if (this.cmbMergeTo.getValue() != Asc.c_oAscFileType.HTML) { - me._mailMergeDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.mergeFolderUrl, - saveFileUrl: url, - defFileName: me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx') - }); - me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder - }).on('saveaserror', function(obj, err){ // save last folder - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - me.fireEvent('editcomplete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._mailMergeDlg = undefined; - }); - me._mailMergeDlg.show(); + var defFileName = me.defFileName + ((this.cmbMergeTo.getValue() == Asc.c_oAscFileType.PDF) ? '.pdf' : '.docx'); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._mailMergeDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.mergeFolderUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._mailMergeDlg.on('saveasfolder', function(obj, folder){ // save last folder + }).on('saveaserror', function(obj, err){ // save last folder + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + me.fireEvent('editcomplete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._mailMergeDlg = undefined; + }); + me._mailMergeDlg.show(); + } } }, @@ -766,7 +771,7 @@ define([ onCmbMergeToSelect: function(combo, record) { var mergeVisible = (record.value == Asc.c_oAscFileType.HTML); this.btnMerge.setVisible(mergeVisible); - this.btnPortal.setVisible(!mergeVisible && this.mode.mergeFolderUrl); + this.btnPortal.setVisible(!mergeVisible && (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl)); this.btnDownload.setVisible(!mergeVisible); }, @@ -778,7 +783,7 @@ define([ if (this._initSettings) return; this.lockControls(DE.enumLockMM.lostConnect, disable, { - array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.mergeFolderUrl) ? [this.btnPortal] : []), + array: _.union([this.btnEditData, this.btnInsField, this.chHighlight], (this.mode.canRequestSaveAs || this.mode.mergeFolderUrl) ? [this.btnPortal] : []), merge: true }); }, diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index 9a3f841b4..e5571e63e 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -123,7 +123,7 @@ define([ '', '
      ', '', - '', + '', '', '
      ' ].join('') @@ -271,17 +271,17 @@ define([ }, onDlgBtnClick: function(event) { - var me = this; - var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event; - if (state == 'insert' || state == 'apply') { - this.handler && this.handler.call(this, state, (state == 'insert' || state == 'apply') ? this.getSettings() : undefined); - } - - this.close(); + this._handleInput((typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event); }, onPrimary: function() { - return true; + this._handleInput('insert'); + return false; + }, + + _handleInput: function(state) { + this.handler && this.handler.call(this, state, (state == 'insert' || state == 'apply') ? this.getSettings() : undefined); + this.close(); }, onFormatSelect: function(combo, record) { diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index e9e931b85..1814951ca 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -183,8 +183,9 @@ define([ setApi: function(api) { this.api = api; - if (this.api) + if (this.api) { this.api.asc_registerCallback('asc_onParaSpacingLine', _.bind(this._onLineSpacing, this)); + } return this; }, diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 15bdcfbfc..6d311f1d6 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -51,17 +51,19 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem DE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 335, + contentWidth: 370, height: 394, toggleGroup: 'paragraph-adv-settings-group', storageName: 'de-para-settings-adv-category' }, initialize : function(options) { + var me = this; _.extend(this.options, { title: this.textTitle, items: [ {panelId: 'id-adv-paragraph-indents', panelCaption: this.strParagraphIndents}, + {panelId: 'id-adv-paragraph-line', panelCaption: this.strParagraphLine}, {panelId: 'id-adv-paragraph-borders', panelCaption: this.strBorders}, {panelId: 'id-adv-paragraph-font', panelCaption: this.strParagraphFont}, {panelId: 'id-adv-paragraph-tabs', panelCaption: this.strTabs}, @@ -84,6 +86,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.Margins = undefined; this.FirstLine = undefined; this.LeftIndent = undefined; + this.Spacing = null; this.spinners = []; this.tableStylerRows = this.options.tableStylerRows; @@ -92,6 +95,63 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.api = this.options.api; this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps); this.isChart = this.options.isChart; + + this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule(); + + this._arrLineRule = [ + {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03, step: 0.01, defaultUnit: 'cm'}, + {displayValue: this.textAuto, defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5, step: 0.01, defaultUnit: ''}, + {displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'} + ]; + + this._arrSpecial = [ + {displayValue: this.textNoneSpecial, value: c_paragraphSpecial.NONE_SPECIAL, defaultValue: 0}, + {displayValue: this.textFirstLine, value: c_paragraphSpecial.FIRST_LINE, defaultValue: 12.7}, + {displayValue: this.textHanging, value: c_paragraphSpecial.HANGING, defaultValue: 12.7} + ]; + this.CurSpecial = undefined; + + this._arrTextAlignment = [ + {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT}, + {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED}, + {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT}, + {displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED} + ]; + + this._arrOutlinelevel = [ + {displayValue: this.textBodyText}, + {displayValue: this.textLevel + '1'}, + {displayValue: this.textLevel + '2'}, + {displayValue: this.textLevel + '3'}, + {displayValue: this.textLevel + '4'}, + {displayValue: this.textLevel + '5'}, + {displayValue: this.textLevel + '6'}, + {displayValue: this.textLevel + '7'}, + {displayValue: this.textLevel + '8'}, + {displayValue: this.textLevel + '9'} + ]; + + this._arrTabAlign = [ + { value: 1, displayValue: this.textTabLeft }, + { value: 3, displayValue: this.textTabCenter }, + { value: 2, displayValue: this.textTabRight } + ]; + this._arrKeyTabAlign = []; + this._arrTabAlign.forEach(function(item) { + me._arrKeyTabAlign[item.value] = item.displayValue; + }); + + this._arrTabLeader = [ + { value: Asc.c_oAscTabLeader.None, displayValue: this.textNone }, + { value: Asc.c_oAscTabLeader.Dot, displayValue: '....................' }, + { value: Asc.c_oAscTabLeader.Hyphen, displayValue: '-----------------' }, + { value: Asc.c_oAscTabLeader.MiddleDot, displayValue: '·················' }, + { value: Asc.c_oAscTabLeader.Underscore,displayValue: '__________' } + ]; + this._arrKeyTabLeader = []; + this._arrTabLeader.forEach(function(item) { + me._arrKeyTabLeader[item.value] = item.displayValue; + }); }, render: function() { @@ -101,25 +161,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem // Indents & Placement - this.numFirstLine = new Common.UI.MetricSpinner({ - el: $('#paragraphadv-spin-first-line'), - step: .1, - width: 85, - defaultUnit : "cm", - defaultValue : 0, - value: '0 cm', - maxValue: 55.87, - minValue: -55.87 - }); - this.numFirstLine.on('change', _.bind(function(field, newValue, oldValue, eOpts){ - if (this._changedProps) { - if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); - this._changedProps.get_Ind().put_FirstLine(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); - } - }, this)); - this.spinners.push(this.numFirstLine); - this.numIndentsLeft = new Common.UI.MetricSpinner({ el: $('#paragraphadv-spin-indent-left'), step: .1, @@ -158,6 +199,121 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem }, this)); this.spinners.push(this.numIndentsRight); + this.numSpacingBefore = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-spacing-before'), + step: .1, + width: 85, + value: '', + defaultUnit : "cm", + maxValue: 55.88, + minValue: 0, + allowAuto : true, + autoText : this.txtAutoText + }); + this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) { + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); + }, this)); + this.spinners.push(this.numSpacingBefore); + + this.numSpacingAfter = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-spacing-after'), + step: .1, + width: 85, + value: '', + defaultUnit : "cm", + maxValue: 55.88, + minValue: 0, + allowAuto : true, + autoText : this.txtAutoText + }); + this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) { + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); + }, this)); + this.spinners.push(this.numSpacingAfter); + + this.cmbLineRule = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-line-rule'), + cls: 'input-group-nr', + editable: false, + data: this._arrLineRule, + style: 'width: 85px;', + menuStyle : 'min-width: 85px;' + }); + this.cmbLineRule.setValue(this.CurLineRuleIdx); + this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); + + this.numLineHeight = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-line-height'), + step: .01, + width: 85, + value: '', + defaultUnit : "", + maxValue: 132, + minValue: 0.5 + }); + this.spinners.push(this.numLineHeight); + this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this)); + + this.chAddInterval = new Common.UI.CheckBox({ + el: $('#paragraphadv-checkbox-add-interval'), + labelText: this.strSomeParagraphSpace + }); + + this.cmbSpecial = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-special'), + cls: 'input-group-nr', + editable: false, + data: this._arrSpecial, + style: 'width: 85px;', + menuStyle : 'min-width: 85px;' + }); + this.cmbSpecial.setValue(''); + this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this)); + + this.numSpecialBy = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-special-by'), + step: .1, + width: 85, + defaultUnit : "cm", + defaultValue : 0, + value: '0 cm', + maxValue: 55.87, + minValue: 0 + }); + this.spinners.push(this.numSpecialBy); + this.numSpecialBy.on('change', _.bind(this.onFirstLineChange, this)); + + this.cmbTextAlignment = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-text-alignment'), + cls: 'input-group-nr', + editable: false, + data: this._arrTextAlignment, + style: 'width: 173px;', + menuStyle : 'min-width: 173px;' + }); + this.cmbTextAlignment.setValue(''); + + this.cmbOutlinelevel = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-outline-level'), + cls: 'input-group-nr', + editable: false, + data: this._arrOutlinelevel, + style: 'width: 174px;', + menuStyle : 'min-width: 174px;' + }); + this.cmbOutlinelevel.setValue(''); + this.cmbOutlinelevel.on('selected', _.bind(this.onOutlinelevelSelect, this)); + + // Line & Page Breaks + this.chBreakBefore = new Common.UI.CheckBox({ el: $('#paragraphadv-checkbox-break-before'), labelText: this.strBreakBefore @@ -326,7 +482,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numSpacing = new Common.UI.MetricSpinner({ el: $('#paragraphadv-spin-spacing'), step: .01, - width: 100, + width: 90, defaultUnit : "cm", defaultValue : 0, value: '0 cm', @@ -348,7 +504,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numPosition = new Common.UI.MetricSpinner({ el: $('#paragraphadv-spin-position'), step: .01, - width: 100, + width: 90, defaultUnit : "cm", defaultValue : 0, value: '0 cm', @@ -371,7 +527,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numTab = new Common.UI.MetricSpinner({ el: $('#paraadv-spin-tab'), step: .1, - width: 180, + width: 108, defaultUnit : "cm", value: '1.25 cm', maxValue: 55.87, @@ -382,7 +538,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numDefaultTab = new Common.UI.MetricSpinner({ el: $('#paraadv-spin-default-tab'), step: .1, - width: 107, + width: 108, defaultUnit : "cm", value: '1.25 cm', maxValue: 55.87, @@ -398,7 +554,15 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.tabList = new Common.UI.ListView({ el: $('#paraadv-list-tabs'), emptyText: this.noTabs, - store: new Common.UI.DataViewStore() + store: new Common.UI.DataViewStore(), + template: _.template(['
      '].join('')), + itemTemplate: _.template([ + '
      ', + '
      <%= value %>
      ', + '
      <%= displayTabAlign %>
      ', + '
      <%= displayTabLeader %>
      ', + '
      ' + ].join('')) }); this.tabList.store.comparator = function(rec) { return rec.get("tabPos"); @@ -415,31 +579,21 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.cmbAlign = new Common.UI.ComboBox({ el : $('#paraadv-cmb-align'), - style : 'width: 85px;', - menuStyle : 'min-width: 85px;', + style : 'width: 108px;', + menuStyle : 'min-width: 108px;', editable : false, cls : 'input-group-nr', - data : [ - { value: 1, displayValue: this.textTabLeft }, - { value: 3, displayValue: this.textTabCenter }, - { value: 2, displayValue: this.textTabRight } - ] + data : this._arrTabAlign }); this.cmbAlign.setValue(1); this.cmbLeader = new Common.UI.ComboBox({ el : $('#paraadv-cmb-leader'), - style : 'width: 85px;', - menuStyle : 'min-width: 85px;', + style : 'width: 108px;', + menuStyle : 'min-width: 108px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Asc.c_oAscTabLeader.None, displayValue: this.textNone }, - { value: Asc.c_oAscTabLeader.Dot, displayValue: '....................' }, - { value: Asc.c_oAscTabLeader.Hyphen, displayValue: '-----------------' }, - { value: Asc.c_oAscTabLeader.MiddleDot, displayValue: '·················' }, - { value: Asc.c_oAscTabLeader.Underscore,displayValue: '__________' } - ] + data : this._arrTabLeader }); this.cmbLeader.setValue(Asc.c_oAscTabLeader.None); @@ -600,6 +754,16 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem } } + if (this.Spacing !== null) { + this._changedProps.asc_putSpacing(this.Spacing); + } + + var spaceBetweenPrg = this.chAddInterval.getValue(); + this._changedProps.asc_putContextualSpacing(spaceBetweenPrg == 'checked'); + + var horizontalAlign = this.cmbTextAlignment.getValue(); + this._changedProps.asc_putJc((horizontalAlign !== undefined && horizontalAlign !== null) ? horizontalAlign : c_paragraphTextAlignment.LEFT); + return { paragraphProps: this._changedProps, borderProps: {borderSize: this.BorderSize, borderColor: this.btnBorderColor.color} }; }, @@ -610,13 +774,34 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.hideTextOnlySettings(this.isChart); this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null; - this.numFirstLine.setValue(this.FirstLine!== null ? Common.Utils.Metric.fnRecalcFromMM(this.FirstLine) : '', true); this.LeftIndent = (props.get_Ind() !== null) ? props.get_Ind().get_Left() : null; if (this.FirstLine<0 && this.LeftIndent !== null) this.LeftIndent = this.LeftIndent + this.FirstLine; this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true); this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true); + this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true); + this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true); + + var linerule = props.get_Spacing().get_LineRule(); + this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true); + + if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) { + this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true); + } else { + this.numLineHeight.setValue('', true); + } + + this.chAddInterval.setValue((props.get_ContextualSpacing() !== null && props.get_ContextualSpacing() !== undefined) ? props.get_ContextualSpacing() : 'indeterminate', true); + + if(this.CurSpecial === undefined) { + this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING); + } + this.cmbSpecial.setValue(this.CurSpecial); + this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); + + this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.LEFT, true); + this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true); this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true); @@ -702,7 +887,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem tabPos: pos, value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), tabAlign: tab.get_Value(), - tabLeader: tab.asc_getLeader() + tabLeader: tab.get_Leader(), + displayTabLeader: this._arrKeyTabLeader[tab.get_Leader()], + displayTabAlign: this._arrKeyTabAlign[tab.get_Value()] }); arr.push(rec); } @@ -723,13 +910,19 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem for (var i=0; i 0 ) { + this.CurSpecial = c_paragraphSpecial.FIRST_LINE; + this.cmbSpecial.setValue(c_paragraphSpecial.FIRST_LINE); + } else if (value === 0) { + this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL; + this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL); + } + this._changedProps.get_Ind().put_FirstLine(value); + } + }, + + onOutlinelevelSelect: function(combo, record) { + }, textTitle: 'Paragraph - Advanced Settings', strIndentsFirstLine: 'First line', strIndentsLeftText: 'Left', strIndentsRightText: 'Right', - strParagraphIndents: 'Indents & Placement', + strParagraphIndents: 'Indents & Spacing', strParagraphPosition: 'Placement', strParagraphFont: 'Font', strBreakBefore: 'Page break before', @@ -1217,6 +1491,26 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem tipOuter: 'Set Outer Border Only', noTabs: 'The specified tabs will appear in this field', textLeader: 'Leader', - textNone: 'None' + textNone: 'None', + strParagraphLine: 'Line & Page Breaks', + strIndentsSpacingBefore: 'Before', + strIndentsSpacingAfter: 'After', + strIndentsLineSpacing: 'Line Spacing', + txtAutoText: 'Auto', + textAuto: 'Multiple', + textAtLeast: 'At least', + textExact: 'Exactly', + strSomeParagraphSpace: 'Don\'t add interval between paragraphs of the same style', + strIndentsSpecial: 'Special', + textNoneSpecial: '(none)', + textFirstLine: 'First line', + textHanging: 'Hanging', + textJustified: 'Justified', + textBodyText: 'BodyText', + textLevel: 'Level ', + strIndentsOutlinelevel: 'Outline level', + strIndent: 'Indents', + strSpacing: 'Spacing' + }, DE.Views.ParagraphSettingsAdvanced || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 6afb0a335..e33266c43 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -187,7 +187,8 @@ define([ asctype: Common.Utils.documentSettingsType.MailMerge, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings[Common.Utils.documentSettingsType.MailMerge] = {panel: "id-mail-merge-settings", btn: this.btnMailMerge}; @@ -202,7 +203,8 @@ define([ asctype: Common.Utils.documentSettingsType.Signature, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature}; diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index af23eb131..b856e4a8c 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1156,6 +1156,8 @@ define([ this._state.GradColor = color; } + this.chShadow.setValue(!!shapeprops.asc_getShadow(), true); + this._noApply = false; } }, @@ -1466,6 +1468,13 @@ define([ this.btnChangeShape.render( $('#shape-btn-change')) ; this.lockedControls.push(this.btnChangeShape); + this.chShadow = new Common.UI.CheckBox({ + el: $('#shape-checkbox-shadow'), + labelText: this.strShadow + }); + this.chShadow.on('change', _.bind(this.onCheckShadow, this)); + this.lockedControls.push(this.chShadow); + this.linkAdvanced = $('#shape-advanced-link'); $(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this)); }, @@ -1591,6 +1600,16 @@ define([ this.fireEvent('editcomplete', this); }, + onCheckShadow: function(field, newValue, oldValue, eOpts) { + if (this.api) { + var props = new Asc.asc_CShapeProperty(); + props.asc_putShadow((field.getValue()=='checked') ? new Asc.asc_CShadowProperty() : null); + this.imgprops.put_ShapeProperties(props); + this.api.ImgApply(this.imgprops); + } + this.fireEvent('editcomplete', this); + }, + fillAutoShapes: function() { var me = this, shapesStore = this.application.getCollection('ShapeGroups'); @@ -1854,6 +1873,7 @@ define([ textHint270: 'Rotate 90° Counterclockwise', textHint90: 'Rotate 90° Clockwise', textHintFlipV: 'Flip Vertically', - textHintFlipH: 'Flip Horizontally' + textHintFlipH: 'Flip Horizontally', + strShadow: 'Show shadow' }, DE.Views.ShapeSettings || {})); }); diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 99270f0f4..c8b9cc613 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -231,7 +231,7 @@ define([ this.langMenu = new Common.UI.MenuSimple({ cls: 'lang-menu', style: 'margin-top:-5px;', - restoreHeight: 300, + restoreHeight: 285, itemTemplate: _.template([ '', '', @@ -364,12 +364,13 @@ define([ this.langMenu.prevTip = info.value; - var index = $parent.find('ul li a:contains("'+info.displayValue+'")').parent().index(); - if (index < 0) { + var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; }); + if (lang) { + this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true); + } else { this.langMenu.saved = info.displayValue; this.langMenu.clearAll(); - } else - this.langMenu.setChecked(index, true); + } } }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index ccb569908..6a1ee4caa 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2055,7 +2055,7 @@ define([ this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl); this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl); - this.mnuInsertImage.items[2].setVisible(this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); + this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); }, onSendThemeColorSchemes: function (schemas) { @@ -2278,7 +2278,7 @@ define([ textTitleError: 'Error', textInsertPageNumber: 'Insert page number', textToCurrent: 'To Current Position', - tipEditHeader: 'Edit Document Header or Footer', + tipEditHeader: 'Edit header or footer', mniEditHeader: 'Edit Document Header', mniEditFooter: 'Edit Document Footer', mniHiddenChars: 'Nonprinting Characters', diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js index 495ef6850..e4174cfc5 100644 --- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js @@ -49,12 +49,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', DE.Views.WatermarkText = new(function() { var langs; var _get = function() { - if (langs) - return langs; - + return langs; + }; + var _load = function(callback) { langs = []; - try { - var langJson = Common.Utils.getConfigJson('resources/watermark/wm-text.json'); + Common.Utils.loadConfig('resources/watermark/wm-text.json', function (langJson) { for (var lang in langJson) { var val = Common.util.LanguageInfo.getLocalLanguageCode(lang); if (val) { @@ -66,14 +65,12 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', if (a.shortname > b.shortname) return 1; return 0; }); - } - catch (e) { - } - - return langs; + callback && callback(langs); + }); }; return { - get: _get + get: _get, + load: _load }; })(); @@ -114,7 +111,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', this.textControls = []; this.imageControls = []; this.fontName = 'Arial'; - this.lang = 'en'; + this.lang = {value: 'en', displayValue: 'English'}; + this.text = ''; this.isAutoColor = false; this.isImageLoaded = false; @@ -209,6 +207,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', scrollAlwaysVisible: true, data : [] }).on('selected', _.bind(this.onSelectLang, this)); + this.cmbLang.setValue(Common.util.LanguageInfo.getLocalLanguageName(9)[1]);//en this.textControls.push(this.cmbLang); this.cmbText = new Common.UI.ComboBox({ @@ -422,18 +421,27 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', }, loadLanguages: function() { - this.languages = DE.Views.WatermarkText.get(); - var data = []; - this.languages && this.languages.forEach(function(item) { - data.push({displayValue: item.name, value: item.shortname, wmtext: item.text}); - }); - this.cmbLang.setData(data); - if (data.length) { - var item = this.cmbLang.store.findWhere({value: this.lang}) || this.cmbLang.store.at(0); - this.cmbLang.setValue(this.lang); - this.onSelectLang(this.cmbLang, item.toJSON()); - } else - this.cmbLang.setDisabled(true); + var me = this; + var callback = function(languages) { + var data = []; + me.languages = languages; + me.languages && me.languages.forEach(function(item) { + data.push({displayValue: item.name, value: item.shortname, wmtext: item.text}); + }); + if (data.length) { + me.cmbLang.setData(data); + me.cmbLang.setValue(me.lang.displayValue); + me.loadWMText(me.lang.value); + me.cmbLang.setDisabled(!me.radioText.getValue()); + me.text && me.cmbText.setValue(me.text); + } else + me.cmbLang.setDisabled(true); + }; + var languages = DE.Views.WatermarkText.get(); + if (languages) + callback(languages); + else + DE.Views.WatermarkText.load(callback); }, onSelectLang: function(combo, record) { @@ -443,9 +451,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', record.wmtext.forEach(function(item) { data.push({value: item}); }); - this.lang = record.value; - this.cmbText.setData(data); - this.cmbText.setValue(data[0].value); + this.lang = record; + if (data.length>0) { + this.cmbText.setData(data); + this.cmbText.setValue(data[0].value); + } }, loadWMText: function(lang) { @@ -463,8 +473,10 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', item && item.get('wmtext').forEach(function(item) { data.push({value: item}); }); - this.cmbText.setData(data); - this.cmbText.setValue(data[0].value); + if (data.length>0) { + this.cmbText.setData(data); + this.cmbText.setValue(data[0].value); + } }, insertFromUrl: function() { @@ -504,7 +516,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', val = props.get_TextPr(); if (val) { var lang = Common.util.LanguageInfo.getLocalLanguageName(val.get_Lang()); - this.lang = lang[0]; + this.lang = {value: lang[0], displayValue: lang[1]}; this.cmbLang.setValue(lang[1]); this.loadWMText(lang[0]); @@ -555,6 +567,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', } val = props.get_Text(); val && this.cmbText.setValue(val); + this.text = val || ''; } this.disableControls(type); } @@ -584,7 +597,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', val.put_Underline(this.btnUnderline.pressed); val.put_Strikeout(this.btnStrikeout.pressed); - val.put_Lang(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.lang))); + val.put_Lang(parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.lang.value))); var color = new Asc.asc_CColor(); if (this.isAutoColor) { @@ -610,7 +623,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', _.each(this.textControls, function(item) { item.setDisabled(disable); }); - this.cmbLang.setDisabled(disable || this.languages.length<1); + this.cmbLang.setDisabled(disable || !this.languages || this.languages.length<1); this.btnOk.setDisabled(type==Asc.c_oAscWatermarkType.Image && !this.isImageLoaded); }, diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 4270f1c3b..c21d8d05c 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -19,7 +19,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loadmask { diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index e2bea029e..45faf2f30 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -20,7 +20,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json index 43e375ca8..903e06308 100644 --- a/apps/documenteditor/main/locale/bg.json +++ b/apps/documenteditor/main/locale/bg.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Внимание", "Common.Controllers.Chat.textEnterMessage": "Въведете съобщението си тук", - "Common.Controllers.Chat.textUserLimit": "Използвате ONLYOFFICE Free Edition.
      Само двама потребители могат да редактират документа едновременно.
      Искате ли повече? Помислете за закупуване на ONLYOFFICE Enterprise Edition.
      Прочетете повече ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Анонимен", "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори", "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, защото се редактира от друг потребител.", @@ -333,7 +332,6 @@ "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": "Изтеглянето", @@ -342,7 +340,7 @@ "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
      Моля, свържете се с администратора на сървъра за документи.", "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.", - "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук ", + "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук", "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка.
      Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.", "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.", "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.", @@ -1346,7 +1344,6 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правото за достъп", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата на създаването", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Зареждане...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Страници", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи", diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index bcffb8c29..57a9eaecc 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Varování", "Common.Controllers.Chat.textEnterMessage": "Zde napište svou zprávu", - "Common.Controllers.Chat.textUserLimit": "Používáte ONLYOFFICE bezplatnou edici.
      Pouze dva uživatelé mohou zároveň upravovat dokument.
      Chcete více? Zvažte zakoupení ONLYOFFICE Enterprise edice.
      Více informací", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymní", "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.", @@ -243,7 +242,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.", "DE.Controllers.Main.criticalErrorExtText": "Kliněte na \"OK\" pro návrat k seznamu dokumentů", "DE.Controllers.Main.criticalErrorTitle": "Chyba", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Editor dokumentů", "DE.Controllers.Main.downloadErrorText": "Stahování selhalo.", "DE.Controllers.Main.downloadMergeText": "Stahování...", "DE.Controllers.Main.downloadMergeTitle": "Stahuji", @@ -252,7 +250,7 @@ "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
      Prosím, kontaktujte administrátora vašeho Dokumentového serveru.", "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.", - "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.
      Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.

      Více informací o připojení najdete v Dokumentovém serveru here", "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.
      Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.", "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.", "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", @@ -969,7 +967,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nejsou zde žádné šablony.", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Změnit přístupová práva", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum vytvoření", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nahrávám ...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Stránky", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odstavce", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index fab5f7340..549634b93 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Achtung", "Common.Controllers.Chat.textEnterMessage": "Geben Sie Ihre Nachricht hier ein", - "Common.Controllers.Chat.textUserLimit": "Sie benutzen ONLYOFFICE Free Edition.
      Nur zwei Benutzer können das Dokument gleichzeitig bearbeiten.
      Möchten Sie mehr? Erwerben Sie kommerzielle Version von ONLYOFFICE Enterprise Edition.
      Lesen Sie mehr davon", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonym", "Common.Controllers.ExternalDiagramEditor.textClose": "Schließen", "Common.Controllers.ExternalDiagramEditor.warningText": "Das Objekt ist deaktiviert, weil es momentan von einem anderen Benutzer bearbeitet wird.", @@ -333,7 +332,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.", "DE.Controllers.Main.criticalErrorExtText": "Klicken Sie auf \"OK\", um in die Dokumentenliste zu gelangen.", "DE.Controllers.Main.criticalErrorTitle": "Fehler", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.", "DE.Controllers.Main.downloadMergeText": "Wird heruntergeladen...", "DE.Controllers.Main.downloadMergeTitle": "Wird heruntergeladen", @@ -342,7 +340,7 @@ "DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
      Wenden Sie sich an Ihren Serveradministrator.", "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.", - "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", + "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
      Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.", "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", @@ -1346,7 +1344,6 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Anwendung", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Verfasser", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zugriffsrechte ändern", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Erstellungsdatum", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ladevorgang...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Seiten", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Absätze", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 830450879..135c39df3 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", - "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", @@ -163,11 +162,11 @@ "Common.Views.Header.tipRedo": "Redo", "Common.Views.Header.tipSave": "Save", "Common.Views.Header.tipUndo": "Undo", + "Common.Views.Header.tipUndock": "Undock into separate window", "Common.Views.Header.tipViewSettings": "View settings", "Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.txtAccessRights": "Change access rights", "Common.Views.Header.txtRename": "Rename", - "Common.Views.Header.tipUndock": "Undock into separate window", "Common.Views.History.textCloseHistory": "Close History", "Common.Views.History.textHide": "Collapse", "Common.Views.History.textHideAll": "Hide detailed changes", @@ -330,12 +329,12 @@ "DE.Controllers.LeftMenu.txtUntitled": "Untitled", "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
      Are you sure you want to continue?", "DE.Controllers.LeftMenu.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.
      Are you sure you want to continue?", + "DE.Controllers.LeftMenu.txtCompatible": "The document will be saved to the new format. It will allow to use all the editor features, but might affect the document layout.
      Use the 'Compatibility' option of the advanced settings if you want to make the files compatible with older MS Word versions.", "DE.Controllers.Main.applyChangesTextText": "Loading the changes...", "DE.Controllers.Main.applyChangesTitleText": "Loading the Changes", "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "DE.Controllers.Main.criticalErrorTitle": "Error", - "del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Download failed.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -1101,6 +1100,7 @@ "DE.Views.DocumentHolder.hyperlinkText": "Hyperlink", "DE.Views.DocumentHolder.ignoreAllSpellText": "Ignore All", "DE.Views.DocumentHolder.ignoreSpellText": "Ignore", + "DE.Views.DocumentHolder.toDictionaryText": "Add to Dictionary", "DE.Views.DocumentHolder.imageText": "Image Advanced Settings", "DE.Views.DocumentHolder.insertColumnLeftText": "Column Left", "DE.Views.DocumentHolder.insertColumnRightText": "Column Right", @@ -1277,6 +1277,7 @@ "DE.Views.DocumentHolder.txtUngroup": "Ungroup", "DE.Views.DocumentHolder.updateStyleText": "Update %1 style", "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "DE.Views.DocumentHolder.txtPrintSelection": "Print Selection", "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel", "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK", "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill", @@ -1345,17 +1346,16 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank text document which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a document of a certain type or purpose where some styles have already been pre-applied.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Text Document", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", - "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text", + "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comment", - "del_DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date", "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Created", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Loading...", - "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified", "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Last Modified By", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified", "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Owner", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphs", @@ -1423,6 +1423,8 @@ "DE.Views.FileMenuPanels.Settings.txtPt": "Point", "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", + "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibility", + "DE.Views.FileMenuPanels.Settings.textOldVersions": "Make the files compatible with older MS Word versions when saved as DOCX", "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center", "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left", "DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page", @@ -1706,7 +1708,6 @@ "DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill", "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before", "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough", - "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line", "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left", "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right", "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together", @@ -1714,7 +1715,7 @@ "DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings", "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Orphan control", "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font", - "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Placement", + "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing", "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Placement", "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", "DE.Views.ParagraphSettingsAdvanced.strStrike": "Strikethrough", @@ -1755,6 +1756,26 @@ "DE.Views.ParagraphSettingsAdvanced.tipRight": "Set right border only", "DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only", "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders", + "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After", + "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing", + "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", + "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", + "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "At least", + "DE.Views.ParagraphSettingsAdvanced.textExact": "Exactly", + "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Don't add interval between paragraphs of the same style", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Special", + "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)", + "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", + "DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", + "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered", + "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified", + "DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText", + "DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ", + "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level", + "DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents", + "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing", "DE.Views.RightMenu.txtChartSettings": "Chart settings", "DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings", "DE.Views.RightMenu.txtImageSettings": "Image settings", @@ -1821,6 +1842,7 @@ "DE.Views.ShapeSettings.txtTight": "Tight", "DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom", "DE.Views.ShapeSettings.txtWood": "Wood", + "DE.Views.ShapeSettings.strShadow": "Show shadow", "DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning", "DE.Views.SignatureSettings.strDelete": "Remove Signature", "DE.Views.SignatureSettings.strDetails": "Signature Details", @@ -2039,6 +2061,7 @@ "DE.Views.Toolbar.capBtnMargins": "Margins", "DE.Views.Toolbar.capBtnPageOrient": "Orientation", "DE.Views.Toolbar.capBtnPageSize": "Size", + "DE.Views.Toolbar.capBtnWatermark": "Watermark", "DE.Views.Toolbar.capImgAlign": "Align", "DE.Views.Toolbar.capImgBackward": "Send Backward", "DE.Views.Toolbar.capImgForward": "Bring Forward", @@ -2070,6 +2093,7 @@ "DE.Views.Toolbar.textColumnsThree": "Three", "DE.Views.Toolbar.textColumnsTwo": "Two", "DE.Views.Toolbar.textContPage": "Continuous Page", + "DE.Views.Toolbar.textEditWatermark": "Custom Watermark", "DE.Views.Toolbar.textEvenPage": "Even Page", "DE.Views.Toolbar.textInMargin": "In Margin", "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break", @@ -2100,6 +2124,7 @@ "DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Remove content control", + "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", "DE.Views.Toolbar.textRichControl": "Insert rich text content control", "DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textStock": "Stock", @@ -2181,6 +2206,7 @@ "DE.Views.Toolbar.tipShowHiddenChars": "Nonprinting characters", "DE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "DE.Views.Toolbar.tipUndo": "Undo", + "DE.Views.Toolbar.tipWatermark": "Edit watermark", "DE.Views.Toolbar.txtDistribHor": "Distribute Horizontally", "DE.Views.Toolbar.txtDistribVert": "Distribute Vertically", "DE.Views.Toolbar.txtMarginAlign": "Align to Margin", @@ -2207,33 +2233,29 @@ "DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme9": "Foundry", - "DE.Views.Toolbar.capBtnWatermark": "Watermark", - "DE.Views.Toolbar.textEditWatermark": "Custom Watermark", - "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", - "DE.Views.Toolbar.tipWatermark": "Edit watermark", - "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark Settings", - "DE.Views.WatermarkSettingsDialog.textNone": "None", - "DE.Views.WatermarkSettingsDialog.textImageW": "Image watermark", - "DE.Views.WatermarkSettingsDialog.textTextW": "Text watermark", - "DE.Views.WatermarkSettingsDialog.textFromUrl": "From URL", - "DE.Views.WatermarkSettingsDialog.textFromFile": "From File", - "DE.Views.WatermarkSettingsDialog.textScale": "Scale", - "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", - "DE.Views.WatermarkSettingsDialog.textText": "Text", - "DE.Views.WatermarkSettingsDialog.textFont": "Font", - "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size", - "DE.Views.WatermarkSettingsDialog.textBold": "Bold", - "DE.Views.WatermarkSettingsDialog.textItalic": "Italic", - "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", - "DE.Views.WatermarkSettingsDialog.textStrikeout": "Strikeout", - "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", - "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal", - "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal", "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancel", - "DE.Views.WatermarkSettingsDialog.okButtonText": "Ok", + "DE.Views.WatermarkSettingsDialog.okButtonText": "OK", + "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", + "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", + "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal", + "DE.Views.WatermarkSettingsDialog.textFont": "Font", + "DE.Views.WatermarkSettingsDialog.textFromFile": "From File", + "DE.Views.WatermarkSettingsDialog.textFromUrl": "From URL", + "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal", + "DE.Views.WatermarkSettingsDialog.textImageW": "Image watermark", + "DE.Views.WatermarkSettingsDialog.textItalic": "Italic", + "DE.Views.WatermarkSettingsDialog.textLanguage": "Language", + "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", "DE.Views.WatermarkSettingsDialog.textNewColor": "Add New Custom Color", - "DE.Views.WatermarkSettingsDialog.textLanguage": "Language" + "DE.Views.WatermarkSettingsDialog.textNone": "None", + "DE.Views.WatermarkSettingsDialog.textScale": "Scale", + "DE.Views.WatermarkSettingsDialog.textStrikeout": "Strikeout", + "DE.Views.WatermarkSettingsDialog.textText": "Text", + "DE.Views.WatermarkSettingsDialog.textTextW": "Text watermark", + "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark Settings", + "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", + "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index f505b86b1..00be95128 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí", - "Common.Controllers.Chat.textUserLimit": "Usted está usando la edición ONLYOFFICE gratuita.
      Sólo dos usuarios pueden editar el documento simultáneamente.
      ¿Quiere más? Compre ONLYOFFICE Enterprise Edition.
      Saber más", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anónimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar", "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.", @@ -163,6 +162,7 @@ "Common.Views.Header.tipRedo": "Rehacer", "Common.Views.Header.tipSave": "Guardar", "Common.Views.Header.tipUndo": "Deshacer", + "Common.Views.Header.tipUndock": "Desacoplar en una ventana independiente", "Common.Views.Header.tipViewSettings": "Mostrar ajustes", "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento", "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso", @@ -333,7 +333,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.", "DE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar al documento.", "DE.Controllers.Main.criticalErrorTitle": "Error", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Error de descarga.", "DE.Controllers.Main.downloadMergeText": "Descargando...", "DE.Controllers.Main.downloadMergeTitle": "Descargando", @@ -342,7 +341,7 @@ "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.
      Por favor, contacte con el Administrador del Servidor de Documentos.", "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.", - "DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.
      Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.
      Encuentre más información acerca de la conexión Servidor de Documentosaquí", + "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.
      Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.

      Encuentre más información acerca de la conexión de Servidor de Documentos aquí", "DE.Controllers.Main.errorDatabaseConnection": "Error externo.
      Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.", "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", @@ -409,7 +408,7 @@ "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
      Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", "DE.Controllers.Main.textLoadingDocument": "Cargando documento", - "DE.Controllers.Main.textNoLicenseTitle": "Conexión ONLYOFFICE", + "DE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones", "DE.Controllers.Main.textPaidFeature": "Función de pago", "DE.Controllers.Main.textShape": "Forma", "DE.Controllers.Main.textStrict": "Modo estricto", @@ -661,8 +660,8 @@ "DE.Controllers.Main.warnLicenseExceeded": "Se ha excedido el número permitido de las conexiones simultáneas al servidor de documentos, y el documento se abrirá para sólo lectura.
      Por favor, contacte con su administrador para recibir más información.", "DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.
      Por favor, actualice su licencia y después recargue la página.", "DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.
      Por favor, contacte con su administrador para recibir más información.", - "DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", - "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", + "DE.Controllers.Main.warnNoLicense": "Esta versión de los editores %1 tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.
      Si necesita más, por favor, considere comprar una licencia comercial.", + "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.
      Si necesita más, por favor, considere comprar una licencia comercial.", "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado", "DE.Controllers.Navigation.txtBeginning": "Principio del documento", "DE.Controllers.Navigation.txtGotoBeginning": "Ir al principio de", @@ -1343,19 +1342,27 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree un nuevo documento de texto en blanco para trabajar con el estilo y el formato y editarlo según sus necesidades. O seleccione una de las plantillas para iniciar documento de cierto tipo o propósito donde algunos estilos se han aplicado ya.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuevo documento de texto", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hay ningunas plantillas", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplicación", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambiar derechos de acceso", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Fecha de creación", + "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comentario", + "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creado", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Cargando...", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Última modificación por", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Última modificación", + "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propietario", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Páginas", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Párrafos", "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Ubicación", "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personas que tienen derechos", "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Símbolos con espacios", "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Estadísticas", + "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Asunto", "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Símbolos", - "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título de documento", + "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título", + "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Subido", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Palabras", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambiar derechos de acceso", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Personas que tienen derechos", @@ -2028,6 +2035,7 @@ "DE.Views.Toolbar.capBtnMargins": "Márgenes", "DE.Views.Toolbar.capBtnPageOrient": "Orientación", "DE.Views.Toolbar.capBtnPageSize": "Tamaño", + "DE.Views.Toolbar.capBtnWatermark": "Marca de agua", "DE.Views.Toolbar.capImgAlign": "Alinear", "DE.Views.Toolbar.capImgBackward": "Enviar atrás", "DE.Views.Toolbar.capImgForward": "Una capa adelante", @@ -2059,6 +2067,7 @@ "DE.Views.Toolbar.textColumnsThree": "Tres", "DE.Views.Toolbar.textColumnsTwo": "Dos", "DE.Views.Toolbar.textContPage": "Página continua", + "DE.Views.Toolbar.textEditWatermark": "Marca de agua personalizada", "DE.Views.Toolbar.textEvenPage": "Página par", "DE.Views.Toolbar.textInMargin": "En margen", "DE.Views.Toolbar.textInsColumnBreak": "Insertar Grieta de Columna", @@ -2089,6 +2098,7 @@ "DE.Views.Toolbar.textPoint": "XY (Dispersión)", "DE.Views.Toolbar.textPortrait": "Vertical", "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido", + "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua", "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico", "DE.Views.Toolbar.textRight": "Derecho: ", "DE.Views.Toolbar.textStock": "De cotizaciones", @@ -2170,6 +2180,7 @@ "DE.Views.Toolbar.tipShowHiddenChars": "Caracteres no imprimibles", "DE.Views.Toolbar.tipSynchronize": "El documento ha sido cambiado por otro usuario. Por favor haga clic para guardar sus cambios y recargue las actualizaciones.", "DE.Views.Toolbar.tipUndo": "Deshacer", + "DE.Views.Toolbar.tipWatermark": "Editar marca de agua", "DE.Views.Toolbar.txtDistribHor": "Distribuir horizontalmente", "DE.Views.Toolbar.txtDistribVert": "Distribuir verticalmente", "DE.Views.Toolbar.txtMarginAlign": "Alinear al margen", @@ -2195,5 +2206,30 @@ "DE.Views.Toolbar.txtScheme6": "Concurrencia", "DE.Views.Toolbar.txtScheme7": "Equidad ", "DE.Views.Toolbar.txtScheme8": "Flujo", - "DE.Views.Toolbar.txtScheme9": "Fundición" + "DE.Views.Toolbar.txtScheme9": "Fundición", + "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancelar", + "DE.Views.WatermarkSettingsDialog.okButtonText": "OK", + "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", + "DE.Views.WatermarkSettingsDialog.textBold": "Negrita", + "DE.Views.WatermarkSettingsDialog.textColor": "Color de texto", + "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal", + "DE.Views.WatermarkSettingsDialog.textFont": "Fuente", + "DE.Views.WatermarkSettingsDialog.textFromFile": "De archivo", + "DE.Views.WatermarkSettingsDialog.textFromUrl": "De URL", + "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal ", + "DE.Views.WatermarkSettingsDialog.textImageW": "Marca de agua de imagen", + "DE.Views.WatermarkSettingsDialog.textItalic": "Cursiva", + "DE.Views.WatermarkSettingsDialog.textLanguage": "Idioma", + "DE.Views.WatermarkSettingsDialog.textLayout": "Disposición", + "DE.Views.WatermarkSettingsDialog.textNewColor": "Añadir nuevo color personalizado", + "DE.Views.WatermarkSettingsDialog.textNone": "Ninguno", + "DE.Views.WatermarkSettingsDialog.textScale": "Escala", + "DE.Views.WatermarkSettingsDialog.textStrikeout": "Tachado", + "DE.Views.WatermarkSettingsDialog.textText": "Texto", + "DE.Views.WatermarkSettingsDialog.textTextW": "Marca de agua de texto", + "DE.Views.WatermarkSettingsDialog.textTitle": "Ajustes de Marca de agua", + "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Subrayado", + "DE.Views.WatermarkSettingsDialog.tipFontName": "Nombre de fuente", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño de fuente" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index d4ac52217..22ea86a8e 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Avertissement", "Common.Controllers.Chat.textEnterMessage": "Entrez votre message ici", - "Common.Controllers.Chat.textUserLimit": "Vous êtes en train d'utiliser ONLYOFFICE Free Edition.
      Ce ne sont que deux utilisateurs qui peuvent éditer le document simultanément.
      Voulez plus ? Envisagez d'acheter ONLYOFFICE Enterprise Edition.
      En savoir plus", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonyme", "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer", "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours de modification par un autre utilisateur.", @@ -334,7 +333,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.", "DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.", "DE.Controllers.Main.criticalErrorTitle": "Erreur", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Échec du téléchargement.", "DE.Controllers.Main.downloadMergeText": "Téléchargement en cours...", "DE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours", @@ -343,7 +341,7 @@ "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": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.", - "DE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
      Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.

      Trouvez plus d'informations sur la connexion de Document Serverici", + "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", "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
      Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.", "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.", @@ -1344,10 +1342,13 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Changer les droits d'accès", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Date de création", + "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire", + "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Chargement en cours...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphes", @@ -1357,6 +1358,7 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiques", "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboles", "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre du document", + "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Mots", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Changer les droits d'accès", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Personnes qui ont des droits", @@ -2029,6 +2031,7 @@ "DE.Views.Toolbar.capBtnMargins": "Marges", "DE.Views.Toolbar.capBtnPageOrient": "Orientation", "DE.Views.Toolbar.capBtnPageSize": "Taille", + "DE.Views.Toolbar.capBtnWatermark": "Filigrane", "DE.Views.Toolbar.capImgAlign": "Aligner", "DE.Views.Toolbar.capImgBackward": "Reculer", "DE.Views.Toolbar.capImgForward": "Déplacer vers l'avant", @@ -2060,6 +2063,7 @@ "DE.Views.Toolbar.textColumnsThree": "Trois", "DE.Views.Toolbar.textColumnsTwo": "Deux", "DE.Views.Toolbar.textContPage": "Page continue", + "DE.Views.Toolbar.textEditWatermark": "Filigrane personnalisé", "DE.Views.Toolbar.textEvenPage": "Page paire", "DE.Views.Toolbar.textInMargin": "Dans la Marge", "DE.Views.Toolbar.textInsColumnBreak": "Insérer un saut de colonne", @@ -2196,5 +2200,14 @@ "DE.Views.Toolbar.txtScheme6": "Rotonde", "DE.Views.Toolbar.txtScheme7": "Capitaux", "DE.Views.Toolbar.txtScheme8": "Flux", - "DE.Views.Toolbar.txtScheme9": "Fonderie" + "DE.Views.Toolbar.txtScheme9": "Fonderie", + "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annuler", + "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", + "DE.Views.WatermarkSettingsDialog.textBold": "Gras", + "DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte", + "DE.Views.WatermarkSettingsDialog.textNewColor": "Ajouter une nouvelle couleur personnalisée", + "DE.Views.WatermarkSettingsDialog.textText": "Texte", + "DE.Views.WatermarkSettingsDialog.textTextW": "Filigrane de texte", + "DE.Views.WatermarkSettingsDialog.textTitle": "Paramètres de filigrane", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index ead830265..8916ccaa8 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Figyelmeztetés", "Common.Controllers.Chat.textEnterMessage": "Írja be ide az üzenetet", - "Common.Controllers.Chat.textUserLimit": "Ön az ONLYOFFICE Ingyenes Kiadást használja.
      Csak két felhasználó szerkesztheti egyszerre a dokumentumot.
      Többet szeretne? Fontolja meg az ONLYOFFICE Vállalati Kiadás megvásárlását
      Tudjon meg többet", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Névtelen", "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár", "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.", @@ -326,7 +325,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.", "DE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\" gombot a dokumentumlistához való visszatéréshez.", "DE.Controllers.Main.criticalErrorTitle": "Hiba", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentum Szerkesztő", "DE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.", "DE.Controllers.Main.downloadMergeText": "Letöltés...", "DE.Controllers.Main.downloadMergeTitle": "Letöltés", @@ -335,7 +333,7 @@ "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.
      Vegye fel a kapcsolatot a Document Server adminisztrátorával.", "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.", - "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", + "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.
      Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.", "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.", "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.", @@ -1266,7 +1264,6 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applikáció", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Szerző", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Hozzáférési jogok módosítása", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Létrehozás dátuma", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Betöltés...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Oldalak", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Bekezdések", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 7b7e95976..1f3d5d599 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Avviso", "Common.Controllers.Chat.textEnterMessage": "Scrivi il tuo messaggio qui", - "Common.Controllers.Chat.textUserLimit": "Stai usando ONLYOFFICE Free Edition.
      Solo due utenti possono modificare il documento contemporaneamente.
      Si desidera di più? Considera l'acquisto di ONLYOFFICE Enterprise Edition.
      Ulteriori informazioni", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi", "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.", @@ -50,6 +49,9 @@ "Common.Controllers.ReviewChanges.textParaDeleted": "Paragrafo Eliminato", "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted", "Common.Controllers.ReviewChanges.textParaInserted": "Paragrafo Inserito", + "Common.Controllers.ReviewChanges.textParaMoveFromDown": "Spostato in basso:", + "Common.Controllers.ReviewChanges.textParaMoveFromUp": "Spostato in alto:", + "Common.Controllers.ReviewChanges.textParaMoveTo": "Spostato:", "Common.Controllers.ReviewChanges.textPosition": "Position", "Common.Controllers.ReviewChanges.textRight": "Align right", "Common.Controllers.ReviewChanges.textShape": "Shape", @@ -61,7 +63,10 @@ "Common.Controllers.ReviewChanges.textStrikeout": "Strikeout", "Common.Controllers.ReviewChanges.textSubScript": "Subscript", "Common.Controllers.ReviewChanges.textSuperScript": "Superscript", - "Common.Controllers.ReviewChanges.textTabs": "Modifica tabelle", + "Common.Controllers.ReviewChanges.textTableChanged": "Impostazioni tabella modificate", + "Common.Controllers.ReviewChanges.textTableRowsAdd": "Righe tabella aggiunte", + "Common.Controllers.ReviewChanges.textTableRowsDel": "Righe tabella eliminate", + "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede", "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato", "Common.Controllers.ReviewChanges.textWidow": "Widow control", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", @@ -157,6 +162,7 @@ "Common.Views.Header.tipRedo": "Ripristina", "Common.Views.Header.tipSave": "Salva", "Common.Views.Header.tipUndo": "Annulla", + "Common.Views.Header.tipUndock": "Sgancia in una finestra separata", "Common.Views.Header.tipViewSettings": "Mostra impostazioni", "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento", "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso", @@ -255,13 +261,13 @@ "Common.Views.ReviewChanges.txtOriginalCap": "Originale", "Common.Views.ReviewChanges.txtPrev": "Precedente", "Common.Views.ReviewChanges.txtReject": "Reject", - "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes", + "Common.Views.ReviewChanges.txtRejectAll": "Annulla tutte le modifiche", "Common.Views.ReviewChanges.txtRejectChanges": "Rifiuta modifiche", - "Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Changes", + "Common.Views.ReviewChanges.txtRejectCurrent": "Annulla le modifiche attuali", "Common.Views.ReviewChanges.txtSharing": "Condivisione", "Common.Views.ReviewChanges.txtSpelling": "Controllo ortografia", "Common.Views.ReviewChanges.txtTurnon": "Traccia cambiamenti", - "Common.Views.ReviewChanges.txtView": "Modalità display", + "Common.Views.ReviewChanges.txtView": "Modalità Visualizzazione", "Common.Views.ReviewChangesDialog.textTitle": "Cambi di Revisione", "Common.Views.ReviewChangesDialog.txtAccept": "Accetta", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accetta tutte le modifiche", @@ -276,6 +282,8 @@ "Common.Views.ReviewPopover.textCancel": "Annulla", "Common.Views.ReviewPopover.textClose": "Chiudi", "Common.Views.ReviewPopover.textEdit": "OK", + "Common.Views.ReviewPopover.textFollowMove": "Segui mossa", + "Common.Views.ReviewPopover.textMention": "+mention fornirà l'accesso al documento e invierà un'e-mail", "Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo", "Common.Views.ReviewPopover.textReply": "Rispondi", "Common.Views.ReviewPopover.textResolve": "Risolvere", @@ -318,6 +326,7 @@ "DE.Controllers.LeftMenu.textNoTextFound": "I dati da cercare non sono stati trovati. Modifica i parametri di ricerca.", "DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.", "DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}", + "DE.Controllers.LeftMenu.txtCompatible": "Il documento verrà salvato nel nuovo formato questo consentirà di utilizzare tutte le funzionalità dell'editor, ma potrebbe influire sul layout del documento.
      Utilizzare l'opzione \"Compatibilità\" nelle impostazioni avanzate se si desidera rendere i file compatibili con le versioni precedenti di MS Word.", "DE.Controllers.LeftMenu.txtUntitled": "Senza titolo", "DE.Controllers.LeftMenu.warnDownloadAs": "Se continua a salvare in questo formato tutte le caratteristiche tranne il testo saranno perse.
      Sei sicuro di voler continuare?", "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.
      Vuoi continuare?", @@ -326,7 +335,6 @@ "DE.Controllers.Main.convertationTimeoutText": "E' stato superato il tempo limite della conversione.", "DE.Controllers.Main.criticalErrorExtText": "Clicca su \"OK\" per ritornare all'elenco dei documenti", "DE.Controllers.Main.criticalErrorTitle": "Errore", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Download fallito.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -335,7 +343,7 @@ "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.
      Si prega di contattare l'amministratore del Server dei Documenti.", "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.", - "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", + "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
      Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", @@ -402,21 +410,21 @@ "DE.Controllers.Main.textContactUs": "Contatta il team di vendite", "DE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore.
      Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.", "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "DE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione", "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "DE.Controllers.Main.textShape": "Forma", "DE.Controllers.Main.textStrict": "Modalità Rigorosa", "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.
      Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.", "DE.Controllers.Main.titleLicenseExp": "La licenza è scaduta", "DE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato", - "DE.Controllers.Main.titleUpdateVersion": "Version changed", + "DE.Controllers.Main.titleUpdateVersion": "Versione Modificata", "DE.Controllers.Main.txtAbove": "Sopra", "DE.Controllers.Main.txtArt": "Il tuo testo qui", "DE.Controllers.Main.txtBasicShapes": "Figure di base", "DE.Controllers.Main.txtBelow": "sotto", "DE.Controllers.Main.txtBookmarkError": "Errore! Segnalibro non definito.", "DE.Controllers.Main.txtButtons": "Bottoni", - "DE.Controllers.Main.txtCallouts": "Chiamate", + "DE.Controllers.Main.txtCallouts": "Callout", "DE.Controllers.Main.txtCharts": "Grafici", "DE.Controllers.Main.txtCurrentDocument": "Documento Corrente", "DE.Controllers.Main.txtDiagramTitle": "Titolo diagramma", @@ -430,6 +438,7 @@ "DE.Controllers.Main.txtFormulaNotInTable": "La formula non in tabella", "DE.Controllers.Main.txtHeader": "Intestazione", "DE.Controllers.Main.txtHyperlink": "Collegamento ipertestuale", + "DE.Controllers.Main.txtIndTooLarge": "Indice troppo grande", "DE.Controllers.Main.txtLines": "Linee", "DE.Controllers.Main.txtMath": "Matematica", "DE.Controllers.Main.txtMissArg": "Argomento mancante", @@ -443,6 +452,12 @@ "DE.Controllers.Main.txtSameAsPrev": "come in precedenza", "DE.Controllers.Main.txtSection": "-Sezione", "DE.Controllers.Main.txtSeries": "Serie", + "DE.Controllers.Main.txtShape_accentBorderCallout1": "Callout Linea con bordo e barra in risalto", + "DE.Controllers.Main.txtShape_accentBorderCallout2": "Callout Linea piegata con bordo e barra in risalto", + "DE.Controllers.Main.txtShape_accentBorderCallout3": "Callout Doppia linea piegata con barra e bordo in risalto", + "DE.Controllers.Main.txtShape_accentCallout1": "Callout Linea con barra in risalto", + "DE.Controllers.Main.txtShape_accentCallout2": "Callout Linea piegata con barra in risalto", + "DE.Controllers.Main.txtShape_accentCallout3": "Callout Doppia linea piegata con barra in risalto", "DE.Controllers.Main.txtShape_actionButtonBackPrevious": "Indietro o Pulsante Precedente", "DE.Controllers.Main.txtShape_actionButtonBeginning": "Pulsante di Inizio", "DE.Controllers.Main.txtShape_actionButtonBlank": "Pulsante Vuoto", @@ -452,19 +467,39 @@ "DE.Controllers.Main.txtShape_actionButtonHelp": "Pulsante Aiuto", "DE.Controllers.Main.txtShape_actionButtonHome": "Pulsante Home", "DE.Controllers.Main.txtShape_actionButtonInformation": "Pulsante Informazioni", + "DE.Controllers.Main.txtShape_actionButtonMovie": "Pulsante Film", "DE.Controllers.Main.txtShape_actionButtonReturn": "Pulsante Invio", "DE.Controllers.Main.txtShape_actionButtonSound": "Pulsante Suono", "DE.Controllers.Main.txtShape_arc": "Arco", "DE.Controllers.Main.txtShape_bentArrow": "Freccia piegata", + "DE.Controllers.Main.txtShape_bentConnector5": "Connettore a gomito", + "DE.Controllers.Main.txtShape_bentConnector5WithArrow": "Connettore freccia a gomito", + "DE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Connettore doppia freccia a gomito", "DE.Controllers.Main.txtShape_bentUpArrow": "Freccia curva in alto", "DE.Controllers.Main.txtShape_bevel": "Smussato", "DE.Controllers.Main.txtShape_blockArc": "Arco a tutto sesto", - "DE.Controllers.Main.txtShape_chevron": "Gallone", + "DE.Controllers.Main.txtShape_borderCallout1": "Callout Linea", + "DE.Controllers.Main.txtShape_borderCallout2": "Callout Linea piegata", + "DE.Controllers.Main.txtShape_borderCallout3": "Callout Doppia linea piegata", + "DE.Controllers.Main.txtShape_bracePair": "Doppia parentesi graffa", + "DE.Controllers.Main.txtShape_callout1": "Callout Linea senza bordo", + "DE.Controllers.Main.txtShape_callout2": "Callout Linea piegata senza bordo ", + "DE.Controllers.Main.txtShape_callout3": "Callout Doppia linea piegata senza bordo", + "DE.Controllers.Main.txtShape_can": "Cilindro", + "DE.Controllers.Main.txtShape_chevron": "freccia a Gallone", + "DE.Controllers.Main.txtShape_chord": "Corda", "DE.Controllers.Main.txtShape_circularArrow": "Freccia circolare", "DE.Controllers.Main.txtShape_cloud": "Nuvola", "DE.Controllers.Main.txtShape_cloudCallout": "Cloud Callout", "DE.Controllers.Main.txtShape_corner": "Angolo", "DE.Controllers.Main.txtShape_cube": "Cubo", + "DE.Controllers.Main.txtShape_curvedConnector3": "Connettore curvo", + "DE.Controllers.Main.txtShape_curvedConnector3WithArrow": "Connettore a freccia curva", + "DE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Connettore a doppia freccia curva", + "DE.Controllers.Main.txtShape_curvedDownArrow": "Freccia curva in basso", + "DE.Controllers.Main.txtShape_curvedLeftArrow": "Freccia curva a sinistra", + "DE.Controllers.Main.txtShape_curvedRightArrow": "Freccia curva a destra", + "DE.Controllers.Main.txtShape_curvedUpArrow": "Freccia curva in su", "DE.Controllers.Main.txtShape_decagon": "Decagono", "DE.Controllers.Main.txtShape_diagStripe": "Striscia diagonale", "DE.Controllers.Main.txtShape_diamond": "Diamante", @@ -472,7 +507,10 @@ "DE.Controllers.Main.txtShape_donut": "Ciambella", "DE.Controllers.Main.txtShape_doubleWave": "Onda doppia", "DE.Controllers.Main.txtShape_downArrow": "Freccia in giù", + "DE.Controllers.Main.txtShape_downArrowCallout": "Callout Freccia in basso", "DE.Controllers.Main.txtShape_ellipse": "Ellisse", + "DE.Controllers.Main.txtShape_ellipseRibbon": "Nastro curvo e inclinato in basso", + "DE.Controllers.Main.txtShape_ellipseRibbon2": "Nastro curvato in alto", "DE.Controllers.Main.txtShape_flowChartAlternateProcess": "Diagramma di flusso: processo alternativo", "DE.Controllers.Main.txtShape_flowChartCollate": "Diagramma di flusso: Fascicolazione", "DE.Controllers.Main.txtShape_flowChartConnector": "Diagramma di flusso: Connettore", @@ -501,7 +539,9 @@ "DE.Controllers.Main.txtShape_flowChartSort": "Diagramma di flusso: Ordinamento", "DE.Controllers.Main.txtShape_flowChartSummingJunction": "Diagramma di flusso: Giunzione di somma", "DE.Controllers.Main.txtShape_flowChartTerminator": "Diagramma di flusso: Terminatore", + "DE.Controllers.Main.txtShape_foldedCorner": "angolo ripiegato", "DE.Controllers.Main.txtShape_frame": "Cornice", + "DE.Controllers.Main.txtShape_halfFrame": "Mezza Cornice", "DE.Controllers.Main.txtShape_heart": "Cuore", "DE.Controllers.Main.txtShape_heptagon": "Ettagono", "DE.Controllers.Main.txtShape_hexagon": "Esagono", @@ -510,16 +550,26 @@ "DE.Controllers.Main.txtShape_irregularSeal1": "Esplosione 1", "DE.Controllers.Main.txtShape_irregularSeal2": "Esplosione 2", "DE.Controllers.Main.txtShape_leftArrow": "Freccia Sinistra", + "DE.Controllers.Main.txtShape_leftArrowCallout": "Callout Freccia a sinistra", + "DE.Controllers.Main.txtShape_leftBrace": "Parentesi graffa aperta", + "DE.Controllers.Main.txtShape_leftBracket": "Parentesi quadra aperta", + "DE.Controllers.Main.txtShape_leftRightArrow": "Freccia bidirezionale sinistra destra", + "DE.Controllers.Main.txtShape_leftRightArrowCallout": "Callout Freccia bidirezionane sinistra destra", + "DE.Controllers.Main.txtShape_leftRightUpArrow": "Freccia tridirezionale sinistra destra alto", + "DE.Controllers.Main.txtShape_leftUpArrow": "Freccia bidirezionale sinistra alto", + "DE.Controllers.Main.txtShape_lightningBolt": "Fulmine", "DE.Controllers.Main.txtShape_line": "Linea", "DE.Controllers.Main.txtShape_lineWithArrow": "Freccia", "DE.Controllers.Main.txtShape_lineWithTwoArrows": "Freccia doppia", "DE.Controllers.Main.txtShape_mathDivide": "Divisione", "DE.Controllers.Main.txtShape_mathEqual": "Uguale", "DE.Controllers.Main.txtShape_mathMinus": "Meno", + "DE.Controllers.Main.txtShape_mathMultiply": "Moltiplicazione", "DE.Controllers.Main.txtShape_mathNotEqual": "Non uguale", "DE.Controllers.Main.txtShape_mathPlus": "Più", "DE.Controllers.Main.txtShape_moon": "Luna", "DE.Controllers.Main.txtShape_noSmoking": "Simbolo \"No\"", + "DE.Controllers.Main.txtShape_notchedRightArrow": "Freccia dentellata a destra ", "DE.Controllers.Main.txtShape_octagon": "Ottagono", "DE.Controllers.Main.txtShape_parallelogram": "Parallelogramma", "DE.Controllers.Main.txtShape_pentagon": "Pentagono", @@ -528,9 +578,25 @@ "DE.Controllers.Main.txtShape_plus": "Più", "DE.Controllers.Main.txtShape_polyline1": "Bozza", "DE.Controllers.Main.txtShape_polyline2": "Forma libera", + "DE.Controllers.Main.txtShape_quadArrow": "Freccia a incrocio", + "DE.Controllers.Main.txtShape_quadArrowCallout": "Callout Freccia a incrocio", "DE.Controllers.Main.txtShape_rect": "Rettangolo", + "DE.Controllers.Main.txtShape_ribbon": "Nastro inclinato in basso", + "DE.Controllers.Main.txtShape_ribbon2": "Nastro inclinato in alto", "DE.Controllers.Main.txtShape_rightArrow": "Freccia destra", + "DE.Controllers.Main.txtShape_rightArrowCallout": "Callout Freccia a destra", + "DE.Controllers.Main.txtShape_rightBrace": "Parentesi graffa chiusa", + "DE.Controllers.Main.txtShape_rightBracket": "Parentesi quadra chiusa", + "DE.Controllers.Main.txtShape_round1Rect": "Rettangolo ad angolo singolo smussato", + "DE.Controllers.Main.txtShape_round2DiagRect": "Rettangolo ad angolo diagonale smussato", + "DE.Controllers.Main.txtShape_round2SameRect": "Rettangolo smussato dallo stesso lato", + "DE.Controllers.Main.txtShape_roundRect": "Rettangolo ad angoli smussati", + "DE.Controllers.Main.txtShape_rtTriangle": "Triangolo rettangolo", "DE.Controllers.Main.txtShape_smileyFace": "Faccia sorridente", + "DE.Controllers.Main.txtShape_snip1Rect": "Ritaglia rettangolo ad angolo singolo", + "DE.Controllers.Main.txtShape_snip2DiagRect": "Ritaglia rettangolo ad angolo diagonale", + "DE.Controllers.Main.txtShape_snip2SameRect": "Ritaglia Rettangolo smussato dallo stesso lato", + "DE.Controllers.Main.txtShape_snipRoundRect": "Ritaglia e smussa singolo angolo rettangolo", "DE.Controllers.Main.txtShape_spline": "Curva", "DE.Controllers.Main.txtShape_star10": "Stella a 10 punte", "DE.Controllers.Main.txtShape_star12": "Stella a 12 punte", @@ -542,14 +608,21 @@ "DE.Controllers.Main.txtShape_star6": "Stella a 6 punte", "DE.Controllers.Main.txtShape_star7": "Stella a 7 punte", "DE.Controllers.Main.txtShape_star8": "Stella a 8 punte", + "DE.Controllers.Main.txtShape_stripedRightArrow": "Freccia a strisce verso destra ", "DE.Controllers.Main.txtShape_sun": "Sole", "DE.Controllers.Main.txtShape_teardrop": "Goccia", "DE.Controllers.Main.txtShape_textRect": "Casella di testo", "DE.Controllers.Main.txtShape_trapezoid": "Trapezio", - "DE.Controllers.Main.txtShape_triangle": "Triangolo", + "DE.Controllers.Main.txtShape_triangle": "Triangolo isoscele", "DE.Controllers.Main.txtShape_upArrow": "Freccia su", + "DE.Controllers.Main.txtShape_upArrowCallout": "Callout Freccia in alto", + "DE.Controllers.Main.txtShape_upDownArrow": "Freccia bidirezionale su giù", + "DE.Controllers.Main.txtShape_uturnArrow": "Freccia a inversione", "DE.Controllers.Main.txtShape_verticalScroll": "Scorrimento verticale", "DE.Controllers.Main.txtShape_wave": "Onda", + "DE.Controllers.Main.txtShape_wedgeEllipseCallout": "Callout Ovale", + "DE.Controllers.Main.txtShape_wedgeRectCallout": "Callout Rettangolare", + "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Callout Rettangolare arrotondato", "DE.Controllers.Main.txtStarsRibbons": "Stelle e nastri", "DE.Controllers.Main.txtStyle_footnote_text": "Nota a piè di pagina", "DE.Controllers.Main.txtStyle_Heading_1": "Titolo 1", @@ -571,9 +644,11 @@ "DE.Controllers.Main.txtSyntaxError": "Errore di sintassi", "DE.Controllers.Main.txtTableInd": "L'indice della tabella non può essere zero", "DE.Controllers.Main.txtTableOfContents": "Sommario", + "DE.Controllers.Main.txtTooLarge": "Numero troppo grande per essere formattato", "DE.Controllers.Main.txtUndefBookmark": "Segnalibro indefinito", "DE.Controllers.Main.txtXAxis": "Asse X", "DE.Controllers.Main.txtYAxis": "Asse Y", + "DE.Controllers.Main.txtZeroDivide": "Diviso Zero", "DE.Controllers.Main.unknownErrorText": "Errore sconosciuto.", "DE.Controllers.Main.unsupportedBrowserErrorText": "Il tuo browser non è supportato.", "DE.Controllers.Main.uploadImageExtMessage": "Formato immagine sconosciuto.", @@ -592,7 +667,7 @@ "DE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.", "DE.Controllers.Navigation.txtBeginning": "Inizio del documento", "DE.Controllers.Navigation.txtGotoBeginning": "Vai all'inizio del documento", - "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", + "DE.Controllers.Statusbar.textHasChanges": "Sono state tracciate nuove modifiche", "DE.Controllers.Statusbar.textTrackChanges": "Il documento è aperto in modalità Traccia Revisioni attivata", "DE.Controllers.Statusbar.tipReview": "Traccia cambiamenti", "DE.Controllers.Statusbar.zoomText": "Zoom {0}%", @@ -1080,6 +1155,7 @@ "DE.Views.DocumentHolder.textEditWrapBoundary": "Modifica bordi disposizione testo", "DE.Views.DocumentHolder.textFlipH": "Capovolgi orizzontalmente", "DE.Views.DocumentHolder.textFlipV": "Capovolgi verticalmente", + "DE.Views.DocumentHolder.textFollow": "Segui mossa", "DE.Views.DocumentHolder.textFromFile": "Da file", "DE.Views.DocumentHolder.textFromUrl": "Da URL", "DE.Views.DocumentHolder.textJoinList": "Iscriviti alla lista precedente", @@ -1268,19 +1344,27 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autore", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambia diritti di accesso", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data di creazione", + "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commento", + "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creato", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Caricamento in corso...", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Ultima modifica di", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Ultima modifica", + "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Proprietario", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pagine", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragrafi", "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Percorso", "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persone con diritti", "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Simboli con spazi", "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistiche", + "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Oggetto", "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simboli", "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titolo documento", + "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Caricato", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Parole", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambia diritti di accesso", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persone con diritti", @@ -1300,7 +1384,7 @@ "DE.Views.FileMenuPanels.Settings.strAutoRecover": "Attiva il ripristino automatico", "DE.Views.FileMenuPanels.Settings.strAutosave": "Attiva salvataggio automatico", "DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Modalità di co-editing", - "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once", + "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Gli altri utenti vedranno immediatamente i tuoi cambiamenti", "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Dovrai accettare i cambiamenti prima di poterli visualizzare.", "DE.Views.FileMenuPanels.Settings.strFast": "Fast", "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting dei caratteri", @@ -1320,9 +1404,11 @@ "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Guide di allineamento", "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Recupero automatico", "DE.Views.FileMenuPanels.Settings.textAutoSave": "Salvataggio automatico", + "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilità", "DE.Views.FileMenuPanels.Settings.textDisabled": "Disattivato", "DE.Views.FileMenuPanels.Settings.textForceSave": "Salva sul server", "DE.Views.FileMenuPanels.Settings.textMinute": "Ogni minuto", + "DE.Views.FileMenuPanels.Settings.textOldVersions": "Rendi i file compatibili con le versioni precedenti di MS Word quando vengono salvati come DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Tutte", "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetro", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Adatta alla pagina", @@ -1953,6 +2039,7 @@ "DE.Views.Toolbar.capBtnMargins": "Margini", "DE.Views.Toolbar.capBtnPageOrient": "Orientamento", "DE.Views.Toolbar.capBtnPageSize": "Dimensione", + "DE.Views.Toolbar.capBtnWatermark": "Filigrana", "DE.Views.Toolbar.capImgAlign": "Allinea", "DE.Views.Toolbar.capImgBackward": "Porta indietro", "DE.Views.Toolbar.capImgForward": "Porta avanti", @@ -1984,6 +2071,7 @@ "DE.Views.Toolbar.textColumnsThree": "Tre", "DE.Views.Toolbar.textColumnsTwo": "Two", "DE.Views.Toolbar.textContPage": "Pagina continua", + "DE.Views.Toolbar.textEditWatermark": "Filigrana personalizzata", "DE.Views.Toolbar.textEvenPage": "Pagina pari", "DE.Views.Toolbar.textInMargin": "Nel margine", "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break", @@ -2014,6 +2102,7 @@ "DE.Views.Toolbar.textPoint": "XY (A dispersione)", "DE.Views.Toolbar.textPortrait": "Verticale", "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto", + "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana", "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF", "DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textStock": "Azionario", @@ -2089,12 +2178,13 @@ "DE.Views.Toolbar.tipPrint": "Stampa", "DE.Views.Toolbar.tipRedo": "Ripristina", "DE.Views.Toolbar.tipSave": "Salva", - "DE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.", + "DE.Views.Toolbar.tipSaveCoauth": "Salva i tuoi cambiamenti per renderli disponibili agli altri utenti.", "DE.Views.Toolbar.tipSendBackward": "Porta indietro", "DE.Views.Toolbar.tipSendForward": "Porta avanti", "DE.Views.Toolbar.tipShowHiddenChars": "Caratteri non stampabili", "DE.Views.Toolbar.tipSynchronize": "Il documento è stato modificato da un altro utente. Clicca per salvare le modifiche e ricaricare gli aggiornamenti.", "DE.Views.Toolbar.tipUndo": "Annulla", + "DE.Views.Toolbar.tipWatermark": "Modifica filigrana", "DE.Views.Toolbar.txtDistribHor": "Distribuisci orizzontalmente", "DE.Views.Toolbar.txtDistribVert": "Distribuisci verticalmente", "DE.Views.Toolbar.txtMarginAlign": "Allinea al margine", @@ -2120,5 +2210,30 @@ "DE.Views.Toolbar.txtScheme6": "Viale", "DE.Views.Toolbar.txtScheme7": "Universo", "DE.Views.Toolbar.txtScheme8": "Flusso", - "DE.Views.Toolbar.txtScheme9": "Galassia" + "DE.Views.Toolbar.txtScheme9": "Galassia", + "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annulla", + "DE.Views.WatermarkSettingsDialog.okButtonText": "OK", + "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", + "DE.Views.WatermarkSettingsDialog.textBold": "Grassetto", + "DE.Views.WatermarkSettingsDialog.textColor": "Colore del testo", + "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonale", + "DE.Views.WatermarkSettingsDialog.textFont": "Carattere", + "DE.Views.WatermarkSettingsDialog.textFromFile": "Da file", + "DE.Views.WatermarkSettingsDialog.textFromUrl": "Da URL", + "DE.Views.WatermarkSettingsDialog.textHor": "Orizzontale", + "DE.Views.WatermarkSettingsDialog.textImageW": "Immagine filigrana", + "DE.Views.WatermarkSettingsDialog.textItalic": "Corsivo", + "DE.Views.WatermarkSettingsDialog.textLanguage": "Lingua", + "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", + "DE.Views.WatermarkSettingsDialog.textNewColor": "Colore personalizzato", + "DE.Views.WatermarkSettingsDialog.textNone": "Nessuno", + "DE.Views.WatermarkSettingsDialog.textScale": "Ridimensiona", + "DE.Views.WatermarkSettingsDialog.textStrikeout": "Barrato", + "DE.Views.WatermarkSettingsDialog.textText": "Testo", + "DE.Views.WatermarkSettingsDialog.textTextW": "Testo filigrana", + "DE.Views.WatermarkSettingsDialog.textTitle": "Impostazioni Filigrana", + "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitrasparente", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Sottolineato", + "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome carattere", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensione carattere" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 757eb077f..351481f2c 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "メッセージをここに挿入する", - "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE無料版を使用しています。
      同時に2人のユーザのみは文書を編集することができます。
      もっとが必要ですか。ONLYOFFICEエンタープライズ版の購入を検討してください。
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名", "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる", "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。", @@ -177,14 +176,13 @@ "DE.Controllers.Main.convertationTimeoutText": "変換のタイムアウトを超過しました。", "DE.Controllers.Main.criticalErrorExtText": "OKボタンを押すと文書リストに戻ることができます。", "DE.Controllers.Main.criticalErrorTitle": "エラー", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "ダウンロード失敗", "DE.Controllers.Main.downloadMergeText": "ダウンロード中...", "DE.Controllers.Main.downloadMergeTitle": "ダウンロード中", "DE.Controllers.Main.downloadTextText": "ドキュメントのダウンロード中...", "DE.Controllers.Main.downloadTitleText": "ドキュメントのダウンロード中", "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。", - "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
      OKボタンをクリックするとドキュメントをダウンロードするように求められます。

      ドキュメントサーバーの接続の詳細情報を見つけます:here", + "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
      OKボタンをクリックするとドキュメントをダウンロードするように求められます。

      ドキュメントサーバーの接続の詳細情報を見つけます:ここに", "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。
      データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。", "DE.Controllers.Main.errorDataRange": "データ範囲が正しくありません", "DE.Controllers.Main.errorDefaultMessage": "エラー コード:%1", @@ -854,7 +852,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "テンプレートなし", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作成者", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "アクセス許可の変更", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "作成日時", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "読み込み中...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "ページ", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "段落", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index d7441b33f..117a8939b 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "경고", "Common.Controllers.Chat.textEnterMessage": "여기에 메시지를 입력하십시오", - "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE 무료 버전을 사용하고 있습니다.
      두 명의 사용자 만이 문서를 동시에 편집 할 수 있습니다.
      ONLYOFFICE Enterprise Edition 구입 고려하십시오.
      자세히보기 ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "익명", "Common.Controllers.ExternalDiagramEditor.textClose": "닫기", "Common.Controllers.ExternalDiagramEditor.warningText": "다른 사용자가 편집 중이므로 개체를 사용할 수 없습니다.", @@ -310,7 +309,6 @@ "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": "다운로드 중", @@ -319,7 +317,7 @@ "DE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다.
      문서 관리자에게 문의하십시오.", "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.", "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.", - "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", + "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", "DE.Controllers.Main.errorDatabaseConnection": "외부 오류.
      데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원부에 문의하십시오.", "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.", "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1", @@ -1095,7 +1093,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "템플릿이 없습니다", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "작성자", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "액세스 권한 변경", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "로드 중 ...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "단락", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index d806618c9..1ab12c11b 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Ievadiet savu ziņu šeit", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", @@ -307,7 +306,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Konversijas taimauts pārsniegts.", "DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "DE.Controllers.Main.criticalErrorTitle": "Kļūda", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentu Redaktors", "DE.Controllers.Main.downloadErrorText": "Lejuplāde neizdevās.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -316,7 +314,7 @@ "DE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.
      Lūdzu, sazinieties ar savu dokumentu servera administratoru.", "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", - "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk par dokumentu servera pieslēgšanu šeit", "DE.Controllers.Main.errorDatabaseConnection": "External error.
      Database connection error. Please contact support in case the error persists.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1", @@ -1092,7 +1090,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nav veidnes", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autors", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Izveides datums", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ielādē...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Lapas", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Rindkopu", @@ -1385,7 +1382,7 @@ "DE.Views.NoteSettingsDialog.textTitle": "Piezīmju uzstādījumi", "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel", "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning", - "DE.Views.PageMarginsDialog.okButtonText": "OK", + "DE.Views.PageMarginsDialog.okButtonText": "Ok", "DE.Views.PageMarginsDialog.textBottom": "Bottom", "DE.Views.PageMarginsDialog.textLeft": "Left", "DE.Views.PageMarginsDialog.textRight": "Right", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 7f99a4e22..e025582b0 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Waarschuwing", "Common.Controllers.Chat.textEnterMessage": "Voer hier uw bericht in", - "Common.Controllers.Chat.textUserLimit": "U gebruikt ONLYOFFICE Free Edition.
      Er kunnen maar twee gebruikers tegelijk het document bewerken.
      U wilt meer? Overweeg ONLYOFFICE Enterprise Edition aan te schaffen.
      Meer informatie", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anoniem", "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten", "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.", @@ -329,7 +328,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.", "DE.Controllers.Main.criticalErrorExtText": "Klik op \"OK\" om terug te keren naar de lijst met documenten.", "DE.Controllers.Main.criticalErrorTitle": "Fout", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE-documenteditor", "DE.Controllers.Main.downloadErrorText": "Download mislukt.", "DE.Controllers.Main.downloadMergeText": "Downloaden...", "DE.Controllers.Main.downloadMergeTitle": "Downloaden", @@ -338,7 +336,7 @@ "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.
      Neem contact op met de beheerder van de documentserver.", "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.", - "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd om het document te downloaden.

      Meer informatie over de verbinding met een documentserver is hier te vinden.", + "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.

      Meer informatie over verbindingen met de documentserver is hier te vinden.", "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.
      Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.", "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.", "DE.Controllers.Main.errorDefaultMessage": "Foutcode: %1", @@ -1212,7 +1210,6 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicatie", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Toegangsrechten wijzigen", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum gemaakt", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Laden...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pagina's", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Alinea's", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index 1b4750dcd..05b0371e7 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie", "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj", - "Common.Controllers.Chat.textUserLimit": "Używasz ONLYOFFICE Free Edition.
      Tylko dwóch użytkowników może jednocześnie edytować dokument. Chcesz więcej? Zastanów się nad zakupem ONLYOFFICE Enterprise Edition. Czytaj więcej ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Gość", "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknij", "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.", @@ -272,7 +271,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.", "DE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\", aby powrócić do listy dokumentów.", "DE.Controllers.Main.criticalErrorTitle": "Błąd", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor dokumentów", "DE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.", "DE.Controllers.Main.downloadMergeText": "Pobieranie...", "DE.Controllers.Main.downloadMergeTitle": "Pobieranie", @@ -281,7 +279,7 @@ "DE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.
      Proszę skontaktować się z administratorem serwera dokumentów.", "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.", - "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", + "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.
      Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.", "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1", @@ -1057,10 +1055,11 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Utwórz nowy pusty dokument tekstowy, który będziesz mógł formatować po jego utworzeniu podczas edytowania. Możesz też wybrać jeden z szablonów, aby utworzyć dokument określonego typu lub celu, w którym niektóre style zostały wcześniej zastosowane.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nowy dokument tekstowy", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tam nie ma żadnych szablonów", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj autora", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj tekst", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikacja", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data utworzenia", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ładowanie...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strony", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Akapity", @@ -1247,8 +1246,10 @@ "DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA", "DE.Views.Links.capBtnBookmarks": "Zakładka", "DE.Views.Links.capBtnInsContents": "Spis treści", + "DE.Views.Links.mniInsFootnote": "Wstaw przypis", "DE.Views.Links.tipBookmarks": "Utwórz zakładkę", "DE.Views.Links.tipInsertHyperlink": "Dodaj hiperłącze", + "DE.Views.Links.tipNotes": "Wstawianie lub edytowanie przypisów", "DE.Views.MailMergeEmailDlg.cancelButtonText": "Anuluj", "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF", "DE.Views.MailMergeEmailDlg.okButtonText": "Wyślij", @@ -1718,9 +1719,10 @@ "DE.Views.Toolbar.textSurface": "Powierzchnia", "DE.Views.Toolbar.textTabCollaboration": "Współpraca", "DE.Views.Toolbar.textTabFile": "Plik", - "DE.Views.Toolbar.textTabHome": "Start", - "DE.Views.Toolbar.textTabInsert": "Wstawić", + "DE.Views.Toolbar.textTabHome": "Narzędzia główne", + "DE.Views.Toolbar.textTabInsert": "Wstawianie", "DE.Views.Toolbar.textTabLayout": "Układ", + "DE.Views.Toolbar.textTabLinks": "Odwołania", "DE.Views.Toolbar.textTabReview": "Przegląd", "DE.Views.Toolbar.textTitleError": "Błąd", "DE.Views.Toolbar.textToCurrent": "Do aktualnej pozycji", @@ -1731,6 +1733,7 @@ "DE.Views.Toolbar.tipAlignLeft": "Wyrównaj do lewej", "DE.Views.Toolbar.tipAlignRight": "Wyrównaj do prawej", "DE.Views.Toolbar.tipBack": "Powrót", + "DE.Views.Toolbar.tipBlankPage": "Wstaw pustą stronę", "DE.Views.Toolbar.tipChangeChart": "Zmień typ wykresu", "DE.Views.Toolbar.tipClearStyle": "Wyczyść style", "DE.Views.Toolbar.tipColorSchemas": "Zmień schemat kolorów", @@ -1801,5 +1804,6 @@ "DE.Views.Toolbar.txtScheme6": "Zbiegowisko", "DE.Views.Toolbar.txtScheme7": "Kapitał", "DE.Views.Toolbar.txtScheme8": "Przepływ", - "DE.Views.Toolbar.txtScheme9": "Odlewnia" + "DE.Views.Toolbar.txtScheme9": "Odlewnia", + "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index a51fb836d..b2d984ee4 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Insira sua mensagem aqui", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anônimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar", "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.", @@ -280,7 +279,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.", "DE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documentos.", "DE.Controllers.Main.criticalErrorTitle": "Erro", - "DE.Controllers.Main.defaultTitleText": "Editor de documento ONLYOFFICE", "DE.Controllers.Main.downloadErrorText": "Download falhou.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -289,7 +287,7 @@ "DE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação que você não tem direitos.
      Contate o administrador do Servidor de Documentos.", "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.", - "DE.Controllers.Main.errorConnectToServer": "O documento não pode ser salvo. Verifique as configurações de conexão ou entre em contato com o seu administrador.
      Quando você clicar no botão \"OK\", poderá baixar o documento.

      Encontre mais informações sobre conexão com o Document Server aqui", + "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.
      Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.

      Encontre mais informações sobre como conecta ao Document Server aqui", "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.
      Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.", "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.", "DE.Controllers.Main.errorDefaultMessage": "Código do erro: %1", @@ -1044,7 +1042,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Não há modelos", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Alterar direitos de acesso", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data de criação", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Carregando...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Páginas", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Parágrafos", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 2df404243..3d2f931b0 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", - "Common.Controllers.Chat.textUserLimit": "Вы используете бесплатную версию ONLYOFFICE.
      Только два пользователя одновременно могут совместно редактировать документ.
      Требуется больше? Рекомендуем приобрести корпоративную версию ONLYOFFICE.
      Читать дальше", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Аноним", "Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть", "Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.", @@ -23,7 +22,7 @@ "Common.Controllers.ReviewChanges.textContextual": "Не добавлять интервал между абзацами одного стиля", "Common.Controllers.ReviewChanges.textDeleted": "Удалено:", "Common.Controllers.ReviewChanges.textDStrikeout": "Двойное зачеркивание", - "Common.Controllers.ReviewChanges.textEquation": "Формула", + "Common.Controllers.ReviewChanges.textEquation": "Уравнение", "Common.Controllers.ReviewChanges.textExact": "Точно", "Common.Controllers.ReviewChanges.textFirstLine": "Первая строка", "Common.Controllers.ReviewChanges.textFontSize": "Размер шрифта", @@ -284,6 +283,7 @@ "Common.Views.ReviewPopover.textClose": "Закрыть", "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textFollowMove": "Перейти на прежнее место", + "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте", "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова", "Common.Views.ReviewPopover.textReply": "Ответить", "Common.Views.ReviewPopover.textResolve": "Решить", @@ -334,7 +334,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "DE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.", "DE.Controllers.Main.criticalErrorTitle": "Ошибка", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Загрузка не удалась.", "DE.Controllers.Main.downloadMergeText": "Загрузка...", "DE.Controllers.Main.downloadMergeTitle": "Загрузка", @@ -343,7 +342,7 @@ "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
      Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", - "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", + "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
      Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", @@ -410,7 +409,7 @@ "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж", "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
      Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", "DE.Controllers.Main.textLoadingDocument": "Загрузка документа", - "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", + "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1", "DE.Controllers.Main.textPaidFeature": "Платная функция", "DE.Controllers.Main.textShape": "Фигура", "DE.Controllers.Main.textStrict": "Строгий режим", @@ -662,8 +661,8 @@ "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.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Navigation.txtBeginning": "Начало документа", "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа", @@ -1100,6 +1099,7 @@ "DE.Views.DocumentHolder.hyperlinkText": "Гиперссылка", "DE.Views.DocumentHolder.ignoreAllSpellText": "Пропустить все", "DE.Views.DocumentHolder.ignoreSpellText": "Пропустить", + "DE.Views.DocumentHolder.toDictionaryText": "Добавить в словарь", "DE.Views.DocumentHolder.imageText": "Дополнительные параметры изображения", "DE.Views.DocumentHolder.insertColumnLeftText": "Столбец слева", "DE.Views.DocumentHolder.insertColumnRightText": "Столбец справа", @@ -1276,6 +1276,7 @@ "DE.Views.DocumentHolder.txtUngroup": "Разгруппировать", "DE.Views.DocumentHolder.updateStyleText": "Обновить стиль %1", "DE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание", + "DE.Views.DocumentHolder.txtPrintSelection": "Напечатать выделенное", "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Отмена", "DE.Views.DropcapSettingsAdvanced.okButtonText": "ОК", "DE.Views.DropcapSettingsAdvanced.strBorders": "Границы и заливка", @@ -1344,19 +1345,27 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новый пустой текстовый документ, к которому Вы сможете применить стили и отформатировать при редактировании после того, как он создан. Или выберите один из шаблонов, чтобы создать документ определенного типа или предназначения, где уже предварительно применены некоторые стили.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новый текстовый документ", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Изменить права доступа", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата создания", + "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Комментарий", + "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Создан", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Загрузка...", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Автор последнего изменения", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Последнее изменение", + "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Владелец", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Страницы", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Абзацы", "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Размещение", "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Люди, имеющие права", "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Символы с пробелами", "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Статистика", + "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Тема", "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Символы", - "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название документа", + "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название", + "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Загружен", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Слова", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Изменить права доступа", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права", @@ -1704,7 +1713,8 @@ "DE.Views.ParagraphSettingsAdvanced.strMargins": "Внутренние поля", "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Запрет висячих строк", "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт", - "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение", + "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы", + "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Положение на странице", "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Положение", "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные", "DE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание", @@ -1745,6 +1755,24 @@ "DE.Views.ParagraphSettingsAdvanced.tipRight": "Задать только правую границу", "DE.Views.ParagraphSettingsAdvanced.tipTop": "Задать только верхнюю границу", "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Без границ", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После", + "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал", + "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Авто", + "DE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель", + "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Минимум", + "DE.Views.ParagraphSettingsAdvanced.textExact": "Точно", + "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка", + "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)", + "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ", + "DE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ", + "DE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине", + "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Основной текст", + "DE.Views.ParagraphSettingsAdvanced.textLevel": "Уровень ", + "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Уровень", + "DE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы", + "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами", "DE.Views.RightMenu.txtChartSettings": "Параметры диаграммы", "DE.Views.RightMenu.txtHeaderFooterSettings": "Параметры верхнего и нижнего колонтитулов", "DE.Views.RightMenu.txtImageSettings": "Параметры изображения", @@ -1811,6 +1839,7 @@ "DE.Views.ShapeSettings.txtTight": "По контуру", "DE.Views.ShapeSettings.txtTopAndBottom": "Сверху и снизу", "DE.Views.ShapeSettings.txtWood": "Дерево", + "DE.Views.ShapeSettings.strShadow": "Отображать тень", "DE.Views.SignatureSettings.notcriticalErrorTitle": "Внимание", "DE.Views.SignatureSettings.strDelete": "Удалить подпись", "DE.Views.SignatureSettings.strDetails": "Состав подписи", @@ -2018,7 +2047,7 @@ "DE.Views.Toolbar.capBtnInsChart": "Диаграмма", "DE.Views.Toolbar.capBtnInsControls": "Элементы управления содержимым", "DE.Views.Toolbar.capBtnInsDropcap": "Буквица", - "DE.Views.Toolbar.capBtnInsEquation": "Формула", + "DE.Views.Toolbar.capBtnInsEquation": "Уравнение", "DE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", "DE.Views.Toolbar.capBtnInsImage": "Изображение", "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы", @@ -2029,6 +2058,7 @@ "DE.Views.Toolbar.capBtnMargins": "Поля", "DE.Views.Toolbar.capBtnPageOrient": "Ориентация", "DE.Views.Toolbar.capBtnPageSize": "Размер", + "DE.Views.Toolbar.capBtnWatermark": "Подложка", "DE.Views.Toolbar.capImgAlign": "Выравнивание", "DE.Views.Toolbar.capImgBackward": "Перенести назад", "DE.Views.Toolbar.capImgForward": "Перенести вперед", @@ -2060,6 +2090,7 @@ "DE.Views.Toolbar.textColumnsThree": "Три", "DE.Views.Toolbar.textColumnsTwo": "Две", "DE.Views.Toolbar.textContPage": "На текущей странице", + "DE.Views.Toolbar.textEditWatermark": "Настраиваемая подложка", "DE.Views.Toolbar.textEvenPage": "С четной страницы", "DE.Views.Toolbar.textInMargin": "На поле", "DE.Views.Toolbar.textInsColumnBreak": "Вставить разрыв колонки", @@ -2090,6 +2121,7 @@ "DE.Views.Toolbar.textPoint": "Точечная", "DE.Views.Toolbar.textPortrait": "Книжная", "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым", + "DE.Views.Toolbar.textRemWatermark": "Удалить подложку", "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"", "DE.Views.Toolbar.textRight": "Правое: ", "DE.Views.Toolbar.textStock": "Биржевая", @@ -2143,7 +2175,7 @@ "DE.Views.Toolbar.tipIncFont": "Увеличить размер шрифта", "DE.Views.Toolbar.tipIncPrLeft": "Увеличить отступ", "DE.Views.Toolbar.tipInsertChart": "Вставить диаграмму", - "DE.Views.Toolbar.tipInsertEquation": "Вставить формулу", + "DE.Views.Toolbar.tipInsertEquation": "Вставить уравнение", "DE.Views.Toolbar.tipInsertImage": "Вставить изображение", "DE.Views.Toolbar.tipInsertNum": "Вставить номер страницы", "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", @@ -2171,6 +2203,7 @@ "DE.Views.Toolbar.tipShowHiddenChars": "Непечатаемые символы", "DE.Views.Toolbar.tipSynchronize": "Документ изменен другим пользователем. Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "DE.Views.Toolbar.tipUndo": "Отменить", + "DE.Views.Toolbar.tipWatermark": "Изменить подложку", "DE.Views.Toolbar.txtDistribHor": "Распределить по горизонтали", "DE.Views.Toolbar.txtDistribVert": "Распределить по вертикали", "DE.Views.Toolbar.txtMarginAlign": "Выровнять относительно поля", @@ -2196,5 +2229,30 @@ "DE.Views.Toolbar.txtScheme6": "Открытая", "DE.Views.Toolbar.txtScheme7": "Справедливость", "DE.Views.Toolbar.txtScheme8": "Поток", - "DE.Views.Toolbar.txtScheme9": "Литейная" + "DE.Views.Toolbar.txtScheme9": "Литейная", + "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Отмена", + "DE.Views.WatermarkSettingsDialog.okButtonText": "OK", + "DE.Views.WatermarkSettingsDialog.textAuto": "Авто", + "DE.Views.WatermarkSettingsDialog.textBold": "Жирный", + "DE.Views.WatermarkSettingsDialog.textColor": "Цвет текста", + "DE.Views.WatermarkSettingsDialog.textDiagonal": "По диагонали", + "DE.Views.WatermarkSettingsDialog.textFont": "Шрифт", + "DE.Views.WatermarkSettingsDialog.textFromFile": "Из файла", + "DE.Views.WatermarkSettingsDialog.textFromUrl": "По URL", + "DE.Views.WatermarkSettingsDialog.textHor": "По горизонтали", + "DE.Views.WatermarkSettingsDialog.textImageW": "Графическая подложка", + "DE.Views.WatermarkSettingsDialog.textItalic": "Курсив", + "DE.Views.WatermarkSettingsDialog.textLanguage": "Язык", + "DE.Views.WatermarkSettingsDialog.textLayout": "Расположение", + "DE.Views.WatermarkSettingsDialog.textNewColor": "Пользовательский цвет", + "DE.Views.WatermarkSettingsDialog.textNone": "Нет", + "DE.Views.WatermarkSettingsDialog.textScale": "Масштаб", + "DE.Views.WatermarkSettingsDialog.textStrikeout": "Зачеркнутый", + "DE.Views.WatermarkSettingsDialog.textText": "Текст", + "DE.Views.WatermarkSettingsDialog.textTextW": "Текстовая подложка", + "DE.Views.WatermarkSettingsDialog.textTitle": "Параметры подложки", + "DE.Views.WatermarkSettingsDialog.textTransparency": "Полупрозрачный", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Подчёркнутый", + "DE.Views.WatermarkSettingsDialog.tipFontName": "Шрифт", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер шрифта" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index 9146b753f..d32e5151d 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Upozornenie", "Common.Controllers.Chat.textEnterMessage": "Zadať svoju správu tu", - "Common.Controllers.Chat.textUserLimit": "Používate ONLYOFFICE vydanie zadarmo.
      Iba dvaja používatelia dokážu spolueditovať dokument súčasne.
      Chcete viac? Zvážte kúpu ONLYOFFICE Podnikové vydanie.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymný", "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.", @@ -288,7 +287,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.", "DE.Controllers.Main.criticalErrorExtText": "Stlačte \"OK\" pre návrat do zoznamu dokumentov.", "DE.Controllers.Main.criticalErrorTitle": "Chyba", - "DE.Controllers.Main.defaultTitleText": "Dokumentový editor ONLYOFFICE ", "DE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.", "DE.Controllers.Main.downloadMergeText": "Sťahovanie...", "DE.Controllers.Main.downloadMergeTitle": "Sťahovanie", @@ -297,7 +295,7 @@ "DE.Controllers.Main.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.
      Prosím, kontaktujte svojho správcu dokumentového servera. ", "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.", - "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", + "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.
      Chyba spojenia databázy. Prosím, kontaktujte podporu ak chyba pretrváva. ", "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.", "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", @@ -1041,7 +1039,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Neexistujú žiadne šablóny", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmeniť prístupové práva", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Dátum vytvorenia", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nahrávanie...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strany", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odseky", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index bcc45f5b9..2a214f389 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Opozorilo", "Common.Controllers.Chat.textEnterMessage": "Svoje sporočilo vnesite tu", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimno", "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.", @@ -174,7 +173,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Pretvorbena prekinitev presežena.", "DE.Controllers.Main.criticalErrorExtText": "Pritisnite \"OK\" za vrnitev na seznam dokumentov.", "DE.Controllers.Main.criticalErrorTitle": "Napaka", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE urejevalec dokumentov", "DE.Controllers.Main.downloadErrorText": "Prenos ni uspel.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -851,7 +849,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ni predlog", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Avtor", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Spremeni pravice dostopa", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum nastanka", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Nalaganje...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strani", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Odstavki", diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index a2906a75b..f79abc367 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Dikkat", "Common.Controllers.Chat.textEnterMessage": "Mesajınızı buraya giriniz", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonim", "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat", "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.", @@ -145,10 +144,13 @@ "Common.Views.Header.textSaveChanged": "Modifiyeli", "Common.Views.Header.textSaveEnd": "Tüm değişiklikler kaydedildi", "Common.Views.Header.textSaveExpander": "Tüm değişiklikler kaydedildi", + "Common.Views.Header.textZoom": "Büyüt", "Common.Views.Header.tipAccessRights": "Belge erişim haklarını yönet", "Common.Views.Header.tipDownload": "Dosyayı indir", "Common.Views.Header.tipGoEdit": "Mevcut belgeyi düzenle", "Common.Views.Header.tipPrint": "Sayfayı yazdır", + "Common.Views.Header.tipSave": "Kaydet", + "Common.Views.Header.tipUndo": "Geri Al", "Common.Views.Header.tipViewUsers": "Kullanıcıları görüntüle ve belge erişim haklarını yönet", "Common.Views.Header.txtAccessRights": "Erişim haklarını değiştir", "Common.Views.Header.txtRename": "Yeniden adlandır", @@ -176,12 +178,16 @@ "Common.Views.LanguageDialog.btnOk": "Tamam", "Common.Views.LanguageDialog.labelSelect": "Belge dilini seçin", "Common.Views.OpenDialog.cancelButtonText": "Cancel", + "Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat", "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Şifre hatalı.", "Common.Views.OpenDialog.txtPassword": "Şifre", "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtTitleProtected": "Korumalı dosya", + "Common.Views.PasswordDialog.cancelButtonText": "İptal", + "Common.Views.PasswordDialog.okButtonText": "Tamam", + "Common.Views.PasswordDialog.txtPassword": "Parola", "Common.Views.PluginDlg.textLoading": "Yükleniyor", "Common.Views.Plugins.groupCaption": "Eklentiler", "Common.Views.Plugins.strPlugins": "Plugin", @@ -227,6 +233,21 @@ "Common.Views.ReviewChangesDialog.txtReject": "Reddet", "Common.Views.ReviewChangesDialog.txtRejectAll": "Tüm Değişiklikleri Reddet", "Common.Views.ReviewChangesDialog.txtRejectCurrent": "Mevcut Değişiklikleri Reddet", + "Common.Views.ReviewPopover.textAdd": "Ekle", + "Common.Views.ReviewPopover.textCancel": "İptal", + "Common.Views.ReviewPopover.textClose": "Kapat", + "Common.Views.ReviewPopover.textEdit": "Tamam", + "Common.Views.ReviewPopover.textReply": "Yanıtla", + "Common.Views.SignDialog.cancelButtonText": "İptal", + "Common.Views.SignDialog.okButtonText": "Tamam", + "Common.Views.SignDialog.textBold": "Kalın", + "Common.Views.SignDialog.textCertificate": "Sertifika", + "Common.Views.SignDialog.textChange": "Değiştir", + "Common.Views.SignDialog.textItalic": "İtalik", + "Common.Views.SignSettingsDialog.cancelButtonText": "İptal", + "Common.Views.SignSettingsDialog.okButtonText": "Tamam", + "Common.Views.SignSettingsDialog.textInfoEmail": "E-posta", + "Common.Views.SignSettingsDialog.textInfoName": "İsim", "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.
      Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", "DE.Controllers.LeftMenu.newDocumentTitle": "İsimlendirilmemiş döküman", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", @@ -241,7 +262,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Değişim süresi geçti.", "DE.Controllers.Main.criticalErrorExtText": "Döküman listesine dönmek için \"TAMAM\"'a tıklayın", "DE.Controllers.Main.criticalErrorTitle": "Hata", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Döküman Editörü", "DE.Controllers.Main.downloadErrorText": "Yükleme başarısız oldu.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -250,7 +270,7 @@ "DE.Controllers.Main.errorAccessDeny": "Hakiniz olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.
      Lütfen Document Server yöneticinize başvurun.", "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Döküman şu an düzenlenemez.", - "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.

      Belge Sunucusuna bağlanma konusunda daha fazla bilgi için buraya tıklayın", "DE.Controllers.Main.errorDatabaseConnection": "Harci hata.
      Veri tabanı bağlantı hatası. Hata devam ederse lütfen destek ile iletişime geçin.", "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.", "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1", @@ -306,6 +326,7 @@ "DE.Controllers.Main.textAnonymous": "Anonim", "DE.Controllers.Main.textBuyNow": "Websitesini ziyaret edin", "DE.Controllers.Main.textChangesSaved": "Tüm değişiklikler kaydedildi", + "DE.Controllers.Main.textClose": "Kapat", "DE.Controllers.Main.textCloseTip": "Ucu kapamak için tıklayın", "DE.Controllers.Main.textContactUs": "Satış departmanı ile iletişime geçin", "DE.Controllers.Main.textLoadingDocument": "Döküman yükleniyor", @@ -330,6 +351,21 @@ "DE.Controllers.Main.txtNeedSynchronize": "Güncellemeleriniz var", "DE.Controllers.Main.txtRectangles": "Dikdörtgenler", "DE.Controllers.Main.txtSeries": "Seriler", + "DE.Controllers.Main.txtShape_actionButtonHome": "Ev Tuşu", + "DE.Controllers.Main.txtShape_cloud": "Bulut", + "DE.Controllers.Main.txtShape_leftArrow": "Sol Ok", + "DE.Controllers.Main.txtShape_lineWithArrow": "Ok", + "DE.Controllers.Main.txtShape_noSmoking": "Simge \"Yok\"", + "DE.Controllers.Main.txtShape_star10": "10-Numara Yıldız", + "DE.Controllers.Main.txtShape_star12": "12-Numara Yıldız", + "DE.Controllers.Main.txtShape_star16": "16-Numara Yıldız", + "DE.Controllers.Main.txtShape_star24": "24-Numara Yıldız", + "DE.Controllers.Main.txtShape_star32": "32-Numara Yıldız", + "DE.Controllers.Main.txtShape_star4": "4-Numara Yıldız", + "DE.Controllers.Main.txtShape_star5": "5-Numara Yıldız", + "DE.Controllers.Main.txtShape_star6": "6-Numara Yıldız", + "DE.Controllers.Main.txtShape_star7": "7-Numara Yıldız", + "DE.Controllers.Main.txtShape_star8": "8-Numara Yıldız", "DE.Controllers.Main.txtStarsRibbons": "Yıldızlar & Kurdeleler", "DE.Controllers.Main.txtStyle_Heading_1": "Başlık 1", "DE.Controllers.Main.txtStyle_Heading_2": "Başlık 2", @@ -700,6 +736,10 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", + "DE.Views.BookmarksDialog.textAdd": "Ekle", + "DE.Views.BookmarksDialog.textClose": "Kapat", + "DE.Views.BookmarksDialog.textDelete": "Sil", + "DE.Views.BookmarksDialog.textName": "İsim", "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster", "DE.Views.ChartSettings.textArea": "Bölge Grafiği", "DE.Views.ChartSettings.textBar": "Çubuk grafik", @@ -726,6 +766,11 @@ "DE.Views.ChartSettings.txtTight": "Sıkı", "DE.Views.ChartSettings.txtTitle": "Grafik", "DE.Views.ChartSettings.txtTopAndBottom": "Üst ve alt", + "DE.Views.ControlSettingsDialog.cancelButtonText": "İptal", + "DE.Views.ControlSettingsDialog.okButtonText": "Tamam", + "DE.Views.ControlSettingsDialog.textColor": "Renk", + "DE.Views.ControlSettingsDialog.textName": "Başlık", + "DE.Views.ControlSettingsDialog.textTag": "Etiket", "DE.Views.CustomColumnsDialog.cancelButtonText": "İptal", "DE.Views.CustomColumnsDialog.okButtonText": "Tamam", "DE.Views.CustomColumnsDialog.textColumns": "Sütun sayısı", @@ -806,6 +851,9 @@ "DE.Views.DocumentHolder.textNextPage": "Sonraki Sayfa", "DE.Views.DocumentHolder.textPaste": "Yapıştır", "DE.Views.DocumentHolder.textPrevPage": "Önceki Sayfa", + "DE.Views.DocumentHolder.textRotate": "Döndür", + "DE.Views.DocumentHolder.textRotate270": "Döndür 90° Saatyönütersi", + "DE.Views.DocumentHolder.textRotate90": "Döndür 90° Saatyönü", "DE.Views.DocumentHolder.textShapeAlignBottom": "Alta Hizala", "DE.Views.DocumentHolder.textShapeAlignCenter": "Ortaya Hizala", "DE.Views.DocumentHolder.textShapeAlignLeft": "Sola Hizala", @@ -950,6 +998,7 @@ "DE.Views.FileMenu.btnHistoryCaption": "Version History", "DE.Views.FileMenu.btnInfoCaption": "Döküman Bilgisi...", "DE.Views.FileMenu.btnPrintCaption": "Yazdır", + "DE.Views.FileMenu.btnProtectCaption": "Koru", "DE.Views.FileMenu.btnRecentFilesCaption": "En sonunucuyu aç...", "DE.Views.FileMenu.btnRenameCaption": "Yeniden adlandır...", "DE.Views.FileMenu.btnReturnCaption": "Dökümana Geri Dön", @@ -964,10 +1013,11 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş metin dosyası oluşturun. Yada belli tipte yada amaçta dökümana başlamak için şablonlardan birini seçin, bu şablonlar önceden düzenlenmiştir.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Metin Dökümanı", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok", + "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Erişim haklarını değiştir", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Oluşturulma tarihi", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Yükleniyor...", + "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Sahip", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Sayfalar", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraflar", "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasyon", @@ -1051,8 +1101,11 @@ "DE.Views.ImageSettings.textFromFile": "Dosyadan", "DE.Views.ImageSettings.textFromUrl": "URL'den", "DE.Views.ImageSettings.textHeight": "Yükseklik", + "DE.Views.ImageSettings.textHint270": "Döndür 90° Saatyönütersi", + "DE.Views.ImageSettings.textHint90": "Döndür 90° Saatyönü", "DE.Views.ImageSettings.textInsert": "Resimi Değiştir", "DE.Views.ImageSettings.textOriginalSize": "Varsayılan Boyut", + "DE.Views.ImageSettings.textRotate90": "Döndür 90°", "DE.Views.ImageSettings.textSize": "Boyut", "DE.Views.ImageSettings.textWidth": "Genişlik", "DE.Views.ImageSettings.textWrap": "Kaydırma Stili", @@ -1072,6 +1125,7 @@ "DE.Views.ImageSettingsAdvanced.textAltDescription": "Açıklama", "DE.Views.ImageSettingsAdvanced.textAltTip": "Görsel obje bilgilerinin alternatif metin tabanlı sunumu görsel veya bilinçsel açıdan problem yaşan kişilere okunarak resimdeki, şekildeki, grafikteki veya tablodaki bilgileri daha kolay anlamalarını sağlamayı amaçlar.", "DE.Views.ImageSettingsAdvanced.textAltTitle": "Başlık", + "DE.Views.ImageSettingsAdvanced.textAngle": "Açı", "DE.Views.ImageSettingsAdvanced.textArrows": "Oklar", "DE.Views.ImageSettingsAdvanced.textAspectRatio": "En-boy oranını kilitle", "DE.Views.ImageSettingsAdvanced.textBeginSize": "Başlama Boyutu", @@ -1188,6 +1242,7 @@ "DE.Views.MailMergeSettings.txtPrev": "To previous record", "DE.Views.MailMergeSettings.txtUntitled": "Untitled", "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed", + "DE.Views.Navigation.txtCollapse": "Hepsini daralt", "DE.Views.NoteSettingsDialog.textApply": "Uygula", "DE.Views.NoteSettingsDialog.textApplyTo": "Değişiklikleri uygula", "DE.Views.NoteSettingsDialog.textCancel": "İptal", @@ -1207,6 +1262,8 @@ "DE.Views.NoteSettingsDialog.textStart": "Başlatma zamanı", "DE.Views.NoteSettingsDialog.textTextBottom": "Aşağıdaki metin", "DE.Views.NoteSettingsDialog.textTitle": "Not ayarları", + "DE.Views.NumberingValueDialog.cancelButtonText": "İptal", + "DE.Views.NumberingValueDialog.okButtonText": "Tamam", "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel", "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning", "DE.Views.PageMarginsDialog.okButtonText": "OK", @@ -1266,6 +1323,7 @@ "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Karakter aralığı", "DE.Views.ParagraphSettingsAdvanced.textDefault": "Varsayılan Sekme", "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efektler", + "DE.Views.ParagraphSettingsAdvanced.textLeader": "Lider", "DE.Views.ParagraphSettingsAdvanced.textLeft": "Sol", "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Yeni Özel Renk Ekle", "DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozisyon", @@ -1316,12 +1374,15 @@ "DE.Views.ShapeSettings.textFromUrl": "URL'den", "DE.Views.ShapeSettings.textGradient": "Gradyan", "DE.Views.ShapeSettings.textGradientFill": "Gradyan Dolgu", + "DE.Views.ShapeSettings.textHint270": "Döndür 90° Saatyönütersi", + "DE.Views.ShapeSettings.textHint90": "Döndür 90° Saatyönü", "DE.Views.ShapeSettings.textImageTexture": "Resim yada Doldurma Deseni", "DE.Views.ShapeSettings.textLinear": "Doğrusal", "DE.Views.ShapeSettings.textNewColor": "Yeni Özel Renk Ekle", "DE.Views.ShapeSettings.textNoFill": "Dolgu Yok", "DE.Views.ShapeSettings.textPatternFill": "Desen", "DE.Views.ShapeSettings.textRadial": "Radyal", + "DE.Views.ShapeSettings.textRotate90": "Döndür 90°", "DE.Views.ShapeSettings.textSelectTexture": "Seç", "DE.Views.ShapeSettings.textStretch": "Esnet", "DE.Views.ShapeSettings.textStyle": "Stil", @@ -1361,6 +1422,14 @@ "DE.Views.StyleTitleDialog.textTitle": "Title", "DE.Views.StyleTitleDialog.txtEmpty": "This field is required", "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty", + "DE.Views.TableFormulaDialog.cancelButtonText": "İptal", + "DE.Views.TableFormulaDialog.okButtonText": "Tamam", + "DE.Views.TableOfContentsSettings.cancelButtonText": "İptal", + "DE.Views.TableOfContentsSettings.okButtonText": "Tamam", + "DE.Views.TableOfContentsSettings.textLeader": "Lider", + "DE.Views.TableOfContentsSettings.textLevel": "Seviye", + "DE.Views.TableOfContentsSettings.textLevels": "Seviyeler", + "DE.Views.TableOfContentsSettings.txtModern": "Modern", "DE.Views.TableSettings.deleteColumnText": "Sütunu Sil", "DE.Views.TableSettings.deleteRowText": "Satırı Sil", "DE.Views.TableSettings.deleteTableText": "Tabloyu Sil", @@ -1382,6 +1451,7 @@ "DE.Views.TableSettings.textBorderColor": "Renk", "DE.Views.TableSettings.textBorders": "Sınır Stili", "DE.Views.TableSettings.textCancel": "İptal Et", + "DE.Views.TableSettings.textCellSize": "Hücre boyutu", "DE.Views.TableSettings.textColumns": "Sütunlar", "DE.Views.TableSettings.textEdit": "Satırlar & Sütunlar", "DE.Views.TableSettings.textEmptyTemplate": "Şablon yok", @@ -1394,6 +1464,7 @@ "DE.Views.TableSettings.textSelectBorders": "Yukarıda seçilen stili uygulayarak değiştirmek istediğiniz sınırları seçin", "DE.Views.TableSettings.textTemplate": "Şablondan Seç", "DE.Views.TableSettings.textTotal": "Toplam", + "DE.Views.TableSettings.textWidth": "Genişlik", "DE.Views.TableSettings.tipAll": "Dış Sınır ve Tüm İç Satırları Belirle", "DE.Views.TableSettings.tipBottom": "Sadece Dış Alt Sınırı Belirle", "DE.Views.TableSettings.tipInner": "Sadece İç Satırları Belirle", @@ -1586,6 +1657,7 @@ "DE.Views.Toolbar.textTabHome": "Ana Sayfa", "DE.Views.Toolbar.textTabInsert": "Ekle", "DE.Views.Toolbar.textTabLayout": "Tasarım", + "DE.Views.Toolbar.textTabProtect": "Koruma", "DE.Views.Toolbar.textTabReview": "İnceleme", "DE.Views.Toolbar.textTitleError": "Hata", "DE.Views.Toolbar.textToCurrent": "Mevcut pozisyona", @@ -1596,6 +1668,7 @@ "DE.Views.Toolbar.tipAlignLeft": "Sola Hizala", "DE.Views.Toolbar.tipAlignRight": "Sağa Hizla", "DE.Views.Toolbar.tipBack": "Geri", + "DE.Views.Toolbar.tipBlankPage": "Boş sayfa ekle", "DE.Views.Toolbar.tipChangeChart": "Grafik tipini değiştir", "DE.Views.Toolbar.tipClearStyle": "Stili Temizle", "DE.Views.Toolbar.tipColorSchemas": "Renk Şemasını Değiştir", @@ -1665,5 +1738,13 @@ "DE.Views.Toolbar.txtScheme6": "Toplama", "DE.Views.Toolbar.txtScheme7": "Net Değer", "DE.Views.Toolbar.txtScheme8": "Yayılma", - "DE.Views.Toolbar.txtScheme9": "Döküm" + "DE.Views.Toolbar.txtScheme9": "Döküm", + "DE.Views.WatermarkSettingsDialog.cancelButtonText": "İptal", + "DE.Views.WatermarkSettingsDialog.okButtonText": "Tamam", + "DE.Views.WatermarkSettingsDialog.textAuto": "Otomatik", + "DE.Views.WatermarkSettingsDialog.textBold": "Kalın", + "DE.Views.WatermarkSettingsDialog.textHor": "Yatay", + "DE.Views.WatermarkSettingsDialog.textItalic": "İtalik", + "DE.Views.WatermarkSettingsDialog.textText": "Metin", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Altı çizili" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index d09828683..d24db1884 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Застереження", "Common.Controllers.Chat.textEnterMessage": "ВВедіть своє повідомлення тут", - "Common.Controllers.Chat.textUserLimit": "Ви використовуюєте ONLYOFFICE Free Edition.
      Тільки два користувачі можуть одночасно редагувати документ одночасно.
      Хочете більше? Подумайте про придбання версії ONLYOFFICE Enterprise Edition.
      Докладніше ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Гість", "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити", "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.", @@ -240,7 +239,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.", "DE.Controllers.Main.criticalErrorExtText": "Натисніть \"OK\", щоб повернутися до списку документів.", "DE.Controllers.Main.criticalErrorTitle": "Помилка", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Завантаження не вдалося", "DE.Controllers.Main.downloadMergeText": "Завантаження...", "DE.Controllers.Main.downloadMergeTitle": "Завантаження", @@ -249,7 +247,7 @@ "DE.Controllers.Main.errorAccessDeny": "Ви намагаєтеся виконати дію, у якої у вас немає прав.
      Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.", "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна", "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.", - "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів тут ", + "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів       тут", "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка.
      Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки, якщо помилка не зникне.", "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.", "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ", @@ -965,7 +963,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата створення", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Завантаження...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Сторінки", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Параграфи", diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index 7308324ae..9567e87ce 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Cảnh báo", "Common.Controllers.Chat.textEnterMessage": "Nhập tin nhắn của bạn ở đây", - "Common.Controllers.Chat.textUserLimit": "Bạn đang sử dụng ONLYOFFICE Free Edition.
      Chỉ hai người dùng có thể đồng thời cùng chỉnh sửa tài liệu.
      Bạn muốn nhiều hơn? Cân nhắc mua ONLYOFFICE Enterprise Edition.
      Đọc thêm", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Nặc danh", "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng", "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.", @@ -241,7 +240,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.", "DE.Controllers.Main.criticalErrorExtText": "Nhấp \"OK\" để trở lại danh sách tài liệu.", "DE.Controllers.Main.criticalErrorTitle": "Lỗi", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Tải về không thành công.", "DE.Controllers.Main.downloadMergeText": "Đang tải...", "DE.Controllers.Main.downloadMergeTitle": "Đang tải về", @@ -250,7 +248,7 @@ "DE.Controllers.Main.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.
      Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.", "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.", - "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", + "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.
      Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ trong trường hợp lỗi vẫn còn.", "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.", "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1", @@ -966,7 +964,6 @@ "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Không có template", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "Ngày tạo", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Đang tải...", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Trang", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Đoạn văn bản", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index 4c20c9a4c..1eaead97f 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息", - "Common.Controllers.Chat.textUserLimit": "您正在使用ONLYOFFICE免费版。
      只有两个用户可以同时共同编辑文档。
      想要更多？考虑购买ONLYOFFICE企业版。
      阅读更多内容", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名", "Common.Controllers.ExternalDiagramEditor.textClose": "关闭", "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。", @@ -333,7 +332,6 @@ "DE.Controllers.Main.convertationTimeoutText": "转换超时", "DE.Controllers.Main.criticalErrorExtText": "按“确定”返回该文件列表。", "DE.Controllers.Main.criticalErrorTitle": "错误:", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE文档编辑器", "DE.Controllers.Main.downloadErrorText": "下载失败", "DE.Controllers.Main.downloadMergeText": "下载中…", "DE.Controllers.Main.downloadMergeTitle": "下载中", @@ -342,7 +340,7 @@ "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。
      请联系您的文档服务器管理员.", "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确", "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑", - "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器在这里", + "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器      在这里", "DE.Controllers.Main.errorDatabaseConnection": "外部错误。
      数据库连接错误。如果错误仍然存​​在，请联系支持人员。", "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。", "DE.Controllers.Main.errorDataRange": "数据范围不正确", @@ -1346,7 +1344,6 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "应用", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作者", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "更改访问权限", - "DE.Views.FileMenuPanels.DocumentInfo.txtDate": "创建日期", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "载入中……", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "页面", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "段落", diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js index 768ce7629..db28adc5d 100644 --- a/apps/documenteditor/mobile/app-dev.js +++ b/apps/documenteditor/mobile/app-dev.js @@ -151,7 +151,7 @@ require([ 'AddShape', 'AddImage', 'AddOther', - 'Collaboration' + 'Common.Controllers.Collaboration' ] }); @@ -222,7 +222,7 @@ require([ 'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddOther', - 'documenteditor/mobile/app/controller/Collaboration' + 'common/mobile/lib/controller/Collaboration' ], function() { window.compareVersions = true; app.start(); diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index 0b3aeb561..465d67e69 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -162,7 +162,7 @@ require([ 'AddShape', 'AddImage', 'AddOther', - 'Collaboration' + 'Common.Controllers.Collaboration' ] }); @@ -233,7 +233,7 @@ require([ 'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddOther', - 'documenteditor/mobile/app/controller/Collaboration' + 'common/mobile/lib/controller/Collaboration' ], function() { app.start(); }); diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index bff7031dc..7ceeca7d4 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -149,14 +149,14 @@ define([ } }); } else if ('review' == eventName) { - var getCollaboration = DE.getController('Collaboration'); + var getCollaboration = DE.getController('Common.Controllers.Collaboration'); getCollaboration.showModal(); - getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false); + getCollaboration.getView('Common.Views.Collaboration').showPage('#reviewing-settings-view', false); } else if('reviewchange' == eventName) { - var getCollaboration = DE.getController('Collaboration'); + var getCollaboration = DE.getController('Common.Controllers.Collaboration'); getCollaboration.showModal(); - getCollaboration.getView('Collaboration').showPage('#reviewing-settings-view', false); - getCollaboration.getView('Collaboration').showPage('#change-view', false); + getCollaboration.getView('Common.Views.Collaboration').showPage('#reviewing-settings-view', false); + getCollaboration.getView('Common.Views.Collaboration').showPage('#change-view', false); } else if ('showActionSheet' == eventName && _actionSheets.length > 0) { _.delay(function () { _.each(_actionSheets, function (action) { diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 2f23bc0c9..5fc91200a 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -155,6 +155,7 @@ define([ Common.NotificationCenter.on('api:disconnect', _.bind(me.onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('goback', _.bind(me.goBack, me)); + Common.NotificationCenter.on('download:advanced', _.bind(me.onAdvancedOptions, me)); // Initialize descendants _.each(me.getApplication().controllers, function(controller) { @@ -186,7 +187,7 @@ define([ Common.Gateway.internalMessage('listenHardBack'); } - me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}'; + me.defaultTitleText = '{{APP_TITLE_TEXT}}'; me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}'); me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}'); @@ -266,6 +267,10 @@ define([ if (data.doc) { DE.getController('Toolbar').setDocumentTitle(data.doc.title); + if (data.doc.info) { + data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); + data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); + } } }, @@ -324,7 +329,7 @@ define([ if (type && typeof type[1] === 'string') { this.api.asc_DownloadOrigin(true) } else { - this.api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true)); } }, @@ -518,7 +523,8 @@ define([ /** coauthoring begin **/ this.isLiveCommenting = Common.localStorage.getBool("de-settings-livecomment", true); - this.isLiveCommenting ? this.api.asc_showComments(true) : this.api.asc_hideComments(); + var resolved = Common.localStorage.getBool("de-settings-resolvedcomment", true); + this.isLiveCommenting ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); /** coauthoring end **/ value = Common.localStorage.getItem("de-settings-zoom"); @@ -1116,17 +1122,16 @@ define([ Common.Utils.ThemeColor.setColors(colors, standart_colors); }, - onAdvancedOptions: function(advOptions) { + onAdvancedOptions: function(type, advOptions, mode, formatOptions) { if (this._state.openDlg) return; - var type = advOptions.asc_getOptionId(), - me = this; + var me = this; if (type == Asc.c_oAscAdvancedOptionsID.TXT) { var picker, pages = [], pagesName = []; - _.each(advOptions.asc_getOptions().asc_getCodePages(), function(page) { + _.each(advOptions.asc_getCodePages(), function(page) { pages.push(page.asc_getCodePage()); pagesName.push(page.asc_getCodePageName()); }); @@ -1135,6 +1140,37 @@ define([ me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + var buttons = []; + if (mode === 2) { + buttons.push({ + text: me.textCancel, + onClick: function () { + me._state.openDlg = null; + } + }); + } + buttons.push({ + text: 'OK', + bold: true, + onClick: function() { + var encoding = picker.value; + + if (me.api) { + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding)); + me.api.asc_DownloadAs(formatOptions); + } else { + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding)); + } + + if (!me._isDocReady) { + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + } + } + me._state.openDlg = null; + } + }); + me._state.openDlg = uiApp.modal({ title: me.advTxtOptions, text: '', @@ -1145,31 +1181,14 @@ define([ '' + '
      ' + '', - buttons: [ - { - text: 'OK', - bold: true, - onClick: function() { - var encoding = picker.value; - - if (me.api) { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding)); - - if (!me._isDocReady) { - me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); - } - } - me._state.openDlg = null; - } - } - ] + buttons: buttons }); picker = uiApp.picker({ container: '#txt-encoding', toolbar: false, rotateEffect: true, - value: [advOptions.asc_getOptions().asc_getRecommendedSettings().asc_getCodePage()], + value: [advOptions.asc_getRecommendedSettings().asc_getCodePage()], cols: [{ values: pages, displayValues: pagesName diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index be2f7dcc9..d122f1bf6 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -47,7 +47,7 @@ define([ 'underscore', 'backbone', 'documenteditor/mobile/app/view/Settings', - 'documenteditor/mobile/app/controller/Collaboration' + 'common/mobile/lib/controller/Collaboration' ], function (core, $, _, Backbone) { 'use strict'; @@ -85,7 +85,8 @@ define([ _isReviewOnly = false, _fileKey, templateInsert, - _metricText = Common.Utils.Metric.getCurrentMetricName(); + _metricText = Common.Utils.Metric.getCurrentMetricName(), + _isEdit; var mm2Cm = function(mm) { return parseFloat((mm/10.).toFixed(2)); @@ -147,6 +148,7 @@ define([ _canReview = mode.canReview; _isReviewOnly = mode.isReviewOnly; _fileKey = mode.fileKey; + _isEdit = mode.isEdit; }, initEvents: function () { @@ -234,6 +236,16 @@ define([ $('#settings-hidden-borders input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-hidden-borders") == 'true') ? true : false); $('#settings-hidden-borders input:checkbox').single('change', _.bind(me.onShowTableEmptyLine, me)); $('#settings-orthography').single('click', _.bind(me.onOrthographyCheck, me)); + var displayComments = Common.localStorage.getBool("de-settings-livecomment", true); + $('#settings-display-comments input:checkbox').attr('checked', displayComments); + $('#settings-display-comments input:checkbox').single('change', _.bind(me.onChangeDisplayComments, me)); + var displayResolved = Common.localStorage.getBool("de-settings-resolvedcomment", true); + if (!displayComments) { + $("#settings-display-resolved").addClass("disabled"); + displayResolved = false; + } + $('#settings-display-resolved input:checkbox').attr('checked', displayResolved); + $('#settings-display-resolved input:checkbox').single('change', _.bind(me.onChangeDisplayResolved, me)); Common.Utils.addScrollIfNeed('.page[data-page=settings-advanced-view]', '.page[data-page=settings-advanced-view] .page-content'); } else if ('#color-schemes-view' == pageId) { me.initPageColorSchemes(); @@ -249,7 +261,7 @@ define([ $('#settings-download').single('click', _.bind(me.onDownloadOrigin, me)); $('#settings-print').single('click', _.bind(me.onPrint, me)); $('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me)); - var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode(); + var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode(); if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") { $('#settings-document').addClass('disabled'); } @@ -260,8 +272,34 @@ define([ } }, + onChangeDisplayComments: function(e) { + var displayComments = $(e.currentTarget).is(':checked'); + if (!displayComments) { + this.api.asc_hideComments(); + $("#settings-display-resolved input").prop( "checked", false ); + Common.localStorage.setBool("de-settings-resolvedcomment", false); + $("#settings-display-resolved").addClass("disabled"); + } else { + var resolved = Common.localStorage.getBool("de-settings-resolvedcomment"); + this.api.asc_showComments(resolved); + $("#settings-display-resolved").removeClass("disabled"); + } + Common.localStorage.setBool("de-settings-livecomment", displayComments); + }, + + onChangeDisplayResolved: function(e) { + var displayComments = Common.localStorage.getBool("de-settings-livecomment"); + if (displayComments) { + var resolved = $(e.currentTarget).is(':checked'); + if (this.api) { + this.api.asc_showComments(resolved); + } + Common.localStorage.setBool("de-settings-resolvedcomment", resolved); + } + }, + clickCollaboration: function() { - DE.getController('Collaboration').showModal(); + DE.getController('Common.Controllers.Collaboration').showModal(); }, onNoCharacters: function(e) { @@ -339,11 +377,14 @@ define([ var value = Common.localStorage.getItem('de-mobile-settings-unit'); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); $unitMeasurement.val([value]); - var _stateDisplayMode = DE.getController('Collaboration').getDisplayMode(); + var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode(); if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") { $('#settings-no-characters').addClass('disabled'); $('#settings-hidden-borders').addClass('disabled'); } + if (!_isEdit) { + $('.page[data-page=settings-advanced-view] .page-content > :not(.display-view)').hide(); + } }, initPageDocumentSettings: function () { @@ -374,9 +415,39 @@ define([ var document = Common.SharedSettings.get('document') || {}, info = document.info || {}; - $('#settings-document-title').html(document.title ? document.title : me.unknownText); - $('#settings-document-autor').html(info.author ? info.author : me.unknownText); - $('#settings-document-date').html(info.created ? info.created : me.unknownText); + document.title ? $('#settings-document-title').html(document.title) : $('.display-document-title').remove(); + var value = info.owner || info.author; + value ? $('#settings-document-owner').html(value) : $('.display-owner').remove(); + value = info.uploaded || info.created; + value ? $('#settings-doc-uploaded').html(value) : $('.display-uploaded').remove(); + info.folder ? $('#settings-doc-location').html(info.folder) : $('.display-location').remove(); + + var appProps = (this.api) ? this.api.asc_getAppProps() : null; + if (appProps) { + var appName = (appProps.asc_getApplication() || '') + ' ' + (appProps.asc_getAppVersion() || ''); + appName ? $('#settings-doc-application').html(appName) : $('.display-application').remove(); + } + var props = (this.api) ? this.api.asc_getCoreProps() : null; + if (props) { + value = props.asc_getTitle(); + value ? $('#settings-doc-title').html(value) : $('.display-title').remove(); + value = props.asc_getSubject(); + value ? $('#settings-doc-subject').html(value) : $('.display-subject').remove(); + value = props.asc_getDescription(); + value ? $('#settings-doc-comment').html(value) : $('.display-comment').remove(); + value = props.asc_getModified(); + value ? $('#settings-doc-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); + value = props.asc_getLastModifiedBy(); + value ? $('#settings-doc-mod-by').html(value) : $('.display-mode-by').remove(); + value = props.asc_getCreated(); + value ? $('#settings-doc-date').html(value.toLocaleString()) : $('.display-created-date').remove(); + value = props.asc_getCreator(); + var templateCreator = ""; + value && value.split(/\s*[,;]\s*/).forEach(function(item) { + templateCreator = templateCreator + "
    • " + item + "
      • "; + }); + templateCreator ? $('#list-creator').html(templateCreator) : $('.display-author').remove(); + } } }, @@ -491,19 +562,22 @@ define([ format = $(e.currentTarget).data('format'); if (format) { - if (format == Asc.c_oAscFileType.TXT) { + if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) { _.defer(function () { uiApp.confirm( - me.warnDownloadAs, + (format === Asc.c_oAscFileType.TXT) ? me.warnDownloadAs : me.warnDownloadAsRTF, me.notcriticalErrorTitle, function () { - me.api.asc_DownloadAs(format); + if (format == Asc.c_oAscFileType.TXT) + Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.TXT, me.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); + else + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); } ); }); } else { _.defer(function () { - me.api.asc_DownloadAs(format); + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); }); } @@ -676,7 +750,8 @@ define([ unknownText: 'Unknown', txtLoading : 'Loading...', notcriticalErrorTitle : 'Warning', - warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
      Are you sure you want to continue?' + warnDownloadAs : 'If you continue saving in this format all features except the text will be lost.
      Are you sure you want to continue?', + warnDownloadAsRTF : 'If you continue saving in this format some of the formatting might be lost.
      Are you sure you want to continue?' } })(), DE.Controllers.Settings || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js index 1c32ee6c4..ccd784064 100644 --- a/apps/documenteditor/mobile/app/controller/Toolbar.js +++ b/apps/documenteditor/mobile/app/controller/Toolbar.js @@ -81,7 +81,7 @@ define([ this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); }, diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index 7c8325042..a3e6bc4b6 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -55,7 +55,7 @@       <% } %> - <% if(phone) {%> + <% if(width < 360) {%>
      • -
      <%= scope.textAuthor %>
      -
      +
      <%= scope.textOwner %>
      +
      • -
        <%= scope.textLoading %>
        +
        <%= scope.textLoading %>
      -
      <%= scope.textCreateDate %>
      -
      +
      <%= scope.textLocation %>
      +
      • -
        <%= scope.textLoading %>
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textUploaded %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
      @@ -357,6 +367,87 @@
      + +
      <%= scope.textTitle %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textSubject %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textComment %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textLastModified %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textLastModifiedBy %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textCreated %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textApplication %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      +
      <%= scope.textAuthor %>
      +
      +
        +
      • +
        +
        <%= scope.textLoading %>
        +
        +
        • +
      +
      @@ -428,6 +519,18 @@ +
    • + +
      +
      + +
      +
      +
      RTF
      +
      +
      +       +
    • @@ -639,6 +742,34 @@
      +
      <%= scope.textCommentingDisplay %>
      +
      +
        +
        +
        +
        <%= scope.textDisplayComments %>
        +
        + +
        +
        +
        +
        +
        +
        <%= scope.textDisplayResolvedComments %>
        +
        + +
        +
        +
        +
      +
      + diff --git a/apps/documenteditor/mobile/app/template/Toolbar.template b/apps/documenteditor/mobile/app/template/Toolbar.template index 345205710..a1238415a 100644 --- a/apps/documenteditor/mobile/app/template/Toolbar.template +++ b/apps/documenteditor/mobile/app/template/Toolbar.template @@ -42,7 +42,7 @@       <% } %> - <% if (!phone) { %> + <% if (width >= 360) { %> diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index eb85b01ca..84dbd7bcb 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -90,7 +90,8 @@ define([ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), orthography: Common.SharedSettings.get('sailfish'), - scope : this + scope : this, + width : $(window).width() })); return this; @@ -124,7 +125,6 @@ define([ $layour.find('#settings-search .item-title').text(this.textFindAndReplace) } else { $layour.find('#settings-document').hide(); - $layour.find('#settings-advanced').hide(); $layour.find('#color-schemes').hide(); $layour.find('#settings-spellcheck').hide(); $layour.find('#settings-orthography').hide(); @@ -287,7 +287,21 @@ define([ textColorSchemes: 'Color Schemes', textNoCharacters: 'Nonprinting Characters', textHiddenTableBorders: 'Hidden Table Borders', - textCollaboration: 'Collaboration' + textCollaboration: 'Collaboration', + textCommentingDisplay: 'Commenting Display', + textDisplayComments: 'Comments', + textDisplayResolvedComments: 'Resolved Comments', + textSubject: 'Subject', + textTitle: 'Title', + textComment: 'Comment', + textOwner: 'Owner', + textApplication : 'Application', + textLocation: 'Location', + textUploaded: 'Uploaded', + textLastModified: 'Last Modified', + textLastModifiedBy: 'Last Modified By', + textCreated: 'Created' + } })(), DE.Views.Settings || {})) diff --git a/apps/documenteditor/mobile/app/view/Toolbar.js b/apps/documenteditor/mobile/app/view/Toolbar.js index 4738c92c5..5bfdd6df8 100644 --- a/apps/documenteditor/mobile/app/view/Toolbar.js +++ b/apps/documenteditor/mobile/app/view/Toolbar.js @@ -90,7 +90,8 @@ define([ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), backTitle : Common.SharedSettings.get('android') ? '' : me.textBack, - scope : me + scope : me, + width : $(window).width() })); $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me)); @@ -153,7 +154,7 @@ define([ //Collaboration showCollaboration: function () { - DE.getController('Collaboration').showModal(); + DE.getController('Common.Controllers.Collaboration').showModal(); }, editDocument: function () { diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json index d040e107c..82565ed2d 100644 --- a/apps/documenteditor/mobile/locale/bg.json +++ b/apps/documenteditor/mobile/locale/bg.json @@ -14,8 +14,6 @@ "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": "Изрежи", @@ -24,8 +22,6 @@ "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": "Гост", @@ -54,7 +50,6 @@ "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": "Изтеглянето", @@ -63,7 +58,7 @@ "DE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
      Моля, свържете се с администратора на сървъра за документи.", "DE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Вече не можете да редактирате.", - "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук ", + "DE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук", "DE.Controllers.Main.errorDatabaseConnection": "Външна грешка.
      Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка.", "DE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да се дефинират.", "DE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.", diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json index c64e57e6f..5d42d26ec 100644 --- a/apps/documenteditor/mobile/locale/cs.json +++ b/apps/documenteditor/mobile/locale/cs.json @@ -14,7 +14,6 @@ "DE.Controllers.AddTable.textColumns": "Sloupce", "DE.Controllers.AddTable.textRows": "Řádky", "DE.Controllers.AddTable.textTableSize": "Velikost tabulky", - "DE.Controllers.DocumentHolder.menuAccept": "Přijmout", "DE.Controllers.DocumentHolder.menuAddLink": "Přidat odkaz", "DE.Controllers.DocumentHolder.menuCopy": "Kopírovat", "DE.Controllers.DocumentHolder.menuCut": "Vyjmout", @@ -23,7 +22,6 @@ "DE.Controllers.DocumentHolder.menuMore": "Více", "DE.Controllers.DocumentHolder.menuOpenLink": "Otevřít odkaz", "DE.Controllers.DocumentHolder.menuPaste": "Vložit", - "DE.Controllers.DocumentHolder.menuReject": "Odmítnout", "DE.Controllers.DocumentHolder.sheetCancel": "Zrušit", "DE.Controllers.DocumentHolder.textGuest": "Návštěvník", "DE.Controllers.EditContainer.textChart": "Graf", @@ -50,7 +48,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.", "DE.Controllers.Main.criticalErrorExtText": "Stisknutím tlačítka \"OK\" se vrátíte do seznamu dokumentů.", "DE.Controllers.Main.criticalErrorTitle": "Chyba", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Editor dokumentů", "DE.Controllers.Main.downloadErrorText": "Stahování selhalo.", "DE.Controllers.Main.downloadMergeText": "Stahování...", "DE.Controllers.Main.downloadMergeTitle": "Stahuji", @@ -59,7 +56,7 @@ "DE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
      Prosím, kontaktujte administrátora vašeho Dokumentového serveru.", "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové připojení bylo ztraceno. Nadále nemůžete editovat.", - "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.
      Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.

      Více informací o připojení najdete v Dokumentovém serveru here", + "DE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.
      Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.

      Více informací o připojení najdete v Dokumentovém serveru here", "DE.Controllers.Main.errorDatabaseConnection": "Externí chyba.
      Chyba připojení k databázi. Prosím, kontaktujte podporu.", "DE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.", "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index d5af67d55..5b9a960fe 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -14,8 +14,6 @@ "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", @@ -24,8 +22,6 @@ "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", @@ -54,7 +50,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.", "DE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.", "DE.Controllers.Main.criticalErrorTitle": "Fehler", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.", "DE.Controllers.Main.downloadMergeText": "Wird heruntergeladen...", "DE.Controllers.Main.downloadMergeTitle": "Wird heruntergeladen", @@ -63,7 +58,7 @@ "DE.Controllers.Main.errorAccessDeny": "Sie versuchen die Änderungen vorzunehemen, für die Sie keine Berechtigungen haben.
      Wenden Sie sich an Ihren Document Server Serveradministrator.", "DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.", - "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", + "DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
      Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", "DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 0823b2b2a..abf1378c1 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -1,17 +1,90 @@ { + "Common.Controllers.Collaboration.textAtLeast": "at least", + "Common.Controllers.Collaboration.textAuto": "auto", + "Common.Controllers.Collaboration.textBaseline": "Baseline", + "Common.Controllers.Collaboration.textBold": "Bold", + "Common.Controllers.Collaboration.textBreakBefore": "Page break before", + "Common.Controllers.Collaboration.textCaps": "All caps", + "Common.Controllers.Collaboration.textCenter": "Align center", + "Common.Controllers.Collaboration.textChart": "Chart", + "Common.Controllers.Collaboration.textColor": "Font color", + "Common.Controllers.Collaboration.textContextual": "Don't add interval between paragraphs of the same style", + "Common.Controllers.Collaboration.textDeleted": "Deleted:", + "Common.Controllers.Collaboration.textDStrikeout": "Double strikeout", + "Common.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", + "Common.Controllers.Collaboration.textEquation": "Equation", + "Common.Controllers.Collaboration.textExact": "exactly", + "Common.Controllers.Collaboration.textFirstLine": "First line", + "Common.Controllers.Collaboration.textFormatted": "Formatted", + "Common.Controllers.Collaboration.textHighlight": "Highlight color", + "Common.Controllers.Collaboration.textImage": "Image", + "Common.Controllers.Collaboration.textIndentLeft": "Indent left", + "Common.Controllers.Collaboration.textIndentRight": "Indent right", + "Common.Controllers.Collaboration.textInserted": "Inserted:", + "Common.Controllers.Collaboration.textItalic": "Italic", + "Common.Controllers.Collaboration.textJustify": "Align justify", + "Common.Controllers.Collaboration.textKeepLines": "Keep lines together", + "Common.Controllers.Collaboration.textKeepNext": "Keep with next", + "Common.Controllers.Collaboration.textLeft": "Align left", + "Common.Controllers.Collaboration.textLineSpacing": "Line Spacing: ", + "Common.Controllers.Collaboration.textMultiple": "multiple", + "Common.Controllers.Collaboration.textNoBreakBefore": "No page break before", + "Common.Controllers.Collaboration.textNoContextual": "Add interval between paragraphs of the same style", + "Common.Controllers.Collaboration.textNoKeepLines": "Don't keep lines together", + "Common.Controllers.Collaboration.textNoKeepNext": "Don't keep with next", + "Common.Controllers.Collaboration.textNot": "Not", + "Common.Controllers.Collaboration.textNoWidow": "No widow control", + "Common.Controllers.Collaboration.textNum": "Change numbering", + "Common.Controllers.Collaboration.textParaDeleted": "Paragraph Deleted", + "Common.Controllers.Collaboration.textParaFormatted": "Paragraph Formatted", + "Common.Controllers.Collaboration.textParaInserted": "Paragraph Inserted", + "Common.Controllers.Collaboration.textParaMoveFromDown": "Moved Down:", + "Common.Controllers.Collaboration.textParaMoveFromUp": "Moved Up:", + "Common.Controllers.Collaboration.textParaMoveTo": "Moved:", + "Common.Controllers.Collaboration.textPosition": "Position", + "Common.Controllers.Collaboration.textRight": "Align right", + "Common.Controllers.Collaboration.textShape": "Shape", + "Common.Controllers.Collaboration.textShd": "Background color", + "Common.Controllers.Collaboration.textSmallCaps": "Small caps", + "Common.Controllers.Collaboration.textSpacing": "Spacing", + "Common.Controllers.Collaboration.textSpacingAfter": "Spacing after", + "Common.Controllers.Collaboration.textSpacingBefore": "Spacing before", + "Common.Controllers.Collaboration.textStrikeout": "Strikeout", + "Common.Controllers.Collaboration.textSubScript": "Subscript", + "Common.Controllers.Collaboration.textSuperScript": "Superscript", + "Common.Controllers.Collaboration.textTableChanged": "Table Settings Changed", + "Common.Controllers.Collaboration.textTableRowsAdd": "Table Rows Added", + "Common.Controllers.Collaboration.textTableRowsDel": "Table Rows Deleted", + "Common.Controllers.Collaboration.textTabs": "Change tabs", + "Common.Controllers.Collaboration.textUnderline": "Underline", + "Common.Controllers.Collaboration.textWidow": "Widow control", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textAcceptAllChanges": "Accept All Changes", + "Common.Views.Collaboration.textBack": "Back", + "Common.Views.Collaboration.textChange": "Review Change", + "Common.Views.Collaboration.textCollaboration": "Collaboration", + "Common.Views.Collaboration.textDisplayMode": "Display Mode", + "Common.Views.Collaboration.textEditUsers": "Users", + "Common.Views.Collaboration.textFinal": "Final", + "Common.Views.Collaboration.textMarkup": "Markup", + "Common.Views.Collaboration.textOriginal": "Original", + "Common.Views.Collaboration.textRejectAllChanges": "Reject All Changes", + "Common.Views.Collaboration.textReview": "Track Changes", + "Common.Views.Collaboration.textReviewing": "Review", + "Common.Views.Collaboration.textСomments": "Сomments", + "Common.Views.Collaboration.textNoComments": "This document doesn't contain comments", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Other", "DE.Controllers.AddContainer.textShape": "Shape", "DE.Controllers.AddContainer.textTable": "Table", "DE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.", "DE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", - "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", - "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page", "DE.Controllers.AddOther.textBelowText": "Below Text", + "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page", + "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", "DE.Controllers.AddTable.textCancel": "Cancel", "DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textRows": "Rows", @@ -20,20 +93,20 @@ "DE.Controllers.DocumentHolder.menuCopy": "Copy", "DE.Controllers.DocumentHolder.menuCut": "Cut", "DE.Controllers.DocumentHolder.menuDelete": "Delete", + "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table", "DE.Controllers.DocumentHolder.menuEdit": "Edit", + "DE.Controllers.DocumentHolder.menuMerge": "Merge Cells", "DE.Controllers.DocumentHolder.menuMore": "More", "DE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "DE.Controllers.DocumentHolder.menuPaste": "Paste", "DE.Controllers.DocumentHolder.menuReview": "Review", - "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", - "DE.Controllers.DocumentHolder.textGuest": "Guest", - "DE.Controllers.DocumentHolder.menuMerge": "Merge Cells", + "DE.Controllers.DocumentHolder.menuReviewChange": "Review Change", "DE.Controllers.DocumentHolder.menuSplit": "Split Cell", + "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", "DE.Controllers.DocumentHolder.textCancel": "Cancel", "DE.Controllers.DocumentHolder.textColumns": "Columns", + "DE.Controllers.DocumentHolder.textGuest": "Guest", "DE.Controllers.DocumentHolder.textRows": "Rows", - "DE.Controllers.DocumentHolder.menuDeleteTable": "Delete Table", - "DE.Controllers.DocumentHolder.menuReviewChange": "Review Change", "DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textHeader": "Header", @@ -59,7 +132,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "DE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.", "DE.Controllers.Main.criticalErrorTitle": "Error", - "del_DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Download failed.", "DE.Controllers.Main.downloadMergeText": "Downloading...", "DE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -172,8 +244,8 @@ "DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
      Please contact your administrator for more information.", "DE.Controllers.Main.warnLicenseExp": "Your license has expired.
      Please update your license and refresh the page.", "DE.Controllers.Main.warnLicenseUsersExceeded": "The number of concurrent users has been exceeded and the document will be opened for viewing only.
      Please contact your administrator for more information.", - "DE.Controllers.Main.warnNoLicense": "This version of %1 Editors has certain limitations for concurrent connections to the document server.
      If you need more please consider purchasing a commercial license.", - "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 Editors has certain limitations for concurrent users.
      If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
      If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
      If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", @@ -181,69 +253,11 @@ "DE.Controllers.Settings.txtLoading": "Loading...", "DE.Controllers.Settings.unknownText": "Unknown", "DE.Controllers.Settings.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
      Are you sure you want to continue?", + "DE.Controllers.Settings.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.
      Are you sure you want to continue?", "DE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "DE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application", "DE.Controllers.Toolbar.leaveButtonText": "Leave this Page", "DE.Controllers.Toolbar.stayButtonText": "Stay on this Page", - "DE.Controllers.Collaboration.textInserted": "Inserted:", - "DE.Controllers.Collaboration.textDeleted": "Deleted:", - "DE.Controllers.Collaboration.textParaInserted": "Paragraph Inserted", - "DE.Controllers.Collaboration.textParaDeleted": "Paragraph Deleted", - "DE.Controllers.Collaboration.textFormatted": "Formatted", - "DE.Controllers.Collaboration.textParaFormatted": "Paragraph Formatted", - "DE.Controllers.Collaboration.textNot": "Not", - "DE.Controllers.Collaboration.textBold": "Bold", - "DE.Controllers.Collaboration.textItalic": "Italic", - "DE.Controllers.Collaboration.textStrikeout": "Strikeout", - "DE.Controllers.Collaboration.textUnderline": "Underline", - "DE.Controllers.Collaboration.textColor": "Font color", - "DE.Controllers.Collaboration.textBaseline": "Baseline", - "DE.Controllers.Collaboration.textSuperScript": "Superscript", - "DE.Controllers.Collaboration.textSubScript": "Subscript", - "DE.Controllers.Collaboration.textHighlight": "Highlight color", - "DE.Controllers.Collaboration.textSpacing": "Spacing", - "DE.Controllers.Collaboration.textDStrikeout": "Double strikeout", - "DE.Controllers.Collaboration.textCaps": "All caps", - "DE.Controllers.Collaboration.textSmallCaps": "Small caps", - "DE.Controllers.Collaboration.textPosition": "Position", - "DE.Controllers.Collaboration.textShd": "Background color", - "DE.Controllers.Collaboration.textContextual": "Don't add interval between paragraphs of the same style", - "DE.Controllers.Collaboration.textNoContextual": "Add interval between paragraphs of the same style", - "DE.Controllers.Collaboration.textIndentLeft": "Indent left", - "DE.Controllers.Collaboration.textIndentRight": "Indent right", - "DE.Controllers.Collaboration.textFirstLine": "First line", - "DE.Controllers.Collaboration.textRight": "Align right", - "DE.Controllers.Collaboration.textLeft": "Align left", - "DE.Controllers.Collaboration.textCenter": "Align center", - "DE.Controllers.Collaboration.textJustify": "Align justify", - "DE.Controllers.Collaboration.textBreakBefore": "Page break before", - "DE.Controllers.Collaboration.textKeepNext": "Keep with next", - "DE.Controllers.Collaboration.textKeepLines": "Keep lines together", - "DE.Controllers.Collaboration.textNoBreakBefore": "No page break before", - "DE.Controllers.Collaboration.textNoKeepNext": "Don't keep with next", - "DE.Controllers.Collaboration.textNoKeepLines": "Don't keep lines together", - "DE.Controllers.Collaboration.textLineSpacing": "Line Spacing: ", - "DE.Controllers.Collaboration.textMultiple": "multiple", - "DE.Controllers.Collaboration.textAtLeast": "at least", - "DE.Controllers.Collaboration.textExact": "exactly", - "DE.Controllers.Collaboration.textSpacingBefore": "Spacing before", - "DE.Controllers.Collaboration.textSpacingAfter": "Spacing after", - "DE.Controllers.Collaboration.textAuto": "auto", - "DE.Controllers.Collaboration.textWidow": "Widow control", - "DE.Controllers.Collaboration.textNoWidow": "No widow control", - "DE.Controllers.Collaboration.textTabs": "Change tabs", - "DE.Controllers.Collaboration.textNum": "Change numbering", - "DE.Controllers.Collaboration.textEquation": "Equation", - "DE.Controllers.Collaboration.textImage": "Image", - "DE.Controllers.Collaboration.textChart": "Chart", - "DE.Controllers.Collaboration.textShape": "Shape", - "DE.Controllers.Collaboration.textTableChanged": "Table Settings Changed", - "DE.Controllers.Collaboration.textTableRowsAdd": "Table Rows Added", - "DE.Controllers.Collaboration.textTableRowsDel": "Table Rows Deleted", - "DE.Controllers.Collaboration.textParaMoveTo": "Moved:", - "DE.Controllers.Collaboration.textParaMoveFromUp": "Moved Up:", - "DE.Controllers.Collaboration.textParaMoveFromDown": "Moved Down:", - "DE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", "DE.Views.AddImage.textAddress": "Address", "DE.Views.AddImage.textBack": "Back", "DE.Views.AddImage.textFromLibrary": "Picture from Library", @@ -260,10 +274,14 @@ "DE.Views.AddOther.textCurrentPos": "Current Position", "DE.Views.AddOther.textDisplay": "Display", "DE.Views.AddOther.textEvenPage": "Even Page", + "DE.Views.AddOther.textFootnote": "Footnote", + "DE.Views.AddOther.textFormat": "Format", "DE.Views.AddOther.textInsert": "Insert", + "DE.Views.AddOther.textInsertFootnote": "Insert Footnote", "DE.Views.AddOther.textLeftBottom": "Left Bottom", "DE.Views.AddOther.textLeftTop": "Left Top", "DE.Views.AddOther.textLink": "Link", + "DE.Views.AddOther.textLocation": "Location", "DE.Views.AddOther.textNextPage": "Next Page", "DE.Views.AddOther.textOddPage": "Odd Page", "DE.Views.AddOther.textPageBreak": "Page Break", @@ -272,12 +290,8 @@ "DE.Views.AddOther.textRightBottom": "Right Bottom", "DE.Views.AddOther.textRightTop": "Right Top", "DE.Views.AddOther.textSectionBreak": "Section Break", - "DE.Views.AddOther.textTip": "Screen Tip", - "DE.Views.AddOther.textFootnote": "Footnote", - "DE.Views.AddOther.textInsertFootnote": "Insert Footnote", - "DE.Views.AddOther.textFormat": "Format", "DE.Views.AddOther.textStartFrom": "Start At", - "DE.Views.AddOther.textLocation": "Location", + "DE.Views.AddOther.textTip": "Screen Tip", "DE.Views.EditChart.textAlign": "Align", "DE.Views.EditChart.textBack": "Back", "DE.Views.EditChart.textBackward": "Move Backward", @@ -442,12 +456,21 @@ "DE.Views.Search.textSearch": "Search", "DE.Views.Settings.textAbout": "About", "DE.Views.Settings.textAddress": "address", + "DE.Views.Settings.textAdvancedSettings": "Application Settings", + "DE.Views.Settings.textApplication": "Application", "DE.Views.Settings.textAuthor": "Author", "DE.Views.Settings.textBack": "Back", "DE.Views.Settings.textBottom": "Bottom", + "DE.Views.Settings.textCentimeter": "Centimeter", + "DE.Views.Settings.textColorSchemes": "Color Schemes", + "DE.Views.Settings.textComment": "Comment", + "DE.Views.Settings.textCommentingDisplay": "Commenting Display", + "DE.Views.Settings.textCreated": "Created", "DE.Views.Settings.textCreateDate": "Creation date", "DE.Views.Settings.textCustom": "Custom", "DE.Views.Settings.textCustomSize": "Custom Size", + "DE.Views.Settings.textDisplayComments": "Comments", + "DE.Views.Settings.textDisplayResolvedComments": "Resolved Comments", "DE.Views.Settings.textDocInfo": "Document Info", "DE.Views.Settings.textDocTitle": "Document title", "DE.Views.Settings.textDocumentFormats": "Document Formats", @@ -461,13 +484,21 @@ "DE.Views.Settings.textFindAndReplace": "Find and Replace", "DE.Views.Settings.textFormat": "Format", "DE.Views.Settings.textHelp": "Help", + "DE.Views.Settings.textHiddenTableBorders": "Hidden Table Borders", + "DE.Views.Settings.textInch": "Inch", "DE.Views.Settings.textLandscape": "Landscape", + "DE.Views.Settings.textLastModified": "Last Modified", + "DE.Views.Settings.textLastModifiedBy": "Last Modified By", "DE.Views.Settings.textLeft": "Left", "DE.Views.Settings.textLoading": "Loading...", + "DE.Views.Settings.textLocation": "Location", "DE.Views.Settings.textMargins": "Margins", + "DE.Views.Settings.textNoCharacters": "Nonprinting Characters", "DE.Views.Settings.textOrientation": "Orientation", + "DE.Views.Settings.textOwner": "Owner", "DE.Views.Settings.textPages": "Pages", "DE.Views.Settings.textParagraphs": "Paragraphs", + "DE.Views.Settings.textPoint": "Point", "DE.Views.Settings.textPortrait": "Portrait", "DE.Views.Settings.textPoweredBy": "Powered by", "DE.Views.Settings.textPrint": "Print", @@ -478,32 +509,16 @@ "DE.Views.Settings.textSpaces": "Spaces", "DE.Views.Settings.textSpellcheck": "Spell Checking", "DE.Views.Settings.textStatistic": "Statistic", + "DE.Views.Settings.textSubject": "Subject", "DE.Views.Settings.textSymbols": "Symbols", "DE.Views.Settings.textTel": "tel", + "DE.Views.Settings.textTitle": "Title", "DE.Views.Settings.textTop": "Top", + "DE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement", + "DE.Views.Settings.textUploaded": "Uploaded", "DE.Views.Settings.textVersion": "Version", "DE.Views.Settings.textWords": "Words", "DE.Views.Settings.unknownText": "Unknown", - "DE.Views.Settings.textAdvancedSettings": "Application Settings", - "DE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement", - "DE.Views.Settings.textCentimeter": "Centimeter", - "DE.Views.Settings.textPoint": "Point", - "DE.Views.Settings.textInch": "Inch", - "DE.Views.Settings.textColorSchemes": "Color Schemes", - "DE.Views.Settings.textNoCharacters": "Nonprinting Characters", - "DE.Views.Settings.textHiddenTableBorders": "Hidden Table Borders", - "DE.Views.Toolbar.textBack": "Back", - "DE.Views.Collaboration.textCollaboration": "Collaboration", - "DE.Views.Collaboration.textReviewing": "Review", - "DE.Views.Collaboration.textСomments": "Сomments", - "DE.Views.Collaboration.textBack": "Back", - "DE.Views.Collaboration.textReview": "Track Changes", - "DE.Views.Collaboration.textAcceptAllChanges": "Accept All Changes", - "DE.Views.Collaboration.textRejectAllChanges": "Reject All Changes", - "DE.Views.Collaboration.textDisplayMode": "Display Mode", - "DE.Views.Collaboration.textMarkup": "Markup", - "DE.Views.Collaboration.textFinal": "Final", - "DE.Views.Collaboration.textOriginal": "Original", - "DE.Views.Collaboration.textChange": "Review Change", - "DE.Views.Collaboration.textEditUsers": "Users" + "DE.Views.Settings.textCollaboration": "Collaboration", + "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 2ecb227a5..0ee558022 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -1,34 +1,111 @@ { + "Common.Controllers.Collaboration.textAtLeast": "al menos", + "Common.Controllers.Collaboration.textAuto": "auto", + "Common.Controllers.Collaboration.textBaseline": "Línea de base", + "Common.Controllers.Collaboration.textBold": "Negrita", + "Common.Controllers.Collaboration.textBreakBefore": "Salto de página anterior", + "Common.Controllers.Collaboration.textCaps": "Mayúsculas", + "Common.Controllers.Collaboration.textCenter": "Alinear al centro", + "Common.Controllers.Collaboration.textChart": "Gráfico", + "Common.Controllers.Collaboration.textColor": "Color de fuente", + "Common.Controllers.Collaboration.textContextual": "No añadir intervalo entre párrafos del mismo estilo", + "Common.Controllers.Collaboration.textDeleted": "Eliminado:", + "Common.Controllers.Collaboration.textDStrikeout": "Doble tachado", + "Common.Controllers.Collaboration.textEditUser": "El documento está siendo editado por múltiples usuarios.", + "Common.Controllers.Collaboration.textEquation": "Ecuación", + "Common.Controllers.Collaboration.textExact": "exactamente", + "Common.Controllers.Collaboration.textFirstLine": "Primera línea", + "Common.Controllers.Collaboration.textFormatted": "Formateado", + "Common.Controllers.Collaboration.textHighlight": "Color de resaltado", + "Common.Controllers.Collaboration.textImage": "Imagen", + "Common.Controllers.Collaboration.textIndentLeft": "Sangría izquierda", + "Common.Controllers.Collaboration.textIndentRight": "Sangría derecha", + "Common.Controllers.Collaboration.textInserted": "Insertado:", + "Common.Controllers.Collaboration.textItalic": "Cursiva", + "Common.Controllers.Collaboration.textJustify": "Alinear al ancho", + "Common.Controllers.Collaboration.textKeepLines": "Mantener líneas juntas", + "Common.Controllers.Collaboration.textKeepNext": "Mantener con el siguiente", + "Common.Controllers.Collaboration.textLeft": "Alinear a la izquierda", + "Common.Controllers.Collaboration.textLineSpacing": "Espaciado de línea: ", + "Common.Controllers.Collaboration.textMultiple": "Multiplicador", + "Common.Controllers.Collaboration.textNoBreakBefore": "Sin salto de página anterior", + "Common.Controllers.Collaboration.textNoContextual": "Añadir intervalo entre párrafos del mismo estilo", + "Common.Controllers.Collaboration.textNoKeepLines": "No mantener líneas juntas", + "Common.Controllers.Collaboration.textNoKeepNext": "No mantener con el siguiente", + "Common.Controllers.Collaboration.textNot": "No", + "Common.Controllers.Collaboration.textNoWidow": "Sin widow control", + "Common.Controllers.Collaboration.textNum": "Cambiar numeración", + "Common.Controllers.Collaboration.textParaDeleted": "Párrafo Eliminado ", + "Common.Controllers.Collaboration.textParaFormatted": "Párrafo formateado", + "Common.Controllers.Collaboration.textParaInserted": "Párrafo Insertado ", + "Common.Controllers.Collaboration.textParaMoveFromDown": "Bajado:", + "Common.Controllers.Collaboration.textParaMoveFromUp": "Subido:", + "Common.Controllers.Collaboration.textParaMoveTo": "Movido:", + "Common.Controllers.Collaboration.textPosition": "Posición", + "Common.Controllers.Collaboration.textRight": "Alinear a la derecha", + "Common.Controllers.Collaboration.textShape": "Forma", + "Common.Controllers.Collaboration.textShd": "Color del fondo", + "Common.Controllers.Collaboration.textSmallCaps": "Versalitas", + "Common.Controllers.Collaboration.textSpacing": "Espaciado", + "Common.Controllers.Collaboration.textSpacingAfter": "Espaciado después", + "Common.Controllers.Collaboration.textSpacingBefore": "Espaciado antes", + "Common.Controllers.Collaboration.textStrikeout": "Tachado", + "Common.Controllers.Collaboration.textSubScript": "Subíndice", + "Common.Controllers.Collaboration.textSuperScript": "Superíndice", + "Common.Controllers.Collaboration.textTableChanged": "Se cambió configuración de la tabla", + "Common.Controllers.Collaboration.textTableRowsAdd": "Se añadieron filas de la tabla", + "Common.Controllers.Collaboration.textTableRowsDel": "Se eliminaron filas de la tabla", + "Common.Controllers.Collaboration.textTabs": "Cambiar tabuladores", + "Common.Controllers.Collaboration.textUnderline": "Subrayado", + "Common.Controllers.Collaboration.textWidow": "Widow control", "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar", "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textAcceptAllChanges": "Aceptar todos los cambios", + "Common.Views.Collaboration.textBack": "Atrás", + "Common.Views.Collaboration.textChange": "Revisar cambios", + "Common.Views.Collaboration.textCollaboration": "Colaboración", + "Common.Views.Collaboration.textDisplayMode": "Modo de visualización", + "Common.Views.Collaboration.textEditUsers": "Usuarios", + "Common.Views.Collaboration.textFinal": "Final", + "Common.Views.Collaboration.textMarkup": "Cambios", + "Common.Views.Collaboration.textOriginal": "Original", + "Common.Views.Collaboration.textRejectAllChanges": "Rechazar todos los cambios", + "Common.Views.Collaboration.textReview": "Seguimiento de cambios", + "Common.Views.Collaboration.textReviewing": "Revisión", + "Common.Views.Collaboration.textСomments": "Comentarios", "DE.Controllers.AddContainer.textImage": "Imagen", "DE.Controllers.AddContainer.textOther": "Otro", "DE.Controllers.AddContainer.textShape": "Forma", "DE.Controllers.AddContainer.textTable": "Tabla", "DE.Controllers.AddImage.textEmptyImgUrl": "Hay que especificar URL de imagen.", "DE.Controllers.AddImage.txtNotUrl": "Este campo debe ser URL-dirección en el formato 'http://www.example.com'", + "DE.Controllers.AddOther.textBelowText": "Bajo el texto", + "DE.Controllers.AddOther.textBottomOfPage": "Al pie de la página", "DE.Controllers.AddOther.txtNotUrl": "Este campo debe ser URL-dirección en el formato 'http://www.example.com'", "DE.Controllers.AddTable.textCancel": "Cancelar", "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", "DE.Controllers.DocumentHolder.menuDelete": "Eliminar", + "DE.Controllers.DocumentHolder.menuDeleteTable": "Borrar tabla", "DE.Controllers.DocumentHolder.menuEdit": "Editar", + "DE.Controllers.DocumentHolder.menuMerge": "Combinar celdas", "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.menuReviewChange": "Revisar cambios", + "DE.Controllers.DocumentHolder.menuSplit": "Dividir celda", "DE.Controllers.DocumentHolder.sheetCancel": "Cancelar", + "DE.Controllers.DocumentHolder.textCancel": "Cancelar", + "DE.Controllers.DocumentHolder.textColumns": "Columnas", "DE.Controllers.DocumentHolder.textGuest": "Visitante", + "DE.Controllers.DocumentHolder.textRows": "Filas", "DE.Controllers.EditContainer.textChart": "Gráfico", "DE.Controllers.EditContainer.textFooter": "Pie de página", "DE.Controllers.EditContainer.textHeader": "Encabezado", @@ -54,7 +131,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.", "DE.Controllers.Main.criticalErrorExtText": "Pulse 'OK' para volver a la lista de documentos.", "DE.Controllers.Main.criticalErrorTitle": "Error", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Fallo en descarga ", "DE.Controllers.Main.downloadMergeText": "Descargando...", "DE.Controllers.Main.downloadMergeTitle": "Descargando", @@ -63,7 +139,7 @@ "DE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.
      Por favor, contacte con su Administrador del Servidor de Documentos.", "DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto", "DE.Controllers.Main.errorCoAuthoringDisconnect": "La conexión al servidor se ha perdido. Usted ya no puede editar.", - "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, verifique los ajustes de conexión o contacte con su administrador.
      Cuando pulsa el botón 'OK', se le solicitará que descargue el documento.

      Encuentre más información acerca de la conexión de Servidor de Documentos aquí", + "DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.
      Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.

      Encuentre más información acerca de la conexión de Servidor de Documentos aquí", "DE.Controllers.Main.errorDatabaseConnection": "Error externo.
      Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.", "DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", @@ -120,7 +196,7 @@ "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
      Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", "DE.Controllers.Main.textDone": "Listo", "DE.Controllers.Main.textLoadingDocument": "Cargando documento", - "DE.Controllers.Main.textNoLicenseTitle": "Limitación de conexiones ONLYOFFICE", + "DE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones", "DE.Controllers.Main.textOK": "OK", "DE.Controllers.Main.textPaidFeature": "Función de pago", "DE.Controllers.Main.textPassword": "Contraseña", @@ -168,7 +244,7 @@ "DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.
      Por favor, actualice su licencia y después recargue la página.", "DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.
      Por favor, contacte con su administrador para recibir más información.", "DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", - "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", + "DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.
      Si necesita más, por favor, considere comprar una licencia comercial.", "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.", "DE.Controllers.Search.textNoTextFound": "Texto no es encontrado", "DE.Controllers.Search.textReplaceAll": "Reemplazar todo", @@ -196,10 +272,14 @@ "DE.Views.AddOther.textCurrentPos": "Posición actual", "DE.Views.AddOther.textDisplay": "Mostrar", "DE.Views.AddOther.textEvenPage": "Página par", + "DE.Views.AddOther.textFootnote": "Nota al pie", + "DE.Views.AddOther.textFormat": "Formato", "DE.Views.AddOther.textInsert": "Insertar", + "DE.Views.AddOther.textInsertFootnote": "Insertar nota al pie", "DE.Views.AddOther.textLeftBottom": "Abajo a la izquierda", "DE.Views.AddOther.textLeftTop": "Arriba a la izquierda", "DE.Views.AddOther.textLink": "Enlace", + "DE.Views.AddOther.textLocation": "Ubicación", "DE.Views.AddOther.textNextPage": "Página siguiente", "DE.Views.AddOther.textOddPage": "Página impar", "DE.Views.AddOther.textPageBreak": "Salto de página ", @@ -208,6 +288,7 @@ "DE.Views.AddOther.textRightBottom": "Abajo a la derecha", "DE.Views.AddOther.textRightTop": "Arriba a la derecha", "DE.Views.AddOther.textSectionBreak": "Salto de sección", + "DE.Views.AddOther.textStartFrom": "Empezar con", "DE.Views.AddOther.textTip": "Consejos de pantalla", "DE.Views.EditChart.textAlign": "Alineación", "DE.Views.EditChart.textBack": "Atrás", @@ -373,9 +454,12 @@ "DE.Views.Search.textSearch": "Buscar", "DE.Views.Settings.textAbout": "Acerca", "DE.Views.Settings.textAddress": "dirección", + "DE.Views.Settings.textAdvancedSettings": "Ajustes de aplicación", "DE.Views.Settings.textAuthor": "Autor", "DE.Views.Settings.textBack": "Atrás", "DE.Views.Settings.textBottom": "Abajo ", + "DE.Views.Settings.textCentimeter": "Centímetro", + "DE.Views.Settings.textColorSchemes": "Esquemas de color", "DE.Views.Settings.textCreateDate": "Fecha de creación", "DE.Views.Settings.textCustom": "Personalizado", "DE.Views.Settings.textCustomSize": "Tamaño personalizado", @@ -392,13 +476,17 @@ "DE.Views.Settings.textFindAndReplace": "Encontrar y reemplazar", "DE.Views.Settings.textFormat": "Formato", "DE.Views.Settings.textHelp": "Ayuda", + "DE.Views.Settings.textHiddenTableBorders": "Bordes de tabla escondidos", + "DE.Views.Settings.textInch": "Pulgada", "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.textNoCharacters": "Caracteres no imprimibles", "DE.Views.Settings.textOrientation": "Orientación ", "DE.Views.Settings.textPages": "Páginas", "DE.Views.Settings.textParagraphs": "Párrafos", + "DE.Views.Settings.textPoint": "Punto", "DE.Views.Settings.textPortrait": "Vertical", "DE.Views.Settings.textPoweredBy": "Desarrollado por", "DE.Views.Settings.textPrint": "Imprimir", @@ -412,6 +500,7 @@ "DE.Views.Settings.textSymbols": "Símbolos", "DE.Views.Settings.textTel": "Tel.", "DE.Views.Settings.textTop": "Superior", + "DE.Views.Settings.textUnitOfMeasurement": "Unidad de medida", "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 689e3de1e..e1506f27c 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -1,34 +1,111 @@ { + "Common.Controllers.Collaboration.textAtLeast": "au moins ", + "Common.Controllers.Collaboration.textAuto": "auto", + "Common.Controllers.Collaboration.textBaseline": "Ligne de base", + "Common.Controllers.Collaboration.textBold": "Gras", + "Common.Controllers.Collaboration.textBreakBefore": "Saut de page avant", + "Common.Controllers.Collaboration.textCaps": "Tout en majuscules", + "Common.Controllers.Collaboration.textCenter": "Aligner au centre", + "Common.Controllers.Collaboration.textChart": "Graphique", + "Common.Controllers.Collaboration.textColor": "Couleur de police", + "Common.Controllers.Collaboration.textContextual": "Ne pas ajouter d'intervalle entre paragraphes du même style", + "Common.Controllers.Collaboration.textDeleted": "Supprimé:", + "Common.Controllers.Collaboration.textDStrikeout": "Double-barré", + "Common.Controllers.Collaboration.textEditUser": "Document est en cours de modification par plusieurs utilisateurs.", + "Common.Controllers.Collaboration.textEquation": "Équation", + "Common.Controllers.Collaboration.textExact": "exactement", + "Common.Controllers.Collaboration.textFirstLine": "Première ligne", + "Common.Controllers.Collaboration.textFormatted": "Formaté", + "Common.Controllers.Collaboration.textHighlight": "Couleur de surlignage", + "Common.Controllers.Collaboration.textImage": "Image", + "Common.Controllers.Collaboration.textIndentLeft": "Retrait à gauche", + "Common.Controllers.Collaboration.textIndentRight": "Retrait à droite", + "Common.Controllers.Collaboration.textInserted": "Inséré:", + "Common.Controllers.Collaboration.textItalic": "Italique", + "Common.Controllers.Collaboration.textJustify": "Justifier ", + "Common.Controllers.Collaboration.textKeepLines": "Lignes solidaires", + "Common.Controllers.Collaboration.textKeepNext": "Paragraphes solidaires", + "Common.Controllers.Collaboration.textLeft": "Aligner à gauche", + "Common.Controllers.Collaboration.textLineSpacing": "Interligne:", + "Common.Controllers.Collaboration.textMultiple": "multiple ", + "Common.Controllers.Collaboration.textNoBreakBefore": "Pas de saut de page avant", + "Common.Controllers.Collaboration.textNoContextual": "Ajouter un intervalle entre les paragraphes du même style", + "Common.Controllers.Collaboration.textNoKeepLines": "Ne gardez pas de lignes ensemble", + "Common.Controllers.Collaboration.textNoKeepNext": "Ne gardez pas avec la prochaine", + "Common.Controllers.Collaboration.textNot": "Non", + "Common.Controllers.Collaboration.textNoWidow": "Pas de contrôle des veuves", + "Common.Controllers.Collaboration.textNum": "Changer la numérotation", + "Common.Controllers.Collaboration.textParaDeleted": "Paragraphe supprimé ", + "Common.Controllers.Collaboration.textParaFormatted": "Paragraphe Formaté", + "Common.Controllers.Collaboration.textParaInserted": "Paragraphe inséré ", + "Common.Controllers.Collaboration.textParaMoveFromDown": "Déplacé vers le bas:", + "Common.Controllers.Collaboration.textParaMoveFromUp": "Déplacé vers le haut:", + "Common.Controllers.Collaboration.textParaMoveTo": "Déplacé:", + "Common.Controllers.Collaboration.textPosition": "Position", + "Common.Controllers.Collaboration.textRight": "Aligner à droite", + "Common.Controllers.Collaboration.textShape": "Forme", + "Common.Controllers.Collaboration.textShd": "Couleur d'arrière-plan", + "Common.Controllers.Collaboration.textSmallCaps": "Petites majuscules", + "Common.Controllers.Collaboration.textSpacing": "Espacement", + "Common.Controllers.Collaboration.textSpacingAfter": "Espacement après", + "Common.Controllers.Collaboration.textSpacingBefore": "Espacement avant", + "Common.Controllers.Collaboration.textStrikeout": "Barré", + "Common.Controllers.Collaboration.textSubScript": "Indice", + "Common.Controllers.Collaboration.textSuperScript": "Exposant", + "Common.Controllers.Collaboration.textTableChanged": "Paramètres du tableau modifiés", + "Common.Controllers.Collaboration.textTableRowsAdd": "Lignes de tableau ajoutées", + "Common.Controllers.Collaboration.textTableRowsDel": "Lignes de tableau supprimées", + "Common.Controllers.Collaboration.textTabs": "Changer les tabulations", + "Common.Controllers.Collaboration.textUnderline": "Souligné", + "Common.Controllers.Collaboration.textWidow": "Contrôle des veuves", "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textAcceptAllChanges": "Accepter toutes les modifications", + "Common.Views.Collaboration.textBack": "Retour", + "Common.Views.Collaboration.textChange": "Réviser modifications", + "Common.Views.Collaboration.textCollaboration": "Collaboration", + "Common.Views.Collaboration.textDisplayMode": "Mode d'affichage", + "Common.Views.Collaboration.textEditUsers": "Utilisateurs", + "Common.Views.Collaboration.textFinal": "Final", + "Common.Views.Collaboration.textMarkup": "Balisage", + "Common.Views.Collaboration.textOriginal": "Original", + "Common.Views.Collaboration.textRejectAllChanges": "Refuser toutes les modifications ", + "Common.Views.Collaboration.textReview": "Suivi des modifications", + "Common.Views.Collaboration.textReviewing": "Révision", + "Common.Views.Collaboration.textСomments": "Commentaires", "DE.Controllers.AddContainer.textImage": "Image", "DE.Controllers.AddContainer.textOther": "Autre", "DE.Controllers.AddContainer.textShape": "Forme", "DE.Controllers.AddContainer.textTable": "Tableau", "DE.Controllers.AddImage.textEmptyImgUrl": "Spécifiez URL de l'image", "DE.Controllers.AddImage.txtNotUrl": "Ce champ doit être une URL de la forme suivante: 'http://www.example.com'", + "DE.Controllers.AddOther.textBelowText": "Sous le texte", + "DE.Controllers.AddOther.textBottomOfPage": "Bas de page", "DE.Controllers.AddOther.txtNotUrl": "Ce champ doit être une URL de la forme suivante: 'http://www.example.com'", "DE.Controllers.AddTable.textCancel": "Annuler", "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", "DE.Controllers.DocumentHolder.menuDelete": "Supprimer", + "DE.Controllers.DocumentHolder.menuDeleteTable": "Supprimer le tableau", "DE.Controllers.DocumentHolder.menuEdit": "Modifier", + "DE.Controllers.DocumentHolder.menuMerge": "Fusionner les cellules", "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.menuReviewChange": "Réviser modifications", + "DE.Controllers.DocumentHolder.menuSplit": "Fractionner la cellule", "DE.Controllers.DocumentHolder.sheetCancel": "Annuler", + "DE.Controllers.DocumentHolder.textCancel": "Annuler", + "DE.Controllers.DocumentHolder.textColumns": "Colonnes", "DE.Controllers.DocumentHolder.textGuest": "Invité", + "DE.Controllers.DocumentHolder.textRows": "Lignes", "DE.Controllers.EditContainer.textChart": "Graphique", "DE.Controllers.EditContainer.textFooter": "Pied de page", "DE.Controllers.EditContainer.textHeader": "En-tête", @@ -54,7 +131,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.", "DE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.", "DE.Controllers.Main.criticalErrorTitle": "Erreur", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Échec du téléchargement.", "DE.Controllers.Main.downloadMergeText": "Téléchargement en cours...", "DE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours", @@ -63,7 +139,7 @@ "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", + "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", "DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
      Erreur de connexion à la base de données.Contactez le support.", "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.", @@ -196,10 +272,14 @@ "DE.Views.AddOther.textCurrentPos": "Position actuelle", "DE.Views.AddOther.textDisplay": "Afficher", "DE.Views.AddOther.textEvenPage": "Page paire", + "DE.Views.AddOther.textFootnote": "Note de bas de page", + "DE.Views.AddOther.textFormat": "Format", "DE.Views.AddOther.textInsert": "Insérer", + "DE.Views.AddOther.textInsertFootnote": "Insérer une note de bas de page", "DE.Views.AddOther.textLeftBottom": "À gauche en bas", "DE.Views.AddOther.textLeftTop": "À gauche en haut", "DE.Views.AddOther.textLink": "Lien", + "DE.Views.AddOther.textLocation": "Emplacement", "DE.Views.AddOther.textNextPage": "Page suivante", "DE.Views.AddOther.textOddPage": "Page impaire", "DE.Views.AddOther.textPageBreak": "Saut de page", @@ -208,6 +288,7 @@ "DE.Views.AddOther.textRightBottom": "À droite en bas", "DE.Views.AddOther.textRightTop": "À droite en haut", "DE.Views.AddOther.textSectionBreak": "Saut de section", + "DE.Views.AddOther.textStartFrom": "À partir de", "DE.Views.AddOther.textTip": "Info-bulle", "DE.Views.EditChart.textAlign": "Aligner", "DE.Views.EditChart.textBack": "Retour", @@ -373,9 +454,12 @@ "DE.Views.Search.textSearch": "Rechercher", "DE.Views.Settings.textAbout": "A propos", "DE.Views.Settings.textAddress": "adresse", + "DE.Views.Settings.textAdvancedSettings": "Paramètres de l'application", "DE.Views.Settings.textAuthor": "Auteur", "DE.Views.Settings.textBack": "Retour", "DE.Views.Settings.textBottom": "En bas", + "DE.Views.Settings.textCentimeter": "Centimètre", + "DE.Views.Settings.textColorSchemes": "Jeux de couleurs", "DE.Views.Settings.textCreateDate": "Date de création", "DE.Views.Settings.textCustom": "Personnalisé", "DE.Views.Settings.textCustomSize": "Taille personnalisée", @@ -392,13 +476,17 @@ "DE.Views.Settings.textFindAndReplace": "Rechercher et remplacer", "DE.Views.Settings.textFormat": "Format", "DE.Views.Settings.textHelp": "Aide", + "DE.Views.Settings.textHiddenTableBorders": "Bordures du tableau cachées", + "DE.Views.Settings.textInch": "Pouce", "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.textNoCharacters": "Caractères non imprimables", "DE.Views.Settings.textOrientation": "Orientation", "DE.Views.Settings.textPages": "Pages", "DE.Views.Settings.textParagraphs": "Paragraphes", + "DE.Views.Settings.textPoint": "Point", "DE.Views.Settings.textPortrait": "Portrait", "DE.Views.Settings.textPoweredBy": "Propulsé par ", "DE.Views.Settings.textPrint": "Imprimer", @@ -412,6 +500,7 @@ "DE.Views.Settings.textSymbols": "Symboles", "DE.Views.Settings.textTel": "Tél.", "DE.Views.Settings.textTop": "En haut", + "DE.Views.Settings.textUnitOfMeasurement": "Unité de mesure", "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 adba17967..a2b0c248f 100644 --- a/apps/documenteditor/mobile/locale/hu.json +++ b/apps/documenteditor/mobile/locale/hu.json @@ -14,8 +14,6 @@ "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", @@ -24,8 +22,6 @@ "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", @@ -54,7 +50,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.", "DE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\"-t a dokumentumok listájához.", "DE.Controllers.Main.criticalErrorTitle": "Hiba", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentum Szerkesztő", "DE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.", "DE.Controllers.Main.downloadMergeText": "Letöltés...", "DE.Controllers.Main.downloadMergeTitle": "Letöltés", @@ -63,7 +58,7 @@ "DE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.
      Vegye fel a kapcsolatot a Document Server adminisztrátorával.", "DE.Controllers.Main.errorBadImageUrl": "Hibás kép URL", "DE.Controllers.Main.errorCoAuthoringDisconnect": "A szerver elveszítette a kapcsolatot. A további szerkesztés nem lehetséges.", - "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", + "DE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", "DE.Controllers.Main.errorDatabaseConnection": "Külső hiba.
      Adatbázis kapcsolati hiba. Kérem vegye igénybe támogatásunkat.", "DE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.", "DE.Controllers.Main.errorDataRange": "Hibás adattartomány.", diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index 20640b972..54c35705c 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -1,34 +1,109 @@ { + "Common.Controllers.Collaboration.textAtLeast": "Minima", + "Common.Controllers.Collaboration.textAuto": "auto", + "Common.Controllers.Collaboration.textBaseline": "Linea guida", + "Common.Controllers.Collaboration.textBold": "Grassetto", + "Common.Controllers.Collaboration.textBreakBefore": "Anteponi interruzione", + "Common.Controllers.Collaboration.textCaps": "Tutto maiuscolo", + "Common.Controllers.Collaboration.textCenter": "Allinea al centro", + "Common.Controllers.Collaboration.textChart": "Grafico", + "Common.Controllers.Collaboration.textColor": "Colore del carattere", + "Common.Controllers.Collaboration.textContextual": "Non aggiungere intervallo tra paragrafi dello stesso stile", + "Common.Controllers.Collaboration.textDeleted": "Eliminato:", + "Common.Controllers.Collaboration.textDStrikeout": "Doppio barrato", + "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", + "Common.Controllers.Collaboration.textEquation": "Equazione", + "Common.Controllers.Collaboration.textExact": "Esatto", + "Common.Controllers.Collaboration.textFirstLine": "Prima riga", + "Common.Controllers.Collaboration.textFormatted": "Formattato", + "Common.Controllers.Collaboration.textHighlight": "Colore evidenziatore", + "Common.Controllers.Collaboration.textImage": "Immagine", + "Common.Controllers.Collaboration.textIndentLeft": "Rientro a sinistra", + "Common.Controllers.Collaboration.textIndentRight": "Rientro a destra", + "Common.Controllers.Collaboration.textInserted": "Inserito:", + "Common.Controllers.Collaboration.textItalic": "Corsivo", + "Common.Controllers.Collaboration.textJustify": "Giustificato", + "Common.Controllers.Collaboration.textKeepLines": "Mantieni assieme le righe", + "Common.Controllers.Collaboration.textKeepNext": "Mantieni con il successivo", + "Common.Controllers.Collaboration.textLeft": "Allinea a sinistra", + "Common.Controllers.Collaboration.textLineSpacing": "Interlinea:", + "Common.Controllers.Collaboration.textMultiple": "multiplo", + "Common.Controllers.Collaboration.textNoBreakBefore": "Nessuna interruzione di pagina prima", + "Common.Controllers.Collaboration.textNoContextual": "Aggiungi intervallo tra paragrafi dello stesso stile", + "Common.Controllers.Collaboration.textNoKeepLines": "Non tenere insieme le linee", + "Common.Controllers.Collaboration.textNoKeepNext": "Non tenere dal prossimo", + "Common.Controllers.Collaboration.textNot": "Not ", + "Common.Controllers.Collaboration.textNum": "Modifica numerazione", + "Common.Controllers.Collaboration.textParaDeleted": "Paragrafo eliminato ", + "Common.Controllers.Collaboration.textParaFormatted": "Paragrafo formattato ", + "Common.Controllers.Collaboration.textParaInserted": "Paragrafo inserito ", + "Common.Controllers.Collaboration.textParaMoveFromDown": "Spostato in basso:", + "Common.Controllers.Collaboration.textParaMoveFromUp": "Spostato in alto:", + "Common.Controllers.Collaboration.textParaMoveTo": "Spostato:", + "Common.Controllers.Collaboration.textPosition": "Posizione", + "Common.Controllers.Collaboration.textRight": "Allinea a destra", + "Common.Controllers.Collaboration.textShape": "Forma", + "Common.Controllers.Collaboration.textShd": "Colore sfondo", + "Common.Controllers.Collaboration.textSmallCaps": "Maiuscoletto", + "Common.Controllers.Collaboration.textSpacing": "Spaziatura", + "Common.Controllers.Collaboration.textSpacingAfter": "Spaziatura dopo", + "Common.Controllers.Collaboration.textSpacingBefore": "Spaziatura prima", + "Common.Controllers.Collaboration.textStrikeout": "Barrato", + "Common.Controllers.Collaboration.textSubScript": "Pedice", + "Common.Controllers.Collaboration.textSuperScript": "Apice", + "Common.Controllers.Collaboration.textTableChanged": "Impostazioni tabella modificate", + "Common.Controllers.Collaboration.textTableRowsAdd": "Righe tabella aggiunte", + "Common.Controllers.Collaboration.textTableRowsDel": "Righe tabella eliminate", + "Common.Controllers.Collaboration.textTabs": "Modifica Schede", + "Common.Controllers.Collaboration.textUnderline": "Sottolineato", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textAcceptAllChanges": "Accetta tutte le modifiche", + "Common.Views.Collaboration.textBack": "Indietro", + "Common.Views.Collaboration.textChange": "Modifica revisione", + "Common.Views.Collaboration.textCollaboration": "Collaborazione", + "Common.Views.Collaboration.textDisplayMode": "Modalità Visualizzazione", + "Common.Views.Collaboration.textEditUsers": "Utenti", + "Common.Views.Collaboration.textFinal": "Finale", + "Common.Views.Collaboration.textMarkup": "Marcatura", + "Common.Views.Collaboration.textOriginal": "Originale", + "Common.Views.Collaboration.textRejectAllChanges": "Annulla tutte le modifiche", + "Common.Views.Collaboration.textReview": "Traccia cambiamenti", + "Common.Views.Collaboration.textReviewing": "Revisione", + "Common.Views.Collaboration.textСomments": "Сommenti", "DE.Controllers.AddContainer.textImage": "Immagine", "DE.Controllers.AddContainer.textOther": "Altro", "DE.Controllers.AddContainer.textShape": "Forma", "DE.Controllers.AddContainer.textTable": "Tabella", "DE.Controllers.AddImage.textEmptyImgUrl": "Specifica URL immagine.", "DE.Controllers.AddImage.txtNotUrl": "Questo campo dovrebbe contenere un URL nel formato 'http://www.example.com'", + "DE.Controllers.AddOther.textBelowText": "Sotto al testo", + "DE.Controllers.AddOther.textBottomOfPage": "Fondo pagina", "DE.Controllers.AddOther.txtNotUrl": "Questo campo dovrebbe contenere un URL nel formato 'http://www.example.com'", "DE.Controllers.AddTable.textCancel": "Annulla", "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", "DE.Controllers.DocumentHolder.menuDelete": "Elimina", + "DE.Controllers.DocumentHolder.menuDeleteTable": "Elimina tabella", "DE.Controllers.DocumentHolder.menuEdit": "Modifica", + "DE.Controllers.DocumentHolder.menuMerge": "Unisci celle", "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.menuReviewChange": "Modifica revisione", + "DE.Controllers.DocumentHolder.menuSplit": "Dividi cella", "DE.Controllers.DocumentHolder.sheetCancel": "Annulla", + "DE.Controllers.DocumentHolder.textCancel": "Annulla", + "DE.Controllers.DocumentHolder.textColumns": "Colonne", "DE.Controllers.DocumentHolder.textGuest": "Ospite", + "DE.Controllers.DocumentHolder.textRows": "Righe", "DE.Controllers.EditContainer.textChart": "Grafico", "DE.Controllers.EditContainer.textFooter": "Piè di pagina", "DE.Controllers.EditContainer.textHeader": "Intestazione", @@ -54,7 +129,6 @@ "DE.Controllers.Main.convertationTimeoutText": "È stato superato il tempo limite della conversione.", "DE.Controllers.Main.criticalErrorExtText": "Clicca 'OK' per tornare alla lista documento", "DE.Controllers.Main.criticalErrorTitle": "Errore", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Scaricamento fallito", "DE.Controllers.Main.downloadMergeText": "Scaricamento in corso...", "DE.Controllers.Main.downloadMergeTitle": "Scaricamento", @@ -63,7 +137,7 @@ "DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.
      Si prega di contattare l'amministratore del Server dei Documenti.", "DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.", - "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", + "DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", "DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
      Errore di connessione al database. Si prega di contattare il supporto.", "DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", @@ -120,7 +194,7 @@ "DE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore.
      Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.", "DE.Controllers.Main.textDone": "Fatto", "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "DE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione", "DE.Controllers.Main.textOK": "OK", "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "DE.Controllers.Main.textPassword": "Password", @@ -168,7 +242,7 @@ "DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
      Si prega di aggiornare la licenza e ricaricare la pagina.", "DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
      Per ulteriori informazioni, contattare l'amministratore.", "DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
      Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", - "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
      Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", + "DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
      Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", "DE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.", "DE.Controllers.Search.textNoTextFound": "Testo non trovato", "DE.Controllers.Search.textReplaceAll": "Sostituisci tutto", @@ -176,6 +250,7 @@ "DE.Controllers.Settings.txtLoading": "Caricamento in corso...", "DE.Controllers.Settings.unknownText": "Sconosciuto", "DE.Controllers.Settings.warnDownloadAs": "Se continui a salvare in questo formato tutte le funzioni eccetto il testo vengono perse.
      Sei sicuro di voler continuare?", + "DE.Controllers.Settings.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.
      Vuoi continuare?", "DE.Controllers.Toolbar.dlgLeaveMsgText": "Ci sono delle modifiche non salvate in questo documento. Clicca su 'Rimani in questa pagina, in attesa del salvataggio automatico del documento. Clicca su 'Lascia questa pagina' per annullare le modifiche.", "DE.Controllers.Toolbar.dlgLeaveTitleText": "Lascia l'applicazione", "DE.Controllers.Toolbar.leaveButtonText": "Lascia la pagina", @@ -196,10 +271,14 @@ "DE.Views.AddOther.textCurrentPos": "Posizione attuale", "DE.Views.AddOther.textDisplay": "Visualizza", "DE.Views.AddOther.textEvenPage": "Pagina pari", + "DE.Views.AddOther.textFootnote": "Note a piè di pagina", + "DE.Views.AddOther.textFormat": "Formato", "DE.Views.AddOther.textInsert": "Inserisci", + "DE.Views.AddOther.textInsertFootnote": "Inserisci nota a piè di pagina", "DE.Views.AddOther.textLeftBottom": "In basso a sinistra", "DE.Views.AddOther.textLeftTop": "In alto a sinistra", "DE.Views.AddOther.textLink": "Collegamento", + "DE.Views.AddOther.textLocation": "Posizione", "DE.Views.AddOther.textNextPage": "Pagina successiva", "DE.Views.AddOther.textOddPage": "Pagina dispari", "DE.Views.AddOther.textPageBreak": "Dividi pagina", @@ -208,6 +287,7 @@ "DE.Views.AddOther.textRightBottom": "In basso a destra", "DE.Views.AddOther.textRightTop": "In alto a destra", "DE.Views.AddOther.textSectionBreak": "Interrompi sezione", + "DE.Views.AddOther.textStartFrom": "Inizia da", "DE.Views.AddOther.textTip": "Suggerimento ", "DE.Views.EditChart.textAlign": "Allinea", "DE.Views.EditChart.textBack": "Indietro", @@ -373,12 +453,21 @@ "DE.Views.Search.textSearch": "Cerca", "DE.Views.Settings.textAbout": "Informazioni su", "DE.Views.Settings.textAddress": "indirizzo", + "DE.Views.Settings.textAdvancedSettings": "Impostazioni Applicazione", + "DE.Views.Settings.textApplication": "Applicazione", "DE.Views.Settings.textAuthor": "Autore", "DE.Views.Settings.textBack": "Indietro", "DE.Views.Settings.textBottom": "In basso", + "DE.Views.Settings.textCentimeter": "Centimetro", + "DE.Views.Settings.textColorSchemes": "Schemi di colore", + "DE.Views.Settings.textComment": "Commento", + "DE.Views.Settings.textCommentingDisplay": "Visualizzazione dei Commenti", + "DE.Views.Settings.textCreated": "Creato", "DE.Views.Settings.textCreateDate": "Data di creazione", "DE.Views.Settings.textCustom": "Personalizzato", "DE.Views.Settings.textCustomSize": "Dimensione personalizzata", + "DE.Views.Settings.textDisplayComments": "Commenti", + "DE.Views.Settings.textDisplayResolvedComments": "Commenti risolti", "DE.Views.Settings.textDocInfo": "Informazioni sul documento", "DE.Views.Settings.textDocTitle": "Titolo documento", "DE.Views.Settings.textDocumentFormats": "Formati del documento", @@ -392,13 +481,21 @@ "DE.Views.Settings.textFindAndReplace": "Trova e sostituisci", "DE.Views.Settings.textFormat": "Formato", "DE.Views.Settings.textHelp": "Guida", + "DE.Views.Settings.textHiddenTableBorders": "Bordi tabella nascosti", + "DE.Views.Settings.textInch": "Pollice", "DE.Views.Settings.textLandscape": "Orizzontale", + "DE.Views.Settings.textLastModified": "Ultima modifica", + "DE.Views.Settings.textLastModifiedBy": "Ultima modifica di", "DE.Views.Settings.textLeft": "A sinistra", "DE.Views.Settings.textLoading": "Caricamento in corso...", + "DE.Views.Settings.textLocation": "Percorso", "DE.Views.Settings.textMargins": "Margini", + "DE.Views.Settings.textNoCharacters": "Caratteri non stampabili", "DE.Views.Settings.textOrientation": "Orientamento", + "DE.Views.Settings.textOwner": "Proprietario", "DE.Views.Settings.textPages": "Pagine", "DE.Views.Settings.textParagraphs": "Paragrafi", + "DE.Views.Settings.textPoint": "Punto", "DE.Views.Settings.textPortrait": "Verticale", "DE.Views.Settings.textPoweredBy": "Con tecnologia", "DE.Views.Settings.textPrint": "Stampa", @@ -409,9 +506,13 @@ "DE.Views.Settings.textSpaces": "Spazi", "DE.Views.Settings.textSpellcheck": "Controllo ortografia", "DE.Views.Settings.textStatistic": "Statistica", + "DE.Views.Settings.textSubject": "Oggetto", "DE.Views.Settings.textSymbols": "Simboli", "DE.Views.Settings.textTel": "Tel.", + "DE.Views.Settings.textTitle": "Titolo documento", "DE.Views.Settings.textTop": "In alto", + "DE.Views.Settings.textUnitOfMeasurement": "Unità di misura", + "DE.Views.Settings.textUploaded": "Caricato", "DE.Views.Settings.textVersion": "Versione", "DE.Views.Settings.textWords": "Parole", "DE.Views.Settings.unknownText": "Sconosciuto", diff --git a/apps/documenteditor/mobile/locale/ko.json b/apps/documenteditor/mobile/locale/ko.json index 49b20f2ff..9f2f0f6d4 100644 --- a/apps/documenteditor/mobile/locale/ko.json +++ b/apps/documenteditor/mobile/locale/ko.json @@ -14,8 +14,6 @@ "DE.Controllers.AddTable.textColumns": "열", "DE.Controllers.AddTable.textRows": "Rows", "DE.Controllers.AddTable.textTableSize": "표 크기", - "DE.Controllers.DocumentHolder.menuAccept": "수락", - "DE.Controllers.DocumentHolder.menuAcceptAll": "모두 수락", "DE.Controllers.DocumentHolder.menuAddLink": "링크 추가", "DE.Controllers.DocumentHolder.menuCopy": "복사", "DE.Controllers.DocumentHolder.menuCut": "잘라 내기", @@ -24,8 +22,6 @@ "DE.Controllers.DocumentHolder.menuMore": "More", "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": "Guest", @@ -54,7 +50,6 @@ "DE.Controllers.Main.convertationTimeoutText": "전환 시간 초과를 초과했습니다.", "DE.Controllers.Main.criticalErrorExtText": "문서 목록으로 돌아가려면 '확인'을 누르십시오.", "DE.Controllers.Main.criticalErrorTitle": "오류", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE 문서 편집기", "DE.Controllers.Main.downloadErrorText": "다운로드하지 못했습니다.", "DE.Controllers.Main.downloadMergeText": "다운로드 중 ...", "DE.Controllers.Main.downloadMergeTitle": "다운로드 중", @@ -62,7 +57,7 @@ "DE.Controllers.Main.downloadTitleText": "문서 다운로드 중", "DE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.", "DE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 더 이상 편집 할 수 없습니다.", - "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", + "DE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", "DE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다.
      데이터베이스 연결 오류입니다. 지원팀에 문의하십시오.", "DE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.", "DE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1", diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json index 34f36ae5f..54997e1df 100644 --- a/apps/documenteditor/mobile/locale/lv.json +++ b/apps/documenteditor/mobile/locale/lv.json @@ -46,7 +46,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Konversijas taimauts pārsniegts.", "DE.Controllers.Main.criticalErrorExtText": "Nospiediet \"OK\", lai atgrieztos dokumentu sarakstā.", "DE.Controllers.Main.criticalErrorTitle": "Kļūda", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Dokumentu Redaktors", "DE.Controllers.Main.downloadErrorText": "Lejuplāde neizdevās.", "DE.Controllers.Main.downloadMergeText": "Lejupielādē...", "DE.Controllers.Main.downloadMergeTitle": "Lejupielāde", @@ -54,7 +53,7 @@ "DE.Controllers.Main.downloadTitleText": "Dokumenta lejupielāde", "DE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Zudis servera savienojums. Jūs vairs nevarat rediģēt.", - "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk par dokumentu servera pieslēgšanu šeit", + "DE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk par dokumentu servera pieslēgšanu šeit", "DE.Controllers.Main.errorDatabaseConnection": "Ārējā kļūda.
      Datubāzes piekļuves kļūda. Lūdzu, sazinieties ar atbalsta daļu.", "DE.Controllers.Main.errorDataRange": "Nepareizs datu diapazons", "DE.Controllers.Main.errorDefaultMessage": "Kļūdas kods: %1", diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json index cf34e4296..6e9ee4e72 100644 --- a/apps/documenteditor/mobile/locale/nl.json +++ b/apps/documenteditor/mobile/locale/nl.json @@ -14,8 +14,6 @@ "DE.Controllers.AddTable.textColumns": "Kolommen", "DE.Controllers.AddTable.textRows": "Rijen", "DE.Controllers.AddTable.textTableSize": "Tabelgrootte", - "DE.Controllers.DocumentHolder.menuAccept": "Accepteren", - "DE.Controllers.DocumentHolder.menuAcceptAll": "Alles accepteren", "DE.Controllers.DocumentHolder.menuAddLink": "Koppeling toevoegen", "DE.Controllers.DocumentHolder.menuCopy": "Kopiëren", "DE.Controllers.DocumentHolder.menuCut": "Knippen", @@ -24,8 +22,6 @@ "DE.Controllers.DocumentHolder.menuMore": "Meer", "DE.Controllers.DocumentHolder.menuOpenLink": "Koppeling openen", "DE.Controllers.DocumentHolder.menuPaste": "Plakken", - "DE.Controllers.DocumentHolder.menuReject": "Afwijzen", - "DE.Controllers.DocumentHolder.menuRejectAll": "Alles afwijzen", "DE.Controllers.DocumentHolder.menuReview": "Beoordelen", "DE.Controllers.DocumentHolder.sheetCancel": "Annuleren", "DE.Controllers.DocumentHolder.textGuest": "Gast", @@ -54,7 +50,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.", "DE.Controllers.Main.criticalErrorExtText": "Druk op \"OK\" om terug te gaan naar de lijst met documenten.", "DE.Controllers.Main.criticalErrorTitle": "Fout", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE-documenteditor", "DE.Controllers.Main.downloadErrorText": "Download mislukt.", "DE.Controllers.Main.downloadMergeText": "Downloaden...", "DE.Controllers.Main.downloadMergeTitle": "Downloaden", @@ -63,7 +58,7 @@ "DE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.
      Neem contact op met de beheerder van de documentserver.", "DE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server verbroken. U kunt niet doorgaan met bewerken.", - "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.

      Meer informatie over verbindingen met de documentserver is hier te vinden.", + "DE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.

      Meer informatie over verbindingen met de documentserver is hier te vinden.", "DE.Controllers.Main.errorDatabaseConnection": "Externe fout.
      Fout in databaseverbinding. Neem contact op met Support.", "DE.Controllers.Main.errorDataEncrypted": "Versleutelde wijzigingen zijn ontvangen, deze kunnen niet ontcijferd worden.", "DE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik", diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json index 4b13b1b69..ec40e9768 100644 --- a/apps/documenteditor/mobile/locale/pl.json +++ b/apps/documenteditor/mobile/locale/pl.json @@ -3,6 +3,7 @@ "Common.UI.ThemeColorPalette.textThemeColors": "Kolory motywu", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textCollaboration": "Współpraca", "DE.Controllers.AddContainer.textImage": "Obraz", "DE.Controllers.AddContainer.textOther": "Inny", "DE.Controllers.AddContainer.textShape": "Kształt", @@ -14,8 +15,6 @@ "DE.Controllers.AddTable.textColumns": "Kolumny", "DE.Controllers.AddTable.textRows": "Wiersze", "DE.Controllers.AddTable.textTableSize": "Rozmiar tabeli", - "DE.Controllers.DocumentHolder.menuAccept": "Akceptuj", - "DE.Controllers.DocumentHolder.menuAcceptAll": "Akceptuj wszystko", "DE.Controllers.DocumentHolder.menuAddLink": "Dodaj link", "DE.Controllers.DocumentHolder.menuCopy": "Kopiuj", "DE.Controllers.DocumentHolder.menuCut": "Wytnij", @@ -49,7 +48,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.", "DE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\" aby powrócić do listy dokumentów.", "DE.Controllers.Main.criticalErrorTitle": "Błąd", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor dokumentów", "DE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.", "DE.Controllers.Main.downloadMergeText": "Pobieranie...", "DE.Controllers.Main.downloadMergeTitle": "Pobieranie", @@ -57,7 +55,7 @@ "DE.Controllers.Main.downloadTitleText": "Pobieranie dokumentu", "DE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie możesz już edytować.", - "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", + "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", "DE.Controllers.Main.errorDatabaseConnection": "Zewnętrzny błąd.
      Błąd połączenia z bazą danych. Proszę skontaktuj się z administratorem.", "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.", "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1", diff --git a/apps/documenteditor/mobile/locale/pt.json b/apps/documenteditor/mobile/locale/pt.json index 28e296601..9733b2e5f 100644 --- a/apps/documenteditor/mobile/locale/pt.json +++ b/apps/documenteditor/mobile/locale/pt.json @@ -46,7 +46,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.", "DE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documento.", "DE.Controllers.Main.criticalErrorTitle": "Erro", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Falha ao Baixar", "DE.Controllers.Main.downloadMergeText": "Baixando...", "DE.Controllers.Main.downloadMergeTitle": "Baixando", @@ -54,7 +53,7 @@ "DE.Controllers.Main.downloadTitleText": "Baixando Documento", "DE.Controllers.Main.errorBadImageUrl": "URL de imagem está incorreta", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão ao servidor perdida. Você não pode mais editar.", - "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.
      Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.

      Encontre mais informações sobre como conecta ao Document Server aqui ", + "DE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.
      Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.

      Encontre mais informações sobre como conecta ao Document Server aqui", "DE.Controllers.Main.errorDatabaseConnection": "Erro externo.
      Erro de conexão do banco de dados. Entre em contato com o suporte.", "DE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.", "DE.Controllers.Main.errorDefaultMessage": "Código do Erro: %1", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 1728813b3..990c766eb 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -1,34 +1,111 @@ { + "Common.Controllers.Collaboration.textAtLeast": "минимум", + "Common.Controllers.Collaboration.textAuto": "авто", + "Common.Controllers.Collaboration.textBaseline": "Базовая линия", + "Common.Controllers.Collaboration.textBold": "Жирный", + "Common.Controllers.Collaboration.textBreakBefore": "С новой страницы", + "Common.Controllers.Collaboration.textCaps": "Все прописные", + "Common.Controllers.Collaboration.textCenter": "Выравнивание по центру", + "Common.Controllers.Collaboration.textChart": "Диаграмма", + "Common.Controllers.Collaboration.textColor": "Цвет шрифта", + "Common.Controllers.Collaboration.textContextual": "Не добавлять интервал между абзацами одного стиля", + "Common.Controllers.Collaboration.textDeleted": "Удалено:", + "Common.Controllers.Collaboration.textDStrikeout": "Двойное зачеркивание", + "Common.Controllers.Collaboration.textEditUser": "Документ редактируется несколькими пользователями.", + "Common.Controllers.Collaboration.textEquation": "Уравнение", + "Common.Controllers.Collaboration.textExact": "точно", + "Common.Controllers.Collaboration.textFirstLine": "Первая строка", + "Common.Controllers.Collaboration.textFormatted": "Отформатировано", + "Common.Controllers.Collaboration.textHighlight": "Цвет выделения", + "Common.Controllers.Collaboration.textImage": "Изображение", + "Common.Controllers.Collaboration.textIndentLeft": "Отступ слева", + "Common.Controllers.Collaboration.textIndentRight": "Отступ справа", + "Common.Controllers.Collaboration.textInserted": "Добавлено:", + "Common.Controllers.Collaboration.textItalic": "Курсив", + "Common.Controllers.Collaboration.textJustify": "Выравнивание по ширине", + "Common.Controllers.Collaboration.textKeepLines": "Не разрывать абзац", + "Common.Controllers.Collaboration.textKeepNext": "Не отрывать от следующего", + "Common.Controllers.Collaboration.textLeft": "Выравнивание по левому краю", + "Common.Controllers.Collaboration.textLineSpacing": "Междустрочный интервал: ", + "Common.Controllers.Collaboration.textMultiple": "множитель", + "Common.Controllers.Collaboration.textNoBreakBefore": "Не с новой страницы", + "Common.Controllers.Collaboration.textNoContextual": "Добавлять интервал между абзацами одного стиля", + "Common.Controllers.Collaboration.textNoKeepLines": "Разрешить разрывать абзац", + "Common.Controllers.Collaboration.textNoKeepNext": "Разрешить отрывать от следующего", + "Common.Controllers.Collaboration.textNot": "Не", + "Common.Controllers.Collaboration.textNoWidow": "Без запрета висячих строк", + "Common.Controllers.Collaboration.textNum": "Изменение нумерации", + "Common.Controllers.Collaboration.textParaDeleted": "Абзац удален ", + "Common.Controllers.Collaboration.textParaFormatted": "Абзац отформатирован", + "Common.Controllers.Collaboration.textParaInserted": "Абзац добавлен ", + "Common.Controllers.Collaboration.textParaMoveFromDown": "Перемещено вниз:", + "Common.Controllers.Collaboration.textParaMoveFromUp": "Перемещено вверх:", + "Common.Controllers.Collaboration.textParaMoveTo": "Перемещено:", + "Common.Controllers.Collaboration.textPosition": "Положение", + "Common.Controllers.Collaboration.textRight": "Выравнивание по правому краю", + "Common.Controllers.Collaboration.textShape": "Фигура", + "Common.Controllers.Collaboration.textShd": "Цвет фона", + "Common.Controllers.Collaboration.textSmallCaps": "Малые прописные", + "Common.Controllers.Collaboration.textSpacing": "Интервал", + "Common.Controllers.Collaboration.textSpacingAfter": "Интервал после абзаца", + "Common.Controllers.Collaboration.textSpacingBefore": "Интервал перед абзацем", + "Common.Controllers.Collaboration.textStrikeout": "Зачеркнутый", + "Common.Controllers.Collaboration.textSubScript": "Подстрочный", + "Common.Controllers.Collaboration.textSuperScript": "Надстрочный", + "Common.Controllers.Collaboration.textTableChanged": "Изменены настройки таблицы", + "Common.Controllers.Collaboration.textTableRowsAdd": "Добавлены строки таблицы", + "Common.Controllers.Collaboration.textTableRowsDel": "Удалены строки таблицы", + "Common.Controllers.Collaboration.textTabs": "Изменение табуляции", + "Common.Controllers.Collaboration.textUnderline": "Подчёркнутый", + "Common.Controllers.Collaboration.textWidow": "Запрет висячих строк", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "пт", + "Common.Views.Collaboration.textAcceptAllChanges": "Принять все изменения", + "Common.Views.Collaboration.textBack": "Назад", + "Common.Views.Collaboration.textChange": "Просмотр изменений", + "Common.Views.Collaboration.textCollaboration": "Совместная работа", + "Common.Views.Collaboration.textDisplayMode": "Отображение", + "Common.Views.Collaboration.textEditUsers": "Пользователи", + "Common.Views.Collaboration.textFinal": "Измененный документ", + "Common.Views.Collaboration.textMarkup": "Изменения", + "Common.Views.Collaboration.textOriginal": "Исходный документ", + "Common.Views.Collaboration.textRejectAllChanges": "Отклонить все изменения", + "Common.Views.Collaboration.textReview": "Отслеживание изменений", + "Common.Views.Collaboration.textReviewing": "Рецензирование", + "Common.Views.Collaboration.textСomments": "Комментарии", "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.textBelowText": "Под текстом", + "DE.Controllers.AddOther.textBottomOfPage": "Внизу страницы", "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.menuDeleteTable": "Удалить таблицу", "DE.Controllers.DocumentHolder.menuEdit": "Редактировать", + "DE.Controllers.DocumentHolder.menuMerge": "Объединить ячейки", "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.menuReviewChange": "Просмотр изменений", + "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку", "DE.Controllers.DocumentHolder.sheetCancel": "Отмена", + "DE.Controllers.DocumentHolder.textCancel": "Отмена", + "DE.Controllers.DocumentHolder.textColumns": "Колонки", "DE.Controllers.DocumentHolder.textGuest": "Гость", + "DE.Controllers.DocumentHolder.textRows": "Строки", "DE.Controllers.EditContainer.textChart": "Диаграмма", "DE.Controllers.EditContainer.textFooter": "Колонтитул", "DE.Controllers.EditContainer.textHeader": "Колонтитул", @@ -54,7 +131,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "DE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.", "DE.Controllers.Main.criticalErrorTitle": "Ошибка", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Загрузка не удалась.", "DE.Controllers.Main.downloadMergeText": "Загрузка...", "DE.Controllers.Main.downloadMergeTitle": "Загрузка", @@ -63,7 +139,7 @@ "DE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
      Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.", - "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", + "DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", "DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
      Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.", "DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", @@ -120,7 +196,7 @@ "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
      Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", "DE.Controllers.Main.textDone": "Готово", "DE.Controllers.Main.textLoadingDocument": "Загрузка документа", - "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", + "DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1", "DE.Controllers.Main.textOK": "OK", "DE.Controllers.Main.textPaidFeature": "Платная функция", "DE.Controllers.Main.textPassword": "Пароль", @@ -167,8 +243,8 @@ "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.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Search.textNoTextFound": "Текст не найден", "DE.Controllers.Search.textReplaceAll": "Заменить все", @@ -196,10 +272,14 @@ "DE.Views.AddOther.textCurrentPos": "Текущая позиция", "DE.Views.AddOther.textDisplay": "Отобразить", "DE.Views.AddOther.textEvenPage": "С четной страницы", + "DE.Views.AddOther.textFootnote": "Сноска", + "DE.Views.AddOther.textFormat": "Формат", "DE.Views.AddOther.textInsert": "Вставить", + "DE.Views.AddOther.textInsertFootnote": "Вставить сноску", "DE.Views.AddOther.textLeftBottom": "Слева снизу", "DE.Views.AddOther.textLeftTop": "Слева сверху", "DE.Views.AddOther.textLink": "Ссылка", + "DE.Views.AddOther.textLocation": "Положение", "DE.Views.AddOther.textNextPage": "Со следующей страницы", "DE.Views.AddOther.textOddPage": "С нечетной страницы", "DE.Views.AddOther.textPageBreak": "Разрыв страницы", @@ -208,6 +288,7 @@ "DE.Views.AddOther.textRightBottom": "Снизу справа", "DE.Views.AddOther.textRightTop": "Справа сверху", "DE.Views.AddOther.textSectionBreak": "Разрыв раздела", + "DE.Views.AddOther.textStartFrom": "Начать с", "DE.Views.AddOther.textTip": "Подсказка", "DE.Views.EditChart.textAlign": "Выравнивание", "DE.Views.EditChart.textBack": "Назад", @@ -373,9 +454,12 @@ "DE.Views.Search.textSearch": "Найти", "DE.Views.Settings.textAbout": "О программе", "DE.Views.Settings.textAddress": "адрес", + "DE.Views.Settings.textAdvancedSettings": "Настройки приложения", "DE.Views.Settings.textAuthor": "Автор", "DE.Views.Settings.textBack": "Назад", "DE.Views.Settings.textBottom": "Нижнее", + "DE.Views.Settings.textCentimeter": "Сантиметр", + "DE.Views.Settings.textColorSchemes": "Цветовые схемы", "DE.Views.Settings.textCreateDate": "Дата создания", "DE.Views.Settings.textCustom": "Особый", "DE.Views.Settings.textCustomSize": "Особый размер", @@ -392,13 +476,17 @@ "DE.Views.Settings.textFindAndReplace": "Поиск и замена", "DE.Views.Settings.textFormat": "Формат", "DE.Views.Settings.textHelp": "Справка", + "DE.Views.Settings.textHiddenTableBorders": "Скрытые границы таблиц", + "DE.Views.Settings.textInch": "Дюйм", "DE.Views.Settings.textLandscape": "Альбомная", "DE.Views.Settings.textLeft": "Левое", "DE.Views.Settings.textLoading": "Загрузка...", "DE.Views.Settings.textMargins": "Поля", + "DE.Views.Settings.textNoCharacters": "Непечатаемые символы", "DE.Views.Settings.textOrientation": "Ориентация страницы", "DE.Views.Settings.textPages": "Страницы", "DE.Views.Settings.textParagraphs": "Абзацы", + "DE.Views.Settings.textPoint": "Пункт", "DE.Views.Settings.textPortrait": "Книжная", "DE.Views.Settings.textPoweredBy": "Разработано", "DE.Views.Settings.textPrint": "Печать", @@ -412,8 +500,10 @@ "DE.Views.Settings.textSymbols": "Символы", "DE.Views.Settings.textTel": "Телефон", "DE.Views.Settings.textTop": "Верхнее", + "DE.Views.Settings.textUnitOfMeasurement": "Единица измерения", "DE.Views.Settings.textVersion": "Версия", "DE.Views.Settings.textWords": "Слова", "DE.Views.Settings.unknownText": "Неизвестно", + "DE.Views.Settings.textCollaboration": "Совместная работа", "DE.Views.Toolbar.textBack": "Назад" } \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json index a57efcb96..979b84c38 100644 --- a/apps/documenteditor/mobile/locale/sk.json +++ b/apps/documenteditor/mobile/locale/sk.json @@ -47,7 +47,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.", "DE.Controllers.Main.criticalErrorExtText": "Stlačením tlačidla 'OK' sa vrátite do zoznamu dokumentov.", "DE.Controllers.Main.criticalErrorTitle": "Chyba", - "DE.Controllers.Main.defaultTitleText": "Dokumentový editor ONLYOFFICE ", "DE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.", "DE.Controllers.Main.downloadMergeText": "Sťahovanie...", "DE.Controllers.Main.downloadMergeTitle": "Sťahovanie", @@ -55,7 +54,7 @@ "DE.Controllers.Main.downloadTitleText": "Sťahovanie dokumentu", "DE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Spojenie so serverom sa stratilo. Už nemôžete upravovať.", - "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", + "DE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", "DE.Controllers.Main.errorDatabaseConnection": "Externá chyba.
      Chyba spojenia databázy. Obráťte sa prosím na podporu.", "DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.", "DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json index 4acd5b213..a976d395d 100644 --- a/apps/documenteditor/mobile/locale/tr.json +++ b/apps/documenteditor/mobile/locale/tr.json @@ -46,7 +46,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Değişim süresi aşıldı.", "DE.Controllers.Main.criticalErrorExtText": "Belge listesine dönmek için 'TAMAM' tuşuna tıklayın.", "DE.Controllers.Main.criticalErrorTitle": "Hata", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Belge Editörü", "DE.Controllers.Main.downloadErrorText": "İndirme başarısız oldu.", "DE.Controllers.Main.downloadMergeText": "İndiriliyor...", "DE.Controllers.Main.downloadMergeTitle": "İndiriliyor", @@ -54,7 +53,7 @@ "DE.Controllers.Main.downloadTitleText": "Belge indiriliyor", "DE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kayboldu. Artık düzenleyemezsiniz.", - "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.

      Belge Sunucusuna bağlanma konusunda daha fazla bilgi için buraya tıklayın", + "DE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.

      Belge Sunucusuna bağlanma konusunda daha fazla bilgi için buraya tıklayın", "DE.Controllers.Main.errorDatabaseConnection": "Dışsal hata.
      Veritabanı bağlantı hatası. Lütfen destek ile iletişime geçin.", "DE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.", "DE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1", diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json index 9128fb4d2..4fe345c7d 100644 --- a/apps/documenteditor/mobile/locale/uk.json +++ b/apps/documenteditor/mobile/locale/uk.json @@ -46,7 +46,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.", "DE.Controllers.Main.criticalErrorExtText": "Натисніть \"ОК\", щоб повернутися до списку документів.", "DE.Controllers.Main.criticalErrorTitle": "Помилка", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Завантаження не вдалося", "DE.Controllers.Main.downloadMergeText": "Завантаження...", "DE.Controllers.Main.downloadMergeTitle": "Завантаження", @@ -54,7 +53,7 @@ "DE.Controllers.Main.downloadTitleText": "Завантаження документу", "DE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна", "DE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Ви більше не можете редагувати.", - "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів тут ", + "DE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів       тут", "DE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка.
      Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки.", "DE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.", "DE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ", diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json index 3a3cf3e4d..a63b6cb6d 100644 --- a/apps/documenteditor/mobile/locale/vi.json +++ b/apps/documenteditor/mobile/locale/vi.json @@ -46,7 +46,6 @@ "DE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.", "DE.Controllers.Main.criticalErrorExtText": "Ấn 'OK' để trở lại danh sách tài liệu.", "DE.Controllers.Main.criticalErrorTitle": "Lỗi", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.downloadErrorText": "Tải về không thành công.", "DE.Controllers.Main.downloadMergeText": "Đang tải...", "DE.Controllers.Main.downloadMergeTitle": "Đang tải về", @@ -54,7 +53,7 @@ "DE.Controllers.Main.downloadTitleText": "Đang tải tài liệu...", "DE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Kết nối máy chủ bị mất. Bạn không thể chỉnh sửa nữa.", - "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", + "DE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", "DE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.
      Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ.", "DE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.", "DE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1", diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json index 8675162ea..6d813d46d 100644 --- a/apps/documenteditor/mobile/locale/zh.json +++ b/apps/documenteditor/mobile/locale/zh.json @@ -14,8 +14,6 @@ "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": "剪切", @@ -24,8 +22,6 @@ "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": "游客", @@ -54,7 +50,6 @@ "DE.Controllers.Main.convertationTimeoutText": "转换超时", "DE.Controllers.Main.criticalErrorExtText": "按“确定”返回文件列表", "DE.Controllers.Main.criticalErrorTitle": "错误:", - "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE文档编辑器", "DE.Controllers.Main.downloadErrorText": "下载失败", "DE.Controllers.Main.downloadMergeText": "下载中…", "DE.Controllers.Main.downloadMergeTitle": "下载中", @@ -63,7 +58,7 @@ "DE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。
      请联系您的文档服务器管理员.", "DE.Controllers.Main.errorBadImageUrl": "图片地址不正确", "DE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。您无法再进行编辑。", - "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器在这里", + "DE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器      在这里", "DE.Controllers.Main.errorDatabaseConnection": "外部错误。
      数据库连接错误。请联系客服支持。", "DE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。", "DE.Controllers.Main.errorDataRange": "数据范围不正确", diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 62a03c171..409d688e1 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6338,6 +6338,93 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +#user-list .item-content { + padding-left: 0; +} +#user-list .item-inner { + justify-content: flex-start; + padding-left: 15px; +} +#user-list .length { + margin-left: 4px; +} +#user-list .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #373737; + font-weight: 500; +} +#user-list ul:before { + content: none; +} +.page-comments .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; +} +.page-comments p { + margin: 0; +} +.page-comments .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; +} +.page-comments .comment-date, +.page-comments .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; +} +.page-comments .comment-text, +.page-comments .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; +} +.page-comments .reply-item { + margin-top: 15px; +} +.page-comments .reply-item .user-name { + padding-top: 16px; +} +.page-comments .reply-item:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: #c8c7cc; + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; +} +.page-comments .comment-quote { + color: #446995; + border-left: 1px solid #446995; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; +} +.settings.popup .list-block ul.list-reply:last-child:after, +.settings.popover .list-block ul.list-reply:last-child:after { + display: none; +} .tablet .searchbar.document.replace .center .searchbar:first-child { margin-right: 10px; } @@ -6785,9 +6872,9 @@ i.icon.icon-format-dotx { 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; - 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%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%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%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-format-pdf { width: 30px; @@ -6814,6 +6901,11 @@ i.icon.icon-format-html { 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"); } +i.icon.icon-format-rtf { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-collaboration { width: 24px; height: 24px; @@ -6862,17 +6954,17 @@ i.icon.icon-footnote { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } .label-switch input[type="checkbox"]:checked + .checkbox { background: #446995; @@ -6989,29 +7081,7 @@ html.pixel-ratio-3 .numbers li { max-height: 100%; overflow: auto; } -#user-list .item-content { - padding-left: 0; -} -#user-list .item-inner { - justify-content: flex-start; - padding-left: 15px; -} -#user-list .length { - margin-left: 4px; -} -#user-list .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: #373737; - font-weight: 500; -} -#user-list ul:before { - content: none; -} + .doc-placeholder { background: #fbfbfb; width: 100%; @@ -7032,4 +7102,4 @@ html.pixel-ratio-3 .numbers li { -moz-animation: flickerAnimation 2s infinite ease-in-out; -o-animation: flickerAnimation 2s infinite ease-in-out; animation: flickerAnimation 2s infinite ease-in-out; -} \ No newline at end of file +} diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 871bbfe52..b89e0c23f 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -5923,6 +5923,93 @@ html.phone .document-menu .list-block .item-link { .container-collaboration .page-content .list-block:first-child { margin-top: -1px; } +#user-list .item-content { + padding-left: 0; +} +#user-list .item-inner { + justify-content: flex-start; + padding-left: 15px; +} +#user-list .length { + margin-left: 4px; +} +#user-list .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #373737; + font-weight: 400; +} +#user-list ul:before { + content: none; +} +.page-comments .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; +} +.page-comments p { + margin: 0; +} +.page-comments .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; +} +.page-comments .comment-date, +.page-comments .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; +} +.page-comments .comment-text, +.page-comments .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; +} +.page-comments .reply-item { + margin-top: 15px; +} +.page-comments .reply-item .user-name { + padding-top: 16px; +} +.page-comments .reply-item:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: rgba(0, 0, 0, 0.12); + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; +} +.page-comments .comment-quote { + color: #446995; + border-left: 1px solid #446995; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; +} +.settings.popup .list-block ul.list-reply:last-child:after, +.settings.popover .list-block ul.list-reply:last-child:after { + display: none; +} .tablet .searchbar.document.replace .center > .replace { display: flex; } @@ -6265,9 +6352,9 @@ i.icon.icon-format-dotx { 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; - 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%22-14.47%20-14.5%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%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%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2224%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2220%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2216%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%2212%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%228%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%2229.063%22%20class%3D%22cls-1%22%20y%3D%224%22%20%2F%3E%3Crect%20class%3D%22cls-1%22%20height%3D%221%22%20width%3D%2229.063%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H2V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H2V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H2V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-format-pdf { width: 30px; @@ -6294,6 +6381,11 @@ i.icon.icon-format-html { 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"); } +i.icon.icon-format-rtf { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Crect%20x%3D%222%22%20y%3D%222%22%20width%3D%227%22%20height%3D%227%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2011H2V12H22V11Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2014H2V15H22V14Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2017H2V18H22V17Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%2020H2V21H22V20Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%202H11V3H22V2Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%205H11V6H22V5Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M22%208H11V9H22V8Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} i.icon.icon-collaboration { width: 24px; height: 24px; @@ -6342,17 +6434,17 @@ i.icon.icon-footnote { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } .navbar i.icon.icon-undo { width: 22px; @@ -6760,29 +6852,6 @@ html.pixel-ratio-3 .numbers li { max-height: 100%; overflow: auto; } -#user-list .item-content { - padding-left: 0; -} -#user-list .item-inner { - justify-content: flex-start; - padding-left: 15px; -} -#user-list .length { - margin-left: 4px; -} -#user-list .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: #373737; - font-weight: 400; -} -#user-list ul:before { - content: none; -} .doc-placeholder { background: #fbfbfb; width: 100%; @@ -6803,4 +6872,4 @@ html.pixel-ratio-3 .numbers li { -moz-animation: flickerAnimation 2s infinite ease-in-out; -o-animation: flickerAnimation 2s infinite ease-in-out; animation: flickerAnimation 2s infinite ease-in-out; -} \ No newline at end of file +} diff --git a/apps/documenteditor/mobile/resources/less/app-ios.less b/apps/documenteditor/mobile/resources/less/app-ios.less index 4614abef7..e97a46d5a 100644 --- a/apps/documenteditor/mobile/resources/less/app-ios.less +++ b/apps/documenteditor/mobile/resources/less/app-ios.less @@ -241,36 +241,6 @@ input, textarea { overflow: auto; } -//Edit users -@initialEditUser: #373737; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 500; - - } - ul:before { - content: none; - } -} - // Skeleton of document .doc-placeholder { @@ -294,4 +264,4 @@ input, textarea { -o-animation: flickerAnimation 2s infinite ease-in-out; animation: flickerAnimation 2s infinite ease-in-out; } -} \ No newline at end of file +} diff --git a/apps/documenteditor/mobile/resources/less/app-material.less b/apps/documenteditor/mobile/resources/less/app-material.less index d39835fa7..c84bb6b83 100644 --- a/apps/documenteditor/mobile/resources/less/app-material.less +++ b/apps/documenteditor/mobile/resources/less/app-material.less @@ -228,35 +228,6 @@ input, textarea { overflow: auto; } -//Edit users -@initialEditUser: #373737; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 400; - } - ul:before { - content: none; - } -} - // Skeleton of document .doc-placeholder { @@ -280,4 +251,4 @@ input, textarea { -o-animation: flickerAnimation 2s infinite ease-in-out; animation: flickerAnimation 2s infinite ease-in-out; } -} \ No newline at end of file +} diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 03d035167..b5c848064 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -381,9 +381,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-txt { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } &.icon-format-pdf { width: 30px; @@ -410,6 +410,11 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-rtf { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } // Collaboration &.icon-collaboration { width: 24px; @@ -459,16 +464,16 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); - } + .encoded-svg-background(''); + } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index da3252478..681503ddb 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -308,9 +308,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-txt { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } &.icon-format-pdf { width: 30px; @@ -337,6 +337,12 @@ i.icon { height: 30px; .encoded-svg-background(''); } + &.icon-format-rtf { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } + // Collaboration &.icon-collaboration { width: 24px; @@ -386,17 +392,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index bd7a8e682..a425b3840 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -201,11 +201,11 @@ PE.ApplicationController = new(function(){ function onPrint() { if (permissions.print!==false) - api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); } function onPrintUrl(url) { - common.utils.dialogPrint(url); + common.utils.dialogPrint(url, api); } function hidePreloader() { @@ -267,7 +267,7 @@ PE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (api && permissions.print!==false){ - api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); } Common.Analytics.trackEvent('Save'); @@ -558,7 +558,7 @@ PE.ApplicationController = new(function(){ Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny); return; } - if (api) api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); + if (api) api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PPTX, true)); } // Helpers // ------------------------- diff --git a/apps/presentationeditor/embed/locale/hu.json b/apps/presentationeditor/embed/locale/hu.json index c178d8383..be9e100fe 100644 --- a/apps/presentationeditor/embed/locale/hu.json +++ b/apps/presentationeditor/embed/locale/hu.json @@ -1,6 +1,10 @@ { + "common.view.modals.txtCopy": "Másolás a vágólapra", + "common.view.modals.txtEmbed": "Beágyaz", "common.view.modals.txtHeight": "Magasság", + "common.view.modals.txtShare": "Hivatkozás megosztása", "common.view.modals.txtWidth": "Szélesség", + "PE.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.", "PE.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.", "PE.ApplicationController.criticalErrorTitle": "Hiba", "PE.ApplicationController.downloadErrorText": "Sikertelen letöltés.", @@ -12,10 +16,13 @@ "PE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés", "PE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.", "PE.ApplicationController.textLoadingDocument": "Prezentáció betöltése", + "PE.ApplicationController.textOf": "of", "PE.ApplicationController.txtClose": "Bezár", "PE.ApplicationController.unknownErrorText": "Ismeretlen hiba.", "PE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.", + "PE.ApplicationController.waitText": "Kérjük várjon...", "PE.ApplicationView.txtDownload": "Letöltés", + "PE.ApplicationView.txtEmbed": "Beágyaz", "PE.ApplicationView.txtFullScreen": "Teljes képernyő", "PE.ApplicationView.txtShare": "Megosztás" } \ No newline at end of file diff --git a/apps/presentationeditor/embed/locale/tr.json b/apps/presentationeditor/embed/locale/tr.json index 79c1d1686..98287a3ff 100644 --- a/apps/presentationeditor/embed/locale/tr.json +++ b/apps/presentationeditor/embed/locale/tr.json @@ -1,6 +1,8 @@ { "common.view.modals.txtCopy": "Panoya kopyala", + "common.view.modals.txtEmbed": "Gömülü", "common.view.modals.txtHeight": "Yükseklik", + "common.view.modals.txtShare": "Bağlantıyı Paylaş", "common.view.modals.txtWidth": "Genişlik", "PE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.", "PE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.", @@ -12,11 +14,15 @@ "PE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı", "PE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.", "PE.ApplicationController.notcriticalErrorTitle": "Uyarı", + "PE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.", "PE.ApplicationController.textLoadingDocument": "Sunum yükleniyor", "PE.ApplicationController.textOf": "'in", "PE.ApplicationController.txtClose": "Kapat", "PE.ApplicationController.unknownErrorText": "Bilinmeyen hata.", "PE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.", + "PE.ApplicationController.waitText": "Lütfen bekleyin...", "PE.ApplicationView.txtDownload": "İndir", + "PE.ApplicationView.txtEmbed": "Gömülü", + "PE.ApplicationView.txtFullScreen": "Tam Ekran", "PE.ApplicationView.txtShare": "Paylaş" } \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 48168be0d..e5bd95ede 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -63,6 +63,19 @@ var c_tableBorder = { BORDER_OUTER_TABLE: 13 // table border and outer cell borders }; +var c_paragraphTextAlignment = { + RIGHT: 0, + LEFT: 1, + CENTERED: 2, + JUSTIFIED: 3 +}; + +var c_paragraphSpecial = { + NONE_SPECIAL: 0, + FIRST_LINE: 1, + HANGING: 2 +}; + define([ 'core', 'presentationeditor/main/app/view/DocumentHolder' diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index d38358c8d..1b65c7a0f 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -215,7 +215,7 @@ define([ case 'back': break; case 'save': this.api.asc_Save(); break; case 'save-desktop': this.api.asc_DownloadAs(); break; - case 'print': this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; + case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); @@ -247,13 +247,13 @@ define([ }, clickSaveAsFormat: function(menu, format) { - this.api.asc_DownloadAs(format); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); menu.hide(); }, clickSaveCopyAsFormat: function(menu, format, ext) { this.isFromFileDownloadAs = ext; - this.api.asc_DownloadAs(format, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format, true)); menu.hide(); }, @@ -269,27 +269,31 @@ define([ defFileName = defFileName.substring(0, idx) + this.isFromFileDownloadAs; } - me._saveCopyDlg = new Common.Views.SaveAsDlg({ - saveFolderUrl: me.mode.saveAsUrl, - saveFileUrl: url, - defFileName: defFileName - }); - me._saveCopyDlg.on('saveaserror', function(obj, err){ - var config = { - closable: false, - title: me.notcriticalErrorTitle, - msg: err, - iconCls: 'warn', - buttons: ['ok'], - callback: function(btn){ - Common.NotificationCenter.trigger('edit:complete', me); - } - }; - Common.UI.alert(config); - }).on('close', function(obj){ - me._saveCopyDlg = undefined; - }); - me._saveCopyDlg.show(); + if (me.mode.canRequestSaveAs) { + Common.Gateway.requestSaveAs(url, defFileName); + } else { + me._saveCopyDlg = new Common.Views.SaveAsDlg({ + saveFolderUrl: me.mode.saveAsUrl, + saveFileUrl: url, + defFileName: defFileName + }); + me._saveCopyDlg.on('saveaserror', function(obj, err){ + var config = { + closable: false, + title: me.notcriticalErrorTitle, + msg: err, + iconCls: 'warn', + buttons: ['ok'], + callback: function(btn){ + Common.NotificationCenter.trigger('edit:complete', me); + } + }; + Common.UI.alert(config); + }).on('close', function(obj){ + me._saveCopyDlg = undefined; + }); + me._saveCopyDlg.show(); + } } this.isFromFileDownloadAs = false; }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 31a72ccb2..8e682a5d2 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -180,7 +180,6 @@ define([ this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('goback', _.bind(this.goBack, this)); - Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this)); this.isShowOpenDialog = false; @@ -287,7 +286,7 @@ define([ }); } - me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}'; + me.defaultTitleText = '{{APP_TITLE_TEXT}}'; me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}'); @@ -317,6 +316,8 @@ define([ this.appOptions.canPlugins = false; this.appOptions.canRequestUsers = this.editorConfig.canRequestUsers; this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; + this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; + this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') @@ -341,7 +342,7 @@ define([ this.permissions = $.extend(this.permissions, data.doc.permissions); var _permissions = $.extend({}, data.doc.permissions), - _options = $.extend({}, data.doc.options, {actions: this.editorConfig.actionLink || {}}); + _options = $.extend({}, data.doc.options, this.editorConfig.actionLink || {}); var _user = new Asc.asc_CUserInfo(); _user.put_Id(this.appOptions.user.id); @@ -420,7 +421,7 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.PPTX; - this.api.asc_DownloadAs(_format, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format, true)); }, onProcessMouse: function(data) { @@ -792,12 +793,6 @@ define([ $('.doc-placeholder').remove(); }, - onDocumentReady: function() { - if (this.editorConfig.actionLink && this.editorConfig.actionLink.action && this.editorConfig.actionLink.action.type == 'comment') { - Common.NotificationCenter.trigger('comments:showaction', this.editorConfig.actionLink.action.data, false); - } - }, - onLicenseChanged: function(params) { var licType = params.asc_getLicenseType(); if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' && @@ -1767,7 +1762,7 @@ define([ if (!this.appOptions.canPrint || this.isModalShowed) return; if (this.api) - this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.component.Analytics.trackEvent('Print'); }, @@ -1787,20 +1782,23 @@ define([ this.iframePrint.style.bottom = "0"; document.body.appendChild(this.iframePrint); this.iframePrint.onload = function() { + try { me.iframePrint.contentWindow.focus(); me.iframePrint.contentWindow.print(); me.iframePrint.contentWindow.blur(); window.focus(); + } catch (e) { + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + } }; } if (url) this.iframePrint.src = url; }, - onAdvancedOptions: function(advOptions) { + onAdvancedOptions: function(type, advOptions) { if (this._state.openDlg) return; - var type = advOptions.asc_getOptionId(), - me = this; + var me = this; if (type == Asc.c_oAscAdvancedOptionsID.DRM) { me._state.openDlg = new Common.Views.OpenDialog({ title: Common.Views.OpenDialog.prototype.txtTitleProtected, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 8abd184b4..0705d16c9 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -161,7 +161,7 @@ define([ if ( !_format || _supported.indexOf(_format) < 0 ) _format = Asc.c_oAscFileType.PDF; - _main.api.asc_DownloadAs(_format); + _main.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(_format)); }, 'go:editor': function() { Common.Gateway.requestEditRights(); @@ -314,6 +314,7 @@ define([ toolbar.btnEditHeader.on('click', _.bind(this.onEditHeaderClick, this, 'header')); toolbar.btnInsDateTime.on('click', _.bind(this.onEditHeaderClick, this, 'datetime')); toolbar.btnInsSlideNum.on('click', _.bind(this.onEditHeaderClick, this, 'slidenum')); + Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); this.onSetupCopyStyleButton(); }, @@ -893,7 +894,7 @@ define([ onPrint: function(e) { if (this.api) - this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.NotificationCenter.trigger('edit:complete', this.toolbar); @@ -1390,13 +1391,23 @@ define([ } })).show(); } else if (opts === 'storage') { - (new Common.Views.SelectFileDlg({ - 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, undefined, true);// for loading from storage; - Common.component.Analytics.trackEvent('ToolBar', 'Image'); - }).show(); + if (this.toolbar.mode.canRequestInsertImage) { + Common.Gateway.requestInsertImage(); + } else { + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + })).on('selectfile', function(obj, file){ + me.insertImage(file); + }).show(); + } + } + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, @@ -1946,24 +1957,42 @@ define([ var themeStore = this.getCollection('SlideThemes'), mainController = this.getApplication().getController('Main'); if (themeStore) { - var arr = []; - _.each(defaultThemes.concat(docThemes), function(theme) { - arr.push(new Common.UI.DataViewModel({ - imageUrl: theme.get_Image(), + var arr1 = [], arr2 = []; + _.each(defaultThemes, function(theme, index) { + var tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); + arr1.push(new Common.UI.DataViewModel({ uid : Common.UI.getId(), themeId : theme.get_Index(), - tip : mainController.translationTable[theme.get_Name()] || theme.get_Name(), - itemWidth : 85, - itemHeight : 38 + tip : tip, + offsety : index * 38 })); - me.toolbar.listTheme.menuPicker.store.add({ - imageUrl: theme.get_Image(), + arr2.push({ uid : Common.UI.getId(), themeId : theme.get_Index(), - tip : mainController.translationTable[theme.get_Name()] || theme.get_Name() + tip : tip, + offsety : index * 38 }); }); - themeStore.reset(arr); + _.each(docThemes, function(theme) { + var image = theme.get_Image(), + tip = mainController.translationTable[theme.get_Name()] || theme.get_Name(); + arr1.push(new Common.UI.DataViewModel({ + imageUrl: image, + uid : Common.UI.getId(), + themeId : theme.get_Index(), + tip : tip, + offsety : 0 + })); + arr2.push({ + imageUrl: image, + uid : Common.UI.getId(), + themeId : theme.get_Index(), + tip : tip, + offsety : 0 + }); + }); + themeStore.reset(arr1); + me.toolbar.listTheme.menuPicker.store.reset(arr2); } if (me.toolbar.listTheme.menuPicker.store.length > 0 && me.toolbar.listTheme.rendered){ diff --git a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template index c17813827..84822e306 100644 --- a/apps/presentationeditor/main/app/template/HeaderFooterDialog.template +++ b/apps/presentationeditor/main/app/template/HeaderFooterDialog.template @@ -5,18 +5,28 @@ - + + + - + + +
      + +
      +
      		+
      +
      +
      -
      +
      diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template index 961b81080..ccba9ab31 100644 --- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template @@ -1,98 +1,114 @@
      - - - - - - -
      - -
      -       		- -
      -       		- -
      -
      +
      +
      + +
      +
      +
      +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      + +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - -
      - -
      -
      -       		-
      -
      -
      -       		-
      -
      -
      -       		-
      -
      - -
      -
      -
      -
      -
      -
      -
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      -
      - -
      -
      -
      +
      -
      -
      -
      -
      -
      - -
      -
      -
      +
      - - - +
      + +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      +
      +
      + + +
      \ No newline at end of file diff --git a/apps/presentationeditor/main/app/template/ShapeSettings.template b/apps/presentationeditor/main/app/template/ShapeSettings.template index f97d33753..85bab47b8 100644 --- a/apps/presentationeditor/main/app/template/ShapeSettings.template +++ b/apps/presentationeditor/main/app/template/ShapeSettings.template @@ -159,6 +159,16 @@
      + + +
      + + + + +
      + +
      diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e0fe4e7d0..529e5359c 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1861,6 +1861,20 @@ define([ } }); + var mnuPrintSelection = new Common.UI.MenuItem({ + caption : me.txtPrintSelection + }).on('click', function(item){ + if (me.api){ + var printopt = new Asc.asc_CAdjustPrint(); + printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + opts.asc_setAdvancedOptions(printopt); + me.api.asc_Print(opts); + me.fireEvent('editcomplete', me); + Common.component.Analytics.trackEvent('DocumentHolder', 'Print Selection'); + } + }); + var menuSlidePaste = new Common.UI.MenuItem({ caption : me.textPaste, value : 'paste' @@ -1900,9 +1914,10 @@ define([ menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.options.value = null; - for (var i = 9; i < 13; i++) { + for (var i = 9; i < 14; i++) { me.slideMenu.items[i].setVisible(value.fromThumbs===true); } + mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true); var selectedElements = me.api.getSelectedElements(), locked = false, @@ -1930,6 +1945,7 @@ define([ mnuChangeSlide.setDisabled(lockedLayout || locked); mnuChangeTheme.setDisabled(me._state.themeLock || locked ); mnuSlideHide.setDisabled(lockedLayout || locked); + mnuPrintSelection.setDisabled(me.slidesCount<1); }, items: [ menuSlidePaste, @@ -1963,6 +1979,7 @@ define([ menuSlideSettings, {caption: '--'}, mnuSelectAll, + mnuPrintSelection, {caption: '--'}, mnuPreview ] @@ -2021,8 +2038,8 @@ define([ style: 'max-height: 300px;', store : PE.getCollection('SlideThemes'), itemTemplate: _.template([ - '
      ', - '
      ', + '
      ', + '
      ' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>', '
      ' ].join('')) }).on('item:click', function(picker, item, record, e) { @@ -2154,7 +2171,7 @@ define([ menu : new Common.UI.MenuSimple({ cls: 'lang-menu', menuAlign: 'tl-tr', - restoreHeight: 300, + restoreHeight: 285, items : [], itemTemplate: langTemplate, search: true @@ -2179,6 +2196,13 @@ define([ } }); + var menuToDictionaryTable = new Common.UI.MenuItem({ + caption : me.toDictionaryText + }).on('click', function(item, e) { + me.api.asc_spellCheckAddToDictionary(me._currentSpellObj); + me.fireEvent('editcomplete', me); + }); + var menuIgnoreSpellTableSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -2197,6 +2221,7 @@ define([ menuIgnoreSpellTableSeparator, menuIgnoreSpellTable, menuIgnoreAllSpellTable, + menuToDictionaryTable, { caption: '--' }, me.langTableMenu ] @@ -2222,7 +2247,7 @@ define([ menu : new Common.UI.MenuSimple({ cls: 'lang-menu', menuAlign: 'tl-tr', - restoreHeight: 300, + restoreHeight: 285, items : [], itemTemplate: langTemplate, search: true @@ -2243,6 +2268,13 @@ define([ me.fireEvent('editcomplete', me); }); + var menuToDictionaryPara = new Common.UI.MenuItem({ + caption : me.toDictionaryText + }).on('click', function(item, e) { + me.api.asc_spellCheckAddToDictionary(me._currentSpellObj); + me.fireEvent('editcomplete', me); + }); + var menuIgnoreSpellParaSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -2970,15 +3002,17 @@ define([ menuParaPaste.setDisabled(disabled); // spellCheck - me.menuSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuSpellcheckParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuIgnoreSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - menuIgnoreAllSpellPara.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); - me.langParaMenu.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + me.menuSpellPara.setVisible(spell); + menuSpellcheckParaSeparator.setVisible(spell); + menuIgnoreSpellPara.setVisible(spell); + menuIgnoreAllSpellPara.setVisible(spell); + menuToDictionaryPara.setVisible(spell && me.mode.isDesktopApp); + me.langParaMenu.setVisible(spell); me.langParaMenu.setDisabled(disabled); - menuIgnoreSpellParaSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + menuIgnoreSpellParaSeparator.setVisible(spell); - if (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) { + if (spell && value.spellProps.value.get_Variants() !== null && value.spellProps.value.get_Variants() !== undefined) { me.addWordVariants(true); } else { me.menuSpellPara.setCaption(me.loadSpellText, true); @@ -2993,9 +3027,9 @@ define([ //equation menu var eqlen = 0; if (isEquation) { - eqlen = me.addEquationMenu(true, 11); + eqlen = me.addEquationMenu(true, 12); } else - me.clearEquationMenu(true, 11); + me.clearEquationMenu(true, 12); menuEquationSeparator.setVisible(isEquation && eqlen>0); }, items: [ @@ -3004,6 +3038,7 @@ define([ menuSpellcheckParaSeparator, menuIgnoreSpellPara, menuIgnoreAllSpellPara, + menuToDictionaryPara, me.langParaMenu, menuIgnoreSpellParaSeparator, menuParaCut, @@ -3093,6 +3128,7 @@ define([ menuHyperlinkSeparator.setVisible(menuAddHyperlinkTable.isVisible() || menuHyperlinkTable.isVisible() /** coauthoring begin **/|| menuAddCommentTable.isVisible()/** coauthoring end **/); me.menuSpellCheckTable.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + menuToDictionaryTable.setVisible(me.mode.isDesktopApp); menuSpellcheckTableSeparator.setVisible(value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); me.langTableMenu.setDisabled(disabled); @@ -3536,7 +3572,9 @@ define([ textRotate: 'Rotate', textCrop: 'Crop', textCropFill: 'Fill', - textCropFit: 'Fit' + textCropFit: 'Fit', + toDictionaryText: 'Add to Dictionary', + txtPrintSelection: 'Print Selection' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 4cc11dc79..3a7fa0803 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -214,8 +214,6 @@ define([ var me = this; me.panels = { - 'saveas' : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), - 'save-copy' : (new PE.Views.FileMenuPanels.ViewSaveCopy({menu:me})).render(), 'opts' : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(), 'info' : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'rights' : (new PE.Views.FileMenuPanels.DocumentRights({menu:me})).render() @@ -256,7 +254,7 @@ define([ this.miNew.$el.find('+.devider')[this.mode.canCreateNew?'show':'hide'](); this.miDownload[(this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide'](); - this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && this.mode.saveAsUrl ?'show':'hide'](); + this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide'](); this.miSaveAs[(this.mode.canDownload && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide'](); // this.hkSaveAs[this.mode.canDownload?'enable':'disable'](); @@ -297,6 +295,14 @@ define([ this.panels['protect'].setMode(this.mode); } + if (this.mode.canDownload) { + this.panels['saveas'] = ((new PE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render()); + } + + if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) { + this.panels['save-copy'] = ((new PE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()); + } + if (this.mode.canHelp) { this.panels['help'] = ((new PE.Views.FileMenuPanels.Help({menu: this})).render()); this.panels['help'].setLangConfig(this.mode.lang); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 01bab61b7..af9828b86 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -612,14 +612,14 @@ define([ // '', // '', // '', - '', - '', - '
      ', - '', '', '', '
      ', '', + '', + '', + '
      ', + '', '', '', '
      ', @@ -794,6 +794,11 @@ define([ }, updateInfo: function(doc) { + if (!this.doc && doc && doc.info) { + doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); + doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); + } + this.doc = doc; if (!this.rendered) return; @@ -805,12 +810,14 @@ define([ if (doc.info.folder ) this.lblPlacement.text( doc.info.folder ); visible = this._ShowHideInfoItem(this.lblPlacement, doc.info.folder!==undefined && doc.info.folder!==null) || visible; - if (doc.info.author) - this.lblOwner.text(doc.info.author); - visible = this._ShowHideInfoItem(this.lblOwner, doc.info.author!==undefined && doc.info.author!==null) || visible; - if (doc.info.uploaded) - this.lblUploaded.text(doc.info.uploaded.toLocaleString()); - visible = this._ShowHideInfoItem(this.lblUploaded, doc.info.uploaded!==undefined && doc.info.uploaded!==null) || visible; + var value = doc.info.owner || doc.info.author; + if (value) + this.lblOwner.text(value); + visible = this._ShowHideInfoItem(this.lblOwner, !!value) || visible; + value = doc.info.uploaded || doc.info.created; + if (value) + this.lblUploaded.text(value); + visible = this._ShowHideInfoItem(this.lblUploaded, !!value) || visible; } else this._ShowHideDocInfo(false); $('tr.divider.general', this.el)[visible?'show':'hide'](); diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js index 3e0ca4041..1f41f68c4 100644 --- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js +++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js @@ -48,7 +48,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', PE.Views.HeaderFooterDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 360, - height: 340 + height: 380 }, initialize : function(options) { @@ -75,7 +75,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', '
      ', '
      ', '', - '', + '', '', '
      ' ].join('') @@ -152,12 +152,27 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', }); this.dateControls.push(this.cmbFormat); - this.chUpdate = new Common.UI.CheckBox({ - el: $('#hf-dlg-chb-update'), + this.radioUpdate = new Common.UI.RadioBox({ + el: $('#hf-dlg-radio-update'), labelText: this.textUpdate, - value: 'checked' + name: 'asc-radio-header-update', + checked: true + }).on('change', _.bind(this.setDateTimeType, this, 'update')); + this.dateControls.push(this.radioUpdate); + + this.radioFixed = new Common.UI.RadioBox({ + el: $('#hf-dlg-radio-fixed'), + labelText: this.textFixed, + name: 'asc-radio-header-update' + }).on('change', _.bind(this.setDateTimeType, this, 'fixed')); + this.dateControls.push(this.radioFixed); + + this.inputFixed = new Common.UI.InputField({ + el: $('#hf-dlg-input-fixed'), + validateOnBlur: false, + style : 'width: 100%;' }); - this.dateControls.push(this.chUpdate); + this.dateControls.push(this.inputFixed); this.chNotTitle = new Common.UI.CheckBox({ el: $('#hf-dlg-chb-not-title'), @@ -181,17 +196,22 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', }, setType: function(type, field, newValue) { + var me = this; newValue = (newValue=='checked'); if (type == 'date') { _.each(this.dateControls, function(item) { item.setDisabled(!newValue); }); + newValue && this.setDateTimeType(this.radioFixed.getValue() ? 'fixed' : 'update', null, true); this.props.put_ShowDateTime(newValue); } else if (type == 'slide') { this.props.put_ShowSlideNum(newValue); } else if (type == 'footer') { this.inputFooter.setDisabled(!newValue); this.props.put_ShowFooter(newValue); + newValue && setTimeout(function(){ + me.inputFooter.cmpEl.find('input').focus(); + },50); } this.props.updateView(); }, @@ -214,13 +234,26 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', this.cmbFormat.setValue(format ? format : arr[0].value); }, + setDateTimeType: function(type, field, newValue) { + if (newValue) { + var me = this; + this.cmbLang.setDisabled(type == 'fixed'); + this.cmbFormat.setDisabled(type == 'fixed'); + this.inputFixed.setDisabled(type == 'update'); + (type == 'fixed') && setTimeout(function(){ + me.inputFixed.cmpEl.find('input').focus(); + },50); + + } + }, + onSelectFormat: function(format) { - format = format || this.cmbFormat.getValue(); - if (this.chUpdate.getValue()=='checked') { + if (this.radioUpdate.getValue()) { + format = format || this.cmbFormat.getValue(); this.props.get_DateTime().put_DateTime(format); } else { this.props.get_DateTime().put_DateTime(null); - this.props.get_DateTime().put_CustomDateTime(format); + this.props.get_DateTime().put_CustomDateTime(this.inputFixed.getValue()); } }, @@ -234,18 +267,20 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', item.setDisabled(!val); }); - var format, + var format, fixed, datetime = slideprops.get_DateTime(), - item = this.cmbLang.store.findWhere({value: datetime.get_Lang() || this.lang}); + item = this.cmbLang.store.findWhere({value: datetime ? (datetime.get_Lang() || this.lang) : this.lang}); this._originalLang = item ? item.get('value') : 0x0409; this.cmbLang.setValue(this._originalLang); if (val) { format = datetime.get_DateTime(); - this.chUpdate.setValue(!!format, true); - !format && (format = datetime.get_CustomDateTime()); + !format ? this.radioFixed.setValue(true) : this.radioUpdate.setValue(true); + !format && (fixed = datetime.get_CustomDateTime() || ''); + this.setDateTimeType(!format ? 'fixed' : 'update', null, true); } this.updateFormats(this.cmbLang.getValue(), format); + this.inputFixed.setValue((fixed!==undefined) ? fixed : this.cmbFormat.getRawValue()); val = slideprops.get_ShowSlideNum(); this.chSlide.setValue(val, true); @@ -288,7 +323,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', }, onPrimary: function() { - this._handleInput('ok'); + this._handleInput('all'); return false; }, @@ -323,7 +358,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template', textNotTitle: 'Don\'t show on title slide', textPreview: 'Preview', diffLanguage: 'You can’t use a date format in a different language than the slide master.\nTo change the master, click \'Apply to all\' instead of \'Apply\'', - notcriticalErrorTitle: 'Warning' + notcriticalErrorTitle: 'Warning', + textFixed: 'Fixed' }, PE.Views.HeaderFooterDialog || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index 8c16332fb..b43273874 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -49,13 +49,14 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced PE.Views.ParagraphSettingsAdvanced = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { - contentWidth: 320, + contentWidth: 370, height: 394, toggleGroup: 'paragraph-adv-settings-group', storageName: 'pe-para-settings-adv-category' }, initialize : function(options) { + var me = this; _.extend(this.options, { title: this.textTitle, items: [ @@ -74,9 +75,43 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this._noApply = true; this._tabListChanged = false; this.spinners = []; + this.FirstLine = undefined; + this.Spacing = null; this.api = this.options.api; this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps); + + this._arrLineRule = [ + {displayValue: this.textAuto, defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5, step: 0.01, defaultUnit: ''}, + {displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'} + ]; + + var curLineRule = this._originalProps.get_Spacing().get_LineRule(), + curItem = _.findWhere(this._arrLineRule, {value: curLineRule}); + this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem); + + this._arrTextAlignment = [ + {displayValue: this.textTabLeft, value: c_paragraphTextAlignment.LEFT}, + {displayValue: this.textTabCenter, value: c_paragraphTextAlignment.CENTERED}, + {displayValue: this.textTabRight, value: c_paragraphTextAlignment.RIGHT}, + {displayValue: this.textJustified, value: c_paragraphTextAlignment.JUSTIFIED} + ]; + + this._arrSpecial = [ + {displayValue: this.textNoneSpecial, value: c_paragraphSpecial.NONE_SPECIAL, defaultValue: 0}, + {displayValue: this.textFirstLine, value: c_paragraphSpecial.FIRST_LINE, defaultValue: 12.7}, + {displayValue: this.textHanging, value: c_paragraphSpecial.HANGING, defaultValue: 12.7} + ]; + + this._arrTabAlign = [ + { value: 1, displayValue: this.textTabLeft }, + { value: 3, displayValue: this.textTabCenter }, + { value: 2, displayValue: this.textTabRight } + ]; + this._arrKeyTabAlign = []; + this._arrTabAlign.forEach(function(item) { + me._arrKeyTabAlign[item.value] = item.displayValue; + }); }, render: function() { @@ -86,24 +121,15 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced // Indents & Placement - this.numFirstLine = new Common.UI.MetricSpinner({ - el: $('#paragraphadv-spin-first-line'), - step: .1, - width: 85, - defaultUnit : "cm", - defaultValue : 0, - value: '0 cm', - maxValue: 55.87, - minValue: -55.87 + this.cmbTextAlignment = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-text-alignment'), + cls: 'input-group-nr', + editable: false, + data: this._arrTextAlignment, + style: 'width: 173px;', + menuStyle : 'min-width: 173px;' }); - this.numFirstLine.on('change', _.bind(function(field, newValue, oldValue, eOpts){ - if (this._changedProps) { - if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) - this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); - this._changedProps.get_Ind().put_FirstLine(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); - } - }, this)); - this.spinners.push(this.numFirstLine); + this.cmbTextAlignment.setValue(''); this.numIndentsLeft = new Common.UI.MetricSpinner({ el: $('#paragraphadv-spin-indent-left'), @@ -122,9 +148,6 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(numval)); } - this.numFirstLine.setMinValue(-numval); - if (this.numFirstLine.getNumberValue() < -numval) - this.numFirstLine.setValue(-numval); }, this)); this.spinners.push(this.numIndentsLeft); @@ -147,6 +170,93 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced }, this)); this.spinners.push(this.numIndentsRight); + this.cmbSpecial = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-special'), + cls: 'input-group-nr', + editable: false, + data: this._arrSpecial, + style: 'width: 85px;', + menuStyle : 'min-width: 85px;' + }); + this.cmbSpecial.setValue(''); + this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this)); + + this.numSpecialBy = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-special-by'), + step: .1, + width: 85, + defaultUnit : "cm", + defaultValue : 0, + value: '0 cm', + maxValue: 55.87, + minValue: 0 + }); + this.spinners.push(this.numSpecialBy); + this.numSpecialBy.on('change', _.bind(this.onFirstLineChange, this)); + + this.numSpacingBefore = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-spacing-before'), + step: .1, + width: 85, + value: '', + defaultUnit : "cm", + maxValue: 55.88, + minValue: 0, + allowAuto : true, + autoText : this.txtAutoText + }); + this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) { + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); + }, this)); + this.spinners.push(this.numSpacingBefore); + + this.numSpacingAfter = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-spacing-after'), + step: .1, + width: 85, + value: '', + defaultUnit : "cm", + maxValue: 55.88, + minValue: 0, + allowAuto : true, + autoText : this.txtAutoText + }); + this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) { + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); + }, this)); + this.spinners.push(this.numSpacingAfter); + + this.cmbLineRule = new Common.UI.ComboBox({ + el: $('#paragraphadv-spin-line-rule'), + cls: 'input-group-nr', + editable: false, + data: this._arrLineRule, + style: 'width: 85px;', + menuStyle : 'min-width: 85px;' + }); + this.cmbLineRule.setValue(this.CurLineRuleIdx); + this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this)); + + this.numLineHeight = new Common.UI.MetricSpinner({ + el: $('#paragraphadv-spin-line-height'), + step: .01, + width: 85, + value: '', + defaultUnit : "", + maxValue: 132, + minValue: 0.5 + }); + this.spinners.push(this.numLineHeight); + this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this)); + // Font this.chStrike = new Common.UI.CheckBox({ @@ -211,7 +321,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numTab = new Common.UI.MetricSpinner({ el: $('#paraadv-spin-tab'), step: .1, - width: 180, + width: 108, defaultUnit : "cm", value: '1.25 cm', maxValue: 55.87, @@ -222,7 +332,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numDefaultTab = new Common.UI.MetricSpinner({ el: $('#paraadv-spin-default-tab'), step: .1, - width: 107, + width: 108, defaultUnit : "cm", value: '1.25 cm', maxValue: 55.87, @@ -238,7 +348,14 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.tabList = new Common.UI.ListView({ el: $('#paraadv-list-tabs'), emptyText: this.noTabs, - store: new Common.UI.DataViewStore() + store: new Common.UI.DataViewStore(), + template: _.template(['
      '].join('')), + itemTemplate: _.template([ + '
      ', + '
      <%= value %>
      ', + '
      <%= displayTabAlign %>
      ', + '
      ' + ].join('')) }); this.tabList.store.comparator = function(rec) { return rec.get("tabPos"); @@ -253,24 +370,15 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.listenTo(this.tabList.store, 'remove', storechanged); this.listenTo(this.tabList.store, 'reset', storechanged); - this.radioLeft = new Common.UI.RadioBox({ - el: $('#paragraphadv-radio-left'), - labelText: this.textTabLeft, - name: 'asc-radio-tab', - checked: true - }); - - this.radioCenter = new Common.UI.RadioBox({ - el: $('#paragraphadv-radio-center'), - labelText: this.textTabCenter, - name: 'asc-radio-tab' - }); - - this.radioRight = new Common.UI.RadioBox({ - el: $('#paragraphadv-radio-right'), - labelText: this.textTabRight, - name: 'asc-radio-tab' + this.cmbAlign = new Common.UI.ComboBox({ + el : $('#paraadv-cmb-align'), + style : 'width: 108px;', + menuStyle : 'min-width: 108px;', + editable : false, + cls : 'input-group-nr', + data : this._arrTabAlign }); + this.cmbAlign.setValue(1); this.btnAddTab = new Common.UI.Button({ el: $('#paraadv-button-add-tab') @@ -299,18 +407,45 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this._changedProps.get_Tabs().add_Tab(tab); }, this); } + + var horizontalAlign = this.cmbTextAlignment.getValue(); + this._changedProps.asc_putJc((horizontalAlign !== undefined && horizontalAlign !== null) ? horizontalAlign : c_paragraphTextAlignment.LEFT); + + if (this.Spacing !== null) { + this._changedProps.asc_putSpacing(this.Spacing); + } + return { paragraphProps: this._changedProps }; }, _setDefaults: function(props) { if (props ){ this._originalProps = new Asc.asc_CParagraphProperty(props); + this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null; this.numIndentsLeft.setValue((props.get_Ind() !== null && props.get_Ind().get_Left() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Left()) : '', true); - this.numFirstLine.setMinValue(-this.numIndentsLeft.getNumberValue()); - this.numFirstLine.setValue((props.get_Ind() !== null && props.get_Ind().get_FirstLine() !== null ) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_FirstLine()) : '', true); this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true); + this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.CENTERED, true); + + if(this.CurSpecial === undefined) { + this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING); + } + this.cmbSpecial.setValue(this.CurSpecial); + this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); + + this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true); + this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true); + + var linerule = props.get_Spacing().get_LineRule(); + this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true); + + if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) { + this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true); + } else { + this.numLineHeight.setValue('', true); + } + // Font this._noApply = true; this.chStrike.setValue((props.get_Strikeout() !== null && props.get_Strikeout() !== undefined) ? props.get_Strikeout() : 'indeterminate', true); @@ -339,7 +474,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced rec.set({ tabPos: pos, value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), - tabAlign: tab.get_Value() + tabAlign: tab.get_Value(), + displayTabAlign: this._arrKeyTabAlign[tab.get_Value()] }); arr.push(rec); } @@ -359,13 +495,19 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced for (var i=0; i 0 ) { + this.CurSpecial = c_paragraphSpecial.FIRST_LINE; + this.cmbSpecial.setValue(c_paragraphSpecial.FIRST_LINE); + } else if (value === 0) { + this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL; + this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL); + } + this._changedProps.get_Ind().put_FirstLine(value); + } + }, + + onLineRuleSelect: function(combo, record) { + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.LineRule = record.value; + var selectItem = _.findWhere(this._arrLineRule, {value: record.value}), + indexSelectItem = this._arrLineRule.indexOf(selectItem); + if ( this.CurLineRuleIdx !== indexSelectItem ) { + this.numLineHeight.setDefaultUnit(this._arrLineRule[indexSelectItem].defaultUnit); + this.numLineHeight.setMinValue(this._arrLineRule[indexSelectItem].minValue); + this.numLineHeight.setStep(this._arrLineRule[indexSelectItem].step); + if (this.Spacing.LineRule === c_paragraphLinerule.LINERULE_AUTO) { + this.numLineHeight.setValue(this._arrLineRule[indexSelectItem].defaultValue); + } else { + this.numLineHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this._arrLineRule[indexSelectItem].defaultValue)); + } + this.CurLineRuleIdx = indexSelectItem; + } + }, + + onNumLineHeightChange: function(field, newValue, oldValue, eOpts) { + if ( this.cmbLineRule.getRawValue() === '' ) + return; + if (this.Spacing === null) { + var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); + this.Spacing = properties.get_Spacing(); + } + this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); }, textTitle: 'Paragraph - Advanced Settings', strIndentsFirstLine: 'First line', strIndentsLeftText: 'Left', strIndentsRightText: 'Right', - strParagraphIndents: 'Indents & Placement', + strParagraphIndents: 'Indents & Spacing', strParagraphFont: 'Font', cancelButtonText: 'Cancel', okButtonText: 'Ok', @@ -584,6 +797,19 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced textAlign: 'Alignment', textTabPosition: 'Tab Position', textDefault: 'Default Tab', - noTabs: 'The specified tabs will appear in this field' + noTabs: 'The specified tabs will appear in this field', + textJustified: 'Justified', + strIndentsSpecial: 'Special', + textNoneSpecial: '(none)', + textFirstLine: 'First line', + textHanging: 'Hanging', + strIndentsSpacingBefore: 'Before', + strIndentsSpacingAfter: 'After', + strIndentsLineSpacing: 'Line Spacing', + txtAutoText: 'Auto', + textAuto: 'Multiple', + textExact: 'Exactly', + strIndent: 'Indents', + strSpacing: 'Spacing' }, PE.Views.ParagraphSettingsAdvanced || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js index 2304e2458..58462c338 100644 --- a/apps/presentationeditor/main/app/view/RightMenu.js +++ b/apps/presentationeditor/main/app/view/RightMenu.js @@ -186,7 +186,8 @@ define([ asctype: Common.Utils.documentSettingsType.Signature, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature}; diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index c58ab3773..29335a3dc 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1069,6 +1069,8 @@ define([ this._state.GradColor = color; } + this.chShadow.setValue(!!props.asc_getShadow(), true); + this._noApply = false; } }, @@ -1341,6 +1343,13 @@ define([ this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipH); + this.chShadow = new Common.UI.CheckBox({ + el: $('#shape-checkbox-shadow'), + labelText: this.strShadow + }); + this.chShadow.on('change', _.bind(this.onCheckShadow, this)); + this.lockedControls.push(this.chShadow); + this.linkAdvanced = $('#shape-advanced-link'); $(this.el).on('click', '#shape-advanced-link', _.bind(this.openAdvancedSettings, this)); }, @@ -1447,6 +1456,15 @@ define([ this.fireEvent('editcomplete', this); }, + onCheckShadow: function(field, newValue, oldValue, eOpts) { + if (this.api) { + var props = new Asc.asc_CShapeProperty(); + props.asc_putShadow((field.getValue()=='checked') ? new Asc.asc_CShadowProperty() : null); + this.api.ShapeApply(props); + } + this.fireEvent('editcomplete', this); + }, + fillAutoShapes: function() { var me = this, shapesStore = this.application.getCollection('ShapeGroups'); @@ -1718,6 +1736,7 @@ define([ textHint270: 'Rotate 90° Counterclockwise', textHint90: 'Rotate 90° Clockwise', textHintFlipV: 'Flip Vertically', - textHintFlipH: 'Flip Horizontally' + textHintFlipH: 'Flip Horizontally', + strShadow: 'Show shadow' }, PE.Views.ShapeSettings || {})); }); diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 8b8d3aa07..07b70a2b6 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -251,7 +251,7 @@ define([ this.langMenu = new Common.UI.MenuSimple({ cls: 'lang-menu', style: 'margin-top:-5px;', - restoreHeight: 300, + restoreHeight: 285, itemTemplate: _.template([ '      ', '', @@ -351,13 +351,13 @@ define([ $parent.find('#status-label-lang').text(info.displayValue); this.langMenu.prevTip = info.value; - - var index = $parent.find('ul li a:contains("'+info.displayValue+'")').parent().index(); - if (index < 0) { + var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; }); + if (lang) { + this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true); + } else { this.langMenu.saved = info.displayValue; this.langMenu.clearAll(); - } else - this.langMenu.setChecked(index, true); + } } }, diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 836eb8822..b0e1a4f69 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -804,12 +804,12 @@ define([ me.listTheme.fieldPicker.itemTemplate = _.template([ '
      ', - '
      ', + '
      ' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>', '
      ' ].join('')); me.listTheme.menuPicker.itemTemplate = _.template([ '
      ', - '
      ', + '
      ' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>', '
      ' ].join('')); @@ -983,7 +983,7 @@ define([ me.fireEvent('insert:image', [item.value]); }) ); - btn.menu.items[2].setVisible(config.fileChoiceUrl && config.fileChoiceUrl.indexOf("{documentType}")>-1); + btn.menu.items[2].setVisible(config.canRequestInsertImage || config.fileChoiceUrl && config.fileChoiceUrl.indexOf("{documentType}")>-1); }); me.btnsInsertText.forEach(function (btn) { @@ -1678,7 +1678,7 @@ define([ mniImageFromStorage: 'Image from Storage', txtSlideAlign: 'Align to Slide', txtObjectsAlign: 'Align Selected Objects', - tipEditHeader: 'Edit Header or Footer', + tipEditHeader: 'Edit header or footer', tipSlideNum: 'Insert slide number', tipDateTime: 'Insert current date and time', capBtnInsHeader: 'Header/Footer', diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index dfe325a0d..c7ee34ea2 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -18,7 +18,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loadmask { diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 35b7f18ae..f863038ca 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -20,7 +20,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loader-page { diff --git a/apps/presentationeditor/main/locale/bg.json b/apps/presentationeditor/main/locale/bg.json index ef8922f07..287766346 100644 --- a/apps/presentationeditor/main/locale/bg.json +++ b/apps/presentationeditor/main/locale/bg.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Внимание", "Common.Controllers.Chat.textEnterMessage": "Въведете съобщението си тук", - "Common.Controllers.Chat.textUserLimit": "Използвате ONLYOFFICE Free Edition.
      Само двама потребители могат да редактират документа едновременно.
      Искате ли повече? Помислете за закупуване на ONLYOFFICE Enterprise Edition.
      Прочетете повече ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Анонимен", "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори", "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, а кой е редактиран от друг потребител.", @@ -244,14 +243,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Превишава се времето на изтичане на реализациите.", "PE.Controllers.Main.criticalErrorExtText": "Натиснете \"OK\", за да се върнете към списъка с документи.", "PE.Controllers.Main.criticalErrorTitle": "Грешка", - "PE.Controllers.Main.defaultTitleText": "Редактор на презентации ONLYOFFICE", "PE.Controllers.Main.downloadErrorText": "Изтеглянето се провали.", "PE.Controllers.Main.downloadTextText": "Представянето се изтегля ...", "PE.Controllers.Main.downloadTitleText": "Изтегляне на презентация", "PE.Controllers.Main.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
      Моля, свържете се с администратора на сървъра за документи.", "PE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.", - "PE.Controllers.Main.errorConnectToServer": "Документът не можа да бъде запазен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървъра за документи тук ", + "PE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук", "PE.Controllers.Main.errorDatabaseConnection": "Външна грешка.
      Грешка при свързване към база данни. Моля, свържете се с екипа за поддръжка, в случай че грешката продължава.", "PE.Controllers.Main.errorDataEncrypted": "Получени са криптирани промени, които не могат да бъдат дешифрирани.", "PE.Controllers.Main.errorDataRange": "Неправилен обхват от данни.", @@ -1153,7 +1151,6 @@ "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правата за достъп", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата на създаване", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Местоположение", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Лица, които имат права", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Заглавие на презентацията", @@ -1527,9 +1524,7 @@ "PE.Views.Statusbar.tipFitPage": "Плъзгайте се", "PE.Views.Statusbar.tipFitWidth": "Поставя се в ширина", "PE.Views.Statusbar.tipPreview": "Започнете слайдшоуто", - "PE.Views.Statusbar.tipSetDocLang": "Задайте език на документа", "PE.Views.Statusbar.tipSetLang": "Задаване на език на текст", - "PE.Views.Statusbar.tipSetSpelling": "Проверка на правописа", "PE.Views.Statusbar.tipZoomFactor": "Мащаб", "PE.Views.Statusbar.tipZoomIn": "Увеличавам ", "PE.Views.Statusbar.tipZoomOut": "Отдалечавам", diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 33f5f5593..5826844a5 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Varování", "Common.Controllers.Chat.textEnterMessage": "Zde napište svou zprávu", - "Common.Controllers.Chat.textUserLimit": "Používáte ONLYOFFICE bezplatnou edici.
      Pouze dva uživatelé mohou zároveň upravovat dokument.
      Chcete více? Zvažte zakoupení ONLYOFFICE Enterprise edice.
      Více informací", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymní", "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.", @@ -135,14 +134,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.", "PE.Controllers.Main.criticalErrorExtText": "Kliněte na \"OK\" pro návrat k seznamu dokumentů", "PE.Controllers.Main.criticalErrorTitle": "Chyba", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Stahování selhalo.", "PE.Controllers.Main.downloadTextText": "Stahování prezentace...", "PE.Controllers.Main.downloadTitleText": "Stahování prezentace", "PE.Controllers.Main.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
      Prosím, kontaktujte administrátora vašeho Dokumentového serveru.", "PE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.", - "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "PE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.
      Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.

      Více informací o připojení najdete v Dokumentovém serveru here", "PE.Controllers.Main.errorDatabaseConnection": "Externí chyba.
      Chyba spojení s databází. Prosím kontaktujte podporu, pokud chyba přetrvává.", "PE.Controllers.Main.errorDataRange": "Nesprávný datový rozsah.", "PE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", @@ -826,7 +824,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nejsou zde žádné šablony.", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Změnit přístupová práva", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum vytvoření", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Umístění", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osoby, které mají práva", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Nadpis prezentace", @@ -1143,9 +1140,7 @@ "PE.Views.Statusbar.tipFitPage": "Přizpůsobit snímku", "PE.Views.Statusbar.tipFitWidth": "Přizpůsobit šířce", "PE.Views.Statusbar.tipPreview": "Spustit náhled", - "PE.Views.Statusbar.tipSetDocLang": "Nastavit jazyk dokumentu", "PE.Views.Statusbar.tipSetLang": "Nastavit jazyk psaní", - "PE.Views.Statusbar.tipSetSpelling": "Kontrola pravopisu", "PE.Views.Statusbar.tipZoomFactor": "Přiblížit", "PE.Views.Statusbar.tipZoomIn": "Přiblížit", "PE.Views.Statusbar.tipZoomOut": "Oddálit", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index d3a0eadb3..cb33b9c6a 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Achtung", "Common.Controllers.Chat.textEnterMessage": "Geben Sie Ihre Nachricht hier ein", - "Common.Controllers.Chat.textUserLimit": "Sie benutzen ONLYOFFICE Free Edition.
      Nur zwei Benutzer können das Dokument gleichzeitig bearbeiten.
      Möchten Sie mehr? Erwerben Sie kommerzielle Version von ONLYOFFICE Enterprise Edition.
      Lesen Sie mehr davon", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonym", "Common.Controllers.ExternalDiagramEditor.textClose": "Schließen", "Common.Controllers.ExternalDiagramEditor.warningText": "Das Objekt ist deaktiviert, weil es momentan von einem anderen Benutzer bearbeitet wird.", @@ -244,14 +243,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.", "PE.Controllers.Main.criticalErrorExtText": "Klicken Sie auf \"OK\", um zur Dokumentenliste zu übergehen.", "PE.Controllers.Main.criticalErrorTitle": "Fehler", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.", "PE.Controllers.Main.downloadTextText": "Präsentation wird heruntergeladen...", "PE.Controllers.Main.downloadTitleText": "Präsentation wird heruntergeladen", "PE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.
      Wenden Sie sich an Ihren Serveradministrator.", "PE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server verloren. Das Dokument kann momentan nicht bearbeitet werden.", - "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", + "PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
      Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.", "PE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", @@ -1153,7 +1151,6 @@ "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Anwendung", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zugriffsrechte ändern", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Erstellungsdatum", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Speicherort", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personen mit Berechtigungen", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titel der Präsentation", @@ -1527,9 +1524,7 @@ "PE.Views.Statusbar.tipFitPage": "Folie anpassen", "PE.Views.Statusbar.tipFitWidth": "Breite anpassen", "PE.Views.Statusbar.tipPreview": "Vorschau starten", - "PE.Views.Statusbar.tipSetDocLang": "Sprache des Dokumentes festlegen", "PE.Views.Statusbar.tipSetLang": "Textsprache wählen", - "PE.Views.Statusbar.tipSetSpelling": "Rechtschreibprüfung", "PE.Views.Statusbar.tipZoomFactor": "Zoommodus", "PE.Views.Statusbar.tipZoomIn": "Vergrößern", "PE.Views.Statusbar.tipZoomOut": "Verkleinern", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 0eed32caa..e460426cc 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", - "del_Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", @@ -96,11 +95,11 @@ "Common.Views.Header.tipRedo": "Redo", "Common.Views.Header.tipSave": "Save", "Common.Views.Header.tipUndo": "Undo", + "Common.Views.Header.tipUndock": "Undock into separate window", "Common.Views.Header.tipViewSettings": "View settings", "Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.txtAccessRights": "Change access rights", "Common.Views.Header.txtRename": "Rename", - "Common.Views.Header.tipUndock": "Undock into separate window", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", @@ -246,7 +245,6 @@ "PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "PE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "PE.Controllers.Main.criticalErrorTitle": "Error", - "del_PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Download failed.", "PE.Controllers.Main.downloadTextText": "Downloading presentation...", "PE.Controllers.Main.downloadTitleText": "Downloading Presentation", @@ -947,13 +945,13 @@ "PE.Views.ChartSettingsAdvanced.textAltTitle": "Title", "PE.Views.ChartSettingsAdvanced.textTitle": "Chart - Advanced Settings", "PE.Views.DateTimeDialog.cancelButtonText": "Cancel", - "PE.Views.DateTimeDialog.okButtonText": "OK", - "PE.Views.DateTimeDialog.txtTitle": "Date & Time", - "PE.Views.DateTimeDialog.textLang": "Language", - "PE.Views.DateTimeDialog.textFormat": "Formats", - "PE.Views.DateTimeDialog.textUpdate": "Update automatically", - "PE.Views.DateTimeDialog.textDefault": "Set as default", "PE.Views.DateTimeDialog.confirmDefault": "Set default format for {0}: \"{1}\"", + "PE.Views.DateTimeDialog.okButtonText": "OK", + "PE.Views.DateTimeDialog.textDefault": "Set as default", + "PE.Views.DateTimeDialog.textFormat": "Formats", + "PE.Views.DateTimeDialog.textLang": "Language", + "PE.Views.DateTimeDialog.textUpdate": "Update automatically", + "PE.Views.DateTimeDialog.txtTitle": "Date & Time", "PE.Views.DocumentHolder.aboveText": "Above", "PE.Views.DocumentHolder.addCommentText": "Add Comment", "PE.Views.DocumentHolder.advancedImageText": "Image Advanced Settings", @@ -979,6 +977,7 @@ "PE.Views.DocumentHolder.hyperlinkText": "Hyperlink", "PE.Views.DocumentHolder.ignoreAllSpellText": "Ignore All", "PE.Views.DocumentHolder.ignoreSpellText": "Ignore", + "PE.Views.DocumentHolder.toDictionaryText": "Add to Dictionary", "PE.Views.DocumentHolder.insertColumnLeftText": "Column Left", "PE.Views.DocumentHolder.insertColumnRightText": "Column Right", "PE.Views.DocumentHolder.insertColumnText": "Insert Column", @@ -1124,6 +1123,7 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.txtPrintSelection": "Print Selection", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close slideshow", @@ -1160,16 +1160,15 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank presentation which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a presentation of a certain type or purpose where some styles have already been pre-applied.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Presentation", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", - "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text", + "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "PE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comment", - "del_PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date", "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Created", - "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified", "PE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Last Modified By", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified", "PE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Owner", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persons who have rights", @@ -1226,20 +1225,21 @@ "PE.Views.FileMenuPanels.Settings.txtPt": "Point", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows", - "PE.Views.HeaderFooterDialog.textTitle": "Header/Footer Settings", - "PE.Views.HeaderFooterDialog.cancelButtonText": "Cancel", "PE.Views.HeaderFooterDialog.applyAllText": "Apply to all", "PE.Views.HeaderFooterDialog.applyText": "Apply", - "PE.Views.HeaderFooterDialog.textLang": "Language", - "PE.Views.HeaderFooterDialog.textFormat": "Formats", - "PE.Views.HeaderFooterDialog.textUpdate": "Update automatically", - "PE.Views.HeaderFooterDialog.textDateTime": "Date and time", - "PE.Views.HeaderFooterDialog.textSlideNum": "Slide number", - "PE.Views.HeaderFooterDialog.textFooter": "Text in footer", - "PE.Views.HeaderFooterDialog.textNotTitle": "Don't show on title slide", - "PE.Views.HeaderFooterDialog.textPreview": "Preview", + "PE.Views.HeaderFooterDialog.cancelButtonText": "Cancel", "PE.Views.HeaderFooterDialog.diffLanguage": "You can’t use a date format in a different language than the slide master.
      To change the master, click 'Apply to all' instead of 'Apply'", "PE.Views.HeaderFooterDialog.notcriticalErrorTitle": "Warning", + "PE.Views.HeaderFooterDialog.textDateTime": "Date and time", + "PE.Views.HeaderFooterDialog.textFooter": "Text in footer", + "PE.Views.HeaderFooterDialog.textFormat": "Formats", + "PE.Views.HeaderFooterDialog.textLang": "Language", + "PE.Views.HeaderFooterDialog.textNotTitle": "Don't show on title slide", + "PE.Views.HeaderFooterDialog.textPreview": "Preview", + "PE.Views.HeaderFooterDialog.textSlideNum": "Slide number", + "PE.Views.HeaderFooterDialog.textTitle": "Header/Footer Settings", + "PE.Views.HeaderFooterDialog.textUpdate": "Update automatically", + "PE.Views.HeaderFooterDialog.textFixed": "Fixed", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancel", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Display", @@ -1328,7 +1328,7 @@ "PE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left", "PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right", "PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font", - "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Placement", + "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing", "PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", "PE.Views.ParagraphSettingsAdvanced.strStrike": "Strikethrough", "PE.Views.ParagraphSettingsAdvanced.strSubscript": "Subscript", @@ -1346,6 +1346,19 @@ "PE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position", "PE.Views.ParagraphSettingsAdvanced.textTabRight": "Right", "PE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings", + "PE.Views.ParagraphSettingsAdvanced.textJustified": "Justified", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Special", + "PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)", + "PE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", + "PE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After", + "PE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing", + "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", + "PE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", + "PE.Views.ParagraphSettingsAdvanced.textExact": "Exactly", + "PE.Views.ParagraphSettingsAdvanced.strIndent": "Indents", + "PE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing", "PE.Views.RightMenu.txtChartSettings": "Chart settings", "PE.Views.RightMenu.txtImageSettings": "Image settings", "PE.Views.RightMenu.txtParagraphSettings": "Text settings", @@ -1403,6 +1416,7 @@ "PE.Views.ShapeSettings.txtNoBorders": "No Line", "PE.Views.ShapeSettings.txtPapyrus": "Papyrus", "PE.Views.ShapeSettings.txtWood": "Wood", + "PE.Views.ShapeSettings.strShadow": "Show shadow", "PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Cancel", "PE.Views.ShapeSettingsAdvanced.okButtonText": "OK", "PE.Views.ShapeSettingsAdvanced.strColumns": "Columns", @@ -1455,12 +1469,14 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in presentation are invalid or could not be verified. The presentation is protected from editing.", "PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strColor": "Color", + "PE.Views.SlideSettings.strDateTime": "Show Date and Time", "PE.Views.SlideSettings.strDelay": "Delay", "PE.Views.SlideSettings.strDuration": "Duration", "PE.Views.SlideSettings.strEffect": "Effect", "PE.Views.SlideSettings.strFill": "Background", "PE.Views.SlideSettings.strForeground": "Foreground color", "PE.Views.SlideSettings.strPattern": "Pattern", + "PE.Views.SlideSettings.strSlideNum": "Show Slide Number", "PE.Views.SlideSettings.strStartOnClick": "Start On Click", "PE.Views.SlideSettings.textAdvanced": "Show advanced settings", "PE.Views.SlideSettings.textApplyAll": "Apply to All Slides", @@ -1525,8 +1541,6 @@ "PE.Views.SlideSettings.txtLeather": "Leather", "PE.Views.SlideSettings.txtPapyrus": "Papyrus", "PE.Views.SlideSettings.txtWood": "Wood", - "PE.Views.SlideSettings.strSlideNum": "Show Slide Number", - "PE.Views.SlideSettings.strDateTime": "Show Date and Time", "PE.Views.SlideshowSettings.cancelButtonText": "Cancel", "PE.Views.SlideshowSettings.okButtonText": "OK", "PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed", @@ -1562,9 +1576,7 @@ "PE.Views.Statusbar.tipFitPage": "Fit to slide", "PE.Views.Statusbar.tipFitWidth": "Fit to width", "PE.Views.Statusbar.tipPreview": "Start slideshow", - "del_PE.Views.Statusbar.tipSetDocLang": "Set document language", "PE.Views.Statusbar.tipSetLang": "Set text language", - "del_PE.Views.Statusbar.tipSetSpelling": "Spell checking", "PE.Views.Statusbar.tipZoomFactor": "Zoom", "PE.Views.Statusbar.tipZoomIn": "Zoom in", "PE.Views.Statusbar.tipZoomOut": "Zoom out", @@ -1800,5 +1812,12 @@ "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", - "PE.Views.Toolbar.txtUngroup": "Ungroup" + "PE.Views.Toolbar.txtUngroup": "Ungroup", + "PE.Views.Toolbar.tipEditHeader": "Edit header or footer", + "PE.Views.Toolbar.tipSlideNum": "Insert slide number", + "PE.Views.Toolbar.tipDateTime": "Insert current date and time", + "PE.Views.Toolbar.capBtnInsHeader": "Header/Footer", + "PE.Views.Toolbar.capBtnSlideNum": "Slide Number", + "PE.Views.Toolbar.capBtnDateTime": "Date & Time" + } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 7dd4842a1..6980c944e 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí", - "Common.Controllers.Chat.textUserLimit": "Usted está usando ONLYOFFICE Free Edition.
      Sólo dos usuarios pueden editar el documento simultáneamente.
      ¿Quiere más? Compre ONLYOFFICE Enterprise Edition.
      Saber más", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anónimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar", "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.", @@ -96,6 +95,7 @@ "Common.Views.Header.tipRedo": "Rehacer", "Common.Views.Header.tipSave": "Guardar", "Common.Views.Header.tipUndo": "Deshacer", + "Common.Views.Header.tipUndock": "Desacoplar en una ventana independiente", "Common.Views.Header.tipViewSettings": "Mostrar ajustes", "Common.Views.Header.tipViewUsers": "Ver usuarios y administrar derechos de acceso al documento", "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso", @@ -244,14 +244,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.", "PE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar a la lista de documentos.", "PE.Controllers.Main.criticalErrorTitle": "Error", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Error de descarga.", "PE.Controllers.Main.downloadTextText": "Descargando presentación...", "PE.Controllers.Main.downloadTitleText": "Descargando presentación", "PE.Controllers.Main.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.
      Por favor, contacte con el Administrador del Servidor de Documentos.", "PE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.", - "PE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.
      Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.
      Encuentre más información acerca de la conexión con Servidor de Documentosaquí", + "PE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.
      Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.

      Encuentre más información acerca de la conexión de Servidor de Documentos aquí", "PE.Controllers.Main.errorDatabaseConnection": "Error externo.
      Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.", "PE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "PE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", @@ -314,7 +313,7 @@ "PE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", "PE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
      Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", "PE.Controllers.Main.textLoadingDocument": "Cargando presentación", - "PE.Controllers.Main.textNoLicenseTitle": "Límite de conexión de ONLYOFFICE", + "PE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones", "PE.Controllers.Main.textPaidFeature": "Función de pago", "PE.Controllers.Main.textShape": "Forma", "PE.Controllers.Main.textStrict": "Modo estricto", @@ -584,7 +583,7 @@ "PE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.
      Por favor, actualice su licencia y después recargue la página.", "PE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.
      Por favor, contacte con su administrador para recibir más información.", "PE.Controllers.Main.warnNoLicense": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", - "PE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", + "PE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.
      Si necesita más, por favor, considere comprar una licencia comercial.", "PE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "El tipo de letra que usted va a guardar no está disponible en este dispositivo.
      El estilo de letra se mostrará usando uno de los tipos de letra del dispositivo, el tipo de letra guardado va a usarse cuando esté disponible.
      ¿Desea continuar?", @@ -944,6 +943,14 @@ "PE.Views.ChartSettingsAdvanced.textAltTip": "Representación de texto alternativa de la información sobre el objeto visual, que se leerá para las personas con deficiencia visual o deterioro cognitivo para ayudarles a entender mejor, que información contiene la imagen, autoforma, gráfica o tabla.", "PE.Views.ChartSettingsAdvanced.textAltTitle": "Título", "PE.Views.ChartSettingsAdvanced.textTitle": "Gráfico - Ajustes avanzados", + "PE.Views.DateTimeDialog.cancelButtonText": "Cancelar", + "PE.Views.DateTimeDialog.confirmDefault": "Establecer formato predeterminado para {0}: \"{1}\"", + "PE.Views.DateTimeDialog.okButtonText": "OK", + "PE.Views.DateTimeDialog.textDefault": "Establecer como el valor predeterminado", + "PE.Views.DateTimeDialog.textFormat": "Formatos", + "PE.Views.DateTimeDialog.textLang": "Idioma", + "PE.Views.DateTimeDialog.textUpdate": "Actualizar automáticamente", + "PE.Views.DateTimeDialog.txtTitle": "Fecha y hora", "PE.Views.DocumentHolder.aboveText": "Arriba", "PE.Views.DocumentHolder.addCommentText": "Añadir comentario", "PE.Views.DocumentHolder.advancedImageText": "Ajustes avanzados de imagen", @@ -1150,13 +1157,21 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree una presentación en blanco nueva para trabajar con estilo y formato y editarla según sus necesidades. O seleccione una de las plantillas para iniciar la presentación de cierto tipo o propósito donde algunos estilos se han aplicado ya.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Presentación nueva", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hay ningunas plantillas", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplicación", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambiar derechos de acceso", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Fecha de creación", + "PE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comentario", + "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creada", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Última modificación por", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Última modificación", + "PE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propietario", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Ubicación", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personas que tienen derechos", - "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título de presentación", + "PE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Asunto", + "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título", + "PE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Subido", "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambiar derechos de acceso", "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Personas que tienen derechos", "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Aviso", @@ -1207,6 +1222,20 @@ "PE.Views.FileMenuPanels.Settings.txtPt": "Punto", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Сorrección ortográfica", "PE.Views.FileMenuPanels.Settings.txtWin": "como Windows", + "PE.Views.HeaderFooterDialog.applyAllText": "Aplicar a todo", + "PE.Views.HeaderFooterDialog.applyText": "Aplicar", + "PE.Views.HeaderFooterDialog.cancelButtonText": "Cancelar", + "PE.Views.HeaderFooterDialog.diffLanguage": "No se puede usar un formato de fecha en un idioma diferente del patrón de diapositivas.
      Para cambiar el patrón pulse \"Aplicar a todo\" en vez de \"Aplicar\"", + "PE.Views.HeaderFooterDialog.notcriticalErrorTitle": "Aviso", + "PE.Views.HeaderFooterDialog.textDateTime": "Fecha y hora", + "PE.Views.HeaderFooterDialog.textFooter": "Texto en pie de página", + "PE.Views.HeaderFooterDialog.textFormat": "Formatos", + "PE.Views.HeaderFooterDialog.textLang": "Idioma", + "PE.Views.HeaderFooterDialog.textNotTitle": "No mostrar en diapositiva de título", + "PE.Views.HeaderFooterDialog.textPreview": "Vista previa", + "PE.Views.HeaderFooterDialog.textSlideNum": "Número de diapositiva", + "PE.Views.HeaderFooterDialog.textTitle": "Ajustes de encabezado / pie de página", + "PE.Views.HeaderFooterDialog.textUpdate": "Actualizar automáticamente", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar", "PE.Views.HyperlinkSettingsDialog.okButtonText": "Aceptar", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Mostrar", @@ -1422,12 +1451,14 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Algunas de las firmas digitales en la presentación son inválidas o no se pudieron verificar. La presentación está protegida y no se puede editar.", "PE.Views.SlideSettings.strBackground": "Color de fondo", "PE.Views.SlideSettings.strColor": "Color", + "PE.Views.SlideSettings.strDateTime": "Mostrar Fecha y Hora", "PE.Views.SlideSettings.strDelay": "Retraso", "PE.Views.SlideSettings.strDuration": "Duración ", "PE.Views.SlideSettings.strEffect": "Efecto", "PE.Views.SlideSettings.strFill": "Fondo", "PE.Views.SlideSettings.strForeground": "Color de primer plano", "PE.Views.SlideSettings.strPattern": "Patrón", + "PE.Views.SlideSettings.strSlideNum": "Mostrar número de diapositiva", "PE.Views.SlideSettings.strStartOnClick": "Iniciar al hacer clic", "PE.Views.SlideSettings.textAdvanced": "Mostrar ajustes avanzados", "PE.Views.SlideSettings.textApplyAll": "Aplicar a todas diapositivas", @@ -1527,9 +1558,7 @@ "PE.Views.Statusbar.tipFitPage": "Ajustar a la diapositiva", "PE.Views.Statusbar.tipFitWidth": "Ajustar a ancho", "PE.Views.Statusbar.tipPreview": "Iniciar presentación", - "PE.Views.Statusbar.tipSetDocLang": "Establecer el idioma de documento", "PE.Views.Statusbar.tipSetLang": "Establecer idioma de texto", - "PE.Views.Statusbar.tipSetSpelling": "Сorrección ortográfica", "PE.Views.Statusbar.tipZoomFactor": "Ampliación", "PE.Views.Statusbar.tipZoomIn": "Acercar", "PE.Views.Statusbar.tipZoomOut": "Alejar", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 595cad745..5a852f6fd 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Avertissement", "Common.Controllers.Chat.textEnterMessage": "Entrez votre message ici", - "Common.Controllers.Chat.textUserLimit": "Vous êtes en train d'utiliser ONLYOFFICE Free Edition.
      Ce ne sont que deux utilisateurs qui peuvent éditer le document simultanément.
      Voulez plus ? Envisagez d'acheter ONLYOFFICE Enterprise Edition.
      En savoir plus", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonyme", "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer", "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours d'être modifié par un autre utilisateur.", @@ -245,14 +244,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.", "PE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.", "PE.Controllers.Main.criticalErrorTitle": "Erreur", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Échec du téléchargement.", "PE.Controllers.Main.downloadTextText": "Téléchargement de la présentation...", "PE.Controllers.Main.downloadTitleText": "Téléchargement de la présentation", "PE.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.", "PE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.", - "PE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
      Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.

      Trouvez plus d'informations sur la connexion de Document Serverici", + "PE.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", "PE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
      Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.", "PE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.", "PE.Controllers.Main.errorDataRange": "Plage de données incorrecte.", @@ -945,6 +943,13 @@ "PE.Views.ChartSettingsAdvanced.textAltTip": "La représentation textuelle alternative des informations sur l’objet visuel, qui sera lue aux personnes avec des déficiences cognitives ou visuelles pour les aider à mieux comprendre l'information de l’image, de la forme automatique, du graphique ou du tableau.", "PE.Views.ChartSettingsAdvanced.textAltTitle": "Titre", "PE.Views.ChartSettingsAdvanced.textTitle": "Graphique - Paramètres avancés", + "PE.Views.DateTimeDialog.cancelButtonText": "Annuler", + "PE.Views.DateTimeDialog.confirmDefault": "Définir le format par défaut pour {0}: \"{1}\"", + "PE.Views.DateTimeDialog.textDefault": "Définir par défaut", + "PE.Views.DateTimeDialog.textFormat": "Formats", + "PE.Views.DateTimeDialog.textLang": "Langue", + "PE.Views.DateTimeDialog.textUpdate": "Mettre à jour automatiquement", + "PE.Views.DateTimeDialog.txtTitle": "Date & heure", "PE.Views.DocumentHolder.aboveText": "Au-dessus", "PE.Views.DocumentHolder.addCommentText": "Ajouter un commentaire", "PE.Views.DocumentHolder.advancedImageText": "Paramètres avancés de l'image", @@ -1151,13 +1156,21 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez une nouvelle présentation vièrge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer une présentation d'un certain type ou objectif.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouvelle présentation", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Changer les droits d'accès", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Date de création", + "PE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commentaire", + "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Créé", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Dernière modification par", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Date de dernière modification", + "PE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Propriétaire", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Emplacement", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personnes qui ont des droits", + "PE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Objet", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titre de la présentation", + "PE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Chargé", "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Changer les droits d'accès", "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Personnes qui ont des droits", "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Avertissement", @@ -1208,6 +1221,19 @@ "PE.Views.FileMenuPanels.Settings.txtPt": "Point", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe", "PE.Views.FileMenuPanels.Settings.txtWin": "comme Windows", + "PE.Views.HeaderFooterDialog.applyAllText": "Appliquer à tous", + "PE.Views.HeaderFooterDialog.applyText": "Appliquer", + "PE.Views.HeaderFooterDialog.cancelButtonText": "Annuler", + "PE.Views.HeaderFooterDialog.notcriticalErrorTitle": "Avertissement", + "PE.Views.HeaderFooterDialog.textDateTime": "Date et heure", + "PE.Views.HeaderFooterDialog.textFooter": "Texte en pied de page", + "PE.Views.HeaderFooterDialog.textFormat": "Formats", + "PE.Views.HeaderFooterDialog.textLang": "Langue", + "PE.Views.HeaderFooterDialog.textNotTitle": "Ne pas afficher sur la diapositive titre", + "PE.Views.HeaderFooterDialog.textPreview": "Aperçu", + "PE.Views.HeaderFooterDialog.textSlideNum": "Numéro de diapositive", + "PE.Views.HeaderFooterDialog.textTitle": "Paramètres des en-têtes/pieds de page", + "PE.Views.HeaderFooterDialog.textUpdate": "Mettre à jour automatiquement", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuler", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Afficher", @@ -1423,12 +1449,14 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Des signatures électroniques sont non valides ou n'ont pas pu être vérifiées. Le document est protégé contre la modification.", "PE.Views.SlideSettings.strBackground": "Couleur d'arrière-plan", "PE.Views.SlideSettings.strColor": "Couleur", + "PE.Views.SlideSettings.strDateTime": "Afficher la date et l'heure", "PE.Views.SlideSettings.strDelay": "Retard", "PE.Views.SlideSettings.strDuration": "Durée", "PE.Views.SlideSettings.strEffect": "Effet", "PE.Views.SlideSettings.strFill": "Arrière-plan", "PE.Views.SlideSettings.strForeground": "Couleur de premier plan", "PE.Views.SlideSettings.strPattern": "Modèle", + "PE.Views.SlideSettings.strSlideNum": "Afficher le numéro de diapositive", "PE.Views.SlideSettings.strStartOnClick": "Démarrer en cliquant", "PE.Views.SlideSettings.textAdvanced": "Afficher les paramètres avancés", "PE.Views.SlideSettings.textApplyAll": "Appliquer à toutes les diapositives", @@ -1528,9 +1556,7 @@ "PE.Views.Statusbar.tipFitPage": "Ajuster à la diapositive", "PE.Views.Statusbar.tipFitWidth": "Ajuster à la largeur", "PE.Views.Statusbar.tipPreview": "Démarrer le diaporama", - "PE.Views.Statusbar.tipSetDocLang": "Définir la langue du document", "PE.Views.Statusbar.tipSetLang": "Définir la langue du texte", - "PE.Views.Statusbar.tipSetSpelling": "Vérification de l'orthographe", "PE.Views.Statusbar.tipZoomFactor": "Zoom", "PE.Views.Statusbar.tipZoomIn": "Zoom avant", "PE.Views.Statusbar.tipZoomOut": "Zoom arrière", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index 1da381194..0fc2f740d 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Figyelmeztetés", "Common.Controllers.Chat.textEnterMessage": "Írja be ide az üzenetet", - "Common.Controllers.Chat.textUserLimit": "Ön az ONLYOFFICE Ingyenes Kiadást használja.
      Csak két felhasználó szerkesztheti egyszerre a dokumentumot.
      Többet szeretne? Fontolja meg az ONLYOFFICE Vállalati Kiadás megvásárlását
      Tudjon meg többet", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Névtelen", "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár", "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.", @@ -244,14 +243,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.", "PE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\" gombot a dokumentumlistához való visszatéréshez.", "PE.Controllers.Main.criticalErrorTitle": "Hiba", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Prezentáció Szerkesztő", "PE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.", "PE.Controllers.Main.downloadTextText": "Prezentáció letöltése...", "PE.Controllers.Main.downloadTitleText": "Prezentáció letöltése", "PE.Controllers.Main.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.
      Vegye fel a kapcsolatot a Document Server adminisztrátorával.", "PE.Controllers.Main.errorBadImageUrl": "Hibás kép URL", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.", - "PE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", + "PE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", "PE.Controllers.Main.errorDatabaseConnection": "Külső hiba.
      Adatbázis-kapcsolati hiba. Ha a hiba továbbra is fennáll, lépjen kapcsolatba a rendszer támogatással.", "PE.Controllers.Main.errorDataEncrypted": "Titkosított változások érkeztek, melyek feloldása sikertelen.", "PE.Controllers.Main.errorDataRange": "Hibás adattartomány.", @@ -1092,7 +1090,6 @@ "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applikáció", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Szerző", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Hozzáférési jogok módosítása", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Létrehozás dátuma", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Hely", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Jogosult személyek", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Prezentáció címe", @@ -1464,9 +1461,7 @@ "PE.Views.Statusbar.tipFitPage": "A diához igazít", "PE.Views.Statusbar.tipFitWidth": "Szélességhez igazít", "PE.Views.Statusbar.tipPreview": "Diavetítés elindítása", - "PE.Views.Statusbar.tipSetDocLang": "Dokumentumnyelv beállítása", "PE.Views.Statusbar.tipSetLang": "Szöveg nyelvének beállítása", - "PE.Views.Statusbar.tipSetSpelling": "Helyesírás-ellenőrzés", "PE.Views.Statusbar.tipZoomFactor": "Zoom", "PE.Views.Statusbar.tipZoomIn": "Zoom be", "PE.Views.Statusbar.tipZoomOut": "Zoom ki", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index dcdaaa931..ff8155594 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Avviso", "Common.Controllers.Chat.textEnterMessage": "Scrivi il tuo messaggio qui", - "Common.Controllers.Chat.textUserLimit": "Stai usando ONLYOFFICE Free Edition.
      Solo due utenti possono modificare il documento contemporaneamente.
      Si desidera di più? Considera l'acquisto di ONLYOFFICE Enterprise Edition.
      Ulteriori informazioni", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi", "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.", @@ -96,6 +95,7 @@ "Common.Views.Header.tipRedo": "Ripristina", "Common.Views.Header.tipSave": "Salva", "Common.Views.Header.tipUndo": "Annulla", + "Common.Views.Header.tipUndock": "Sgancia in una finestra separata", "Common.Views.Header.tipViewSettings": "Mostra impostazioni", "Common.Views.Header.tipViewUsers": "Mostra gli utenti e gestisci i diritti di accesso al documento", "Common.Views.Header.txtAccessRights": "Modifica diritti di accesso", @@ -192,12 +192,13 @@ "Common.Views.ReviewChanges.txtSharing": "Condivisione", "Common.Views.ReviewChanges.txtSpelling": "Controllo ortografia", "Common.Views.ReviewChanges.txtTurnon": "Traccia cambiamenti", - "Common.Views.ReviewChanges.txtView": "Modalità display", + "Common.Views.ReviewChanges.txtView": "Modalità Visualizzazione", "Common.Views.ReviewPopover.textAdd": "Aggiungi", "Common.Views.ReviewPopover.textAddReply": "Aggiungi risposta", "Common.Views.ReviewPopover.textCancel": "Annulla", "Common.Views.ReviewPopover.textClose": "Chiudi", "Common.Views.ReviewPopover.textEdit": "OK", + "Common.Views.ReviewPopover.textMention": "+mention fornirà l'accesso al documento e invierà un'e-mail", "Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo", "Common.Views.ReviewPopover.textReply": "Rispondi", "Common.Views.ReviewPopover.textResolve": "Risolvere", @@ -244,14 +245,13 @@ "PE.Controllers.Main.convertationTimeoutText": "E' stato superato il tempo limite della conversione.", "PE.Controllers.Main.criticalErrorExtText": "Clicca su \"OK\" per ritornare all'elenco dei documenti.", "PE.Controllers.Main.criticalErrorTitle": "Errore", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Download fallito.", "PE.Controllers.Main.downloadTextText": "Download della presentazione in corso...", "PE.Controllers.Main.downloadTitleText": "Download della presentazione", "PE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.
      Si prega di contattare l'amministratore del Server dei Documenti.", "PE.Controllers.Main.errorBadImageUrl": "URL dell'immagine errato", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.", - "PE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", + "PE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", "PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.
      Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.", "PE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.", "PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.", @@ -314,7 +314,7 @@ "PE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", "PE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore.
      Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.", "PE.Controllers.Main.textLoadingDocument": "Caricamento della presentazione", - "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "PE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione", "PE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "PE.Controllers.Main.textShape": "Forma", "PE.Controllers.Main.textStrict": "Modalità Rigorosa", @@ -345,6 +345,12 @@ "PE.Controllers.Main.txtPicture": "Foto", "PE.Controllers.Main.txtRectangles": "Rettangoli", "PE.Controllers.Main.txtSeries": "Serie", + "PE.Controllers.Main.txtShape_accentBorderCallout1": "Callout Linea con bordo e barra in risalto", + "PE.Controllers.Main.txtShape_accentBorderCallout2": "Callout Linea piegata con bordo e barra in risalto", + "PE.Controllers.Main.txtShape_accentBorderCallout3": "Callout Doppia linea piegata con barra e bordo in risalto", + "PE.Controllers.Main.txtShape_accentCallout1": "Callout Linea con barra in risalto", + "PE.Controllers.Main.txtShape_accentCallout2": "Callout Linea piegata con barra in risalto", + "PE.Controllers.Main.txtShape_accentCallout3": "Callout Doppia linea piegata con barra in risalto", "PE.Controllers.Main.txtShape_actionButtonBackPrevious": "Indietro o Pulsante Precedente", "PE.Controllers.Main.txtShape_actionButtonBeginning": "Pulsante di Inizio", "PE.Controllers.Main.txtShape_actionButtonBlank": "Pulsante Vuoto", @@ -354,18 +360,39 @@ "PE.Controllers.Main.txtShape_actionButtonHelp": "Pulsante Aiuto", "PE.Controllers.Main.txtShape_actionButtonHome": "Pulsante Home", "PE.Controllers.Main.txtShape_actionButtonInformation": "Pulsante Informazioni", + "PE.Controllers.Main.txtShape_actionButtonMovie": "Pulsante Film", "PE.Controllers.Main.txtShape_actionButtonReturn": "Pulsante Invio", "PE.Controllers.Main.txtShape_actionButtonSound": "Pulsante Suono", "PE.Controllers.Main.txtShape_arc": "Arco", "PE.Controllers.Main.txtShape_bentArrow": "Freccia piegata", + "PE.Controllers.Main.txtShape_bentConnector5": "Connettore a gomito", + "PE.Controllers.Main.txtShape_bentConnector5WithArrow": "Connettore freccia a gomito", + "PE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Connettore doppia freccia a gomito", "PE.Controllers.Main.txtShape_bentUpArrow": "Freccia curva in alto", "PE.Controllers.Main.txtShape_bevel": "Smussato", "PE.Controllers.Main.txtShape_blockArc": "Arco a tutto sesto", - "PE.Controllers.Main.txtShape_chevron": "Gallone", + "PE.Controllers.Main.txtShape_borderCallout1": "Callout Linea", + "PE.Controllers.Main.txtShape_borderCallout2": "Callout Linea piegata", + "PE.Controllers.Main.txtShape_borderCallout3": "Callout Doppia linea piegata", + "PE.Controllers.Main.txtShape_bracePair": "Doppia parentesi graffa", + "PE.Controllers.Main.txtShape_callout1": "Callout Linea senza bordo", + "PE.Controllers.Main.txtShape_callout2": "Callout Linea piegata senza bordo ", + "PE.Controllers.Main.txtShape_callout3": "Callout Doppia linea piegata senza bordo", + "PE.Controllers.Main.txtShape_can": "Cilindro", + "PE.Controllers.Main.txtShape_chevron": "freccia a Gallone", + "PE.Controllers.Main.txtShape_chord": "Corda", "PE.Controllers.Main.txtShape_circularArrow": "Freccia circolare", "PE.Controllers.Main.txtShape_cloud": "Nuvola", + "PE.Controllers.Main.txtShape_cloudCallout": "Callout Nuvola", "PE.Controllers.Main.txtShape_corner": "Angolo", "PE.Controllers.Main.txtShape_cube": "Cubo", + "PE.Controllers.Main.txtShape_curvedConnector3": "Connettore curvo", + "PE.Controllers.Main.txtShape_curvedConnector3WithArrow": "Connettore a freccia curva", + "PE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Connettore a doppia freccia curva", + "PE.Controllers.Main.txtShape_curvedDownArrow": "Freccia curva in basso", + "PE.Controllers.Main.txtShape_curvedLeftArrow": "Freccia curva a sinistra", + "PE.Controllers.Main.txtShape_curvedRightArrow": "Freccia curva a destra", + "PE.Controllers.Main.txtShape_curvedUpArrow": "Freccia curva in su", "PE.Controllers.Main.txtShape_decagon": "Decagono", "PE.Controllers.Main.txtShape_diagStripe": "Striscia diagonale", "PE.Controllers.Main.txtShape_diamond": "Diamante", @@ -373,7 +400,10 @@ "PE.Controllers.Main.txtShape_donut": "Ciambella", "PE.Controllers.Main.txtShape_doubleWave": "Onda doppia", "PE.Controllers.Main.txtShape_downArrow": "Freccia in giù", + "PE.Controllers.Main.txtShape_downArrowCallout": "Callout Freccia in basso", "PE.Controllers.Main.txtShape_ellipse": "Ellisse", + "PE.Controllers.Main.txtShape_ellipseRibbon": "Nastro curvo e inclinato in basso", + "PE.Controllers.Main.txtShape_ellipseRibbon2": "Nastro curvato in alto", "PE.Controllers.Main.txtShape_flowChartAlternateProcess": "Diagramma di flusso: processo alternativo", "PE.Controllers.Main.txtShape_flowChartCollate": "Diagramma di flusso: Fascicolazione", "PE.Controllers.Main.txtShape_flowChartConnector": "Diagramma di flusso: Connettore", @@ -402,7 +432,9 @@ "PE.Controllers.Main.txtShape_flowChartSort": "Diagramma di flusso: Ordinamento", "PE.Controllers.Main.txtShape_flowChartSummingJunction": "Diagramma di flusso: Giunzione di somma", "PE.Controllers.Main.txtShape_flowChartTerminator": "Diagramma di flusso: Terminatore", + "PE.Controllers.Main.txtShape_foldedCorner": "angolo ripiegato", "PE.Controllers.Main.txtShape_frame": "Cornice", + "PE.Controllers.Main.txtShape_halfFrame": "Mezza Cornice", "PE.Controllers.Main.txtShape_heart": "Cuore", "PE.Controllers.Main.txtShape_heptagon": "Ettagono", "PE.Controllers.Main.txtShape_hexagon": "Esagono", @@ -411,16 +443,26 @@ "PE.Controllers.Main.txtShape_irregularSeal1": "Esplosione 1", "PE.Controllers.Main.txtShape_irregularSeal2": "Esplosione 2", "PE.Controllers.Main.txtShape_leftArrow": "Freccia Sinistra", + "PE.Controllers.Main.txtShape_leftArrowCallout": "Callout Freccia a sinistra", + "PE.Controllers.Main.txtShape_leftBrace": "Parentesi graffa aperta", + "PE.Controllers.Main.txtShape_leftBracket": "Parentesi quadra aperta", + "PE.Controllers.Main.txtShape_leftRightArrow": "Freccia bidirezionale sinistra destra", + "PE.Controllers.Main.txtShape_leftRightArrowCallout": "Callout Freccia bidirezionane sinistra destra", + "PE.Controllers.Main.txtShape_leftRightUpArrow": "Freccia tridirezionale sinistra destra alto", + "PE.Controllers.Main.txtShape_leftUpArrow": "Freccia bidirezionale sinistra alto", + "PE.Controllers.Main.txtShape_lightningBolt": "Fulmine", "PE.Controllers.Main.txtShape_line": "Linea", "PE.Controllers.Main.txtShape_lineWithArrow": "Freccia", "PE.Controllers.Main.txtShape_lineWithTwoArrows": "Freccia doppia", "PE.Controllers.Main.txtShape_mathDivide": "Divisione", "PE.Controllers.Main.txtShape_mathEqual": "Uguale", "PE.Controllers.Main.txtShape_mathMinus": "Meno", + "PE.Controllers.Main.txtShape_mathMultiply": "Moltiplicazione", "PE.Controllers.Main.txtShape_mathNotEqual": "Non uguale", "PE.Controllers.Main.txtShape_mathPlus": "Più", "PE.Controllers.Main.txtShape_moon": "Luna", "PE.Controllers.Main.txtShape_noSmoking": "Simbolo \"No\"", + "PE.Controllers.Main.txtShape_notchedRightArrow": "Freccia dentellata a destra ", "PE.Controllers.Main.txtShape_octagon": "Ottagono", "PE.Controllers.Main.txtShape_parallelogram": "Parallelogramma", "PE.Controllers.Main.txtShape_pentagon": "Pentagono", @@ -429,9 +471,25 @@ "PE.Controllers.Main.txtShape_plus": "Più", "PE.Controllers.Main.txtShape_polyline1": "Bozza", "PE.Controllers.Main.txtShape_polyline2": "Forma libera", + "PE.Controllers.Main.txtShape_quadArrow": "Freccia a incrocio", + "PE.Controllers.Main.txtShape_quadArrowCallout": "Callout Freccia a incrocio", "PE.Controllers.Main.txtShape_rect": "Rettangolo", + "PE.Controllers.Main.txtShape_ribbon": "Nastro inclinato in basso", + "PE.Controllers.Main.txtShape_ribbon2": "Nastro inclinato in alto", "PE.Controllers.Main.txtShape_rightArrow": "Freccia destra", + "PE.Controllers.Main.txtShape_rightArrowCallout": "Callout Freccia a destra", + "PE.Controllers.Main.txtShape_rightBrace": "Parentesi graffa chiusa", + "PE.Controllers.Main.txtShape_rightBracket": "Parentesi quadra chiusa", + "PE.Controllers.Main.txtShape_round1Rect": "Rettangolo ad angolo singolo smussato", + "PE.Controllers.Main.txtShape_round2DiagRect": "Rettangolo ad angolo diagonale smussato", + "PE.Controllers.Main.txtShape_round2SameRect": "Rettangolo smussato dallo stesso lato", + "PE.Controllers.Main.txtShape_roundRect": "Rettangolo ad angoli smussati", + "PE.Controllers.Main.txtShape_rtTriangle": "Triangolo rettangolo", "PE.Controllers.Main.txtShape_smileyFace": "Faccia sorridente", + "PE.Controllers.Main.txtShape_snip1Rect": "Ritaglia rettangolo ad angolo singolo", + "PE.Controllers.Main.txtShape_snip2DiagRect": "Ritaglia rettangolo ad angolo diagonale", + "PE.Controllers.Main.txtShape_snip2SameRect": "Ritaglia Rettangolo smussato dallo stesso lato", + "PE.Controllers.Main.txtShape_snipRoundRect": "Ritaglia e smussa singolo angolo rettangolo", "PE.Controllers.Main.txtShape_spline": "Curva", "PE.Controllers.Main.txtShape_star10": "Stella a 10 punte", "PE.Controllers.Main.txtShape_star12": "Stella a 12 punte", @@ -443,14 +501,21 @@ "PE.Controllers.Main.txtShape_star6": "Stella a 6 punte", "PE.Controllers.Main.txtShape_star7": "Stella a 7 punte", "PE.Controllers.Main.txtShape_star8": "Stella a 8 punte", + "PE.Controllers.Main.txtShape_stripedRightArrow": "Freccia a strisce verso destra ", "PE.Controllers.Main.txtShape_sun": "Sole", "PE.Controllers.Main.txtShape_teardrop": "Goccia", "PE.Controllers.Main.txtShape_textRect": "Casella di testo", "PE.Controllers.Main.txtShape_trapezoid": "Trapezio", - "PE.Controllers.Main.txtShape_triangle": "Triangolo", + "PE.Controllers.Main.txtShape_triangle": "Triangolo isoscele", "PE.Controllers.Main.txtShape_upArrow": "Freccia su", + "PE.Controllers.Main.txtShape_upArrowCallout": "Callout Freccia in alto", + "PE.Controllers.Main.txtShape_upDownArrow": "Freccia bidirezionale su giù", + "PE.Controllers.Main.txtShape_uturnArrow": "Freccia a inversione", "PE.Controllers.Main.txtShape_verticalScroll": "Scorrimento verticale", "PE.Controllers.Main.txtShape_wave": "Onda", + "PE.Controllers.Main.txtShape_wedgeEllipseCallout": "Callout Ovale", + "PE.Controllers.Main.txtShape_wedgeRectCallout": "Callout Rettangolare", + "PE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Callout Rettangolare arrotondato", "PE.Controllers.Main.txtSldLtTBlank": "Vuoto", "PE.Controllers.Main.txtSldLtTChart": "Grafico", "PE.Controllers.Main.txtSldLtTChartAndTx": "Grafico e testo", @@ -519,7 +584,7 @@ "PE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
      Si prega di aggiornare la licenza e ricaricare la pagina.", "PE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
      Per ulteriori informazioni, contattare l'amministratore.", "PE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
      Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", - "PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
      Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", + "PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di %1 presenta alcune limitazioni per gli utenti simultanei.
      Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", "PE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Il carattere che vuoi salvare non è accessibile su questo dispositivo.
      Lo stile di testo sarà visualizzato usando uno dei caratteri di sistema, il carattere salvato sarà usato quando accessibile.
      Vuoi continuare?", @@ -879,6 +944,14 @@ "PE.Views.ChartSettingsAdvanced.textAltTip": "La rappresentazione alternativa del testo delle informazioni riguardanti gli oggetti visivi, che verrà letta alle persone con deficit visivi o cognitivi per aiutarli a comprendere meglio quali informazioni sono contenute nell'immagine, nella forma, nel grafico o nella tabella.", "PE.Views.ChartSettingsAdvanced.textAltTitle": "Titolo", "PE.Views.ChartSettingsAdvanced.textTitle": "Grafico - Impostazioni avanzate", + "PE.Views.DateTimeDialog.cancelButtonText": "Annulla", + "PE.Views.DateTimeDialog.confirmDefault": "Imposta formato definitivo per {0}: \"{1}\"", + "PE.Views.DateTimeDialog.okButtonText": "OK", + "PE.Views.DateTimeDialog.textDefault": "Imposta come predefinito", + "PE.Views.DateTimeDialog.textFormat": "Formati", + "PE.Views.DateTimeDialog.textLang": "Lingua", + "PE.Views.DateTimeDialog.textUpdate": "Aggiorna automaticamente", + "PE.Views.DateTimeDialog.txtTitle": "Data e ora", "PE.Views.DocumentHolder.aboveText": "Al di sopra", "PE.Views.DocumentHolder.addCommentText": "Aggiungi commento", "PE.Views.DocumentHolder.advancedImageText": "Impostazioni avanzate dell'immagine", @@ -1085,13 +1158,21 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea una nuova presentazione vuota che potrai formattare durante la modifica. O scegli uno dei modelli per creare una presentazione di un certo tipo a quale sono già applicati certi stili.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuova presentazione", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autore", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Cambia diritti di accesso", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data di creazione", + "PE.Views.FileMenuPanels.DocumentInfo.txtComment": "Commento", + "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Creato", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Ultima modifica di", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Ultima modifica", + "PE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Proprietario", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Percorso", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persone con diritti", + "PE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Oggetto", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titolo presentazione", + "PE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Caricato", "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Cambia diritti di accesso", "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Persone con diritti", "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Avviso", @@ -1109,7 +1190,7 @@ "PE.Views.FileMenuPanels.Settings.strAutoRecover": "Attiva il ripristino automatico", "PE.Views.FileMenuPanels.Settings.strAutosave": "Attiva salvataggio automatico", "PE.Views.FileMenuPanels.Settings.strCoAuthMode": "Modalità di co-editing", - "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once", + "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Gli altri utenti vedranno immediatamente i tuoi cambiamenti", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Dovrai accettare i cambiamenti prima di poterli visualizzare.", "PE.Views.FileMenuPanels.Settings.strFast": "Fast", "PE.Views.FileMenuPanels.Settings.strFontRender": "Suggerimento per i caratteri", @@ -1142,6 +1223,21 @@ "PE.Views.FileMenuPanels.Settings.txtPt": "Punto", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Controllo ortografia", "PE.Views.FileMenuPanels.Settings.txtWin": "come Windows", + "PE.Views.HeaderFooterDialog.applyAllText": "Applica a tutti", + "PE.Views.HeaderFooterDialog.applyText": "Applica", + "PE.Views.HeaderFooterDialog.cancelButtonText": "Annulla", + "PE.Views.HeaderFooterDialog.diffLanguage": "Non è possibile utilizzare un formato data in una lingua diversa da quella della diapositiva.
      Per cambiare il master, fare clic su \"Applica a tutto\" anziché \"Applica\"", + "PE.Views.HeaderFooterDialog.notcriticalErrorTitle": "Avviso", + "PE.Views.HeaderFooterDialog.textDateTime": "Data e ora", + "PE.Views.HeaderFooterDialog.textFixed": "Bloccato", + "PE.Views.HeaderFooterDialog.textFooter": "Testo a piè di pagina", + "PE.Views.HeaderFooterDialog.textFormat": "Formati", + "PE.Views.HeaderFooterDialog.textLang": "Lingua", + "PE.Views.HeaderFooterDialog.textNotTitle": "Non mostrare sul titolo della diapositiva", + "PE.Views.HeaderFooterDialog.textPreview": "Anteprima", + "PE.Views.HeaderFooterDialog.textSlideNum": "Numero Diapositiva", + "PE.Views.HeaderFooterDialog.textTitle": "Impostazioni intestazione / piè di pagina", + "PE.Views.HeaderFooterDialog.textUpdate": "Aggiorna automaticamente", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annulla", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Visualizza", @@ -1357,12 +1453,14 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Alcune delle firme digitali in presentazione non sono valide o non possono essere verificate. La presentazione è protetta dalla modifica.", "PE.Views.SlideSettings.strBackground": "Colore sfondo", "PE.Views.SlideSettings.strColor": "Colore", + "PE.Views.SlideSettings.strDateTime": "Visualizza Data e Ora", "PE.Views.SlideSettings.strDelay": "Ritardo", "PE.Views.SlideSettings.strDuration": "Durata", "PE.Views.SlideSettings.strEffect": "Effetto", "PE.Views.SlideSettings.strFill": "Sfondo", "PE.Views.SlideSettings.strForeground": "Colore primo piano", "PE.Views.SlideSettings.strPattern": "Modello", + "PE.Views.SlideSettings.strSlideNum": "Mostra numero diapositiva", "PE.Views.SlideSettings.strStartOnClick": "Inizia al clic del mouse", "PE.Views.SlideSettings.textAdvanced": "Mostra impostazioni avanzate", "PE.Views.SlideSettings.textApplyAll": "Applica a tutte le diapositive", @@ -1462,9 +1560,7 @@ "PE.Views.Statusbar.tipFitPage": "Adatta alla diapositiva", "PE.Views.Statusbar.tipFitWidth": "Adatta alla larghezza", "PE.Views.Statusbar.tipPreview": "Avvia presentazione", - "PE.Views.Statusbar.tipSetDocLang": "Imposta lingua del documento", "PE.Views.Statusbar.tipSetLang": "Seleziona lingua del testo", - "PE.Views.Statusbar.tipSetSpelling": "Controllo ortografia", "PE.Views.Statusbar.tipZoomFactor": "Ingrandimento", "PE.Views.Statusbar.tipZoomIn": "Zoom avanti", "PE.Views.Statusbar.tipZoomOut": "Zoom indietro", @@ -1574,6 +1670,9 @@ "PE.Views.TextArtSettings.txtWood": "Legno", "PE.Views.Toolbar.capAddSlide": "Aggiungi diapositiva", "PE.Views.Toolbar.capBtnComment": "Commento", + "PE.Views.Toolbar.capBtnDateTime": "Data e ora", + "PE.Views.Toolbar.capBtnInsHeader": "Inntestazioni/Piè di pagina", + "PE.Views.Toolbar.capBtnSlideNum": "Numero Diapositiva", "PE.Views.Toolbar.capInsertChart": "Grafico", "PE.Views.Toolbar.capInsertEquation": "Equazione", "PE.Views.Toolbar.capInsertHyperlink": "Collegamento ipertestuale", @@ -1644,7 +1743,9 @@ "PE.Views.Toolbar.tipColorSchemas": "Cambia combinazione colori", "PE.Views.Toolbar.tipCopy": "Copia", "PE.Views.Toolbar.tipCopyStyle": "Copia stile", + "PE.Views.Toolbar.tipDateTime": "Inserisci data e ora correnti", "PE.Views.Toolbar.tipDecPrLeft": "Riduci rientro", + "PE.Views.Toolbar.tipEditHeader": "Modifica intestazione o piè di pagina", "PE.Views.Toolbar.tipFontColor": "Colore caratteri", "PE.Views.Toolbar.tipFontName": "Tipo di carattere", "PE.Views.Toolbar.tipFontSize": "Dimensione carattere", @@ -1666,9 +1767,10 @@ "PE.Views.Toolbar.tipPrint": "Stampa", "PE.Views.Toolbar.tipRedo": "Ripristina", "PE.Views.Toolbar.tipSave": "Salva", - "PE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.", + "PE.Views.Toolbar.tipSaveCoauth": "Salva i tuoi cambiamenti per renderli disponibili agli altri utenti.", "PE.Views.Toolbar.tipShapeAlign": "Allinea forma", "PE.Views.Toolbar.tipShapeArrange": "Disponi forma", + "PE.Views.Toolbar.tipSlideNum": "Inserisci Numero Diapositiva", "PE.Views.Toolbar.tipSlideSize": "Seleziona dimensione diapositiva", "PE.Views.Toolbar.tipSlideTheme": "Tema diapositiva", "PE.Views.Toolbar.tipUndo": "Annulla", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index f3bfe79de..d537365b3 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": " 警告", "Common.Controllers.Chat.textEnterMessage": "ここでメッセージを挿入してください。", - "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE無料版を使用しています。
      同時に2人のユーザのみは文書を編集することができます。
      もっとが必要ですか。ONLYOFFICEエンタープライズ版の購入を検討してください。
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名", "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる", "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。", @@ -97,12 +96,11 @@ "PE.Controllers.Main.convertationTimeoutText": "変換のタイムアウトを超過しました。", "PE.Controllers.Main.criticalErrorExtText": "OKボタンを押すと文書リストに戻ることができます。", "PE.Controllers.Main.criticalErrorTitle": "エラー", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "ダウンロードに失敗しました", "PE.Controllers.Main.downloadTextText": "プレゼンテーションのダウンロード中...", "PE.Controllers.Main.downloadTitleText": "プレゼンテーションのダウンロード中", "PE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。", - "PE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
      OKボタンをクリックするとドキュメントをダウンロードするように求められます。

      ドキュメントサーバーの接続の詳細情報を見つけます:here", + "PE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
      OKボタンをクリックするとドキュメントをダウンロードするように求められます。

      ドキュメントサーバーの接続の詳細情報を見つけます:ここに", "PE.Controllers.Main.errorDatabaseConnection": "外部エラーです。
      データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。 ", "PE.Controllers.Main.errorDataRange": "データ範囲が正しくありません", "PE.Controllers.Main.errorDefaultMessage": "エラー コード:%1", @@ -331,7 +329,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "テンプレートなし", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作成者", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "アクセス許可の変更", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "作成日", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "場所", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "権利を持っている者", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "プレゼンテーションのタイトル", diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index 3893a8961..714c90f7d 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "경고", "Common.Controllers.Chat.textEnterMessage": "여기에 메시지를 입력하십시오", - "Common.Controllers.Chat.textUserLimit": "ONLYOFFICE 무료 버전을 사용하고 있습니다.
      두 명의 사용자 만이 문서를 동시에 편집 할 수 있습니다.
      ONLYOFFICE Enterprise Edition 구입 고려하십시오.
      자세히보기 ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "익명", "Common.Controllers.ExternalDiagramEditor.textClose": "닫기", "Common.Controllers.ExternalDiagramEditor.warningText": "다른 사용자가 편집 중이므로 개체를 사용할 수 없습니다.", @@ -227,14 +226,13 @@ "PE.Controllers.Main.convertationTimeoutText": "전환 시간 초과를 초과했습니다.", "PE.Controllers.Main.criticalErrorExtText": "문서 목록으로 돌아가려면 \"OK\"를 누르십시오.", "PE.Controllers.Main.criticalErrorTitle": "오류", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE 프레젠테이션 편집기", "PE.Controllers.Main.downloadErrorText": "다운로드하지 못했습니다.", "PE.Controllers.Main.downloadTextText": "프리젠 테이션 다운로드 중 ...", "PE.Controllers.Main.downloadTitleText": "프레젠테이션 다운로드", "PE.Controllers.Main.errorAccessDeny": "권한이없는 작업을 수행하려고합니다.
      Document Server 관리자에게 문의하십시오.", "PE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.", "PE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 지금 문서를 편집 할 수 없습니다.", - "PE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", + "PE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", "PE.Controllers.Main.errorDatabaseConnection": "외부 오류입니다.
      데이터베이스 연결 오류입니다. 오류가 계속 발생하면 지원 담당자에게 문의하십시오.", "PE.Controllers.Main.errorDataRange": "잘못된 데이터 범위입니다.", "PE.Controllers.Main.errorDefaultMessage": "오류 코드 : % 1", @@ -938,7 +936,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "템플릿이 없습니다", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "작성자", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "액세스 권한 변경", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "생성 날짜", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "위치", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "권한이있는 사람", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "프레젠테이션 제목", @@ -1278,9 +1275,7 @@ "PE.Views.Statusbar.tipFitPage": "슬라이드에 맞추기", "PE.Views.Statusbar.tipFitWidth": "너비에 맞춤", "PE.Views.Statusbar.tipPreview": "슬라이드 쇼 시작", - "PE.Views.Statusbar.tipSetDocLang": "문서 언어 설정", "PE.Views.Statusbar.tipSetLang": "텍스트 언어 설정", - "PE.Views.Statusbar.tipSetSpelling": "맞춤법 검사", "PE.Views.Statusbar.tipZoomFactor": "확대 / 축소", "PE.Views.Statusbar.tipZoomIn": "확대", "PE.Views.Statusbar.tipZoomOut": "축소", diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index 7e1eb99bd..607ba69c5 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Enter your message here", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalDiagramEditor.textClose": "Close", "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.", @@ -224,14 +223,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "PE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "PE.Controllers.Main.criticalErrorTitle": "Error", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Download failed.", "PE.Controllers.Main.downloadTextText": "Downloading presentation...", "PE.Controllers.Main.downloadTitleText": "Downloading Presentation", "PE.Controllers.Main.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.
      Lūdzu, sazinieties ar savu dokumentu servera administratoru.", "PE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", - "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "PE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk par dokumentu servera pieslēgšanu šeit", "PE.Controllers.Main.errorDatabaseConnection": "External error.
      Database connection error. Please contact support in case the error persists.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1", @@ -935,7 +933,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Creation Date", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persons who have rights", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Presentation Title", @@ -1275,9 +1272,7 @@ "PE.Views.Statusbar.tipFitPage": "Fit Slide", "PE.Views.Statusbar.tipFitWidth": "Fit Width", "PE.Views.Statusbar.tipPreview": "Start Preview", - "PE.Views.Statusbar.tipSetDocLang": "Uzstādīt dokumenta valodu", "PE.Views.Statusbar.tipSetLang": "Uzstādīt teksta valodu", - "PE.Views.Statusbar.tipSetSpelling": "Pareizrakstības pārbaude", "PE.Views.Statusbar.tipZoomFactor": "Palielināšana", "PE.Views.Statusbar.tipZoomIn": "Zoom In", "PE.Views.Statusbar.tipZoomOut": "Zoom Out", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index 837ddccc5..6010cc2a3 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Waarschuwing", "Common.Controllers.Chat.textEnterMessage": "Voer hier uw bericht in", - "Common.Controllers.Chat.textUserLimit": "U gebruikt ONLYOFFICE Free Edition.
      Er kunnen maar twee gebruikers tegelijk het document bewerken.
      U wilt meer? Overweeg ONLYOFFICE Enterprise Edition aan te schaffen.
      Meer informatie", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anoniem", "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten", "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.", @@ -227,14 +226,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.", "PE.Controllers.Main.criticalErrorExtText": "Klik op \"OK\" om terug te keren naar de lijst met documenten.", "PE.Controllers.Main.criticalErrorTitle": "Fout", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Download mislukt.", "PE.Controllers.Main.downloadTextText": "Presentatie wordt gedownload...", "PE.Controllers.Main.downloadTitleText": "Presentatie wordt gedownload", "PE.Controllers.Main.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.
      Neem contact op met de beheerder van de documentserver.", "PE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.", - "PE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd om het document te downloaden.

      Meer informatie over de verbinding met een documentserver is hier te vinden.", + "PE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.

      Meer informatie over verbindingen met de documentserver is hier te vinden.", "PE.Controllers.Main.errorDatabaseConnection": "Externe fout.
      Fout in databaseverbinding. Neem contact op met Support als deze fout zich blijft voordoen.", "PE.Controllers.Main.errorDataRange": "Onjuist gegevensbereik.", "PE.Controllers.Main.errorDefaultMessage": "Foutcode: %1", @@ -944,7 +942,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Er zijn geen sjablonen", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Auteur", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Toegangsrechten wijzigen", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum gemaakt", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Locatie", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personen met rechten", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Presentatietitel", @@ -1284,9 +1281,7 @@ "PE.Views.Statusbar.tipFitPage": "Aanpassen aan dia", "PE.Views.Statusbar.tipFitWidth": "Aan breedte aanpassen", "PE.Views.Statusbar.tipPreview": "Diavoorstelling starten", - "PE.Views.Statusbar.tipSetDocLang": "Taal van document instellen", "PE.Views.Statusbar.tipSetLang": "Taal van tekst instellen", - "PE.Views.Statusbar.tipSetSpelling": "Spellingcontrole", "PE.Views.Statusbar.tipZoomFactor": "Zoomen", "PE.Views.Statusbar.tipZoomIn": "Inzoomen", "PE.Views.Statusbar.tipZoomOut": "Uitzoomen", diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index 778bd6287..854f71361 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie", "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj", - "Common.Controllers.Chat.textUserLimit": "Używasz ONLYOFFICE Free Edition.
      Tylko dwóch użytkowników może jednocześnie edytować dokument. Chcesz więcej? Zastanów się nad zakupem ONLYOFFICE Enterprise Edition. Czytaj więcej ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimowy użytkownik ", "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknąć", "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.", @@ -133,14 +132,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.", "PE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\", aby powrócić do listy dokumentów.", "PE.Controllers.Main.criticalErrorTitle": "Błąd", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor prezentacji", "PE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.", "PE.Controllers.Main.downloadTextText": "Pobieranie prezentacji...", "PE.Controllers.Main.downloadTitleText": "Pobieranie prezentacji", "PE.Controllers.Main.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.
      Proszę skontaktować się z administratorem serwera dokumentów.", "PE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.", - "PE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", + "PE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", "PE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.
      Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", "PE.Controllers.Main.errorDataRange": "Błędny zakres danych.", "PE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1", @@ -824,7 +822,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tam nie ma żadnych szablonów", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data utworzenia", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokalizacja", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osoby, które mają prawa", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Tytuł prezentacji", @@ -1141,9 +1138,7 @@ "PE.Views.Statusbar.tipFitPage": "Dopasuj do slajdu", "PE.Views.Statusbar.tipFitWidth": "Dopasuj do szerokości", "PE.Views.Statusbar.tipPreview": "Rozpocznij pokaz slajdów", - "PE.Views.Statusbar.tipSetDocLang": "Ustaw język dokumentu", "PE.Views.Statusbar.tipSetLang": "Ustaw język tekstu", - "PE.Views.Statusbar.tipSetSpelling": "Sprawdzanie pisowni", "PE.Views.Statusbar.tipZoomFactor": "Powiększenie", "PE.Views.Statusbar.tipZoomIn": "Powiększ", "PE.Views.Statusbar.tipZoomOut": "Pomniejsz", @@ -1256,8 +1251,8 @@ "PE.Views.Toolbar.capInsertTable": "Tabela", "PE.Views.Toolbar.capInsertText": "Pole tekstowe", "PE.Views.Toolbar.capTabFile": "Plik", - "PE.Views.Toolbar.capTabHome": "Strona główna", - "PE.Views.Toolbar.capTabInsert": "Wstawić", + "PE.Views.Toolbar.capTabHome": "Narzędzia główne", + "PE.Views.Toolbar.capTabInsert": "Wstawianie", "PE.Views.Toolbar.mniCustomTable": "Wstaw tabelę niestandardową", "PE.Views.Toolbar.mniImageFromFile": "Obraz z pliku", "PE.Views.Toolbar.mniImageFromUrl": "Obraz z URL", @@ -1302,9 +1297,10 @@ "PE.Views.Toolbar.textSubscript": "Indeks dolny", "PE.Views.Toolbar.textSuperscript": "Indeks górny", "PE.Views.Toolbar.textSurface": "Powierzchnia", + "PE.Views.Toolbar.textTabCollaboration": "Współpraca", "PE.Views.Toolbar.textTabFile": "Plik", - "PE.Views.Toolbar.textTabHome": "Start", - "PE.Views.Toolbar.textTabInsert": "Wstawić", + "PE.Views.Toolbar.textTabHome": "Narzędzia główne", + "PE.Views.Toolbar.textTabInsert": "Wstawianie", "PE.Views.Toolbar.textTitleError": "Błąd", "PE.Views.Toolbar.textUnderline": "Podkreśl", "PE.Views.Toolbar.tipAddSlide": "Dodaj slajd", @@ -1315,6 +1311,7 @@ "PE.Views.Toolbar.tipColorSchemas": "Zmień schemat kolorów", "PE.Views.Toolbar.tipCopy": "Kopiuj", "PE.Views.Toolbar.tipCopyStyle": "Kopiuj styl", + "PE.Views.Toolbar.tipDateTime": "Wstaw aktualną datę i godzinę", "PE.Views.Toolbar.tipDecPrLeft": "Zmniejsz wcięcie", "PE.Views.Toolbar.tipFontColor": "Kolor czcionki", "PE.Views.Toolbar.tipFontName": "Czcionka", @@ -1340,6 +1337,7 @@ "PE.Views.Toolbar.tipSaveCoauth": "Zapisz swoje zmiany, aby inni użytkownicy mogli je zobaczyć.", "PE.Views.Toolbar.tipShapeAlign": "Wyrównaj kształt", "PE.Views.Toolbar.tipShapeArrange": "Uformuj kształt", + "PE.Views.Toolbar.tipSlideNum": "Wstaw numer slajdu", "PE.Views.Toolbar.tipSlideSize": "Wybierz rozmiar slajdu", "PE.Views.Toolbar.tipSlideTheme": "Motyw slajdu", "PE.Views.Toolbar.tipUndo": "Anulować", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index 9485398bd..10c0d461c 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Inserir sua mensagem aqui", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anônimo", "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar", "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.", @@ -132,14 +131,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.", "PE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documentos.", "PE.Controllers.Main.criticalErrorTitle": "Erro", - "PE.Controllers.Main.defaultTitleText": "Editor de apresentação ONLYOFFICE", "PE.Controllers.Main.downloadErrorText": "Download falhou.", "PE.Controllers.Main.downloadTextText": "Baixando apresentação...", "PE.Controllers.Main.downloadTitleText": "Baixando apresentação", "PE.Controllers.Main.errorAccessDeny": "Você está tentando executar uma ação para a qual não tem direitos.
      Entre em contato com o administrador do Document Server.", "PE.Controllers.Main.errorBadImageUrl": "URL da imagem está incorreta", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.", - "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "PE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.
      Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.

      Encontre mais informações sobre como conecta ao Document Server aqui", "PE.Controllers.Main.errorDatabaseConnection": "Erro externo.
      Erro de conexão ao banco de dados. Entre em contato com o suporte caso o erro persista.", "PE.Controllers.Main.errorDataRange": "Intervalo de dados incorreto.", "PE.Controllers.Main.errorDefaultMessage": "Código do erro: %1", @@ -823,7 +821,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Não há modelos", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Alterar direitos de acesso", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Data de criação", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Localização", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Pessoas que têm direitos", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Título de apresentação", @@ -1140,9 +1137,7 @@ "PE.Views.Statusbar.tipFitPage": "Ajustar slide", "PE.Views.Statusbar.tipFitWidth": "Ajustar largura", "PE.Views.Statusbar.tipPreview": "Start Preview", - "PE.Views.Statusbar.tipSetDocLang": "Definir idioma do documento", "PE.Views.Statusbar.tipSetLang": "Definir idioma do texto", - "PE.Views.Statusbar.tipSetSpelling": "Verificação ortográfica", "PE.Views.Statusbar.tipZoomFactor": "Zoom", "PE.Views.Statusbar.tipZoomIn": "Ampliar", "PE.Views.Statusbar.tipZoomOut": "Reduzir", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index a0c0e1b76..b5e8dbd47 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", - "Common.Controllers.Chat.textUserLimit": "Вы используете бесплатную версию ONLYOFFICE.
      Только два пользователя одновременно могут совместно редактировать документ.
      Требуется больше? Рекомендуем приобрести корпоративную версию ONLYOFFICE.
      Читать дальше", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Аноним", "Common.Controllers.ExternalDiagramEditor.textClose": "Закрыть", "Common.Controllers.ExternalDiagramEditor.warningText": "Объект недоступен, так как редактируется другим пользователем.", @@ -199,6 +198,7 @@ "Common.Views.ReviewPopover.textCancel": "Отмена", "Common.Views.ReviewPopover.textClose": "Закрыть", "Common.Views.ReviewPopover.textEdit": "OK", + "Common.Views.ReviewPopover.textMention": "+упоминание предоставит доступ к документу и отправит оповещение по почте", "Common.Views.ReviewPopover.textOpenAgain": "Открыть снова", "Common.Views.ReviewPopover.textReply": "Ответить", "Common.Views.ReviewPopover.textResolve": "Решить", @@ -245,14 +245,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "PE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.", "PE.Controllers.Main.criticalErrorTitle": "Ошибка", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Загрузка не удалась.", "PE.Controllers.Main.downloadTextText": "Загрузка презентации...", "PE.Controllers.Main.downloadTitleText": "Загрузка презентации", "PE.Controllers.Main.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
      Пожалуйста, обратитесь к администратору Сервера документов.", "PE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", - "PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", + "PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", "PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
      Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "PE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", @@ -315,7 +314,7 @@ "PE.Controllers.Main.textContactUs": "Связаться с отделом продаж", "PE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
      Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", "PE.Controllers.Main.textLoadingDocument": "Загрузка презентации", - "PE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", + "PE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1", "PE.Controllers.Main.textPaidFeature": "Платная функция", "PE.Controllers.Main.textShape": "Фигура", "PE.Controllers.Main.textStrict": "Строгий режим", @@ -584,8 +583,8 @@ "PE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
      Обратитесь к администратору за дополнительной информацией.", "PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
      Обновите лицензию, а затем обновите страницу.", "PE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
      Обратитесь к администратору за дополнительной информацией.", - "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", - "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "PE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.
      Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.
      Вы хотите продолжить?", @@ -945,6 +944,14 @@ "PE.Views.ChartSettingsAdvanced.textAltTip": "Альтернативное текстовое представление информации о визуальном объекте, которое будет зачитываться для людей с нарушениями зрения или когнитивными нарушениями, чтобы помочь им лучше понять, какую информацию содержит изображение, автофигура, диаграмма или таблица.", "PE.Views.ChartSettingsAdvanced.textAltTitle": "Заголовок", "PE.Views.ChartSettingsAdvanced.textTitle": "Диаграмма - дополнительные параметры", + "PE.Views.DateTimeDialog.cancelButtonText": "Отмена", + "PE.Views.DateTimeDialog.confirmDefault": "Задать формат по умолчанию для {0}: \"{1}\"", + "PE.Views.DateTimeDialog.okButtonText": "Ок", + "PE.Views.DateTimeDialog.textDefault": "Установить по умолчанию", + "PE.Views.DateTimeDialog.textFormat": "Форматы", + "PE.Views.DateTimeDialog.textLang": "Язык", + "PE.Views.DateTimeDialog.textUpdate": "Обновлять автоматически", + "PE.Views.DateTimeDialog.txtTitle": "Дата и время", "PE.Views.DocumentHolder.aboveText": "Выше", "PE.Views.DocumentHolder.addCommentText": "Добавить комментарий", "PE.Views.DocumentHolder.advancedImageText": "Дополнительные параметры изображения", @@ -970,6 +977,7 @@ "PE.Views.DocumentHolder.hyperlinkText": "Гиперссылка", "PE.Views.DocumentHolder.ignoreAllSpellText": "Пропустить все", "PE.Views.DocumentHolder.ignoreSpellText": "Пропустить", + "PE.Views.DocumentHolder.toDictionaryText": "Добавить в словарь", "PE.Views.DocumentHolder.insertColumnLeftText": "Столбец слева", "PE.Views.DocumentHolder.insertColumnRightText": "Столбец справа", "PE.Views.DocumentHolder.insertColumnText": "Вставить столбец", @@ -1115,6 +1123,7 @@ "PE.Views.DocumentHolder.txtUnderbar": "Черта под текстом", "PE.Views.DocumentHolder.txtUngroup": "Разгруппировать", "PE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание", + "PE.Views.DocumentHolder.txtPrintSelection": "Напечатать выделенное", "PE.Views.DocumentPreview.goToSlideText": "Перейти к слайду", "PE.Views.DocumentPreview.slideIndexText": "Слайд {0} из {1}", "PE.Views.DocumentPreview.txtClose": "Завершить показ слайдов", @@ -1151,13 +1160,21 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новую пустую презентацию, к которой Вы сможете применить стили и отформатировать при редактировании после того, как она будет создана. Или выберите один из шаблонов, чтобы создать презентацию определенного типа или предназначения, где уже предварительно применены некоторые стили.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новая презентация", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Изменить права доступа", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата создания", + "PE.Views.FileMenuPanels.DocumentInfo.txtComment": "Комментарий", + "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Создана", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Автор последнего изменения", + "PE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Последнее изменение", + "PE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Владелец", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Размещение", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Люди, имеющие права", - "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название презентации", + "PE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Тема", + "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Название", + "PE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Загружена", "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Изменить права доступа", "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Люди, имеющие права", "PE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Внимание", @@ -1208,6 +1225,21 @@ "PE.Views.FileMenuPanels.Settings.txtPt": "Пункт", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии", "PE.Views.FileMenuPanels.Settings.txtWin": "как Windows", + "PE.Views.HeaderFooterDialog.applyAllText": "Применить ко всем", + "PE.Views.HeaderFooterDialog.applyText": "Применить", + "PE.Views.HeaderFooterDialog.cancelButtonText": "Отмена", + "PE.Views.HeaderFooterDialog.diffLanguage": "Формат даты должен использовать тот же язык, что и образец слайдов.
      Чтобы изменить образец, вместо кнопки 'Применить' нажмите кнопку 'Применить ко всем'", + "PE.Views.HeaderFooterDialog.notcriticalErrorTitle": "Внимание", + "PE.Views.HeaderFooterDialog.textDateTime": "Дата и время", + "PE.Views.HeaderFooterDialog.textFooter": "Текст в нижнем колонтитуле", + "PE.Views.HeaderFooterDialog.textFormat": "Форматы", + "PE.Views.HeaderFooterDialog.textLang": "Язык", + "PE.Views.HeaderFooterDialog.textNotTitle": "Не показывать на титульном слайде", + "PE.Views.HeaderFooterDialog.textPreview": "Просмотр", + "PE.Views.HeaderFooterDialog.textSlideNum": "Номер слайда", + "PE.Views.HeaderFooterDialog.textTitle": "Параметры верхнего и нижнего колонтитулов", + "PE.Views.HeaderFooterDialog.textUpdate": "Обновлять автоматически", + "PE.Views.HeaderFooterDialog.textFixed": "Фиксировано", "PE.Views.HyperlinkSettingsDialog.cancelButtonText": "Отмена", "PE.Views.HyperlinkSettingsDialog.okButtonText": "OK", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Отображать", @@ -1296,7 +1328,7 @@ "PE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Слева", "PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Справа", "PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Шрифт", - "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и положение", + "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Отступы и интервалы", "PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Малые прописные", "PE.Views.ParagraphSettingsAdvanced.strStrike": "Зачёркивание", "PE.Views.ParagraphSettingsAdvanced.strSubscript": "Подстрочные", @@ -1314,6 +1346,19 @@ "PE.Views.ParagraphSettingsAdvanced.textTabPosition": "Позиция", "PE.Views.ParagraphSettingsAdvanced.textTabRight": "По правому краю", "PE.Views.ParagraphSettingsAdvanced.textTitle": "Абзац - дополнительные параметры", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Перед", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "После", + "PE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал", + "PE.Views.ParagraphSettingsAdvanced.textAuto": "Множитель", + "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Авто", + "PE.Views.ParagraphSettingsAdvanced.textExact": "Точно", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Первая строка", + "PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(нет)", + "PE.Views.ParagraphSettingsAdvanced.textFirstLine": "Отступ", + "PE.Views.ParagraphSettingsAdvanced.textHanging": "Выступ", + "PE.Views.ParagraphSettingsAdvanced.textJustified": "По ширине", + "PE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы", + "PE.Views.ParagraphSettingsAdvanced.strSpacing": "Интервал между абзацами", "PE.Views.RightMenu.txtChartSettings": "Параметры диаграммы", "PE.Views.RightMenu.txtImageSettings": "Параметры изображения", "PE.Views.RightMenu.txtParagraphSettings": "Параметры текста", @@ -1371,6 +1416,7 @@ "PE.Views.ShapeSettings.txtNoBorders": "Без обводки", "PE.Views.ShapeSettings.txtPapyrus": "Папирус", "PE.Views.ShapeSettings.txtWood": "Дерево", + "PE.Views.ShapeSettings.strShadow": "Отображать тень", "PE.Views.ShapeSettingsAdvanced.cancelButtonText": "Отмена", "PE.Views.ShapeSettingsAdvanced.okButtonText": "OK", "PE.Views.ShapeSettingsAdvanced.strColumns": "Колонки", @@ -1423,12 +1469,14 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в презентации недействительны или их нельзя проверить. Презентация защищена от редактирования.", "PE.Views.SlideSettings.strBackground": "Цвет фона", "PE.Views.SlideSettings.strColor": "Цвет", + "PE.Views.SlideSettings.strDateTime": "Показывать дату и время", "PE.Views.SlideSettings.strDelay": "Задержка", "PE.Views.SlideSettings.strDuration": "Длит.", "PE.Views.SlideSettings.strEffect": "Эффект", "PE.Views.SlideSettings.strFill": "Фон", "PE.Views.SlideSettings.strForeground": "Цвет переднего плана", "PE.Views.SlideSettings.strPattern": "Узор", + "PE.Views.SlideSettings.strSlideNum": "Показывать номер слайда", "PE.Views.SlideSettings.strStartOnClick": "Запускать щелчком", "PE.Views.SlideSettings.textAdvanced": "Дополнительные параметры", "PE.Views.SlideSettings.textApplyAll": "Применить ко всем слайдам", @@ -1528,9 +1576,7 @@ "PE.Views.Statusbar.tipFitPage": "По размеру слайда", "PE.Views.Statusbar.tipFitWidth": "По ширине", "PE.Views.Statusbar.tipPreview": "Начать показ слайдов", - "PE.Views.Statusbar.tipSetDocLang": "Задать язык документа", "PE.Views.Statusbar.tipSetLang": "Выбрать язык текста", - "PE.Views.Statusbar.tipSetSpelling": "Проверка орфографии", "PE.Views.Statusbar.tipZoomFactor": "Масштаб", "PE.Views.Statusbar.tipZoomIn": "Увеличить", "PE.Views.Statusbar.tipZoomOut": "Уменьшить", @@ -1641,7 +1687,7 @@ "PE.Views.Toolbar.capAddSlide": "Добавить слайд", "PE.Views.Toolbar.capBtnComment": "Комментарий", "PE.Views.Toolbar.capInsertChart": "Диаграмма", - "PE.Views.Toolbar.capInsertEquation": "Формула", + "PE.Views.Toolbar.capInsertEquation": "Уравнение", "PE.Views.Toolbar.capInsertHyperlink": "Гиперссылка", "PE.Views.Toolbar.capInsertImage": "Изображение", "PE.Views.Toolbar.capInsertShape": "Фигура", @@ -1717,7 +1763,7 @@ "PE.Views.Toolbar.tipHAligh": "Горизонтальное выравнивание", "PE.Views.Toolbar.tipIncPrLeft": "Увеличить отступ", "PE.Views.Toolbar.tipInsertChart": "Вставить диаграмму", - "PE.Views.Toolbar.tipInsertEquation": "Вставить формулу", + "PE.Views.Toolbar.tipInsertEquation": "Вставить уравнение", "PE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку", "PE.Views.Toolbar.tipInsertImage": "Вставить изображение", "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", @@ -1766,5 +1812,11 @@ "PE.Views.Toolbar.txtScheme8": "Поток", "PE.Views.Toolbar.txtScheme9": "Литейная", "PE.Views.Toolbar.txtSlideAlign": "Выровнять относительно слайда", - "PE.Views.Toolbar.txtUngroup": "Разгруппировать" + "PE.Views.Toolbar.txtUngroup": "Разгруппировать", + "PE.Views.Toolbar.tipEditHeader": "Изменить колонтитулы", + "PE.Views.Toolbar.tipSlideNum": "Вставить номер слайда", + "PE.Views.Toolbar.tipDateTime": "Вставить текущую дату и время", + "PE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", + "PE.Views.Toolbar.capBtnSlideNum": "Номер слайда", + "PE.Views.Toolbar.capBtnDateTime": "Дата и время" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index c667cdf2a..bd6269815 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Upozornenie", "Common.Controllers.Chat.textEnterMessage": "Zadať svoju správu tu", - "Common.Controllers.Chat.textUserLimit": "Používate ONLYOFFICE vydanie zadarmo.
      Iba dvaja používatelia dokážu spolueditovať dokument súčasne.
      Chcete viac? Zvážte kúpu ONLYOFFICE Podnikové vydanie.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonymný", "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.", @@ -190,14 +189,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.", "PE.Controllers.Main.criticalErrorExtText": "Stlačte \"OK\" pre návrat do zoznamu dokumentov.", "PE.Controllers.Main.criticalErrorTitle": "Chyba", - "PE.Controllers.Main.defaultTitleText": "Editor ONLYOFFICE Prezentácia", "PE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.", "PE.Controllers.Main.downloadTextText": "Sťahovanie prezentácie...", "PE.Controllers.Main.downloadTitleText": "Sťahovanie prezentácie", "PE.Controllers.Main.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.
      Prosím, kontaktujte svojho správcu dokumentového servera. ", "PE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.", - "PE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", + "PE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", "PE.Controllers.Main.errorDatabaseConnection": "Externá chyba.
      Chyba spojenia databázy. Prosím, kontaktujte podporu ak chyba pretrváva. ", "PE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.", "PE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1", @@ -893,7 +891,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Neexistujú žiadne šablóny", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmeniť prístupové práva", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Dátum vytvorenia", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Umiestnenie", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osoby s oprávneniami", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Názov prezentácie", @@ -1217,9 +1214,7 @@ "PE.Views.Statusbar.tipFitPage": "Prispôsobiť snímke", "PE.Views.Statusbar.tipFitWidth": "Prispôsobiť na šírku", "PE.Views.Statusbar.tipPreview": "Spustiť prezentáciu", - "PE.Views.Statusbar.tipSetDocLang": "Nastaviť jazyk dokumentov", "PE.Views.Statusbar.tipSetLang": "Nastaviť jazyk textu", - "PE.Views.Statusbar.tipSetSpelling": "Kontrola pravopisu", "PE.Views.Statusbar.tipZoomFactor": "Priblíženie", "PE.Views.Statusbar.tipZoomIn": "Priblížiť", "PE.Views.Statusbar.tipZoomOut": "Oddialiť", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index a8e57af30..c791b40d0 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Opozorilo", "Common.Controllers.Chat.textEnterMessage": "Svoje sporočilo vnesite tu", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonimno", "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.", @@ -94,7 +93,6 @@ "PE.Controllers.Main.convertationTimeoutText": "Pretvorbena prekinitev presežena.", "PE.Controllers.Main.criticalErrorExtText": "Pritisnite \"OK\" za vrnitev na seznam dokumentov.", "PE.Controllers.Main.criticalErrorTitle": "Napaka", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Urejevalnik predstavitev", "PE.Controllers.Main.downloadErrorText": "Prenos ni uspel.", "PE.Controllers.Main.downloadTextText": "Prenašanje predstavitve...", "PE.Controllers.Main.downloadTitleText": "Prenašanje predstavitve", @@ -327,7 +325,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ni predlog", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Avtor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Spremeni pravice dostopa", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Datum nastanka", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokacija", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osebe, ki imajo pravice", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Naslov predstavitve", diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index a49a113bc..6a668d1c4 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Dikkat", "Common.Controllers.Chat.textEnterMessage": "Mesajınızı buraya giriniz", - "Common.Controllers.Chat.textUserLimit": "You are using ONLYOFFICE Free Edition.
      Only two users can co-edit the document simultaneously.
      Want more? Consider buying ONLYOFFICE Enterprise Edition.
      Read more", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Anonim", "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat", "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.", @@ -109,6 +108,7 @@ "Common.Views.LanguageDialog.btnOk": "Tamam", "Common.Views.LanguageDialog.labelSelect": "Belge dilini seçin", "Common.Views.OpenDialog.cancelButtonText": "İptal", + "Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat", "Common.Views.OpenDialog.okButtonText": "TAMAM", "Common.Views.OpenDialog.txtEncoding": "Kodlama", "Common.Views.OpenDialog.txtIncorrectPwd": "Şifre hatalı.", @@ -125,6 +125,19 @@ "Common.Views.RenameDialog.okButtonText": "Tamam", "Common.Views.RenameDialog.textName": "Dosya adı", "Common.Views.RenameDialog.txtInvalidName": "Dosya adı aşağıdaki karakterlerden herhangi birini içeremez:", + "Common.Views.ReviewChanges.strFast": "Hızlı", + "Common.Views.ReviewChanges.tipAcceptCurrent": "Mevcut değişiklikleri kabul et", + "Common.Views.ReviewChanges.txtAccept": "Onayla", + "Common.Views.ReviewChanges.txtAcceptAll": "Tüm Değişiklikleri Kabul Et", + "Common.Views.ReviewChanges.txtAcceptChanges": "Değişiklikleri Kabul Et", + "Common.Views.ReviewChanges.txtAcceptCurrent": "Mevcut Değişiklikleri Kabul Et", + "Common.Views.ReviewChanges.txtChat": "Sohbet", + "Common.Views.ReviewChanges.txtClose": "Kapat", + "Common.Views.ReviewPopover.textAdd": "Ekle", + "Common.Views.ReviewPopover.textClose": "Kapat", + "Common.Views.SignDialog.textBold": "Kalın", + "Common.Views.SignDialog.textChange": "Değiştir", + "Common.Views.SignSettingsDialog.textInfoEmail": "E-posta", "PE.Controllers.LeftMenu.newDocumentTitle": "İsim verilmemiş sunum", "PE.Controllers.LeftMenu.requestEditRightsText": "Düzenleme hakları isteniyor...", "PE.Controllers.LeftMenu.textNoTextFound": "Aradığınız veri bulunamadı. Lütfen arama seçeneklerinizi ayarlayınız.", @@ -133,14 +146,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Değişim süresi aşıldı.", "PE.Controllers.Main.criticalErrorExtText": "Döküman listesine dönmek için \"TAMAM\"'a tıklayın", "PE.Controllers.Main.criticalErrorTitle": "Hata", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Sunum Editörü", "PE.Controllers.Main.downloadErrorText": "Yükleme başarısız oldu.", "PE.Controllers.Main.downloadTextText": "Sunum yükleniyor...", "PE.Controllers.Main.downloadTitleText": "Sunum Yükleniyor", "PE.Controllers.Main.errorAccessDeny": "Hakkınız olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.
      Lütfen Belge Sunucu yöneticinize başvurun.", "PE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Döküman şu an düzenlenemez.", - "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
      When you click the 'OK' button, you will be prompted to download the document.

      Find more information about connecting Document Server here", + "PE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.

      Belge Sunucusuna bağlanma konusunda daha fazla bilgi için buraya tıklayın", "PE.Controllers.Main.errorDatabaseConnection": "Harci hata.
      Veri tabanı bağlantı hatası. Hata devam ederse lütfen destek ile iletişime geçin.", "PE.Controllers.Main.errorDataRange": "Yanlış veri aralığı.", "PE.Controllers.Main.errorDefaultMessage": "Hata kodu: %1", @@ -192,6 +204,7 @@ "PE.Controllers.Main.textAnonymous": "Anonim", "PE.Controllers.Main.textBuyNow": "Websitesini ziyaret edin", "PE.Controllers.Main.textChangesSaved": "Tüm değişiklikler kaydedildi", + "PE.Controllers.Main.textClose": "Kapat", "PE.Controllers.Main.textCloseTip": "Ucu kapamak için tıklayın", "PE.Controllers.Main.textContactUs": "Satış departmanı ile iletişime geçin", "PE.Controllers.Main.textLoadingDocument": "Sunum yükleniyor", @@ -223,6 +236,18 @@ "PE.Controllers.Main.txtPicture": "Resim", "PE.Controllers.Main.txtRectangles": "Dikdörtgenler", "PE.Controllers.Main.txtSeries": "Seriler", + "PE.Controllers.Main.txtShape_cloud": "Bulut", + "PE.Controllers.Main.txtShape_noSmoking": "Simge \"Yok\"", + "PE.Controllers.Main.txtShape_star10": "10-Numara Yıldız", + "PE.Controllers.Main.txtShape_star12": "12-Numara Yıldız", + "PE.Controllers.Main.txtShape_star16": "16-Numara Yıldız", + "PE.Controllers.Main.txtShape_star24": "24-Numara Yıldız", + "PE.Controllers.Main.txtShape_star32": "32-Numara Yıldız", + "PE.Controllers.Main.txtShape_star4": "4-Numara Yıldız", + "PE.Controllers.Main.txtShape_star5": "5-Numara Yıldız", + "PE.Controllers.Main.txtShape_star6": "6-Numara Yıldız", + "PE.Controllers.Main.txtShape_star7": "7-Numara Yıldız", + "PE.Controllers.Main.txtShape_star8": "8-Numara Yıldız", "PE.Controllers.Main.txtSldLtTBlank": "Boş", "PE.Controllers.Main.txtSldLtTChart": "Grafik", "PE.Controllers.Main.txtSldLtTChartAndTx": "Grafik ve Metin", @@ -686,6 +711,7 @@ "PE.Views.DocumentHolder.textArrangeForward": "İleri Taşı", "PE.Views.DocumentHolder.textArrangeFront": "Önplana Getir", "PE.Views.DocumentHolder.textCopy": "Kopyala", + "PE.Views.DocumentHolder.textCropFill": "Doldur", "PE.Views.DocumentHolder.textCut": "Kes", "PE.Views.DocumentHolder.textNextPage": "Sonraki slayt", "PE.Views.DocumentHolder.textPaste": "Yapıştır", @@ -821,9 +847,11 @@ "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş bir sunum oluşturun. Yada şablonlardan birini seçerek belli tipte yada amaç için sunum başlatın.", "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Sunum", "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok", + "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle", + "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Uygulama", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Erişim haklarını değiştir", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Oluşturulma tarihi", + "PE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Oluşturuldu", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasyon", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Hakkı olan kişiler", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Sunum Başlığı", @@ -884,6 +912,7 @@ "PE.Views.HyperlinkSettingsDialog.txtPrev": "Önceki slayt", "PE.Views.HyperlinkSettingsDialog.txtSlide": "Slayt", "PE.Views.ImageSettings.textAdvanced": "Gelişmiş ayarları göster", + "PE.Views.ImageSettings.textCropFill": "Doldur", "PE.Views.ImageSettings.textEdit": "Düzenle", "PE.Views.ImageSettings.textEditObject": "Obje Düzenle", "PE.Views.ImageSettings.textFromFile": "Dosyadan", @@ -1140,9 +1169,7 @@ "PE.Views.Statusbar.tipFitPage": "Slaytı sığdır", "PE.Views.Statusbar.tipFitWidth": "Genişliğe Sığdır", "PE.Views.Statusbar.tipPreview": "Start Preview", - "PE.Views.Statusbar.tipSetDocLang": "Belge dilini belirle", "PE.Views.Statusbar.tipSetLang": "Metin Dili Belirle", - "PE.Views.Statusbar.tipSetSpelling": "Yazım denetimi", "PE.Views.Statusbar.tipZoomFactor": "Büyüt", "PE.Views.Statusbar.tipZoomIn": "Yakınlaştır", "PE.Views.Statusbar.tipZoomOut": "Uzaklaştır", diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index 947ca1671..3da7468cf 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Застереження", "Common.Controllers.Chat.textEnterMessage": "ВВедіть своє повідомлення тут", - "Common.Controllers.Chat.textUserLimit": "Ви використовуюєте ONLYOFFICE Free Edition.
      Тільки два користувачі можуть одночасно редагувати документ одночасно.
      Хочете більше? Подумайте про придбання версії ONLYOFFICE Enterprise Edition.
      Докладніше ", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Aнонім", "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити", "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.", @@ -132,14 +131,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.", "PE.Controllers.Main.criticalErrorExtText": "Натисніть \"OK\", щоб повернутися до списку документів.", "PE.Controllers.Main.criticalErrorTitle": "Помилка", - "PE.Controllers.Main.defaultTitleText": "Редактор презентацій ONLYOFFICE", "PE.Controllers.Main.downloadErrorText": "Завантаження не вдалося", "PE.Controllers.Main.downloadTextText": "Завантаження презентації...", "PE.Controllers.Main.downloadTitleText": "Завантаження презентації", "PE.Controllers.Main.errorAccessDeny": "Ви намагаєтеся виконати дію, на яку у вас немає прав.
      Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.", "PE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна", "PE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.", - "PE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів тут ", + "PE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів       тут", "PE.Controllers.Main.errorDatabaseConnection": "Зовнішня помилка.
      Помилка підключення до бази даних. Будь ласка, зв'яжіться зі службою підтримки, якщо помилка не зникне.", "PE.Controllers.Main.errorDataRange": "Неправильний діапазон даних.", "PE.Controllers.Main.errorDefaultMessage": "Код помилки: %1 ", @@ -822,7 +820,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Дата створення", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Місцезнаходження", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Особи, які мають права", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Назва презентації", @@ -1139,9 +1136,7 @@ "PE.Views.Statusbar.tipFitPage": "Пристосувати до слайду", "PE.Views.Statusbar.tipFitWidth": "Придатний до ширини", "PE.Views.Statusbar.tipPreview": "Розпочати слайдшоу", - "PE.Views.Statusbar.tipSetDocLang": "Виберіть мову документу", "PE.Views.Statusbar.tipSetLang": "вибрати мову тексту", - "PE.Views.Statusbar.tipSetSpelling": "Перевірка орфографії", "PE.Views.Statusbar.tipZoomFactor": "Збільшити", "PE.Views.Statusbar.tipZoomIn": "Збільшити зображення", "PE.Views.Statusbar.tipZoomOut": "Зменшити зображення", diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index d4cd2a0f6..4308c6011 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "Cảnh báo", "Common.Controllers.Chat.textEnterMessage": "Nhập tin nhắn của bạn ở đây", - "Common.Controllers.Chat.textUserLimit": "Bạn đang sử dụng ONLYOFFICE Free Edition.
      Chỉ hai người dùng có thể đồng thời cùng chỉnh sửa tài liệu.
      Bạn muốn nhiều hơn? Cân nhắc mua ONLYOFFICE Enterprise Edition.
      Đọc thêm", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "Nặc danh", "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng", "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.", @@ -133,14 +132,13 @@ "PE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.", "PE.Controllers.Main.criticalErrorExtText": "Nhấp \"OK\" để trở lại danh sách tài liệu.", "PE.Controllers.Main.criticalErrorTitle": "Lỗi", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.Main.downloadErrorText": "Tải về không thành công.", "PE.Controllers.Main.downloadTextText": "Đang tải trình chiếu...", "PE.Controllers.Main.downloadTitleText": "Đang tải Trình chiếu", "PE.Controllers.Main.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.
      Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.", "PE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.", - "PE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", + "PE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", "PE.Controllers.Main.errorDatabaseConnection": "Lỗi bên ngoài.
      Lỗi kết nối cơ sở dữ liệu. Vui lòng liên hệ bộ phận hỗ trợ trong trường hợp lỗi vẫn còn.", "PE.Controllers.Main.errorDataRange": "Phạm vi dữ liệu không chính xác.", "PE.Controllers.Main.errorDefaultMessage": "Mã lỗi: %1", @@ -823,7 +821,6 @@ "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Không có template", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "Ngày tạo", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Địa điểm", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Những cá nhân có quyền", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Tiêu đề bản trình chiếu", @@ -1140,9 +1137,7 @@ "PE.Views.Statusbar.tipFitPage": "Vừa với Slide", "PE.Views.Statusbar.tipFitWidth": "Vừa với Chiều rộng", "PE.Views.Statusbar.tipPreview": "Bắt đầu trình chiếu", - "PE.Views.Statusbar.tipSetDocLang": "Đặt Ngôn ngữ Tài liệu", "PE.Views.Statusbar.tipSetLang": "Đặt ngôn ngữ văn bản", - "PE.Views.Statusbar.tipSetSpelling": "Kiểm tra chính tả", "PE.Views.Statusbar.tipZoomFactor": "Thu phóng", "PE.Views.Statusbar.tipZoomIn": "Phóng to", "PE.Views.Statusbar.tipZoomOut": "Thu nhỏ", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 04dc07fb5..2bbda9f0c 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -1,7 +1,6 @@ { "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息", - "Common.Controllers.Chat.textUserLimit": "您正在使用ONLYOFFICE免费版。
      只有两个用户可以同时共同编辑文档。
      想要更多？考虑购买ONLYOFFICE企业版。
      阅读更多内容", "Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名", "Common.Controllers.ExternalDiagramEditor.textClose": "关闭", "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。", @@ -244,14 +243,13 @@ "PE.Controllers.Main.convertationTimeoutText": "转换超时", "PE.Controllers.Main.criticalErrorExtText": "按“确定”返回该文件列表。", "PE.Controllers.Main.criticalErrorTitle": "错误:", - "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE演示编辑器", "PE.Controllers.Main.downloadErrorText": "下载失败", "PE.Controllers.Main.downloadTextText": "正在下载演示文稿...", "PE.Controllers.Main.downloadTitleText": "下载文件", "PE.Controllers.Main.errorAccessDeny": "您正在尝试执行您没有权限的操作。
      请联系您的文档服务器管理员.", "PE.Controllers.Main.errorBadImageUrl": "图片地址不正确", "PE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑", - "PE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器在这里", + "PE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器      在这里", "PE.Controllers.Main.errorDatabaseConnection": "外部错误。
      数据库连接错误。如果错误仍然存​​在，请联系支持人员。", "PE.Controllers.Main.errorDataEncrypted": "加密更改已收到，无法对其解密。", "PE.Controllers.Main.errorDataRange": "数据范围不正确", @@ -1153,7 +1151,6 @@ "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "应用", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "作者", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "更改访问权限", - "PE.Views.FileMenuPanels.DocumentInfo.txtDate": "创建日期", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "地址", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "有权利的人", "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "演讲题目", @@ -1527,9 +1524,7 @@ "PE.Views.Statusbar.tipFitPage": "适合幻灯片", "PE.Views.Statusbar.tipFitWidth": "适合宽度", "PE.Views.Statusbar.tipPreview": "开始幻灯片放映", - "PE.Views.Statusbar.tipSetDocLang": "设置文档语言", "PE.Views.Statusbar.tipSetLang": "设置文本语言", - "PE.Views.Statusbar.tipSetSpelling": "拼写检查", "PE.Views.Statusbar.tipZoomFactor": "放大", "PE.Views.Statusbar.tipZoomIn": "放大", "PE.Views.Statusbar.tipZoomOut": "缩小", diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 2ac1e08e4..cf734ba8a 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -332,4 +332,11 @@ z-index: @zindex-dropdown - 20; background-color: @gray-light; border: 1px solid @gray; -} \ No newline at end of file +} + +.item-theme { + width: 85px; + height: 38px; + .background-ximage('../../../../../../sdkjs/common/Images/themes_thumbnail.png', '../../../../../../sdkjs/common/Images/themes_thumbnail@2x.png', 85px); + background-size: cover +} diff --git a/apps/presentationeditor/mobile/app-dev.js b/apps/presentationeditor/mobile/app-dev.js index eb062d384..575778b44 100644 --- a/apps/presentationeditor/mobile/app-dev.js +++ b/apps/presentationeditor/mobile/app-dev.js @@ -149,7 +149,7 @@ require([ 'AddImage', 'AddLink', 'AddSlide', - 'Collaboration' + 'Common.Controllers.Collaboration' ] }); @@ -218,7 +218,7 @@ require([ 'presentationeditor/mobile/app/controller/add/AddImage', 'presentationeditor/mobile/app/controller/add/AddLink', 'presentationeditor/mobile/app/controller/add/AddSlide', - 'presentationeditor/mobile/app/controller/Collaboration' + 'common/mobile/lib/controller/Collaboration' ], function() { window.compareVersions = true; diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index 5103851de..c2f9901d1 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -160,7 +160,7 @@ require([ 'AddImage', 'AddLink', 'AddSlide', - 'Collaboration' + 'Common.Controllers.Collaboration' ] }); @@ -229,7 +229,7 @@ require([ 'presentationeditor/mobile/app/controller/add/AddImage', 'presentationeditor/mobile/app/controller/add/AddLink', 'presentationeditor/mobile/app/controller/add/AddSlide', - 'presentationeditor/mobile/app/controller/Collaboration' + 'common/mobile/lib/controller/Collaboration' ], function() { app.start(); }); diff --git a/apps/presentationeditor/mobile/app/controller/Collaboration.js b/apps/presentationeditor/mobile/app/controller/Collaboration.js deleted file mode 100644 index ac31c2bf5..000000000 --- a/apps/presentationeditor/mobile/app/controller/Collaboration.js +++ /dev/null @@ -1,217 +0,0 @@ -/* - * - * (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 - * - */ - -/** - * Collaboration.js - * Presentation Editor - * - * Created by Julia Svinareva on 31/5/19 - * Copyright (c) 2019 Ascensio System SIA. All rights reserved. - * - */ -define([ - 'core', - 'jquery', - 'underscore', - 'backbone', - 'presentationeditor/mobile/app/view/Collaboration' -], function (core, $, _, Backbone) { - 'use strict'; - - PE.Controllers.Collaboration = Backbone.Controller.extend(_.extend((function() { - // Private - var rootView, - _userId, - editUsers = []; - - return { - models: [], - collections: [], - views: [ - 'Collaboration' - ], - - initialize: function() { - var me = this; - me.addListeners({ - 'Collaboration': { - 'page:show' : me.onPageShow - } - }); - }, - - setApi: function(api) { - this.api = api; - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onChangeEditUsers, this)); - this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onChangeEditUsers, this)); - }, - - onLaunch: function () { - this.createView('Collaboration').render(); - }, - - setMode: function(mode) { - this.appConfig = mode; - _userId = mode.user.id; - return this; - }, - - - showModal: function() { - var me = this, - isAndroid = Framework7.prototype.device.android === true, - modalView, - mainView = PE.getController('Editor').getView('Editor').f7View; - - uiApp.closeModal(); - - if (Common.SharedSettings.get('phone')) { - modalView = $$(uiApp.pickerModal( - '
      ' + - '
      ' + - this.getView('Collaboration').rootLayout() + - '
      ' + - '
      ' - )).on('opened', function () { - if (_.isFunction(me.api.asc_OnShowContextMenu)) { - me.api.asc_OnShowContextMenu() - } - }).on('close', function (e) { - mainView.showNavbar(); - }).on('closed', function () { - if (_.isFunction(me.api.asc_OnHideContextMenu)) { - me.api.asc_OnHideContextMenu() - } - }); - mainView.hideNavbar(); - } else { - modalView = uiApp.popover( - '
      ' + - '
      ' + - '
      ' + - '
      ' + - '
      ' + - this.getView('Collaboration').rootLayout() + - '
      ' + - '
      ' + - '
      ' + - '
      ', - $$('#toolbar-collaboration') - ); - } - - if (Framework7.prototype.device.android === true) { - $$('.view.collaboration-root-view.navbar-through').removeClass('navbar-through').addClass('navbar-fixed'); - $$('.view.collaboration-root-view .navbar').prependTo('.view.collaboration-root-view > .pages > .page'); - } - - rootView = uiApp.addView('.collaboration-root-view', { - dynamicNavbar: true, - domCache: true - }); - - Common.NotificationCenter.trigger('collaborationcontainer:show'); - this.onPageShow(this.getView('Collaboration')); - - PE.getController('Toolbar').getView('Toolbar').hideSearch(); - }, - - rootView : function() { - return rootView; - }, - - onPageShow: function(view, pageId) { - var me = this; - - if('#edit-users-view' == pageId) { - me.initEditUsers(); - Common.Utils.addScrollIfNeed('.page[data-page=edit-users-view]', '.page[data-page=edit-users-view] .page-content'); - } else { - } - }, - - onChangeEditUsers: function(users) { - editUsers = users; - }, - - initEditUsers: function() { - var usersArray = []; - _.each(editUsers, function(item){ - var fio = item.asc_getUserName().split(' '); - var initials = fio[0].substring(0, 1).toUpperCase(); - if (fio.length > 1) { - initials += fio[fio.length - 1].substring(0, 1).toUpperCase(); - } - if(!item.asc_getView()) { - var userAttr = { - color: item.asc_getColor(), - id: item.asc_getId(), - idOriginal: item.asc_getIdOriginal(), - name: item.asc_getUserName(), - view: item.asc_getView(), - initial: initials - }; - if(item.asc_getIdOriginal() == _userId) { - usersArray.unshift(userAttr); - } else { - usersArray.push(userAttr); - } - } - }); - var userSort = _.chain(usersArray).groupBy('idOriginal').value(); - var templateUserItem = _.template([ - '<% _.each(users, function (user) { %>', - '
    • ' + - '
      ' + - '
      <%= user[0].initial %>
      '+ - '' + - '<% if (user.length>1) { %><% } %>' + - '
      '+ - '
      • ', - '<% }); %>'].join('')); - var templateUserList = _.template( - '
      ' + - this.textEditUser + - '
      ' + - '
        ' + - templateUserItem({users: userSort}) + - '
      '); - $('#user-list').html(templateUserList()); - }, - - - textEditUser: 'Document is currently being edited by several users.' - - } - })(), PE.Controllers.Collaboration || {})) -}); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 0db9e2598..d558d23d4 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -186,7 +186,7 @@ define([ } me.initNames(); - me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}'; + me.defaultTitleText = '{{APP_TITLE_TEXT}}'; me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}'); @@ -261,6 +261,10 @@ define([ if (data.doc) { PE.getController('Toolbar').setDocumentTitle(data.doc.title); + if (data.doc.info) { + data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); + data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); + } } }, @@ -313,7 +317,7 @@ define([ return; } this._state.isFromGatewayDownloadAs = true; - this.api.asc_DownloadAs(Asc.c_oAscFileType.PPTX, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PPTX, true)); }, goBack: function(current) { @@ -1093,11 +1097,10 @@ define([ this.isThumbnailsShow = isShow; }, - onAdvancedOptions: function(advOptions) { + onAdvancedOptions: function(type, advOptions) { if (this._state.openDlg) return; - var type = advOptions.asc_getOptionId(), - me = this; + var me = this; if (type == Asc.c_oAscAdvancedOptionsID.DRM) { $(me.loadMask).hasClass('modal-in') && uiApp.closeModal(me.loadMask); diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index 14050c3e0..aa85b12be 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -190,11 +190,54 @@ define([ me.initPageApplicationSettings(); } else if ('#color-schemes-view' == pageId) { me.initPageColorSchemes(); + } else if ('#settings-info-view' == pageId) { + me.initPageInfo(); } }, + initPageInfo: function() { + var document = Common.SharedSettings.get('document') || {}, + info = document.info || {}; + + document.title ? $('#settings-presentation-title').html(document.title) : $('.display-presentation-title').remove(); + var value = info.owner || info.author; + value ? $('#settings-pe-owner').html(value) : $('.display-owner').remove(); + value = info.uploaded || info.created; + value ? $('#settings-pe-uploaded').html(value) : $('.display-uploaded').remove(); + info.folder ? $('#settings-pe-location').html(info.folder) : $('.display-location').remove(); + + var appProps = (this.api) ? this.api.asc_getAppProps() : null; + if (appProps) { + var appName = (appProps.asc_getApplication() || '') + ' ' + (appProps.asc_getAppVersion() || ''); + appName ? $('#settings-pe-application').html(appName) : $('.display-application').remove(); + } + + var props = (this.api) ? this.api.asc_getCoreProps() : null; + if (props) { + value = props.asc_getTitle(); + value ? $('#settings-pe-title').html(value) : $('.display-title').remove(); + value = props.asc_getSubject(); + value ? $('#settings-pe-subject').html(value) : $('.display-subject').remove(); + value = props.asc_getDescription(); + value ? $('#settings-pe-comment').html(value) : $('.display-comment').remove(); + value = props.asc_getModified(); + value ? $('#settings-pe-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); + value = props.asc_getLastModifiedBy(); + value ? $('#settings-pe-mod-by').html(value) : $('.display-mode-by').remove(); + value = props.asc_getCreated(); + value ? $('#settings-pe-date').html(value.toLocaleString()) : $('.display-created-date').remove(); + value = props.asc_getCreator(); + var templateCreator = ""; + value && value.split(/\s*[,;]\s*/).forEach(function(item) { + templateCreator = templateCreator + "
    • " + item + "
      • "; + }); + templateCreator ? $('#list-creator').html(templateCreator) : $('.display-author').remove(); + } + + }, + onCollaboration: function() { - PE.getController('Collaboration').showModal(); + PE.getController('Common.Controllers.Collaboration').showModal(); }, initPageColorSchemes: function () { @@ -339,7 +382,7 @@ define([ if (format) { _.defer(function () { - me.api.asc_DownloadAs(format); + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); }); } diff --git a/apps/presentationeditor/mobile/app/controller/Toolbar.js b/apps/presentationeditor/mobile/app/controller/Toolbar.js index 1f268a8a5..e9f6a53a0 100644 --- a/apps/presentationeditor/mobile/app/controller/Toolbar.js +++ b/apps/presentationeditor/mobile/app/controller/Toolbar.js @@ -80,7 +80,7 @@ define([ this.api.asc_registerCallback('asc_onCanRedo', _.bind(this.onApiCanRevert, this, 'redo')); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); }, diff --git a/apps/presentationeditor/mobile/app/template/Collaboration.template b/apps/presentationeditor/mobile/app/template/Collaboration.template deleted file mode 100644 index 599f0a369..000000000 --- a/apps/presentationeditor/mobile/app/template/Collaboration.template +++ /dev/null @@ -1,47 +0,0 @@ - -       - - -
      -
      -
      -
      <% if (!android) { %><%= scope.textBack %><% } %>
      -
      <%= scope.textEditUsers %>
      -
      <% if (phone) { %><% } %>
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      \ No newline at end of file diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index 97e870c9d..d9b90cb1b 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -25,7 +25,7 @@ <% } %> - <% if(phone) {%> + <% if(width < 390) {%>
    • ' + - '
      ' + - '
      <%= user[0].initial %>
      '+ - '' + - '<% if (user.length>1) { %><% } %>' + - '
      '+ - '
      • ', - '<% }); %>'].join('')); - var templateUserList = _.template( - '
      ' + - this.textEditUser + - '
      ' + - '
        ' + - templateUserItem({users: userSort}) + - '
      '); - $('#user-list').html(templateUserList()); - }, - - - textEditUser: 'Document is currently being edited by several users.' - - } - })(), SSE.Controllers.Collaboration || {})) -}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 084f9b2da..472f1ad74 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -160,6 +160,7 @@ define([ /**/ Common.NotificationCenter.on('api:disconnect', _.bind(me.onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('goback', _.bind(me.goBack, me)); + Common.NotificationCenter.on('download:advanced', _.bind(me.onAdvancedOptions, me)); // Initialize descendants _.each(me.getApplication().controllers, function(controller) { @@ -191,7 +192,7 @@ define([ Common.Gateway.internalMessage('listenHardBack'); } - me.defaultTitleText = me.defaultTitleText || '{{APP_TITLE_TEXT}}'; + me.defaultTitleText = '{{APP_TITLE_TEXT}}'; me.warnNoLicense = me.warnNoLicense.replace('%1', '{{COMPANY_NAME}}'); me.warnNoLicenseUsers = me.warnNoLicenseUsers.replace('%1', '{{COMPANY_NAME}}'); me.textNoLicenseTitle = me.textNoLicenseTitle.replace('%1', '{{COMPANY_NAME}}'); @@ -212,6 +213,7 @@ define([ me.appOptions.createUrl = me.editorConfig.createUrl; me.appOptions.lang = me.editorConfig.lang; me.appOptions.location = (typeof (me.editorConfig.location) == 'string') ? me.editorConfig.location.toLowerCase() : ''; + me.appOptions.region = (typeof (me.editorConfig.region) == 'string') ? this.editorConfig.region.toLowerCase() : this.editorConfig.region; me.appOptions.sharingSettingsUrl = me.editorConfig.sharingSettingsUrl; me.appOptions.fileChoiceUrl = me.editorConfig.fileChoiceUrl; me.appOptions.mergeFolderUrl = me.editorConfig.mergeFolderUrl; @@ -227,7 +229,13 @@ define([ if (value!==null) this.api.asc_setLocale(parseInt(value)); else { - this.api.asc_setLocale((this.editorConfig.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(this.editorConfig.lang)) : 0x0409); + value = me.appOptions.region; + value = Common.util.LanguageInfo.getLanguages().hasOwnProperty(value) ? value : Common.util.LanguageInfo.getLocalLanguageCode(value); + if (value!==null) + value = parseInt(value); + else + value = (this.editorConfig.lang) ? parseInt(Common.util.LanguageInfo.getLocalLanguageCode(me.editorConfig.lang)) : 0x0409; + this.api.asc_setLocale(value); } if (me.appOptions.location == 'us' || me.appOptions.location == 'ca') @@ -267,9 +275,12 @@ define([ Common.SharedSettings.set('document', data.doc); - if (data.doc) { SSE.getController('Toolbar').setDocumentTitle(data.doc.title); + if (data.doc.info) { + data.doc.info.author && console.log("Obsolete: The 'author' parameter of the document 'info' section is deprecated. Please use 'owner' instead."); + data.doc.info.created && console.log("Obsolete: The 'created' parameter of the document 'info' section is deprecated. Please use 'uploaded' instead."); + } } }, @@ -321,7 +332,7 @@ define([ return; } this._state.isFromGatewayDownloadAs = true; - this.api.asc_DownloadAs(Asc.c_oAscFileType.XLSX, true); + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.XLSX, true)); }, goBack: function(current) { @@ -508,9 +519,9 @@ define([ this.api.asc_setZoom(zf>0 ? zf : 1); /** coauthoring begin **/ - value = Common.localStorage.getItem("sse-settings-livecomment"); - this.isLiveCommenting = !(value!==null && parseInt(value) == 0); - this.isLiveCommenting?this.api.asc_showComments(true):this.api.asc_hideComments(); + this.isLiveCommenting = Common.localStorage.getBool("sse-settings-livecomment", true); + var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true); + this.isLiveCommenting ? this.api.asc_showComments(resolved) : this.api.asc_hideComments(); if (this.appOptions.isEdit && this.appOptions.canLicense && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) { // Force ON fast co-authoring mode @@ -1217,17 +1228,16 @@ define([ Common.Utils.ThemeColor.setColors(colors, standart_colors); }, - onAdvancedOptions: function(advOptions) { + onAdvancedOptions: function(type, advOptions, mode, formatOptions) { if (this._state.openDlg) return; - var type = advOptions.asc_getOptionId(), - me = this; + var me = this; if (type == Asc.c_oAscAdvancedOptionsID.CSV) { var picker, pages = [], pagesName = []; - _.each(advOptions.asc_getOptions().asc_getCodePages(), function(page) { + _.each(advOptions.asc_getCodePages(), function(page) { pages.push(page.asc_getCodePage()); pagesName.push(page.asc_getCodePageName()); }); @@ -1236,6 +1246,38 @@ define([ me.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + var buttons = []; + if (mode === 2) { + buttons.push({ + text: me.textCancel, + onClick: function () { + me._state.openDlg = null; + } + }); + } + buttons.push({ + text: 'OK', + bold: true, + onClick: function() { + var encoding = picker.cols[0].value, + delimiter = picker.cols[1].value; + + if (me.api) { + if (mode==2) { + formatOptions && formatOptions.asc_setAdvancedOptions(new Asc.asc_CTextOptions(encoding, delimiter)); + me.api.asc_DownloadAs(formatOptions); + } else { + me.api.asc_setAdvancedOptions(type, new Asc.asc_CTextOptions(encoding, delimiter)); + } + + if (!me._isDocReady) { + me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); + } + } + me._state.openDlg = null; + } + }); + me._state.openDlg = uiApp.modal({ title: me.advCSVOptions, text: '', @@ -1247,28 +1289,10 @@ define([ '' + '
      ' + '', - buttons: [ - { - text: 'OK', - bold: true, - onClick: function() { - var encoding = picker.cols[0].value, - delimiter = picker.cols[1].value; - - if (me.api) { - me.api.asc_setAdvancedOptions(type, new Asc.asc_CCSVAdvancedOptions(encoding, delimiter)); - - if (!me._isDocReady) { - me.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); - } - } - me._state.openDlg = null; - } - } - ] + buttons: buttons }); - var recommendedSettings = advOptions.asc_getOptions().asc_getRecommendedSettings(); + var recommendedSettings = advOptions.asc_getRecommendedSettings(); picker = uiApp.picker({ container: '#txt-encoding', diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 26966e450..878e9affb 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -200,7 +200,7 @@ define([ }); }).on('close', function () { $overlay.off('removeClass'); - $overlay.removeClass('modal-overlay-visible') + $overlay.removeClass('modal-overlay-visible'); }); } @@ -244,6 +244,8 @@ define([ me.initFormulaLang(); } else if ('#regional-settings-view' == pageId) { me.initRegSettings(); + } else if ('#settings-info-view' == pageId) { + me.initPageInfo(); } else { var _userCount = SSE.getController('Main').returnUserCount(); if (_userCount > 0) { @@ -252,6 +254,47 @@ define([ } }, + initPageInfo: function() { + var document = Common.SharedSettings.get('document') || {}, + info = document.info || {}; + + document.title ? $('#settings-spreadsheet-title').html(document.title) : $('.display-spreadsheet-title').remove(); + var value = info.owner || info.author; + value ? $('#settings-sse-owner').html(value) : $('.display-owner').remove(); + value = info.uploaded || info.created; + value ? $('#settings-sse-uploaded').html(value) : $('.display-uploaded').remove(); + info.folder ? $('#settings-sse-location').html(info.folder) : $('.display-location').remove(); + + var appProps = (this.api) ? this.api.asc_getAppProps() : null; + if (appProps) { + var appName = (appProps.asc_getApplication() || '') + ' ' + (appProps.asc_getAppVersion() || ''); + appName ? $('#settings-sse-application').html(appName) : $('.display-application').remove(); + } + + var props = (this.api) ? this.api.asc_getCoreProps() : null; + if (props) { + value = props.asc_getTitle(); + value ? $('#settings-sse-title').html(value) : $('.display-title').remove(); + value = props.asc_getSubject(); + value ? $('#settings-sse-subject').html(value) : $('.display-subject').remove(); + value = props.asc_getDescription(); + value ? $('#settings-sse-comment').html(value) : $('.display-comment').remove(); + value = props.asc_getModified(); + value ? $('#settings-sse-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); + value = props.asc_getLastModifiedBy(); + value ? $('#settings-sse-mod-by').html(value) : $('.display-mode-by').remove(); + value = props.asc_getCreated(); + value ? $('#settings-sse-date').html(value.toLocaleString()) : $('.display-created-date').remove(); + value = props.asc_getCreator(); + var templateCreator = ""; + value && value.split(/\s*[,;]\s*/).forEach(function(item) { + templateCreator = templateCreator + "
    • " + item + "
      • "; + }); + templateCreator ? $('#list-creator').html(templateCreator) : $('.display-author').remove(); + } + + }, + initRegSettings: function() { var value = Number(Common.localStorage.getItem('sse-settings-regional')); this.getView('Settings').renderRegSettings(value ? value : 0x0409, _regdata); @@ -282,7 +325,7 @@ define([ }, onCollaboration: function() { - SSE.getController('Collaboration').showModal(); + SSE.getController('Common.Controllers.Collaboration').showModal(); }, initSpreadsheetSettings: function() { @@ -549,6 +592,44 @@ define([ var $r1c1Style = $('.page[data-page=settings-application-view] #r1-c1-style input'); $r1c1Style.prop('checked',value); $r1c1Style.single('change', _.bind(me.clickR1C1Style, me)); + + //init Commenting Display + var displayComments = Common.localStorage.getBool("sse-settings-livecomment", true); + $('#settings-display-comments input:checkbox').attr('checked', displayComments); + $('#settings-display-comments input:checkbox').single('change', _.bind(me.onChangeDisplayComments, me)); + var displayResolved = Common.localStorage.getBool("sse-settings-resolvedcomment", true); + if (!displayComments) { + $("#settings-display-resolved").addClass("disabled"); + displayResolved = false; + } + $('#settings-display-resolved input:checkbox').attr('checked', displayResolved); + $('#settings-display-resolved input:checkbox').single('change', _.bind(me.onChangeDisplayResolved, me)); + }, + + onChangeDisplayComments: function(e) { + var displayComments = $(e.currentTarget).is(':checked'); + if (!displayComments) { + this.api.asc_hideComments(); + $("#settings-display-resolved input").prop( "checked", false ); + Common.localStorage.setBool("sse-settings-resolvedcomment", false); + $("#settings-display-resolved").addClass("disabled"); + } else { + var resolved = Common.localStorage.getBool("sse-settings-resolvedcomment"); + this.api.asc_showComments(resolved); + $("#settings-display-resolved").removeClass("disabled"); + } + Common.localStorage.setBool("sse-settings-livecomment", displayComments); + }, + + onChangeDisplayResolved: function(e) { + var displayComments = Common.localStorage.getBool("sse-settings-livecomment"); + if (displayComments) { + var resolved = $(e.currentTarget).is(':checked'); + if (this.api) { + this.api.asc_showComments(resolved); + } + Common.localStorage.setBool("sse-settings-resolvedcomment", resolved); + } }, clickR1C1Style: function(e) { @@ -590,20 +671,24 @@ define([ var me = this, format = $(e.currentTarget).data('format'); - if (format) { - if (format == Asc.c_oAscFileType.TXT) { - uiApp.confirm( - me.warnDownloadAs, - me.notcriticalErrorTitle, - function () { - me.api.asc_DownloadAs(format); - } - ); - } else { - me.api.asc_DownloadAs(format); - } + me.hideModal(); - me.hideModal(); + if (format) { + if (format == Asc.c_oAscFileType.CSV) { + setTimeout(function () { + uiApp.confirm( + me.warnDownloadAs, + me.notcriticalErrorTitle, + function () { + Common.NotificationCenter.trigger('download:advanced', Asc.c_oAscAdvancedOptionsID.CSV, me.api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format)); + } + ); + }, 50); + } else { + setTimeout(function () { + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + }, 50); + } } }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js index 8f0ab5c36..6f969e151 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Toolbar.js @@ -87,7 +87,7 @@ define([ this.api.asc_registerCallback('asc_onWorksheetLocked', _.bind(this.onApiWorksheetLocked, this)); this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onApiActiveSheetChanged, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)) + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.displayCollaboration, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.displayCollaboration, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); @@ -160,6 +160,7 @@ define([ onApiActiveSheetChanged: function (index) { locked.sheet = this.api.asc_isWorksheetLockedOrDeleted(index); + Common.NotificationCenter.trigger('comments:filterchange', ['doc', 'sheet' + this.api.asc_getWorksheetId(index)], false ); }, onApiCanRevert: function(which, can) { diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index a8bc562c4..204c4be27 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -56,7 +56,7 @@ define([ _cellInfo = undefined, _cellStyles = [], _fontInfo = {}, - _borderInfo = {color: '000000', width: 'medium'}, + _borderInfo = {color: '000000', width: Asc.c_oAscBorderStyles.Medium}, _styleSize = {width: 100, height: 50}, _isEdit = false; @@ -283,7 +283,7 @@ define([ $('#edit-border-size .item-after').text($('#edit-border-size select option[value=' +_borderInfo.width + ']').text()); $('#edit-border-size select').single('change', function (e) { - _borderInfo.width = $(e.currentTarget).val(); + _borderInfo.width = parseInt($(e.currentTarget).val()); }) }, @@ -360,6 +360,7 @@ define([ onApiInitEditorStyles: function(styles){ window.styles_loaded = false; + _cellStyles = styles; this.getView('EditCell').renderStyles(styles); diff --git a/apps/spreadsheeteditor/mobile/app/template/Collaboration.template b/apps/spreadsheeteditor/mobile/app/template/Collaboration.template deleted file mode 100644 index 599f0a369..000000000 --- a/apps/spreadsheeteditor/mobile/app/template/Collaboration.template +++ /dev/null @@ -1,47 +0,0 @@ - -       - - -
      -
      -
      -
      <% if (!android) { %><%= scope.textBack %><% } %>
      -
      <%= scope.textEditUsers %>
      -
      <% if (phone) { %><% } %>
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/template/EditCell.template b/apps/spreadsheeteditor/mobile/app/template/EditCell.template index 193f2652e..93435f351 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditCell.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditCell.template @@ -423,9 +423,9 @@
    • diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template index de6530a45..a87da9488 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Settings.template +++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template @@ -25,7 +25,7 @@
      • <% } %> - <% if(phone) {%> + <% if(width < 360) {%>
      • +
      <%= scope.textRegionalSettings %>
      + +
      +
      <%= scope.textCommentingDisplay %>
      +
      +
        +
        +
        +
        <%= scope.textDisplayComments %>
        +
        + +
        +
        +
        +
        +
        +
        <%= scope.textDisplayResolvedComments %>
        +
        + +
        +
        +
        +
      +
      +
      • @@ -447,21 +579,6 @@
      -
      <%= scope.textRegionalSettings %>
      -
      - -
      diff --git a/apps/spreadsheeteditor/mobile/app/template/Toolbar.template b/apps/spreadsheeteditor/mobile/app/template/Toolbar.template index 345205710..a1238415a 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/mobile/app/template/Toolbar.template @@ -42,7 +42,7 @@ <% } %> - <% if (!phone) { %> + <% if (width >= 360) { %> diff --git a/apps/spreadsheeteditor/mobile/app/view/Collaboration.js b/apps/spreadsheeteditor/mobile/app/view/Collaboration.js deleted file mode 100644 index be4328c70..000000000 --- a/apps/spreadsheeteditor/mobile/app/view/Collaboration.js +++ /dev/null @@ -1,149 +0,0 @@ -/* - * - * (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 - * - */ - -/** - * Collaboration.js - * Presentation Editor - * - * Created by Julia Svinareva on 31/5/19 - * Copyright (c) 2019 Ascensio System SIA. All rights reserved. - * - */ - -define([ - 'text!spreadsheeteditor/mobile/app/template/Collaboration.template', - 'jquery', - 'underscore', - 'backbone' -], function (settingsTemplate, $, _, Backbone) { - 'use strict'; - - SSE.Views.Collaboration = Backbone.View.extend(_.extend((function() { - // private - - return { - - template: _.template(settingsTemplate), - - events: { - // - }, - - initialize: function() { - Common.NotificationCenter.on('collaborationcontainer:show', _.bind(this.initEvents, this)); - this.on('page:show', _.bind(this.updateItemHandlers, this)); - }, - - initEvents: function () { - var me = this; - - Common.Utils.addScrollIfNeed('.view[data-page=collaboration-root-view] .pages', '.view[data-page=collaboration-root-view] .page'); - me.updateItemHandlers(); - }, - - initControls: function() { - // - }, - - // Render layout - render: function() { - this.layout = $('
      ').append(this.template({ - android : Common.SharedSettings.get('android'), - phone : Common.SharedSettings.get('phone'), - orthography: Common.SharedSettings.get('sailfish'), - scope : this - })); - - return this; - }, - - updateItemHandlers: function () { - var selectorsDynamicPage = [ - '.page[data-page=collaboration-root-view]' - ].map(function (selector) { - return selector + ' a.item-link[data-page]'; - }).join(', '); - - $(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this)); - }, - - onItemClick: function (e) { - var $target = $(e.currentTarget), - page = $target.data('page'); - - if (page && page.length > 0 ) { - this.showPage(page); - } - }, - - rootLayout: function () { - if (this.layout) { - var $layour = this.layout.find('#collaboration-root-view'), - isPhone = Common.SharedSettings.get('phone'); - - return $layour.html(); - } - - return ''; - }, - - showPage: function(templateId, animate) { - var rootView = SSE.getController('Collaboration').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(), - animatePages: animate !== false - }); - - this.fireEvent('page:show', [this, templateId]); - } - }, - - - - textCollaboration: 'Collaboration', - textСomments: 'Сomments', - textBack: 'Back', - textEditUsers: 'Users' - - } - })(), SSE.Views.Collaboration || {})) -}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js index fdc640ed5..a385fcaaf 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -100,7 +100,8 @@ define([ csv: Asc.c_oAscFileType.CSV, xltx: Asc.c_oAscFileType.XLTX, ots: Asc.c_oAscFileType.OTS - } + }, + width : $(window).width() })); return this; @@ -130,7 +131,6 @@ define([ $layout.find('#settings-search .item-title').text(this.textFindAndReplace) } else { $layout.find('#settings-spreadsheet').hide(); - $layout.find('#settings-application').hide(); } if (!canDownload) $layout.find('#settings-download').hide(); if (!canAbout) $layout.find('#settings-about').hide(); @@ -170,6 +170,9 @@ define([ this.showPage('#settings-application-view'); $('#language-formula').single('click', _.bind(this.showFormulaLanguage, this)); $('#regional-settings').single('click', _.bind(this.showRegionalSettings, this)); + if (!isEdit) { + $('.page[data-page=settings-application-view] .page-content > :not(.display-view)').hide(); + } }, showFormulaLanguage: function () { @@ -201,15 +204,6 @@ define([ showDocumentInfo: function() { this.showPage('#settings-info-view'); - - var document = Common.SharedSettings.get('document') || {}, - info = document.info || {}; - - $('#settings-document-title').html(document.title ? document.title : this.unknownText); - $('#settings-document-autor').html(info.author ? info.author : this.unknownText); - $('#settings-document-date').html(info.created ? info.created : this.unknownText); - - Common.Utils.addScrollIfNeed('.page[data-page=settings-info-view]', '.page[data-page=settings-info-view] .page-content'); }, showDownload: function () { @@ -381,7 +375,20 @@ define([ textFormulaLanguage: 'Formula Language', textExample: 'Example', textR1C1Style: 'R1C1 Reference Style', - textRegionalSettings: 'Regional Settings' + textRegionalSettings: 'Regional Settings', + textCommentingDisplay: 'Commenting Display', + textDisplayComments: 'Comments', + textDisplayResolvedComments: 'Resolved Comments', + textSubject: 'Subject', + textTitle: 'Title', + textComment: 'Comment', + textOwner: 'Owner', + textApplication : 'Application', + textCreated: 'Created', + textLastModified: 'Last Modified', + textLastModifiedBy: 'Last Modified By', + textUploaded: 'Uploaded', + textLocation: 'Location' } })(), SSE.Views.Settings || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js index d5bc17b8e..0eb8ba308 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/mobile/app/view/Toolbar.js @@ -80,7 +80,8 @@ define([ $el.prepend(me.template({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), - backTitle : Common.SharedSettings.get('android') ? '' : me.textBack + backTitle : Common.SharedSettings.get('android') ? '' : me.textBack, + width : $(window).width() })); $('.view-main .navbar').on('addClass removeClass', _.bind(me.onDisplayMainNavbar, me)); @@ -158,7 +159,7 @@ define([ //Collaboration showCollaboration: function () { - SSE.getController('Collaboration').showModal(); + SSE.getController('Common.Controllers.Collaboration').showModal(); }, textBack: 'Back' diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js index 0158fca99..7b524d3de 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js @@ -200,7 +200,7 @@ define([ var $view = $('.settings'); var disabled = text == 'locked'; - disabled && (text = ' '); + disabled && (text = this.textSelectedRange); $view.find('#add-link-display input').prop('disabled', disabled).val(text); $view.find('#add-link-display .label').toggleClass('disabled', disabled); }, @@ -261,7 +261,8 @@ define([ textInternalLink: 'Internal Data Range', textSheet: 'Sheet', textRange: 'Range', - textRequired: 'Required' + textRequired: 'Required', + textSelectedRange: 'Selected Range' } })(), SSE.Views.AddLink || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json index 6c1ec3d64..3287f99ee 100644 --- a/apps/spreadsheeteditor/mobile/locale/bg.json +++ b/apps/spreadsheeteditor/mobile/locale/bg.json @@ -102,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Превишава се времето на изтичане на реализациите.", "SSE.Controllers.Main.criticalErrorExtText": "Натиснете 'OK', за да се върнете към списъка с документи.", "SSE.Controllers.Main.criticalErrorTitle": "Грешка", - "SSE.Controllers.Main.defaultTitleText": "Редактор на електронни таблици ONLYOFFICE", "SSE.Controllers.Main.downloadErrorText": "Изтеглянето се провали.", "SSE.Controllers.Main.downloadMergeText": "Изтегля се ...", "SSE.Controllers.Main.downloadMergeTitle": "Изтеглянето", @@ -117,7 +116,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "URL адресът на изображението е неправилен", "SSE.Controllers.Main.errorChangeArray": "Не можете да променяте част от масив.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Връзката със сървъра е загубена. Документът не може да бъде редактиран в момента.", - "SSE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук ", + "SSE.Controllers.Main.errorConnectToServer": "Документът не може да бъде запасен. Моля, проверете настройките за връзка или се свържете с администратора си.
      Когато щракнете върху бутона 'OK', ще бъдете подканени да изтеглите документа.

      Намерете повече информация за свързването на сървър за документи тук", "SSE.Controllers.Main.errorCopyMultiselectArea": "Тази команда не може да се използва с многократни селекции.
      Изберете единичен обхват и опитайте отново.", "SSE.Controllers.Main.errorCountArg": "Грешка в въведената формула.
      Използва се неправилен брой аргументи.", "SSE.Controllers.Main.errorCountArgExceed": "Грешка във въведената формула.
      Брой аргументи е надвишен.", diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json index 616b07c96..ede001c68 100644 --- a/apps/spreadsheeteditor/mobile/locale/cs.json +++ b/apps/spreadsheeteditor/mobile/locale/cs.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Vypršel čas konverze.", "SSE.Controllers.Main.criticalErrorExtText": "Stisknutím tlačítka \"OK\" se vrátíte do seznamu dokumentů.", "SSE.Controllers.Main.criticalErrorTitle": "Chyba", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Tabulkový editor", "SSE.Controllers.Main.downloadErrorText": "Stahování selhalo.", "SSE.Controllers.Main.downloadMergeText": "Stahování...", "SSE.Controllers.Main.downloadMergeTitle": "Stahuji", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Operaci nelze provést, protože oblast obsahuje filtrované buňky.
      Prosím, odkryjte filtrované prvky a zkuste to znovu.", "SSE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávná", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Spojení se serverem ztraceno. Dokument nyní nelze upravovat.", - "SSE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím zkontrolujte nastavení připojení nebo kontaktujte administrátora.
      Po kliknutí na tlačítko \"OK\", budete vyzváni ke stažení dokumentu.

      Více informací o připojení k dokumentovému serveru naleznete na here", + "SSE.Controllers.Main.errorConnectToServer": "Dokument nelze uložit. Prosím, zkontrolujte nastavení vašeho připojení nebo kontaktujte vašeho administrátora.
      Při kliknutí na tlačítko \"OK\" budete vyzváni ke stažení dokumentu.

      Více informací o připojení najdete v Dokumentovém serveru here", "SSE.Controllers.Main.errorCopyMultiselectArea": "Tento příkaz nelze použít s více výběry.
      Vyberte jeden z rozsahů a zkuste to znovu.", "SSE.Controllers.Main.errorCountArg": "Chyba v zadaném vzorci.
      Použitý neprávný počet argumentů.", "SSE.Controllers.Main.errorCountArgExceed": "Chyba v zadaném vzorci.
      Překročen počet argumentů.", diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index bd2f2fdd9..464f48060 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -102,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.", "SSE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.", "SSE.Controllers.Main.criticalErrorTitle": "Fehler", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Herunterladen ist fehlgeschlagen.", "SSE.Controllers.Main.downloadMergeText": "Wird heruntergeladen...", "SSE.Controllers.Main.downloadMergeTitle": "Wird heruntergeladen", @@ -117,7 +116,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch", "SSE.Controllers.Main.errorChangeArray": "Sie können einen Teil eines Arrays nicht ändern.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.", - "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", + "SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.
      Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.

      Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie hier", "SSE.Controllers.Main.errorCopyMultiselectArea": "Dieser Befehl kann nicht bei Mehrfachauswahl verwendet werden
      Wählen Sie nur einen einzelnen Bereich aus, und versuchen Sie es nochmal.", "SSE.Controllers.Main.errorCountArg": "Die eingegebene Formel enthält einen Fehler.
      Es wurde falsche Anzahl an Argumenten benutzt.", "SSE.Controllers.Main.errorCountArgExceed": "Die eingegebene Formel enthält einen Fehler.
      Anzahl der Argumente wurde überschritten.", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 801de3914..4e5a89008 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -1,8 +1,14 @@ { + "Common.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textBack": "Back", + "Common.Views.Collaboration.textCollaboration": "Collaboration", + "Common.Views.Collaboration.textEditUsers": "Users", + "Common.Views.Collaboration.textСomments": "Сomments", + "Common.Views.Collaboration.textNoComments": "This spreadsheet doesn't contain comments", "SSE.Controllers.AddChart.txtDiagramTitle": "Chart Title", "SSE.Controllers.AddChart.txtSeries": "Series", "SSE.Controllers.AddChart.txtXAxis": "X Axis", @@ -22,19 +28,19 @@ "SSE.Controllers.DocumentHolder.menuCut": "Cut", "SSE.Controllers.DocumentHolder.menuDelete": "Delete", "SSE.Controllers.DocumentHolder.menuEdit": "Edit", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Freeze Panes", "SSE.Controllers.DocumentHolder.menuHide": "Hide", "SSE.Controllers.DocumentHolder.menuMerge": "Merge", "SSE.Controllers.DocumentHolder.menuMore": "More", "SSE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "SSE.Controllers.DocumentHolder.menuPaste": "Paste", "SSE.Controllers.DocumentHolder.menuShow": "Show", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Unfreeze Panes", "SSE.Controllers.DocumentHolder.menuUnmerge": "Unmerge", "SSE.Controllers.DocumentHolder.menuUnwrap": "Unwrap", "SSE.Controllers.DocumentHolder.menuWrap": "Wrap", "SSE.Controllers.DocumentHolder.sheetCancel": "Cancel", "SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.
      Continue?", - "SSE.Controllers.DocumentHolder.menuFreezePanes": "Freeze Panes", - "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Unfreeze Panes", "SSE.Controllers.EditCell.textAuto": "Auto", "SSE.Controllers.EditCell.textFonts": "Fonts", "SSE.Controllers.EditCell.textPt": "pt", @@ -94,6 +100,10 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Internal Data Range", "SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range", "SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "SSE.Controllers.FilterOptions.textEmptyItem": "{Blanks}", + "SSE.Controllers.FilterOptions.textErrorMsg": "You must choose at least one value", + "SSE.Controllers.FilterOptions.textErrorTitle": "Warning", + "SSE.Controllers.FilterOptions.textSelectAll": "Select All", "SSE.Controllers.Main.advCSVOptions": "Choose CSV Options", "SSE.Controllers.Main.advDRMEnterPassword": "Enter your password:", "SSE.Controllers.Main.advDRMOptions": "Protected File", @@ -104,7 +114,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "SSE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.", "SSE.Controllers.Main.criticalErrorTitle": "Error", - "del_SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Download failed.", "SSE.Controllers.Main.downloadMergeText": "Downloading...", "SSE.Controllers.Main.downloadMergeTitle": "Downloading", @@ -135,6 +144,7 @@ "SSE.Controllers.Main.errorFillRange": "Could not fill the selected range of cells.
      All the merged cells need to be the same size.", "SSE.Controllers.Main.errorFormulaName": "An error in the entered formula.
      Incorrect formula name is used.", "SSE.Controllers.Main.errorFormulaParsing": "Internal error while parsing the formula.", + "SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
      Use the CONCATENATE function or concatenation operator (&).", "SSE.Controllers.Main.errorFrmlWrongReferences": "The function refers to a sheet that does not exist.
      Please check the data and try again.", "SSE.Controllers.Main.errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", "SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", @@ -165,7 +175,6 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
      but will not be able to download until the connection is restored.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
      Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
      Please correct the error.", - "SSE.Controllers.Main.errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
      Use the CONCATENATE function or concatenation operator (&).", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data", @@ -300,11 +309,6 @@ "SSE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application", "SSE.Controllers.Toolbar.leaveButtonText": "Leave this Page", "SSE.Controllers.Toolbar.stayButtonText": "Stay on this Page", - "SSE.Controllers.Collaboration.textEditUser": "Document is currently being edited by several users.", - "SSE.Controllers.FilterOptions.textEmptyItem": "{Blanks}", - "SSE.Controllers.FilterOptions.textSelectAll": "Select All", - "SSE.Controllers.FilterOptions.textErrorTitle": "Warning", - "SSE.Controllers.FilterOptions.textErrorMsg": "You must choose at least one value", "SSE.Views.AddFunction.sCatDateAndTime": "Date and time", "SSE.Views.AddFunction.sCatEngineering": "Engineering", "SSE.Views.AddFunction.sCatFinancial": "Financial", @@ -329,6 +333,7 @@ "SSE.Views.AddLink.textRequired": "Required", "SSE.Views.AddLink.textSheet": "Sheet", "SSE.Views.AddLink.textTip": "Screen Tip", + "SSE.Views.AddLink.textSelectedRange": "Selected Range", "SSE.Views.AddOther.textAddress": "Address", "SSE.Views.AddOther.textBack": "Back", "SSE.Views.AddOther.textFilter": "Filter", @@ -490,28 +495,45 @@ "SSE.Views.EditText.textFonts": "Fonts", "SSE.Views.EditText.textSize": "Size", "SSE.Views.EditText.textTextColor": "Text Color", + "SSE.Views.FilterOptions.textClearFilter": "Clear Filter", + "SSE.Views.FilterOptions.textDeleteFilter": "Delete Filter", + "SSE.Views.FilterOptions.textFilter": "Filter Options", + "SSE.Views.Search.textByColumns": "By columns", + "SSE.Views.Search.textByRows": "By rows", "SSE.Views.Search.textDone": "Done", "SSE.Views.Search.textFind": "Find", "SSE.Views.Search.textFindAndReplace": "Find and Replace", + "SSE.Views.Search.textFormulas": "Formulas", + "SSE.Views.Search.textHighlightRes": "Highlight results", + "SSE.Views.Search.textLookIn": "Look In", "SSE.Views.Search.textMatchCase": "Match Case", "SSE.Views.Search.textMatchCell": "Match Cell", "SSE.Views.Search.textReplace": "Replace", "SSE.Views.Search.textSearch": "Search", + "SSE.Views.Search.textSearchBy": "Search", "SSE.Views.Search.textSearchIn": "Search In", "SSE.Views.Search.textSheet": "Sheet", - "SSE.Views.Search.textWorkbook": "Workbook", - "SSE.Views.Search.textLookIn": "Look In", - "SSE.Views.Search.textFormulas": "Formulas", "SSE.Views.Search.textValues": "Values", - "SSE.Views.Search.textByColumns": "By columns", - "SSE.Views.Search.textByRows": "By rows", - "SSE.Views.Search.textSearchBy": "Search", - "SSE.Views.Search.textHighlightRes": "Highlight results", + "SSE.Views.Search.textWorkbook": "Workbook", + "SSE.Views.Settings. textLocation": "Location", "SSE.Views.Settings.textAbout": "About", "SSE.Views.Settings.textAddress": "address", + "SSE.Views.Settings.textApplication": "Application", + "SSE.Views.Settings.textApplicationSettings": "Application Settings", "SSE.Views.Settings.textAuthor": "Author", "SSE.Views.Settings.textBack": "Back", + "SSE.Views.Settings.textBottom": "Bottom", + "SSE.Views.Settings.textCentimeter": "Centimeter", + "SSE.Views.Settings.textCollaboration": "Collaboration", + "SSE.Views.Settings.textColorSchemes": "Color Schemes", + "SSE.Views.Settings.textComment": "Comment", + "SSE.Views.Settings.textCommentingDisplay": "Commenting Display", + "SSE.Views.Settings.textCreated": "Created", "SSE.Views.Settings.textCreateDate": "Creation date", + "SSE.Views.Settings.textCustom": "Custom", + "SSE.Views.Settings.textCustomSize": "Custom Size", + "SSE.Views.Settings.textDisplayComments": "Comments", + "SSE.Views.Settings.textDisplayResolvedComments": "Resolved Comments", "SSE.Views.Settings.textDocInfo": "Spreadsheet Info", "SSE.Views.Settings.textDocTitle": "Spreadsheet title", "SSE.Views.Settings.textDone": "Done", @@ -519,48 +541,40 @@ "SSE.Views.Settings.textDownloadAs": "Download As...", "SSE.Views.Settings.textEditDoc": "Edit Document", "SSE.Views.Settings.textEmail": "email", + "SSE.Views.Settings.textExample": "Example", "SSE.Views.Settings.textFind": "Find", "SSE.Views.Settings.textFindAndReplace": "Find and Replace", + "SSE.Views.Settings.textFormat": "Format", + "SSE.Views.Settings.textFormulaLanguage": "Formula Language", "SSE.Views.Settings.textHelp": "Help", + "SSE.Views.Settings.textHideGridlines": "Hide Gridlines", + "SSE.Views.Settings.textHideHeadings": "Hide Headings", + "SSE.Views.Settings.textInch": "Inch", + "SSE.Views.Settings.textLandscape": "Landscape", + "SSE.Views.Settings.textLastModified": "Last Modified", + "SSE.Views.Settings.textLastModifiedBy": "Last Modified By", + "SSE.Views.Settings.textLeft": "Left", "SSE.Views.Settings.textLoading": "Loading...", + "SSE.Views.Settings.textMargins": "Margins", + "SSE.Views.Settings.textOrientation": "Orientation", + "SSE.Views.Settings.textOwner": "Owner", + "SSE.Views.Settings.textPoint": "Point", + "SSE.Views.Settings.textPortrait": "Portrait", "SSE.Views.Settings.textPoweredBy": "Powered by", "SSE.Views.Settings.textPrint": "Print", - "SSE.Views.Settings.textSettings": "Settings", - "SSE.Views.Settings.textTel": "tel", - "SSE.Views.Settings.textVersion": "Version", - "SSE.Views.Settings.textApplicationSettings": "Application Settings", - "SSE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement", - "SSE.Views.Settings.textCentimeter": "Centimeter", - "SSE.Views.Settings.textPoint": "Point", - "SSE.Views.Settings.textInch": "Inch", - "SSE.Views.Settings.textColorSchemes": "Color Schemes", - "SSE.Views.Settings.textSpreadsheetSettings": "Spreadsheet Settings", - "SSE.Views.Settings.textHideHeadings": "Hide Headings", - "SSE.Views.Settings.textHideGridlines": "Hide Gridlines", - "SSE.Views.Settings.textOrientation": "Orientation", - "SSE.Views.Settings.textPortrait": "Portrait", - "SSE.Views.Settings.textLandscape": "Landscape", - "SSE.Views.Settings.textFormat": "Format", - "SSE.Views.Settings.textSpreadsheetFormats": "Spreadsheet Formats", - "SSE.Views.Settings.textCustom": "Custom", - "SSE.Views.Settings.textCustomSize": "Custom Size", - "SSE.Views.Settings.textMargins": "Margins", - "SSE.Views.Settings.textTop": "Top", - "SSE.Views.Settings.textLeft": "Left", - "SSE.Views.Settings.textBottom": "Bottom", - "SSE.Views.Settings.textRight": "Right", - "SSE.Views.Settings.unknownText": "Unknown", - "SSE.Views.Settings.textFormulaLanguage": "Formula Language", - "SSE.Views.Settings.textExample": "Example", - "SSE.Views.Settings.textCollaboration": "Collaboration", "SSE.Views.Settings.textR1C1Style": "R1C1 Reference Style", "SSE.Views.Settings.textRegionalSettings": "Regional Settings", - "SSE.Views.Toolbar.textBack": "Back", - "SSE.Views.Collaboration.textCollaboration": "Collaboration", - "SSE.Views.Collaboration.textСomments": "Сomments", - "SSE.Views.Collaboration.textBack": "Back", - "SSE.Views.Collaboration.textEditUsers": "Users", - "SSE.Views.FilterOptions.textFilter": "Filter Options", - "SSE.Views.FilterOptions.textClearFilter": "Clear Filter", - "SSE.Views.FilterOptions.textDeleteFilter": "Delete Filter" + "SSE.Views.Settings.textRight": "Right", + "SSE.Views.Settings.textSettings": "Settings", + "SSE.Views.Settings.textSpreadsheetFormats": "Spreadsheet Formats", + "SSE.Views.Settings.textSpreadsheetSettings": "Spreadsheet Settings", + "SSE.Views.Settings.textSubject": "Subject", + "SSE.Views.Settings.textTel": "tel", + "SSE.Views.Settings.textTitle": "Title", + "SSE.Views.Settings.textTop": "Top", + "SSE.Views.Settings.textUnitOfMeasurement": "Unit of Measurement", + "SSE.Views.Settings.textUploaded": "Uploaded", + "SSE.Views.Settings.textVersion": "Version", + "SSE.Views.Settings.unknownText": "Unknown", + "SSE.Views.Toolbar.textBack": "Back" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index f362126a4..bf1c0ad3c 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -1,8 +1,13 @@ { + "Common.Controllers.Collaboration.textEditUser": "Actualmente el documento está siendo editado por múltiples usuarios.", "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar", "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textBack": "Atrás", + "Common.Views.Collaboration.textCollaboration": "Colaboración", + "Common.Views.Collaboration.textEditUsers": "Usuarios", + "Common.Views.Collaboration.textСomments": "Comentarios", "SSE.Controllers.AddChart.txtDiagramTitle": "Título de gráfico", "SSE.Controllers.AddChart.txtSeries": "Serie", "SSE.Controllers.AddChart.txtXAxis": "Eje X", @@ -22,12 +27,14 @@ "SSE.Controllers.DocumentHolder.menuCut": "Cortar", "SSE.Controllers.DocumentHolder.menuDelete": "Eliminar", "SSE.Controllers.DocumentHolder.menuEdit": "Editar", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Inmovilizar paneles", "SSE.Controllers.DocumentHolder.menuHide": "Ocultar", "SSE.Controllers.DocumentHolder.menuMerge": "Unir", "SSE.Controllers.DocumentHolder.menuMore": "Más", "SSE.Controllers.DocumentHolder.menuOpenLink": "Abrir enlace", "SSE.Controllers.DocumentHolder.menuPaste": "Pegar", "SSE.Controllers.DocumentHolder.menuShow": "Mostrar", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Movilizar paneles", "SSE.Controllers.DocumentHolder.menuUnmerge": "Anular combinación", "SSE.Controllers.DocumentHolder.menuUnwrap": "Desenvolver", "SSE.Controllers.DocumentHolder.menuWrap": "Envoltura", @@ -92,6 +99,10 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Rango de datos interno", "SSE.Controllers.EditHyperlink.textInvalidRange": "Rango de celdas inválido", "SSE.Controllers.EditHyperlink.txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\"", + "SSE.Controllers.FilterOptions.textEmptyItem": "{Vacíos}", + "SSE.Controllers.FilterOptions.textErrorMsg": "Usted debe seleccionar al menos un valor", + "SSE.Controllers.FilterOptions.textErrorTitle": "Aviso", + "SSE.Controllers.FilterOptions.textSelectAll": "Seleccionar todo", "SSE.Controllers.Main.advCSVOptions": "Elegir los parámetros de CSV", "SSE.Controllers.Main.advDRMEnterPassword": "Introduzca su contraseña:", "SSE.Controllers.Main.advDRMOptions": "Archivo protegido", @@ -102,7 +113,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.", "SSE.Controllers.Main.criticalErrorExtText": "Pulse 'OK' para volver a la lista de documentos.", "SSE.Controllers.Main.criticalErrorTitle": "Error", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Error en la descarga", "SSE.Controllers.Main.downloadMergeText": "Descargando...", "SSE.Controllers.Main.downloadMergeTitle": "Descargando", @@ -117,7 +127,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto", "SSE.Controllers.Main.errorChangeArray": "No se puede cambiar parte de una matriz.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. No se puede editar el documento ahora.", - "SSE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, verifique la configuración de conexión o póngase en contacto con el administrador.
      Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.
      Encuentre más información acerca de la conexión Servidor de Documentosaquí", + "SSE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.
      Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.

      Encuentre más información acerca de la conexión de Servidor de Documentos aquí", "SSE.Controllers.Main.errorCopyMultiselectArea": "No se puede usar este comando con varias selecciones.
      Seleccione un solo rango y intente de nuevo.", "SSE.Controllers.Main.errorCountArg": "Hay un error en la fórmula introducida.
      Se usa un número de argumentos incorrecto.", "SSE.Controllers.Main.errorCountArgExceed": "Un error en la fórmula introducida.
      Número de argumentos es excedido.", @@ -133,6 +143,7 @@ "SSE.Controllers.Main.errorFillRange": "No se puede rellenar el rango de celdas seleccionado.
      Todas las celdas seleccionadas deben tener el mismo tamaño.", "SSE.Controllers.Main.errorFormulaName": "Hay un error en la fórmula introducida.
      Se usa un nombre de fórmula incorrecto.", "SSE.Controllers.Main.errorFormulaParsing": "Error interno mientras analizando la fórmula.", + "SSE.Controllers.Main.errorFrmlMaxTextLength": "Valores de texto en fórmulas son limitados al número de caracteres - 255.
      Use la función CONCATENAR u operador de concatenación (&).", "SSE.Controllers.Main.errorFrmlWrongReferences": "La función se refiere a una hoja que no existe.
      Por favor, verifique los datos e inténtelo de nuevo.", "SSE.Controllers.Main.errorInvalidRef": "Introducir un nombre correcto para la selección o una referencia válida para pasar.", "SSE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido", @@ -203,7 +214,7 @@ "SSE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
      Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", "SSE.Controllers.Main.textDone": "Listo", "SSE.Controllers.Main.textLoadingDocument": "Cargando hoja de cálculo", - "SSE.Controllers.Main.textNoLicenseTitle": "Limitación en conexiones a ONLYOFFICE", + "SSE.Controllers.Main.textNoLicenseTitle": "%1 limitación de conexiones", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPaidFeature": "Función de pago", "SSE.Controllers.Main.textPassword": "Contraseña", @@ -270,7 +281,7 @@ "SSE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.
      Por favor, actualice su licencia y después recargue la página.", "SSE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.
      Por favor, contacte con su administrador para recibir más información.", "SSE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.
      Si se requiere más, por favor, considere comprar una licencia comercial.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Esta versión de editores %1 tiene ciertas limitaciones para usuarios simultáneos.
      Si necesita más, por favor, considere comprar una licencia comercial.", "SSE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.", "SSE.Controllers.Search.textNoTextFound": "Texto no encontrado", "SSE.Controllers.Search.textReplaceAll": "Reemplazar todo", @@ -482,21 +493,38 @@ "SSE.Views.EditText.textFonts": "Fuentes", "SSE.Views.EditText.textSize": "Tamaño", "SSE.Views.EditText.textTextColor": "Color de texto", + "SSE.Views.FilterOptions.textClearFilter": "Borrar filtro", + "SSE.Views.FilterOptions.textDeleteFilter": "Eliminar filtro", + "SSE.Views.FilterOptions.textFilter": "Opciones de filtro", + "SSE.Views.Search.textByColumns": "Por columnas", + "SSE.Views.Search.textByRows": "Por filas", "SSE.Views.Search.textDone": "Listo", "SSE.Views.Search.textFind": "Buscar", "SSE.Views.Search.textFindAndReplace": "Buscar y reemplazar", + "SSE.Views.Search.textFormulas": "Fórmulas ", + "SSE.Views.Search.textHighlightRes": "Resaltar resultados", + "SSE.Views.Search.textLookIn": "Buscar en", "SSE.Views.Search.textMatchCase": "Coincidir mayúsculas y minúsculas", "SSE.Views.Search.textMatchCell": "Coincidir celda", "SSE.Views.Search.textReplace": "Reemplazar", "SSE.Views.Search.textSearch": "Búsqueda", + "SSE.Views.Search.textSearchBy": "Búsqueda", "SSE.Views.Search.textSearchIn": "Buscar en", "SSE.Views.Search.textSheet": "Hoja", + "SSE.Views.Search.textValues": "Valores", "SSE.Views.Search.textWorkbook": "Libro de trabajo", "SSE.Views.Settings.textAbout": "Acerca de producto", "SSE.Views.Settings.textAddress": "dirección", + "SSE.Views.Settings.textApplicationSettings": "Ajustes de aplicación", "SSE.Views.Settings.textAuthor": "Autor", "SSE.Views.Settings.textBack": "Atrás", + "SSE.Views.Settings.textBottom": "Abajo ", + "SSE.Views.Settings.textCentimeter": "Centímetro", + "SSE.Views.Settings.textCollaboration": "Colaboración", + "SSE.Views.Settings.textColorSchemes": "Esquemas de color", "SSE.Views.Settings.textCreateDate": "Fecha de creación", + "SSE.Views.Settings.textCustom": "Personalizado", + "SSE.Views.Settings.textCustomSize": "Tamaño personalizado", "SSE.Views.Settings.textDocInfo": "Información sobre hoja de cálculo", "SSE.Views.Settings.textDocTitle": "Título de hoja de cálculo", "SSE.Views.Settings.textDone": "Listo", @@ -504,14 +532,33 @@ "SSE.Views.Settings.textDownloadAs": "Descargar como...", "SSE.Views.Settings.textEditDoc": "Editar documento", "SSE.Views.Settings.textEmail": "email", + "SSE.Views.Settings.textExample": "Ejemplo", "SSE.Views.Settings.textFind": "Buscar", "SSE.Views.Settings.textFindAndReplace": "Buscar y reemplazar", + "SSE.Views.Settings.textFormat": "Formato", + "SSE.Views.Settings.textFormulaLanguage": "Idioma de fórmulas", "SSE.Views.Settings.textHelp": "Ayuda", + "SSE.Views.Settings.textHideGridlines": "Ocultar líneas de la cuadrícula", + "SSE.Views.Settings.textHideHeadings": "Ocultar encabezados", + "SSE.Views.Settings.textInch": "Pulgada", + "SSE.Views.Settings.textLandscape": "Horizontal", + "SSE.Views.Settings.textLeft": "A la izquierda", "SSE.Views.Settings.textLoading": "Cargando...", + "SSE.Views.Settings.textMargins": "Márgenes", + "SSE.Views.Settings.textOrientation": "Orientación", + "SSE.Views.Settings.textPoint": "Punto", + "SSE.Views.Settings.textPortrait": "Vertical", "SSE.Views.Settings.textPoweredBy": "Desarrollado por", "SSE.Views.Settings.textPrint": "Imprimir", + "SSE.Views.Settings.textR1C1Style": "Estilo de referencia R1C1", + "SSE.Views.Settings.textRegionalSettings": "Configuración regional", + "SSE.Views.Settings.textRight": "A la derecha", "SSE.Views.Settings.textSettings": "Ajustes", + "SSE.Views.Settings.textSpreadsheetFormats": "Formatos de hoja de cálculo", + "SSE.Views.Settings.textSpreadsheetSettings": "Ajustes de hoja de cálculo", "SSE.Views.Settings.textTel": "Tel.", + "SSE.Views.Settings.textTop": "Arriba", + "SSE.Views.Settings.textUnitOfMeasurement": "Unidad de medida", "SSE.Views.Settings.textVersion": "Versión ", "SSE.Views.Settings.unknownText": "Desconocido", "SSE.Views.Toolbar.textBack": "Atrás" diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index 00c29e026..452934035 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -1,8 +1,13 @@ { + "Common.Controllers.Collaboration.textEditUser": "Le document est en cours de modification par plusieurs utilisateurs", "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textBack": "Retour", + "Common.Views.Collaboration.textCollaboration": "Collaboration", + "Common.Views.Collaboration.textEditUsers": "Utilisateurs", + "Common.Views.Collaboration.textСomments": "Commentaires", "SSE.Controllers.AddChart.txtDiagramTitle": "Titre du graphique", "SSE.Controllers.AddChart.txtSeries": "Série", "SSE.Controllers.AddChart.txtXAxis": "Axe X", @@ -22,12 +27,14 @@ "SSE.Controllers.DocumentHolder.menuCut": "Couper", "SSE.Controllers.DocumentHolder.menuDelete": "Supprimer", "SSE.Controllers.DocumentHolder.menuEdit": "Modifier", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Figer les volets", "SSE.Controllers.DocumentHolder.menuHide": "Masquer", "SSE.Controllers.DocumentHolder.menuMerge": "Fusionner", "SSE.Controllers.DocumentHolder.menuMore": "Plus", "SSE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien", "SSE.Controllers.DocumentHolder.menuPaste": "Coller", "SSE.Controllers.DocumentHolder.menuShow": "Afficher", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Libérer les volets", "SSE.Controllers.DocumentHolder.menuUnmerge": "Annuler la fusion", "SSE.Controllers.DocumentHolder.menuUnwrap": "Annuler le renvoi", "SSE.Controllers.DocumentHolder.menuWrap": "Renvoi à la ligne", @@ -92,6 +99,10 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Plage de données interne", "SSE.Controllers.EditHyperlink.textInvalidRange": "Plage de cellules non valide", "SSE.Controllers.EditHyperlink.txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\"", + "SSE.Controllers.FilterOptions.textEmptyItem": "{Vides}", + "SSE.Controllers.FilterOptions.textErrorMsg": "Vous devez choisir au moins une valeur", + "SSE.Controllers.FilterOptions.textErrorTitle": "Avertissement", + "SSE.Controllers.FilterOptions.textSelectAll": "Sélectionner tout", "SSE.Controllers.Main.advCSVOptions": "Choisir les paramètres CSV", "SSE.Controllers.Main.advDRMEnterPassword": "Entrez votre mot de passe:", "SSE.Controllers.Main.advDRMOptions": "Fichier protégé", @@ -102,7 +113,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.", "SSE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.", "SSE.Controllers.Main.criticalErrorTitle": "Erreur", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Échec du téléchargement.", "SSE.Controllers.Main.downloadMergeText": "Téléchargement en cours...", "SSE.Controllers.Main.downloadMergeTitle": "Téléchargement en cours", @@ -117,7 +127,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "L'URL d'image est incorrecte", "SSE.Controllers.Main.errorChangeArray": "Vous ne pouvez pas modifier des parties d'une tableau. ", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.", - "SSE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
      Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.

      Trouvez plus d'informations sur la connexion de Document Serverici", + "SSE.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", "SSE.Controllers.Main.errorCopyMultiselectArea": "Impossible d'exécuter cette commande sur des sélections multiples.
      Sélectionnez une seule plage et essayez à nouveau.", "SSE.Controllers.Main.errorCountArg": "Une erreur dans la formule entrée.
      Le nombre d'arguments utilisé est incorrect.", "SSE.Controllers.Main.errorCountArgExceed": "Une erreur dans la formule entrée.
      Le nombre d'arguments est dépassé.", @@ -133,6 +143,7 @@ "SSE.Controllers.Main.errorFillRange": "Il est impossible de remplir la plage de cellules sélectionnée.
      Toutes les cellules unies doivent être de la même taille.", "SSE.Controllers.Main.errorFormulaName": "Une erreur dans la formule entrée.
      Le nom de formule utilisé est incorrect.", "SSE.Controllers.Main.errorFormulaParsing": "Une erreur interne lors de l'analyse de la formule.", + "SSE.Controllers.Main.errorFrmlMaxTextLength": "Les valeurs de texte dans les formules sont limitées à 255 caractères.
      Utilisez la fonction CONCATENER ou l’opérateur de concaténation (&).", "SSE.Controllers.Main.errorFrmlWrongReferences": "La fonction fait référence à une feuille qui n'existe pas.
      Veuillez vérifier les données et réessayez.", "SSE.Controllers.Main.errorInvalidRef": "Entrez un nom correct pour la sélection ou une référence valable pour aller à.", "SSE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu", @@ -482,21 +493,38 @@ "SSE.Views.EditText.textFonts": "Polices", "SSE.Views.EditText.textSize": "Taille", "SSE.Views.EditText.textTextColor": "Couleur du texte", + "SSE.Views.FilterOptions.textClearFilter": "Effacer le filtre", + "SSE.Views.FilterOptions.textDeleteFilter": "Supprimer le filtre", + "SSE.Views.FilterOptions.textFilter": "Options de filtre", + "SSE.Views.Search.textByColumns": "Par colonnes", + "SSE.Views.Search.textByRows": "Par lignes", "SSE.Views.Search.textDone": "Terminé", "SSE.Views.Search.textFind": "Trouver", "SSE.Views.Search.textFindAndReplace": "Rechercher et remplacer", + "SSE.Views.Search.textFormulas": "Formules", + "SSE.Views.Search.textHighlightRes": "Surligner les résultats", + "SSE.Views.Search.textLookIn": "Rechercher dans", "SSE.Views.Search.textMatchCase": "Respecter la casse", "SSE.Views.Search.textMatchCell": "Respecter la cellule", "SSE.Views.Search.textReplace": "Remplacer", "SSE.Views.Search.textSearch": "Rechercher", + "SSE.Views.Search.textSearchBy": "Recherche", "SSE.Views.Search.textSearchIn": "Сhamp de recherche", "SSE.Views.Search.textSheet": "Feuille", + "SSE.Views.Search.textValues": "Valeurs", "SSE.Views.Search.textWorkbook": "Classeur", "SSE.Views.Settings.textAbout": "A propos", "SSE.Views.Settings.textAddress": "adresse", + "SSE.Views.Settings.textApplicationSettings": "Paramètres de l'application", "SSE.Views.Settings.textAuthor": "Auteur", "SSE.Views.Settings.textBack": "Retour", + "SSE.Views.Settings.textBottom": "En bas", + "SSE.Views.Settings.textCentimeter": "Centimètre", + "SSE.Views.Settings.textCollaboration": "Collaboration", + "SSE.Views.Settings.textColorSchemes": "Jeux de couleurs", "SSE.Views.Settings.textCreateDate": "Date de création", + "SSE.Views.Settings.textCustom": "Personnalisé", + "SSE.Views.Settings.textCustomSize": "Taille personnalisée", "SSE.Views.Settings.textDocInfo": "Infos sur tableur", "SSE.Views.Settings.textDocTitle": "Titre du classeur", "SSE.Views.Settings.textDone": "Terminé", @@ -504,14 +532,33 @@ "SSE.Views.Settings.textDownloadAs": "Télécharger comme...", "SSE.Views.Settings.textEditDoc": "Modifier", "SSE.Views.Settings.textEmail": "e-mail", + "SSE.Views.Settings.textExample": "Example", "SSE.Views.Settings.textFind": "Trouver", "SSE.Views.Settings.textFindAndReplace": "Rechercher et remplacer", + "SSE.Views.Settings.textFormat": "Format", + "SSE.Views.Settings.textFormulaLanguage": "La formule de langue", "SSE.Views.Settings.textHelp": "Aide", + "SSE.Views.Settings.textHideGridlines": "Masquer le quadrillage", + "SSE.Views.Settings.textHideHeadings": "Masquer les en-têtes", + "SSE.Views.Settings.textInch": "Pouce", + "SSE.Views.Settings.textLandscape": "Paysage", + "SSE.Views.Settings.textLeft": "À gauche", "SSE.Views.Settings.textLoading": "Chargement en cours...", + "SSE.Views.Settings.textMargins": "Marges", + "SSE.Views.Settings.textOrientation": "Orientation", + "SSE.Views.Settings.textPoint": "Point", + "SSE.Views.Settings.textPortrait": "Portrait", "SSE.Views.Settings.textPoweredBy": "Propulsé par ", "SSE.Views.Settings.textPrint": "Imprimer", + "SSE.Views.Settings.textR1C1Style": "Style de référence L1C1", + "SSE.Views.Settings.textRegionalSettings": "Paramètres régionaux", + "SSE.Views.Settings.textRight": "À droit", "SSE.Views.Settings.textSettings": "Paramètres", + "SSE.Views.Settings.textSpreadsheetFormats": "Formats de feuille de calcul", + "SSE.Views.Settings.textSpreadsheetSettings": "Paramètres de feuille de calcul", "SSE.Views.Settings.textTel": "tél.", + "SSE.Views.Settings.textTop": "En haut", + "SSE.Views.Settings.textUnitOfMeasurement": "Unité de mesure", "SSE.Views.Settings.textVersion": "Version", "SSE.Views.Settings.unknownText": "Inconnu", "SSE.Views.Toolbar.textBack": "Retour" diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json index e1dca4563..d538972dc 100644 --- a/apps/spreadsheeteditor/mobile/locale/hu.json +++ b/apps/spreadsheeteditor/mobile/locale/hu.json @@ -1,8 +1,13 @@ { + "Common.Controllers.Collaboration.textEditUser": "A dokumentumot jelenleg több felhasználó szerkeszti.", "Common.UI.ThemeColorPalette.textStandartColors": "Sztenderd színek", "Common.UI.ThemeColorPalette.textThemeColors": "Téma színek", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textBack": "Vissza", + "Common.Views.Collaboration.textCollaboration": "Együttműködés", + "Common.Views.Collaboration.textEditUsers": "Felhasználók", + "Common.Views.Collaboration.textСomments": "Hozzászólások", "SSE.Controllers.AddChart.txtDiagramTitle": "Diagram címe", "SSE.Controllers.AddChart.txtSeries": "Sorozatok", "SSE.Controllers.AddChart.txtXAxis": "X tengely", @@ -22,12 +27,14 @@ "SSE.Controllers.DocumentHolder.menuCut": "Kivág", "SSE.Controllers.DocumentHolder.menuDelete": "Töröl", "SSE.Controllers.DocumentHolder.menuEdit": "Szerkeszt", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Panelek rögzítése", "SSE.Controllers.DocumentHolder.menuHide": "Elrejt", "SSE.Controllers.DocumentHolder.menuMerge": "Összevon", "SSE.Controllers.DocumentHolder.menuMore": "Még", "SSE.Controllers.DocumentHolder.menuOpenLink": "Link megnyitása", "SSE.Controllers.DocumentHolder.menuPaste": "Beilleszt", "SSE.Controllers.DocumentHolder.menuShow": "Mutat", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Rögzítés eltávolítása", "SSE.Controllers.DocumentHolder.menuUnmerge": "Szétválaszt", "SSE.Controllers.DocumentHolder.menuUnwrap": "Tördelés megszüntetése", "SSE.Controllers.DocumentHolder.menuWrap": "Tördel", @@ -92,6 +99,9 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Belső adattartomány", "SSE.Controllers.EditHyperlink.textInvalidRange": "Érvénytelen cellatartomány", "SSE.Controllers.EditHyperlink.txtNotUrl": "A mező URL-címének a \"http://www.example.com\" formátumban kell lennie", + "SSE.Controllers.FilterOptions.textErrorMsg": "Legalább egy értéket ki kell választania", + "SSE.Controllers.FilterOptions.textErrorTitle": "Figyelmeztetés", + "SSE.Controllers.FilterOptions.textSelectAll": "Összes kiválasztása", "SSE.Controllers.Main.advCSVOptions": "Válasszon a CSV beállítások közül", "SSE.Controllers.Main.advDRMEnterPassword": "Adja meg a jelszavát:", "SSE.Controllers.Main.advDRMOptions": "Védett fájl", @@ -102,7 +112,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Időtúllépés az átalakítás során.", "SSE.Controllers.Main.criticalErrorExtText": "Nyomja meg az \"OK\"-t a dokumentumok listájához.", "SSE.Controllers.Main.criticalErrorTitle": "Hiba", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Táblázatkezelő", "SSE.Controllers.Main.downloadErrorText": "Sikertelen letöltés.", "SSE.Controllers.Main.downloadMergeText": "Letöltés...", "SSE.Controllers.Main.downloadMergeTitle": "Letöltés", @@ -117,7 +126,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "Hibás kép URL", "SSE.Controllers.Main.errorChangeArray": "Nem módosíthatja a tömb egy részét.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Elveszett a kapcsolat a szerverrel. A dokumentum jelenleg nem szerkeszthető.", - "SSE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", + "SSE.Controllers.Main.errorConnectToServer": "A dokumentum mentése nem lehetséges. Kérjük ellenőrizze a kapcsolódási beállításokat vagy lépjen kapcsolatba a rendszer adminisztrátorral.
      Ha az 'OK'-ra kattint letöltheti a dokumentumot.

      Bővebb információk a Dokumentum Szerverhez kapcsolódásról itt találhat.", "SSE.Controllers.Main.errorCopyMultiselectArea": "Ez a parancs nem használható többes kiválasztással.
      Válasszon ki egy tartományt és próbálja újra.", "SSE.Controllers.Main.errorCountArg": "Hiba a megadott képletben.
      Nem megfelelő számú argumentum használata.", "SSE.Controllers.Main.errorCountArgExceed": "Hiba a megadott képletben.
      Az argumentumok száma túllépve.", @@ -203,7 +212,7 @@ "SSE.Controllers.Main.textCustomLoader": "Kérjük, vegye figyelembe, hogy az engedély feltételei szerint nem jogosult a betöltő cseréjére.
      Kérjük, forduljon értékesítési osztályunkhoz, hogy árajánlatot kapjon.", "SSE.Controllers.Main.textDone": "Kész", "SSE.Controllers.Main.textLoadingDocument": "Munkafüzet betöltése", - "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE kapcsolódási limitáció", + "SSE.Controllers.Main.textNoLicenseTitle": "%1 kapcsoat limit", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPaidFeature": "Fizetett funkció", "SSE.Controllers.Main.textPassword": "Jelszó", @@ -265,11 +274,12 @@ "SSE.Controllers.Main.uploadImageSizeMessage": "A maximális képmérethatár túllépve.", "SSE.Controllers.Main.uploadImageTextText": "Kép feltöltése...", "SSE.Controllers.Main.uploadImageTitleText": "Kép feltöltése", + "SSE.Controllers.Main.waitText": "Kérjük várjon...", "SSE.Controllers.Main.warnLicenseExceeded": "A párhuzamos kapcsolódások száma elérte a maximumot, így a dokumentum csak olvasható módban nyílik meg.
      Kérjük lépjen kapcsolatba a rendszer adminisztrátorral bővebb információkért.", "SSE.Controllers.Main.warnLicenseExp": "A licence lejárt.
      Kérem frissítse a licencét, majd az oldalt.", "SSE.Controllers.Main.warnLicenseUsersExceeded": "A párhuzamos felhasználók száma elérte a maximumot, így a dokumentum csak olvasható módban nyílik meg.
      Kérjük lépjen kapcsolatba a rendszer adminisztrátorral bővebb információkért.", "SSE.Controllers.Main.warnNoLicense": "Ez a verziója az ONLYOFFICE Szerkesztőnek bizonyos limitációkat tartalmaz párhuzamos kapcsolódások terén a dokumentum szerverhez.
      Amennyiben többre van szüksége, fontolja meg hogy kereskedelmi licenc megvásárlását.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Ez a verziója az ONLYOFFICE Szerkesztőnek bizonyos limitációkat tartalmaz párhuzamosan kapcsolódott felhasználók terén.
      Amennyiben többre van szüksége, fontolja meg hogy kereskedelmi licenc megvásárlását.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Ez a verziója az %1 Szerkesztőnek bizonyos limitációkat tartalmaz párhuzamosan kapcsolódott felhasználók terén.
      Amennyiben többre van szüksége, fontolja meg hogy kereskedelmi licenc megvásárlását.", "SSE.Controllers.Main.warnProcessRightsChange": "Nincs joga szerkeszteni a fájl-t.", "SSE.Controllers.Search.textNoTextFound": "A szöveg nem található", "SSE.Controllers.Search.textReplaceAll": "Mindent cserél", @@ -481,21 +491,38 @@ "SSE.Views.EditText.textFonts": "Betűtípusok", "SSE.Views.EditText.textSize": "Méret", "SSE.Views.EditText.textTextColor": "Szöveg szín", + "SSE.Views.FilterOptions.textClearFilter": "Szűrő törlése", + "SSE.Views.FilterOptions.textDeleteFilter": "Szűrő törlése", + "SSE.Views.FilterOptions.textFilter": "Szűrő beállítások", + "SSE.Views.Search.textByColumns": "Oszlopoktól", + "SSE.Views.Search.textByRows": "Soroktól", "SSE.Views.Search.textDone": "Kész", "SSE.Views.Search.textFind": "Keres", "SSE.Views.Search.textFindAndReplace": "Keres és cserél", + "SSE.Views.Search.textFormulas": "Képletek", + "SSE.Views.Search.textHighlightRes": "Eredmények kiemelése", + "SSE.Views.Search.textLookIn": "Keres", "SSE.Views.Search.textMatchCase": "Egyezés esete", "SSE.Views.Search.textMatchCell": "Egyező cella", "SSE.Views.Search.textReplace": "Cserél", "SSE.Views.Search.textSearch": "Keresés", + "SSE.Views.Search.textSearchBy": "Keresés", "SSE.Views.Search.textSearchIn": "Keresés", "SSE.Views.Search.textSheet": "Munkalap", + "SSE.Views.Search.textValues": "Értékek", "SSE.Views.Search.textWorkbook": "Munkafüzet", "SSE.Views.Settings.textAbout": "Névjegy", "SSE.Views.Settings.textAddress": "Cím", + "SSE.Views.Settings.textApplicationSettings": "Alkalmazás beállítások", "SSE.Views.Settings.textAuthor": "Szerző", "SSE.Views.Settings.textBack": "Vissza", + "SSE.Views.Settings.textBottom": "Alsó", + "SSE.Views.Settings.textCentimeter": "Centiméter", + "SSE.Views.Settings.textCollaboration": "Együttműködés", + "SSE.Views.Settings.textColorSchemes": "Szín sémák", "SSE.Views.Settings.textCreateDate": "Létrehozás dátuma", + "SSE.Views.Settings.textCustom": "Egyéni", + "SSE.Views.Settings.textCustomSize": "Egyéni méret", "SSE.Views.Settings.textDocInfo": "Munkafüzet infó", "SSE.Views.Settings.textDocTitle": "Munkafüzet cím", "SSE.Views.Settings.textDone": "Kész", @@ -503,14 +530,33 @@ "SSE.Views.Settings.textDownloadAs": "Letöltés mint...", "SSE.Views.Settings.textEditDoc": "Dokumentum szerkesztése", "SSE.Views.Settings.textEmail": "Email", + "SSE.Views.Settings.textExample": "Példa", "SSE.Views.Settings.textFind": "Keres", "SSE.Views.Settings.textFindAndReplace": "Keres és cserél", + "SSE.Views.Settings.textFormat": "Formátum", + "SSE.Views.Settings.textFormulaLanguage": "Képlet nyelve", "SSE.Views.Settings.textHelp": "Súgó", + "SSE.Views.Settings.textHideGridlines": "Rácsvonalak elrejtése", + "SSE.Views.Settings.textHideHeadings": "Fejlécek elrejtése", + "SSE.Views.Settings.textInch": "Hüvelyk", + "SSE.Views.Settings.textLandscape": "Fekvő", + "SSE.Views.Settings.textLeft": "Bal", "SSE.Views.Settings.textLoading": "Betöltés...", + "SSE.Views.Settings.textMargins": "Margók", + "SSE.Views.Settings.textOrientation": "Tájolás", + "SSE.Views.Settings.textPoint": "Pont", + "SSE.Views.Settings.textPortrait": "Álló", "SSE.Views.Settings.textPoweredBy": "Powered by", "SSE.Views.Settings.textPrint": "Nyomtat", + "SSE.Views.Settings.textR1C1Style": "R1C1 Reference Style", + "SSE.Views.Settings.textRegionalSettings": "Területi beállítások", + "SSE.Views.Settings.textRight": "Jobb", "SSE.Views.Settings.textSettings": "Beállítások", + "SSE.Views.Settings.textSpreadsheetFormats": "Munkafüzet formátumok", + "SSE.Views.Settings.textSpreadsheetSettings": "Munkafüzet beállításai", "SSE.Views.Settings.textTel": "Tel.", + "SSE.Views.Settings.textTop": "Felső", + "SSE.Views.Settings.textUnitOfMeasurement": "Mérési egység", "SSE.Views.Settings.textVersion": "Verzió", "SSE.Views.Settings.unknownText": "Ismeretlen", "SSE.Views.Toolbar.textBack": "Vissza" diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 3febf189c..f68d71363 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -1,8 +1,13 @@ { + "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textBack": "Indietro", + "Common.Views.Collaboration.textCollaboration": "Collaborazione", + "Common.Views.Collaboration.textEditUsers": "Utenti", + "Common.Views.Collaboration.textСomments": "Сommenti", "SSE.Controllers.AddChart.txtDiagramTitle": "Titolo del grafico", "SSE.Controllers.AddChart.txtSeries": "Serie", "SSE.Controllers.AddChart.txtXAxis": "Asse X", @@ -22,12 +27,14 @@ "SSE.Controllers.DocumentHolder.menuCut": "Taglia", "SSE.Controllers.DocumentHolder.menuDelete": "Elimina", "SSE.Controllers.DocumentHolder.menuEdit": "Modifica", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Blocca riquadri", "SSE.Controllers.DocumentHolder.menuHide": "Nascondi", "SSE.Controllers.DocumentHolder.menuMerge": "Unisci", "SSE.Controllers.DocumentHolder.menuMore": "Altro", "SSE.Controllers.DocumentHolder.menuOpenLink": "Apri collegamento", "SSE.Controllers.DocumentHolder.menuPaste": "Incolla", "SSE.Controllers.DocumentHolder.menuShow": "Mostra", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Sblocca i riquadri", "SSE.Controllers.DocumentHolder.menuUnmerge": "Dissocia", "SSE.Controllers.DocumentHolder.menuUnwrap": "Scarta", "SSE.Controllers.DocumentHolder.menuWrap": "Racchiudi", @@ -92,6 +99,10 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Intervallo di dati interno", "SSE.Controllers.EditHyperlink.textInvalidRange": "Intervallo celle non valido", "SSE.Controllers.EditHyperlink.txtNotUrl": "Questo campo deve contenere un URL nel formato \"http://www.example.com\"", + "SSE.Controllers.FilterOptions.textEmptyItem": "{Blanks}", + "SSE.Controllers.FilterOptions.textErrorMsg": "Devi selezionare almeno un valore", + "SSE.Controllers.FilterOptions.textErrorTitle": "Avviso", + "SSE.Controllers.FilterOptions.textSelectAll": "Seleziona tutto", "SSE.Controllers.Main.advCSVOptions": "Scegli opzioni CSV", "SSE.Controllers.Main.advDRMEnterPassword": "Inserisci la password:", "SSE.Controllers.Main.advDRMOptions": "File protetto", @@ -102,7 +113,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "È stato superato il tempo limite della conversione.", "SSE.Controllers.Main.criticalErrorExtText": "Clicca 'OK' per tornare alla lista documento", "SSE.Controllers.Main.criticalErrorTitle": "Errore", - "SSE.Controllers.Main.defaultTitleText": "Editor dei fogli di calcolo ONLYOFFICE® ", "SSE.Controllers.Main.downloadErrorText": "Download non riuscito.", "SSE.Controllers.Main.downloadMergeText": "Scaricamento in corso...", "SSE.Controllers.Main.downloadMergeTitle": "Scaricamento", @@ -117,7 +127,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "URL dell'immagine errato", "SSE.Controllers.Main.errorChangeArray": "Non è possibile modificare parte di un array.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.", - "SSE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", + "SSE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.
      Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.

      Per maggiori dettagli sulla connessione al Document Server clicca qui", "SSE.Controllers.Main.errorCopyMultiselectArea": "Questo comando non può essere applicato a selezioni multiple.
      Seleziona un intervallo singolo e riprova.", "SSE.Controllers.Main.errorCountArg": "Un errore nella formula inserita.
      E' stato utilizzato un numero di argomento scorretto.", "SSE.Controllers.Main.errorCountArgExceed": "Un errore nella formula inserita.
      E' stato superato il numero di argomenti.", @@ -133,6 +143,7 @@ "SSE.Controllers.Main.errorFillRange": "Impossibile riempire l'intervallo di celle selezionato.
      Tutte le celle uite devono essere della stessa dimensione.", "SSE.Controllers.Main.errorFormulaName": "Un errore nella formula inserita.
      È stato usato un nome errato per la formula.", "SSE.Controllers.Main.errorFormulaParsing": "Si è verificato un errore durante l'analisi della formula.", + "SSE.Controllers.Main.errorFrmlMaxTextLength": "I valori di testo nelle formule sono limitati a 255 caratteri.
      Utilizzare la funzione CONCATENATE o l'operatore di concatenazione (&).
      ", "SSE.Controllers.Main.errorFrmlWrongReferences": "La funzione si riferisce a un foglio inesistente.
      Verifica i dati e riprova.", "SSE.Controllers.Main.errorInvalidRef": "Inserisci un nome valido per la selezione o una referenza valida per andare a", "SSE.Controllers.Main.errorKeyEncrypt": "Descrittore di chiave sconosciuto", @@ -203,7 +214,7 @@ "SSE.Controllers.Main.textCustomLoader": "Si noti che in base ai termini della licenza non si ha il diritto di cambiare il caricatore.
      Si prega di contattare il nostro ufficio vendite per ottenere un preventivo.", "SSE.Controllers.Main.textDone": "Fatto", "SSE.Controllers.Main.textLoadingDocument": "Caricamento del foglio di calcolo", - "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "SSE.Controllers.Main.textNoLicenseTitle": "%1 limite connessione", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "SSE.Controllers.Main.textPassword": "Password", @@ -219,7 +230,7 @@ "SSE.Controllers.Main.txtArt": "Il tuo testo qui", "SSE.Controllers.Main.txtBasicShapes": "Forme di base", "SSE.Controllers.Main.txtButtons": "Bottoni", - "SSE.Controllers.Main.txtCallouts": "Chiamate", + "SSE.Controllers.Main.txtCallouts": "Callout", "SSE.Controllers.Main.txtCharts": "Grafici", "SSE.Controllers.Main.txtDelimiter": "Delimitatore", "SSE.Controllers.Main.txtDiagramTitle": "Titolo del grafico", @@ -270,7 +281,7 @@ "SSE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.
      Si prega di aggiornare la licenza e ricaricare la pagina.", "SSE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione.
      Per ulteriori informazioni, contattare l'amministratore.", "SSE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.
      Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei.
      Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di %1 presenta alcune limitazioni per gli utenti simultanei.
      Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.", "SSE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.", "SSE.Controllers.Search.textNoTextFound": "Testo non trovato", "SSE.Controllers.Search.textReplaceAll": "Sostituisci tutto", @@ -482,21 +493,45 @@ "SSE.Views.EditText.textFonts": "Caratteri", "SSE.Views.EditText.textSize": "Dimensione", "SSE.Views.EditText.textTextColor": "Colore del testo", + "SSE.Views.FilterOptions.textClearFilter": "Svuota filtro", + "SSE.Views.FilterOptions.textDeleteFilter": "Elimina Filtro", + "SSE.Views.FilterOptions.textFilter": "Opzioni Filtro", + "SSE.Views.Search.textByColumns": "Per colonne", + "SSE.Views.Search.textByRows": "Per righe", "SSE.Views.Search.textDone": "Fatto", "SSE.Views.Search.textFind": "Trova", "SSE.Views.Search.textFindAndReplace": "Trova e sostituisci", + "SSE.Views.Search.textFormulas": "Formule", + "SSE.Views.Search.textHighlightRes": "Evidenzia risultati", + "SSE.Views.Search.textLookIn": "Cerca in", "SSE.Views.Search.textMatchCase": "Caso di corrispondenza", "SSE.Views.Search.textMatchCell": "Corrispondi cella", "SSE.Views.Search.textReplace": "Sostituisci", "SSE.Views.Search.textSearch": "Cerca", + "SSE.Views.Search.textSearchBy": "Cerca", "SSE.Views.Search.textSearchIn": "Cerca in", "SSE.Views.Search.textSheet": "Foglio", + "SSE.Views.Search.textValues": "Valori", "SSE.Views.Search.textWorkbook": "Cartella di lavoro", + "SSE.Views.Settings. textLocation": "Percorso", "SSE.Views.Settings.textAbout": "Informazioni su", "SSE.Views.Settings.textAddress": "Indirizzo", + "SSE.Views.Settings.textApplication": "Applicazione", + "SSE.Views.Settings.textApplicationSettings": "Impostazioni Applicazione", "SSE.Views.Settings.textAuthor": "Autore", "SSE.Views.Settings.textBack": "Indietro", + "SSE.Views.Settings.textBottom": "In basso", + "SSE.Views.Settings.textCentimeter": "Centimetro", + "SSE.Views.Settings.textCollaboration": "Collaborazione", + "SSE.Views.Settings.textColorSchemes": "Schemi di colore", + "SSE.Views.Settings.textComment": "Commento", + "SSE.Views.Settings.textCommentingDisplay": "Visualizzazione dei Commenti", + "SSE.Views.Settings.textCreated": "Creato", "SSE.Views.Settings.textCreateDate": "Data di creazione", + "SSE.Views.Settings.textCustom": "Personalizzato", + "SSE.Views.Settings.textCustomSize": "Dimensione personalizzata", + "SSE.Views.Settings.textDisplayComments": "Commenti", + "SSE.Views.Settings.textDisplayResolvedComments": "Commenti risolti", "SSE.Views.Settings.textDocInfo": "Informazioni del Foglio di calcolo", "SSE.Views.Settings.textDocTitle": "Titolo foglio elettronico", "SSE.Views.Settings.textDone": "Fatto", @@ -504,14 +539,39 @@ "SSE.Views.Settings.textDownloadAs": "Scarica come...", "SSE.Views.Settings.textEditDoc": "Modifica documento", "SSE.Views.Settings.textEmail": "email", + "SSE.Views.Settings.textExample": "Esempio", "SSE.Views.Settings.textFind": "Trova", "SSE.Views.Settings.textFindAndReplace": "Trova e sostituisci", + "SSE.Views.Settings.textFormat": "Formato", + "SSE.Views.Settings.textFormulaLanguage": "Lingua della Formula", "SSE.Views.Settings.textHelp": "Aiuto", + "SSE.Views.Settings.textHideGridlines": "Nascondi griglia", + "SSE.Views.Settings.textHideHeadings": "Nascondi titoli", + "SSE.Views.Settings.textInch": "Pollice", + "SSE.Views.Settings.textLandscape": "Orizzontale", + "SSE.Views.Settings.textLastModified": "Ultima modifica", + "SSE.Views.Settings.textLastModifiedBy": "Ultima modifica di", + "SSE.Views.Settings.textLeft": "A sinistra", "SSE.Views.Settings.textLoading": "Caricamento in corso...", + "SSE.Views.Settings.textMargins": "Margini", + "SSE.Views.Settings.textOrientation": "Orientamento", + "SSE.Views.Settings.textOwner": "Proprietario", + "SSE.Views.Settings.textPoint": "Punto", + "SSE.Views.Settings.textPortrait": "Verticale", "SSE.Views.Settings.textPoweredBy": "Con tecnologia", "SSE.Views.Settings.textPrint": "Stampa", + "SSE.Views.Settings.textR1C1Style": "Stile di riferimento R1C1", + "SSE.Views.Settings.textRegionalSettings": "Impostazioni Regionali", + "SSE.Views.Settings.textRight": "A destra", "SSE.Views.Settings.textSettings": "Impostazioni", + "SSE.Views.Settings.textSpreadsheetFormats": "Formati foglio di calcolo", + "SSE.Views.Settings.textSpreadsheetSettings": "Impostazioni foglio di calcolo", + "SSE.Views.Settings.textSubject": "Oggetto", "SSE.Views.Settings.textTel": "Tel.", + "SSE.Views.Settings.textTitle": "Titolo", + "SSE.Views.Settings.textTop": "In alto", + "SSE.Views.Settings.textUnitOfMeasurement": "Unità di misura", + "SSE.Views.Settings.textUploaded": "Caricato", "SSE.Views.Settings.textVersion": "Versione", "SSE.Views.Settings.unknownText": "Sconosciuto", "SSE.Views.Toolbar.textBack": "Indietro" diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json index f624b3893..9492ec6a4 100644 --- a/apps/spreadsheeteditor/mobile/locale/ko.json +++ b/apps/spreadsheeteditor/mobile/locale/ko.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "전환 시간 초과를 초과했습니다.", "SSE.Controllers.Main.criticalErrorExtText": "문서 목록으로 돌아가려면 '확인'을 누르십시오.", "SSE.Controllers.Main.criticalErrorTitle": "오류", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE 스프레드 시트 편집기", "SSE.Controllers.Main.downloadErrorText": "다운로드하지 못했습니다.", "SSE.Controllers.Main.downloadMergeText": "다운로드 중 ...", "SSE.Controllers.Main.downloadMergeTitle": "다운로드 중", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "영역에 필터링 된 셀이 포함되어있어 작업을 수행 할 수 없습니다.
      필터링 된 요소를 숨김 해제하고 다시 시도하십시오.", "SSE.Controllers.Main.errorBadImageUrl": "이미지 URL이 잘못되었습니다.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "서버 연결이 끊어졌습니다. 문서를 지금 편집 할 수 없습니다.", - "SSE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", + "SSE.Controllers.Main.errorConnectToServer": "문서를 저장할 수 없습니다. 연결 설정을 확인하거나 관리자에게 문의하십시오.
      '확인'버튼을 클릭하면 문서를 다운로드하라는 메시지가 나타납니다.

      Document Server 연결에 대한 추가 정보 찾기 여기 ", "SSE.Controllers.Main.errorCopyMultiselectArea": "이 명령은 여러 선택 항목과 함께 사용할 수 없습니다.
      단일 범위를 선택하고 다시 시도하십시오.", "SSE.Controllers.Main.errorCountArg": "입력 된 수식에 오류가 있습니다.
      잘못된 수의 인수가 사용되었습니다.", "SSE.Controllers.Main.errorCountArgExceed": "입력 된 수식에 오류가 있습니다.
      인수 수가 초과되었습니다.", diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json index 23caee718..2d3d18f30 100644 --- a/apps/spreadsheeteditor/mobile/locale/lv.json +++ b/apps/spreadsheeteditor/mobile/locale/lv.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Konversijas taimauts pārsniegts.", "SSE.Controllers.Main.criticalErrorExtText": "Nospiediet \"OK\", lai atgrieztos dokumentu sarakstā.", "SSE.Controllers.Main.criticalErrorTitle": "Kļūda", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Lejuplāde neizdevās.", "SSE.Controllers.Main.downloadMergeText": "Lejupielādē...", "SSE.Controllers.Main.downloadMergeTitle": "Lejupielāde", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Darbību nevar veikt, jo apgabals satur filtrētas šūnas.
      Lūdzu, parādiet filtrētos elementus, un mēģiniet vēlreiz.", "SSE.Controllers.Main.errorBadImageUrl": "Nav pareizs attēla URL", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Pazaudēts servera savienojums. Šobrīd dokumentu nevar rediģēt.", - "SSE.Controllers.Main.errorConnectToServer": "Dokumentu nevarēja saglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot OK, jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk informācijas par Dokumentu servera pievienošanu šeit", + "SSE.Controllers.Main.errorConnectToServer": "Dokumentu neizdevās noglabāt. Lūdzu, pārbaudiet savienojuma uzstādījumus vai sazinieties ar savu administratoru.
      Nospiežot \"OK\", jūs varēsit lejupielādēt dokumentu.

      Uzziniet vairāk par dokumentu servera pieslēgšanu šeit", "SSE.Controllers.Main.errorCopyMultiselectArea": "Šo komandu nevar izmantot nesaistītiem diapazoniem.
      Izvēlieties vienu diapazonu un mēģiniet vēlreiz.", "SSE.Controllers.Main.errorCountArg": "Kļūda ievadītā formulā.
      Ir izmantots nepareizs argumentu skaits.", "SSE.Controllers.Main.errorCountArgExceed": "Kļūda ievadītā formulā.
      Ir pārsniegts argumentu skaits.", diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json index 9cd3b783c..55b74bd3f 100644 --- a/apps/spreadsheeteditor/mobile/locale/nl.json +++ b/apps/spreadsheeteditor/mobile/locale/nl.json @@ -102,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Time-out voor conversie overschreden.", "SSE.Controllers.Main.criticalErrorExtText": "Druk op \"OK\" om terug te gaan naar de lijst met documenten.", "SSE.Controllers.Main.criticalErrorTitle": "Fout", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Download mislukt.", "SSE.Controllers.Main.downloadMergeText": "Downloaden...", "SSE.Controllers.Main.downloadMergeTitle": "Downloaden", @@ -116,7 +115,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "De bewerking kan niet worden uitgevoerd omdat het gebied gefilterde cellen bevat.
      Maak het verbergen van de gefilterde elementen ongedaan en probeer het opnieuw.", "SSE.Controllers.Main.errorBadImageUrl": "URL afbeelding is onjuist", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbinding met server is verbroken. Het document kan op dit moment niet worden bewerkt.", - "SSE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd om het document te downloaden.

      Meer informatie over de verbinding met een documentserver is hier te vinden.", + "SSE.Controllers.Main.errorConnectToServer": "Het document kan niet worden opgeslagen. Controleer de verbindingsinstellingen of neem contact op met de beheerder.
      Wanneer u op de knop 'OK' klikt, wordt u gevraagd het document te downloaden.

      Meer informatie over verbindingen met de documentserver is hier te vinden.", "SSE.Controllers.Main.errorCopyMultiselectArea": "Deze opdracht kan niet worden uitgevoerd op meerdere selecties.
      Selecteer één bereik en probeer het opnieuw.", "SSE.Controllers.Main.errorCountArg": "De ingevoerde formule bevat een fout.
      Onjuist aantal argumenten gebruikt.", "SSE.Controllers.Main.errorCountArgExceed": "De ingevoerde formule bevat een fout.
      Aantal argumenten overschreden.", diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json index 9367af1e0..502fffab4 100644 --- a/apps/spreadsheeteditor/mobile/locale/pl.json +++ b/apps/spreadsheeteditor/mobile/locale/pl.json @@ -3,6 +3,7 @@ "Common.UI.ThemeColorPalette.textThemeColors": "Kolory motywu", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", + "Common.Views.Collaboration.textCollaboration": "Współpraca", "SSE.Controllers.AddChart.txtDiagramTitle": "Tytuł wykresu", "SSE.Controllers.AddChart.txtSeries": "Serie", "SSE.Controllers.AddChart.txtXAxis": "Oś X", @@ -101,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.", "SSE.Controllers.Main.criticalErrorExtText": "Naciśnij \"OK\" aby powrócić do listy dokumentów.", "SSE.Controllers.Main.criticalErrorTitle": "Błąd", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Edytor arkusza kalkulacyjnego", "SSE.Controllers.Main.downloadErrorText": "Pobieranie nieudane.", "SSE.Controllers.Main.downloadMergeText": "Pobieranie...", "SSE.Controllers.Main.downloadMergeTitle": "Pobieranie", @@ -115,7 +115,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Operacja nie może zostać wykonana, ponieważ obszar zawiera filtrowane komórki.
      Proszę ukryj filtrowane elementy i spróbuj ponownie.", "SSE.Controllers.Main.errorBadImageUrl": "Adres URL obrazu jest błędny", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.", - "SSE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", + "SSE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
      Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.

      Dowiedz się więcej o połączeniu serwera dokumentów tutaj", "SSE.Controllers.Main.errorCopyMultiselectArea": "To polecenie nie może być użyte z wieloma wyborami.
      Wybierz jeden zakres i spróbuj ponownie.", "SSE.Controllers.Main.errorCountArg": "Wprowadzona formuła jest błędna.
      Niepoprawna ilość argumentów.", "SSE.Controllers.Main.errorCountArgExceed": "Wprowadzona formuła jest błędna.
      Przekroczono liczbę argumentów.", @@ -467,6 +467,7 @@ "SSE.Views.Settings.textAddress": "Adres", "SSE.Views.Settings.textAuthor": "Autor", "SSE.Views.Settings.textBack": "Powrót", + "SSE.Views.Settings.textCollaboration": "Współpraca", "SSE.Views.Settings.textCreateDate": "Data utworzenia", "SSE.Views.Settings.textDocInfo": "Informacje o arkuszu kalkulacyjnym", "SSE.Views.Settings.textDocTitle": "Tytuł arkusza kalkulacyjnego", diff --git a/apps/spreadsheeteditor/mobile/locale/pt.json b/apps/spreadsheeteditor/mobile/locale/pt.json index a78af8dfc..5dbf197b4 100644 --- a/apps/spreadsheeteditor/mobile/locale/pt.json +++ b/apps/spreadsheeteditor/mobile/locale/pt.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Tempo limite de conversão excedido.", "SSE.Controllers.Main.criticalErrorExtText": "Pressione \"OK\" para voltar para a lista de documento.", "SSE.Controllers.Main.criticalErrorTitle": "Erro", - "SSE.Controllers.Main.defaultTitleText": "Editor de planilha ONLYOFFICE", "SSE.Controllers.Main.downloadErrorText": "Download falhou.", "SSE.Controllers.Main.downloadMergeText": "Baixando...", "SSE.Controllers.Main.downloadMergeTitle": "Baixando", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "A operação não pode ser realizada por que a área contém células filtrads.
      Torne visíveis os elementos fritados e tente novamente.", "SSE.Controllers.Main.errorBadImageUrl": "URL da imagem está incorreta", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Conexão com servidor perdida. O documento não pode ser editado neste momento.", - "SSE.Controllers.Main.errorConnectToServer": "O documento não pode ser salvo. Verifique as configurações de conexão ou entre em contato com o seu administrador.
      Quando você no botão \"OK\", poderá baixar o documento.

      Encontre mais informações sobre conectar o Document Server aqui", + "SSE.Controllers.Main.errorConnectToServer": "O documento não pôde ser salvo. Verifique as configurações de conexão ou entre em contato com o administrador.
      Quando você clicar no botão 'OK', você será solicitado à fazer o download do documento.

      Encontre mais informações sobre como conecta ao Document Server aqui", "SSE.Controllers.Main.errorCopyMultiselectArea": "Este comando não pode ser usado com várias seleções.
      Selecione um intervalo único e tente novamente.", "SSE.Controllers.Main.errorCountArg": "Um erro na fórmula inserida.
      Número incorreto de argumentos está sendo usado.", "SSE.Controllers.Main.errorCountArgExceed": "Um erro na fórmula inserida.
      Número de argumentos foi excedido.", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index ad969de46..7fcd2ece7 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -1,8 +1,13 @@ { + "Common.Controllers.Collaboration.textEditUser": "Документ редактируется несколькими пользователями.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "пт", + "Common.Views.Collaboration.textBack": "Назад", + "Common.Views.Collaboration.textCollaboration": "Совместная работа", + "Common.Views.Collaboration.textEditUsers": "Пользователи", + "Common.Views.Collaboration.textСomments": "Комментарии", "SSE.Controllers.AddChart.txtDiagramTitle": "Заголовок диаграммы", "SSE.Controllers.AddChart.txtSeries": "Ряд", "SSE.Controllers.AddChart.txtXAxis": "Ось X", @@ -22,12 +27,14 @@ "SSE.Controllers.DocumentHolder.menuCut": "Вырезать", "SSE.Controllers.DocumentHolder.menuDelete": "Удалить", "SSE.Controllers.DocumentHolder.menuEdit": "Редактировать", + "SSE.Controllers.DocumentHolder.menuFreezePanes": "Закрепить области", "SSE.Controllers.DocumentHolder.menuHide": "Скрыть", "SSE.Controllers.DocumentHolder.menuMerge": "Объединить", "SSE.Controllers.DocumentHolder.menuMore": "Ещё", "SSE.Controllers.DocumentHolder.menuOpenLink": "Перейти по ссылке", "SSE.Controllers.DocumentHolder.menuPaste": "Вставить", "SSE.Controllers.DocumentHolder.menuShow": "Показать", + "SSE.Controllers.DocumentHolder.menuUnfreezePanes": "Снять закрепление областей", "SSE.Controllers.DocumentHolder.menuUnmerge": "Разбить", "SSE.Controllers.DocumentHolder.menuUnwrap": "Убрать перенос", "SSE.Controllers.DocumentHolder.menuWrap": "Перенос текста", @@ -92,6 +99,10 @@ "SSE.Controllers.EditHyperlink.textInternalLink": "Внутренний диапазон данных", "SSE.Controllers.EditHyperlink.textInvalidRange": "Недопустимый диапазон ячеек", "SSE.Controllers.EditHyperlink.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", + "SSE.Controllers.FilterOptions.textEmptyItem": "{Пустые}", + "SSE.Controllers.FilterOptions.textErrorMsg": "Необходимо выбрать хотя бы одно значение", + "SSE.Controllers.FilterOptions.textErrorTitle": "Внимание", + "SSE.Controllers.FilterOptions.textSelectAll": "Выделить всё", "SSE.Controllers.Main.advCSVOptions": "Выбрать параметры CSV", "SSE.Controllers.Main.advDRMEnterPassword": "Введите пароль:", "SSE.Controllers.Main.advDRMOptions": "Защищенный файл", @@ -102,7 +113,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "SSE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.", "SSE.Controllers.Main.criticalErrorTitle": "Ошибка", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Загрузка не удалась.", "SSE.Controllers.Main.downloadMergeText": "Загрузка...", "SSE.Controllers.Main.downloadMergeTitle": "Загрузка", @@ -117,7 +127,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения", "SSE.Controllers.Main.errorChangeArray": "Нельзя изменить часть массива.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", - "SSE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", + "SSE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
      Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

      Дополнительную информацию о подключении Сервера документов можно найти здесь", "SSE.Controllers.Main.errorCopyMultiselectArea": "Данная команда неприменима для несвязных диапазонов.
      Выберите один диапазон и повторите попытку.", "SSE.Controllers.Main.errorCountArg": "Ошибка во введенной формуле.
      Использовано неверное количество аргументов.", "SSE.Controllers.Main.errorCountArgExceed": "Ошибка во введенной формуле.
      Превышено количество аргументов.", @@ -133,6 +143,7 @@ "SSE.Controllers.Main.errorFillRange": "Не удается заполнить выбранный диапазон ячеек.
      Все объединенные ячейки должны быть одного размера.", "SSE.Controllers.Main.errorFormulaName": "Ошибка во введенной формуле.
      Использовано неверное имя формулы.", "SSE.Controllers.Main.errorFormulaParsing": "Внутренняя ошибка при синтаксическом анализе формулы.", + "SSE.Controllers.Main.errorFrmlMaxTextLength": "Длина текстовых значений в формулах не может превышать 255 символов.
      Используйте функцию СЦЕПИТЬ или оператор сцепления (&).", "SSE.Controllers.Main.errorFrmlWrongReferences": "Функция ссылается на лист, который не существует.
      Проверьте данные и повторите попытку.", "SSE.Controllers.Main.errorInvalidRef": "Введите корректное имя для выделенного диапазона или допустимую ссылку для перехода.", "SSE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа", @@ -203,7 +214,7 @@ "SSE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
      Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", "SSE.Controllers.Main.textDone": "Готово", "SSE.Controllers.Main.textLoadingDocument": "Загрузка таблицы", - "SSE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE", + "SSE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений %1", "SSE.Controllers.Main.textOK": "OK", "SSE.Controllers.Main.textPaidFeature": "Платная функция", "SSE.Controllers.Main.textPassword": "Пароль", @@ -269,8 +280,8 @@ "SSE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.
      Обратитесь к администратору за дополнительной информацией.", "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
      Обновите лицензию, а затем обновите страницу.", "SSE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.
      Обратитесь к администратору за дополнительной информацией.", - "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.
      Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "SSE.Controllers.Search.textNoTextFound": "Текст не найден", "SSE.Controllers.Search.textReplaceAll": "Заменить все", @@ -482,21 +493,38 @@ "SSE.Views.EditText.textFonts": "Шрифты", "SSE.Views.EditText.textSize": "Размер", "SSE.Views.EditText.textTextColor": "Цвет текста", + "SSE.Views.FilterOptions.textClearFilter": "Очистить фильтр", + "SSE.Views.FilterOptions.textDeleteFilter": "Удалить фильтр", + "SSE.Views.FilterOptions.textFilter": "Параметры фильтра", + "SSE.Views.Search.textByColumns": "По столбцам", + "SSE.Views.Search.textByRows": "По строкам", "SSE.Views.Search.textDone": "Готово", "SSE.Views.Search.textFind": "Поиск", "SSE.Views.Search.textFindAndReplace": "Поиск и замена", + "SSE.Views.Search.textFormulas": "Формулы", + "SSE.Views.Search.textHighlightRes": "Выделить результаты", + "SSE.Views.Search.textLookIn": "Область поиска", "SSE.Views.Search.textMatchCase": "С учетом регистра", "SSE.Views.Search.textMatchCell": "Сопоставление ячеек", "SSE.Views.Search.textReplace": "Заменить", "SSE.Views.Search.textSearch": "Поиск", + "SSE.Views.Search.textSearchBy": "Поиск", "SSE.Views.Search.textSearchIn": "Область поиска", "SSE.Views.Search.textSheet": "Лист", + "SSE.Views.Search.textValues": "Значения", "SSE.Views.Search.textWorkbook": "Книга", "SSE.Views.Settings.textAbout": "О программе", "SSE.Views.Settings.textAddress": "адрес", + "SSE.Views.Settings.textApplicationSettings": "Настройки приложения", "SSE.Views.Settings.textAuthor": "Автор", "SSE.Views.Settings.textBack": "Назад", + "SSE.Views.Settings.textBottom": "Снизу", + "SSE.Views.Settings.textCentimeter": "Сантиметр", + "SSE.Views.Settings.textCollaboration": "Совместная работа", + "SSE.Views.Settings.textColorSchemes": "Цветовые схемы", "SSE.Views.Settings.textCreateDate": "Дата создания", + "SSE.Views.Settings.textCustom": "Пользовательский", + "SSE.Views.Settings.textCustomSize": "Особый размер", "SSE.Views.Settings.textDocInfo": "Информация о таблице", "SSE.Views.Settings.textDocTitle": "Название таблицы", "SSE.Views.Settings.textDone": "Готово", @@ -504,14 +532,33 @@ "SSE.Views.Settings.textDownloadAs": "Скачать как...", "SSE.Views.Settings.textEditDoc": "Редактировать", "SSE.Views.Settings.textEmail": "email", + "SSE.Views.Settings.textExample": "Пример", "SSE.Views.Settings.textFind": "Поиск", "SSE.Views.Settings.textFindAndReplace": "Поиск и замена", + "SSE.Views.Settings.textFormat": "Формат", + "SSE.Views.Settings.textFormulaLanguage": "Язык формул", "SSE.Views.Settings.textHelp": "Справка", + "SSE.Views.Settings.textHideGridlines": "Скрыть линии сетки", + "SSE.Views.Settings.textHideHeadings": "Скрыть заголовки", + "SSE.Views.Settings.textInch": "Дюйм", + "SSE.Views.Settings.textLandscape": "Альбомная", + "SSE.Views.Settings.textLeft": "Слева", "SSE.Views.Settings.textLoading": "Загрузка...", + "SSE.Views.Settings.textMargins": "Поля", + "SSE.Views.Settings.textOrientation": "Ориентация", + "SSE.Views.Settings.textPoint": "Пункт", + "SSE.Views.Settings.textPortrait": "Книжная", "SSE.Views.Settings.textPoweredBy": "Разработано", "SSE.Views.Settings.textPrint": "Печать", + "SSE.Views.Settings.textR1C1Style": "Стиль ссылок R1C1", + "SSE.Views.Settings.textRegionalSettings": "Региональные параметры", + "SSE.Views.Settings.textRight": "Справа", "SSE.Views.Settings.textSettings": "Настройки", + "SSE.Views.Settings.textSpreadsheetFormats": "Форматы таблицы", + "SSE.Views.Settings.textSpreadsheetSettings": "Настройки таблицы", "SSE.Views.Settings.textTel": "Телефон", + "SSE.Views.Settings.textTop": "Сверху", + "SSE.Views.Settings.textUnitOfMeasurement": "Единица измерения", "SSE.Views.Settings.textVersion": "Версия", "SSE.Views.Settings.unknownText": "Неизвестно", "SSE.Views.Toolbar.textBack": "Назад" diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json index 8016c20e7..b98328583 100644 --- a/apps/spreadsheeteditor/mobile/locale/sk.json +++ b/apps/spreadsheeteditor/mobile/locale/sk.json @@ -102,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Prekročený čas konverzie.", "SSE.Controllers.Main.criticalErrorExtText": "Stlačením tlačidla 'OK' sa vrátite do zoznamu dokumentov.", "SSE.Controllers.Main.criticalErrorTitle": "Chyba", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Editor tabuliek", "SSE.Controllers.Main.downloadErrorText": "Sťahovanie zlyhalo.", "SSE.Controllers.Main.downloadMergeText": "Sťahovanie...", "SSE.Controllers.Main.downloadMergeTitle": "Sťahovanie", @@ -116,7 +115,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Operáciu nemožno vykonať, pretože oblasť obsahuje filtrované bunky.
      Odkryte filtrované prvky a skúste to znova.", "SSE.Controllers.Main.errorBadImageUrl": "Adresa URL obrázku je nesprávna", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Serverové pripojenie sa stratilo. Práve teraz nie je možné dokument upravovať.", - "SSE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", + "SSE.Controllers.Main.errorConnectToServer": "Dokument sa nepodarilo uložiť. Prosím, skontrolujte nastavenia pripojenia alebo kontaktujte správcu.
      Po kliknutí na tlačidlo 'OK' sa zobrazí výzva na prevzatie dokumentu.

      Viac informácií o pripojení dokumentového servera nájdete tu", "SSE.Controllers.Main.errorCopyMultiselectArea": "Tento príkaz sa nedá použiť s viacerými výbermi.
      Vyberte jeden rozsah a skúste to znova.", "SSE.Controllers.Main.errorCountArg": "Chyba v zadanom vzorci.
      Používa sa nesprávny počet argumentov.", "SSE.Controllers.Main.errorCountArgExceed": "Chyba v zadanom vzorci.
      Počet argumentov je prekročený.", diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json index 595920f33..e91940946 100644 --- a/apps/spreadsheeteditor/mobile/locale/tr.json +++ b/apps/spreadsheeteditor/mobile/locale/tr.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Değişim süresi aşıldı.", "SSE.Controllers.Main.criticalErrorExtText": "Belge listesine dönmek için 'TAMAM' tuşuna tıklayın.", "SSE.Controllers.Main.criticalErrorTitle": "Hata", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editör", "SSE.Controllers.Main.downloadErrorText": "İndirme başarısız oldu.", "SSE.Controllers.Main.downloadMergeText": "İndiriliyor...", "SSE.Controllers.Main.downloadMergeTitle": "İndiriliyor", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "İşlem yapılamıyor çünkü alanda filtreli hücrelet mevcut.
      Lütfen filtreli elemanların gizliliğini kaldırın ve tekrar deneyin.", "SSE.Controllers.Main.errorBadImageUrl": "Resim URL'si yanlış", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Sunucu bağlantısı kesildi. Belge şu an düzenlenemez.", - "SSE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen bağlantı ayarlarınızı kontrol edin veya yöneticinizle irtibata geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirmek isteyip istemediğiniz sorulacaktır.

      Belge Sunucusu'na bağlanmak hakkında daha fazla bilgi almak için buraya tıklayın", + "SSE.Controllers.Main.errorConnectToServer": "Belge kaydedilemedi. Lütfen internet bağlantınızı kontrol edin veya yöneticiniz ile iletişime geçin.
      'TAMAM' tuşuna tıkladığınızda belgeyi indirebileceksiniz.

      Belge Sunucusuna bağlanma konusunda daha fazla bilgi için buraya tıklayın", "SSE.Controllers.Main.errorCopyMultiselectArea": "Bu komut çoklu seçimlerle kullanılamaz.
      Tek bir aralık seçin ve tekrar deneyin.", "SSE.Controllers.Main.errorCountArg": "Girilen formülde hata oluştu.
      Yanlış argüman sayısı kullanıldı.", "SSE.Controllers.Main.errorCountArgExceed": "Girilen formülde hata oluştu.
      Argüman sayısı aşıldı.", diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json index eeb58e2f9..b2efc41b6 100644 --- a/apps/spreadsheeteditor/mobile/locale/uk.json +++ b/apps/spreadsheeteditor/mobile/locale/uk.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Термін переходу перевищено.", "SSE.Controllers.Main.criticalErrorExtText": "Натисніть \"ОК\", щоб повернутися до списку документів.", "SSE.Controllers.Main.criticalErrorTitle": "Помилка", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Редактор електронних таблиць", "SSE.Controllers.Main.downloadErrorText": "Завантаження не вдалося", "SSE.Controllers.Main.downloadMergeText": "Завантаження...", "SSE.Controllers.Main.downloadMergeTitle": "Завантаження", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Операція не може бути виконана, оскільки область містить фільтрувані клітинки.
      Будь ласка, відобразіть фільтрувані елементи та повторіть спробу.", "SSE.Controllers.Main.errorBadImageUrl": "URL-адреса зображення невірна", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "З'єднання з сервером втрачено. Документ не можна редагувати прямо зараз.", - "SSE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів тут ", + "SSE.Controllers.Main.errorConnectToServer": "Не вдалося зберегти документ. Будь ласка, перевірте налаштування з'єднання або зверніться до свого адміністратора.
      Після натискання кнопки «ОК» вам буде запропоновано завантажити документ.

      Більше інформації про підключення сервера документів       тут", "SSE.Controllers.Main.errorCopyMultiselectArea": "Ця команда не може бути використана з декількома вибору.
      Виберіть один діапазон і спробуйте ще раз.", "SSE.Controllers.Main.errorCountArg": "Помилка введеної формули.
      Використовується невірне число аргументів.", "SSE.Controllers.Main.errorCountArgExceed": "Помилка введеної формули.
      Кількість аргументів перевищено.", diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json index e4570baed..a98d2a5b6 100644 --- a/apps/spreadsheeteditor/mobile/locale/vi.json +++ b/apps/spreadsheeteditor/mobile/locale/vi.json @@ -101,7 +101,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.", "SSE.Controllers.Main.criticalErrorExtText": "Ấn 'OK' để trở lại danh sách tài liệu.", "SSE.Controllers.Main.criticalErrorTitle": "Lỗi", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE Spreadsheet Editor", "SSE.Controllers.Main.downloadErrorText": "Tải về không thành công.", "SSE.Controllers.Main.downloadMergeText": "Đang tải...", "SSE.Controllers.Main.downloadMergeTitle": "Đang tải về", @@ -115,7 +114,7 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "Không thể thực hiện thao tác vì vùng này chứa các ô được lọc.
      Vui lòng bỏ ẩn các phần tử được lọc và thử lại.", "SSE.Controllers.Main.errorBadImageUrl": "URL hình ảnh không chính xác", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Mất kết nối server. Không thể chỉnh sửa tài liệu ngay lúc này.", - "SSE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", + "SSE.Controllers.Main.errorConnectToServer": "Không thể lưu tài liệu. Vui lòng kiểm tra cài đặt kết nối hoặc liên hệ với quản trị viên của bạn.
      Khi bạn nhấp vào nút 'OK', bạn sẽ được nhắc tải xuống tài liệu.

      Tìm thêm thông tin về kết nối Server Tài liệu ở đây", "SSE.Controllers.Main.errorCopyMultiselectArea": "Không thể sử dụng lệnh này với nhiều lựa chọn.
      Chọn một phạm vi và thử lại.", "SSE.Controllers.Main.errorCountArg": "Lỗi trong công thức đã nhập.
      Không dùng đúng số lượng đối số.", "SSE.Controllers.Main.errorCountArgExceed": "Lỗi trong công thức đã nhập.
      Đã vượt quá số lượng đối số.", diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json index 27acf72e6..7f576604d 100644 --- a/apps/spreadsheeteditor/mobile/locale/zh.json +++ b/apps/spreadsheeteditor/mobile/locale/zh.json @@ -102,7 +102,6 @@ "SSE.Controllers.Main.convertationTimeoutText": "转换超时", "SSE.Controllers.Main.criticalErrorExtText": "按“确定”返回文件列表", "SSE.Controllers.Main.criticalErrorTitle": "错误:", - "SSE.Controllers.Main.defaultTitleText": "ONLYOFFICE电子表格编辑器", "SSE.Controllers.Main.downloadErrorText": "下载失败", "SSE.Controllers.Main.downloadMergeText": "下载中…", "SSE.Controllers.Main.downloadMergeTitle": "下载中", @@ -117,7 +116,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "图片地址不正确", "SSE.Controllers.Main.errorChangeArray": "您无法更改部分阵列。", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "服务器连接丢失。该文档现在无法编辑", - "SSE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器在这里", + "SSE.Controllers.Main.errorConnectToServer": "这份文件无法保存。请检查连接设置或联系您的管理员。
      当你点击“OK”按钮,系统将提示您下载文档。

      找到更多信息连接文件服务器      在这里", "SSE.Controllers.Main.errorCopyMultiselectArea": "该命令不能与多个选择一起使用。
      选择一个范围，然后重试。", "SSE.Controllers.Main.errorCountArg": "一个错误的输入公式。< br >正确使用数量的参数。", "SSE.Controllers.Main.errorCountArgExceed": "一个错误的输入公式。< br >超过数量的参数。", diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index 972d80f78..74b26d6ad 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -6274,6 +6274,157 @@ html.pixel-ratio-3 .document-menu .list-block li:last-child li .item-inner:after margin-left: 20px; color: #212121; } +.page-change .block-description { + background-color: #fff; + padding-top: 15px; + padding-bottom: 15px; + margin: 0; + max-width: 100%; + word-wrap: break-word; +} +.page-change #user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; +} +.page-change #date-change { + font-size: 14px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 3px; +} +.page-change #text-change { + color: #000000; + font-size: 15px; + line-height: 20px; + margin: 0; + margin-top: 10px; +} +.page-change .block-btn, +.page-change .content-block.block-btn:first-child { + display: flex; + flex-direction: row; + justify-content: space-around; + margin: 26px 0; +} +.page-change .block-btn #btn-next-change, +.page-change .content-block.block-btn:first-child #btn-next-change, +.page-change .block-btn #btn-reject-change, +.page-change .content-block.block-btn:first-child #btn-reject-change { + margin-left: 20px; +} +.page-change .block-btn #btn-goto-change, +.page-change .content-block.block-btn:first-child #btn-goto-change { + margin-right: 20px; +} +.page-change .block-btn .right-buttons, +.page-change .content-block.block-btn:first-child .right-buttons { + display: flex; +} +.page-change .block-btn .link, +.page-change .content-block.block-btn:first-child .link { + display: inline-block; +} +.navbar .center-collaboration { + display: flex; + justify-content: space-around; +} +.container-collaboration .navbar .right.close-collaboration { + position: absolute; + right: 10px; +} +.container-collaboration .page-content .list-block:first-child { + margin-top: -1px; +} +#user-list .item-content { + padding-left: 0; +} +#user-list .item-inner { + justify-content: flex-start; + padding-left: 15px; +} +#user-list .length { + margin-left: 4px; +} +#user-list .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #373737; + font-weight: 500; +} +#user-list ul:before { + content: none; +} +.page-comments .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; +} +.page-comments p { + margin: 0; +} +.page-comments .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; +} +.page-comments .comment-date, +.page-comments .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; +} +.page-comments .comment-text, +.page-comments .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; +} +.page-comments .reply-item { + margin-top: 15px; +} +.page-comments .reply-item .user-name { + padding-top: 16px; +} +.page-comments .reply-item:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: #c8c7cc; + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; +} +.page-comments .comment-quote { + color: #40865c; + border-left: 1px solid #40865c; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; +} +.settings.popup .list-block ul.list-reply:last-child:after, +.settings.popover .list-block ul.list-reply:last-child:after { + display: none; +} i.icon.icon-search { width: 24px; height: 24px; @@ -6613,9 +6764,9 @@ i.icon.icon-format-ots { 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-ots%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ots%22%20clip-path%3D%22url(%23clip-ots)%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-csv { - 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%20viewBox%3D%220%200%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2235.5%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H16V18H22V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2020H16V21H22V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2014H16V15H22V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2011H16V12H22V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%208H16V9H22V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%205H16V6H22V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%202H16V3H22V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2017H9V18H15V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2020H9V21H15V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2014H9V15H15V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2011H9V12H15V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%208H9V9H15V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%205H9V6H15V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%202H9V3H15V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2017H2V18H8V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2020H2V21H8V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2014H2V15H8V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2011H2V12H8V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%208H2V9H8V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%205H2V6H8V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%202H2V3H8V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-collaboration { width: 24px; @@ -6635,17 +6786,17 @@ i.icon.icon-table-settings { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22white%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22white%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22white%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22white%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22white%22%2F%3E%3C%2Fsvg%3E"); } .chart-types .thumb.bar-normal { background-image: url('../img/charts/chart-03.png'); @@ -7222,29 +7373,6 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { max-height: 100%; overflow: auto; } -#user-list .item-content { - padding-left: 0; -} -#user-list .item-inner { - justify-content: flex-start; - padding-left: 15px; -} -#user-list .length { - margin-left: 4px; -} -#user-list .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: #373737; - font-weight: 500; -} -#user-list ul:before { - content: none; -} .filter-root-view .list-center .item-title { text-align: center; width: 100%; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index e81c01687..dd99508dd 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -5877,6 +5877,149 @@ html.phone .document-menu .list-block .item-link { margin-left: 20px; color: #212121; } +.page-change .block-description { + background-color: #fff; + padding-top: 15px; + padding-bottom: 15px; + margin: 0; + max-width: 100%; + word-wrap: break-word; +} +.page-change #user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; +} +.page-change #date-change { + font-size: 14px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 3px; +} +.page-change #text-change { + color: #000000; + font-size: 15px; + line-height: 20px; + margin: 0; + margin-top: 10px; +} +.page-change .block-btn { + display: flex; + flex-direction: row; + justify-content: space-around; + margin: 0; + padding: 26px 0; + background-color: #EFEFF4; +} +.page-change .block-btn #btn-next-change, +.page-change .block-btn #btn-reject-change { + margin-left: 20px; +} +.page-change .block-btn #btn-goto-change { + margin-right: 20px; +} +.page-change .block-btn .right-buttons { + display: flex; +} +.page-change .block-btn .link { + display: inline-block; +} +.container-collaboration .navbar .right.close-collaboration { + position: absolute; + right: 5px; +} +.container-collaboration .page-content .list-block:first-child { + margin-top: -1px; +} +#user-list .item-content { + padding-left: 0; +} +#user-list .item-inner { + justify-content: flex-start; + padding-left: 15px; +} +#user-list .length { + margin-left: 4px; +} +#user-list .color { + min-width: 40px; + min-height: 40px; + margin-right: 20px; + text-align: center; + border-radius: 50px; + line-height: 40px; + color: #373737; + font-weight: 400; +} +#user-list ul:before { + content: none; +} +.page-comments .list-block .item-inner { + display: block; + padding: 16px 0; + word-wrap: break-word; +} +.page-comments p { + margin: 0; +} +.page-comments .user-name { + font-size: 17px; + line-height: 22px; + color: #000000; + margin: 0; + font-weight: bold; +} +.page-comments .comment-date, +.page-comments .reply-date { + font-size: 12px; + line-height: 18px; + color: #6d6d72; + margin: 0; + margin-top: 0px; +} +.page-comments .comment-text, +.page-comments .reply-text { + color: #000000; + font-size: 15px; + line-height: 25px; + margin: 0; + max-width: 100%; + padding-right: 15px; +} +.page-comments .reply-item { + margin-top: 15px; +} +.page-comments .reply-item .user-name { + padding-top: 16px; +} +.page-comments .reply-item:before { + content: ''; + position: absolute; + left: auto; + bottom: 0; + right: auto; + top: 0; + height: 1px; + width: 100%; + background-color: rgba(0, 0, 0, 0.12); + display: block; + z-index: 15; + -webkit-transform-origin: 50% 100%; + transform-origin: 50% 100%; +} +.page-comments .comment-quote { + color: #40865c; + border-left: 1px solid #40865c; + padding-left: 10px; + margin: 5px 0; + font-size: 15px; +} +.settings.popup .list-block ul.list-reply:last-child:after, +.settings.popover .list-block ul.list-reply:last-child:after { + display: none; +} .tablet .searchbar.document.replace .center > .replace { display: flex; } @@ -6257,9 +6400,9 @@ i.icon.icon-format-ots { 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-ots%22%3E%3Crect%20width%3D%2233%22%20height%3D%2233%22%2F%3E%3C%2FclipPath%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22ots%22%20clip-path%3D%22url(%23clip-ots)%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-csv { - 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%20viewBox%3D%220%200%2058%2058%22%20height%3D%2258px%22%20width%3D%2258px%22%20y%3D%220px%22%20x%3D%220px%22%20xml%3Aspace%3D%22preserve%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%2340865c%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2213.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2224.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2242.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2238.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2234.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2230.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2226.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2222.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2218.5%22%20x%3D%2235.5%22%20%2F%3E%3Crect%20height%3D%221%22%20width%3D%229%22%20class%3D%22cls-1%22%20y%3D%2214.5%22%20x%3D%2235.5%22%20%2F%3E%3C%2Fsvg%3E"); + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%2017H16V18H22V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2020H16V21H22V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2014H16V15H22V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%2011H16V12H22V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%208H16V9H22V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%205H16V6H22V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M22%202H16V3H22V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2017H9V18H15V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2020H9V21H15V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2014H9V15H15V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%2011H9V12H15V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%208H9V9H15V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%205H9V6H15V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M15%202H9V3H15V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2017H2V18H8V17Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2020H2V21H8V20Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2014H2V15H8V14Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%2011H2V12H8V11Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%208H2V9H8V8Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%205H2V6H8V5Z%22%20fill%3D%22%2340865c%22%2F%3E%3Cpath%20d%3D%22M8%202H2V3H8V2Z%22%20fill%3D%22%2340865c%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-collaboration { width: 24px; @@ -6269,17 +6412,17 @@ i.icon.icon-collaboration { i.icon.icon-cut { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20d%3D%22M19.4406%2016.7116C17.8368%2016.7116%2016.4336%2017.76%2015.9825%2019.2576L13.1259%2013.5167L19.4907%200.737143C19.5909%200.487542%2019.4907%200.18802%2019.2902%200.0881796C19.0396%20-0.011661%2018.7389%200.0881795%2018.6387%200.287861L12.5245%2012.3686L6.51049%200.287861C6.41026%200.0382593%206.10956%20-0.0615813%205.85898%200.0382593C5.6084%200.1381%205.50816%200.437622%205.6084%200.687223L11.9732%2013.4668L9.06644%2019.2576C8.61539%2017.8099%207.21213%2016.7116%205.6084%2016.7116C3.60373%2016.7116%202%2018.3091%202%2020.3059C2%2022.3027%203.60373%2023.9002%205.6084%2023.9002C6.91143%2023.9002%208.06411%2023.2013%208.71562%2022.153C8.71562%2022.153%208.71562%2022.1529%208.71562%2022.103C8.81586%2021.9533%208.86597%2021.8035%208.91609%2021.6537L12.5245%2014.615L16.0828%2021.7037C16.1329%2021.8534%2016.2331%2022.0032%2016.2832%2022.153V22.2029C16.2832%2022.2029%2016.2832%2022.2029%2016.2832%2022.2528C16.9347%2023.3011%2018.0874%2024%2019.3905%2024C21.3951%2024%2022.9989%2022.4026%2022.9989%2020.4057C23.049%2018.359%2021.4452%2016.7116%2019.4406%2016.7116ZM5.6084%2022.9517C4.15501%2022.9517%203.00233%2021.8035%203.00233%2020.3558C3.00233%2018.9081%204.15501%2017.76%205.6084%2017.76C7.06178%2017.76%208.21446%2018.9081%208.21446%2020.3558C8.21446%2020.7053%208.16434%2021.0547%208.01399%2021.3542L7.91376%2021.5539C7.51283%2022.3526%206.66084%2022.9517%205.6084%2022.9517ZM19.4406%2022.9517C18.4382%2022.9517%2017.5361%2022.3526%2017.1352%2021.504L17.035%2021.3043C16.9347%2021.0048%2016.8345%2020.6553%2016.8345%2020.3059C16.8345%2018.8582%2017.9872%2017.71%2019.4406%2017.71C20.894%2017.71%2022.0466%2018.8582%2022.0466%2020.3059C22.0466%2021.7536%2020.894%2022.9517%2019.4406%2022.9517Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23cut)%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.22427%2022.2702C4.51527%2023.1269%206.52738%2022.7183%207.6592%2021.0127C8.79101%2019.3071%208.38572%2017.2943%207.09472%2016.4376C5.80372%2015.5809%203.79161%2015.9896%202.65979%2017.6952C1.52798%2019.4008%201.93328%2021.4136%203.22427%2022.2702ZM2.67135%2023.1035C4.51208%2024.325%207.11827%2023.6364%208.49243%2021.5656C9.8666%2019.4948%209.48837%2016.8259%207.64764%2015.6044C5.80691%2014.3829%203.20072%2015.0714%201.82656%2017.1422C0.452398%2019.2131%200.830625%2021.882%202.67135%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M20.9158%2022.2702C19.6248%2023.1269%2017.6127%2022.7183%2016.4809%2021.0127C15.349%2019.3071%2015.7543%2017.2943%2017.0453%2016.4376C18.3363%2015.5809%2020.3484%2015.9896%2021.4803%2017.6952C22.6121%2019.4008%2022.2068%2021.4136%2020.9158%2022.2702ZM21.4687%2023.1035C19.628%2024.325%2017.0218%2023.6364%2015.6476%2021.5656C14.2735%2019.4948%2014.6517%2016.8259%2016.4924%2015.6044C18.3331%2014.3829%2020.9393%2015.0714%2022.3135%2017.1422C23.6877%2019.2131%2023.3094%2021.882%2021.4687%2023.1035Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M16.4924%2015.6044L13.9037%2012.4737L19.9552%200.675715C20.0693%200.446914%2019.9552%200.172352%2019.727%200.0808313C19.4416%20-0.0106892%2019.0993%200.0808312%2018.9851%200.263872L12.0233%2011.4212L5.17562%200.263872C5.06149%200.035071%204.71911%20-0.0564496%204.43379%200.035071C4.14847%200.126592%204.03434%200.401153%204.14847%200.629955L10.2001%2012.4279L7.64761%2015.6044L9.2292%2018L12.0233%2013.4804L14.9108%2018L16.4924%2015.6044Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22cut%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22black%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E"); } i.icon.icon-copy { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%203.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%207.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M3%2011.5H9%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9%2014.5H0.5V0.5H14.5V9H9.5H9V9.5V14.5ZM15%2010V9.5H23.5V23.5H9.5V15.5H10V15V14.5V10H15Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M1%201H15V7H16V0H0V17H8V16H1V1Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M23%208H9V23H23V8ZM8%207V24H24V7H8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M13%205H3V4H13V5Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%209H3V8H8V9Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M8%2013H3V12H8V13Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H11V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H11V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H11V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } i.icon.icon-paste { width: 24px; height: 24px; - background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M21%2020.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2016.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M21%2012.5H12%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M13%202.5H4%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%202.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%201.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%203.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%204.5H5%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M14%200.5L5%200.500001%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M9.5%209H9V9.5V19H10V10H23.5V23.5H9.5V20V19.5H9H0.5V2.5H18.5V9H9.5Z%22%20stroke%3D%22black%22%2F%3E%3C%2Fsvg%3E"); + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%202H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10%208H23V23H10V8Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20d%3D%22M5%200H14V5H5V0Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2012H12V11H21V12Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2016H12V15H21V16Z%22%20fill%3D%22black%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2020H12V19H21V20Z%22%20fill%3D%22black%22%2F%3E%3C%2Fsvg%3E"); } .navbar i.icon.icon-undo { width: 22px; @@ -7090,29 +7233,6 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { max-height: 100%; overflow: auto; } -#user-list .item-content { - padding-left: 0; -} -#user-list .item-inner { - justify-content: flex-start; - padding-left: 15px; -} -#user-list .length { - margin-left: 4px; -} -#user-list .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: #373737; - font-weight: 400; -} -#user-list ul:before { - content: none; -} .filter-root-view .list-center .item-title { text-align: center; width: 100%; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less index 458767033..c370b84f6 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less @@ -74,6 +74,7 @@ input, textarea { @import url('../../../../common/mobile/resources/less/ios/_color-palette.less'); @import url('../../../../common/mobile/resources/less/ios/_about.less'); @import url('../../../../common/mobile/resources/less/ios/_color-schema.less'); +@import url('../../../../common/mobile/resources/less/ios/_collaboration.less'); @import url('ios/_icons.less'); @@ -193,36 +194,6 @@ input, textarea { overflow: auto; } -//Edit users -@initialEditUser: #373737; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 500; - - } - ul:before { - content: none; - } -} - //Filter Options .filter-root-view { .list-center .item-title { diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-material.less b/apps/spreadsheeteditor/mobile/resources/less/app-material.less index 4f2e38a50..b69f06340 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-material.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-material.less @@ -67,6 +67,7 @@ input, textarea { @import url('../../../../common/mobile/resources/less/material/_color-palette.less'); @import url('../../../../common/mobile/resources/less/material/_about.less'); @import url('../../../../common/mobile/resources/less/material/_color-schema.less'); +@import url('../../../../common/mobile/resources/less/material/_collaboration.less'); @import url('material/_search.less'); @import url('material/_icons.less'); @@ -180,35 +181,6 @@ input, textarea { overflow: auto; } -//Edit users -@initialEditUser: #373737; - -#user-list { - .item-content { - padding-left: 0; - } - .item-inner { - justify-content: flex-start; - padding-left: 15px; - } - .length { - margin-left: 4px; - } - .color { - min-width: 40px; - min-height: 40px; - margin-right: 20px; - text-align: center; - border-radius: 50px; - line-height: 40px; - color: @initialEditUser; - font-weight: 400; - } - ul:before { - content: none; - } -} - //Filter Options .filter-root-view { .list-center .item-title { diff --git a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less index 603d5ea4c..462c2cfde 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less @@ -348,9 +348,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-csv { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } // Collaboration &.icon-collaboration { @@ -371,17 +371,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less index a6ba74d6b..6c2e8a2aa 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less +++ b/apps/spreadsheeteditor/mobile/resources/less/material/_icons.less @@ -322,9 +322,9 @@ i.icon { .encoded-svg-background(''); } &.icon-format-csv { - width: 30px; - height: 30px; - .encoded-svg-background(''); + width: 24px; + height: 24px; + .encoded-svg-background(''); } // Collaboration &.icon-collaboration { @@ -335,17 +335,17 @@ i.icon { &.icon-cut { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-copy { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } &.icon-paste { width: 24px; height: 24px; - .encoded-svg-background(''); + .encoded-svg-background(''); } } diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 5030f05ec..44189578b 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -6,6 +6,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/commonDefines.js", "../../../../sdkjs/common/docscoapicommon.js", "../../../../sdkjs/common/docscoapi.js", + "../../../../sdkjs/common/spellcheckapi.js", "../../../../sdkjs/common/apiCommon.js", "../../../../sdkjs/common/SerializeCommonWordExcel.js", "../../../../sdkjs/common/editorscommon.js", @@ -86,7 +87,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/vendor/easysax.js", "../../../../sdkjs/common/openxml.js", "../../../../sdkjs/common/intervalTree.js", - "../../../../sdkjs/cell/document/empty-workbook.js", + "../../../../sdkjs/cell/document/empty.js", "../../../../sdkjs/cell/model/UndoRedo.js", "../../../../sdkjs/cell/model/clipboard.js", "../../../../sdkjs/cell/model/autofilters.js", @@ -110,6 +111,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/model/Workbook.js", "../../../../sdkjs/cell/model/Serialize.js", "../../../../sdkjs/cell/model/ConditionalFormatting.js", + "../../../../sdkjs/cell/model/DataValidation.js", "../../../../sdkjs/cell/model/CellInfo.js", "../../../../sdkjs/cell/view/mobileTouch.js", "../../../../sdkjs/cell/view/StringRender.js", diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 206692a1d..37c317e18 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -289,6 +289,11 @@ module.exports = function(grunt) { options: { plugins: [{ cleanupIDs: false + }, + { + convertPathData: { + floatPrecision: 4 + } }] }, dist: { diff --git a/build/documenteditor.json b/build/documenteditor.json index 50a89586e..0bdc55f0a 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -145,6 +145,12 @@ "cwd": "../apps/documenteditor/main/locale/", "src": "*", "dest": "../deploy/web-apps/apps/documenteditor/main/locale/" + }, + { + "expand": true, + "cwd": "../apps/documenteditor/main/resources/watermark", + "src": "*", + "dest": "../deploy/web-apps/apps/documenteditor/main/resources/watermark" } ], "help": [ @@ -389,10 +395,10 @@ "copy": { "localization": [ { - "expand": true, - "cwd": "../apps/documenteditor/embed/locale/", - "src": "*", - "dest": "../deploy/web-apps/apps/documenteditor/embed/locale/" + "expand": true, + "cwd": "../apps/documenteditor/embed/locale/", + "src": "*", + "dest": "../deploy/web-apps/apps/documenteditor/embed/locale/" } ], "index-page": {