Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sse-header-footer

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-17 11:12:12 +03:00
parent c1cf352dd1 993fafadb6
commit f846d91706
275 changed files with 2483 additions and 1486 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1,14 +1,14 @@
.idea
Thumbs.db
.DS_Store
deploy
/deploy
build/node_modules
apps/documenteditor/embed/resources/less/node_modules
apps/presentationeditor/embed/resources/less/node_modules
apps/spreadsheeteditor/embed/resources/less/node_modules
apps/documenteditor/mobile/resources/sass/.sass-cache
apps/spreadsheeteditor/mobile/resources/sass/.sass-cache
apps/presentationeditor/mobile/resources/sass/.sass-cache
apps/presentationeditor/mobile/resources/sass/.sass-cache
# test documents
@ -18,8 +18,8 @@ apps/presentationeditor/mobile/document
apps/spreadsheeteditor/embed/offlinedocs
apps/spreadsheeteditor/main/offlinedocs
apps/spreadsheeteditor/mobile/offlinedocs
# tests
selenium-debug.log
**/test/bin
# tests
selenium-debug.log
**/test/bin
**/test/reports

5
CHANGELOG.md
View file

@ -5,11 +5,16 @@
* Add rotation and flip to image and shape settings (bug #19378)
* Save file copy to selected folder (bug #23603, bug #32790)
* Load image from storage
* Add customization parameter 'hideRightMenu' for hiding right panel on first loading (bug #39096)
* Show comments in view mode
### Document Editor
* Search selected text
* Add blank page
### Spreadsheet Editor
* Set print area
### Presentation Editor
* Enter the slide number manually for internal hyperlinks
* Add ability to search and replace text

9
apps/api/documents/api.js
View file

@ -90,8 +90,6 @@
imageEmbedded: url,
url: http://...
},
backgroundColor: 'header background color',
textColor: 'header text color',
customer: {
name: 'SuperPuper',
address: 'New-York, 125f-25',
@ -116,6 +114,7 @@
compactToolbar: false,
leftMenu: true,
rightMenu: true,
hideRightMenu: false, // hide or show right panel on first loading
toolbar: true,
header: true,
statusBar: true,
@ -718,6 +717,12 @@
iframe.allowFullscreen = true;
iframe.setAttribute("allowfullscreen",""); // for IE11
iframe.setAttribute("onmousewheel",""); // for Safari on Mac
if (config.type == "mobile")
{
iframe.style.position = "fixed";
iframe.style.overflow = "hidden";
}
return iframe;
}

346
apps/api/documents/index.html
View file

@ -1,346 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>ONLYOFFICE Documents</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/>
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes">
<style type="text/css">
html {
height: 100%;
}
body {
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
}
#wrap {
position:absolute;
left:0;
top:0;
right:0;
bottom:0;
}
</style>
</head>
<body>
<div id="wrap">
<div id="placeholder"></div>
</div>
<script type="text/javascript" src="api.js"></script>
<script>
(function() {
// Url parameters
var urlParams = getUrlParams(),
cfg = getEditorConfig(urlParams),
doc = getDocumentData(urlParams);
// Document Editor
var docEditor = new DocsAPI.DocEditor('placeholder', {
type: urlParams['type'],
width: '100%',
height: '100%',
documentType: urlParams['doctype'] || 'text',
document: doc,
editorConfig: cfg,
events: {
'onReady': onDocEditorReady,
'onDocumentStateChange': onDocumentStateChange,
'onRequestEditRights': onRequestEditRights,
'onRequestHistory': onRequestHistory,
'onRequestHistoryData': onRequestHistoryData,
'onRequestEmailAddresses': onRequestEmailAddresses,
'onRequestStartMailMerge': onRequestStartMailMerge,
'onRequestHistoryClose': onRequestHistoryClose,
'onError': onError
}
});
// Document Editor event handlers
function onRequestEmailAddresses() {
docEditor.setEmailAddresses({emailAddresses: ['aaa@mail.ru'], createEmailAccountUrl: 'http://ya.ru'});
}
function onRequestHistory() {
docEditor.refreshHistory({
'currentVersion': 3,
'history': [
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'changes': null,
'created': '1/18/2015 6:38 PM',
'version': 1,
'versionGroup': 1,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'changes': [
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'created': '1/19/2015 6:30 PM'
},
{
'user': {
'id': '8952d4ee-e8a5-42bf-11f0-6cd77801ec15',
'name': 'Александр Трофимов'
},
'created': '1/19/2015 6:32 PM'
},
{
'user': {
id: '8952d4ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Татьяна Щербакова'
},
'created': '1/19/2015 6:38 PM'
}
],
'created': '2/19/2015 6:38 PM',
'version': 2,
'versionGroup': 1,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '895255ee-e8a5-42bf-86f0-6cd77801ec15',
name: 'Me'
},
'changes': null,
'created': '2/21/2015 6:38 PM',
'version': 3,
'versionGroup': 2,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-11f0-6cd77801ec15',
name: 'Александр Трофимов'
},
'changes': null,
'created': '2/22/2015 6:37 PM',
'version': 4,
'versionGroup': 3,
'key': 'wyX9AwRq_677SWKjhfk='
},
{
'user': {
id: '8952d4ee-e8a5-42bf-11f0-6cd33801ec15',
name: 'Леонид Орлов'
},
'changes': null,
'created': '2/24/2015 6:29 PM',
'version': 5,
'versionGroup': 3,
'key': 'wyX9AwRq_677SWKjhfk='
}]
});
}
function onRequestHistoryData(revision) {
docEditor.setHistoryData(
{
'version': revision.data,
'url': 'http://isa2',
'urlDiff': 'http://isa2',
'changesUrl': 'http://isa2'
}
);
}
function onRequestStartMailMerge() {
docEditor.processMailMerge(true, 'some error message');
}
function onRequestHistoryClose() {
// reload page
}
function onDocEditorReady(event) {
if (event.target) {
//console.log('Ready! Editor: ', event.target);
}
}
function onDocumentStateChange(event) {
var isModified = event.data;
//console.log(isModified);
}
function onRequestEditRights(event) {
// occurs whenever the user tryes to enter edit mode
docEditor.applyEditRights(true, "Someone is editing this document right now. Please try again later.");
}
function onError(event) {
// critical error happened
// examine event.data.errorCode and event.data.errorDescription for details
}
function onDownloadAs(event) {
// return url of downloaded doc
// console.log(event.data);
}
// helpers
function getUrlParams() {
var e,
a = /\+/g, // Regex for replacing addition symbol with a space
r = /([^&=]+)=?([^&]*)/g,
d = function (s) { return decodeURIComponent(s.replace(a, " ")); },
q = window.location.search.substring(1),
urlParams = {};
while (e = r.exec(q))
urlParams[d(e[1])] = d(e[2]);
return urlParams;
}
function getDocumentData(urlParams) {
return {
key: urlParams["key"],
url: urlParams["url"] || '_offline_',
title: urlParams["title"],
fileType: urlParams["filetype"],
vkey: urlParams["vkey"],
permissions: {
edit: true,
download: true,
reader: true
}
};
}
function getEditorConfig(urlParams) {
return {
mode : urlParams["mode"] || 'edit',
lang : urlParams["lang"] || 'en',
canCoAuthoring : true,
createUrl : 'http://www.example.com/create',
user: {
id: urlParams["userid"] || 'uid-901', firstname: urlParams["userfname"] || 'Mitchell', lastname: urlParams["userlname"] || 'Hamish'
},
recent : [
{title: 'Memory.docx', url: 'http://onlyoffice.com', folder: 'Document Editor'},
{title: 'Description.doc', url: 'http://onlyoffice.com', folder: 'Document Editor'},
{title: 'DocEditor_right.xsl', url: 'http://onlyoffice.com', folder: 'Spreadsheet Editor'},
{title: 'api.rtf', url: 'http://onlyoffice.com', folder: 'Unnamed folder'}
],
// templates : [
// {name: 'Contracts', icon: '../../api/documents/resources/templates/contracts.png', url: 'http://...'},
// {name: 'Letter', icon: '../../api/documents/resources/templates/letter.png', url: 'http://...'},
// {name: 'List', icon: '../../api/documents/resources/templates/list.png', url: 'http://...'},
// {name: 'Plan', icon: '../../api/documents/resources/templates/plan.png', url: 'http://...'}
// ],
embedded : {
embedUrl : 'http://onlyoffice.com/embed',
fullscreenUrl : 'http://onlyoffice.com/fullscreen',
saveUrl : 'http://onlyoffice.com/download',
shareUrl : 'http://tl.com/72b4la97',
toolbarDocked : 'top'
}
,customization: {
// logo: {
// image: 'https://dylnrgbh910l3.cloudfront.net/studio/tag/i8.8.237/skins/default/images/onlyoffice_logo/editor_logo_general.png', // default size 86 x 20
// imageEmbedded: 'https://d2hw9csky753gb.cloudfront.net/studio/tag/i8.8.237/skins/default/images/onlyoffice_logo/editor_embedded_logo.png', // default size 124 x 20
// url: 'http://...'
// },
// backgroundColor: '#ffffff',
// textColor: '#ff0000',
// customer: {
// name: 'SuperPuper',
// address: 'New-York, 125f-25',
// mail: 'support@gmail.com',
// www: 'www.superpuper.com',
// info: 'Some info',
// logo: 'https://img.imgsmail.ru/r/default/portal/0.1.29/logo.png' // default size 216 x 35
// },
// goback: {text: 'Go To London', url: 'http://...'},
about: true,
feedback: true
}
};
}
// Mobile version
function isMobile(){
var prefixes = {
ios: 'i(?:Pad|Phone|Pod)(?:.*)CPU(?: iPhone)? OS ',
android: '(Android |HTC_|Silk/)',
blackberry: 'BlackBerry(?:.*)Version\/',
rimTablet: 'RIM Tablet OS ',
webos: '(?:webOS|hpwOS)\/',
bada: 'Bada\/'
},
i, prefix, match;
for (i in prefixes){
if (prefixes.hasOwnProperty(i)) {
prefix = prefixes[i];
if (navigator.userAgent.match(new RegExp('(?:'+prefix+')([^\\s;]+)')))
return true;
}
}
return false;
}
var fixSize = function() {
var wrapEl = document.getElementById('wrap');
if (wrapEl){
wrapEl.style.height = screen.availHeight + 'px';
window.scrollTo(0, -1);
wrapEl.style.height = window.innerHeight + 'px';
}
};
var fixIpadLandscapeIos7 = function() {
if (navigator.userAgent.match(/iPad;.*CPU.*OS 7_\d/i)) {
var wrapEl = document.getElementById('wrap');
if (wrapEl){
wrapEl.style.position = "fixed";
wrapEl.style.bottom = 0;
wrapEl.style.width = "100%";
}
}
};
if (isMobile()){
window.addEventListener('load', fixSize);
window.addEventListener('resize', fixSize);
fixIpadLandscapeIos7();
}
})();
</script>
</body>
</html>

1
apps/api/documents/index.html.desktop
View file

@ -58,6 +58,7 @@
editorConfig: cfg,
events: {
onInternalMessage: onInternalMessage,
onRequestClose: e => {return 0;}
}
});

1
apps/common/main/lib/collection/Comments.js
View file

@ -52,6 +52,7 @@ define([
Common.Collections.Comments = Backbone.Collection.extend({
model: Common.Models.Comment,
groups: null,
clearEditing: function () {
this.each(function(comment) {

6
apps/common/main/lib/collection/Plugins.js
View file

@ -49,6 +49,10 @@ define([
'use strict';
Common.Collections.Plugins = Backbone.Collection.extend({
model: Common.Models.Plugin
model: Common.Models.Plugin,
hasVisible: function() {
return !!this.findWhere({visible: true});
}
});
});

3
apps/common/main/lib/component/Button.js
View file

@ -132,7 +132,8 @@ define([
};
ButtonsArray.prototype.setDisabled = function(disable) {
if ( _disabled != disable ) {
// if ( _disabled != disable ) //bug when disable buttons outside the group
{
_disabled = disable;
this.forEach( function(button) {

4
apps/common/main/lib/component/InputField.js
View file

@ -228,9 +228,7 @@ define([
if (this.options.maskExp && !_.isEmpty(this.options.maskExp.source)){
var charCode = String.fromCharCode(e.which);
if(!this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT && e.keyCode !== Common.UI.Keys.RETURN){
if(!this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.RETURN){
e.preventDefault();
e.stopPropagation();
}

74
apps/common/main/lib/component/Layout.js
View file

@ -133,7 +133,21 @@ define([
};
var panel, resizer, stretch = false;
options.items.forEach(function(item) {
this.freeze = options.freeze;
this.changeLayout(options.items);
},
doLayout: function() {
},
changeLayout: function(items) {
var panel, resizer, stretch = false;
this.splitters && this.splitters.forEach(function(item) {
item.resizer && item.resizer.el.remove();
}, this);
this.splitters = [];
this.panels = [];
items.forEach(function(item) {
item.el instanceof HTMLElement && (item.el = $(item.el));
panel = _.extend(new LayoutPanel(), item);
if ( panel.stretch ) {
@ -158,11 +172,11 @@ define([
if (!stretch) {
panel.resize.el =
resizer.el = panel.el.after('<div class="layout-resizer after"></div>').next();
resizer.el = panel.el.after('<div class="layout-resizer after"></div>').next();
this.panels.push(resizer);
} else {
panel.resize.el =
resizer.el = panel.el.before('<div class="layout-resizer before"></div>').prev();
resizer.el = panel.el.before('<div class="layout-resizer before"></div>').prev();
this.panels.splice(this.panels.length - 1, 0, resizer);
}
@ -172,11 +186,7 @@ define([
Common.Gateway.on('processmouse', this.resize.eventStop);
}
}, this);
this.freeze = options.freeze; this.freeze && this.freezePanels(this.freeze);
},
doLayout: function() {
this.freezePanels(this.freeze);
},
getElementHeight: function(el) {
@ -378,8 +388,10 @@ define([
},
setResizeValue: function (index, value) {
if (index >= this.splitters.length)
if (index >= this.splitters.length) {
this.doLayout();
return false;
}
var panel = null, next = null, oldValue = 0,
resize = this.splitters[index].resizer,
@ -428,16 +440,6 @@ define([
Common.UI.VBoxLayout.prototype = _.extend(new BaseLayout(), {
initialize: function(options){
BaseLayout.prototype.initialize.call(this,options);
this.panels.forEach(function(panel){
!panel.stretch && !panel.height && (panel.height = this.getElementHeight(panel.el));
if (panel.isresizer) {
panel.el.on('mousedown', {type: 'vertical', panel: panel}, _.bind(this.resizeStart, this));
}
}, this);
this.doLayout.call(this);
},
doLayout: function() {
@ -474,6 +476,18 @@ define([
height += style.height || this.getElementHeight(panel.el);
}
}, this);
},
changeLayout: function(items) {
BaseLayout.prototype.changeLayout.call(this, items);
this.panels.forEach(function(panel){
!panel.stretch && !panel.height && (panel.height = this.getElementHeight(panel.el));
if (panel.isresizer) {
panel.el.on('mousedown', {type: 'vertical', panel: panel}, _.bind(this.resizeStart, this));
}
}, this);
this.doLayout.call(this);
}
});
@ -485,16 +499,6 @@ define([
Common.UI.HBoxLayout.prototype = _.extend(new BaseLayout(), {
initialize: function(options){
BaseLayout.prototype.initialize.call(this,options);
this.panels.forEach(function(panel){
!panel.stretch && !panel.width && (panel.width = this.getElementWidth(panel.el));
if (panel.isresizer) {
panel.el.on('mousedown', {type: 'horizontal', panel: panel}, _.bind(this.resizeStart, this));
}
}, this);
this.doLayout.call(this);
},
doLayout: function(event) {
@ -537,6 +541,18 @@ define([
width += this.getElementWidth(panel.el);
}
},this);
},
changeLayout: function(items) {
BaseLayout.prototype.changeLayout.call(this, items);
this.panels.forEach(function(panel){
!panel.stretch && !panel.width && (panel.width = this.getElementWidth(panel.el));
if (panel.isresizer) {
panel.el.on('mousedown', {type: 'horizontal', panel: panel}, _.bind(this.resizeStart, this));
}
}, this);
this.doLayout.call(this);
}
});

5
apps/common/main/lib/component/MaskedField.js
View file

@ -54,10 +54,7 @@ define([
el.attr('maxlength', me.options.maxLength);
el.on('keypress', function(e) {
var charCode = String.fromCharCode(e.which);
if(!me.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT &&
e.keyCode !== Common.UI.Keys.TAB /* || el.val().length>=me.options.maxLength*/){
if(!me.options.maskExp.test(charCode) && !e.ctrlKey){
if (e.keyCode==Common.UI.Keys.RETURN) me.trigger('changed', me, el.val());
e.preventDefault();
e.stopPropagation();

7
apps/common/main/lib/component/MetricSpinner.js
View file

@ -374,12 +374,7 @@ define([
if (charCode=='.' || charCode==',') {
e.preventDefault();
e.stopPropagation();
} else if(this.options.maskExp && !this.options.maskExp.test(charCode) && !e.ctrlKey &&
e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT &&
e.keyCode !== Common.UI.Keys.HOME && e.keyCode !== Common.UI.Keys.END &&
e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.RETURN &&
e.keyCode !== Common.UI.Keys.INSERT && e.keyCode !== Common.UI.Keys.TAB){
} else if(this.options.maskExp && !this.options.maskExp.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.RETURN ){
e.preventDefault();
e.stopPropagation();
}

49
apps/common/main/lib/component/Mixtbar.js
View file

@ -88,7 +88,7 @@ define([
var _template_tabs =
'<section class="tabs">' +
'<a class="scroll left"><i class="icon">&lt;</i></a>' +
'<a class="scroll left"></a>' +
'<ul>' +
'<% for(var i in items) { %>' +
'<li class="ribtab' +
@ -98,7 +98,7 @@ define([
'</li>' +
'<% } %>' +
'</ul>' +
'<a class="scroll right"><i class="icon">&gt;</i></a>' +
'<a class="scroll right"></a>' +
'</section>';
this.$layout = $(options.template({
@ -226,6 +226,8 @@ define([
if ( $boxTabs.parent().hasClass('short') ) {
$boxTabs.parent().removeClass('short');
}
this.processPanelVisible();
},
onTabClick: function (e) {
@ -243,10 +245,12 @@ define([
me.collapse();
} else {
me.setTab(tab);
me.processPanelVisible(null, true);
}
} else {
if ( !$target.hasClass('active') && !islone ) {
me.setTab(tab);
me.processPanelVisible(null, true);
}
}
},
@ -345,6 +349,47 @@ define([
return true;
},
/**
* in case panel partly visible.
* hide button's caption to decrease panel width
* ##adopt-panel-width
**/
processPanelVisible: function(panel, now) {
var me = this;
if ( me._timer_id ) clearTimeout(me._timer_id);
function _fc() {
let $active = panel || me.$panels.filter('.active');
if ( $active && $active.length ) {
var _maxright = $active.parents('.box-controls').width();
var data = $active.data(),
_rightedge = data.rightedge;
if ( !_rightedge ) {
_rightedge = $active.get(0).getBoundingClientRect().right;
}
if ( _rightedge > _maxright ) {
if ( !$active.hasClass('compactwidth') ) {
$active.addClass('compactwidth');
data.rightedge = _rightedge;
}
} else {
if ($active.hasClass('compactwidth')) {
$active.removeClass('compactwidth');
}
}
}
};
if ( now === true ) _fc(); else
me._timer_id = setTimeout(function() {
delete me._timer_id;
_fc();
}, 100);
},
/**/
setExtra: function (place, el) {
if ( !!el ) {
if (this.$tabs) {

3
apps/common/main/lib/component/TabBar.js
View file

@ -206,6 +206,7 @@ define([
function dragComplete() {
if (!_.isUndefined(me.drag)) {
me.drag.tab.removeClass('dragged');
me.drag.tab.$el.css('z-index', '');
me.bar.dragging = false;
var tab = null;
@ -250,6 +251,8 @@ define([
}
if (!_.isUndefined(bar) && !_.isUndefined(tab) && bar.tabs.length > 1) {
tab.addClass('dragged');
var index = bar.tabs.indexOf(tab),
_clientX = e.clientX*Common.Utils.zoom();
me.bar = bar;

16
apps/common/main/lib/component/Window.js
View file

@ -235,6 +235,21 @@ define([
this.$window.css('top',top);
}
function _setVisible() {
if (window.innerHeight == undefined) {
var main_width = document.documentElement.offsetWidth;
var main_height = document.documentElement.offsetHeight;
} else {
main_width = Common.Utils.innerWidth();
main_height = Common.Utils.innerHeight();
}
if (this.getLeft() + this.getWidth() > main_width)
this.$window.css('left', main_width - this.getWidth());
if (this.getTop() + this.getHeight() > main_height)
this.$window.css('top', main_height - this.getHeight());
}
function _getTransformation(end) {
return {
'-webkit-transition': '0.3s opacity',
@ -653,6 +668,7 @@ define([
} else
if (!this.$window.is(':visible')) {
this.$window.css({opacity: 0});
_setVisible.call(this);
this.$window.show()
}

185
apps/common/main/lib/controller/Comments.js
View file

@ -74,7 +74,7 @@ define([
subEditStrings : {},
filter : undefined,
hintmode : false,
previewmode: false,
viewmode: false,
isSelectedComment : false,
uids : [],
oldUids : [],
@ -150,6 +150,8 @@ define([
this.popoverComments.comparator = function (collection) { return collection.get('time'); };
}
this.groupCollection = [];
this.view = this.createView('Common.Views.Comments', { store: this.collection });
this.view.render();
@ -167,7 +169,7 @@ define([
this.currentUserName = data.config.user.fullname;
this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
this.hintmode = data['hintmode'] || false;
this.previewmode = data['previewmode'] || false;
this.viewmode = data['viewmode'] || false;
}
},
setApi: function (api) {
@ -192,6 +194,8 @@ define([
setMode: function(mode) {
this.mode = mode;
this.isModeChanged = true; // change show-comment mode from/to hint mode using canComments flag
this.view.viewmode = !this.mode.canComments;
this.view.changeLayout(mode);
return this;
},
//
@ -229,12 +233,12 @@ define([
this.api.asc_removeComment(id);
}
},
onResolveComment: function (uid, id) {
onResolveComment: function (uid) {
var t = this,
reply = null,
addReply = null,
ascComment = buildCommentData(), // new asc_CCommentData(null),
comment = t.findComment(uid, id);
comment = t.findComment(uid);
if (_.isUndefined(uid)) {
uid = comment.get('uid');
@ -277,9 +281,7 @@ define([
return false;
},
onShowComment: function (id, selected) {
if (this.previewmode) return;
var comment = this.findComment(id, undefined);
var comment = this.findComment(id);
if (comment) {
if (null !== comment.get('quote')) {
if (this.api) {
@ -295,7 +297,8 @@ define([
}
} else {
var model = this.popoverComments.findWhere({uid: id});
if (model) {
if (model && !this.getPopover().isVisible()) {
this.getPopover().showComments(true);
return;
}
}
@ -596,47 +599,40 @@ define([
if (filter) {
if (!this.view.isVisible()) {
this.view.needUpdateFilter = filter;
this.filter = {
property : filter.property,
value : filter.value
};
return;
applyOnly = true;
}
this.view.needUpdateFilter = false;
this.filter = filter;
this.filter = {
property : filter.property,
value : filter.value
};
var me = this,
comments = [];
this.filter.forEach(function(item){
if (!me.groupCollection[item])
me.groupCollection[item] = new Backbone.Collection([], { model: Common.Models.Comment});
comments = comments.concat(me.groupCollection[item].models);
});
this.collection.reset(comments);
this.collection.groups = this.filter;
if (!applyOnly) {
if (this.getPopover()) {
this.getPopover().hide();
}
}
this.view.needUpdateFilter = false;
var t = this, endComment = null;
this.collection.each(function (model) {
var prop = model.get(t.filter.property);
if (prop) {
model.set('hide', (null === prop.match(t.filter.value)), {silent: !!applyOnly});
var end = true;
for (var i = this.collection.length - 1; i >= 0; --i) {
if (end) {
this.collection.at(i).set('last', true, {silent: true});
} else {
if (this.collection.at(i).get('last')) {
this.collection.at(i).set('last', false, {silent: true});
}
}
end = false;
}
if (model.get('last')) {
model.set('last', false, {silent:!!applyOnly});
}
if (!model.get('hide')) {
endComment = model;
}
});
if (endComment) {
endComment.set('last', true, {silent: !!applyOnly});
}
if (!applyOnly)
this.view.render();
this.view.update();
}
}
},
onAppAddComment: function (sender, to_doc) {
@ -644,12 +640,23 @@ define([
this.addDummyComment();
},
addCommentToGroupCollection: function(comment) {
var groupname = comment.get('groupName');
if (!this.groupCollection[groupname])
this.groupCollection[groupname] = new Backbone.Collection([], { model: Common.Models.Comment});
this.groupCollection[groupname].push(comment);
},
// SDK
onApiAddComment: function (id, data) {
var comment = this.readSDKComment(id, data);
if (comment) {
this.collection.push(comment);
if (comment.get('groupName')) {
this.addCommentToGroupCollection(comment);
(_.indexOf(this.collection.groups, comment.get('groupName'))>-1) && this.collection.push(comment);
} else
this.collection.push(comment);
this.updateComments(true);
@ -668,12 +675,20 @@ define([
onApiAddComments: function (data) {
for (var i = 0; i < data.length; ++i) {
var comment = this.readSDKComment(data[i].asc_getId(), data[i]);
this.collection.push(comment);
comment.get('groupName') ? this.addCommentToGroupCollection(comment) : this.collection.push(comment);
}
this.updateComments(true);
},
onApiRemoveComment: function (id, silentUpdate) {
for (var name in this.groupCollection) {
var store = this.groupCollection[name],
model = store.findWhere({uid: id});
if (model) {
store.remove(model);
break;
}
}
if (this.collection.length) {
var model = this.collection.findWhere({uid: id});
if (model) {
@ -717,7 +732,7 @@ define([
replies = null,
repliesCount = 0,
dateReply = null,
comment = this.findComment(id);
comment = this.findComment(id) || this.findCommentInGroup(id);
if (comment) {
t = this;
@ -776,7 +791,7 @@ define([
}
},
onApiLockComment: function (id,userId) {
var cur = this.findComment(id),
var cur = this.findComment(id) || this.findCommentInGroup(id),
user = null;
if (cur) {
@ -792,7 +807,7 @@ define([
}
},
onApiUnLockComment: function (id) {
var cur = this.findComment(id);
var cur = this.findComment(id) || this.findCommentInGroup(id);
if (cur) {
cur.set('lock', false);
this.getPopover() && this.getPopover().loadText();
@ -800,11 +815,9 @@ define([
}
},
onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
if (this.previewmode) return;
this.isModeChanged = false;
var same_uids = (0 === _.difference(this.uids, uids).length) && (0 === _.difference(uids, this.uids).length);
if (hint && this.isSelectedComment && same_uids) {
if (hint && this.isSelectedComment && same_uids && !this.isModeChanged) {
// хотим показать тот же коментарий что был и выбран
return;
}
@ -815,7 +828,7 @@ define([
if (popover) {
this.clearDummyComment();
if (this.isSelectedComment && same_uids) {
if (this.isSelectedComment && same_uids && !this.isModeChanged) {
//NOTE: click to sdk view ?
if (this.api) {
//this.view.txtComment.blur();
@ -887,6 +900,7 @@ define([
popover.setLeftTop(posX, posY, leftX);
popover.showComments(animate, false, true, text);
}
this.isModeChanged = false;
},
onApiHideComment: function (hint) {
var t = this;
@ -922,8 +936,6 @@ define([
}
},
onApiUpdateCommentPosition: function (uids, posX, posY, leftX) {
if (this.previewmode) return;
var i, useAnimation = false,
comment = null,
text = undefined,
@ -999,11 +1011,6 @@ define([
// internal
updateComments: function (needRender, disableSort) {
if (needRender && !this.view.isVisible()) {
this.view.needRender = needRender;
return;
}
var me = this;
me.updateCommentsTime = new Date();
if (me.timerUpdateComments===undefined)
@ -1017,6 +1024,12 @@ define([
},
updateCommentsView: function (needRender, disableSort) {
if (needRender && !this.view.isVisible()) {
this.view.needRender = needRender;
this.onUpdateFilter(this.filter, true);
return;
}
var i, end = true;
if (_.isUndefined(disableSort)) {
@ -1024,6 +1037,8 @@ define([
}
if (needRender) {
this.onUpdateFilter(this.filter, true);
for (i = this.collection.length - 1; i >= 0; --i) {
if (end) {
this.collection.at(i).set('last', true, {silent: true});
@ -1035,24 +1050,25 @@ define([
end = false;
}
this.onUpdateFilter(this.filter, true);
this.view.render();
this.view.needRender = false;
}
this.view.update();
},
findComment: function (uid, id) {
if (_.isUndefined(uid)) {
return this.collection.findWhere({id: id});
}
findComment: function (uid) {
return this.collection.findWhere({uid: uid});
},
findPopupComment: function (id) {
return this.popoverComments.findWhere({id: id});
},
findCommentInGroup: function (id) {
for (var name in this.groupCollection) {
var store = this.groupCollection[name],
model = store.findWhere({uid: id});
if (model) return model;
}
},
closeEditing: function (id) {
var t = this;
@ -1117,8 +1133,21 @@ define([
// helpers
onUpdateUsers: function() {
var users = this.userCollection;
this.collection.each(function (model) {
var users = this.userCollection,
hasGroup = false;
for (var name in this.groupCollection) {
hasGroup = true;
this.groupCollection[name].each(function (model) {
var user = users.findOriginalUser(model.get('userid'));
model.set('usercolor', (user) ? user.get('color') : null, {silent: true});
model.get('replys').forEach(function (reply) {
user = users.findOriginalUser(reply.get('userid'));
reply.set('usercolor', (user) ? user.get('color') : null, {silent: true});
});
});
}
!hasGroup && this.collection.each(function (model) {
var user = users.findOriginalUser(model.get('userid'));
model.set('usercolor', (user) ? user.get('color') : null, {silent: true});
@ -1135,7 +1164,8 @@ define([
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 = this.userCollection.findOriginalUser(data.asc_getUserId());
var user = this.userCollection.findOriginalUser(data.asc_getUserId()),
groupname = id.substr(0, id.lastIndexOf('_')+1).match(/^(doc|sheet[0-9_]+)_/);
var comment = new Common.Models.Comment({
uid : id,
userid : data.asc_getUserId(),
@ -1155,7 +1185,9 @@ define([
showReplyInPopover : false,
hideAddReply : !_.isUndefined(this.hidereply) ? this.hidereply : (this.showPopover ? true : false),
scope : this.view,
editable : this.mode.canEditComments || (data.asc_getUserId() == this.currentUserId)
editable : this.mode.canEditComments || (data.asc_getUserId() == this.currentUserId),
hint : !this.mode.canComments,
groupName : (groupname && groupname.length>1) ? groupname[1] : null
});
if (comment) {
var replies = this.readSDKReplies(data);
@ -1370,12 +1402,12 @@ define([
if ('none' !== panel.css('display')) {
this.view.txtComment.focus();
}
if (this.view.needRender)
this.updateComments(true);
else if (this.view.needUpdateFilter)
this.onUpdateFilter(this.view.needUpdateFilter);
this.view.update();
}
if (this.view.needRender)
this.updateComments(true);
else if (this.view.needUpdateFilter)
this.onUpdateFilter(this.view.needUpdateFilter);
this.view.update();
}
},
@ -1442,9 +1474,16 @@ define([
},
setPreviewMode: function(mode) {
this.previewmode = mode;
if (this.viewmode === mode) return;
this.viewmode = mode;
if (mode)
this.prevcanComments = this.mode.canComments;
this.mode.canComments = (mode) ? false : this.prevcanComments;
this.closeEditing();
this.setMode(this.mode);
this.updateComments(true);
if (this.getPopover())
this.getPopover().hide();
this.getPopover().update(true);
}
}, Common.Controllers.Comments || {}));

5
apps/common/main/lib/controller/Desktop.js
View file

@ -70,6 +70,11 @@ define([
}
return false;
},
requestClose: function () {
if ( config.isDesktopApp && !!app ) {
app.execCommand('editor:request', JSON.stringify({action:'close', url: config.customization.goback.url}));
}
}
};
};

12
apps/common/main/lib/controller/Plugins.js
View file

@ -63,7 +63,7 @@ define([
var tab = {action: 'plugins', caption: me.panelPlugins.groupCaption};
me.$toolbarPanelPlugins = me.panelPlugins.getPanel();
toolbar.addTab(tab, me.$toolbarPanelPlugins, 4); // TODO: clear plugins list in left panel
toolbar.addTab(tab, me.$toolbarPanelPlugins, 10); // TODO: clear plugins list in left panel
}
}
},
@ -174,7 +174,7 @@ define([
arr.push(plugin);
});
this.api.asc_pluginsRegister('', arr);
if (storePlugins.length>0)
if (storePlugins.hasVisible())
Common.NotificationCenter.trigger('tab:visible', 'plugins', true);
},
@ -292,12 +292,13 @@ define([
this.api.asc_pluginRun(record.get('guid'), 0, '');
},
onPluginShow: function(plugin, variationIndex, frameId) {
onPluginShow: function(plugin, variationIndex, frameId, urlAddition) {
var variation = plugin.get_Variations()[variationIndex];
if (variation.get_Visual()) {
var url = variation.get_Url();
url = ((plugin.get_BaseUrl().length == 0) ? url : plugin.get_BaseUrl()) + url;
if (urlAddition)
url += urlAddition;
if (variation.get_InsideMode()) {
if (!this.panelPlugins.openInsideMode(plugin.get_Name(), url, frameId))
this.api.asc_pluginButtonClick(-1);
@ -311,7 +312,8 @@ define([
if (_.isArray(arrBtns)) {
_.each(arrBtns, function(b, index){
newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')};
if (b.visible)
newBtns[index] = {text: b.text, cls: 'custom' + ((b.primary) ? ' primary' : '')};
});
}

44
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -115,7 +115,7 @@ define([
if (api) {
this.api = api;
if (this.appConfig.canReview) {
if (this.appConfig.canReview || this.appConfig.canViewReview) {
this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.onApiShowChange, this));
this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this));
}
@ -157,7 +157,7 @@ define([
this.getPopover().showReview(animate, lock, lockUser);
if (!this.appConfig.isReviewOnly && this._state.lock !== lock) {
if (this.appConfig.canReview && !this.appConfig.isReviewOnly && this._state.lock !== lock) {
this.view.btnAccept.setDisabled(lock==true);
this.view.btnReject.setDisabled(lock==true);
if (this.dlgChanges) {
@ -207,7 +207,7 @@ define([
},
getPopover: function () {
if (this.appConfig.canReview && _.isUndefined(this.popover)) {
if ((this.appConfig.canReview || this.appConfig.canViewReview) && _.isUndefined(this.popover)) {
this.popover = Common.Views.ReviewPopover.prototype.getPopover({
reviewStore : this.popoverChanges,
renderTo : this.sdkViewName
@ -408,7 +408,8 @@ define([
lockuser : item.get_LockUserId(),
type : item.get_Type(),
changedata : item,
scope : me.view
scope : me.view,
hint : !me.appConfig.canReview
});
arr.push(change);
@ -513,17 +514,22 @@ define([
},
onReviewViewClick: function(menu, item, e) {
this.turnDisplayMode(item.value);
!this.appConfig.canReview && Common.localStorage.setItem(this.view.appPrefix + "review-mode", item.value);
Common.NotificationCenter.trigger('edit:complete', this.view);
},
turnDisplayMode: function(mode) {
if (this.api) {
if (item.value === 'final')
if (mode === 'final')
this.api.asc_BeginViewModeInReview(true);
else if (item.value === 'original')
else if (mode === 'original')
this.api.asc_BeginViewModeInReview(false);
else
this.api.asc_EndViewModeInReview();
}
this.disableEditing(item.value !== 'markup');
this._state.previewMode = (item.value !== 'markup');
Common.NotificationCenter.trigger('edit:complete', this.view);
this.disableEditing(mode == 'final' || mode == 'original');
this._state.previewMode = (mode == 'final' || mode == 'original');
},
isPreviewChangesMode: function() {
@ -561,21 +567,22 @@ define([
disableEditing: function(disable) {
var app = this.getApplication();
app.getController('RightMenu').getView('RightMenu').clearSelection();
app.getController('Toolbar').DisableToolbar(disable, false, true);
app.getController('RightMenu').SetDisabled(disable, false);
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
app.getController('DocumentHolder').getView().SetDisabled(disable);
app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
var leftMenu = app.getController('LeftMenu').leftMenu;
leftMenu.btnComments.setDisabled(disable);
if (disable) leftMenu.close();
if (this.appConfig.canReview) {
app.getController('RightMenu').getView('RightMenu').clearSelection();
app.getController('RightMenu').SetDisabled(disable, false);
app.getController('Statusbar').getView('Statusbar').SetDisabled(disable);
app.getController('Navigation') && app.getController('Navigation').SetDisabled(disable);
app.getController('Common.Controllers.Plugins').getView('Common.Views.Plugins').disableControls(disable);
}
var comments = app.getController('Common.Controllers.Comments');
if (comments)
comments.setPreviewMode(disable);
var leftMenu = app.getController('LeftMenu').leftMenu;
leftMenu.getMenu('file').miProtect.setDisabled(disable);
if (this.view) {
@ -626,6 +633,9 @@ define([
me.dlgChanges.show(Math.max(10, offset.left + sdk.width() - 300), Math.max(10, offset.top + sdk.height() - 150));
}
});
} else if (config.canViewReview) {
config.canViewReview = me.api.asc_HaveRevisionsChanges(true); // check revisions from all users
config.canViewReview && me.turnDisplayMode(Common.localStorage.getItem(me.view.appPrefix + "review-mode") || 'original'); // load display mode only in viewer
}
if (me.view && me.view.btnChat) {

1
apps/common/main/lib/model/Plugin.js
View file

@ -56,6 +56,7 @@ define([
index: 0,
icons: undefined,
isViewer: false,
isDisplayedInViewer: true,
EditorsSupport: ["word", "cell", "slide"],
isVisual: false,
isCustomWindow: false,

1
apps/common/main/lib/model/ReviewChange.js
View file

@ -62,6 +62,7 @@ define([
lockuser : '',
type : 0,
changedata : null,
hint : false,
id : Common.UI.getId(), // internal
scope : null

14
apps/common/main/lib/template/Comments.template
View file

@ -10,7 +10,7 @@
<% if (quote!==null && quote!=='') { %>
<div class="user-quote"><%=scope.getFixedQuote(quote)%></div>
<% } %>
<% if (!editText) { %>
<% if (!editText || scope.viewmode) { %>
<div class="user-message" data-can-copy="true"><%=scope.pickLink(comment)%></div>
<% } else { %>
<div class="inner-edit-ct">
@ -24,20 +24,22 @@
<% if (replys.length) { %>
<div class="reply-arrow img-commonctrl"></div>
<% _.each(replys, function (item) { %>
<div class="reply-item-ct">
<% _.each(replys, function (item, index) { %>
<div class="reply-item-ct" <% if (scope.viewmode && index==replys.length-1) { %>style="padding-bottom: 0;" <% } %>;>
<div class="user-name">
<div class="color" style="display: inline-block; background-color: <% if (item.get("usercolor")!==null) { %><%=item.get("usercolor")%><% } else { %> #cfcfcf <% } %>; " ></div><%= scope.getUserName(item.get("username")) %>
</div>
<div class="user-date"><%=item.get("date")%></div>
<% if (!item.get("editText")) { %>
<div class="user-message" data-can-copy="true"><%=scope.pickLink(item.get("reply"))%></div>
<% if (!scope.viewmode) { %>
<div class="btns-reply-ct">
<% if (item.get("editable")) { %>
<div class="btn-edit img-commonctrl" data-value="<%=item.get("id")%>"></div>
<% } %>
<div class="btn-delete img-commonctrl" data-value="<%=item.get("id")%>"></div>
</div>
</div>
<%}%>
<% } else { %>
<div class="inner-edit-ct">
<textarea class="msg-reply textarea-fix user-select" maxlength="maxCommLength"><%=item.get("reply")%></textarea>
@ -51,7 +53,7 @@
<!-- add reply button -->
<% if (!showReply) { %>
<% if (!showReply && !scope.viewmode) { %>
<% if (replys.length) { %>
<label class="user-reply" style="margin-left: 20px; margin-top: 5px;" role="presentation" tabindex="-1">textAddReply</label>
<% } else { %>
@ -61,7 +63,7 @@
<!-- edit buttons -->
<% if (!editText && !lock) { %>
<% if (!editText && !lock && !scope.viewmode) { %>
<div class="edit-ct">
<% if (editable) { %>
<div class="btn-edit img-commonctrl"></div>

2
apps/common/main/lib/template/ReviewChangesPopover.template
View file

@ -4,6 +4,7 @@
</div>
<div class="user-date"><%=date%></div>
<div class="user-message limit-height"><%=changetext%></div>
<% if (!hint) { %>
<div class="edit-ct">
<% if (scope.appConfig.isReviewOnly) { %>
<div class="btn-delete img-commonctrl"></div>
@ -12,4 +13,5 @@
<div class="btn-reject img-commonctrl"></div>
<% } %>
</div>
<% } %>
</div>

5
apps/common/main/lib/view/About.js
View file

@ -61,7 +61,7 @@ define([
this.template = _.template([
'<table id="id-about-licensor-logo" cols="1" style="width: 100%; margin-top: 20px;">',
'<tr>',
'<td align="center"><div class="asc-about-office"/></td>',
'<td align="center"><div class="asc-about-office"></div></td>',
'</tr>',
'<tr>',
'<td align="center"><label class="asc-about-version">' + options.appName.toUpperCase() + '</label></td>',
@ -77,7 +77,7 @@ define([
'<tr>',
'<td colspan="3" align="center" class="padding-small">',
'<label class="asc-about-desc-name">' + this.txtAddress + '</label>',
'<label class="asc-about-desc">' + this.txtAscAddress + '</label>',
'<label class="asc-about-desc">' + "20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050" + '</label>',
'</td>',
'</tr>',
'<tr>',
@ -247,7 +247,6 @@ define([
txtLicensor: 'LICENSOR',
txtLicensee: 'LICENSEE',
txtAddress: 'address: ',
txtAscAddress: 'Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021',
txtMail: 'email: ',
txtTel: 'tel.: ',
txtEdition: 'Integration Edition '

38
apps/common/main/lib/view/Comments.js
View file

@ -79,6 +79,7 @@ define([
addCommentHeight: 45,
newCommentHeight: 110,
textBoxAutoSizeLocked: undefined, // disable autosize textbox
viewmode: false,
initialize: function (options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
@ -549,6 +550,42 @@ define([
this.autoHeightTextBox();
},
changeLayout: function(mode) {
var me = this,
add = $('.new-comment-ct', this.el),
to = $('.add-link-ct', this.el),
msgs = $('.messages-ct', this.el);
msgs.toggleClass('stretch', !mode.canComments);
if (!mode.canComments) {
add.hide(); to.hide();
this.layout.changeLayout([{el: msgs[0], rely: false, stretch: true}]);
} else {
var container = $('#comments-box', this.el),
items = container.find(' > .layout-item');
to.show();
this.layout.changeLayout([{el: items[0], rely: true,
resize: {
hidden: false,
autohide: false,
fmin: (function () {
var height = container.height();
if (add.css('display') !== 'none') {
if (height * 0.5 < me.newCommentHeight)
return height - me.newCommentHeight;
}
return height * 0.5;
}),
fmax: (function () {
if (add.css('display') !== 'none')
return container.height() - me.newCommentHeight;
return container.height() - me.addCommentHeight;
})
}},
{el: items[1], stretch: true},
{el: items[2], stretch: true}]);
}
},
updateLayout: function () {
var container = $('#comments-box', this.el), add = $('.new-comment-ct', this.el);
if (add.css('display') !== 'none') {
@ -561,6 +598,7 @@ define([
autoHeightTextBox: function () {
var me = this, domTextBox = null, lineHeight = 0, minHeight = 44;
var textBox = $('#comment-msg-new', this.el);
if (textBox.length<1) return;
function updateTextBoxHeight() {

16
apps/common/main/lib/view/Header.js
View file

@ -106,6 +106,7 @@ define([
'</section>';
var templateTitleBox = '<section id="box-document-title">' +
'<div class="extra"></div>' +
'<div class="hedset">' +
'<div class="btn-slot" id="slot-btn-dt-save"></div>' +
'<div class="btn-slot" id="slot-btn-dt-print"></div>' +
@ -148,6 +149,8 @@ define([
};
function applyUsers(count, originalCount) {
if (!$btnUsers) return;
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit; // has other user(s) who edit document
if ( has_edit_users ) {
$btnUsers
@ -204,11 +207,12 @@ define([
if ( me.logo )
me.logo.children(0).on('click', function (e) {
var _url = !!me.branding && !!me.branding.logo && !!me.branding.logo.url ?
me.branding.logo.url : 'http://www.onlyoffice.com';
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();
var _url = !!me.branding && !!me.branding.logo && (me.branding.logo.url!==undefined) ?
me.branding.logo.url : 'https://www.onlyoffice.com';
if (_url) {
var newDocumentPage = window.open(_url);
newDocumentPage && newDocumentPage.focus();
}
});
onResetUsers(storeUsers);
@ -412,6 +416,7 @@ define([
if (this.branding && this.branding.logo && this.branding.logo.image && this.logo) {
this.logo.html('<img src="' + this.branding.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
this.logo.css({'background-image': 'none', width: 'auto'});
(this.branding.logo.url || this.branding.logo.url===undefined) && this.logo.addClass('link');
}
return $html;
@ -522,6 +527,7 @@ define([
if (element) {
element.html('<img src="' + value.logo.image + '" style="max-width:100px; max-height:20px; margin: 0;"/>');
element.css({'background-image': 'none', width: 'auto'});
(value.logo.url || value.logo.url===undefined) && element.addClass('link');
}
}
}

5
apps/common/main/lib/view/LanguageDialog.js
View file

@ -109,7 +109,8 @@ define([
if (this.cmbLanguage.scroller) this.cmbLanguage.scroller.update({alwaysVisibleY: true});
this.cmbLanguage.on('selected', _.bind(this.onLangSelect, this));
this.cmbLanguage.setValue(Common.util.LanguageInfo.getLocalLanguageName(this.options.current)[0]);
var langname = Common.util.LanguageInfo.getLocalLanguageName(this.options.current);
this.cmbLanguage.setValue(langname[0], langname[1]);
this.onLangSelect(this.cmbLanguage, this.cmbLanguage.getSelectedRecord());
},
@ -133,7 +134,7 @@ define([
plang = icon.attr('lang');
if (plang) icon.removeClass(plang);
icon.addClass(rec.value).attr('lang',rec.value);
rec && icon.addClass(rec.value).attr('lang',rec.value);
},
onPrimary: function() {

8
apps/common/main/lib/view/OpenDialog.js
View file

@ -74,7 +74,8 @@ define([
cls : 'open-dlg',
contentTemplate : '',
title : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT'),
toolcallback : _.bind(t.onToolClose, t)
toolcallback : _.bind(t.onToolClose, t),
closeFile : false
}, options);
@ -130,8 +131,11 @@ define([
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
'<% if (closeFile) { %>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
'<% } %>',
'<% if (closable) { %>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + ((_options.mode == 1) ? t.closeButtonText : t.cancelButtonText) + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.cancelButtonText + '</button>',
'<% } %>',
'</div>'
].join('');

32
apps/common/main/lib/view/ReviewChanges.js
View file

@ -126,11 +126,11 @@ define([
this.btnsTurnReview.forEach(function (button) {
button.on('click', _click_turnpreview.bind(me));
});
}
if (this.appConfig.canViewReview)
this.btnReviewView.menu.on('item:click', function (menu, item, e) {
me.fireEvent('reviewchanges:view', [menu, item]);
});
}
this.btnsSpelling.forEach(function(button) {
button.on('click', function (b, e) {
@ -206,7 +206,8 @@ define([
enableToggle: true
});
this.btnsTurnReview = [this.btnTurnOn];
}
if (this.appConfig.canViewReview) {
this.btnReviewView = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-reviewview',
@ -223,7 +224,7 @@ define([
});
}
if (!this.appConfig.isOffline && this.appConfig.canCoAuthoring) {
if (this.appConfig.isEdit && !this.appConfig.isOffline && this.appConfig.canCoAuthoring) {
this.btnCoAuthMode = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-coedit',
@ -311,6 +312,10 @@ define([
);
me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]);
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
}
if (me.appConfig.canViewReview) {
me.btnReviewView.setMenu(
new Common.UI.Menu({
cls: 'ppm-toolbar',
@ -345,11 +350,8 @@ define([
]
}));
me.btnReviewView.updateHint(me.tipReviewView);
me.btnAccept.setDisabled(config.isReviewOnly);
me.btnReject.setDisabled(config.isReviewOnly);
!me.appConfig.canReview && me.turnDisplayMode(Common.localStorage.getItem(me.appPrefix + "review-mode") || 'original');
}
me.btnSharing && me.btnSharing.updateHint(me.tipSharing);
me.btnHistory && me.btnHistory.updateHint(me.tipHistory);
me.btnChat && me.btnChat.updateHint(me.txtChat + Common.Utils.String.platformKey('Alt+Q'));
@ -392,7 +394,7 @@ define([
var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing',
separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments',
separator_review = !config.canReview ? me.$el.find('.separator.review') : '.separator.review',
separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review',
separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat',
separator_last;
@ -419,7 +421,7 @@ define([
if (!me.btnHistory && separator_last)
me.$el.find(separator_last).hide();
Common.NotificationCenter.trigger('tab:visible', 'review', true);
Common.NotificationCenter.trigger('tab:visible', 'review', config.isEdit || config.canViewReview);
setEvents.call(me);
});
@ -434,8 +436,8 @@ define([
this.btnAccept.render(this.$el.find('#btn-change-accept'));
this.btnReject.render(this.$el.find('#btn-change-reject'));
this.btnTurnOn.render(this.$el.find('#btn-review-on'));
this.btnReviewView.render(this.$el.find('#btn-review-view'));
}
this.btnReviewView && this.btnReviewView.render(this.$el.find('#btn-review-view'));
this.btnSharing && this.btnSharing.render(this.$el.find('#slot-btn-sharing'));
this.btnCoAuthMode && this.btnCoAuthMode.render(this.$el.find('#slot-btn-coauthmode'));
@ -529,6 +531,14 @@ define([
this.btnChat && this.btnChat.toggle(state, true);
},
turnDisplayMode: function(mode) {
if (this.btnReviewView) {
this.btnReviewView.menu.items[0].setChecked(mode=='markup', true);
this.btnReviewView.menu.items[1].setChecked(mode=='final', true);
this.btnReviewView.menu.items[2].setChecked(mode=='original', true);
}
},
SetDisabled: function (state, langs) {
this.btnsSpelling && this.btnsSpelling.forEach(function(button) {
if ( button ) {

12
apps/common/main/lib/view/SearchDialog.js
View file

@ -87,10 +87,10 @@
'<div class="box">',
'<div class="input-row">',
'<span class="btn-placeholder" id="search-placeholder-btn-options"></span>',
'<input type="text" id="sd-text-search" class="form-control" maxlength="100" placeholder="'+this.textSearchStart+'">',
'<input type="text" id="sd-text-search" class="form-control" maxlength="255" placeholder="'+this.textSearchStart+'">',
'</div>',
'<div class="input-row">',
'<input type="text" id="sd-text-replace" class="form-control" maxlength="100" placeholder="'+this.textReplaceDef+'">',
'<input type="text" id="sd-text-replace" class="form-control" maxlength="255" placeholder="'+this.textReplaceDef+'">',
'</div>',
'<div class="input-row">',
'<label class="link" id="search-label-replace" result="replaceshow">'+this.txtBtnReplace+'</label>',
@ -176,12 +176,14 @@
return this;
},
show: function(mode) {
show: function(mode, text) {
Common.UI.Window.prototype.show.call(this);
!this.mode && !mode && (mode = 'search');
if (mode && this.mode != mode) this.setMode(mode);
text && this.setSearchText(text);
if (this.options.markresult && this.miHighlight.checked) {
this.fireEvent('search:highlight', [this, true]);
}
@ -271,6 +273,10 @@
}
},
setSearchText: function(value) {
this.txtSearch && this.txtSearch.val(value);
},
onShowReplace: function(e) {
this.setMode((this.mode=='replace') ? 'search' : 'replace');

0
apps/common/main/resources/img/about/OnlyOffice.png → apps/common/main/resources/img/about/logo.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
apps/common/main/resources/img/about/OnlyOffice@2x.png → apps/common/main/resources/img/about/logo@2x.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
apps/common/main/resources/img/controls/toolbarbig.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
apps/common/main/resources/img/controls/toolbarbig@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 37 KiB

15
apps/common/main/resources/less/about.less
View file

@ -1,11 +1,18 @@
.about-dlg {
.asc-about-office {
background-repeat: no-repeat;
.background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 340px);
width: 340px;
height: 55px;
margin-bottom: 5px;
&:before {
content: data-uri('@{common-image-path}/about/logo.png');
@media
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 2dppx),
only screen and (min-resolution: 192dpi) {
content: data-uri('@{common-image-path}/about/logo@2x.png');
}
}
}
.asc-about-header {

4
apps/common/main/resources/less/comments.less
View file

@ -16,6 +16,10 @@
height: 300px;
border-bottom: 1px solid @gray-dark;
&.stretch {
border-bottom: none;
}
.ps-scrollbar-y-rail {
margin-top: 5px;
margin-bottom: 5px;

6
apps/common/main/resources/less/header.less
View file

@ -144,9 +144,13 @@
.background-ximage('@{common-image-path}/header/header-logo.png', '@{common-image-path}/header/header-logo@2x.png', 86px);
}
img {
&.link img {
cursor: pointer;
}
#box-document-title & {
padding: 4px 24px 4px 12px;
}
}
}

2
apps/common/main/resources/less/language-dialog.less
View file

@ -63,7 +63,7 @@
&.sr, &.sr-Cyrl-RS, &.sr-Latn-RS {background-position: -16px -168px;}
&.sk, &.sk-SK {background-position: -32px -168px;}
&.kk, &.kk-KZ {background-position: 0 -180px;}
&.fi, &.fi-FI {background-position: -16px -180px;}
&.fi, &.fi-FI, &.sv-FI {background-position: -16px -180px;}
&.zh, &.zh-CN {background-position: -32px -180px;}
&.ja, &.ja-JP {background-position: 0 -192px;}
&.es-MX {background-position: -16px -192px;}

4
apps/common/main/resources/less/tabbar.less
View file

@ -15,6 +15,10 @@
}
}
&:not(.dragged) {
transition: left .2s;
}
> a {
display: inline;
background-color: #7a7a7a;

53
apps/common/main/resources/less/toolbar.less
View file

@ -108,20 +108,46 @@
.scroll {
line-height: @height-tabs;
min-width: 20px;
text-align: center;
z-index: 1;
cursor: pointer;
color: #fff;
position: relative;
display: flex;
align-items: center;
&:hover {
text-decoration: none;
}
&:not(:hover) {
&:after {
opacity: .8;
}
}
&.left{
box-shadow: 5px 0 20px 5px @tabs-bg-color
box-shadow: 5px 0 20px 5px @tabs-bg-color;
&:after {
transform: rotate(135deg);
margin-left: 8px;
}
}
&.right{
box-shadow: -5px 0 20px 5px @tabs-bg-color
box-shadow: -5px 0 20px 5px @tabs-bg-color;
&:after {
transform: rotate(-45deg);
margin-left: 4px;
}
}
@arrow-length: 8px;
&:after {
content: ' ';
width: @arrow-length;
height: @arrow-length;
border: solid white;
border-width: 0 2px 2px 0;
}
}
}
@ -147,6 +173,22 @@
.panel:not(.active) {
display: none;
}
/* ##adopt-panel-width */
.panel.compactwidth:not(#plugns-panel) {
.btn-group, .btn-toolbar {
&.x-huge {
.caption {
display: none;
}
.inner-box-caption {
justify-content: center;
}
}
}
}
/**/
}
background-color: @gray-light;
@ -323,4 +365,5 @@
.button-normal-icon(btn-controls, 54, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-select-pivot', 55, @toolbar-big-icon-size);
.button-normal-icon(~'x-huge .btn-bookmarks', 56, @toolbar-big-icon-size);
.button-normal-icon(btn-print-area, 56, @toolbar-big-icon-size);
.button-normal-icon(btn-blankpage, 57, @toolbar-big-icon-size);
.button-normal-icon(btn-print-area, 58, @toolbar-big-icon-size);

27
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -216,8 +216,6 @@ var ApplicationController = new(function(){
}
function onDocumentContentReady() {
Common.Gateway.documentReady();
hidePreloader();
var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom) : -2);
@ -320,7 +318,7 @@ var ApplicationController = new(function(){
}, 2000);
}
});
Common.Gateway.documentReady();
Common.Analytics.trackEvent('Load', 'Complete');
}
@ -360,6 +358,16 @@ var ApplicationController = new(function(){
}
function onError(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) {
$('#id-critical-error-title').text(me.criticalErrorTitle);
$('#id-critical-error-message').text(me.scriptLoadError);
$('#id-critical-error-close').off().on('click', function(){
window.location.reload();
});
$('#id-critical-error-dialog').css('z-index', 20002).modal('show');
return;
}
hidePreloader();
var message;
@ -382,6 +390,10 @@ var ApplicationController = new(function(){
message = me.downloadErrorText;
break;
case Asc.c_oAscError.ID.ConvertationPassword:
message = me.errorFilePassProtect;
break;
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@ -440,6 +452,10 @@ var ApplicationController = new(function(){
}
function onDownloadAs() {
if ( permissions.download === false) {
Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, me.errorAccessDeny);
return;
}
if (api) api.asc_DownloadAs(Asc.c_oAscFileType.DOCX, true);
}
@ -525,6 +541,9 @@ var ApplicationController = new(function(){
convertationErrorText : 'Convertation failed.',
downloadErrorText : 'Download failed.',
criticalErrorTitle : 'Error',
notcriticalErrorTitle : 'Warning'
notcriticalErrorTitle : 'Warning',
scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
errorFilePassProtect: 'The file is password protected and cannot be opened.',
errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.'
}
})();

21
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -126,7 +126,7 @@ define([
shortcuts: {
'command+shift+s,ctrl+shift+s': _.bind(this.onShortcut, this, 'save'),
'command+f,ctrl+f': _.bind(this.onShortcut, this, 'search'),
'command+h,ctrl+h': _.bind(this.onShortcut, this, 'replace'),
'ctrl+h': _.bind(this.onShortcut, this, 'replace'),
'alt+f': _.bind(this.onShortcut, this, 'file'),
'esc': _.bind(this.onShortcut, this, 'escape'),
/** coauthoring begin **/
@ -143,7 +143,7 @@ define([
setApi: function(api) {
this.api = api;
this.api.asc_registerCallback('asc_onReplaceAll', _.bind(this.onApiTextReplaced, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this, true));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
/** coauthoring begin **/
@ -188,8 +188,8 @@ define([
createDelayedElements: function() {
/** coauthoring begin **/
if ( this.mode.canCoAuthoring ) {
this.leftMenu.btnComments[(this.mode.canComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canComments)
this.leftMenu.btnComments[(this.mode.canViewComments && !this.mode.isLightVersion) ? 'show' : 'hide']();
if (this.mode.canViewComments)
this.leftMenu.setOptionsPanel('comment', this.getApplication().getController('Common.Controllers.Comments').getView());
this.leftMenu.btnChat[(this.mode.canChat && !this.mode.isLightVersion) ? 'show' : 'hide']();
@ -406,7 +406,7 @@ define([
Common.Utils.InternalSettings.set("de-settings-livecomment", value);
var resolved = Common.localStorage.getBool("de-settings-resolvedcomment");
Common.Utils.InternalSettings.set("de-settings-resolvedcomment", resolved);
if (this.mode.canComments && this.leftMenu.panelComments.isVisible())
if (this.mode.canViewComments && this.leftMenu.panelComments.isVisible())
value = resolved = true;
(value) ? this.api.asc_showComments(resolved) : this.api.asc_hideComments();
/** coauthoring end **/
@ -535,9 +535,10 @@ define([
var mode = this.mode.isEdit ? (action || undefined) : 'no-replace';
if (this.dlgSearch.isVisible()) {
this.dlgSearch.setMode(mode);
this.dlgSearch.setSearchText(this.api.asc_GetSelectedText());
this.dlgSearch.focus();
} else {
this.dlgSearch.show(mode);
this.dlgSearch.show(mode, this.api.asc_GetSelectedText());
}
} else this.dlgSearch['hide']();
},
@ -564,7 +565,7 @@ define([
}
},
onApiServerDisconnect: function(disableDownload) {
onApiServerDisconnect: function(enableDownload) {
this.mode.isEdit = false;
this.leftMenu.close();
@ -575,7 +576,7 @@ define([
this.leftMenu.btnPlugins.setDisabled(true);
this.leftMenu.btnNavigation.setDisabled(true);
this.leftMenu.getMenu('file').setMode({isDisconnected: true, disableDownload: !!disableDownload});
this.leftMenu.getMenu('file').setMode({isDisconnected: true, enableDownload: !!enableDownload});
if ( this.dlgSearch ) {
this.leftMenu.btnSearch.toggle(false, true);
this.dlgSearch['hide']();
@ -652,7 +653,7 @@ define([
if (value && this.leftMenu._state.pluginIsRunning) {
this.leftMenu.panelPlugins.show();
if (this.mode.canCoAuthoring) {
this.mode.canComments && this.leftMenu.panelComments['hide']();
this.mode.canViewComments && this.leftMenu.panelComments['hide']();
this.mode.canChat && this.leftMenu.panelChat['hide']();
}
}
@ -750,7 +751,7 @@ define([
}
return false;
case 'comments':
if (this.mode.canCoAuthoring && this.mode.canComments && !this.mode.isLightVersion) {
if (this.mode.canCoAuthoring && this.mode.canViewComments && !this.mode.isLightVersion) {
Common.UI.Menu.Manager.hideAll();
this.leftMenu.showMenu('comments');
this.getApplication().getController('Common.Controllers.Comments').onAfterShow();

96
apps/documenteditor/main/app/controller/Main.js
View file

@ -403,6 +403,11 @@ define([
},
onDownloadAs: function(format) {
if ( !this.appOptions.canDownload && !this.appOptions.canDownloadOrigin) {
Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny);
return;
}
this._state.isFromGatewayDownloadAs = true;
var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
if (type && typeof type[1] === 'string')
@ -592,10 +597,10 @@ define([
app.getController('LeftMenu').SetDisabled(disable, true);
},
goBack: function() {
goBack: function(current) {
if ( !Common.Controllers.Desktop.process('goback') ) {
var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) {
if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;
@ -802,8 +807,6 @@ define([
if (this._isDocReady)
return;
Common.Gateway.documentReady();
if (this._state.openDlg)
this._state.openDlg.close();
@ -994,6 +997,7 @@ define([
Common.Gateway.sendInfo({mode:me.appOptions.isEdit?'edit':'view'});
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
Common.Gateway.documentReady();
},
onLicenseChanged: function(params) {
@ -1068,7 +1072,7 @@ define([
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%';
elem ? elem.innerHTML = proc : this.loadMask.setTitle(proc);
elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc);
},
onEditorPermissions: function(params) {
@ -1105,6 +1109,7 @@ define([
(!this.appOptions.isReviewOnly || this.appOptions.canLicense); // if isReviewOnly==true -> canLicense must be true
this.appOptions.isEdit = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
this.appOptions.canReview = this.permissions.review === true && this.appOptions.canLicense && this.appOptions.isEdit;
this.appOptions.canViewReview = true;
this.appOptions.canUseHistory = this.appOptions.canLicense && this.editorConfig.canUseHistory && this.appOptions.canCoAuthoring && !this.appOptions.isOffline;
this.appOptions.canHistoryClose = this.editorConfig.canHistoryClose;
this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore && !!this.permissions.changeHistory;
@ -1112,6 +1117,7 @@ define([
this.appOptions.canSendEmailAddresses = this.appOptions.canLicense && this.editorConfig.canSendEmailAddresses && this.appOptions.canEdit && this.appOptions.canCoAuthoring;
this.appOptions.canComments = this.appOptions.canLicense && (this.permissions.comment===undefined ? this.appOptions.isEdit : this.permissions.comment) && (this.editorConfig.mode !== 'view');
this.appOptions.canComments = this.appOptions.canComments && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
this.appOptions.canViewComments = this.appOptions.canComments || !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit;
this.appOptions.canPrint = (this.permissions.print !== false);
@ -1204,27 +1210,24 @@ define([
},
applyModeEditorElements: function() {
if (this.appOptions.canComments || this.appOptions.isEdit) {
/** coauthoring begin **/
this.contComments.setMode(this.appOptions);
this.contComments.setConfig({config: this.editorConfig}, this.api);
/** coauthoring end **/
}
if (this.appOptions.isEdit) {
var me = this,
application = this.getApplication(),
toolbarController = application.getController('Toolbar'),
rightmenuController = application.getController('RightMenu'),
fontsControllers = application.getController('Common.Controllers.Fonts'),
reviewController = application.getController('Common.Controllers.ReviewChanges');
/** coauthoring begin **/
this.contComments.setMode(this.appOptions);
this.contComments.setConfig({config: this.editorConfig}, this.api);
/** coauthoring end **/
var me = this,
application = this.getApplication(),
reviewController = application.getController('Common.Controllers.ReviewChanges');
reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
if (this.appOptions.isEdit) {
var toolbarController = application.getController('Toolbar'),
rightmenuController = application.getController('RightMenu'),
fontsControllers = application.getController('Common.Controllers.Fonts');
fontsControllers && fontsControllers.setApi(me.api);
toolbarController && toolbarController.setApi(me.api);
rightmenuController && rightmenuController.setApi(me.api);
reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
if (this.appOptions.canProtect)
application.getController('Common.Controllers.Protection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
@ -1289,6 +1292,12 @@ define([
},
onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) {
this.showTips([this.scriptLoadError]);
this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000);
return;
}
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
@ -1429,6 +1438,10 @@ define([
config.msg = this.errorDataEncrypted;
break;
case Asc.c_oAscError.ID.EditingError:
config.msg = (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.errorEditingSaveas : this.errorEditingDownloadas;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -1447,7 +1460,7 @@ define([
config.msg += '<br/><br/>' + this.criticalErrorExtText;
config.callback = function(btn) {
if (btn == 'ok')
Common.NotificationCenter.trigger('goback');
Common.NotificationCenter.trigger('goback', true);
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
@ -1482,6 +1495,9 @@ define([
}
})).show();
},10);
} else if (id == Asc.c_oAscError.ID.EditingError) {
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print
}
this._state.lostEditingRights = false;
this.onEditComplete();
@ -1908,7 +1924,7 @@ define([
});
} else if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
me._state.openDlg = new Common.Views.OpenDialog({
closable: me.appOptions.canRequestClose,
closeFile: me.appOptions.canRequestClose,
type: type,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
validatePwd: !!me._state.isDRM,
@ -1919,8 +1935,10 @@ define([
me.api.asc_setAdvancedOptions(type, new Asc.asc_CDRMAdvancedOptions(value));
me.loadMask && me.loadMask.show();
}
} else
} else {
Common.Gateway.requestClose();
Common.Controllers.Desktop.requestClose();
}
me._state.openDlg = null;
}
});
@ -2081,7 +2099,8 @@ define([
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = this.appOptions.isEdit;
if (plugins) {
var arr = [], arrUI = [];
var arr = [], arrUI = [],
lang = this.appOptions.lang.split(/[\-\_]/)[0];
plugins.pluginsData.forEach(function(item){
if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
@ -2091,18 +2110,29 @@ define([
var variationsArr = [],
pluginVisible = false;
item.variations.forEach(function(itemVar){
var visible = (isEdit || itemVar.isViewer) && _.contains(itemVar.EditorsSupport, 'word');
var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, 'word');
if ( visible ) pluginVisible = true;
if (item.isUICustomizer ) {
visible && arrUI.push(item.baseUrl + itemVar.url);
} else {
var model = new Common.Models.PluginVariation(itemVar);
var description = itemVar.description;
if (typeof itemVar.descriptionLocale == 'object')
description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
_.each(itemVar.buttons, function(b, index){
if (typeof b.textLocale == 'object')
b.text = b.textLocale[lang] || b.textLocale['en'] || b.text || '';
b.visible = (isEdit || b.isViewer !== false);
});
model.set({
description: description,
index: variationsArr.length,
url: itemVar.url,
icons: itemVar.icons,
buttons: itemVar.buttons,
visible: visible
});
@ -2110,9 +2140,13 @@ define([
}
});
if (variationsArr.length>0 && !item.isUICustomizer)
if (variationsArr.length>0 && !item.isUICustomizer) {
var name = item.name;
if (typeof item.nameLocale == 'object')
name = item.nameLocale[lang] || item.nameLocale['en'] || name || '';
arr.push(new Common.Models.Plugin({
name : item.name,
name : name,
guid: item.guid,
baseUrl : item.baseUrl,
variations: variationsArr,
@ -2121,6 +2155,7 @@ define([
groupName: (item.group) ? item.group.name : '',
groupRank: (item.group) ? item.group.rank : 0
}));
}
});
if ( uiCustomize!==false ) // from ui customizer in editor config or desktop event
@ -2301,7 +2336,10 @@ define([
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department'
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department',
scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
errorEditingSaveas: 'An error occurred during the work with the document.<br>Use the \'Save as...\' option to save the file backup copy to your computer hard drive.',
errorEditingDownloadas: 'An error occurred during the work with the document.<br>Use the \'Download as...\' option to save the file backup copy to your computer hard drive.'
}
})(), DE.Controllers.Main || {}))
});

2
apps/documenteditor/main/app/controller/RightMenu.js
View file

@ -279,7 +279,7 @@ define([
this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings"));
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));
}
}
},

53
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -312,6 +312,7 @@ define([
toolbar.btnEditHeader.menu.on('item:click', _.bind(this.onEditHeaderFooterClick, this));
toolbar.mnuPageNumCurrentPos.on('click', _.bind(this.onPageNumCurrentPosClick, this));
toolbar.mnuInsertPageCount.on('click', _.bind(this.onInsertPageCountClick, this));
toolbar.btnBlankPage.on('click', _.bind(this.onBtnBlankPageClick, this));
toolbar.listStyles.on('click', _.bind(this.onListStyleSelect, this));
toolbar.listStyles.on('contextmenu', _.bind(this.onListStyleContextMenu, this));
toolbar.styleMenu.on('hide:before', _.bind(this.onListStyleBeforeHide, this));
@ -358,7 +359,7 @@ define([
this.api.asc_registerCallback('asc_onMarkerFormatChanged', _.bind(this.onApiStartHighlight, this));
this.api.asc_registerCallback('asc_onTextHighLight', _.bind(this.onApiHighlightColor, this));
this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this));
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onMathTypes, this));
@ -746,6 +747,7 @@ define([
var in_footnote = this.api.asc_IsCursorInFootnote();
need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control;
toolbar.btnsPageBreak.setDisabled(need_disable);
toolbar.btnBlankPage.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || in_equation || control_plain;
toolbar.btnInsertShape.setDisabled(need_disable);
@ -934,7 +936,7 @@ define([
var toolbar = this.toolbar;
if (this.api) {
var isModified = this.api.asc_isDocumentCanSave();
var isSyncButton = toolbar.btnCollabChanges.$icon.hasClass('btn-synch');
var isSyncButton = toolbar.btnCollabChanges && toolbar.btnCollabChanges.$icon.hasClass('btn-synch');
if (!isModified && !isSyncButton && !toolbar.mode.forcesave)
return;
@ -1139,6 +1141,7 @@ define([
onFontNameSelect: function(combo, record) {
if (this.api) {
if (record.isNewFont) {
!this.getApplication().getController('Main').isModalShowed &&
Common.UI.warning({
width: 500,
closable: false,
@ -1856,6 +1859,14 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Page Number');
},
onBtnBlankPageClick: function(btn) {
if (this.api)
this.api.asc_AddBlankPage();
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Blank Page');
},
onListStyleSelect: function(combo, record) {
this._state.prstyle = undefined;
if (this.api)
@ -2674,8 +2685,8 @@ define([
});
},
onApiCoAuthoringDisconnect: function(disableDownload) {
this.toolbar.setMode({isDisconnected:true, disableDownload: !!disableDownload});
onApiCoAuthoringDisconnect: function(enableDownload) {
this.toolbar.setMode({isDisconnected:true, enableDownload: !!enableDownload});
this.editMode = false;
this.DisableToolbar(true, true);
},
@ -2707,7 +2718,7 @@ define([
toolbar._state.previewmode = reviewmode && disable;
if (reviewmode) {
toolbar._state.previewmode && toolbar.btnSave.setDisabled(true);
toolbar._state.previewmode && toolbar.btnSave && toolbar.btnSave.setDisabled(true);
if (toolbar.needShowSynchTip) {
toolbar.needShowSynchTip = false;
@ -2757,27 +2768,27 @@ define([
me.toolbar.render(_.extend({isCompactView: compactview}, config));
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = this.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel )
me.toolbar.addTab(tab, $panel, 4);
if ( config.isEdit ) {
me.toolbar.setMode(config);
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
var $panel = this.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ( $panel )
me.toolbar.addTab(tab, $panel, 4);
me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
// hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
// hide 'undo' and 'redo' buttons and retrieve parent container
var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
// move 'paste' button to the container instead of 'undo' and 'redo'
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.isDesktopApp ) {
// hide 'print' and 'save' buttons group and next separator
me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
// hide 'undo' and 'redo' buttons and retrieve parent container
var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
// move 'paste' button to the container instead of 'undo' and 'redo'
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.canProtect ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();

12
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -76,7 +76,8 @@ define([
'render:before' : function (toolbar) {
var config = DE.getController('Main').appOptions;
toolbar.setExtra('right', me.header.getPanel('right', config));
toolbar.setExtra('left', me.header.getPanel('left', config));
if (!config.isEdit)
toolbar.setExtra('left', me.header.getPanel('left', config));
},
'view:compact' : function (toolbar, state) {
me.header.mnuitemCompactToolbar.setChecked(state, true);
@ -161,9 +162,10 @@ define([
if ( panel ) panel.height = _intvars.get('toolbar-height-tabs');
}
if ( config.isDesktopApp && config.isEdit ) {
if ( config.isEdit ) {
var $title = me.viewport.vlayout.getItem('title').el;
$title.html(me.header.getPanel('title', config)).show();
$title.find('.extra').html(me.header.getPanel('left', config));
var toolbar = me.viewport.vlayout.getItem('toolbar');
toolbar.el.addClass('top-title');
@ -381,11 +383,11 @@ define([
}
},
onApiCoAuthoringDisconnect: function() {
onApiCoAuthoringDisconnect: function(enableDownload) {
if (this.header) {
if (this.header.btnDownload)
if (this.header.btnDownload && !enableDownload)
this.header.btnDownload.hide();
if (this.header.btnPrint)
if (this.header.btnPrint && !enableDownload)
this.header.btnPrint.hide();
if (this.header.btnEdit)
this.header.btnEdit.hide();

1
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -81,6 +81,7 @@
</section>
<section class="panel" data-tab="ins">
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-blankpage"></span>
<span class="btn-slot text x-huge btn-pagebreak"></span>
<span class="btn-slot text x-huge" id="slot-btn-editheader"></span>
</div>

4
apps/documenteditor/main/app/view/BookmarksDialog.js
View file

@ -271,12 +271,12 @@ define([
gotoBookmark: function(btn, eOpts){
var rec = this.bookmarksList.getSelectedRec();
if (rec.length>0) {
this.props.asc_GoToBookmark(rec[0].get('value'));
this.props.asc_SelectBookmark(rec[0].get('value'));
}
},
onDblClickBookmark: function(listView, itemView, record) {
this.props.asc_GoToBookmark(record.get('value'));
this.props.asc_SelectBookmark(record.get('value'));
},
deleteBookmark: function(btn, eOpts){

5
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -614,6 +614,7 @@ define([
var coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = me.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
if (!pasteItems) return;
// Prepare menu container
if (pasteContainer.length < 1) {
@ -772,13 +773,15 @@ define([
}
if (props && props.get_Checked()===false && props.get_Variants() !== null && props.get_Variants() !== undefined) {
me.addWordVariants();
if (me.textMenu.isVisible()) {
if (me.textMenu && me.textMenu.isVisible()) {
me.textMenu.alignPosition();
}
}
};
this.addWordVariants = function(isParagraph) {
if (!me.textMenu) return;
if (_.isUndefined(isParagraph)) {
isParagraph = me.textMenu.isVisible();
}

10
apps/documenteditor/main/app/view/FileMenu.js
View file

@ -277,8 +277,10 @@ define([
this.$el.find('#fm-btn-back').hide().prev().hide();
this.panels['opts'].setMode(this.mode);
this.panels['info'].setMode(this.mode).updateInfo(this.document);
this.panels['rights'].setMode(this.mode).updateInfo(this.document);
this.panels['info'].setMode(this.mode);
!this.mode.isDisconnected && this.panels['info'].updateInfo(this.document);
this.panels['rights'].setMode(this.mode);
!this.mode.isDisconnected && this.panels['rights'].updateInfo(this.document);
if ( this.mode.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) {
@ -322,8 +324,8 @@ define([
this.mode.canOpenRecent = this.mode.canCreateNew = false;
this.mode.isDisconnected = mode.isDisconnected;
this.mode.canRename = false;
this.mode.canPrint = false;
this.mode.canDownload = this.mode.canDownloadOrigin = false;
if (!mode.enableDownload)
this.mode.canPrint = this.mode.canDownload = this.mode.canDownloadOrigin = false;
} else {
this.mode = mode;
}

20
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -208,7 +208,7 @@ define([
'<tr class="coauth changes">',
'<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
'<td class="right">',
'<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;"/>',
'<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
'<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
'</tr>','<tr class="divider coauth changes"></tr>',
'<tr class="coauth changes">',
@ -401,7 +401,7 @@ define([
/** coauthoring begin **/
$('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.comments', this.el)[mode.canCoAuthoring && (mode.isEdit || mode.canComments) ? 'show' : 'hide']();
$('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide']();
/** coauthoring end **/
},
@ -682,6 +682,10 @@ define([
'<td class="left"><label>' + this.txtPlacement + '</label></td>',
'<td class="right"><label id="id-info-placement">-</label></td>',
'</tr>',
'<tr class="appname">',
'<td class="left"><label>' + this.txtAppName + '</label></td>',
'<td class="right"><label id="id-info-appname">-</label></td>',
'</tr>',
'<tr class="date">',
'<td class="left"><label>' + this.txtDate + '</label></td>',
'<td class="right"><label id="id-info-date">-</label></td>',
@ -729,6 +733,7 @@ define([
this.lblPlacement = $('#id-info-placement');
this.lblDate = $('#id-info-date');
this.lblAuthor = $('#id-info-author');
this.lblApplication = $('#id-info-appname');
this.lblStatPages = $('#id-info-pages');
this.lblStatWords = $('#id-info-words');
this.lblStatParagraphs = $('#id-info-paragraphs');
@ -781,6 +786,12 @@ define([
this._ShowHideInfoItem('placement', doc.info.folder!==undefined && doc.info.folder!==null);
} else
this._ShowHideDocInfo(false);
var appname = (this.api) ? this.api.asc_getAppProps() : null;
if (appname) {
appname = (appname.asc_getApplication() || '') + ' ' + (appname.asc_getAppVersion() || '');
this.lblApplication.text(appname);
}
this._ShowHideInfoItem('appname', !!appname);
},
_ShowHideInfoItem: function(cls, visible) {
@ -812,7 +823,7 @@ define([
this.api.asc_registerCallback('asc_onDocInfo', _.bind(this._onDocInfo, this));
this.api.asc_registerCallback('asc_onGetDocInfoEnd', _.bind(this._onGetDocInfoEnd, this));
this.api.asc_registerCallback('asc_onDocumentName', _.bind(this.onDocumentName, this));
this.updateInfo(this.doc);
return this;
},
@ -873,7 +884,8 @@ define([
txtParagraphs: 'Paragraphs',
txtSymbols: 'Symbols',
txtSpaces: 'Symbols with spaces',
txtLoading: 'Loading...'
txtLoading: 'Loading...',
txtAppName: 'Application'
}, DE.Views.FileMenuPanels.DocumentInfo || {}));
DE.Views.FileMenuPanels.DocumentRights = Common.UI.BaseView.extend(_.extend({

6
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -426,7 +426,7 @@ define([
onBtnRotateClick: function(btn) {
var properties = new Asc.asc_CImgProperty();
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
properties.asc_putRotAdd((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
this.api.ImgApply(properties);
this.fireEvent('editcomplete', this);
},
@ -434,9 +434,9 @@ define([
onBtnFlipClick: function(btn) {
var properties = new Asc.asc_CImgProperty();
if (btn.options.value==1)
properties.asc_putFlipH(true);
properties.asc_putFlipHInvert(true);
else
properties.asc_putFlipV(true);
properties.asc_putFlipVInvert(true);
this.api.ImgApply(properties);
this.fireEvent('editcomplete', this);
},

4
apps/documenteditor/main/app/view/LeftMenu.js
View file

@ -216,7 +216,7 @@ define([
onCoauthOptions: function(e) {
/** coauthoring begin **/
if (this.mode.canCoAuthoring) {
if (this.mode.canComments) {
if (this.mode.canViewComments) {
if (this.btnComments.pressed && this.btnComments.$el.hasClass('notify'))
this.btnComments.$el.removeClass('notify');
this.panelComments[this.btnComments.pressed?'show':'hide']();
@ -288,7 +288,7 @@ define([
this.$el.width(SCALE_MIN);
/** coauthoring begin **/
if (this.mode.canCoAuthoring) {
if (this.mode.canComments) {
if (this.mode.canViewComments) {
this.panelComments['hide']();
if (this.btnComments.pressed)
this.fireEvent('comments:hide', this);

3
apps/documenteditor/main/app/view/RightMenu.js
View file

@ -150,7 +150,8 @@ define([
this.trigger('render:before', this);
var open = !Common.localStorage.getBool("de-hide-right-settings");
this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu;
var open = !Common.localStorage.getBool("de-hide-right-settings", this.defaultHideRightMenu);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show();

18
apps/documenteditor/main/app/view/ShapeSettings.js
View file

@ -376,8 +376,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -515,8 +517,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},
@ -1565,7 +1569,7 @@ define([
onBtnRotateClick: function(btn) {
var properties = new Asc.asc_CImgProperty();
properties.asc_putRot((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
properties.asc_putRotAdd((btn.options.value==1 ? 90 : 270) * 3.14159265358979 / 180);
this.api.ImgApply(properties);
this.fireEvent('editcomplete', this);
},
@ -1573,9 +1577,9 @@ define([
onBtnFlipClick: function(btn) {
var properties = new Asc.asc_CImgProperty();
if (btn.options.value==1)
properties.asc_putFlipH(true);
properties.asc_putFlipHInvert(true);
else
properties.asc_putFlipV(true);
properties.asc_putFlipVInvert(true);
this.api.ImgApply(properties);
this.fireEvent('editcomplete', this);
},

4
apps/documenteditor/main/app/view/SignatureSettings.js
View file

@ -390,8 +390,8 @@ define([
DE.getController('DocumentHolder').getView().SetDisabled(disable, true);
DE.getController('Navigation') && DE.getController('Navigation').SetDisabled(disable);
var leftMenu = DE.getController('LeftMenu').leftMenu;
leftMenu.btnComments.setDisabled(disable);
// var leftMenu = DE.getController('LeftMenu').leftMenu;
// leftMenu.btnComments.setDisabled(disable);
var comments = DE.getController('Common.Controllers.Comments');
if (comments)
comments.setPreviewMode(disable);

5
apps/documenteditor/main/app/view/TableOfContentsSettings.js
View file

@ -594,10 +594,7 @@ define([
me = this;
input.on('keypress', function(e) {
var charCode = String.fromCharCode(e.which);
if(!/[1-9]/.test(charCode) && !e.ctrlKey && e.keyCode !== Common.UI.Keys.DELETE && e.keyCode !== Common.UI.Keys.BACKSPACE &&
e.keyCode !== Common.UI.Keys.LEFT && e.keyCode !== Common.UI.Keys.RIGHT && e.keyCode !== Common.UI.Keys.HOME &&
e.keyCode !== Common.UI.Keys.END && e.keyCode !== Common.UI.Keys.ESC && e.keyCode !== Common.UI.Keys.INSERT &&
e.keyCode !== Common.UI.Keys.TAB){
if(!/[1-9]/.test(charCode) && !e.ctrlKey){
e.preventDefault();
e.stopPropagation();
}

12
apps/documenteditor/main/app/view/TextArtSettings.js
View file

@ -242,8 +242,10 @@ define([
onTransparencyChangeComplete: function(field, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = newValue;
this.api.setEndPointHistory();
this._transparencyApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._transparencyApplyFunc();
}
this._sendUndoPoint = true;
},
@ -381,8 +383,10 @@ define([
onGradientChangeComplete: function(slider, newValue, oldValue){
clearInterval(this.updateslider);
this._sliderChanged = true;
this.api.setEndPointHistory();
this._gradientApplyFunc();
if (!this._sendUndoPoint) { // start point was added
this.api.setEndPointHistory();
this._gradientApplyFunc();
}
this._sendUndoPoint = true;
},

19
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -560,6 +560,14 @@ define([
this.paragraphControls.push(this.mnuInsertPageCount);
this.toolbarControls.push(this.btnEditHeader);
this.btnBlankPage = new Common.UI.Button({
id: 'id-toolbar-btn-blankpage',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-blankpage',
caption: me.capBtnBlankPage
});
this.paragraphControls.push(this.btnBlankPage);
this.btnInsertShape = new Common.UI.Button({
id: 'tlbtn-insertshape',
cls: 'btn-toolbar x-huge icon-top',
@ -1295,6 +1303,7 @@ define([
_injectComponent('#slot-btn-controls', this.btnContentControls);
_injectComponent('#slot-btn-columns', this.btnColumns);
_injectComponent('#slot-btn-editheader', this.btnEditHeader);
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
_injectComponent('#slot-btn-insequation', this.btnInsertEquation);
_injectComponent('#slot-btn-pageorient', this.btnPageOrient);
@ -1333,6 +1342,7 @@ define([
me.btnsPageBreak.add(button);
});
me.btnsPageBreak.setDisabled(true);
Array.prototype.push.apply(me.paragraphControls, me.btnsPageBreak);
}.call(this);
@ -1537,6 +1547,7 @@ define([
this.btnInsertText.updateHint(this.tipInsertText);
this.btnInsertTextArt.updateHint(this.tipInsertTextArt);
this.btnEditHeader.updateHint(this.tipEditHeader);
this.btnBlankPage.updateHint(this.tipBlankPage);
this.btnInsertShape.updateHint(this.tipInsertShape);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
this.btnDropCap.updateHint(this.tipDropCap);
@ -2003,7 +2014,7 @@ define([
setMode: function (mode) {
if (mode.isDisconnected) {
this.btnSave.setDisabled(true);
if (mode.disableDownload)
if (!mode.enableDownload)
this.btnPrint.setDisabled(true);
}
@ -2100,7 +2111,7 @@ define([
createSynchTip: function () {
this.synchTooltip = new Common.UI.SynchronizeTip({
extCls: this.mode.isDesktopApp ? 'inc-index' : undefined,
extCls: 'inc-index',
target: this.btnCollabChanges.$el
});
this.synchTooltip.on('dontshowclick', function () {
@ -2371,7 +2382,9 @@ define([
tipControls: 'Insert content control',
mniHighlightControls: 'Highlight settings',
textNoHighlight: 'No highlighting',
mniImageFromStorage: 'Image from Storage'
mniImageFromStorage: 'Image from Storage',
capBtnBlankPage: 'Blank Page',
tipBlankPage: 'Insert blank page'
}
})(), DE.Views.Toolbar || {}));
});

11
apps/documenteditor/main/locale/cs.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "UDĚLOVATEL LICENCE",
"Common.Views.About.txtMail": "email:",
@ -195,6 +194,8 @@
"Common.Views.RenameDialog.txtInvalidName": "Název souboru nesmí obsahovat žádný z následujících znaků:",
"Common.Views.ReviewChanges.hintNext": "K další změně",
"Common.Views.ReviewChanges.hintPrev": "K předchozí změně",
"Common.Views.ReviewChanges.strFast": "Automatický",
"Common.Views.ReviewChanges.strStrict": "Statický",
"Common.Views.ReviewChanges.tipAcceptCurrent": "Přijmout aktuální změnu",
"Common.Views.ReviewChanges.tipRejectCurrent": "Odmítnout aktuální změnu",
"Common.Views.ReviewChanges.tipReview": "Sledovat změny",
@ -312,8 +313,8 @@
"DE.Controllers.Main.textLoadingDocument": "Načítání dokumentu",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source verze",
"DE.Controllers.Main.textShape": "Tvar",
"DE.Controllers.Main.textStrict": "Strict mode",
"DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
"DE.Controllers.Main.textStrict": "Statický réžim",
"DE.Controllers.Main.textTryUndoRedo": "Funkce zpět/zopakovat jsou vypnuty pro Automatický co-editační režim.<br>Klikněte na tlačítko \"Statický režim\", abyste přešli do přísného co-editačního režimu a abyste upravovali soubor bez rušení ostatních uživatelů a odeslali vaše změny jen po jejich uložení. Pomocí Rozšířeného nastavení editoru můžete přepínat mezi co-editačními režimy.",
"DE.Controllers.Main.titleLicenseExp": "Platnost licence vypršela",
"DE.Controllers.Main.titleServerVersion": "Editor byl aktualizován",
"DE.Controllers.Main.titleUpdateVersion": "Verze změněna",
@ -987,7 +988,7 @@
"DE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
"DE.Views.FileMenuPanels.Settings.strFast": "Fast",
"DE.Views.FileMenuPanels.Settings.strFast": "Automatický",
"DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting",
"DE.Views.FileMenuPanels.Settings.strForcesave": "Vždy uložit na server (jinak uložit na server při zavření dokumentu)",
"DE.Views.FileMenuPanels.Settings.strInputMode": "Zapnout hieroglyfy",
@ -995,7 +996,7 @@
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Povolit zobrazení vyřešených komentářů",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Změny spolupráce v reálném čase",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Povolit kontrolu pravopisu",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
"DE.Views.FileMenuPanels.Settings.strStrict": "Statický",
"DE.Views.FileMenuPanels.Settings.strUnit": "Zobrazovat hodnoty v jednotkách",
"DE.Views.FileMenuPanels.Settings.strZoom": "Výchozí měřítko zobrazení",
"DE.Views.FileMenuPanels.Settings.text10Minutes": "Každých 10 minut",

12
apps/documenteditor/main/locale/de.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "Adresse:",
"Common.Views.About.txtAscAddress": "Lubanas St. 125a-25, Riga, Lettland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LIZENZNEHMER",
"Common.Views.About.txtLicensor": "LIZENZGEBER",
"Common.Views.About.txtMail": "E-Mail-Adresse: ",
@ -148,8 +147,8 @@
"Common.Views.Header.textHideStatusBar": "Statusleiste verbergen",
"Common.Views.Header.textSaveBegin": "Speicherung...",
"Common.Views.Header.textSaveChanged": "Verändert",
"Common.Views.Header.textSaveEnd": "Alle Änderungen sind gespeichert",
"Common.Views.Header.textSaveExpander": "Alle Änderungen sind gespeichert",
"Common.Views.Header.textSaveEnd": "Alle Änderungen wurden gespeichert",
"Common.Views.Header.textSaveExpander": "Alle Änderungen wurden gespeichert",
"Common.Views.Header.textZoom": "Zoom",
"Common.Views.Header.tipAccessRights": "Zugriffsrechte für das Dokument verwalten",
"Common.Views.Header.tipDownload": "Datei herunterladen",
@ -189,7 +188,7 @@
"Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
"Common.Views.OpenDialog.closeButtonText": "Datei schließen",
"Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ",
"Common.Views.OpenDialog.txtEncoding": "Zeichenkodierung",
"Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
"Common.Views.OpenDialog.txtPassword": "Kennwort",
"Common.Views.OpenDialog.txtPreview": "Vorschau",
@ -353,7 +352,7 @@
"DE.Controllers.Main.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
"DE.Controllers.Main.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.",
"DE.Controllers.Main.errorUsersExceed": "Die nach dem Zahlungsplan erlaubte Anzahl der Benutzer ist überschritten",
"DE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist verloren. Man kann das Dokument anschauen.<br>Es ist aber momentan nicht möglich, ihn herunterzuladen oder auszudrücken bis die Verbindung wiederhergestellt wird.",
"DE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist unterbrochen. Man kann das Dokument anschauen.<br>Es ist aber momentan nicht möglich, es herunterzuladen oder auszudrucken bis die Verbindung wiederhergestellt wird.",
"DE.Controllers.Main.leavePageText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\" und dann \"Speichern\", um sie zu speichern. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
"DE.Controllers.Main.loadFontsTextText": "Daten werden geladen...",
"DE.Controllers.Main.loadFontsTitleText": "Daten werden geladen",
@ -381,6 +380,7 @@
"DE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...",
"DE.Controllers.Main.saveTextText": "Dokument wird gespeichert...",
"DE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...",
"DE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
"DE.Controllers.Main.sendMergeText": "Merge wird versandt...",
"DE.Controllers.Main.sendMergeTitle": "Merge-Vesand",
"DE.Controllers.Main.splitDividerErrorText": "Die Zeilenanzahl muss ein Divisor von %1 sein.",
@ -388,7 +388,7 @@
"DE.Controllers.Main.splitMaxRowsErrorText": "Die Zeilenanzahl muss weniger als %1 sein.",
"DE.Controllers.Main.textAnonymous": "Anonym",
"DE.Controllers.Main.textBuyNow": "Webseite besuchen",
"DE.Controllers.Main.textChangesSaved": "Alle Änderungen werden gespeichert",
"DE.Controllers.Main.textChangesSaved": "Alle Änderungen wurden gespeichert",
"DE.Controllers.Main.textClose": "Schließen",
"DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen",
"DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",

9
apps/documenteditor/main/locale/en.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",
@ -359,6 +358,8 @@
"DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
"DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded",
"DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"DE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.<br>Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.<br>Use the 'Download as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.",
"DE.Controllers.Main.loadFontsTextText": "Loading data...",
"DE.Controllers.Main.loadFontsTitleText": "Loading Data",
@ -386,6 +387,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"DE.Controllers.Main.saveTextText": "Saving document...",
"DE.Controllers.Main.saveTitleText": "Saving Document",
"DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Sending Merge",
"DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.",
@ -1147,6 +1149,7 @@
"DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistics",
"DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbols",
"DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Document Title",
"DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
"DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words",
"DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
"DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
@ -1905,7 +1908,7 @@
"DE.Views.Toolbar.tipClearStyle": "Clear style",
"DE.Views.Toolbar.tipColorSchemas": "Change color scheme",
"DE.Views.Toolbar.tipColumns": "Insert columns",
"DE.Views.Toolbar.tipControls": "Insert content controls",
"DE.Views.Toolbar.tipControls": "Insert content control",
"DE.Views.Toolbar.tipCopy": "Copy",
"DE.Views.Toolbar.tipCopyStyle": "Copy style",
"DE.Views.Toolbar.tipDecFont": "Decrement font size",
@ -1972,5 +1975,7 @@
"DE.Views.Toolbar.txtScheme7": "Equity",
"DE.Views.Toolbar.txtScheme8": "Flow",
"DE.Views.Toolbar.txtScheme9": "Foundry",
"DE.Views.Toolbar.capBtnBlankPage": "Blank Page",
"DE.Views.Toolbar.tipBlankPage": "Insert blank page",
"DE.Views.Toolbar.mniImageFromStorage": "Image from Storage"
}

2
apps/documenteditor/main/locale/es.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "dirección: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENCIATARIO ",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "email: ",
@ -381,6 +380,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...",
"DE.Controllers.Main.saveTextText": "Guardando documento...",
"DE.Controllers.Main.saveTitleText": "Guardando documento",
"DE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.",
"DE.Controllers.Main.sendMergeText": "Envío de fusión...",
"DE.Controllers.Main.sendMergeTitle": "Envío de fusión",
"DE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1.",

2
apps/documenteditor/main/locale/fr.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresse: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonie, EU, LV-1021",
"Common.Views.About.txtLicensee": "CESSIONNAIRE",
"Common.Views.About.txtLicensor": "CONCÉDANT",
"Common.Views.About.txtMail": "émail: ",
@ -381,6 +380,7 @@
"DE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...",
"DE.Controllers.Main.saveTextText": "Enregistrement du document...",
"DE.Controllers.Main.saveTitleText": "Enregistrement du document",
"DE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.",
"DE.Controllers.Main.sendMergeText": "Envoie du résultat de la fusion...",
"DE.Controllers.Main.sendMergeTitle": "Envoie du résultat de la fusion",
"DE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1.",

186
apps/documenteditor/main/locale/it.json
View file

@ -8,9 +8,9 @@
"Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso",
"Common.Controllers.ExternalMergeEditor.textAnonymous": "Anonimo",
"Common.Controllers.ExternalMergeEditor.textClose": "Chiudi",
"Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.",
"Common.Controllers.ExternalMergeEditor.warningTitle": "Warning",
"Common.Controllers.History.notcriticalErrorTitle": "Warning",
"Common.Controllers.ExternalMergeEditor.warningText": "L'oggetto è disabilitato perché un altro utente lo sta modificando.",
"Common.Controllers.ExternalMergeEditor.warningTitle": "Avviso",
"Common.Controllers.History.notcriticalErrorTitle": "Avviso",
"Common.Controllers.ReviewChanges.textAtLeast": "almeno",
"Common.Controllers.ReviewChanges.textAuto": "auto",
"Common.Controllers.ReviewChanges.textBaseline": "Baseline",
@ -40,7 +40,7 @@
"Common.Controllers.ReviewChanges.textLeft": "Align left",
"Common.Controllers.ReviewChanges.textLineSpacing": "Line Spacing: ",
"Common.Controllers.ReviewChanges.textMultiple": "multiple",
"Common.Controllers.ReviewChanges.textNoBreakBefore": "No page break before",
"Common.Controllers.ReviewChanges.textNoBreakBefore": "Nessuna interruzione di pagina prima",
"Common.Controllers.ReviewChanges.textNoContextual": "Aggiungi intervallo tra paragrafi dello stesso stile",
"Common.Controllers.ReviewChanges.textNoKeepLines": "Don't keep lines together",
"Common.Controllers.ReviewChanges.textNoKeepNext": "Don't keep with next",
@ -62,7 +62,7 @@
"Common.Controllers.ReviewChanges.textSubScript": "Subscript",
"Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
"Common.Controllers.ReviewChanges.textTabs": "Modifica tabelle",
"Common.Controllers.ReviewChanges.textUnderline": "Underline",
"Common.Controllers.ReviewChanges.textUnderline": "Sottolineato",
"Common.Controllers.ReviewChanges.textWidow": "Widow control",
"Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "indirizzo: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lettonia, UE, LV-1021",
"Common.Views.About.txtLicensee": "LICENZIATARIO",
"Common.Views.About.txtLicensor": "CONCEDENTE",
"Common.Views.About.txtMail": "email: ",
@ -168,6 +167,7 @@
"Common.Views.History.textRestore": "Ripristina",
"Common.Views.History.textShow": "Espandi",
"Common.Views.History.textShowAll": "Mostra modifiche dettagliate",
"Common.Views.History.textVer": "ver.",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Annulla",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Incolla URL immagine:",
@ -308,7 +308,7 @@
"Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
"DE.Controllers.LeftMenu.leavePageText": "Tutte le modifiche non salvate nel documento verranno perse.<br> Clicca \"Annulla\" e poi \"Salva\" per salvarle. Clicca \"OK\" per annullare tutte le modifiche non salvate.",
"DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avviso",
"DE.Controllers.LeftMenu.requestEditRightsText": "Richiesta di autorizzazione di modifica...",
"DE.Controllers.LeftMenu.textLoadHistory": "Loading versions history...",
"DE.Controllers.LeftMenu.textNoTextFound": "I dati da cercare non sono stati trovati. Modifica i parametri di ricerca.",
@ -380,6 +380,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...",
"DE.Controllers.Main.saveTextText": "Salvataggio del documento in corso...",
"DE.Controllers.Main.saveTitleText": "Salvataggio del documento",
"DE.Controllers.Main.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Sending Merge",
"DE.Controllers.Main.splitDividerErrorText": "Il numero di righe deve essere un divisore di %1.",
@ -388,10 +389,13 @@
"DE.Controllers.Main.textAnonymous": "Anonimo",
"DE.Controllers.Main.textBuyNow": "Visita il sito web",
"DE.Controllers.Main.textChangesSaved": "Tutte le modifiche sono state salvate",
"DE.Controllers.Main.textClose": "Chiudi",
"DE.Controllers.Main.textCloseTip": "Clicca per chiudere il consiglio",
"DE.Controllers.Main.textContactUs": "Contatta il team di vendite",
"DE.Controllers.Main.textLicencePaidFeature": "La funzione che si sta tentando di utilizzare è disponibile con la licenza estesa. <br>Se necessario, contattare l'ufficio vendite",
"DE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® 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.<br>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.",
@ -399,7 +403,7 @@
"DE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato",
"DE.Controllers.Main.titleUpdateVersion": "Version changed",
"DE.Controllers.Main.txtAbove": "Sopra",
"DE.Controllers.Main.txtArt": "Your text here",
"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.",
@ -464,11 +468,11 @@
"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.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.textTrackChanges": "Il documento è aperto in modalità Traccia Revisioni attivata",
"DE.Controllers.Statusbar.tipReview": "Traccia cambiamenti",
"DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"DE.Controllers.Toolbar.confirmAddFontName": "Il carattere che vuoi salvare non è accessibile su questo dispositivo.<br>Lo stile di testo sarà visualizzato usando uno dei caratteri di sistema, il carattere salvato sarà usato quando accessibile.<br>Vuoi continuare?",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Warning",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "Avviso",
"DE.Controllers.Toolbar.textAccent": "Accenti",
"DE.Controllers.Toolbar.textBracket": "Parentesi",
"DE.Controllers.Toolbar.textEmptyImgUrl": "Specifica URL immagine.",
@ -489,17 +493,17 @@
"DE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above",
"DE.Controllers.Toolbar.txtAccent_ArrowR": "Rightwards Arrow Above",
"DE.Controllers.Toolbar.txtAccent_Bar": "Bar",
"DE.Controllers.Toolbar.txtAccent_BarBot": "Underbar",
"DE.Controllers.Toolbar.txtAccent_BarTop": "Overbar",
"DE.Controllers.Toolbar.txtAccent_BarBot": "Barra inferiore",
"DE.Controllers.Toolbar.txtAccent_BarTop": "barra sopra",
"DE.Controllers.Toolbar.txtAccent_BorderBox": "Boxed Formula (With Placeholder)",
"DE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Boxed Formula(Example)",
"DE.Controllers.Toolbar.txtAccent_Check": "Controlla",
"DE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Underbrace",
"DE.Controllers.Toolbar.txtAccent_CurveBracketBot": "sottoparentesi",
"DE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Overbrace",
"DE.Controllers.Toolbar.txtAccent_Custom_1": "Vector A",
"DE.Controllers.Toolbar.txtAccent_Custom_1": "Vettore A",
"DE.Controllers.Toolbar.txtAccent_Custom_2": "ABC con barra superiore",
"DE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y With Overbar",
"DE.Controllers.Toolbar.txtAccent_DDDot": "Triple Dot",
"DE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y con barra sopra",
"DE.Controllers.Toolbar.txtAccent_DDDot": "Punto triplo",
"DE.Controllers.Toolbar.txtAccent_DDot": "Double Dot",
"DE.Controllers.Toolbar.txtAccent_Dot": "Dot",
"DE.Controllers.Toolbar.txtAccent_DoubleBar": "Double Overbar",
@ -602,28 +606,28 @@
"DE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Surface Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Surface Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Contour Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedTriple": "Volume Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume Integral",
"DE.Controllers.Toolbar.txtIntegralOrientedTriple": "Volume Integrale",
"DE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Volume Integrale",
"DE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Volume Integrale",
"DE.Controllers.Toolbar.txtIntegralSubSup": "Integrale",
"DE.Controllers.Toolbar.txtIntegralTriple": "Triple Integral",
"DE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple Integral",
"DE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple Integral",
"DE.Controllers.Toolbar.txtIntegralTriple": "Triplo Integrale",
"DE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triplo Integrale",
"DE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triplo Integrale",
"DE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Wedge",
"DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Wedge",
"DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Wedge",
"DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Wedge",
"DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Wedge",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Product",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Product",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Product",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Product",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Product",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Prodotto",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Prodotto",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Prodotto",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Prodotto",
"DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Prodotto",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Product",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union",
"DE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Unione",
"DE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Vee",
"DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Vee",
"DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Vee",
@ -644,20 +648,20 @@
"DE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Summation",
"DE.Controllers.Toolbar.txtLargeOperator_Union": "Union",
"DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union",
"DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union",
"DE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union",
"DE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union",
"DE.Controllers.Toolbar.txtLimitLog_Custom_1": "Limit Example",
"DE.Controllers.Toolbar.txtLimitLog_Custom_2": "Maximum Example",
"DE.Controllers.Toolbar.txtLargeOperator_Union": "Unione",
"DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Unione",
"DE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Unione",
"DE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Unione",
"DE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Unione",
"DE.Controllers.Toolbar.txtLimitLog_Custom_1": "Esempio limite",
"DE.Controllers.Toolbar.txtLimitLog_Custom_2": "Esempio Massimo",
"DE.Controllers.Toolbar.txtLimitLog_Lim": "Limit",
"DE.Controllers.Toolbar.txtLimitLog_Ln": "Natural Logarithm",
"DE.Controllers.Toolbar.txtLimitLog_Log": "Logarithm",
"DE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithm",
"DE.Controllers.Toolbar.txtLimitLog_Max": "Maximum",
"DE.Controllers.Toolbar.txtLimitLog_Min": "Minimo",
"DE.Controllers.Toolbar.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Controllers.Toolbar.txtMarginsH": "I margini superiore e inferiore sono troppo alti per una determinata altezza di pagina",
"DE.Controllers.Toolbar.txtMarginsW": "Left and right margins are too wide for a given page width",
"DE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Matrice Vuota",
"DE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Matrice Vuota",
@ -688,7 +692,7 @@
"DE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Rightwards Arrow Below",
"DE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Rightwards Arrow Above",
"DE.Controllers.Toolbar.txtOperator_ColonEquals": "Due punti uguali",
"DE.Controllers.Toolbar.txtOperator_Custom_1": "Yields",
"DE.Controllers.Toolbar.txtOperator_Custom_1": "Rendimenti",
"DE.Controllers.Toolbar.txtOperator_Custom_2": "Delta Yields",
"DE.Controllers.Toolbar.txtOperator_Definition": "Equal to By Definition",
"DE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta uguale a",
@ -728,12 +732,12 @@
"DE.Controllers.Toolbar.txtSymbol_cap": "Intersezione",
"DE.Controllers.Toolbar.txtSymbol_cbrt": "Cube Root",
"DE.Controllers.Toolbar.txtSymbol_cdots": "Ellissi orizzontale di linea media",
"DE.Controllers.Toolbar.txtSymbol_celsius": "Degrees Celsius",
"DE.Controllers.Toolbar.txtSymbol_celsius": "Gradi Celsius",
"DE.Controllers.Toolbar.txtSymbol_chi": "Chi",
"DE.Controllers.Toolbar.txtSymbol_cong": "Approssimativamente uguale a",
"DE.Controllers.Toolbar.txtSymbol_cup": "Union",
"DE.Controllers.Toolbar.txtSymbol_cup": "Unione",
"DE.Controllers.Toolbar.txtSymbol_ddots": "Down Right Diagonal Ellipsis",
"DE.Controllers.Toolbar.txtSymbol_degree": "Degrees",
"DE.Controllers.Toolbar.txtSymbol_degree": "Gradi",
"DE.Controllers.Toolbar.txtSymbol_delta": "Delta",
"DE.Controllers.Toolbar.txtSymbol_div": "Division Sign",
"DE.Controllers.Toolbar.txtSymbol_downarrow": "Down Arrow",
@ -742,9 +746,9 @@
"DE.Controllers.Toolbar.txtSymbol_equals": "Equal",
"DE.Controllers.Toolbar.txtSymbol_equiv": "Identical To",
"DE.Controllers.Toolbar.txtSymbol_eta": "Eta",
"DE.Controllers.Toolbar.txtSymbol_exists": "There Exist",
"DE.Controllers.Toolbar.txtSymbol_exists": "Esiste",
"DE.Controllers.Toolbar.txtSymbol_factorial": "Factorial",
"DE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrees Fahrenheit",
"DE.Controllers.Toolbar.txtSymbol_fahrenheit": "Gradi Fahrenheit",
"DE.Controllers.Toolbar.txtSymbol_forall": "For All",
"DE.Controllers.Toolbar.txtSymbol_gamma": "Gamma",
"DE.Controllers.Toolbar.txtSymbol_geq": "Greater Than or Equal To",
@ -768,11 +772,11 @@
"DE.Controllers.Toolbar.txtSymbol_neq": "Not Equal To",
"DE.Controllers.Toolbar.txtSymbol_ni": "Contains as Member",
"DE.Controllers.Toolbar.txtSymbol_not": "Not Sign",
"DE.Controllers.Toolbar.txtSymbol_notexists": "There Does Not Exist",
"DE.Controllers.Toolbar.txtSymbol_notexists": "Non esiste",
"DE.Controllers.Toolbar.txtSymbol_nu": "Nu",
"DE.Controllers.Toolbar.txtSymbol_o": "Omicron",
"DE.Controllers.Toolbar.txtSymbol_omega": "Omega",
"DE.Controllers.Toolbar.txtSymbol_partial": "Partial Differential",
"DE.Controllers.Toolbar.txtSymbol_partial": "Differenziale Parziale",
"DE.Controllers.Toolbar.txtSymbol_percent": "Percentage",
"DE.Controllers.Toolbar.txtSymbol_phi": "Phi",
"DE.Controllers.Toolbar.txtSymbol_pi": "Pi",
@ -782,16 +786,16 @@
"DE.Controllers.Toolbar.txtSymbol_psi": "Psi",
"DE.Controllers.Toolbar.txtSymbol_qdrt": "Fourth Root",
"DE.Controllers.Toolbar.txtSymbol_qed": "End of Proof",
"DE.Controllers.Toolbar.txtSymbol_rddots": "Up Right Diagonal Ellipsis",
"DE.Controllers.Toolbar.txtSymbol_rddots": "Ellissi in diagonale alto destra",
"DE.Controllers.Toolbar.txtSymbol_rho": "Rho",
"DE.Controllers.Toolbar.txtSymbol_rightarrow": "Right Arrow",
"DE.Controllers.Toolbar.txtSymbol_sigma": "Sigma",
"DE.Controllers.Toolbar.txtSymbol_sqrt": "Radical Sign",
"DE.Controllers.Toolbar.txtSymbol_tau": "Tau",
"DE.Controllers.Toolbar.txtSymbol_therefore": "Therefore",
"DE.Controllers.Toolbar.txtSymbol_therefore": "Dunque",
"DE.Controllers.Toolbar.txtSymbol_theta": "Theta",
"DE.Controllers.Toolbar.txtSymbol_times": "Multiplication Sign",
"DE.Controllers.Toolbar.txtSymbol_uparrow": "Up Arrow",
"DE.Controllers.Toolbar.txtSymbol_uparrow": "Freccia su",
"DE.Controllers.Toolbar.txtSymbol_upsilon": "Upsilon",
"DE.Controllers.Toolbar.txtSymbol_varepsilon": "Epsilon Variant",
"DE.Controllers.Toolbar.txtSymbol_varphi": "Phi Variant",
@ -814,6 +818,7 @@
"DE.Views.BookmarksDialog.textName": "Nome",
"DE.Views.BookmarksDialog.textSort": "Ordina per",
"DE.Views.BookmarksDialog.textTitle": "Segnalibri",
"DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera",
"DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate",
"DE.Views.ChartSettings.textArea": "Aerogramma",
"DE.Views.ChartSettings.textBar": "A barre",
@ -842,8 +847,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Sopra e sotto",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Annulla",
"DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Aspetto",
"DE.Views.ControlSettingsDialog.textApplyAll": "Applica a tutti",
"DE.Views.ControlSettingsDialog.textBox": "Rettangolo di selezione",
"DE.Views.ControlSettingsDialog.textColor": "Colore",
"DE.Views.ControlSettingsDialog.textLock": "Blocca",
"DE.Views.ControlSettingsDialog.textName": "Titolo",
"DE.Views.ControlSettingsDialog.textNewColor": "Aggiungi un nuovo colore personalizzato",
"DE.Views.ControlSettingsDialog.textNone": "Nessuno",
"DE.Views.ControlSettingsDialog.textShowAs": "Mostra come",
"DE.Views.ControlSettingsDialog.textTag": "Etichetta",
"DE.Views.ControlSettingsDialog.textTitle": "Impostazioni di controllo del contenuto",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Il controllo del contenuto non può essere eliminato",
@ -875,8 +887,8 @@
"DE.Views.DocumentHolder.deleteText": "Elimina",
"DE.Views.DocumentHolder.direct270Text": "Ruota testo verso l'alto",
"DE.Views.DocumentHolder.direct90Text": "Ruota testo verso il basso",
"DE.Views.DocumentHolder.directHText": "Horizontal",
"DE.Views.DocumentHolder.directionText": "Text Direction",
"DE.Views.DocumentHolder.directHText": "Orizzontale",
"DE.Views.DocumentHolder.directionText": "Direzione del testo",
"DE.Views.DocumentHolder.editChartText": "Modifica dati",
"DE.Views.DocumentHolder.editFooterText": "Modifica piè di pagina",
"DE.Views.DocumentHolder.editHeaderText": "Modifica intestazione",
@ -919,7 +931,7 @@
"DE.Views.DocumentHolder.strDetails": "Dettagli firma",
"DE.Views.DocumentHolder.strSetup": "Impostazioni firma",
"DE.Views.DocumentHolder.strSign": "Firma",
"DE.Views.DocumentHolder.styleText": "Formatting as Style",
"DE.Views.DocumentHolder.styleText": "Formattazione come stile",
"DE.Views.DocumentHolder.tableText": "Tabella",
"DE.Views.DocumentHolder.textAlign": "Allinea",
"DE.Views.DocumentHolder.textArrange": "Disponi",
@ -979,14 +991,14 @@
"DE.Views.DocumentHolder.txtBorderProps": "Border properties",
"DE.Views.DocumentHolder.txtBottom": "In basso",
"DE.Views.DocumentHolder.txtColumnAlign": "Column alignment",
"DE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size",
"DE.Views.DocumentHolder.txtDeleteArg": "Delete argument",
"DE.Views.DocumentHolder.txtDeleteBreak": "Delete manual break",
"DE.Views.DocumentHolder.txtDeleteChars": "Delete enclosing characters",
"DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators",
"DE.Views.DocumentHolder.txtDeleteEq": "Delete equation",
"DE.Views.DocumentHolder.txtDeleteGroupChar": "Delete char",
"DE.Views.DocumentHolder.txtDeleteRadical": "Delete radical",
"DE.Views.DocumentHolder.txtDecreaseArg": "Diminuisci dimensione argomento",
"DE.Views.DocumentHolder.txtDeleteArg": "Elimina argomento",
"DE.Views.DocumentHolder.txtDeleteBreak": "Elimina interruzione manuale",
"DE.Views.DocumentHolder.txtDeleteChars": "Rimuovi caratteri allegati",
"DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Rimuovi caratteri allegati e separatori",
"DE.Views.DocumentHolder.txtDeleteEq": "Elimina equazione",
"DE.Views.DocumentHolder.txtDeleteGroupChar": "Elimina char",
"DE.Views.DocumentHolder.txtDeleteRadical": "Rimuovi radicale",
"DE.Views.DocumentHolder.txtFractionLinear": "Modifica a frazione lineare",
"DE.Views.DocumentHolder.txtFractionSkewed": "Modifica a frazione obliqua",
"DE.Views.DocumentHolder.txtFractionStacked": "Modifica a frazione impilata",
@ -1048,7 +1060,7 @@
"DE.Views.DocumentHolder.txtTopAndBottom": "Sopra e sotto",
"DE.Views.DocumentHolder.txtUnderbar": "Barra sotto al testo",
"DE.Views.DocumentHolder.txtUngroup": "Separa",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.updateStyleText": "Aggiorna %1 stile",
"DE.Views.DocumentHolder.vertAlignText": "Allineamento verticale",
"DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Annulla",
"DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
@ -1149,7 +1161,7 @@
"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.strCoAuthModeDescStrict": "You will need to accept changes before you can see them",
"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",
"DE.Views.FileMenuPanels.Settings.strForcesave": "Salva sempre sul server (altrimenti salva sul server alla chiusura del documento)",
@ -1339,7 +1351,7 @@
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Annulla",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Tema",
"DE.Views.MailMergeEmailDlg.textAttachDocx": "Allega come DOCX",
"DE.Views.MailMergeEmailDlg.textAttachPdf": "Allega come PDF",
"DE.Views.MailMergeEmailDlg.textFileName": "File name",
@ -1349,8 +1361,8 @@
"DE.Views.MailMergeEmailDlg.textMessage": "Messaggio",
"DE.Views.MailMergeEmailDlg.textSubject": "Subject Line",
"DE.Views.MailMergeEmailDlg.textTitle": "Send to Email",
"DE.Views.MailMergeEmailDlg.textTo": "To",
"DE.Views.MailMergeEmailDlg.textWarning": "Warning!",
"DE.Views.MailMergeEmailDlg.textTo": "A",
"DE.Views.MailMergeEmailDlg.textWarning": "Avviso!",
"DE.Views.MailMergeEmailDlg.textWarningMsg": "Please note that mailing cannot be stopped once your click the 'Send' button.",
"DE.Views.MailMergeRecepients.textLoading": "Loading",
"DE.Views.MailMergeRecepients.textTitle": "Select Data Source",
@ -1358,7 +1370,7 @@
"DE.Views.MailMergeSaveDlg.textTitle": "Folder for save",
"DE.Views.MailMergeSettings.downloadMergeTitle": "Unione",
"DE.Views.MailMergeSettings.errorMailMergeSaveFile": "Merge failed.",
"DE.Views.MailMergeSettings.notcriticalErrorTitle": "Warning",
"DE.Views.MailMergeSettings.notcriticalErrorTitle": "Avviso",
"DE.Views.MailMergeSettings.textAddRecipients": "Add some recipients to the list first",
"DE.Views.MailMergeSettings.textAll": "All records",
"DE.Views.MailMergeSettings.textCurrent": "Current record",
@ -1377,16 +1389,16 @@
"DE.Views.MailMergeSettings.textMergeTo": "Unisci a",
"DE.Views.MailMergeSettings.textPdf": "PDF",
"DE.Views.MailMergeSettings.textPortal": "Save",
"DE.Views.MailMergeSettings.textPreview": "Preview results",
"DE.Views.MailMergeSettings.textPreview": "Anteprima dei risultati",
"DE.Views.MailMergeSettings.textReadMore": "Read more",
"DE.Views.MailMergeSettings.textSendMsg": "Tutti i messaggi mail sono pronti e saranno spediti in poco tempo.<br>La velocità di invio dipende dal tuo servizio mail.<br>Puoi continuare a lavorare con il documento o chiuderlo. Ti verrà recapitata una notifica all'indirizzo email di registrazione al completamento dell'operazione.",
"DE.Views.MailMergeSettings.textTo": "To",
"DE.Views.MailMergeSettings.txtFirst": "To first record",
"DE.Views.MailMergeSettings.textTo": "A",
"DE.Views.MailMergeSettings.txtFirst": "Al primo record",
"DE.Views.MailMergeSettings.txtFromToError": "Il valore \"Da\" deve essere minore del valore \"A\"",
"DE.Views.MailMergeSettings.txtLast": "To last record",
"DE.Views.MailMergeSettings.txtNext": "To next record",
"DE.Views.MailMergeSettings.txtPrev": "To previous record",
"DE.Views.MailMergeSettings.txtUntitled": "Untitled",
"DE.Views.MailMergeSettings.txtLast": "All'ultimo record",
"DE.Views.MailMergeSettings.txtNext": "Al record successivo",
"DE.Views.MailMergeSettings.txtPrev": "al record precedente",
"DE.Views.MailMergeSettings.txtUntitled": "Senza titolo",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
"DE.Views.Navigation.txtCollapse": "Comprimi tutto",
"DE.Views.Navigation.txtDemote": "Retrocedere",
@ -1421,21 +1433,21 @@
"DE.Views.NumberingValueDialog.cancelButtonText": "Annulla",
"DE.Views.NumberingValueDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.cancelButtonText": "Annulla",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avviso",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",
"DE.Views.PageMarginsDialog.textBottom": "In basso",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
"DE.Views.PageMarginsDialog.textTitle": "Margins",
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsH": "I margini superiore e inferiore sono troppo alti per una determinata altezza di pagina",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
"DE.Views.PageSizeDialog.cancelButtonText": "Annulla",
"DE.Views.PageSizeDialog.okButtonText": "Ok",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textPreset": "Preimpostazione",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
"DE.Views.PageSizeDialog.textWidth": "Larghezza",
"DE.Views.PageSizeDialog.txtCustom": "Personalizzato",
"DE.Views.ParagraphSettings.strLineHeight": "Interlinea",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo",
@ -1451,7 +1463,7 @@
"DE.Views.ParagraphSettings.textNewColor": "Colore personalizzato",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Annulla",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Le schede specificate appariranno in questo campo",
"DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Maiuscole",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordi e riempimento",
@ -1514,7 +1526,7 @@
"DE.Views.RightMenu.txtShapeSettings": "Impostazioni forma",
"DE.Views.RightMenu.txtSignatureSettings": "Impostazioni della Firma",
"DE.Views.RightMenu.txtTableSettings": "Impostazioni tabella",
"DE.Views.RightMenu.txtTextArtSettings": "Text Art Settings",
"DE.Views.RightMenu.txtTextArtSettings": "Impostazioni Text Art",
"DE.Views.ShapeSettings.strBackground": "Colore sfondo",
"DE.Views.ShapeSettings.strChange": "Cambia forma",
"DE.Views.ShapeSettings.strColor": "Colore",
@ -1592,7 +1604,7 @@
"DE.Views.StyleTitleDialog.textHeader": "Crea nuovo stile",
"DE.Views.StyleTitleDialog.textNextStyle": "Next paragraph style",
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtEmpty": "Campo obbligatorio",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
"DE.Views.TableOfContentsSettings.cancelButtonText": "Annulla",
"DE.Views.TableOfContentsSettings.okButtonText ": "OK",
@ -1739,25 +1751,25 @@
"DE.Views.TableSettingsAdvanced.txtPercent": "Percento",
"DE.Views.TableSettingsAdvanced.txtPt": "Punto",
"DE.Views.TextArtSettings.strColor": "Colore",
"DE.Views.TextArtSettings.strFill": "Fill",
"DE.Views.TextArtSettings.strFill": "Riempimento",
"DE.Views.TextArtSettings.strSize": "Size",
"DE.Views.TextArtSettings.strStroke": "Stroke",
"DE.Views.TextArtSettings.strTransparency": "Opacity",
"DE.Views.TextArtSettings.strType": "Tipo",
"DE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
"DE.Views.TextArtSettings.textBorderSizeErr": "Il valore inserito non è corretto.<br>Inserisci un valore tra 0 pt e 1584 pt.",
"DE.Views.TextArtSettings.textColor": "Colore di riempimento",
"DE.Views.TextArtSettings.textDirection": "Direction",
"DE.Views.TextArtSettings.textGradient": "Gradient",
"DE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
"DE.Views.TextArtSettings.textLinear": "Linear",
"DE.Views.TextArtSettings.textNewColor": "Add New Custom Color",
"DE.Views.TextArtSettings.textNoFill": "No Fill",
"DE.Views.TextArtSettings.textNoFill": "Nessun riempimento",
"DE.Views.TextArtSettings.textRadial": "Radial",
"DE.Views.TextArtSettings.textSelectTexture": "Select",
"DE.Views.TextArtSettings.textStyle": "Style",
"DE.Views.TextArtSettings.textTemplate": "Template",
"DE.Views.TextArtSettings.textTransform": "Transform",
"DE.Views.TextArtSettings.txtNoBorders": "No Line",
"DE.Views.TextArtSettings.txtNoBorders": "Nessuna linea",
"DE.Views.Toolbar.capBtnColumns": "Colonne",
"DE.Views.Toolbar.capBtnComment": "Commento",
"DE.Views.Toolbar.capBtnInsChart": "Grafico",
@ -1786,6 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Modifica intestazione",
"DE.Views.Toolbar.mniHiddenBorders": "Bordi tabella nascosti",
"DE.Views.Toolbar.mniHiddenChars": "Caratteri non stampabili",
"DE.Views.Toolbar.mniHighlightControls": "selezionare impostazioni",
"DE.Views.Toolbar.mniImageFromFile": "Immagine da file",
"DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL",
"DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento",
@ -1800,7 +1813,7 @@
"DE.Views.Toolbar.textColumnsLeft": "Left",
"DE.Views.Toolbar.textColumnsOne": "One",
"DE.Views.Toolbar.textColumnsRight": "Right",
"DE.Views.Toolbar.textColumnsThree": "Three",
"DE.Views.Toolbar.textColumnsThree": "Tre",
"DE.Views.Toolbar.textColumnsTwo": "Two",
"DE.Views.Toolbar.textContPage": "Pagina continua",
"DE.Views.Toolbar.textEvenPage": "Pagina pari",
@ -1823,6 +1836,7 @@
"DE.Views.Toolbar.textMarginsWide": "Wide",
"DE.Views.Toolbar.textNewColor": "Colore personalizzato",
"DE.Views.Toolbar.textNextPage": "Pagina successiva",
"DE.Views.Toolbar.textNoHighlight": "Nessuna evidenziazione",
"DE.Views.Toolbar.textNone": "Nessuno",
"DE.Views.Toolbar.textOddPage": "Pagina dispari",
"DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
@ -1836,12 +1850,12 @@
"DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textStock": "Azionario",
"DE.Views.Toolbar.textStrikeout": "Barrato",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
"DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Elimina tutti gli stili personalizzati",
"DE.Views.Toolbar.textStyleMenuNew": "Nuovo stile da selezione",
"DE.Views.Toolbar.textStyleMenuRestore": "Restore to default",
"DE.Views.Toolbar.textStyleMenuRestoreAll": "Restore all to default styles",
"DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
"DE.Views.Toolbar.textStyleMenuUpdate": "Aggiorna da selezione",
"DE.Views.Toolbar.textSubscript": "Pedice",
"DE.Views.Toolbar.textSuperscript": "Apice",
"DE.Views.Toolbar.textSurface": "Superficie",
@ -1855,7 +1869,7 @@
"DE.Views.Toolbar.textTabReview": "Revisione",
"DE.Views.Toolbar.textTitleError": "Errore",
"DE.Views.Toolbar.textToCurrent": "Alla posizione corrente",
"DE.Views.Toolbar.textTop": "Top: ",
"DE.Views.Toolbar.textTop": "in alto:",
"DE.Views.Toolbar.textUnderline": "Sottolineato",
"DE.Views.Toolbar.tipAlignCenter": "Allinea al centro",
"DE.Views.Toolbar.tipAlignJust": "Giustifica",

1
apps/documenteditor/main/locale/ja.json
View file

@ -99,7 +99,6 @@
"Common.Utils.Metric.txtCm": "センチ",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "アドレス：",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ライセンシー",
"Common.Views.About.txtLicensor": "ライセンサー\t",
"Common.Views.About.txtMail": "メール",

1
apps/documenteditor/main/locale/ko.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "주소 :",
"Common.Views.About.txtAscAddress": "Lubanas 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email :",

1
apps/documenteditor/main/locale/lv.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "address: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENSEE",
"Common.Views.About.txtLicensor": "LICENSOR",
"Common.Views.About.txtMail": "email: ",

1
apps/documenteditor/main/locale/nl.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letland, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENTIEHOUDER",
"Common.Views.About.txtLicensor": "LICENTIEVERLENER",
"Common.Views.About.txtMail": "e-mail:",

3
apps/documenteditor/main/locale/pl.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCJOBIORCA",
"Common.Views.About.txtLicensor": "LICENCJODAWCA",
"Common.Views.About.txtMail": "e-mail:",
@ -1133,7 +1132,7 @@
"DE.Views.ImageSettingsAdvanced.textWrapThroughTooltip": "Przez",
"DE.Views.ImageSettingsAdvanced.textWrapTightTooltip": "szczelnie",
"DE.Views.ImageSettingsAdvanced.textWrapTopbottomTooltip": "Góra i dół",
"DE.Views.LeftMenu.tipAbout": "O",
"DE.Views.LeftMenu.tipAbout": "O programie",
"DE.Views.LeftMenu.tipChat": "Czat",
"DE.Views.LeftMenu.tipComments": "Komentarze",
"DE.Views.LeftMenu.tipPlugins": "Wtyczki",

1
apps/documenteditor/main/locale/pt.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "Pt",
"Common.Views.About.txtAddress": "endereço:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENÇA",
"Common.Views.About.txtLicensor": "LICENCIANTE",
"Common.Views.About.txtMail": "e-mail:",

12
apps/documenteditor/main/locale/ru.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "пт",
"Common.Views.About.txtAddress": "адрес: ",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "ЛИЦЕНЗИАТ",
"Common.Views.About.txtLicensor": "ЛИЦЕНЗИАР",
"Common.Views.About.txtMail": "email: ",
@ -381,6 +380,7 @@
"DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...",
"DE.Controllers.Main.saveTextText": "Сохранение документа...",
"DE.Controllers.Main.saveTitleText": "Сохранение документа",
"DE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.",
"DE.Controllers.Main.sendMergeText": "Отправка результатов слияния...",
"DE.Controllers.Main.sendMergeTitle": "Отправка результатов слияния",
"DE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1.",
@ -1798,7 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Изменить верхний колонтитул",
"DE.Views.Toolbar.mniHiddenBorders": "Скрытые границы таблиц",
"DE.Views.Toolbar.mniHiddenChars": "Непечатаемые символы",
"DE.Views.Toolbar.mniHighlightControls": "Параметры выделения",
"DE.Views.Toolbar.mniHighlightControls": "Цвет подсветки",
"DE.Views.Toolbar.mniImageFromFile": "Изображение из файла",
"DE.Views.Toolbar.mniImageFromUrl": "Изображение по URL",
"DE.Views.Toolbar.strMenuNoFill": "Без заливки",
@ -1836,17 +1836,17 @@
"DE.Views.Toolbar.textMarginsWide": "Широкие",
"DE.Views.Toolbar.textNewColor": "Пользовательский цвет",
"DE.Views.Toolbar.textNextPage": "Со следующей страницы",
"DE.Views.Toolbar.textNoHighlight": "Без выделения",
"DE.Views.Toolbar.textNoHighlight": "Без подсветки",
"DE.Views.Toolbar.textNone": "Нет",
"DE.Views.Toolbar.textOddPage": "С нечетной страницы",
"DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля",
"DE.Views.Toolbar.textPageSizeCustom": "Особый размер страницы",
"DE.Views.Toolbar.textPie": "Круговая",
"DE.Views.Toolbar.textPlainControl": "Вставить элемент управления содержимым \"Обычный текст\"",
"DE.Views.Toolbar.textPlainControl": "Вставить элемент управления \"Обычный текст\"",
"DE.Views.Toolbar.textPoint": "Точечная",
"DE.Views.Toolbar.textPortrait": "Книжная",
"DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым",
"DE.Views.Toolbar.textRichControl": "Вставить элемент управления содержимым \"Форматированный текст\"",
"DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"",
"DE.Views.Toolbar.textRight": "Правое: ",
"DE.Views.Toolbar.textStock": "Биржевая",
"DE.Views.Toolbar.textStrikeout": "Зачеркнутый",
@ -1880,7 +1880,7 @@
"DE.Views.Toolbar.tipClearStyle": "Очистить стиль",
"DE.Views.Toolbar.tipColorSchemas": "Изменение цветовой схемы",
"DE.Views.Toolbar.tipColumns": "Вставить колонки",
"DE.Views.Toolbar.tipControls": "Вставить элементы управления содержимым",
"DE.Views.Toolbar.tipControls": "Вставить элемент управления содержимым",
"DE.Views.Toolbar.tipCopy": "Копировать",
"DE.Views.Toolbar.tipCopyStyle": "Копировать стиль",
"DE.Views.Toolbar.tipDecFont": "Уменьшить размер шрифта",

54
apps/documenteditor/main/locale/sk.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adresa:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Lotyšsko, EU, LV-1021",
"Common.Views.About.txtLicensee": "DRŽITEĽ LICENCIE",
"Common.Views.About.txtLicensor": "UDEĽOVATEĽ LICENCIE",
"Common.Views.About.txtMail": "e-mail: ",
@ -135,12 +134,13 @@
"Common.Views.DocumentAccessDialog.textLoading": "Nahrávanie...",
"Common.Views.DocumentAccessDialog.textTitle": "Nastavenie zdieľania",
"Common.Views.ExternalDiagramEditor.textClose": "Zatvoriť",
"Common.Views.ExternalDiagramEditor.textSave": "Uložiť a Zavrieť",
"Common.Views.ExternalDiagramEditor.textSave": "Uložiť a Zatvoriť",
"Common.Views.ExternalDiagramEditor.textTitle": "Editor grafu",
"Common.Views.ExternalMergeEditor.textClose": "Zatvoriť",
"Common.Views.ExternalMergeEditor.textSave": "Uložiť a Zavrieť",
"Common.Views.ExternalMergeEditor.textSave": "Uložiť a Zatvoriť",
"Common.Views.ExternalMergeEditor.textTitle": "Príjemcovia hromadnej korešpondencie",
"Common.Views.Header.labelCoUsersDescr": "Dokument v súčasnosti upravuje niekoľko používateľov.",
"Common.Views.Header.textAdvSettings": "Pokročilé nastavenia",
"Common.Views.Header.textBack": "Prejsť do Dokumentov",
"Common.Views.Header.textSaveBegin": "Ukladanie...",
"Common.Views.Header.textSaveChanged": "Modifikovaný",
@ -150,10 +150,12 @@
"Common.Views.Header.tipDownload": "Stiahnuť súbor",
"Common.Views.Header.tipGoEdit": "Editovať aktuálny súbor",
"Common.Views.Header.tipPrint": "Vytlačiť súbor",
"Common.Views.Header.tipSave": "Uložiť",
"Common.Views.Header.tipUndo": "Krok späť",
"Common.Views.Header.tipViewUsers": "Zobraziť používateľov a spravovať prístupové práva k dokumentom",
"Common.Views.Header.txtAccessRights": "Zmeniť prístupové práva",
"Common.Views.Header.txtRename": "Premenovať",
"Common.Views.History.textCloseHistory": "Zavrieť históriu",
"Common.Views.History.textCloseHistory": "Zatvoriť históriu",
"Common.Views.History.textHide": "Stiahnuť/zbaliť/zvinúť",
"Common.Views.History.textHideAll": "Skryť podrobné zmeny",
"Common.Views.History.textRestore": "Obnoviť",
@ -181,15 +183,24 @@
"Common.Views.OpenDialog.txtEncoding": "Kódovanie",
"Common.Views.OpenDialog.txtIncorrectPwd": "Heslo je nesprávne.",
"Common.Views.OpenDialog.txtPassword": "Heslo",
"Common.Views.OpenDialog.txtPreview": "Náhľad",
"Common.Views.OpenDialog.txtTitle": "Vyberte %1 možností",
"Common.Views.OpenDialog.txtTitleProtected": "Chránený súbor",
"Common.Views.PasswordDialog.cancelButtonText": "Zrušiť",
"Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Heslá sa nezhodujú",
"Common.Views.PluginDlg.textLoading": "Nahrávanie",
"Common.Views.Plugins.groupCaption": "Pluginy",
"Common.Views.Plugins.strPlugins": "Pluginy",
"Common.Views.Plugins.textLoading": "Nahrávanie",
"Common.Views.Plugins.textStart": "Začať/začiatok",
"Common.Views.Plugins.textStop": "Stop",
"Common.Views.Protection.hintPwd": "Zmeniť alebo odstrániť heslo",
"Common.Views.Protection.hintSignature": "Pridajte riadok digitálneho podpisu alebo podpisu",
"Common.Views.Protection.txtAddPwd": "Pridajte heslo",
"Common.Views.Protection.txtChangePwd": "Zmeniť heslo",
"Common.Views.Protection.txtDeletePwd": "Odstrániť heslo",
"Common.Views.Protection.txtInvisibleSignature": "Pridajte digitálny podpis",
"Common.Views.Protection.txtSignature": "Podpis",
"Common.Views.RenameDialog.cancelButtonText": "Zrušiť",
"Common.Views.RenameDialog.okButtonText": "OK",
@ -208,6 +219,7 @@
"Common.Views.ReviewChanges.txtAcceptChanges": "Akceptovať zmeny",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Akceptovať aktuálnu zmenu",
"Common.Views.ReviewChanges.txtClose": "Zatvoriť",
"Common.Views.ReviewChanges.txtCoAuthMode": "Režim spoločnej úpravy",
"Common.Views.ReviewChanges.txtDocLang": "Jazyk",
"Common.Views.ReviewChanges.txtFinal": "Všetky zmeny prijaté (ukážka)",
"Common.Views.ReviewChanges.txtMarkup": "Všetky zmeny (upravované)",
@ -230,6 +242,11 @@
"Common.Views.ReviewChangesDialog.txtReject": "Odmietnuť",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Odmietnuť všetky zmeny",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Odmietnuť aktuálnu zmenu",
"Common.Views.ReviewPopover.textAdd": "Pridať",
"Common.Views.ReviewPopover.textAddReply": "Pridať odpoveď",
"Common.Views.ReviewPopover.textCancel": "Zrušiť",
"Common.Views.ReviewPopover.textClose": "Zatvoriť",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.SignDialog.cancelButtonText": "Zrušiť",
"Common.Views.SignDialog.okButtonText": "Ok",
"Common.Views.SignDialog.textBold": "Tučné",
@ -238,6 +255,7 @@
"Common.Views.SignDialog.textInputName": "Zadať meno signatára",
"Common.Views.SignDialog.textItalic": "Kurzíva",
"Common.Views.SignDialog.textPurpose": "Účel podpisovania tohto dokumentu",
"Common.Views.SignDialog.textSelect": "Vybrať",
"Common.Views.SignDialog.textSelectImage": "Vybrať obrázok",
"Common.Views.SignDialog.textSignature": "Podpis vyzerá ako",
"Common.Views.SignDialog.textTitle": "Podpísať dokument",
@ -284,6 +302,7 @@
"DE.Controllers.Main.errorDataRange": "Nesprávny rozsah údajov.",
"DE.Controllers.Main.errorDefaultMessage": "Kód chyby: %1",
"DE.Controllers.Main.errorFilePassProtect": "Dokument je chránený heslom a nie je možné ho otvoriť.",
"DE.Controllers.Main.errorForceSave": "Pri ukladaní súboru sa vyskytla chyba. Ak chcete súbor uložiť na pevný disk počítača, použite možnosť 'Prevziať ako' alebo to skúste znova neskôr.",
"DE.Controllers.Main.errorKeyEncrypt": "Neznámy kľúč deskriptoru",
"DE.Controllers.Main.errorKeyExpire": "Kľúč deskriptora vypršal",
"DE.Controllers.Main.errorMailMergeLoadFile": "Načítavanie zlyhalo",
@ -335,6 +354,7 @@
"DE.Controllers.Main.textAnonymous": "Anonymný",
"DE.Controllers.Main.textBuyNow": "Navštíviť webovú stránku",
"DE.Controllers.Main.textChangesSaved": "Všetky zmeny boli uložené",
"DE.Controllers.Main.textClose": "Zatvoriť",
"DE.Controllers.Main.textCloseTip": "Kliknutím zavrite tip",
"DE.Controllers.Main.textContactUs": "Kontaktujte predajcu",
"DE.Controllers.Main.textLoadingDocument": "Načítavanie dokumentu",
@ -740,6 +760,13 @@
"DE.Controllers.Toolbar.txtSymbol_vdots": "Vertikálna elipsa/vypustenie",
"DE.Controllers.Toolbar.txtSymbol_xsi": "Ksí ",
"DE.Controllers.Toolbar.txtSymbol_zeta": "Zéta",
"DE.Controllers.Viewport.textFitPage": "Prispôsobiť na stranu",
"DE.Controllers.Viewport.textFitWidth": "Prispôsobiť na šírku",
"DE.Views.BookmarksDialog.textAdd": "Pridať",
"DE.Views.BookmarksDialog.textBookmarkName": "Názov záložky",
"DE.Views.BookmarksDialog.textClose": "Zatvoriť",
"DE.Views.BookmarksDialog.textDelete": "Vymazať",
"DE.Views.BookmarksDialog.textTitle": "Záložky",
"DE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia",
"DE.Views.ChartSettings.textArea": "Plošný graf",
"DE.Views.ChartSettings.textBar": "Pruhový graf",
@ -767,6 +794,8 @@
"DE.Views.ChartSettings.txtTitle": "Graf",
"DE.Views.ChartSettings.txtTopAndBottom": "Hore a dole",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Zrušiť",
"DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textNewColor": "Pridať novú vlastnú farbu",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Zrušiť",
"DE.Views.CustomColumnsDialog.okButtonText": "Ok",
"DE.Views.CustomColumnsDialog.textColumns": "Počet stĺpcov",
@ -845,6 +874,8 @@
"DE.Views.DocumentHolder.textCopy": "Kopírovať",
"DE.Views.DocumentHolder.textCut": "Vystrihnúť",
"DE.Views.DocumentHolder.textEditWrapBoundary": "Upraviť okrajovú obálku",
"DE.Views.DocumentHolder.textFromFile": "Zo súboru",
"DE.Views.DocumentHolder.textFromUrl": "Z URL adresy ",
"DE.Views.DocumentHolder.textNextPage": "Ďalšia stránka",
"DE.Views.DocumentHolder.textPaste": "Vložiť",
"DE.Views.DocumentHolder.textPrevPage": "Predchádzajúca strana",
@ -986,7 +1017,7 @@
"DE.Views.DropcapSettingsAdvanced.tipFontName": "Písmo",
"DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Bez orámovania",
"DE.Views.FileMenu.btnBackCaption": "Prejsť do Dokumentov",
"DE.Views.FileMenu.btnCloseMenuCaption": "Zavrieť menu",
"DE.Views.FileMenu.btnCloseMenuCaption": "Zatvoriť menu",
"DE.Views.FileMenu.btnCreateNewCaption": "Vytvoriť nový",
"DE.Views.FileMenu.btnDownloadCaption": "Stiahnuť ako...",
"DE.Views.FileMenu.btnHelpCaption": "Pomoc...",
@ -1025,6 +1056,7 @@
"DE.Views.FileMenuPanels.DocumentRights.txtRights": "Osoby s oprávneniami",
"DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Ochrániť dokument",
"DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Podpis",
"DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Upraviť dokument",
"DE.Views.FileMenuPanels.Settings.okButtonText": "Použiť",
"DE.Views.FileMenuPanels.Settings.strAlignGuides": "Zapnúť tipy zarovnávania",
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "Zapnúť automatickú obnovu",
@ -1069,6 +1101,7 @@
"DE.Views.FileMenuPanels.Settings.txtWin": "ako Windows",
"DE.Views.HeaderFooterSettings.textBottomCenter": "Dole v strede",
"DE.Views.HeaderFooterSettings.textBottomLeft": "Dole vľavo",
"DE.Views.HeaderFooterSettings.textBottomPage": "Spodná časť stránky",
"DE.Views.HeaderFooterSettings.textBottomRight": "Dole vpravo",
"DE.Views.HeaderFooterSettings.textDiffFirst": "Odlišná prvá stránka",
"DE.Views.HeaderFooterSettings.textDiffOdd": "Rozdielne nepárne a párne stránky",
@ -1085,9 +1118,11 @@
"DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Vybraný textový úryvok",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Zobraziť",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Externý odkaz",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Nastavenie hypertextového odkazu",
"DE.Views.HyperlinkSettingsDialog.textTooltip": "Popis",
"DE.Views.HyperlinkSettingsDialog.textUrl": "Odkaz na",
"DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Záložky",
"DE.Views.HyperlinkSettingsDialog.txtEmpty": "Toto pole sa vyžaduje",
"DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Toto pole by malo byť vo formáte 'http://www.example.com'",
"DE.Views.ImageSettings.textAdvanced": "Zobraziť pokročilé nastavenia",
@ -1187,6 +1222,9 @@
"DE.Views.LeftMenu.tipTitles": "Nadpisy",
"DE.Views.LeftMenu.txtDeveloper": "VÝVOJÁRSKY REŽIM",
"DE.Views.LeftMenu.txtTrial": "Skúšobný režim",
"DE.Views.Links.capBtnBookmarks": "Záložka",
"DE.Views.Links.capBtnInsFootnote": "Poznámka pod čiarou",
"DE.Views.Links.mniDelFootnote": "Odstrániť všetky poznámky pod čiarou",
"DE.Views.Links.textContentsSettings": "Nastavenia",
"DE.Views.Links.tipInsertHyperlink": "Pridať odkaz",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Zrušiť",
@ -1241,6 +1279,7 @@
"DE.Views.MailMergeSettings.txtPrev": "K predchádzajúcemu záznamu",
"DE.Views.MailMergeSettings.txtUntitled": "Neoznačený",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Spustenie zlúčenia zlyhalo",
"DE.Views.Navigation.txtExpand": "Rozbaliť všetko",
"DE.Views.NoteSettingsDialog.textApply": "Použiť",
"DE.Views.NoteSettingsDialog.textApplyTo": "Použiť zmeny na",
"DE.Views.NoteSettingsDialog.textCancel": "Zrušiť",
@ -1260,6 +1299,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Začať na",
"DE.Views.NoteSettingsDialog.textTextBottom": "Pod textom",
"DE.Views.NoteSettingsDialog.textTitle": "Nastavenia poznámok",
"DE.Views.NumberingValueDialog.cancelButtonText": "Zrušiť",
"DE.Views.NumberingValueDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.cancelButtonText": "Zrušiť",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Upozornenie",
"DE.Views.PageMarginsDialog.okButtonText": "OK",
@ -1421,6 +1462,8 @@
"DE.Views.StyleTitleDialog.txtEmpty": "Toto pole sa vyžaduje",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Pole nesmie byť prázdne",
"DE.Views.TableOfContentsSettings.cancelButtonText": "Zrušiť",
"DE.Views.TableOfContentsSettings.okButtonText ": "OK",
"DE.Views.TableOfContentsSettings.textStyle": "Štýl",
"DE.Views.TableSettings.deleteColumnText": "Odstrániť stĺpec",
"DE.Views.TableSettings.deleteRowText": "Odstrániť riadok",
"DE.Views.TableSettings.deleteTableText": "Odstrániť tabuľku",
@ -1442,6 +1485,7 @@
"DE.Views.TableSettings.textBorderColor": "Farba",
"DE.Views.TableSettings.textBorders": "Štýl orámovania",
"DE.Views.TableSettings.textCancel": "Zrušiť",
"DE.Views.TableSettings.textCellSize": "Veľkosť bunky",
"DE.Views.TableSettings.textColumns": "Stĺpce",
"DE.Views.TableSettings.textEdit": "Riadky a stĺpce",
"DE.Views.TableSettings.textEmptyTemplate": "Žiadne šablóny",

1
apps/documenteditor/main/locale/sl.json
View file

@ -96,7 +96,6 @@
"Common.UI.Window.textWarning": "Opozorilo",
"Common.UI.Window.yesButtonText": "Da",
"Common.Views.About.txtAddress": "naslov:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvija, EU, LV-1021",
"Common.Views.About.txtLicensee": "LICENCE",
"Common.Views.About.txtLicensor": "DAJALEC LICENCE",
"Common.Views.About.txtMail": "e-naslov:",

1
apps/documenteditor/main/locale/tr.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "adres:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Letonya, AB, LV-1021",
"Common.Views.About.txtLicensee": "LİSANS SAHİBİ",
"Common.Views.About.txtLicensor": "LİSANS VEREN",
"Common.Views.About.txtMail": "eposta:",

1
apps/documenteditor/main/locale/uk.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "Пт",
"Common.Views.About.txtAddress": "адреса:",
"Common.Views.About.txtAscAddress": "Вул. Лубанас 125а-25, Рига, Латвія, ЄС, LV-1021",
"Common.Views.About.txtLicensee": "ЛІЦЕНЗІЯ",
"Common.Views.About.txtLicensor": "Ліцензіар",
"Common.Views.About.txtMail": "пошта:",

1
apps/documenteditor/main/locale/vi.json
View file

@ -101,7 +101,6 @@
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"Common.Views.About.txtAddress": "địa chỉ:",
"Common.Views.About.txtAscAddress": "Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021",
"Common.Views.About.txtLicensee": "NGƯỜI ĐƯỢC CẤP GIẤY PHÉP",
"Common.Views.About.txtLicensor": "NGƯỜI CẤP GIẤY PHÉP",
"Common.Views.About.txtMail": "email:",

55
apps/documenteditor/main/locale/zh.json
View file

@ -1,16 +1,16 @@
{
"Common.Controllers.Chat.notcriticalErrorTitle": "警告中",
"Common.Controllers.Chat.notcriticalErrorTitle": "警告",
"Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息",
"Common.Controllers.Chat.textUserLimit": "您正在使用ONLYOFFICE免费版。<br>只有两个用户可以同时共同编辑文档。<br>想要更多？考虑购买ONLYOFFICE企业版。<br> <a href=\"http://www.onlyoffice.com/free-edition.aspx\" target=\"_blank\">阅读更多内容</a>",
"Common.Controllers.ExternalDiagramEditor.textAnonymous": "匿名",
"Common.Controllers.ExternalDiagramEditor.textClose": "关闭",
"Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。",
"Common.Controllers.ExternalDiagramEditor.warningTitle": "警告中",
"Common.Controllers.ExternalDiagramEditor.warningTitle": "警告",
"Common.Controllers.ExternalMergeEditor.textAnonymous": "匿名",
"Common.Controllers.ExternalMergeEditor.textClose": "关闭",
"Common.Controllers.ExternalMergeEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。",
"Common.Controllers.ExternalMergeEditor.warningTitle": "警告中",
"Common.Controllers.History.notcriticalErrorTitle": "警告中",
"Common.Controllers.ExternalMergeEditor.warningTitle": "警告",
"Common.Controllers.History.notcriticalErrorTitle": "警告",
"Common.Controllers.ReviewChanges.textAtLeast": "至少",
"Common.Controllers.ReviewChanges.textAuto": "自动",
"Common.Controllers.ReviewChanges.textBaseline": "基线",
@ -35,14 +35,14 @@
"Common.Controllers.ReviewChanges.textInserted": "<b>插入：</ b>",
"Common.Controllers.ReviewChanges.textItalic": "斜体",
"Common.Controllers.ReviewChanges.textJustify": "仅对齐",
"Common.Controllers.ReviewChanges.textKeepLines": "保持一条线上",
"Common.Controllers.ReviewChanges.textKeepLines": "保持同一行",
"Common.Controllers.ReviewChanges.textKeepNext": "与下一个保持一致",
"Common.Controllers.ReviewChanges.textLeft": "左对齐",
"Common.Controllers.ReviewChanges.textLineSpacing": "行间距：",
"Common.Controllers.ReviewChanges.textMultiple": "多",
"Common.Controllers.ReviewChanges.textNoBreakBefore": "之前没有分页",
"Common.Controllers.ReviewChanges.textNoContextual": "在相同样式的段落之间添加间隔",
"Common.Controllers.ReviewChanges.textNoKeepLines": "不要把线保持在一起",
"Common.Controllers.ReviewChanges.textNoKeepLines": "不要保持一行",
"Common.Controllers.ReviewChanges.textNoKeepNext": "不要跟着下一个",
"Common.Controllers.ReviewChanges.textNot": "不",
"Common.Controllers.ReviewChanges.textNoWidow": "没有单独控制",
@ -54,7 +54,7 @@
"Common.Controllers.ReviewChanges.textRight": "右对齐",
"Common.Controllers.ReviewChanges.textShape": "形状",
"Common.Controllers.ReviewChanges.textShd": "背景颜色",
"Common.Controllers.ReviewChanges.textSmallCaps": "小帽子",
"Common.Controllers.ReviewChanges.textSmallCaps": "小写",
"Common.Controllers.ReviewChanges.textSpacing": "间距",
"Common.Controllers.ReviewChanges.textSpacingAfter": "间隔",
"Common.Controllers.ReviewChanges.textSpacingBefore": "之前的距离",
@ -64,8 +64,8 @@
"Common.Controllers.ReviewChanges.textTabs": "更改选项卡",
"Common.Controllers.ReviewChanges.textUnderline": "下划线",
"Common.Controllers.ReviewChanges.textWidow": "视窗控制",
"Common.UI.ComboBorderSize.txtNoBorders": "没有边界",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边界",
"Common.UI.ComboBorderSize.txtNoBorders": "没有边框",
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框",
"Common.UI.ComboDataView.emptyComboText": "没有风格",
"Common.UI.ExtendedColorDialog.addButtonText": "添加",
"Common.UI.ExtendedColorDialog.cancelButtonText": "取消",
@ -79,7 +79,7 @@
"Common.UI.SearchDialog.textReplaceDef": "输入替换文字",
"Common.UI.SearchDialog.textSearchStart": "在这里输入你的文字",
"Common.UI.SearchDialog.textTitle": "查找和替换",
"Common.UI.SearchDialog.textTitle2": "发现",
"Common.UI.SearchDialog.textTitle2": "查找",
"Common.UI.SearchDialog.textWholeWords": "只有整个字",
"Common.UI.SearchDialog.txtBtnHideReplace": "隐藏替换",
"Common.UI.SearchDialog.txtBtnReplace": "替换",
@ -96,16 +96,15 @@
"Common.UI.Window.textDontShow": "不要再显示此消息",
"Common.UI.Window.textError": "错误:",
"Common.UI.Window.textInformation": "信息",
"Common.UI.Window.textWarning": "警告中",
"Common.UI.Window.textWarning": "警告",
"Common.UI.Window.yesButtonText": "是",
"Common.Utils.Metric.txtCm": "厘米",
"Common.Utils.Metric.txtPt": "像素",
"Common.Views.About.txtAddress": "地址：",
"Common.Views.About.txtAscAddress": "卢巴纳斯125a-25，里加，拉脱维亚，欧盟，LV-1021",
"Common.Views.About.txtLicensee": "被许可人",
"Common.Views.About.txtLicensor": "许可",
"Common.Views.About.txtMail": "电子邮件：",
"Common.Views.About.txtPoweredBy": "供电",
"Common.Views.About.txtPoweredBy": "技术支持",
"Common.Views.About.txtTel": "电话：",
"Common.Views.About.txtVersion": "版本",
"Common.Views.AdvancedSettingsWindow.cancelButtonText": "取消",
@ -188,7 +187,7 @@
"Common.Views.ReviewChanges.txtRejectCurrent": "拒绝当前的变化",
"DE.Controllers.LeftMenu.leavePageText": "本文档中的所有未保存的更改都将丢失。<br>单击“取消”，然后单击“保存”保存。单击“确定”以放弃所有未保存的更改。",
"DE.Controllers.LeftMenu.newDocumentTitle": "未命名的文档",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "警告中",
"DE.Controllers.LeftMenu.notcriticalErrorTitle": "警告",
"DE.Controllers.LeftMenu.requestEditRightsText": "请求编辑权限..",
"DE.Controllers.LeftMenu.textLoadHistory": "载入版本历史记录...",
"DE.Controllers.LeftMenu.textNoTextFound": "您搜索的数据无法找到。请调整您的搜索选项。",
@ -243,7 +242,7 @@
"DE.Controllers.Main.loadingDocumentTitleText": "文件加载中…",
"DE.Controllers.Main.mailMergeLoadFileText": "原始数据加载中…",
"DE.Controllers.Main.mailMergeLoadFileTitle": "原始数据加载中…",
"DE.Controllers.Main.notcriticalErrorTitle": "警告中",
"DE.Controllers.Main.notcriticalErrorTitle": "警告",
"DE.Controllers.Main.openErrorText": "打开文件时发生错误",
"DE.Controllers.Main.openTextText": "打开文件...",
"DE.Controllers.Main.openTitleText": "正在打开文件",
@ -324,7 +323,7 @@
"DE.Controllers.Statusbar.textTrackChanges": "打开文档，并启用“跟踪更改”模式",
"DE.Controllers.Statusbar.zoomText": "缩放％{0}",
"DE.Controllers.Toolbar.confirmAddFontName": "您要保存的字体在当前设备上不可用。<br>使用其中一种系统字体显示文本样式，当可用时将使用保存的字体。<br>是否要继续？",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "警告中",
"DE.Controllers.Toolbar.notcriticalErrorTitle": "警告",
"DE.Controllers.Toolbar.textAccent": "口音",
"DE.Controllers.Toolbar.textBracket": "括号",
"DE.Controllers.Toolbar.textEmptyImgUrl": "您需要指定图像URL。",
@ -339,7 +338,7 @@
"DE.Controllers.Toolbar.textRadical": "自由基",
"DE.Controllers.Toolbar.textScript": "脚本",
"DE.Controllers.Toolbar.textSymbols": "符号",
"DE.Controllers.Toolbar.textWarning": "警告中",
"DE.Controllers.Toolbar.textWarning": "警告",
"DE.Controllers.Toolbar.txtAccent_Accent": "急性",
"DE.Controllers.Toolbar.txtAccent_ArrowD": "右上方的箭头在上方",
"DE.Controllers.Toolbar.txtAccent_ArrowL": "向左箭头",
@ -722,7 +721,7 @@
"DE.Views.DocumentHolder.insertRowBelowText": "下面的行",
"DE.Views.DocumentHolder.insertRowText": "插入行",
"DE.Views.DocumentHolder.insertText": "插入",
"DE.Views.DocumentHolder.keepLinesText": "保持一条线上",
"DE.Views.DocumentHolder.keepLinesText": "保持同一行",
"DE.Views.DocumentHolder.langText": "选择语言",
"DE.Views.DocumentHolder.leftText": "左",
"DE.Views.DocumentHolder.loadSpellText": "加载变体...",
@ -893,7 +892,7 @@
"DE.Views.DropcapSettingsAdvanced.textVertical": "垂直",
"DE.Views.DropcapSettingsAdvanced.textWidth": "宽度",
"DE.Views.DropcapSettingsAdvanced.tipFontName": "字体名称",
"DE.Views.DropcapSettingsAdvanced.txtNoBorders": "没有边界",
"DE.Views.DropcapSettingsAdvanced.txtNoBorders": "没有边框",
"DE.Views.FileMenu.btnBackCaption": "转到文档",
"DE.Views.FileMenu.btnCloseMenuCaption": "关闭菜单",
"DE.Views.FileMenu.btnCreateNewCaption": "新建",
@ -932,9 +931,9 @@
"DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "更改访问权限",
"DE.Views.FileMenuPanels.DocumentRights.txtRights": "有权利的人",
"DE.Views.FileMenuPanels.Settings.okButtonText": "应用",
"DE.Views.FileMenuPanels.Settings.strAlignGuides": "打开校准指南",
"DE.Views.FileMenuPanels.Settings.strAlignGuides": "打开对齐指南",
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "打开自动复原",
"DE.Views.FileMenuPanels.Settings.strAutosave": "拐弯就自动保存",
"DE.Views.FileMenuPanels.Settings.strAutosave": "打开自动保存",
"DE.Views.FileMenuPanels.Settings.strCoAuthMode": "共同编辑模式",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "其他用户将一次看到您的更改",
"DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "您将需要接受更改才能看到它们",
@ -1112,7 +1111,7 @@
"DE.Views.MailMergeSaveDlg.textTitle": "保存文件夹",
"DE.Views.MailMergeSettings.downloadMergeTitle": "合并",
"DE.Views.MailMergeSettings.errorMailMergeSaveFile": "合并失败",
"DE.Views.MailMergeSettings.notcriticalErrorTitle": "警告中",
"DE.Views.MailMergeSettings.notcriticalErrorTitle": "警告",
"DE.Views.MailMergeSettings.textAddRecipients": "首先将一些收件人添加到列表中",
"DE.Views.MailMergeSettings.textAll": "所有记录",
"DE.Views.MailMergeSettings.textCurrent": "当前记录",
@ -1162,7 +1161,7 @@
"DE.Views.NoteSettingsDialog.textTextBottom": "文字下方",
"DE.Views.NoteSettingsDialog.textTitle": "笔记设置",
"DE.Views.PageMarginsDialog.cancelButtonText": "取消",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "警告中",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "警告",
"DE.Views.PageMarginsDialog.okButtonText": "确定",
"DE.Views.PageMarginsDialog.textBottom": "底部",
"DE.Views.PageMarginsDialog.textLeft": "左",
@ -1199,14 +1198,14 @@
"DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "第一行",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "左",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "对",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "保持一条线上",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "保持同一行",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "与下一个保持一致",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "填充",
"DE.Views.ParagraphSettingsAdvanced.strOrphan": "单独控制",
"DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "字体 ",
"DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "缩进和放置",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "放置",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "小帽子",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "小写",
"DE.Views.ParagraphSettingsAdvanced.strStrike": "删除线",
"DE.Views.ParagraphSettingsAdvanced.strSubscript": "下标",
"DE.Views.ParagraphSettingsAdvanced.strSuperscript": "上标",
@ -1242,7 +1241,7 @@
"DE.Views.ParagraphSettingsAdvanced.tipOuter": "仅限外部边框",
"DE.Views.ParagraphSettingsAdvanced.tipRight": "设置右边框",
"DE.Views.ParagraphSettingsAdvanced.tipTop": "仅限顶部边框",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "没有边界",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "没有边框",
"DE.Views.RightMenu.txtChartSettings": "图表设置",
"DE.Views.RightMenu.txtHeaderFooterSettings": "页眉和页脚设置",
"DE.Views.RightMenu.txtImageSettings": "图像设置",
@ -1358,7 +1357,7 @@
"DE.Views.TableSettings.tipOuter": "仅限外部边框",
"DE.Views.TableSettings.tipRight": "仅设置外边界",
"DE.Views.TableSettings.tipTop": "仅限外部边框",
"DE.Views.TableSettings.txtNoBorders": "没有边界",
"DE.Views.TableSettings.txtNoBorders": "没有边框",
"DE.Views.TableSettingsAdvanced.cancelButtonText": "取消",
"DE.Views.TableSettingsAdvanced.okButtonText": "确定",
"DE.Views.TableSettingsAdvanced.textAlign": "校准",
@ -1431,7 +1430,7 @@
"DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "为内细胞设置表外边界和外边界",
"DE.Views.TableSettingsAdvanced.txtCm": "厘米",
"DE.Views.TableSettingsAdvanced.txtInch": "寸",
"DE.Views.TableSettingsAdvanced.txtNoBorders": "没有边界",
"DE.Views.TableSettingsAdvanced.txtNoBorders": "没有边框",
"DE.Views.TableSettingsAdvanced.txtPercent": "百分",
"DE.Views.TableSettingsAdvanced.txtPt": "点",
"DE.Views.TextArtSettings.strColor": "颜色",

2
apps/documenteditor/main/resources/help/de/HelpfulHints/SupportedFormats.htm
View file

@ -27,7 +27,7 @@
<td>DOC</td>
<td>Dateierweiterung für Textverarbeitungsdokumente, die mit Microsoft Word erstellt werden</td>
<td>+</td>
<td>+</td>
<td></td>
<td></td>
</tr>
<tr>

2
apps/documenteditor/main/resources/help/de/search/indexes.js
View file

@ -43,7 +43,7 @@ var indexes =
{
"id": "HelpfulHints/SupportedFormats.htm",
"title": "Unterstützte Formate von elektronischen Dokumenten",
"body": "Elektronische Dokumente stellen die am meisten benutzte Computerdateien dar. Dank des inzwischen hoch entwickelten Computernetzwerks ist es bequemer anstatt von gedruckten Dokumenten elektronische Dokumente zu verbreiten. Aufgrund der Vielfältigkeit der Geräte, die für die Anzeige der Dokumente verwendet werden, gibt es viele proprietäre und offene Dateiformate. Der Dokumenteneditor unterstützt die geläufigsten Formate. Format Beschreibung Anzeigen Bearbeiten Download DOC Dateierweiterung für Textverarbeitungsdokumente, die mit Microsoft Word erstellt werden + + DOCX Office Open XML Gezipptes, XML-basiertes, von Microsoft entwickeltes Dateiformat zur Präsentation von Kalkulationstabellen, Diagrammen, Präsentationen und Textverarbeitungsdokumenten + + + ODT Textverarbeitungsformat von OpenDocument, ein offener Standard für elektronische Dokumente + + + RTF Rich Text Format Plattformunabhängiges Datei- und Datenaustauschformat von Microsoft für formatierte Texte + + + TXT Dateierweiterung reiner Textdateien mit wenig Formatierung + + + PDF Portable Document Format Dateiformat, mit dem Dokumente unabhängig vom ursprünglichen Anwendungsprogramm, Betriebssystem und der Hardware originalgetreu wiedergegeben werden können + + HTML HyperText Markup Language Hauptauszeichnungssprache für Webseiten + EPUB Electronic Publication Offener Standard für E-Books vom International Digital Publishing Forum + XPS Open XML Paper Specification Offenes, lizenzfreies Dokumentenformat von Microsoft mit festem Layout + DjVu Dateiformat, das hauptsächlich zur Speicherung gescannter Dokumente (vor allem solcher mit Text, Rastergrafiken und Fotos) konzipiert wurde +"
"body": "Elektronische Dokumente stellen die am meisten benutzte Computerdateien dar. Dank des inzwischen hoch entwickelten Computernetzwerks ist es bequemer anstatt von gedruckten Dokumenten elektronische Dokumente zu verbreiten. Aufgrund der Vielfältigkeit der Geräte, die für die Anzeige der Dokumente verwendet werden, gibt es viele proprietäre und offene Dateiformate. Der Dokumenteneditor unterstützt die geläufigsten Formate. Format Beschreibung Anzeigen Bearbeiten Download DOC Dateierweiterung für Textverarbeitungsdokumente, die mit Microsoft Word erstellt werden + DOCX Office Open XML Gezipptes, XML-basiertes, von Microsoft entwickeltes Dateiformat zur Präsentation von Kalkulationstabellen, Diagrammen, Präsentationen und Textverarbeitungsdokumenten + + + ODT Textverarbeitungsformat von OpenDocument, ein offener Standard für elektronische Dokumente + + + RTF Rich Text Format Plattformunabhängiges Datei- und Datenaustauschformat von Microsoft für formatierte Texte + + + TXT Dateierweiterung reiner Textdateien mit wenig Formatierung + + + PDF Portable Document Format Dateiformat, mit dem Dokumente unabhängig vom ursprünglichen Anwendungsprogramm, Betriebssystem und der Hardware originalgetreu wiedergegeben werden können + + HTML HyperText Markup Language Hauptauszeichnungssprache für Webseiten + EPUB Electronic Publication Offener Standard für E-Books vom International Digital Publishing Forum + XPS Open XML Paper Specification Offenes, lizenzfreies Dokumentenformat von Microsoft mit festem Layout + DjVu Dateiformat, das hauptsächlich zur Speicherung gescannter Dokumente (vor allem solcher mit Text, Rastergrafiken und Fotos) konzipiert wurde +"
},
{
"id": "ProgramInterface/FileTab.htm",

2
apps/documenteditor/main/resources/help/en/HelpfulHints/SupportedFormats.htm
View file

@ -30,7 +30,7 @@
<td>DOC</td>
<td>Filename extension for word processing documents created with Microsoft Word</td>
<td>+</td>
<td>+</td>
<td></td>
<td></td>
</tr>
<tr>

2
apps/documenteditor/main/resources/help/en/search/indexes.js
View file

@ -43,7 +43,7 @@ var indexes =
{
"id": "HelpfulHints/SupportedFormats.htm",
"title": "Supported Formats of Electronic Documents",
"body": "Electronic documents represent one of the most commonly used computer files. Thanks to the computer network highly developed nowadays, it's possible and more convenient to distribute electronic documents than printed ones. Due to the variety of devices used for document presentation, there are a lot of proprietary and open file formats. Document Editor handles the most popular of them. Formats Description View Edit Download DOC Filename extension for word processing documents created with Microsoft Word + + DOCX Office Open XML Zipped, XML-based file format developed by Microsoft for representing spreadsheets, charts, presentations, and word processing documents + + + ODT Word processing file format of OpenDocument, an open standard for electronic documents + + + RTF Rich Text Format Document file format developed by Microsoft for cross-platform document interchange + + + TXT Filename extension for text files usually containing very little formatting + + + PDF Portable Document Format File format used to represent documents in a manner independent of application software, hardware, and operating systems + + HTML HyperText Markup Language The main markup language for web pages + EPUB Electronic Publication Free and open e-book standard created by the International Digital Publishing Forum + XPS Open XML Paper Specification Open royalty-free fixed-layout document format developed by Microsoft + DjVu File format designed primarily to store scanned documents, especially those containing a combination of text, line drawings, and photographs +"
"body": "Electronic documents represent one of the most commonly used computer files. Thanks to the computer network highly developed nowadays, it's possible and more convenient to distribute electronic documents than printed ones. Due to the variety of devices used for document presentation, there are a lot of proprietary and open file formats. Document Editor handles the most popular of them. Formats Description View Edit Download DOC Filename extension for word processing documents created with Microsoft Word + DOCX Office Open XML Zipped, XML-based file format developed by Microsoft for representing spreadsheets, charts, presentations, and word processing documents + + + ODT Word processing file format of OpenDocument, an open standard for electronic documents + + + RTF Rich Text Format Document file format developed by Microsoft for cross-platform document interchange + + + TXT Filename extension for text files usually containing very little formatting + + + PDF Portable Document Format File format used to represent documents in a manner independent of application software, hardware, and operating systems + + HTML HyperText Markup Language The main markup language for web pages + EPUB Electronic Publication Free and open e-book standard created by the International Digital Publishing Forum + XPS Open XML Paper Specification Open royalty-free fixed-layout document format developed by Microsoft + DjVu File format designed primarily to store scanned documents, especially those containing a combination of text, line drawings, and photographs +"
},
{
"id": "ProgramInterface/FileTab.htm",

2
apps/documenteditor/main/resources/help/es/HelpfulHints/SupportedFormats.htm
View file

@ -27,7 +27,7 @@
<td>DOC</td>
<td>Extensión de archivo para los documentos de texto creados con Microsoft Word</td>
<td>+</td>
<td>+</td>
<td></td>
<td></td>
</tr>
<tr>

12
apps/documenteditor/main/resources/help/es/search/indexes.js
View file

File diff suppressed because one or more lines are too long

2
apps/documenteditor/main/resources/help/fr/HelpfulHints/SupportedFormats.htm
View file

@ -27,7 +27,7 @@
<td>DOC</td>
<td>L'extension de nom de fichier pour les documents du traitement textuel créé avec Microsoft Word</td>
<td>+</td>
<td>+</td>
<td></td>
<td></td>
</tr>
<tr>

2
apps/documenteditor/main/resources/help/fr/search/indexes.js
View file

@ -43,7 +43,7 @@ var indexes =
{
"id": "HelpfulHints/SupportedFormats.htm",
"title": "Formats des documents électroniques pris en charge",
"body": "Les documents électroniques représentent l'un des types des fichiers les plus utilisés en informatique. Grâce à l'utilisation du réseau informatique tant développé aujourd'hui, il est possible et plus pratique de distribuer des documents électroniques que des versions imprimées. Les formats de fichier ouverts et propriétaires sont bien nombreux à cause de la variété des périphériques utilisés pour la présentation des documents. Document Editor prend en charge les formats les plus populaires. Formats Description Affichage Edition Téléchargement DOC L'extension de nom de fichier pour les documents du traitement textuel créé avec Microsoft Word + + DOCX Office Open XML Le format de fichier compressé basé sur XML développé par Microsoft pour représenter des feuilles de calcul et les graphiques, les présentations et les document du traitement textuel + + + ODT Le format de fichier du traitement textuel d'OpenDocument, le standard ouvert pour les documents électroniques + + + RTF Rich Text Format Le format de fichier du document développé par Microsoft pour la multiplateforme d'échange des documents + + + TXT L'extension de nom de fichier pour les fichiers de texte contenant habituellement une mise en forme minimale + + + PDF Portable Document Format Format de fichier utilisé pour représenter les documents d'une manière indépendante du logiciel, du matériel et des systèmes d'exploitation + + HTML HyperText Markup Language Le principale langage de balisage pour les pages web + EPUB Electronic Publication Le format ebook standardisé, gratuit et ouvert créé par l'International Digital Publishing Forum + XPS Open XML Paper Specification Le format ouvert de la mise en page fixe, libre de redevance créé par Microsoft + DjVu Le format de fichier conçu principalement pour stocker les documents numérisés, en particulier ceux qui contiennent une combinaison du texte, des dessins au trait et des photographies +"
"body": "Les documents électroniques représentent l'un des types des fichiers les plus utilisés en informatique. Grâce à l'utilisation du réseau informatique tant développé aujourd'hui, il est possible et plus pratique de distribuer des documents électroniques que des versions imprimées. Les formats de fichier ouverts et propriétaires sont bien nombreux à cause de la variété des périphériques utilisés pour la présentation des documents. Document Editor prend en charge les formats les plus populaires. Formats Description Affichage Edition Téléchargement DOC L'extension de nom de fichier pour les documents du traitement textuel créé avec Microsoft Word + DOCX Office Open XML Le format de fichier compressé basé sur XML développé par Microsoft pour représenter des feuilles de calcul et les graphiques, les présentations et les document du traitement textuel + + + ODT Le format de fichier du traitement textuel d'OpenDocument, le standard ouvert pour les documents électroniques + + + RTF Rich Text Format Le format de fichier du document développé par Microsoft pour la multiplateforme d'échange des documents + + + TXT L'extension de nom de fichier pour les fichiers de texte contenant habituellement une mise en forme minimale + + + PDF Portable Document Format Format de fichier utilisé pour représenter les documents d'une manière indépendante du logiciel, du matériel et des systèmes d'exploitation + + HTML HyperText Markup Language Le principale langage de balisage pour les pages web + EPUB Electronic Publication Le format ebook standardisé, gratuit et ouvert créé par l'International Digital Publishing Forum + XPS Open XML Paper Specification Le format ouvert de la mise en page fixe, libre de redevance créé par Microsoft + DjVu Le format de fichier conçu principalement pour stocker les documents numérisés, en particulier ceux qui contiennent une combinaison du texte, des dessins au trait et des photographies +"
},
{
"id": "ProgramInterface/FileTab.htm",

2
apps/documenteditor/main/resources/help/ru/HelpfulHints/SupportedFormats.htm
View file

@ -30,7 +30,7 @@
<td>DOC</td>
<td>Расширение имени файла для текстовых документов, созданных программой Microsoft Word</td>
<td>+</td>
<td>+</td>
<td></td>
<td></td>
</tr>
<tr>

2
apps/documenteditor/main/resources/help/ru/search/indexes.js
View file

@ -43,7 +43,7 @@ var indexes =
{
"id": "HelpfulHints/SupportedFormats.htm",
"title": "Поддерживаемые форматы электронных документов",
"body": "Электронные документы - это одни из наиболее широко используемых компьютерных файлов. Благодаря высокому уровню развития современных компьютерных сетей распространять электронные документы становится удобнее, чем печатные. Многообразие устройств, используемых для представления документов, обуславливает большое количество проприетарных и открытых файловых форматов. Редактор документов работает с самыми популярными из них. Форматы Описание Просмотр Редактирование Скачивание DOC Расширение имени файла для текстовых документов, созданных программой Microsoft Word + + DOCX Office Open XML разработанный компанией Microsoft формат файлов на основе XML, сжатых по технологии ZIP. Предназначен для представления электронных таблиц, диаграмм, презентаций и текстовых документов + + + ODT Формат текстовых файлов OpenDocument, открытый стандарт для электронных документов + + + RTF Rich Text Format Формат документов, разработанный компанией Microsoft, для кроссплатформенного обмена документами + + + TXT Расширение имени файла для текстовых файлов, как правило, с минимальным форматированием + + + PDF Portable Document Format Формат файлов, используемый для представления документов независимо от программного обеспечения, аппаратных средств и операционных систем + + HTML HyperText Markup Language Основной язык разметки веб-страниц + EPUB Electronic Publication Бесплатный открытый стандарт для электронных книг, созданный Международным форумом по цифровым публикациям (International Digital Publishing Forum) + XPS Open XML Paper Specification Открытый бесплатный формат фиксированной разметки, разработанный компанией Microsoft + DjVu Формат файлов, предназначенный главным образом для хранения отсканированных документов, особенно тех, которые содержат комбинацию текста, рисунков и фотографий +"
"body": "Электронные документы - это одни из наиболее широко используемых компьютерных файлов. Благодаря высокому уровню развития современных компьютерных сетей распространять электронные документы становится удобнее, чем печатные. Многообразие устройств, используемых для представления документов, обуславливает большое количество проприетарных и открытых файловых форматов. Редактор документов работает с самыми популярными из них. Форматы Описание Просмотр Редактирование Скачивание DOC Расширение имени файла для текстовых документов, созданных программой Microsoft Word + DOCX Office Open XML разработанный компанией Microsoft формат файлов на основе XML, сжатых по технологии ZIP. Предназначен для представления электронных таблиц, диаграмм, презентаций и текстовых документов + + + ODT Формат текстовых файлов OpenDocument, открытый стандарт для электронных документов + + + RTF Rich Text Format Формат документов, разработанный компанией Microsoft, для кроссплатформенного обмена документами + + + TXT Расширение имени файла для текстовых файлов, как правило, с минимальным форматированием + + + PDF Portable Document Format Формат файлов, используемый для представления документов независимо от программного обеспечения, аппаратных средств и операционных систем + + HTML HyperText Markup Language Основной язык разметки веб-страниц + EPUB Electronic Publication Бесплатный открытый стандарт для электронных книг, созданный Международным форумом по цифровым публикациям (International Digital Publishing Forum) + XPS Open XML Paper Specification Открытый бесплатный формат фиксированной разметки, разработанный компанией Microsoft + DjVu Формат файлов, предназначенный главным образом для хранения отсканированных документов, особенно тех, которые содержат комбинацию текста, рисунков и фотографий +"
},
{
"id": "ProgramInterface/FileTab.htm",

BIN
apps/documenteditor/main/resources/img/toolbar-menu@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

1
apps/documenteditor/main/resources/less/leftmenu.less
View file

@ -78,4 +78,5 @@ button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60
-webkit-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
cursor: default;
}

32
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -306,6 +306,11 @@ define([
},
onDownloadAs: function() {
if ( !this.appOptions.canDownload && !this.appOptions.canDownloadOrigin) {
Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny);
return;
}
this._state.isFromGatewayDownloadAs = true;
var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
@ -316,9 +321,9 @@ define([
}
},
goBack: function() {
goBack: function(current) {
var href = this.appOptions.customization.goback.url;
if (this.appOptions.customization.goback.blank!==false) {
if (!current && this.appOptions.customization.goback.blank!==false) {
window.open(href, "_blank");
} else {
parent.location.href = href;
@ -485,8 +490,6 @@ define([
if (this._isDocReady)
return;
Common.Gateway.documentReady();
if (this._state.openDlg)
uiApp.closeModal(this._state.openDlg);
@ -579,6 +582,7 @@ define([
me.applyLicense();
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
Common.Gateway.documentReady();
},
onLicenseChanged: function(params) {
@ -767,6 +771,14 @@ define([
},
onError: function(id, level, errData) {
if (id == Asc.c_oAscError.ID.LoadingScriptError) {
uiApp.addNotification({
title: this.criticalErrorTitle,
message: this.scriptLoadError
});
return;
}
this.hidePreloader();
this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
@ -833,7 +845,7 @@ define([
break;
case Asc.c_oAscError.ID.CoAuthoringDisconnect:
config.msg = (this.appOptions.isEdit) ? this.errorCoAuthoringDisconnect : this.errorViewerDisconnect;
config.msg = this.errorViewerDisconnect;
break;
case Asc.c_oAscError.ID.ConvertationPassword:
@ -881,6 +893,10 @@ define([
config.msg = this.errorDataEncrypted;
break;
case Asc.c_oAscError.ID.AccessDeny:
config.msg = this.errorAccessDeny;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -898,7 +914,7 @@ define([
if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp) {
config.msg += '</br></br>' + this.criticalErrorExtText;
config.callback = function() {
Common.NotificationCenter.trigger('goback');
Common.NotificationCenter.trigger('goback', true);
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
@ -1347,7 +1363,9 @@ define([
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.',
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
closeButtonText: 'Close File'
closeButtonText: 'Close File',
scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.',
errorAccessDeny: 'You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.'
}
})(), DE.Controllers.Main || {}))
});

2
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file

@ -265,6 +265,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();

2
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file

@ -261,6 +261,8 @@ define([
},
_initBorderColorView: function () {
if (!_shapeObject) return;
var me = this,
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();

2
apps/documenteditor/mobile/app/template/Settings.template
View file

@ -426,7 +426,7 @@
</div>
<div class="content-block">
<h3 id="settings-about-name" class="vendor">Ascensio System SIA</h3>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021</a></p>
<p><label><%= scope.textAddress %>:</label><a id="settings-about-address" class="external" href="#">20A-12 Ernesta Birznieka-Upisha street, Riga, Latvia, EU, LV-1050</a></p>
<p><label><%= scope.textEmail %>:</label><a id="settings-about-email" class="external" target="_blank" href="mailto:support@onlyoffice.com">support@onlyoffice.com</a></p>
<p><label><%= scope.textTel %>:</label><a id="settings-about-tel" class="external" target="_blank" href="tel:+371 660-16425">+371 660-16425</a></p>
<p><a id="settings-about-url" class="external" target="_blank" href="http://www.onlyoffice.com">www.onlyoffice.com</a></p>

3
apps/documenteditor/mobile/locale/de.json
View file

@ -71,7 +71,7 @@
"DE.Controllers.Main.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
"DE.Controllers.Main.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.",
"DE.Controllers.Main.errorUsersExceed": "Die Anzahl der Benutzer ist überschritten ",
"DE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist verloren. Man kann das Dokument anschauen,<br>aber nicht herunterladen bis die Verbindung wiederhergestellt wird.",
"DE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist unterbrochen. Man kann das Dokument anschauen,<br>aber nicht herunterladen bis die Verbindung wiederhergestellt wird.",
"DE.Controllers.Main.leavePageText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\", um auf automatisches Speichern des Dokumentes zu warten. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
"DE.Controllers.Main.loadFontsTextText": "Daten werden geladen...",
"DE.Controllers.Main.loadFontsTitleText": "Daten werden geladen",
@ -96,6 +96,7 @@
"DE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...",
"DE.Controllers.Main.saveTextText": "Dokument wird gespeichert...",
"DE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...",
"DE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.",
"DE.Controllers.Main.sendMergeText": "Merge-Vesand...",
"DE.Controllers.Main.sendMergeTitle": "Merge-Vesand",
"DE.Controllers.Main.splitDividerErrorText": "Die Anzahl der Zeilen muss einen Divisor von %1 sein. ",

2
apps/documenteditor/mobile/locale/en.json
View file

@ -53,6 +53,7 @@
"DE.Controllers.Main.downloadMergeTitle": "Downloading",
"DE.Controllers.Main.downloadTextText": "Downloading document...",
"DE.Controllers.Main.downloadTitleText": "Downloading Document",
"DE.Controllers.Main.errorAccessDeny": "You are trying to perform an action you do not have rights for.<br>Please contact your Document Server administrator.",
"DE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
@ -96,6 +97,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"DE.Controllers.Main.saveTextText": "Saving document...",
"DE.Controllers.Main.saveTitleText": "Saving Document",
"DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Sending Merge",
"DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",

1
apps/documenteditor/mobile/locale/es.json
View file

@ -96,6 +96,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere por favor...",
"DE.Controllers.Main.saveTextText": "Guardando documento...",
"DE.Controllers.Main.saveTitleText": "Guardando documento",
"DE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.",
"DE.Controllers.Main.sendMergeText": "Envío de los resultados de fusión...",
"DE.Controllers.Main.sendMergeTitle": "Envío de los resultados de fusión",
"DE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1",

1
apps/documenteditor/mobile/locale/fr.json
View file

@ -96,6 +96,7 @@
"DE.Controllers.Main.savePreparingTitle": "Merci de patienter, la préparation de l'enregistrement est en cours...",
"DE.Controllers.Main.saveTextText": "Enregistrement du document...",
"DE.Controllers.Main.saveTitleText": "Enregistrement du document",
"DE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.",
"DE.Controllers.Main.sendMergeText": "Envoie du résultat de la fusion...",
"DE.Controllers.Main.sendMergeTitle": "Envoie du résultat de la fusion",
"DE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1",

1
apps/documenteditor/mobile/locale/it.json
View file

@ -96,6 +96,7 @@
"DE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Attendere prego...",
"DE.Controllers.Main.saveTextText": "Salvataggio del documento in corso...",
"DE.Controllers.Main.saveTitleText": "Salvataggio del documento",
"DE.Controllers.Main.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.",
"DE.Controllers.Main.sendMergeText": "Sending Merge...",
"DE.Controllers.Main.sendMergeTitle": "Invio unione",
"DE.Controllers.Main.splitDividerErrorText": "Il numero di righe deve essere un divisore di %1",

3
apps/documenteditor/mobile/locale/pl.json
View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Wybierz opcje TXT",
"DE.Controllers.Main.applyChangesTextText": "Ładowanie danych...",
"DE.Controllers.Main.applyChangesTitleText": "Ładowanie danych",
"DE.Controllers.Main.closeButtonText": "Zamknij plik",
"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",
@ -338,7 +339,7 @@
"DE.Views.Search.textHighlight": "Podświetl wyniki",
"DE.Views.Search.textReplace": "Zamień",
"DE.Views.Search.textSearch": "Szukaj",
"DE.Views.Settings.textAbout": "O",
"DE.Views.Settings.textAbout": "O programie",
"DE.Views.Settings.textAddress": "Adres",
"DE.Views.Settings.textAuthor": "Autor",
"DE.Views.Settings.textBack": "Powrót",

Some files were not shown because too many files have changed in this diff Show more