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

Merge branch 'develop' into feature/sse-layout

Browse source
This commit is contained in:
Julia Radzhabova 2018-07-18 14:08:43 +03:00
parent 413d4b7133 d8fc456686
commit 43bad93bb1
103 changed files with 765 additions and 371 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,6 +45,7 @@
changeHistory: <can change history>, // default = false
comment: <can comment in view mode> // default = edit,
modifyFilter: <can add, remove and save filter in the spreadsheet> // default = true
modifyContentControl: <can modify content controls in documenteditor> // default = true
}
},
editorConfig: {

4
apps/common/main/lib/controller/Protection.js
View file

@ -110,8 +110,8 @@ define([
return this;
},
onDocumentPassword: function(hasPassword) {
this.view && this.view.onDocumentPassword(hasPassword);
onDocumentPassword: function(hasPassword, disabled) {
this.view && this.view.onDocumentPassword(hasPassword, disabled);
},
SetDisabled: function(state, canProtect) {

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

@ -172,7 +172,8 @@ define([
});
} else {
this.initCodePages();
this.updatePreview();
if (this.preview)
this.updatePreview();
this.onPrimary = function() {
me._handleInput('ok');
return false;

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

@ -111,7 +111,7 @@ define([
this.btnsDelPwd = [];
this.btnsChangePwd = [];
this._state = {disabled: false, hasPassword: false};
this._state = {disabled: false, hasPassword: false, disabledPassword: false};
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
@ -235,7 +235,7 @@ define([
cls: 'btn-text-default',
style: 'width: 100%;',
caption: this.txtAddPwd,
disabled: this._state.disabled,
disabled: this._state.disabled || this._state.disabledPassword,
visible: !this._state.hasPassword
});
this.btnsAddPwd.push(button);
@ -246,7 +246,7 @@ define([
cls: 'btn-text-default',
style: 'width: 100%;',
caption: this.txtDeletePwd,
disabled: this._state.disabled,
disabled: this._state.disabled || this._state.disabledPassword,
visible: this._state.hasPassword
});
this.btnsDelPwd.push(button);
@ -257,7 +257,7 @@ define([
cls: 'btn-text-default',
style: 'width: 100%;',
caption: this.txtChangePwd,
disabled: this._state.disabled,
disabled: this._state.disabled || this._state.disabledPassword,
visible: this._state.hasPassword
});
this.btnsChangePwd.push(button);
@ -279,21 +279,25 @@ define([
}
this.btnsAddPwd.concat(this.btnsDelPwd, this.btnsChangePwd).forEach(function(button) {
if ( button ) {
button.setDisabled(state);
button.setDisabled(state || this._state.disabledPassword);
}
}, this);
},
onDocumentPassword: function (hasPassword) {
onDocumentPassword: function (hasPassword, disabledPassword) {
this._state.hasPassword = hasPassword;
this._state.disabledPassword = !!disabledPassword;
var disabled = this._state.disabledPassword || this._state.disabled;
this.btnsAddPwd && this.btnsAddPwd.forEach(function(button) {
if ( button ) {
button.setVisible(!hasPassword);
button.setDisabled(disabled);
}
}, this);
this.btnsDelPwd.concat(this.btnsChangePwd).forEach(function(button) {
if ( button ) {
button.setVisible(hasPassword);
button.setDisabled(disabled);
}
}, this);
this.btnPwd.setVisible(hasPassword);

38
apps/common/main/resources/img/doc-formats/pdfa.svg Normal file
View file

@ -0,0 +1,38 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
<defs>
<style>
.cls-1 {
fill: #ba4c3f;
}
.cls-2 {
opacity: 0.2;
}
.cls-2, .cls-3 {
isolation: isolate;
}
.cls-4 {
fill: #fff;
}
</style>
</defs>
<symbol id="svg-format-pdfa">
<path class="cls-1" d="M95,23v96a2.9,2.9,0,0,1-3,3H8a2.9,2.9,0,0,1-3-3V8A2.9,2.9,0,0,1,8,5H77Z" transform="translate(-5 -5)"/>
<path class="cls-2" d="M95,23H80a2.9,2.9,0,0,1-3-3V5Z" transform="translate(-5 -5)"/>
<g class="cls-3">
<path class="cls-4" d="M38.9,107.1a2.6,2.6,0,0,1-.9,2.1,3.6,3.6,0,0,1-2.4.8h-.8v3H33v-8.6h2.7a4.3,4.3,0,0,1,2.4.7A2.6,2.6,0,0,1,38.9,107.1Zm-4.1,1.4h.6a1.6,1.6,0,0,0,1.2-.4,1,1,0,0,0,.4-.9,1.3,1.3,0,0,0-.3-1,1.6,1.6,0,0,0-1.1-.3h-.8Z" transform="translate(-5 -5)"/>
<path class="cls-4" d="M47.6,108.6a4.5,4.5,0,0,1-1.2,3.3,5.2,5.2,0,0,1-3.5,1.1H40.5v-8.6h2.7a4.4,4.4,0,0,1,3.2,1.1A4.1,4.1,0,0,1,47.6,108.6Zm-1.9.1c0-1.9-.8-2.8-2.4-2.8h-1v5.6h.8C44.8,111.5,45.7,110.6,45.7,108.7Z" transform="translate(-5 -5)"/>
<path class="cls-4" d="M51.2,113H49.4v-8.6h4.9v1.5H51.2v2.2h2.9v1.5H51.2Z" transform="translate(-5 -5)"/>
<path class="cls-4" d="M59.8,104.4,56.6,113H55l3.2-8.6Z" transform="translate(-5 -5)"/>
<path class="cls-4" d="M66.2,113l-.7-2H62.4l-.6,2h-2l3.1-8.6h2.2l3,8.6Zm-1.1-3.6c-.6-1.8-.9-2.9-1-3.1s-.1-.4-.1-.6-.5,1.8-1.1,3.7Z" transform="translate(-5 -5)"/>
</g>
<path id="path4463" class="cls-4" d="M40.4,66.7c1.6-3.2,3.4-6.7,4.9-10.2h0l.6-1.4c-1.9-7.3-3.1-13.1-2-16.9h0a2.5,2.5,0,0,1,2.6-1.5h.9c1.6,0,2.4,2,2.5,2.9h0a10.8,10.8,0,0,1-.5,3.6h0a9.5,9.5,0,0,0-.5-3.7h0c-.7-1.5-1.4-2.4-2-2.5h0a1.9,1.9,0,0,0-.7,1.4h0c-.1,1.1-.2,2.1-.2,3.2h0A37.6,37.6,0,0,0,47.5,51h0c.1-.5.3-1,.4-1.5h0l1.5-5.9h0a79.7,79.7,0,0,1-.8,8.8h0l-.3,1.3h0a29.2,29.2,0,0,0,7.4,11.5h0A24.9,24.9,0,0,0,60,68.1h0a63.6,63.6,0,0,1,8.7-.6h0c3.2,0,5.6.5,6.6,1.5h0a2.4,2.4,0,0,1,.7,1.6h0c0,.4-.1.7-.1,1h0c0-.2,0-1-2.6-1.9h0c-2.1-.6-6-.6-10.6-.1h0c5.3,2.6,10.6,4,12.3,3.2h0l.9-.9h0a10.4,10.4,0,0,1-.6,1.6h0a1.8,1.8,0,0,1-1.2.9h0c-2.7.7-9.5-.9-15.5-4.3h0a123.9,123.9,0,0,0-19.8,4.7h0C33,84.9,28.7,89.5,25.2,87.8h0l-1.3-.7a1.4,1.4,0,0,1-.5-1.6h0c.4-2,2.9-5,8-8.1h0l3-1.6h0l-2.2,2.1h0c-4,3.3-7,7.5-6.9,9.1h0c3.4-.5,8.5-7.5,15.1-20.4m2.1,1.1-3.2,5.8h0a81.1,81.1,0,0,1,17.1-4.9h0L54.3,67h0A29.8,29.8,0,0,1,47,57.7h0a100.4,100.4,0,0,1-4.5,10.1" transform="translate(-5 -5)"/>
<g>
<path class="cls-4" d="M68.5,39.4c-.1.5-.5,1.8-1,3.7h2c-.5-1.8-.8-2.9-.9-3.1S68.5,39.6,68.5,39.4Z" transform="translate(-5 -5)"/>
<path class="cls-4" d="M75,36H62a2,2,0,0,0-2,2v9a2,2,0,0,0,2,2H75a2,2,0,0,0,2-2V38A2,2,0,0,0,75,36ZM70.5,46.7l-.6-2H67l-.5,2H64.6l2.8-8.6h2.1l2.8,8.6Z" transform="translate(-5 -5)"/>
</g>
</symbol>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

2
apps/common/main/resources/img/doc-formats/rtf.svg
View file

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-rtf"><path fill="#7c7c7d" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.27 113)">RTF</text><rect class="cls-4" x="49" y="38" width="25" height="2"/><rect class="cls-4" x="49" y="44" width="25" height="2"/><rect class="cls-4" x="49" y="50" width="25" height="2"/><rect class="cls-4" x="49" y="56" width="25" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/><rect class="cls-4" x="25" y="38" width="20" height="20"/></symbol></svg>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127"><defs><style>.cls-2{opacity:0.2;}.cls-3{font-size:12px;font-family:OpenSans-Bold, Open Sans;font-weight:700;}.cls-3,.cls-4{fill:#fff;}</style></defs><symbol id="svg-format-rtf"><path fill="#635e9b" d="M95,23v96a3,3,0,0,1-3,3H8a3,3,0,0,1-3-3V8A3,3,0,0,1,8,5H77Z"/><path class="cls-2" d="M95,23H80a3,3,0,0,1-3-3V5Z"/><text class="cls-3" transform="translate(39.27 113)">RTF</text><rect class="cls-4" x="49" y="38" width="25" height="2"/><rect class="cls-4" x="49" y="44" width="25" height="2"/><rect class="cls-4" x="49" y="50" width="25" height="2"/><rect class="cls-4" x="49" y="56" width="25" height="2"/><rect class="cls-4" x="25" y="62" width="49" height="2"/><rect class="cls-4" x="25" y="68" width="49" height="2"/><rect class="cls-4" x="25" y="74" width="49" height="2"/><rect class="cls-4" x="25" y="80" width="49" height="2"/><rect class="cls-4" x="25" y="86" width="49" height="2"/><rect class="cls-4" x="25" y="38" width="20" height="20"/></symbol></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

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

@ -40,7 +40,6 @@
.extra {
> section {
line-height: 20px;
height: 100%;
display: flex;
}
@ -52,6 +51,7 @@
&.right {
flex-grow: 1;
min-width: 100px;
line-height: 20px;
}
.status-label {

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

@ -108,7 +108,7 @@ define([
weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
});
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
this.languages = null;
this.translationTable = [];
// Initialize viewport
@ -413,7 +413,8 @@ define([
Asc.c_oAscFileType.ODT,
Asc.c_oAscFileType.DOCX,
Asc.c_oAscFileType.HTML,
Asc.c_oAscFileType.PDF
Asc.c_oAscFileType.PDF,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
@ -993,16 +994,27 @@ define([
onLicenseChanged: function(params) {
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady)
this.applyLicense();
},
applyLicense: function() {
if (this._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = ['ok'],
primary = 'ok';
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}];
primary = 'buynow';
}
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect');
@ -1014,12 +1026,9 @@ define([
Common.UI.info({
width: 500,
title: this.textNoLicenseTitle,
msg : this._state.licenseWarning,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
msg : license,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
@ -1088,7 +1097,9 @@ define([
this.appOptions.forcesave = this.appOptions.canForcesave;
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
this.appOptions.trialMode = params.asc_getLicenseMode();
this.appOptions.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
this.appOptions.isProtectSupport = true; // remove in 5.2
this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
this.appOptions.canEditContentControl = (this.permissions.modifyContentControl!==false);
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
if ( this.appOptions.isLightVersion ) {
@ -1382,6 +1393,10 @@ define([
console.warn(config.msg);
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -1403,6 +1418,10 @@ define([
Common.NotificationCenter.trigger('goback');
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
}
else {
Common.Gateway.reportWarning(id, config.msg);
@ -2191,7 +2210,6 @@ define([
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
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.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -2239,10 +2257,14 @@ define([
txtOddPage: "Odd Page ",
txtSameAsPrev: "Same as Previous",
txtCurrentDocument: "Current Document",
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
txtNoTableOfContents: "No table of contents entries found.",
txtTableOfContents: "Table of Contents",
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later."
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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.'
}
})(), DE.Controllers.Main || {}))
});

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

@ -142,7 +142,8 @@ define([
Asc.c_oAscFileType.RTF,
Asc.c_oAscFileType.ODT,
Asc.c_oAscFileType.DOCX,
Asc.c_oAscFileType.HTML
Asc.c_oAscFileType.HTML,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
@ -2725,7 +2726,7 @@ define([
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.isOffline ) {
if ( config.isProtectSupport && config.isOffline ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();

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

@ -501,7 +501,11 @@ define([
stylesStore.reset(stylearray, {silent: false});
}
}
} else {
this.cmbChartStyle.menuPicker.store.reset();
this.cmbChartStyle.clearComboView();
}
this.cmbChartStyle.setDisabled(!styles || styles.length<1 || this._locked);
},
setLocked: function (locked) {

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

@ -2862,6 +2862,7 @@ define([
var control_props = me.api.asc_GetContentControlProperties(),
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
menuTableControlSettings.setVisible(me.mode.canEditContentControl);
}
menuTableTOC.setVisible(in_toc);
},
@ -3402,7 +3403,7 @@ define([
var in_toc = me.api.asc_GetTableOfContentsPr(true),
in_control = !in_toc && me.api.asc_IsContentControl() ;
menuParaRemoveControl.setVisible(in_control);
menuParaControlSettings.setVisible(in_control);
menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl);
menuParaControlSeparator.setVisible(in_control);
if (in_control) {
var control_props = me.api.asc_GetContentControlProperties(),

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

@ -54,6 +54,7 @@ define([
formats: [[
{name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
{name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
{name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT}
],[
// {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC},

2
apps/documenteditor/main/app/view/ParagraphSettings.js
View file

@ -168,7 +168,6 @@ define([
this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this));
$(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this));
$(this.el).on('click', '#paragraph-color-new', _.bind(this.addNewColor, this));
this.TextOnlySettings = $('.text-only');
},
@ -453,6 +452,7 @@ define([
transparent: true
});
this.mnuColorPicker.on('select', _.bind(this.onColorPickerSelect, this));
this.btnColor.menu.items[1].on('click', _.bind(this.addNewColor, this));
}
this.mnuColorPicker.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},

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

@ -1586,7 +1586,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1605,7 +1605,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1624,7 +1624,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1643,7 +1643,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1662,7 +1662,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

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

@ -652,7 +652,7 @@ define([
el: $('#table-border-color-menu')
});
this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#table-border-color-new', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -670,7 +670,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#table-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

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

@ -1080,7 +1080,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1099,7 +1099,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1119,7 +1119,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

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

@ -2002,6 +2002,8 @@ define([
this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge);
this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles);
this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl);
this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl);
},
onSendThemeColorSchemes: function (schemas) {
@ -2215,7 +2217,7 @@ define([
tipLineSpace: 'Paragraph Line Spacing',
tipPrColor: 'Background color',
tipInsertTable: 'Insert Table',
tipInsertImage: 'Insert Picture',
tipInsertImage: 'Insert Image',
tipPageBreak: 'Insert Page or Section break',
tipInsertNum: 'Insert Page Number',
tipClearStyle: 'Clear Style',
@ -2225,8 +2227,8 @@ define([
tipBack: 'Back',
tipInsertShape: 'Insert Autoshape',
tipInsertEquation: 'Insert Equation',
mniImageFromFile: 'Picture from file',
mniImageFromUrl: 'Picture from url',
mniImageFromFile: 'Image from file',
mniImageFromUrl: 'Image from url',
mniCustomTable: 'Insert Custom Table',
textTitleError: 'Error',
textInsertPageNumber: 'Insert page number',
@ -2317,7 +2319,7 @@ define([
textCharts: 'Charts',
tipChangeChart: 'Change Chart Type',
capBtnInsPagebreak: 'Page Break',
capBtnInsImage: 'Picture',
capBtnInsImage: 'Image',
capBtnInsTable: 'Table',
capBtnInsChart: 'Chart',
textTabFile: 'File',

1
apps/documenteditor/main/index.html
View file

@ -264,6 +264,7 @@
<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/docx.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdf.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdfa.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/txt.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/odt.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/rtf.svg">

1
apps/documenteditor/main/index.html.deploy
View file

@ -285,6 +285,7 @@
<inline src="resources/img/header/buttons.svg" />
<inline src="resources/img/doc-formats/docx.svg" />
<inline src="resources/img/doc-formats/pdf.svg" />
<inline src="resources/img/doc-formats/pdfa.svg" />
<inline src="resources/img/doc-formats/txt.svg" />
<inline src="resources/img/doc-formats/odt.svg" />
<inline src="resources/img/doc-formats/rtf.svg" />

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

@ -217,7 +217,7 @@
"Common.Views.Protection.txtEncrypt": "Verschlüsseln",
"Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu",
"Common.Views.Protection.txtSignature": "Signatur",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen",
"Common.Views.RenameDialog.cancelButtonText": "Abbrechen",
"Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Dateiname",
@ -322,8 +322,9 @@
"DE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
"DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
"DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
"DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -446,9 +447,11 @@
"DE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"DE.Controllers.Main.warnBrowserIE9": "Die Applkation hat geringte Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
"DE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.",
"DE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"DE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"DE.Controllers.Navigation.txtBeginning": "Anfang des Dokuments",
"DE.Controllers.Navigation.txtGotoBeginning": "Zum Anfang des Dokuments übergehnen",
@ -1413,8 +1416,10 @@
"DE.Views.PageSizeDialog.cancelButtonText": "Abbrechen",
"DE.Views.PageSizeDialog.okButtonText": "Ok",
"DE.Views.PageSizeDialog.textHeight": "Höhe",
"DE.Views.PageSizeDialog.textPreset": "Voreinstellung",
"DE.Views.PageSizeDialog.textTitle": "Seitenformat",
"DE.Views.PageSizeDialog.textWidth": "Breite",
"DE.Views.PageSizeDialog.txtCustom": "Benutzerdefinierte",
"DE.Views.ParagraphSettings.strLineHeight": "Zeilenabstand",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Absatzabstand",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Kein Abstand zwischen Absätzen gleicher Formatierung",

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

@ -217,7 +217,7 @@
"Common.Views.Protection.txtEncrypt": "Encrypt",
"Common.Views.Protection.txtInvisibleSignature": "Add digital signature",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Signature line",
"Common.Views.Protection.txtSignatureLine": "Add signature line",
"Common.Views.RenameDialog.cancelButtonText": "Cancel",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name",
@ -332,6 +332,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<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>",
"DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"DE.Controllers.Main.errorDataRange": "Incorrect data range.",
"DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -454,9 +455,11 @@
"DE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"DE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.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.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
@ -1421,6 +1424,7 @@
"DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
"DE.Views.PageSizeDialog.okButtonText": "Ok",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textPreset": "Preset",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
"DE.Views.PageSizeDialog.textPreset": "Preset",
@ -1753,7 +1757,7 @@
"DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
"DE.Views.Toolbar.capBtnInsEquation": "Equation",
"DE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
"DE.Views.Toolbar.capBtnInsImage": "Picture",
"DE.Views.Toolbar.capBtnInsImage": "Image",
"DE.Views.Toolbar.capBtnInsPagebreak": "Breaks",
"DE.Views.Toolbar.capBtnInsShape": "Shape",
"DE.Views.Toolbar.capBtnInsTable": "Table",
@ -1774,8 +1778,8 @@
"DE.Views.Toolbar.mniEditHeader": "Edit Header",
"DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders",
"DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters",
"DE.Views.Toolbar.mniImageFromFile": "Picture from File",
"DE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
"DE.Views.Toolbar.mniImageFromFile": "Image from File",
"DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
"DE.Views.Toolbar.strMenuNoFill": "No Fill",
"DE.Views.Toolbar.textArea": "Area",
"DE.Views.Toolbar.textAutoColor": "Automatic",
@ -1873,7 +1877,7 @@
"DE.Views.Toolbar.tipIncPrLeft": "Increase indent",
"DE.Views.Toolbar.tipInsertChart": "Insert chart",
"DE.Views.Toolbar.tipInsertEquation": "Insert equation",
"DE.Views.Toolbar.tipInsertImage": "Insert picture",
"DE.Views.Toolbar.tipInsertImage": "Insert image",
"DE.Views.Toolbar.tipInsertNum": "Insert Page Number",
"DE.Views.Toolbar.tipInsertShape": "Insert autoshape",
"DE.Views.Toolbar.tipInsertTable": "Insert table",

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

@ -1406,6 +1406,7 @@
"DE.Views.PageSizeDialog.textHeight": "Altura",
"DE.Views.PageSizeDialog.textTitle": "Tamaño de página",
"DE.Views.PageSizeDialog.textWidth": "Ancho",
"DE.Views.PageSizeDialog.txtCustom": "Personalizado",
"DE.Views.ParagraphSettings.strLineHeight": "Espaciado de línea",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Espaciado de Párafo ",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "No añadir intervalo entre párrafos del mismo estilo",

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

@ -1407,6 +1407,7 @@
"DE.Views.PageSizeDialog.textHeight": "Hauteur",
"DE.Views.PageSizeDialog.textTitle": "Taille de la page",
"DE.Views.PageSizeDialog.textWidth": "Largeur",
"DE.Views.PageSizeDialog.txtCustom": "Personnalisé",
"DE.Views.ParagraphSettings.strLineHeight": "Interligne",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Espacement de paragraphe",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Ne pas ajouter d'intervalle entre paragraphes du même style",

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

@ -7,14 +7,14 @@
"Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.",
"Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso",
"Common.Controllers.ExternalMergeEditor.textAnonymous": "Anonimo",
"Common.Controllers.ExternalMergeEditor.textClose": "Close",
"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.ReviewChanges.textAtLeast": "almeno",
"Common.Controllers.ReviewChanges.textAuto": "auto",
"Common.Controllers.ReviewChanges.textBaseline": "Baseline",
"Common.Controllers.ReviewChanges.textBold": "Bold",
"Common.Controllers.ReviewChanges.textBold": "Grassetto",
"Common.Controllers.ReviewChanges.textBreakBefore": "Page break before",
"Common.Controllers.ReviewChanges.textCaps": "Maiuscole",
"Common.Controllers.ReviewChanges.textCenter": "Align center",
@ -137,7 +137,7 @@
"Common.Views.ExternalDiagramEditor.textClose": "Chiudi",
"Common.Views.ExternalDiagramEditor.textSave": "Salva ed esci",
"Common.Views.ExternalDiagramEditor.textTitle": "Modifica grafico",
"Common.Views.ExternalMergeEditor.textClose": "Close",
"Common.Views.ExternalMergeEditor.textClose": "Chiudi",
"Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
"Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
"Common.Views.Header.labelCoUsersDescr": "È in corso la modifica del documento da parte di più utenti.",
@ -192,17 +192,18 @@
"Common.Views.OpenDialog.txtIncorrectPwd": "Password errata",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtPreview": "Anteprima",
"Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.",
"Common.Views.OpenDialog.txtTitle": "Seleziona parametri %1",
"Common.Views.OpenDialog.txtTitleProtected": "File protetto",
"Common.Views.PasswordDialog.cancelButtonText": "Annulla",
"Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento",
"Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde",
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Ripeti password",
"Common.Views.PasswordDialog.txtTitle": "Imposta password",
"Common.Views.PluginDlg.textLoading": "Caricamento",
"Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi",
"Common.Views.Plugins.groupCaption": "Plugin",
"Common.Views.Plugins.strPlugins": "Plugin",
"Common.Views.Plugins.textLoading": "Caricamento",
"Common.Views.Plugins.textStart": "Avvio",
@ -241,7 +242,7 @@
"Common.Views.ReviewChanges.txtAcceptChanges": "Accetta modifiche",
"Common.Views.ReviewChanges.txtAcceptCurrent": "Accetta la modifica corrente",
"Common.Views.ReviewChanges.txtChat": "Chat",
"Common.Views.ReviewChanges.txtClose": "Close",
"Common.Views.ReviewChanges.txtClose": "Chiudi",
"Common.Views.ReviewChanges.txtCoAuthMode": "Modalità di co-editing",
"Common.Views.ReviewChanges.txtDocLang": "Lingua",
"Common.Views.ReviewChanges.txtFinal": "Tutti i cambiamenti accettati (anteprima)",
@ -306,6 +307,7 @@
"DE.Controllers.LeftMenu.textReplaceSkipped": "La sostituzione è stata effettuata. {0} occorrenze sono state saltate.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "La ricerca è stata effettuata. Occorrenze sostituite: {0}",
"DE.Controllers.LeftMenu.warnDownloadAs": "Se continua a salvare in questo formato tutte le caratteristiche tranne il testo saranno perse.<br>Sei sicuro di voler continuare?",
"DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se si continua a salvare in questo formato, parte della formattazione potrebbe andare persa.<br>Vuoi continuare?",
"DE.Controllers.Main.applyChangesTextText": "Caricamento delle modifiche in corso...",
"DE.Controllers.Main.applyChangesTitleText": "Caricamento delle modifiche",
"DE.Controllers.Main.convertationTimeoutText": "E' stato superato il tempo limite della conversione.",
@ -322,6 +324,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
"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>",
"DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
"DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -363,7 +366,7 @@
"DE.Controllers.Main.printTitleText": "Stampa del documento",
"DE.Controllers.Main.reloadButtonText": "Ricarica pagina",
"DE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questo documento. Si prega di provare più tardi.",
"DE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato",
"DE.Controllers.Main.requestEditFailedTitleText": "Accesso negato",
"DE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file",
"DE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ",
"DE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...",
@ -444,10 +447,14 @@
"DE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"DE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente",
"DE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.",
"DE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei. <br> Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"DE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.",
"DE.Controllers.Navigation.txtBeginning": "Inizio del documento",
"DE.Controllers.Navigation.txtGotoBeginning": "Vai all'inizio del documento",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
"DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
"DE.Controllers.Statusbar.tipReview": "Traccia cambiamenti",
@ -704,7 +711,7 @@
"DE.Controllers.Toolbar.txtSymbol_about": "Approssimativamente",
"DE.Controllers.Toolbar.txtSymbol_additional": "Complement",
"DE.Controllers.Toolbar.txtSymbol_aleph": "Alef",
"DE.Controllers.Toolbar.txtSymbol_alpha": "Alpha",
"DE.Controllers.Toolbar.txtSymbol_alpha": "Alfa",
"DE.Controllers.Toolbar.txtSymbol_approx": "Quasi uguale a",
"DE.Controllers.Toolbar.txtSymbol_ast": "Operatore asterisco",
"DE.Controllers.Toolbar.txtSymbol_beta": "Beta",
@ -790,8 +797,11 @@
"DE.Controllers.Viewport.textFitPage": "Adatta alla pagina",
"DE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza",
"DE.Views.BookmarksDialog.textAdd": "Aggiungi",
"DE.Views.BookmarksDialog.textBookmarkName": "Nome segnalibro",
"DE.Views.BookmarksDialog.textClose": "Chiudi",
"DE.Views.BookmarksDialog.textDelete": "Elimina",
"DE.Views.BookmarksDialog.textGoto": "Vai a",
"DE.Views.BookmarksDialog.textHidden": "Segnalibri nascosti",
"DE.Views.BookmarksDialog.textLocation": "Percorso",
"DE.Views.BookmarksDialog.textName": "Nome",
"DE.Views.BookmarksDialog.textSort": "Ordina per",
@ -886,7 +896,7 @@
"DE.Views.DocumentHolder.removeHyperlinkText": "Elimina collegamento ipertestuale",
"DE.Views.DocumentHolder.rightText": "A destra",
"DE.Views.DocumentHolder.rowText": "Riga",
"DE.Views.DocumentHolder.saveStyleText": "Create new style",
"DE.Views.DocumentHolder.saveStyleText": "Crea nuovo stile",
"DE.Views.DocumentHolder.selectCellText": "Seleziona cella",
"DE.Views.DocumentHolder.selectColumnText": "Seleziona colonna",
"DE.Views.DocumentHolder.selectRowText": "Seleziona riga",
@ -921,6 +931,7 @@
"DE.Views.DocumentHolder.textNextPage": "Pagina successiva",
"DE.Views.DocumentHolder.textPaste": "Incolla",
"DE.Views.DocumentHolder.textPrevPage": "Pagina precedente",
"DE.Views.DocumentHolder.textRefreshField": "Aggiorna campo",
"DE.Views.DocumentHolder.textRemove": "Elimina",
"DE.Views.DocumentHolder.textRemoveControl": "Rimuovi il controllo del contenuto",
"DE.Views.DocumentHolder.textReplace": "Sostituisci immagine",
@ -932,6 +943,7 @@
"DE.Views.DocumentHolder.textShapeAlignRight": "Allinea a destra",
"DE.Views.DocumentHolder.textShapeAlignTop": "Allinea in alto",
"DE.Views.DocumentHolder.textTOC": "Sommario",
"DE.Views.DocumentHolder.textTOCSettings": "Impostazioni sommario",
"DE.Views.DocumentHolder.textUndo": "Annulla",
"DE.Views.DocumentHolder.textUpdateAll": "Aggiorna intera tabella",
"DE.Views.DocumentHolder.textUpdatePages": "Aggiorna solo numeri di pagina",
@ -1080,7 +1092,7 @@
"DE.Views.FileMenu.btnRenameCaption": "Rinomina...",
"DE.Views.FileMenu.btnReturnCaption": "Torna al documento",
"DE.Views.FileMenu.btnRightsCaption": "Diritti di accesso...",
"DE.Views.FileMenu.btnSaveAsCaption": "Salva con",
"DE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome",
"DE.Views.FileMenu.btnSaveCaption": "Salva",
"DE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...",
"DE.Views.FileMenu.btnToEditCaption": "Modifica documento",
@ -1183,11 +1195,14 @@
"DE.Views.HyperlinkSettingsDialog.textDefault": "Testo selezionato",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Visualizza",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Collegamento esterno",
"DE.Views.HyperlinkSettingsDialog.textInternal": "Inserisci nel documento",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Impostazioni collegamento ipertestuale",
"DE.Views.HyperlinkSettingsDialog.textTooltip": "Testo del suggerimento",
"DE.Views.HyperlinkSettingsDialog.textUrl": "Collega a",
"DE.Views.HyperlinkSettingsDialog.txtBeginning": "Inizio del documento",
"DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Segnalibri",
"DE.Views.HyperlinkSettingsDialog.txtEmpty": "Questo campo è richiesto",
"DE.Views.HyperlinkSettingsDialog.txtHeadings": "Intestazioni",
"DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Il formato URL richiesto è \"http://www.example.com\"",
"DE.Views.ImageSettings.textAdvanced": "Mostra impostazioni avanzate",
"DE.Views.ImageSettings.textEdit": "Modifica",
@ -1280,6 +1295,7 @@
"DE.Views.LeftMenu.tipAbout": "Informazioni su",
"DE.Views.LeftMenu.tipChat": "Chat",
"DE.Views.LeftMenu.tipComments": "Commenti",
"DE.Views.LeftMenu.tipNavigation": "Navigazione",
"DE.Views.LeftMenu.tipPlugins": "Plugin",
"DE.Views.LeftMenu.tipSearch": "Ricerca",
"DE.Views.LeftMenu.tipSupport": "Feedback & Support",
@ -1300,6 +1316,7 @@
"DE.Views.Links.textGotoFootnote": "Passa alle note a piè di pagina",
"DE.Views.Links.textUpdateAll": "Aggiorna intera tabella",
"DE.Views.Links.textUpdatePages": "Aggiorna solo numeri di pagina",
"DE.Views.Links.tipBookmarks": "Crea un segnalibro",
"DE.Views.Links.tipContents": "Inserisci Sommario",
"DE.Views.Links.tipContentsUpdate": "Aggiorna Sommario",
"DE.Views.Links.tipInsertHyperlink": "Aggiungi collegamento ipertestuale",
@ -1357,7 +1374,16 @@
"DE.Views.MailMergeSettings.txtUntitled": "Untitled",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
"DE.Views.Navigation.txtCollapse": "Comprimi tutto",
"DE.Views.Navigation.txtDemote": "Retrocedere",
"DE.Views.Navigation.txtEmpty": "Questo documento non contiene intestazioni",
"DE.Views.Navigation.txtEmptyItem": "Intestazione vuota",
"DE.Views.Navigation.txtExpand": "Espandi tutto",
"DE.Views.Navigation.txtExpandToLevel": "Espandi al livello",
"DE.Views.Navigation.txtHeadingAfter": "Nuova intestazione dopo",
"DE.Views.Navigation.txtHeadingBefore": "Nuova intestazione prima",
"DE.Views.Navigation.txtNewHeading": "Nuovo sottotitolo",
"DE.Views.Navigation.txtPromote": "Promuovere",
"DE.Views.Navigation.txtSelect": "Scegli contenuto",
"DE.Views.NoteSettingsDialog.textApply": "Applica",
"DE.Views.NoteSettingsDialog.textApplyTo": "Applica modifiche a",
"DE.Views.NoteSettingsDialog.textCancel": "Annulla",
@ -1390,8 +1416,10 @@
"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.txtCustom": "Personalizzato",
"DE.Views.ParagraphSettings.strLineHeight": "Interlinea",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Non aggiungere intervallo tra paragrafi dello stesso stile",
@ -1544,7 +1572,7 @@
"DE.Views.Statusbar.tipZoomIn": "Zoom avanti",
"DE.Views.Statusbar.tipZoomOut": "Zoom indietro",
"DE.Views.Statusbar.txtPageNumInvalid": "Numero pagina non valido",
"DE.Views.StyleTitleDialog.textHeader": "Create New Style",
"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",
@ -1637,7 +1665,7 @@
"DE.Views.TableSettingsAdvanced.textBorderWidth": "Dimensioni bordo",
"DE.Views.TableSettingsAdvanced.textBottom": "In basso",
"DE.Views.TableSettingsAdvanced.textCellOptions": "Opzioni della cella",
"DE.Views.TableSettingsAdvanced.textCellProps": "Celle",
"DE.Views.TableSettingsAdvanced.textCellProps": "Cella",
"DE.Views.TableSettingsAdvanced.textCellSize": "Dimensioni cella",
"DE.Views.TableSettingsAdvanced.textCenter": "Al centro",
"DE.Views.TableSettingsAdvanced.textCenterTooltip": "Al centro",
@ -1793,7 +1821,7 @@
"DE.Views.Toolbar.textStrikeout": "Barrato",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
"DE.Views.Toolbar.textStyleMenuNew": "New style from selection",
"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",
@ -1805,6 +1833,7 @@
"DE.Views.Toolbar.textTabHome": "Home",
"DE.Views.Toolbar.textTabInsert": "Inserisci",
"DE.Views.Toolbar.textTabLayout": "Layout di Pagina",
"DE.Views.Toolbar.textTabLinks": "Riferimenti",
"DE.Views.Toolbar.textTabProtect": "Protezione",
"DE.Views.Toolbar.textTabReview": "Revisione",
"DE.Views.Toolbar.textTitleError": "Errore",

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

@ -1406,6 +1406,7 @@
"DE.Views.PageSizeDialog.textHeight": "높이",
"DE.Views.PageSizeDialog.textTitle": "페이지 크기",
"DE.Views.PageSizeDialog.textWidth": "너비",
"DE.Views.PageSizeDialog.txtCustom": "사용자 정의",
"DE.Views.ParagraphSettings.strLineHeight": "줄 간격",
"DE.Views.ParagraphSettings.strParagraphSpacing": "단락 간격",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "같은 스타일의 단락 사이에 간격을 추가하지 마십시오.",

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

@ -1403,6 +1403,7 @@
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
"DE.Views.PageSizeDialog.txtCustom": "Personalizēts",
"DE.Views.ParagraphSettings.strLineHeight": "Rindstarpas",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Atstatums",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Nepievienojiet intervālu starp rindkopam vienā stila",

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

@ -1412,6 +1412,7 @@
"DE.Views.PageSizeDialog.textHeight": "Hoogte",
"DE.Views.PageSizeDialog.textTitle": "Paginaformaat",
"DE.Views.PageSizeDialog.textWidth": "Breedte",
"DE.Views.PageSizeDialog.txtCustom": "Aangepast",
"DE.Views.ParagraphSettings.strLineHeight": "Regelafstand",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Afstand tussen alinea's",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Geen interval toevoegen tussen alinea's met dezelfde stijl",

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

@ -217,7 +217,7 @@
"Common.Views.Protection.txtEncrypt": "Шифровать",
"Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись",
"Common.Views.Protection.txtSignature": "Подпись",
"Common.Views.Protection.txtSignatureLine": "Строка подписи",
"Common.Views.Protection.txtSignatureLine": "Добавить строку подписи",
"Common.Views.RenameDialog.cancelButtonText": "Отмена",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "Имя файла",
@ -324,6 +324,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
"DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
"DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
"DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
@ -446,9 +447,11 @@
"DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"DE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.",
"DE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0.",
"DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"DE.Controllers.Navigation.txtBeginning": "Начало документа",
"DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
@ -1413,8 +1416,10 @@
"DE.Views.PageSizeDialog.cancelButtonText": "Отмена",
"DE.Views.PageSizeDialog.okButtonText": "Ok",
"DE.Views.PageSizeDialog.textHeight": "Высота",
"DE.Views.PageSizeDialog.textPreset": "Предустановка",
"DE.Views.PageSizeDialog.textTitle": "Размер страницы",
"DE.Views.PageSizeDialog.textWidth": "Ширина",
"DE.Views.PageSizeDialog.txtCustom": "Особый",
"DE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами",
"DE.Views.ParagraphSettings.strSomeParagraphSpace": "Не добавлять интервал между абзацами одного стиля",

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

@ -268,7 +268,7 @@
"DE.Controllers.Main.textCloseTip": "点击关闭提示",
"DE.Controllers.Main.textContactUs": "联系销售",
"DE.Controllers.Main.textLoadingDocument": "文件加载中…",
"DE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本",
"DE.Controllers.Main.textShape": "形状",
"DE.Controllers.Main.textStrict": "严格模式",
"DE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。",
@ -290,6 +290,22 @@
"DE.Controllers.Main.txtRectangles": "矩形",
"DE.Controllers.Main.txtSeries": "系列",
"DE.Controllers.Main.txtStarsRibbons": "星星和丝带",
"DE.Controllers.Main.txtStyle_Heading_1": "标题1",
"DE.Controllers.Main.txtStyle_Heading_2": "标题2",
"DE.Controllers.Main.txtStyle_Heading_3": "标题3",
"DE.Controllers.Main.txtStyle_Heading_4": "标题4",
"DE.Controllers.Main.txtStyle_Heading_5": "标题5",
"DE.Controllers.Main.txtStyle_Heading_6": "标题6",
"DE.Controllers.Main.txtStyle_Heading_7": "标题7",
"DE.Controllers.Main.txtStyle_Heading_8": "标题8",
"DE.Controllers.Main.txtStyle_Heading_9": "标题9",
"DE.Controllers.Main.txtStyle_Intense_Quote": "直接引用",
"DE.Controllers.Main.txtStyle_List_Paragraph": "排列段落",
"DE.Controllers.Main.txtStyle_No_Spacing": "无空格",
"DE.Controllers.Main.txtStyle_Normal": "正常",
"DE.Controllers.Main.txtStyle_Quote": "引用",
"DE.Controllers.Main.txtStyle_Subtitle": "副标题",
"DE.Controllers.Main.txtStyle_Title": "标题",
"DE.Controllers.Main.txtXAxis": "X轴",
"DE.Controllers.Main.txtYAxis": "Y轴",
"DE.Controllers.Main.unknownErrorText": "示知错误",
@ -667,6 +683,7 @@
"DE.Views.ChartSettings.txtTight": "紧",
"DE.Views.ChartSettings.txtTitle": "图表",
"DE.Views.ChartSettings.txtTopAndBottom": "上下",
"DE.Views.ControlSettingsDialog.textName": "标题",
"DE.Views.DocumentHolder.aboveText": "以上",
"DE.Views.DocumentHolder.addCommentText": "发表评论",
"DE.Views.DocumentHolder.advancedFrameText": "框架高级设置",

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

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: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

6
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -271,6 +271,7 @@
.box-shadow(none);
margin: 0;
font-size: 12px;
float: none;
&:not(.header-name) {
&:hover,
@ -286,11 +287,12 @@
}
.help-item-wrap {
padding: 7px 2px 7px 20px;
padding: 4px 2px 4px 20px;
}
.header-name {
padding: 7px 2px 7px 10px;
padding: 16px 2px 4px 10px;
font-size: 12px;
}
}
}

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

@ -80,7 +80,7 @@ define([
usersCount : 1,
fastCoauth : true,
lostEditingRights : false,
licenseWarning : false
licenseType : false
};
// Initialize viewport
@ -583,17 +583,37 @@ define([
onLicenseChanged: function(params) {
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady && this._state.licenseWarning)
if (this._isDocReady && this._state.licenseType)
this.applyLicense();
},
applyLicense: function() {
var me = this;
if (me._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = [{text: 'OK'}];
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}];
}
DE.getController('Toolbar').activateViewControls();
DE.getController('Toolbar').deactivateEditControls();
Common.NotificationCenter.trigger('api:disconnect');
@ -606,22 +626,8 @@ define([
Common.localStorage.setItem("de-license-warning", now);
uiApp.modal({
title: me.textNoLicenseTitle,
text : me._state.licenseWarning,
buttons: [
{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}
]
text : license,
buttons: buttons
});
}
} else
@ -871,6 +877,10 @@ define([
config.msg = this.errorBadImageUrl;
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -891,6 +901,10 @@ define([
Common.NotificationCenter.trigger('goback');
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
}
else {
Common.Gateway.reportWarning(id, config.msg);
@ -1287,7 +1301,6 @@ define([
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1328,8 +1341,12 @@ define([
txtStyle_footnote_text: 'Footnote Text',
txtHeader: "Header",
txtFooter: "Footer",
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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'
}
})(), DE.Controllers.Main || {}))

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

@ -54,8 +54,9 @@
"DE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments",
"DE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
"DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"DE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
"DE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"DE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"DE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"DE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -149,9 +150,11 @@
"DE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.",
"DE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...",
"DE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"DE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"DE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"DE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"DE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.",
"DE.Controllers.Search.textReplaceAll": "Alle ersetzen",

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

@ -54,8 +54,9 @@
"DE.Controllers.Main.downloadTitleText": "Downloading Document",
"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>",
"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>",
"DE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
"DE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"DE.Controllers.Main.errorDataRange": "Incorrect data range.",
"DE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -149,9 +150,11 @@
"DE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.",
"DE.Controllers.Main.uploadImageTextText": "Uploading image...",
"DE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"DE.Controllers.Main.warnLicenseExceeded": "The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.<br>Please contact your administrator for more information.",
"DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"DE.Controllers.Main.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.",
"DE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"DE.Controllers.Main.closeButtonText": "Close File",
"DE.Controllers.Search.textNoTextFound": "Text not Found",

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

@ -54,8 +54,9 @@
"DE.Controllers.Main.downloadTitleText": "Scaricamento del documento",
"DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.",
"DE.Controllers.Main.errorConnectToServer": "Impossibile salvare il documento. Si prega di verificare i parametri di connessione o rivolgersi all'amministratore.<br>Una volta cliccato il pulsante 'OK', si verrà invitati a scaricare il documento.<br><br>Puoi trovare maggiori informazioni sulla connessione al Server dei Documenti <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">qui</a>",
"DE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">clicca qui</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
"DE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"DE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"DE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"DE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -149,7 +150,9 @@
"DE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima per l'immagine.",
"DE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...",
"DE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"DE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"DE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"DE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei. <br> Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.",
"DE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.",
@ -343,7 +346,7 @@
"DE.Views.Search.textHighlight": "Evidenzia risultati",
"DE.Views.Search.textReplace": "Sostituisci",
"DE.Views.Search.textSearch": "Cerca",
"DE.Views.Settings.textAbout": "A proposito",
"DE.Views.Settings.textAbout": "Informazioni su",
"DE.Views.Settings.textAddress": "indirizzo",
"DE.Views.Settings.textAuthor": "Autore",
"DE.Views.Settings.textBack": "Indietro",

11
apps/documenteditor/mobile/locale/ru.json
View file

@ -56,6 +56,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
"DE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
"DE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
"DE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"DE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"DE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
@ -149,9 +150,11 @@
"DE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
"DE.Controllers.Main.uploadImageTextText": "Загрузка изображения...",
"DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"DE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"DE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"DE.Controllers.Search.textNoTextFound": "Текст не найден",
"DE.Controllers.Search.textReplaceAll": "Заменить все",
@ -338,7 +341,7 @@
"DE.Views.EditText.textSubscript": "Подстрочные",
"DE.Views.Search.textCase": "С учетом регистра",
"DE.Views.Search.textDone": "Готово",
"DE.Views.Search.textFind": "Найти",
"DE.Views.Search.textFind": "Поиск",
"DE.Views.Search.textFindAndReplace": "Поиск и замена",
"DE.Views.Search.textHighlight": "Выделить результаты",
"DE.Views.Search.textReplace": "Заменить",
@ -359,7 +362,7 @@
"DE.Views.Settings.textDownloadAs": "Скачать как...",
"DE.Views.Settings.textEditDoc": "Редактировать",
"DE.Views.Settings.textEmail": "email",
"DE.Views.Settings.textFind": "Найти",
"DE.Views.Settings.textFind": "Поиск",
"DE.Views.Settings.textFindAndReplace": "Поиск и замена",
"DE.Views.Settings.textFormat": "Формат",
"DE.Views.Settings.textHelp": "Справка",

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

@ -107,7 +107,7 @@
"DE.Controllers.Main.textContactUs": "联系销售",
"DE.Controllers.Main.textDone": "完成",
"DE.Controllers.Main.textLoadingDocument": "文件加载中…",
"DE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本",
"DE.Controllers.Main.textOK": "确定",
"DE.Controllers.Main.textPassword": "密码",
"DE.Controllers.Main.textPreloader": "载入中……",

53
apps/presentationeditor/main/app/controller/Main.js
View file

@ -102,7 +102,7 @@ define([
onLaunch: function() {
var me = this;
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
this.languages = null;
this.translationTable = [];
@ -385,7 +385,8 @@ define([
_supported = [
Asc.c_oAscFileType.PPTX,
Asc.c_oAscFileType.ODP,
Asc.c_oAscFileType.PDF
Asc.c_oAscFileType.PDF,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
@ -759,16 +760,27 @@ define([
onLicenseChanged: function(params) {
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady)
this.applyLicense();
},
applyLicense: function() {
if (this._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = ['ok'],
primary = 'ok';
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}];
primary = 'buynow';
}
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect');
@ -780,12 +792,9 @@ define([
Common.UI.info({
width: 500,
title: this.textNoLicenseTitle,
msg : this._state.licenseWarning,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
msg : license,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
@ -852,7 +861,8 @@ define([
this.appOptions.forcesave = this.appOptions.canForcesave;
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
this.appOptions.trialMode = params.asc_getLicenseMode();
this.appOptions.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
this.appOptions.isProtectSupport = true; // remove in 5.2
this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
@ -1126,6 +1136,10 @@ define([
console.warn(config.msg);
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -1149,6 +1163,10 @@ define([
}
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
}
else {
Common.Gateway.reportWarning(id, config.msg);
@ -1977,7 +1995,6 @@ define([
textStrict: 'Strict mode',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
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.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -2010,7 +2027,6 @@ define([
saveTextText: 'Saving document...',
txtLoading: 'Loading...',
txtAddNotes: 'Click to add notes',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
txtAddFirstSlide: 'Click to add first slide',
txtTheme_blank: 'Blank',
@ -2023,7 +2039,12 @@ define([
txtTheme_safari: 'Safari',
txtTheme_dotted: 'Dotted',
txtTheme_corner: 'Corner',
txtTheme_turtle: 'Turtle'
txtTheme_turtle: 'Turtle',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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.'
}
})(), PE.Controllers.Main || {}))
});

5
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -149,7 +149,8 @@ define([
var _supported = [
Asc.c_oAscFileType.PPTX,
Asc.c_oAscFileType.ODP
Asc.c_oAscFileType.ODP,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
@ -2017,7 +2018,7 @@ define([
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.isOffline ) {
if ( config.isProtectSupport && config.isOffline ) { // don't add protect panel to toolbar
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel)

4
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -430,7 +430,11 @@ define([
stylesStore.reset(stylearray, {silent: false});
}
}
} else {
this.cmbChartStyle.menuPicker.store.reset();
this.cmbChartStyle.clearComboView();
}
this.cmbChartStyle.setDisabled(!styles || styles.length<1 || this._locked);
},
onWidthChange: function(field, newValue, oldValue, eOpts){

1
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -55,6 +55,7 @@ define([
formats: [[
{name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
{name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA},
{name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP}
]],

10
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -1458,7 +1458,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1477,7 +1477,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1496,7 +1496,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1515,7 +1515,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1534,7 +1534,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

8
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -1011,7 +1011,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#slide-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1030,7 +1030,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#slide-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1049,7 +1049,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#slide-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1068,7 +1068,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#slide-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

4
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -628,7 +628,7 @@ define([
el: $('#table-border-color-menu')
});
this.borderColor.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#table-border-color-new', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.borderColor, this.btnBorderColor));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -646,7 +646,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#table-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
}
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

10
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -1483,7 +1483,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1502,7 +1502,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#textart-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1521,7 +1521,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#textart-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1540,7 +1540,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1559,7 +1559,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1657,9 +1657,9 @@ define([
tipIncPrLeft: 'Increase Indent',
tipLineSpace: 'Line Spacing',
tipInsertTable: 'Insert Table',
tipInsertImage: 'Insert Picture',
mniImageFromFile: 'Picture from file',
mniImageFromUrl: 'Picture from url',
tipInsertImage: 'Insert Image',
mniImageFromFile: 'Image from file',
mniImageFromUrl: 'Image from url',
mniCustomTable: 'Insert Custom Table',
tipInsertHyperlink: 'Add Hyperlink',
tipInsertText: 'Insert Text',
@ -1732,7 +1732,7 @@ define([
tipChangeChart: 'Change Chart Type',
capInsertText: 'Text',
capInsertTextArt: 'Text Art',
capInsertImage: 'Picture',
capInsertImage: 'Image',
capInsertShape: 'Shape',
capInsertTable: 'Table',
capInsertChart: 'Chart',

1
apps/presentationeditor/main/index.html
View file

@ -263,6 +263,7 @@
<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pptx.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdf.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdfa.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/odp.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">
<script>

1
apps/presentationeditor/main/index.html.deploy
View file

@ -285,6 +285,7 @@
<inline src="resources/img/header/buttons.svg" />
<inline src="resources/img/doc-formats/pptx.svg" />
<inline src="resources/img/doc-formats/pdf.svg" />
<inline src="resources/img/doc-formats/pdfa.svg" />
<inline src="resources/img/doc-formats/odp.svg" />
<inline src="resources/img/doc-formats/blank.svg" />

2
apps/presentationeditor/main/index.reporter.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html style="width:100%; height:100%;">
<html style="width:100%; height:100%;overflow: hidden;">
<head>
<title>ONLYOFFICE Presentation Editor</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

2
apps/presentationeditor/main/index.reporter.html.deploy
View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html style="width:100%; height:100%;">
<html style="width:100%; height:100%;overflow: hidden;">
<head>
<title>ONLYOFFICE Presentation Editor</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

11
apps/presentationeditor/main/locale/de.json
View file

@ -149,7 +149,7 @@
"Common.Views.Protection.txtEncrypt": "Verschlüsseln",
"Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu",
"Common.Views.Protection.txtSignature": "Signatur",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen",
"Common.Views.RenameDialog.cancelButtonText": "Abbrechen",
"Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Dateiname",
@ -236,8 +236,9 @@
"PE.Controllers.Main.errorAccessDeny": "Sie haben versucht die Änderungen im Dokument, zu dem Sie keine Berechtigungen haben, vorzunehemen.<br>Wenden Sie sich an Ihren Serveradministrator.",
"PE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server verloren. Das Dokument kann momentan nicht bearbeitet werden.",
"PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
"PE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -385,9 +386,11 @@
"PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"PE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
"PE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.",
"PE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "Die Schriftart, die Sie verwenden wollen, ist auf diesem Gerät nicht verfügbar.<br>Der Textstil wird mit einer der Systemschriften angezeigt, die gespeicherte Schriftart wird verwendet, wenn sie verfügbar ist.<br>Wollen Sie fortsetzen?",

21
apps/presentationeditor/main/locale/en.json
View file

@ -149,7 +149,7 @@
"Common.Views.Protection.txtEncrypt": "Encrypt",
"Common.Views.Protection.txtInvisibleSignature": "Add digital signature",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Signature line",
"Common.Views.Protection.txtSignatureLine": "Add signature line",
"Common.Views.RenameDialog.cancelButtonText": "Cancel",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name",
@ -246,6 +246,7 @@
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.",
"PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<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>",
"PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"PE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"PE.Controllers.Main.errorDataRange": "Incorrect data range.",
"PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -393,9 +394,11 @@
"PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"PE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"PE.Controllers.Main.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.",
"PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.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.",
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
@ -1409,7 +1412,7 @@
"PE.Views.Toolbar.capInsertChart": "Chart",
"PE.Views.Toolbar.capInsertEquation": "Equation",
"PE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"PE.Views.Toolbar.capInsertImage": "Picture",
"PE.Views.Toolbar.capInsertImage": "Image",
"PE.Views.Toolbar.capInsertShape": "Shape",
"PE.Views.Toolbar.capInsertTable": "Table",
"PE.Views.Toolbar.capInsertText": "Text Box",
@ -1417,8 +1420,8 @@
"PE.Views.Toolbar.capTabHome": "Home",
"PE.Views.Toolbar.capTabInsert": "Insert",
"PE.Views.Toolbar.mniCustomTable": "Insert Custom Table",
"PE.Views.Toolbar.mniImageFromFile": "Picture from File",
"PE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
"PE.Views.Toolbar.mniImageFromFile": "Image from File",
"PE.Views.Toolbar.mniImageFromUrl": "Image from URL",
"PE.Views.Toolbar.mniSlideAdvanced": "Advanced Settings",
"PE.Views.Toolbar.mniSlideStandard": "Standard (4:3)",
"PE.Views.Toolbar.mniSlideWide": "Widescreen (16:9)",
@ -1452,8 +1455,8 @@
"PE.Views.Toolbar.textShapeAlignRight": "Align Right",
"PE.Views.Toolbar.textShapeAlignTop": "Align Top",
"PE.Views.Toolbar.textShowBegin": "Show from Beginning",
"PE.Views.Toolbar.textShowCurrent": "Show from Current slide",
"PE.Views.Toolbar.textShowPresenterView": "Show presenter view",
"PE.Views.Toolbar.textShowCurrent": "Show from Current Slide",
"PE.Views.Toolbar.textShowPresenterView": "Show Presenter View",
"PE.Views.Toolbar.textShowSettings": "Show Settings",
"PE.Views.Toolbar.textStock": "Stock",
"PE.Views.Toolbar.textStrikeout": "Strikethrough",
@ -1484,7 +1487,7 @@
"PE.Views.Toolbar.tipInsertChart": "Insert chart",
"PE.Views.Toolbar.tipInsertEquation": "Insert equation",
"PE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink",
"PE.Views.Toolbar.tipInsertImage": "Insert picture",
"PE.Views.Toolbar.tipInsertImage": "Insert image",
"PE.Views.Toolbar.tipInsertShape": "Insert autoshape",
"PE.Views.Toolbar.tipInsertTable": "Insert table",
"PE.Views.Toolbar.tipInsertText": "Insert text box",

29
apps/presentationeditor/main/locale/it.json
View file

@ -124,17 +124,18 @@
"Common.Views.OpenDialog.txtEncoding": "Codifica",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password errata",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.",
"Common.Views.OpenDialog.txtTitle": "Seleziona parametri %1",
"Common.Views.OpenDialog.txtTitleProtected": "File protetto",
"Common.Views.PasswordDialog.cancelButtonText": "Annulla",
"Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento",
"Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde",
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Ripeti password",
"Common.Views.PasswordDialog.txtTitle": "Imposta password",
"Common.Views.PluginDlg.textLoading": "Caricamento",
"Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi",
"Common.Views.Plugins.groupCaption": "Plugin",
"Common.Views.Plugins.strPlugins": "Plugin",
"Common.Views.Plugins.textLoading": "Caricamento",
"Common.Views.Plugins.textStart": "Avvio",
@ -237,6 +238,7 @@
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
"PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
"PE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -276,7 +278,7 @@
"PE.Controllers.Main.printTitleText": "Stampa della presentazione",
"PE.Controllers.Main.reloadButtonText": "Ricarica pagina",
"PE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questa presentazione. Si prega di provare più tardi.",
"PE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato",
"PE.Controllers.Main.requestEditFailedTitleText": "Accesso negato",
"PE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file",
"PE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ",
"PE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...",
@ -297,6 +299,7 @@
"PE.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.",
"PE.Controllers.Main.titleLicenseExp": "La licenza è scaduta",
"PE.Controllers.Main.titleServerVersion": "L'editor è stato aggiornato",
"PE.Controllers.Main.txtAddFirstSlide": "Fare click per aggiungere la prima diapositiva",
"PE.Controllers.Main.txtAddNotes": "Clicca per aggiungere note",
"PE.Controllers.Main.txtArt": "Your text here",
"PE.Controllers.Main.txtBasicShapes": "Figure di base",
@ -363,9 +366,15 @@
"PE.Controllers.Main.txtStarsRibbons": "Stelle e nastri",
"PE.Controllers.Main.txtTheme_blank": "Vuoto",
"PE.Controllers.Main.txtTheme_classic": "Classico",
"PE.Controllers.Main.txtTheme_corner": "angolo",
"PE.Controllers.Main.txtTheme_dotted": "Punteggiato",
"PE.Controllers.Main.txtTheme_green": "Verde",
"PE.Controllers.Main.txtTheme_lines": "Linee",
"PE.Controllers.Main.txtTheme_office": "Ufficio",
"PE.Controllers.Main.txtTheme_official": "Ufficiale",
"PE.Controllers.Main.txtTheme_pixel": "Pixel",
"PE.Controllers.Main.txtTheme_safari": "Safari",
"PE.Controllers.Main.txtTheme_turtle": "Turtle",
"PE.Controllers.Main.txtXAxis": "Asse X",
"PE.Controllers.Main.txtYAxis": "Asse Y",
"PE.Controllers.Main.unknownErrorText": "Errore sconosciuto.",
@ -377,7 +386,9 @@
"PE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"PE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente",
"PE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.",
"PE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"PE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"PE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"PE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.",
@ -571,10 +582,10 @@
"PE.Controllers.Toolbar.txtLimitLog_LogBase": "Logaritmo",
"PE.Controllers.Toolbar.txtLimitLog_Max": "Massimo",
"PE.Controllers.Toolbar.txtLimitLog_Min": "Minimo",
"PE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Matrice Vuota",
"PE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Matrice Vuota",
"PE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Matrice Vuota",
"PE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Matrice Vuota",
"PE.Controllers.Toolbar.txtMatrix_1_2": "1x2 Matrice vuota",
"PE.Controllers.Toolbar.txtMatrix_1_3": "1x3 Matrice vuota",
"PE.Controllers.Toolbar.txtMatrix_2_1": "2x1 Matrice vuota",
"PE.Controllers.Toolbar.txtMatrix_2_2": "2x2 Matrice vuota",
"PE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Matrice vuota con parentesi",
"PE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Matrice vuota con parentesi",
"PE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Matrice vuota con parentesi",
@ -914,7 +925,7 @@
"PE.Views.DocumentPreview.txtPlay": "Avvia presentazione",
"PE.Views.DocumentPreview.txtPrev": "Diapositiva precedente",
"PE.Views.DocumentPreview.txtReset": "Reimposta",
"PE.Views.FileMenu.btnAboutCaption": "Informazioni sul programma",
"PE.Views.FileMenu.btnAboutCaption": "Informazioni su",
"PE.Views.FileMenu.btnBackCaption": "Va' ai Documenti",
"PE.Views.FileMenu.btnCloseMenuCaption": "Chiudi il menù",
"PE.Views.FileMenu.btnCreateNewCaption": "Crea nuovo oggetto",
@ -927,7 +938,7 @@
"PE.Views.FileMenu.btnRenameCaption": "Rinomina...",
"PE.Views.FileMenu.btnReturnCaption": "Torna alla presentazione",
"PE.Views.FileMenu.btnRightsCaption": "Access Rights...",
"PE.Views.FileMenu.btnSaveAsCaption": "Salva con",
"PE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome",
"PE.Views.FileMenu.btnSaveCaption": "Salva",
"PE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...",
"PE.Views.FileMenu.btnToEditCaption": "Modifica presentazione",

9
apps/presentationeditor/main/locale/ru.json
View file

@ -149,7 +149,7 @@
"Common.Views.Protection.txtEncrypt": "Шифровать",
"Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись",
"Common.Views.Protection.txtSignature": "Подпись",
"Common.Views.Protection.txtSignatureLine": "Строка подписи",
"Common.Views.Protection.txtSignatureLine": "Добавить строку подписи",
"Common.Views.RenameDialog.cancelButtonText": "Отмена",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "Имя файла",
@ -238,6 +238,7 @@
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.",
"PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
"PE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
"PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
@ -385,9 +386,11 @@
"PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"PE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.",
"PE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0",
"PE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"PE.Controllers.Statusbar.zoomText": "Масштаб {0}%",
"PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы хотите сохранить, недоступен на этом устройстве.<br>Стиль текста будет отображаться с помощью одного из системных шрифтов. Сохраненный шрифт будет использоваться, когда он станет доступен.<br>Вы хотите продолжить?",

16
apps/presentationeditor/main/locale/zh.json
View file

@ -182,7 +182,7 @@
"PE.Controllers.Main.textCloseTip": "点击关闭提示",
"PE.Controllers.Main.textContactUs": "联系销售",
"PE.Controllers.Main.textLoadingDocument": "载入演示",
"PE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本",
"PE.Controllers.Main.textShape": "形状",
"PE.Controllers.Main.textStrict": "严格模式",
"PE.Controllers.Main.textTryUndoRedo": "对于快速的协同编辑模式，取消/重做功能是禁用的。< br >单击“严格模式”按钮切换到严格co-editing模式编辑该文件没有其他用户干扰和发送您的更改只后你拯救他们。您可以使用编辑器高级设置在编辑模式之间切换。",
@ -193,12 +193,20 @@
"PE.Controllers.Main.txtButtons": "按钮",
"PE.Controllers.Main.txtCallouts": "标注",
"PE.Controllers.Main.txtCharts": "图表",
"PE.Controllers.Main.txtClipArt": "剪贴画",
"PE.Controllers.Main.txtDateTime": "日期与时间",
"PE.Controllers.Main.txtDiagram": "SmartArt",
"PE.Controllers.Main.txtDiagramTitle": "图表标题",
"PE.Controllers.Main.txtEditingMode": "设置编辑模式..",
"PE.Controllers.Main.txtFiguredArrows": "图形箭头",
"PE.Controllers.Main.txtFooter": "页脚",
"PE.Controllers.Main.txtHeader": "头",
"PE.Controllers.Main.txtImage": "图片",
"PE.Controllers.Main.txtLines": "行",
"PE.Controllers.Main.txtMath": "数学",
"PE.Controllers.Main.txtMedia": "媒体",
"PE.Controllers.Main.txtNeedSynchronize": "你有更新",
"PE.Controllers.Main.txtPicture": "图片",
"PE.Controllers.Main.txtRectangles": "矩形",
"PE.Controllers.Main.txtSeries": "系列",
"PE.Controllers.Main.txtSldLtTBlank": "空白",
@ -237,6 +245,10 @@
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "垂直标题和文字",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "垂直标题和文字在图表上",
"PE.Controllers.Main.txtSldLtTVertTx": "垂直文本",
"PE.Controllers.Main.txtSlideNumber": "幻灯片编号",
"PE.Controllers.Main.txtSlideSubtitle": "幻灯片副标题",
"PE.Controllers.Main.txtSlideText": "幻灯片文本",
"PE.Controllers.Main.txtSlideTitle": "幻灯片标题",
"PE.Controllers.Main.txtStarsRibbons": "星星和丝带",
"PE.Controllers.Main.txtXAxis": "X轴",
"PE.Controllers.Main.txtYAxis": "Y轴",
@ -734,6 +746,7 @@
"PE.Views.DocumentHolder.txtMatrixAlign": "矩阵对齐",
"PE.Views.DocumentHolder.txtNewSlide": "新幻灯片",
"PE.Views.DocumentHolder.txtOverbar": "文本上一条",
"PE.Views.DocumentHolder.txtPastePicture": "图片",
"PE.Views.DocumentHolder.txtPressLink": "按CTRL并单击链接",
"PE.Views.DocumentHolder.txtPreview": "开始幻灯片放映",
"PE.Views.DocumentHolder.txtRemFractionBar": "删除分数栏",
@ -1214,6 +1227,7 @@
"PE.Views.TextArtSettings.txtNoBorders": "没有线",
"PE.Views.TextArtSettings.txtPapyrus": "纸莎草",
"PE.Views.TextArtSettings.txtWood": "木头",
"PE.Views.Toolbar.capInsertImage": "图片",
"PE.Views.Toolbar.mniCustomTable": "插入自定义表",
"PE.Views.Toolbar.mniImageFromFile": "图片文件",
"PE.Views.Toolbar.mniImageFromUrl": "图片来自网络",

BIN
apps/presentationeditor/main/resources/img/toolbar-menu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

5
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -357,6 +357,7 @@
.box-shadow(none);
margin: 0;
font-size: 12px;
float: none;
&:not(.header-name) {
&:hover,
@ -372,11 +373,11 @@
}
.help-item-wrap {
padding: 7px 2px 7px 20px;
padding: 4px 2px 4px 20px;
}
.header-name {
padding: 7px 2px 7px 10px;
padding: 16px 2px 4px 10px;
}
}
}

65
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -80,7 +80,7 @@ define([
usersCount : 1,
fastCoauth : true,
lostEditingRights : false,
licenseWarning : false
licenseType : false
};
// Initialize viewport
@ -537,17 +537,37 @@ define([
onLicenseChanged: function(params) {
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady && this._state.licenseWarning)
if (this._isDocReady && this._state.licenseType)
this.applyLicense();
},
applyLicense: function() {
var me = this;
if (me._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = [{text: 'OK'}];
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}];
}
PE.getController('Toolbar').activateViewControls();
PE.getController('Toolbar').deactivateEditControls();
Common.NotificationCenter.trigger('api:disconnect');
@ -560,22 +580,8 @@ define([
Common.localStorage.setItem("pe-license-warning", now);
uiApp.modal({
title: me.textNoLicenseTitle,
text : me._state.licenseWarning,
buttons: [
{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}
]
text : license,
buttons: buttons
});
}
} else
@ -821,6 +827,10 @@ define([
config.msg = this.errorBadImageUrl;
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -841,6 +851,10 @@ define([
Common.NotificationCenter.trigger('goback');
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
} else {
Common.Gateway.reportWarning(id, config.msg);
@ -1287,7 +1301,6 @@ define([
textTryUndoRedo: 'The Undo/Redo functions are disabled for the Fast co-editing mode.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
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.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1320,8 +1333,12 @@ define([
txtSlideNumber: 'Slide number',
txtSlideSubtitle: 'Slide subtitle',
txtSlideTitle: 'Slide title',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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'
}
})(), PE.Controllers.Main || {}))

9
apps/presentationeditor/mobile/locale/de.json
View file

@ -69,8 +69,9 @@
"PE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments",
"PE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
"PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder kontaktieren Sie Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
"PE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -203,9 +204,11 @@
"PE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.",
"PE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...",
"PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"PE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"PE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"PE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.",
"PE.Controllers.Settings.notcriticalErrorTitle": "Achtung",

9
apps/presentationeditor/mobile/locale/en.json
View file

@ -69,8 +69,9 @@
"PE.Controllers.Main.downloadTitleText": "Downloading Document",
"PE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
"PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
"PE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"PE.Controllers.Main.errorDataRange": "Incorrect data range.",
"PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"PE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -203,9 +204,11 @@
"PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.",
"PE.Controllers.Main.uploadImageTextText": "Uploading image...",
"PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"PE.Controllers.Main.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.",
"PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"PE.Controllers.Main.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.",
"PE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Main.closeButtonText": "Close File",
"PE.Controllers.Search.textNoTextFound": "Text not Found",

7
apps/presentationeditor/mobile/locale/it.json
View file

@ -69,8 +69,9 @@
"PE.Controllers.Main.downloadTitleText": "Download del documento",
"PE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Scollegato dal server. Non è possibile modificare.",
"PE.Controllers.Main.errorConnectToServer": "Impossibile salvare il documento. Si prega di verificare i parametri di connessione o rivolgersi all'amministratore.<br>Una volta cliccato il pulsante 'OK', si verrà invitati a scaricare il documento.<br><br>Puoi trovare maggiori informazioni sulla connessione al Server dei Documenti <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">qui</a>",
"PE.Controllers.Main.errorConnectToServer": "Il documento non può essere salvato. Controllare le impostazioni di rete o contatta l'Amministratore.<br>Quando clicchi 'OK' Ti verrà richiesto di scaricare il documento.<br><br>Per maggiori dettagli sulla connessione al Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">clicca qui</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione al database. Si prega di contattare il supporto.",
"PE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"PE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"PE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"PE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -203,9 +204,11 @@
"PE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima per l'immagine.",
"PE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...",
"PE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"PE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"PE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"PE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"PE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei. <br>Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.",
"PE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.",
"PE.Controllers.Search.textNoTextFound": "Testo non trovato",
"PE.Controllers.Settings.notcriticalErrorTitle": "Avviso",

9
apps/presentationeditor/mobile/locale/ru.json
View file

@ -71,6 +71,7 @@
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
"PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
"PE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
"PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"PE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
@ -203,9 +204,11 @@
"PE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
"PE.Controllers.Main.uploadImageTextText": "Загрузка изображения...",
"PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"PE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"PE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"PE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"PE.Controllers.Search.textNoTextFound": "Текст не найден",
"PE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
@ -431,7 +434,7 @@
"PE.Views.Settings.textDownloadAs": "Скачать как...",
"PE.Views.Settings.textEditPresent": "Редактировать",
"PE.Views.Settings.textEmail": "email",
"PE.Views.Settings.textFind": "Найти",
"PE.Views.Settings.textFind": "Поиск",
"PE.Views.Settings.textHelp": "Справка",
"PE.Views.Settings.textLoading": "Загрузка...",
"PE.Views.Settings.textPoweredBy": "Powered by",

2
apps/presentationeditor/mobile/locale/zh.json
View file

@ -122,7 +122,7 @@
"PE.Controllers.Main.textContactUs": "联系销售",
"PE.Controllers.Main.textDone": "完成",
"PE.Controllers.Main.textLoadingDocument": "载入演示",
"PE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本",
"PE.Controllers.Main.textOK": "确定",
"PE.Controllers.Main.textPassword": "密码",
"PE.Controllers.Main.textPreloader": "载入中…",

4
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -261,9 +261,9 @@ define([
}
}, this)
});
} else if (format == Asc.c_oAscFileType.PDF) {
} else if (format == Asc.c_oAscFileType.PDF || format == Asc.c_oAscFileType.PDFA) {
menu.hide();
Common.NotificationCenter.trigger('download:settings', this.leftMenu);
Common.NotificationCenter.trigger('download:settings', this.leftMenu, format);
} else {
this.api.asc_DownloadAs(format);
menu.hide();

59
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -107,7 +107,7 @@ define([
// $(document.body).css('position', 'absolute');
var me = this;
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseWarning: false};
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
this.translationTable = [];
if (!Common.Utils.isBrowserSupported()){
@ -407,13 +407,14 @@ define([
Asc.c_oAscFileType.XLSX,
Asc.c_oAscFileType.ODS,
Asc.c_oAscFileType.CSV,
Asc.c_oAscFileType.PDF
Asc.c_oAscFileType.PDF,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
_format = Asc.c_oAscFileType.XLSX;
if (_format == Asc.c_oAscFileType.PDF)
Common.NotificationCenter.trigger('download:settings', this, true);
if (_format == Asc.c_oAscFileType.PDF || _format == Asc.c_oAscFileType.PDFA)
Common.NotificationCenter.trigger('download:settings', this, _format, true);
else
this.api.asc_DownloadAs(_format, true);
},
@ -786,16 +787,27 @@ define([
if (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) return;
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady)
this.applyLicense();
},
applyLicense: function() {
if (this._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = ['ok'],
primary = 'ok';
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}];
primary = 'buynow';
}
this.disableEditing(true);
Common.NotificationCenter.trigger('api:disconnect');
@ -807,12 +819,9 @@ define([
Common.UI.info({
width: 500,
title: this.textNoLicenseTitle,
msg : this._state.licenseWarning,
buttons: [
{value: 'buynow', caption: this.textBuyNow},
{value: 'contact', caption: this.textContactUs}
],
primary: 'buynow',
msg : license,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'buynow')
window.open('https://www.onlyoffice.com', "_blank");
@ -896,7 +905,8 @@ define([
(typeof (this.editorConfig.customization) == 'object' && !!this.editorConfig.customization.forcesave);
this.appOptions.forcesave = this.appOptions.canForcesave;
this.appOptions.canEditComments= this.appOptions.isOffline || !(typeof (this.editorConfig.customization) == 'object' && this.editorConfig.customization.commentAuthorOnly);
this.appOptions.canProtect = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport() && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
this.appOptions.isProtectSupport = true; // remove in 5.2
this.appOptions.canProtect = this.appOptions.isProtectSupport && this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport() && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
this.applyModeCommonElements();
@ -1285,6 +1295,10 @@ define([
console.warn(config.msg);
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@ -1306,6 +1320,10 @@ define([
}
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
} else {
Common.Gateway.reportWarning(id, config.msg);
@ -1721,6 +1739,8 @@ define([
case 'setMergeData': this.setMergeData(data.data); break;
case 'getMergeData': this.getMergeData(); break;
case 'setAppDisabled':
if (this.isAppDisabled===undefined && !data.data) // first editor opening
Common.NotificationCenter.trigger('layout:changed', 'main');
this.isAppDisabled = data.data;
break;
case 'queryClose':
@ -2152,7 +2172,6 @@ define([
errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.<br>Please check the data and try again.',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
confirmPutMergeRange: 'The source data contains merged cells.<br>They will be unmerged before they are pasted into the table.',
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.',
@ -2193,9 +2212,13 @@ define([
txtStyle_Currency: 'Currency',
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorMaxPoints: "The maximum number of points in series per chart is 4096."
errorMaxPoints: "The maximum number of points in series per chart is 4096.",
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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.'
}
})(), SSE.Controllers.Main || {}))
});

5
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -221,9 +221,10 @@ define([
}
},
openPrintSettings: function(type, cmp, asUrl) {
openPrintSettings: function(type, cmp, format, asUrl) {
if (this.api) {
this.asUrl = asUrl;
this.downloadFormat = format;
this.printSettingsDlg = (new SSE.Views.PrintSettings({
type: type,
handler: _.bind(this.resultPrintSettings,this),
@ -252,7 +253,7 @@ define([
if ( this.printSettingsDlg.type=='print' )
this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera);
else
this.api.asc_DownloadAs(Asc.c_oAscFileType.PDF, this.asUrl, this.adjPrintParams);
this.api.asc_DownloadAs(this.downloadFormat, this.asUrl, this.adjPrintParams);
Common.component.Analytics.trackEvent((this.printSettingsDlg.type=='print') ? 'Print' : 'DownloadAs');
Common.component.Analytics.trackEvent('ToolBar', (this.printSettingsDlg.type=='print') ? 'Print' : 'DownloadAs');
Common.NotificationCenter.trigger('edit:complete', view);

9
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -102,14 +102,15 @@ define([
var _supported = [
Asc.c_oAscFileType.XLSX,
Asc.c_oAscFileType.ODS,
Asc.c_oAscFileType.CSV
Asc.c_oAscFileType.CSV,
Asc.c_oAscFileType.PDFA
];
if ( !_format || _supported.indexOf(_format) < 0 )
_format = Asc.c_oAscFileType.PDF;
if (_format == Asc.c_oAscFileType.PDF)
Common.NotificationCenter.trigger('download:settings', this.toolbar);
if (_format == Asc.c_oAscFileType.PDF || _format == Asc.c_oAscFileType.PDFA)
Common.NotificationCenter.trigger('download:settings', this.toolbar, _format);
else
_main.api.asc_DownloadAs(_format);
},
@ -3079,7 +3080,7 @@ define([
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.isOffline ) {
if ( config.isProtectSupport && config.isOffline ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
if ($panel)

19
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file

@ -539,7 +539,7 @@ define([
value: '000000'
});
this.colorsSpark.on('select', _.bind(this.onColorsSparkSelect, this));
$(this.el).on('click', '#spark-color-new', _.bind(this.addNewColor, this, this.colorsSpark, this.btnSparkColor));
this.btnSparkColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsSpark, this.btnSparkColor));
this.btnHighColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -554,7 +554,7 @@ define([
this.lockedControls.push(this.btnHighColor);
this.colorsHigh = new Common.UI.ThemeColorPalette({ el: $('#spark-high-color-menu') });
this.colorsHigh.on('select', _.bind(this.onColorsPointSelect, this, 0, this.btnHighColor));
$(this.el).on('click', '#spark-high-color-new', _.bind(this.addNewColor, this, this.colorsHigh, this.btnHighColor));
this.btnHighColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsHigh, this.btnHighColor));
this.btnLowColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -569,7 +569,7 @@ define([
this.lockedControls.push(this.btnLowColor);
this.colorsLow = new Common.UI.ThemeColorPalette({ el: $('#spark-low-color-menu') });
this.colorsLow.on('select', _.bind(this.onColorsPointSelect, this, 1, this.btnLowColor));
$(this.el).on('click', '#spark-low-color-new', _.bind(this.addNewColor, this, this.colorsLow, this.btnLowColor));
this.btnLowColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLow, this.btnLowColor));
this.btnNegativeColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -584,7 +584,7 @@ define([
this.lockedControls.push(this.btnNegativeColor);
this.colorsNegative = new Common.UI.ThemeColorPalette({ el: $('#spark-negative-color-menu') });
this.colorsNegative.on('select', _.bind(this.onColorsPointSelect, this, 2, this.btnNegativeColor));
$(this.el).on('click', '#spark-negative-color-new', _.bind(this.addNewColor, this, this.colorsNegative, this.btnNegativeColor));
this.btnNegativeColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsNegative, this.btnNegativeColor));
this.btnFirstColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -598,8 +598,8 @@ define([
this.lockedControls.push(this.btnFirstColor);
this.colorsFirst = new Common.UI.ThemeColorPalette({ el: $('#spark-first-color-menu') });
this.colorsFirst.on('select', _.bind(this.onColorsPointSelect, this, 3, this.btnFirstColor));
$(this.el).on('click', '#spark-first-color-new', _.bind(this.addNewColor, this, this.colorsFirst, this.btnFirstColor));
this.btnFirstColor.setColor(this.defColor.color);
this.btnFirstColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFirst, this.btnFirstColor));
this.btnLastColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -614,7 +614,7 @@ define([
this.lockedControls.push(this.btnLastColor);
this.colorsLast = new Common.UI.ThemeColorPalette({ el: $('#spark-last-color-menu') });
this.colorsLast.on('select', _.bind(this.onColorsPointSelect, this, 4, this.btnLastColor));
$(this.el).on('click', '#spark-last-color-new', _.bind(this.addNewColor, this, this.colorsLast, this.btnLastColor));
this.btnLastColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsLast, this.btnLastColor));
this.btnMarkersColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -629,8 +629,7 @@ define([
this.lockedControls.push(this.btnMarkersColor);
this.colorsMarkers = new Common.UI.ThemeColorPalette({ el: $('#spark-markers-color-menu') });
this.colorsMarkers.on('select', _.bind(this.onColorsPointSelect, this, 5, this.btnMarkersColor));
$(this.el).on('click', '#spark-markers-color-new', _.bind(this.addNewColor, this, this.colorsMarkers, this.btnMarkersColor));
this.btnMarkersColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsMarkers, this.btnMarkersColor));
}
this.colorsSpark.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsHigh.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors(), defValue);
@ -1088,7 +1087,11 @@ define([
stylesStore.reset(stylearray, {silent: false});
}
}
} else {
this.cmbChartStyle.menuPicker.store.reset();
this.cmbChartStyle.clearComboView();
}
this.cmbChartStyle.setDisabled(!styles || styles.length<1 || this._locked);
},
updateSparkStyles: function(styles) {

2
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -44,6 +44,8 @@ define([
formats: [[
{name: 'XLSX', imgCls: 'xlsx', type: Asc.c_oAscFileType.XLSX},
{name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF},
{name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}
],[
{name: 'ODS', imgCls: 'ods', type: Asc.c_oAscFileType.ODS},
{name: 'CSV', imgCls: 'csv', type: Asc.c_oAscFileType.CSV}
]

10
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1483,7 +1483,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#shape-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1502,7 +1502,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#shape-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1521,7 +1521,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#shape-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1540,7 +1540,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#shape-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1559,7 +1559,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#shape-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

13
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -85,6 +85,7 @@ define([
};
this.lockedControls = [];
this._locked = false;
this.isEditCell = false;
this._originalProps = null;
this._noApply = false;
@ -177,6 +178,7 @@ define([
this.api = o;
if (o) {
this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
this.api.asc_registerCallback('asc_onEditCell', this.onApiEditCell.bind(this));
}
return this;
},
@ -510,14 +512,21 @@ define([
});
}
},
onApiEditCell: function(state) {
this.isEditCell = (state != Asc.c_oAscCellEditorState.editEnd);
if ( state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd)
this.disableControls(this._locked);
},
setLocked: function (locked) {
this._locked = locked;
},
disableControls: function(disable) {
if (this._initSettings) return;
disable = disable || this.isEditCell;
if (this._state.DisabledControls!==disable) {
this._state.DisabledControls = disable;
_.each(this.lockedControls, function(item) {

10
apps/spreadsheeteditor/main/app/view/TextArtSettings.js
View file

@ -1487,7 +1487,7 @@ define([
value: '000000'
});
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
$(this.el).on('click', '#textart-border-color-new', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
this.btnBackColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1507,7 +1507,7 @@ define([
transparent: true
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
$(this.el).on('click', '#textart-back-color-new', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1526,7 +1526,7 @@ define([
value: '000000'
});
this.colorsFG.on('select', _.bind(this.onColorsFGSelect, this));
$(this.el).on('click', '#textart-foreground-color-new', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnFGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsFG, this.btnFGColor));
this.btnBGColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1545,7 +1545,7 @@ define([
value: 'ffffff'
});
this.colorsBG.on('select', _.bind(this.onColorsBGSelect, this));
$(this.el).on('click', '#textart-background-color-new', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnBGColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBG, this.btnBGColor));
this.btnGradColor = new Common.UI.ColorButton({
style: "width:45px;",
@ -1564,7 +1564,7 @@ define([
value: '000000'
});
this.colorsGrad.on('select', _.bind(this.onColorsGradientSelect, this));
$(this.el).on('click', '#textart-gradient-color-new', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
this.btnGradColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsGrad, this.btnGradColor));
}
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());

8
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -2282,7 +2282,7 @@ define([
tipIncDecimal: 'Increase Decimal',
tipDecDecimal: 'Decrease Decimal',
tipAutofilter: 'Set Autofilter',
tipInsertImage: 'Insert Picture',
tipInsertImage: 'Insert Image',
tipInsertHyperlink: 'Add Hyperlink',
tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.',
tipIncFont: 'Increment font size',
@ -2311,8 +2311,8 @@ define([
txtFormula: 'Insert Function',
txtNoBorders: 'No borders',
txtAdditional: 'Additional',
mniImageFromFile: 'Picture from file',
mniImageFromUrl: 'Picture from url',
mniImageFromFile: 'Image from file',
mniImageFromUrl: 'Image from url',
textNewColor: 'Add New Custom Color',
tipInsertChart: 'Insert Chart',
tipEditChart: 'Edit Chart',
@ -2381,7 +2381,7 @@ define([
textMoreFormats: 'More formats',
capInsertText: 'Text',
capInsertTextart: 'Text Art',
capInsertImage: 'Picture',
capInsertImage: 'Image',
capInsertShape: 'Shape',
capInsertChart: 'Chart',
capInsertHyperlink: 'Hyperlink',

1
apps/spreadsheeteditor/main/index.html
View file

@ -265,6 +265,7 @@
<img class="inline-svg" src="../../common/main/resources/img/header/buttons.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/xlsx.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdf.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/pdfa.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/ods.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/csv.svg">
<img class="inline-svg" src="../../common/main/resources/img/doc-formats/blank.svg">

1
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -284,6 +284,7 @@
<inline src="resources/img/header/buttons.svg" />
<inline src="resources/img/doc-formats/xlsx.svg" />
<inline src="resources/img/doc-formats/pdf.svg" />
<inline src="resources/img/doc-formats/pdfa.svg" />
<inline src="resources/img/doc-formats/ods.svg" />
<inline src="resources/img/doc-formats/csv.svg" />
<inline src="resources/img/doc-formats/blank.svg" />

11
apps/spreadsheeteditor/main/locale/de.json
View file

@ -139,7 +139,7 @@
"Common.Views.Protection.txtEncrypt": "Verschlüsseln",
"Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu",
"Common.Views.Protection.txtSignature": "Signatur",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen",
"Common.Views.RenameDialog.cancelButtonText": "Abbrechen",
"Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Dateiname",
@ -363,12 +363,13 @@
"SSE.Controllers.Main.errorAutoFilterHiddenRange": "Die Operation kann nicht ausgeführt werden, weil der Bereich gefilterte Zellen enthält.<br>Bitte machen Sie die gefilterten Elemente sichtbar und versuchen Sie es erneut.",
"SSE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Das Dokument kann momentan nicht bearbeitet werden.",
"SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.<br>Wann Sie auf die Taste \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Finden Sie mehr Information über Verbindung des Dokument Servers <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"SSE.Controllers.Main.errorCopyMultiselectArea": "Bei einer Markierung von nicht angrenzenden Zellen ist die Ausführung dieses Befehls nicht möglich.<br>Wählen Sie nur einen einzelnen Bereich aus, und versuchen Sie es noch mal.",
"SSE.Controllers.Main.errorCountArg": "Die eingegebene Formel enthält einen Fehler.<br>Falsche Anzahl an Argumenten wurde genutzt.",
"SSE.Controllers.Main.errorCountArgExceed": "Die eingegebene Formel enthält einen Fehler.<br>Anzahl der Argumente wurde überschritten.",
"SSE.Controllers.Main.errorCreateDefName": "Die bestehende benannte Bereiche können nicht bearbeitet werden und die neuen Bereiche können<br>im Moment nicht erstellt werden, weil einige von ihnen sind in Bearbeitung.",
"SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Fehler beim Verbinden zur Datenbank. Bitte wenden Sie sich an den Kundendienst, falls der Fehler bestehen bleibt.",
"SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -494,9 +495,11 @@
"SSE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"SSE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
"SSE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination STRG+0 wieder her.",
"SSE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"SSE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"SSE.Controllers.Print.strAllSheets": "Alle Blätter",
"SSE.Controllers.Print.textWarning": "Achtung",

17
apps/spreadsheeteditor/main/locale/en.json
View file

@ -139,7 +139,7 @@
"Common.Views.Protection.txtEncrypt": "Encrypt",
"Common.Views.Protection.txtInvisibleSignature": "Add digital signature",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Signature line",
"Common.Views.Protection.txtSignatureLine": "Add signature line",
"Common.Views.RenameDialog.cancelButtonText": "Cancel",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "File name",
@ -401,6 +401,7 @@
"SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.<br>Number of arguments is exceeded.",
"SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.",
"SSE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"SSE.Controllers.Main.errorDataRange": "Incorrect data range.",
"SSE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -526,9 +527,11 @@
"SSE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"SSE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
"SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
"SSE.Controllers.Main.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.",
"SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.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.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Print.strAllSheets": "All Sheets",
"SSE.Controllers.Print.textWarning": "Warning",
@ -1833,12 +1836,12 @@
"SSE.Views.Toolbar.capInsertChart": "Chart",
"SSE.Views.Toolbar.capInsertEquation": "Equation",
"SSE.Views.Toolbar.capInsertHyperlink": "Hyperlink",
"SSE.Views.Toolbar.capInsertImage": "Picture",
"SSE.Views.Toolbar.capInsertImage": "Image",
"SSE.Views.Toolbar.capInsertShape": "Shape",
"SSE.Views.Toolbar.capInsertTable": "Table",
"SSE.Views.Toolbar.capInsertText": "Text Box",
"SSE.Views.Toolbar.mniImageFromFile": "Picture from File",
"SSE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
"SSE.Views.Toolbar.mniImageFromFile": "Image from File",
"SSE.Views.Toolbar.mniImageFromUrl": "Image from URL",
"SSE.Views.Toolbar.textAlignBottom": "Align Bottom",
"SSE.Views.Toolbar.textAlignCenter": "Align Center",
"SSE.Views.Toolbar.textAlignJust": "Justified",
@ -1934,7 +1937,7 @@
"SSE.Views.Toolbar.tipInsertChartSpark": "Insert chart",
"SSE.Views.Toolbar.tipInsertEquation": "Insert equation",
"SSE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink",
"SSE.Views.Toolbar.tipInsertImage": "Insert picture",
"SSE.Views.Toolbar.tipInsertImage": "Insert image",
"SSE.Views.Toolbar.tipInsertOpt": "Insert cells",
"SSE.Views.Toolbar.tipInsertShape": "Insert autoshape",
"SSE.Views.Toolbar.tipInsertText": "Insert text box",

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

@ -1654,7 +1654,7 @@
"SSE.Views.Statusbar.RenameDialog.errNameExists": "Hoja de cálculo con tal nombre existe ya.",
"SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "El nombre de hoja no puede contener los caracteres siguientes: \\/*?[]:",
"SSE.Views.Statusbar.RenameDialog.labelSheetName": "Nombre de hoja",
"SSE.Views.Statusbar.textAverage": "MEDIA",
"SSE.Views.Statusbar.textAverage": "PROMEDIO",
"SSE.Views.Statusbar.textCount": "CONTAR",
"SSE.Views.Statusbar.textNewColor": "Añadir Color Personalizado Nuevo",
"SSE.Views.Statusbar.textNoColor": "Sin color",

20
apps/spreadsheeteditor/main/locale/fr.json
View file

@ -1360,12 +1360,12 @@
"SSE.Views.MainSettingsPrint.strPrint": "Imprimer",
"SSE.Views.MainSettingsPrint.strRight": "A droite",
"SSE.Views.MainSettingsPrint.strTop": "En haut",
"SSE.Views.MainSettingsPrint.textActualSize": "Taille actuelle",
"SSE.Views.MainSettingsPrint.textFitCols": "Monter toutes les colonnes sur une seule page",
"SSE.Views.MainSettingsPrint.textFitPage": "Monter le feuille sur une seule page",
"SSE.Views.MainSettingsPrint.textFitRows": "Monter toutes les lignes sur une page",
"SSE.Views.MainSettingsPrint.textActualSize": "Taille réelle",
"SSE.Views.MainSettingsPrint.textFitCols": "Ajuster toutes les colonnes à une page",
"SSE.Views.MainSettingsPrint.textFitPage": "Ajuster la feuille à une page",
"SSE.Views.MainSettingsPrint.textFitRows": "Ajuster toutes les lignes à une page",
"SSE.Views.MainSettingsPrint.textPageOrientation": "Orientation de la page",
"SSE.Views.MainSettingsPrint.textPageScaling": "Ecaillage",
"SSE.Views.MainSettingsPrint.textPageScaling": "Mise à l'échelle",
"SSE.Views.MainSettingsPrint.textPageSize": "Taille de la page",
"SSE.Views.MainSettingsPrint.textPrintGrid": "Imprimer le quadrillage",
"SSE.Views.MainSettingsPrint.textPrintHeadings": "Imprimer les titres de lignes et de colonnes ",
@ -1514,16 +1514,16 @@
"SSE.Views.PrintSettings.strRight": "A droite",
"SSE.Views.PrintSettings.strShow": "Afficher",
"SSE.Views.PrintSettings.strTop": "En haut",
"SSE.Views.PrintSettings.textActualSize": "Taille actuelle",
"SSE.Views.PrintSettings.textActualSize": "Taille réelle",
"SSE.Views.PrintSettings.textAllSheets": "Toutes les feuilles",
"SSE.Views.PrintSettings.textCurrentSheet": "Feuille actuel",
"SSE.Views.PrintSettings.textFitCols": "Monter toutes les colonnes sur une seule page",
"SSE.Views.PrintSettings.textFitPage": "Monter le feuille sur une seule page",
"SSE.Views.PrintSettings.textFitRows": "Monter toutes les lignes sur une page",
"SSE.Views.PrintSettings.textFitCols": "Ajuster toutes les colonnes à une page",
"SSE.Views.PrintSettings.textFitPage": "Ajuster la feuille à une page",
"SSE.Views.PrintSettings.textFitRows": "Ajuster toutes les lignes à une page",
"SSE.Views.PrintSettings.textHideDetails": "Masquer détails",
"SSE.Views.PrintSettings.textLayout": "Disposition",
"SSE.Views.PrintSettings.textPageOrientation": "Orientation de la page",
"SSE.Views.PrintSettings.textPageScaling": "Ecaillage",
"SSE.Views.PrintSettings.textPageScaling": "Mise à l'échelle",
"SSE.Views.PrintSettings.textPageSize": "Taille de la page",
"SSE.Views.PrintSettings.textPrintGrid": "Imprimer le quadrillage",
"SSE.Views.PrintSettings.textPrintHeadings": "Imprimer les titres de lignes et de colonnes ",

22
apps/spreadsheeteditor/main/locale/it.json
View file

@ -111,6 +111,7 @@
"Common.Views.OpenDialog.txtOther": "Altro",
"Common.Views.OpenDialog.txtPassword": "Password",
"Common.Views.OpenDialog.txtPreview": "Anteprima",
"Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.",
"Common.Views.OpenDialog.txtSemicolon": "Punto e virgola",
"Common.Views.OpenDialog.txtSpace": "Spazio",
"Common.Views.OpenDialog.txtTab": "Tabulazione",
@ -118,13 +119,13 @@
"Common.Views.OpenDialog.txtTitleProtected": "File protetto",
"Common.Views.PasswordDialog.cancelButtonText": "Annulla",
"Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per aprire il documento",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento",
"Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde",
"Common.Views.PasswordDialog.txtPassword": "Password",
"Common.Views.PasswordDialog.txtRepeat": "Ripeti password",
"Common.Views.PasswordDialog.txtTitle": "Imposta password",
"Common.Views.PluginDlg.textLoading": "Caricamento",
"Common.Views.Plugins.groupCaption": "Componenti Aggiuntivi",
"Common.Views.Plugins.groupCaption": "Plugin",
"Common.Views.Plugins.strPlugins": "Plugin",
"Common.Views.Plugins.textLoading": "Caricamento",
"Common.Views.Plugins.textStart": "Avvio",
@ -368,6 +369,7 @@
"SSE.Controllers.Main.errorCountArgExceed": "Un errore nella formula inserita.<br>E' stato superato il numero di argomenti.",
"SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.",
"SSE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
"SSE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"SSE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"SSE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"SSE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -424,7 +426,7 @@
"SSE.Controllers.Main.printTitleText": "Stampa in corso del foglio di calcolo",
"SSE.Controllers.Main.reloadButtonText": "Ricarica pagina",
"SSE.Controllers.Main.requestEditFailedMessageText": "Qualcuno sta modificando questo documento. Si prega di provare più tardi.",
"SSE.Controllers.Main.requestEditFailedTitleText": "Accesso vietato",
"SSE.Controllers.Main.requestEditFailedTitleText": "Accesso negato",
"SSE.Controllers.Main.saveErrorText": "Si è verificato un errore al salvataggio del file",
"SSE.Controllers.Main.savePreparingText": "Preparazione al salvataggio ",
"SSE.Controllers.Main.savePreparingTitle": "Preparazione al salvataggio. Si prega di aspettare...",
@ -493,7 +495,9 @@
"SSE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"SSE.Controllers.Main.warnBrowserIE9": "L'applicazione è poco compatibile con IE9. Usa IE10 o più recente",
"SSE.Controllers.Main.warnBrowserZoom": "Le impostazioni correnti di zoom del tuo browser non sono completamente supportate. Per favore, ritorna allo zoom predefinito premendo Ctrl+0.",
"SSE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"SSE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"SSE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"SSE.Controllers.Main.warnProcessRightsChange": "Ci stato negato il diritto alla modifica del file.",
@ -1203,7 +1207,7 @@
"SSE.Views.FileMenu.btnRenameCaption": "Rinomina...",
"SSE.Views.FileMenu.btnReturnCaption": "Torna al foglio di calcolo",
"SSE.Views.FileMenu.btnRightsCaption": "Access Rights...",
"SSE.Views.FileMenu.btnSaveAsCaption": "Salva con",
"SSE.Views.FileMenu.btnSaveAsCaption": "Salva con Nome",
"SSE.Views.FileMenu.btnSaveCaption": "Salva",
"SSE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...",
"SSE.Views.FileMenu.btnToEditCaption": "Modifica foglio di calcolo",
@ -1392,7 +1396,7 @@
"SSE.Views.NamedRangePasteDlg.okButtonText": "Ok",
"SSE.Views.NamedRangePasteDlg.textNames": "Named Ranges",
"SSE.Views.NamedRangePasteDlg.txtTitle": "Paste Name",
"SSE.Views.NameManagerDlg.closeButtonText": "Close",
"SSE.Views.NameManagerDlg.closeButtonText": "Chiudi",
"SSE.Views.NameManagerDlg.guestText": "Guest",
"SSE.Views.NameManagerDlg.okButtonText": "Ok",
"SSE.Views.NameManagerDlg.textDataRange": "Data Range",
@ -1502,6 +1506,7 @@
"SSE.Views.PivotTable.txtCreate": "Inserisci tabella",
"SSE.Views.PivotTable.txtRefresh": "Aggiorna",
"SSE.Views.PivotTable.txtSelect": "Seleziona",
"SSE.Views.PrintSettings.btnDownload": "Salva e scarica",
"SSE.Views.PrintSettings.btnPrint": "Salva e stampa",
"SSE.Views.PrintSettings.cancelButtonText": "Annulla",
"SSE.Views.PrintSettings.strBottom": "In basso",
@ -1531,7 +1536,10 @@
"SSE.Views.PrintSettings.textSelection": "Selezione",
"SSE.Views.PrintSettings.textSettings": "Impostazioni Foglio",
"SSE.Views.PrintSettings.textShowDetails": "Mostra dettagli",
"SSE.Views.PrintSettings.textShowGrid": "Mostra griglia",
"SSE.Views.PrintSettings.textShowHeadings": "Mostra intestazioni di righe e colonne",
"SSE.Views.PrintSettings.textTitle": "Impostazioni stampa",
"SSE.Views.PrintSettings.textTitlePDF": "Impostazioni PDF",
"SSE.Views.RightMenu.txtChartSettings": "Impostazioni grafico",
"SSE.Views.RightMenu.txtImageSettings": "Impostazioni immagine",
"SSE.Views.RightMenu.txtParagraphSettings": "Impostazioni testo",
@ -1908,7 +1916,7 @@
"SSE.Views.Toolbar.txtFranc": "CHF Franco svizzero",
"SSE.Views.Toolbar.txtGeneral": "Generale",
"SSE.Views.Toolbar.txtInteger": "Numero intero",
"SSE.Views.Toolbar.txtManageRange": "Name manager",
"SSE.Views.Toolbar.txtManageRange": "Nome manager",
"SSE.Views.Toolbar.txtMergeAcross": "Unisci in ciascuna riga",
"SSE.Views.Toolbar.txtMergeCells": "Unisci celle",
"SSE.Views.Toolbar.txtMergeCenter": "Unisci e centra",
@ -1916,7 +1924,7 @@
"SSE.Views.Toolbar.txtNewRange": "Define Name",
"SSE.Views.Toolbar.txtNoBorders": "Nessun bordo",
"SSE.Views.Toolbar.txtNumber": "Numero",
"SSE.Views.Toolbar.txtPasteRange": "Paste name",
"SSE.Views.Toolbar.txtPasteRange": "Incolla Nome",
"SSE.Views.Toolbar.txtPercentage": "Percentuale",
"SSE.Views.Toolbar.txtPound": "£ Sterlina britannica",
"SSE.Views.Toolbar.txtRouble": "₽ Rublo",

9
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -139,7 +139,7 @@
"Common.Views.Protection.txtEncrypt": "Шифровать",
"Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись",
"Common.Views.Protection.txtSignature": "Подпись",
"Common.Views.Protection.txtSignatureLine": "Строка подписи",
"Common.Views.Protection.txtSignatureLine": "Добавить строку подписи",
"Common.Views.RenameDialog.cancelButtonText": "Отмена",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "Имя файла",
@ -369,6 +369,7 @@
"SSE.Controllers.Main.errorCountArgExceed": "Ошибка во введенной формуле.<br>Превышено количество аргументов.",
"SSE.Controllers.Main.errorCreateDefName": "В настоящий момент нельзя отредактировать существующие именованные диапазоны и создать новые,<br>так как некоторые из них редактируются.",
"SSE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.",
"SSE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.",
"SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"SSE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.",
@ -494,9 +495,11 @@
"SSE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"SSE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.",
"SSE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0",
"SSE.Controllers.Main.warnLicenseExceeded": "Превышено допустимое число одновременных подключений к серверу документов, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос об обновлении текущей лицензии или покупке коммерческой лицензии.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "Превышено допустимое число одновременно работающих пользователей, и документ откроется только на просмотр.<br>Обратитесь к администратору за дополнительной информацией.",
"SSE.Controllers.Main.warnNoLicense": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по количеству одновременных подключений к серверу документов.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов ONLYOFFICE имеет некоторые ограничения по числу одновременно работающих пользователей.<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"SSE.Controllers.Print.strAllSheets": "Все листы",
"SSE.Controllers.Print.textWarning": "Предупреждение",

26
apps/spreadsheeteditor/main/locale/zh.json
View file

@ -81,6 +81,7 @@
"Common.Views.ImageFromUrlDialog.txtNotUrl": "该字段应该是“http://www.example.com”格式的URL",
"Common.Views.OpenDialog.cancelButtonText": "取消",
"Common.Views.OpenDialog.okButtonText": "确定",
"Common.Views.OpenDialog.txtComma": "逗号",
"Common.Views.OpenDialog.txtDelimiter": "字段分隔符",
"Common.Views.OpenDialog.txtEncoding": "编码",
"Common.Views.OpenDialog.txtOther": "其他",
@ -319,7 +320,7 @@
"SSE.Controllers.Main.textContactUs": "联系销售",
"SSE.Controllers.Main.textLoadingDocument": "加载电子表格",
"SSE.Controllers.Main.textNo": "否",
"SSE.Controllers.Main.textNoLicenseTitle": "NLYOFFICE开源版本",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE开源版本",
"SSE.Controllers.Main.textPleaseWait": "该操作可能需要比预期的更多的时间。请稍候...",
"SSE.Controllers.Main.textRecalcFormulas": "计算公式...",
"SSE.Controllers.Main.textShape": "形状",
@ -342,6 +343,27 @@
"SSE.Controllers.Main.txtRectangles": "矩形",
"SSE.Controllers.Main.txtSeries": "系列",
"SSE.Controllers.Main.txtStarsRibbons": "星星和丝带",
"SSE.Controllers.Main.txtStyle_Bad": "差",
"SSE.Controllers.Main.txtStyle_Calculation": "计算",
"SSE.Controllers.Main.txtStyle_Check_Cell": "检查单元格",
"SSE.Controllers.Main.txtStyle_Comma": "逗号",
"SSE.Controllers.Main.txtStyle_Currency": "货币",
"SSE.Controllers.Main.txtStyle_Explanatory_Text": "说明文本",
"SSE.Controllers.Main.txtStyle_Good": "好",
"SSE.Controllers.Main.txtStyle_Heading_1": "标题1",
"SSE.Controllers.Main.txtStyle_Heading_2": "标题2",
"SSE.Controllers.Main.txtStyle_Heading_3": "标题3",
"SSE.Controllers.Main.txtStyle_Heading_4": "标题4",
"SSE.Controllers.Main.txtStyle_Input": "输入",
"SSE.Controllers.Main.txtStyle_Linked_Cell": "关联的单元格",
"SSE.Controllers.Main.txtStyle_Neutral": "中立",
"SSE.Controllers.Main.txtStyle_Normal": "正常",
"SSE.Controllers.Main.txtStyle_Note": "备注",
"SSE.Controllers.Main.txtStyle_Output": "输出",
"SSE.Controllers.Main.txtStyle_Percent": "百分比",
"SSE.Controllers.Main.txtStyle_Title": "标题",
"SSE.Controllers.Main.txtStyle_Total": "总数",
"SSE.Controllers.Main.txtStyle_Warning_Text": "警告文本",
"SSE.Controllers.Main.txtXAxis": "X轴",
"SSE.Controllers.Main.txtYAxis": "Y轴",
"SSE.Controllers.Main.unknownErrorText": "示知错误",
@ -988,6 +1010,7 @@
"SSE.Views.DocumentHolder.txtColumn": "整列",
"SSE.Views.DocumentHolder.txtColumnWidth": "设置列宽",
"SSE.Views.DocumentHolder.txtCopy": "复制",
"SSE.Views.DocumentHolder.txtCurrency": "货币",
"SSE.Views.DocumentHolder.txtCustomColumnWidth": "自定义列宽",
"SSE.Views.DocumentHolder.txtCustomRowHeight": "自定义行高度",
"SSE.Views.DocumentHolder.txtCut": "剪切",
@ -1004,6 +1027,7 @@
"SSE.Views.DocumentHolder.txtInsert": "插入",
"SSE.Views.DocumentHolder.txtInsHyperlink": "超链接",
"SSE.Views.DocumentHolder.txtPaste": "粘贴",
"SSE.Views.DocumentHolder.txtPercentage": "百分比",
"SSE.Views.DocumentHolder.txtReapply": "Reapply",
"SSE.Views.DocumentHolder.txtRow": "整行",
"SSE.Views.DocumentHolder.txtRowHeight": "设置列宽",

BIN
apps/spreadsheeteditor/main/resources/img/popupmenu-btns.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 7 KiB

BIN
apps/spreadsheeteditor/main/resources/img/popupmenu-btns@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
apps/spreadsheeteditor/main/resources/img/toolbar-menu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

5
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -424,6 +424,7 @@
.box-shadow(none);
margin: 0;
font-size: 12px;
float: none;
&:not(.header-name) {
&:hover,
@ -439,11 +440,11 @@
}
.help-item-wrap {
padding: 7px 2px 7px 20px;
padding: 4px 2px 4px 20px;
}
.header-name {
padding: 7px 2px 7px 10px;
padding: 16px 2px 4px 10px;
}
}
}

2
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View file

@ -31,7 +31,7 @@
.toolbar-btn-icon(btn-menu-pivot, 87, @toolbar-icon-size);
/*menuCell*/
.toolbar-btn-icon(btn-menu-cell, 80, @toolbar-icon-size);
.toolbar-btn-icon(btn-menu-cell, 88, @toolbar-icon-size);
}
}

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -148,7 +148,7 @@
.toolbar-btn-icon(btn-currency-style, 52, @toolbar-icon-size);
.toolbar-btn-icon(btn-addcell, 53, @toolbar-icon-size);
.toolbar-btn-icon(btn-delcell, 54, @toolbar-icon-size);
.toolbar-btn-icon(btn-ttempl, 55, @toolbar-icon-size);
.toolbar-btn-icon(btn-ttempl, 80, @toolbar-icon-size);
//
.toolbar-btn-icon(btn-showmode, 56, @toolbar-icon-size);
.toolbar-btn-icon(btn-settings, 57, @toolbar-icon-size);

71
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -81,7 +81,7 @@ define([
usersCount : 1,
fastCoauth : true,
lostEditingRights : false,
licenseWarning : false
licenseType : false
};
// Initialize viewport
@ -556,17 +556,37 @@ define([
if (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) return;
var licType = params.asc_getLicenseType();
if (licType !== undefined && (licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount) && this.appOptions.canEdit && this.editorConfig.mode !== 'view') {
this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) ? this.warnNoLicense : this.warnNoLicenseUsers;
}
if (licType !== undefined && this.appOptions.canEdit && this.editorConfig.mode !== 'view' &&
(licType===Asc.c_oLicenseResult.Connections || licType===Asc.c_oLicenseResult.UsersCount || licType===Asc.c_oLicenseResult.ConnectionsOS || licType===Asc.c_oLicenseResult.UsersCountOS))
this._state.licenseType = licType;
if (this._isDocReady && this._state.licenseWarning)
if (this._isDocReady && this._state.licenseType)
this.applyLicense();
},
applyLicense: function() {
var me = this;
if (me._state.licenseWarning) {
if (this._state.licenseType) {
var license = this._state.licenseType,
buttons = [{text: 'OK'}];
if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) {
license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded;
} else {
license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers;
buttons = [{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}];
}
SSE.getController('Toolbar').activateViewControls();
SSE.getController('Toolbar').deactivateEditControls();
Common.NotificationCenter.trigger('api:disconnect');
@ -579,22 +599,8 @@ define([
Common.localStorage.setItem("sse-license-warning", now);
uiApp.modal({
title: me.textNoLicenseTitle,
text : me._state.licenseWarning,
buttons: [
{
text: me.textBuyNow,
bold: true,
onClick: function() {
window.open('https://www.onlyoffice.com', "_blank");
}
},
{
text: me.textContactUs,
onClick: function() {
window.open('mailto:sales@onlyoffice.com', "_blank");
}
}
]
text : license,
buttons: buttons
});
}
} else
@ -955,6 +961,10 @@ define([
config.msg = this.errorAccessDeny;
break;
case Asc.c_oAscError.ID.DataEncrypted:
config.msg = this.errorDataEncrypted;
break;
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@ -975,6 +985,10 @@ define([
Common.NotificationCenter.trigger('goback');
}
}
if (id == Asc.c_oAscError.ID.DataEncrypted) {
this.api.asc_coAuthoringDisconnect();
Common.NotificationCenter.trigger('api:disconnect');
}
}
else {
Common.Gateway.reportWarning(id, config.msg);
@ -1370,7 +1384,7 @@ define([
unsupportedBrowserErrorText : 'Your browser is not supported.',
requestEditFailedTitleText: 'Access denied',
requestEditFailedMessageText: 'Someone is editing this document right now. Please try again later.',
textLoadingDocument: 'Loading document',
textLoadingDocument: 'Loading spreadsheet',
applyChangesTitleText: 'Loading Data',
applyChangesTextText: 'Loading data...',
errorKeyEncrypt: 'Unknown key descriptor',
@ -1389,8 +1403,8 @@ define([
txtLines: 'Lines',
txtEditingMode: 'Set editing mode...',
textAnonymous: 'Anonymous',
loadingDocumentTitleText: 'Loading document',
loadingDocumentTextText: 'Loading document...',
loadingDocumentTitleText: 'Loading spreadsheet',
loadingDocumentTextText: 'Loading spreadsheet...',
warnProcessRightsChange: 'You have been denied the right to edit the file.',
errorProcessSaveResult: 'Saving is failed.',
textCloseTip: '\nClick to close the tip.',
@ -1421,7 +1435,6 @@ define([
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.<br>Please update your license and refresh the page.',
@ -1474,9 +1487,13 @@ define([
txtStyle_Currency: 'Currency',
txtStyle_Percent: 'Percent',
txtStyle_Comma: 'Comma',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.',
errorMaxPoints: 'The maximum number of points in series per chart is 4096.',
txtProtected: 'Once you enter the password and open the file, the current password to the file will be reset',
warnNoLicense: 'This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.',
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.',
pastInMergeAreaError: 'Cannot change part of a merged cell',
errorWrongBracketsCount: 'Found an error in the formula entered.<br>Wrong cout of brackets.',
errorWrongOperator: 'An error in the entered formula. Wrong operator is used.<br>Please correct the error or use the Esc button to cancel the formula editing.',

6
apps/spreadsheeteditor/mobile/locale/cs.json
View file

@ -166,8 +166,8 @@
"SSE.Controllers.Main.loadImagesTitleText": "Načítání obrázků",
"SSE.Controllers.Main.loadImageTextText": "Načítání obrázku...",
"SSE.Controllers.Main.loadImageTitleText": "Načítání obrázku",
"SSE.Controllers.Main.loadingDocumentTextText": "Načítám dokument...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Načítání dokumentu",
"SSE.Controllers.Main.loadingDocumentTextText": "Načítání sešitu...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Načítání sešitu",
"SSE.Controllers.Main.mailMergeLoadFileText": "Načítání datového zdroje...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Načítání datového zdroje",
"SSE.Controllers.Main.notcriticalErrorTitle": "Varování",
@ -193,7 +193,7 @@
"SSE.Controllers.Main.textClose": "Zavřít",
"SSE.Controllers.Main.textContactUs": "Kontaktujte prodejce",
"SSE.Controllers.Main.textDone": "Hotovo",
"SSE.Controllers.Main.textLoadingDocument": "Načítání dokumentu",
"SSE.Controllers.Main.textLoadingDocument": "Načítání sešitu",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source verze",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Heslo",

17
apps/spreadsheeteditor/mobile/locale/de.json
View file

@ -115,12 +115,13 @@
"SSE.Controllers.Main.errorAutoFilterHiddenRange": "Die Operation kann nicht ausgeführt werden, weil der Bereich gefilterte Zellen enthält.<br>Bitte machen Sie die gefilterten Elemente sichtbar und versuchen Sie es erneut.",
"SSE.Controllers.Main.errorBadImageUrl": "URL des Bildes ist falsch",
"SSE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
"SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder richten Sie an Ihren Administrator.<br>Wann Sie auf die Taste \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Finden Sie mehr Information über Verbindung des Dokument Servers <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"SSE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen oder wenden Sie sich an Ihren Administrator.<br>Wenn Sie auf die Schaltfläche \"OK\" klicken, werden Sie aufgefordert das Dokument herunterzuladen.<br><br>Mehr Informationen über die Verbindung zum Dokumentenserver finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"SSE.Controllers.Main.errorCopyMultiselectArea": "Dieser Befehl kann nicht bei Mehrfachauswahl verwendet werden<br>Wählen Sie nur einen einzelnen Bereich aus, und versuchen Sie es nochmal.",
"SSE.Controllers.Main.errorCountArg": "Die eingegebene Formel enthält einen Fehler.<br>Es wurde falsche Anzahl an Argumenten benutzt.",
"SSE.Controllers.Main.errorCountArgExceed": "Die eingegebene Formel enthält einen Fehler.<br>Anzahl der Argumente wurde überschritten.",
"SSE.Controllers.Main.errorCreateDefName": "Die bestehende benannte Bereiche können nicht bearbeitet werden und neue Bereiche können<br>im Moment nicht erstellt werden, weil einige von ihnen sind in Bearbeitung.",
"SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
"SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.",
"SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.",
@ -167,14 +168,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "Bilder werden geladen",
"SSE.Controllers.Main.loadImageTextText": "Bild wird geladen...",
"SSE.Controllers.Main.loadImageTitleText": "Bild wird geladen",
"SSE.Controllers.Main.loadingDocumentTextText": "Dokument wird geladen...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Dokument wird geladen",
"SSE.Controllers.Main.loadingDocumentTextText": "Tabelle wird geladen...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Tabelle wird geladen",
"SSE.Controllers.Main.mailMergeLoadFileText": "Laden der Datenquellen...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Laden der Datenquellen",
"SSE.Controllers.Main.notcriticalErrorTitle": "Warnung",
"SSE.Controllers.Main.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten",
"SSE.Controllers.Main.openTextText": "Dokument wird geöffnet...",
"SSE.Controllers.Main.openTitleText": "Das Dokument wird geöffnet",
"SSE.Controllers.Main.pastInMergeAreaError": "Es ist unmöglich, einen Teil der vereinigten Zelle zu ändern",
"SSE.Controllers.Main.printTextText": "Dokument wird ausgedruckt...",
"SSE.Controllers.Main.printTitleText": "Drucken des Dokuments",
"SSE.Controllers.Main.reloadButtonText": "Seite neu laden",
@ -194,7 +196,7 @@
"SSE.Controllers.Main.textClose": "Schließen",
"SSE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
"SSE.Controllers.Main.textDone": "Fertig",
"SSE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...",
"SSE.Controllers.Main.textLoadingDocument": "Tabelle wird geladen",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Kennwort",
@ -256,9 +258,11 @@
"SSE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.",
"SSE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...",
"SSE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"SSE.Controllers.Main.warnLicenseExceeded": "Die Anzahl gleichzeitiger Verbindungen zum Document Server wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"SSE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, aktualisieren Sie diese Version oder erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Nutzer benötigen, achten Sie bitte darauf, dass Sie entweder Ihre derzeitige Lizenz aktualisieren oder eine kommerzielle erwerben müssen.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "Die Anzahl der gleichzeitigen Benutzer wurde überschritten und das Dokument wird nur zum Anzeigen geöffnet. <br> Wenden Sie sich an den Administrator, um weitere Informationen zu erhalten.",
"SSE.Controllers.Main.warnNoLicense": "Diese Version von ONLYOFFICE Editoren hat gewisse Einschränkungen für gleichzeitige Verbindungen zum Dokumentenserver.<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Diese Version von ONLYOFFICE Editoren hat bestimmte Einschränkungen für gleichzeitige Benutzer. <br> Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"SSE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"SSE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.",
"SSE.Controllers.Search.textReplaceAll": "Alle ersetzen",
@ -376,6 +380,7 @@
"SSE.Views.EditChart.textDisplayUnits": "Anzeigeeinheiten",
"SSE.Views.EditChart.textFill": "Füllung",
"SSE.Views.EditChart.textForward": "Vorwärts navigieren",
"SSE.Views.EditChart.textGridlines": "Gitternetzlinien ",
"SSE.Views.EditChart.textHorAxis": "Horizontale Achse",
"SSE.Views.EditChart.textHorizontal": "Horizontal",
"SSE.Views.EditChart.textLabelOptions": "Beschriftungsoptionen",

14
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -121,6 +121,7 @@
"SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.<br>Number of arguments is exceeded.",
"SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created<br>at the moment as some of them are being edited.",
"SSE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please contact support in case the error persists.",
"SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.",
"SSE.Controllers.Main.errorDataRange": "Incorrect data range.",
"SSE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
@ -167,8 +168,8 @@
"SSE.Controllers.Main.loadImagesTitleText": "Loading Images",
"SSE.Controllers.Main.loadImageTextText": "Loading image...",
"SSE.Controllers.Main.loadImageTitleText": "Loading Image",
"SSE.Controllers.Main.loadingDocumentTextText": "Loading document...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Loading document",
"SSE.Controllers.Main.loadingDocumentTextText": "Loading spreadsheet...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Loading spreadsheet",
"SSE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
"SSE.Controllers.Main.notcriticalErrorTitle": "Warning",
@ -195,7 +196,7 @@
"SSE.Controllers.Main.textClose": "Close",
"SSE.Controllers.Main.textContactUs": "Contact sales",
"SSE.Controllers.Main.textDone": "Done",
"SSE.Controllers.Main.textLoadingDocument": "Loading document",
"SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Password",
@ -257,9 +258,11 @@
"SSE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.",
"SSE.Controllers.Main.uploadImageTextText": "Uploading image...",
"SSE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"SSE.Controllers.Main.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.",
"SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider upgrading your current license or purchasing a commercial one.",
"SSE.Controllers.Main.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.",
"SSE.Controllers.Main.warnNoLicense": "This version of ONLYOFFICE Editors has certain limitations for concurrent connections to the document server.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnNoLicenseUsers": "This version of ONLYOFFICE Editors has certain limitations for concurrent users.<br>If you need more please consider purchasing a commercial license.",
"SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"SSE.Controllers.Main.closeButtonText": "Close File",
"SSE.Controllers.Search.textNoTextFound": "Text not found",
@ -386,6 +389,7 @@
"SSE.Views.EditChart.textDisplayUnits": "Display Units",
"SSE.Views.EditChart.textFill": "Fill",
"SSE.Views.EditChart.textForward": "Move Forward",
"SSE.Views.EditChart.textGridlines": "Gridlines",
"SSE.Views.EditChart.textHorAxis": "Horizontal Axis",
"SSE.Views.EditChart.textHorizontal": "Horizontal",
"SSE.Views.EditChart.textLabelOptions": "Label Options",

8
apps/spreadsheeteditor/mobile/locale/es.json
View file

@ -167,14 +167,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "Cargando imágenes",
"SSE.Controllers.Main.loadImageTextText": "Cargando imagen...",
"SSE.Controllers.Main.loadImageTitleText": "Cargando imagen",
"SSE.Controllers.Main.loadingDocumentTextText": "Cargando documento...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Cargando documento",
"SSE.Controllers.Main.loadingDocumentTextText": "Cargando hoja de cálculo...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Cargando hoja de cálculo",
"SSE.Controllers.Main.mailMergeLoadFileText": "Cargando fuente de datos...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Cargando fuente de datos",
"SSE.Controllers.Main.notcriticalErrorTitle": "Aviso",
"SSE.Controllers.Main.openErrorText": "Se ha producido un error al abrir el archivo ",
"SSE.Controllers.Main.openTextText": "Abriendo documento...",
"SSE.Controllers.Main.openTitleText": "Abriendo documento",
"SSE.Controllers.Main.pastInMergeAreaError": "Es imposible cambiar una parte de la celda unida",
"SSE.Controllers.Main.printTextText": "Imprimiendo documento...",
"SSE.Controllers.Main.printTitleText": "Imprimiendo documento",
"SSE.Controllers.Main.reloadButtonText": "Volver a cargar página",
@ -194,7 +195,7 @@
"SSE.Controllers.Main.textClose": "Cerrar",
"SSE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
"SSE.Controllers.Main.textDone": "Listo",
"SSE.Controllers.Main.textLoadingDocument": "Cargando documento",
"SSE.Controllers.Main.textLoadingDocument": "Cargando hoja de cálculo",
"SSE.Controllers.Main.textNoLicenseTitle": "Limitación en conexiones a ONLYOFFICE",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Contraseña",
@ -375,6 +376,7 @@
"SSE.Views.EditChart.textDisplayUnits": "Unidades de visualización",
"SSE.Views.EditChart.textFill": "Relleno",
"SSE.Views.EditChart.textForward": "Mover adelante",
"SSE.Views.EditChart.textGridlines": "Líneas de cuadrícula",
"SSE.Views.EditChart.textHorAxis": "Eje horizontal",
"SSE.Views.EditChart.textHorizontal": "Horizontal ",
"SSE.Views.EditChart.textLabelOptions": "Parámetros de etiqueta",

8
apps/spreadsheeteditor/mobile/locale/fr.json
View file

@ -167,14 +167,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "Chargement des images",
"SSE.Controllers.Main.loadImageTextText": "Chargement d'une image...",
"SSE.Controllers.Main.loadImageTitleText": "Chargement d'une image",
"SSE.Controllers.Main.loadingDocumentTextText": "Chargement du document...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Chargement du document",
"SSE.Controllers.Main.loadingDocumentTextText": "Chargement feuille de calcul...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Chargement feuille de calcul",
"SSE.Controllers.Main.mailMergeLoadFileText": "Chargement de la source des données...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Chargement de la source des données",
"SSE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
"SSE.Controllers.Main.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier",
"SSE.Controllers.Main.openTextText": "Ouverture du document...",
"SSE.Controllers.Main.openTitleText": "Ouverture du document",
"SSE.Controllers.Main.pastInMergeAreaError": "Impossible de modifier une partie d'une cellule fusionnée",
"SSE.Controllers.Main.printTextText": "Impression du document...",
"SSE.Controllers.Main.printTitleText": "Impression du document",
"SSE.Controllers.Main.reloadButtonText": "Recharger la page",
@ -194,7 +195,7 @@
"SSE.Controllers.Main.textClose": "Fermer",
"SSE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
"SSE.Controllers.Main.textDone": "Terminé",
"SSE.Controllers.Main.textLoadingDocument": "Chargement du document",
"SSE.Controllers.Main.textLoadingDocument": "Chargement feuille de calcul",
"SSE.Controllers.Main.textNoLicenseTitle": "Limitation de connexion ONLYOFFICE",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Mot de passe",
@ -375,6 +376,7 @@
"SSE.Views.EditChart.textDisplayUnits": "Unités de l'affichage",
"SSE.Views.EditChart.textFill": "Remplissage",
"SSE.Views.EditChart.textForward": "Déplacer vers l'avant",
"SSE.Views.EditChart.textGridlines": "Quadrillage",
"SSE.Views.EditChart.textHorAxis": "Axe horizontal",
"SSE.Views.EditChart.textHorizontal": "Horizontal",
"SSE.Views.EditChart.textLabelOptions": "Options d'étiquettes",

11
apps/spreadsheeteditor/mobile/locale/it.json
View file

@ -121,6 +121,7 @@
"SSE.Controllers.Main.errorCountArgExceed": "Un errore nella formula inserita.<br>E' stato superato il numero di argomenti.",
"SSE.Controllers.Main.errorCreateDefName": "Gli intervalli denominati esistenti non possono essere modificati e quelli nuovi non possono essere creati<br>al momento alcuni di essi sono in fase di modifica.",
"SSE.Controllers.Main.errorDatabaseConnection": "Errore esterno.<br>Errore di connessione a banca dati. Si prega di contattare l'assistenza tecnica nel caso in cui l'errore persiste.",
"SSE.Controllers.Main.errorDataEncrypted": "Le modifiche crittografate sono state ricevute, non possono essere decifrate.",
"SSE.Controllers.Main.errorDataRange": "Intervallo di dati non corretto.",
"SSE.Controllers.Main.errorDefaultMessage": "Codice errore: %1",
"SSE.Controllers.Main.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.",
@ -167,14 +168,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "Caricamento delle immagini",
"SSE.Controllers.Main.loadImageTextText": "Caricamento dell'immagine in corso...",
"SSE.Controllers.Main.loadImageTitleText": "Caricamento dell'immagine",
"SSE.Controllers.Main.loadingDocumentTextText": "Caricamento del documento in corso...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Caricamento del documento",
"SSE.Controllers.Main.loadingDocumentTextText": "Caricamento del foglio di calcolo...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Caricamento del foglio di calcolo",
"SSE.Controllers.Main.mailMergeLoadFileText": "Caricamento origine dati...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Caricamento origine dati",
"SSE.Controllers.Main.notcriticalErrorTitle": "Avviso",
"SSE.Controllers.Main.openErrorText": "Si è verificato un errore all'apertura del file",
"SSE.Controllers.Main.openTextText": "Apertura del documento in corso...",
"SSE.Controllers.Main.openTitleText": "Apertura del documento",
"SSE.Controllers.Main.pastInMergeAreaError": "Impossibile modificare una parte della cella unita",
"SSE.Controllers.Main.printTextText": "Stampa del documento in corso...",
"SSE.Controllers.Main.printTitleText": "Stampa del documento",
"SSE.Controllers.Main.reloadButtonText": "Ricarica pagina",
@ -194,7 +196,7 @@
"SSE.Controllers.Main.textClose": "Chiudi",
"SSE.Controllers.Main.textContactUs": "Contatta il reparto vendite.",
"SSE.Controllers.Main.textDone": "Fatto",
"SSE.Controllers.Main.textLoadingDocument": "Caricamento del documento",
"SSE.Controllers.Main.textLoadingDocument": "Caricamento del foglio di calcolo",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Password",
@ -256,7 +258,9 @@
"SSE.Controllers.Main.uploadImageSizeMessage": "È stata superata la dimensione massima dell'immagine.",
"SSE.Controllers.Main.uploadImageTextText": "Caricamento dell'immagine in corso...",
"SSE.Controllers.Main.uploadImageTitleText": "Caricamento dell'immagine",
"SSE.Controllers.Main.warnLicenseExceeded": "Il numero di connessioni simultanee al server dei documenti è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Contattare l'amministratore per ulteriori informazioni.",
"SSE.Controllers.Main.warnLicenseExp": "La tua licenza è scaduta.<br>Si prega di aggiornare la licenza e ricaricare la pagina.",
"SSE.Controllers.Main.warnLicenseUsersExceeded": "Il numero di utenti simultaei è stato superato e il documento verrà aperto solo per la visualizzazione. <br>Per ulteriori informazioni, contattare l'amministratore.",
"SSE.Controllers.Main.warnNoLicense": "Questa versione di ONLYOFFICE® Editors presenta delle limitazioni per le connessioni simultanee al server dei documenti.<br>Se necessiti di avere di più, considera l'acquisto di una licenza commerciale.",
"SSE.Controllers.Main.warnNoLicenseUsers": "Questa versione di ONLYOFFICE Editors presenta alcune limitazioni per gli utenti simultanei. <br> Se hai bisogno di più, ti preghiamo di considerare l'aggiornamento della tua licenza attuale o l'acquisto di una licenza commerciale.",
"SSE.Controllers.Main.warnProcessRightsChange": "Ti è stato negato il diritto di modificare il file.",
@ -376,6 +380,7 @@
"SSE.Views.EditChart.textDisplayUnits": "Mostra unità",
"SSE.Views.EditChart.textFill": "Riempimento",
"SSE.Views.EditChart.textForward": "Sposta avanti",
"SSE.Views.EditChart.textGridlines": "Gridlines",
"SSE.Views.EditChart.textHorAxis": "Asse orizzontale",
"SSE.Views.EditChart.textHorizontal": "Orizzontale",
"SSE.Views.EditChart.textLabelOptions": "Opzioni etichetta",

8
apps/spreadsheeteditor/mobile/locale/ko.json
View file

@ -167,14 +167,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "이미지로드 중",
"SSE.Controllers.Main.loadImageTextText": "이미지로드 중 ...",
"SSE.Controllers.Main.loadImageTitleText": "이미지로드 중",
"SSE.Controllers.Main.loadingDocumentTextText": "문서로드 중 ...",
"SSE.Controllers.Main.loadingDocumentTitleText": "문서로드 중",
"SSE.Controllers.Main.loadingDocumentTextText": "스프레드 시트로드 중 ...",
"SSE.Controllers.Main.loadingDocumentTitleText": "스프레드 시트로드 중",
"SSE.Controllers.Main.mailMergeLoadFileText": "데이터 소스로드 중 ...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "데이터 소스로드 중",
"SSE.Controllers.Main.notcriticalErrorTitle": "경고",
"SSE.Controllers.Main.openErrorText": "파일을 여는 동안 오류가 발생했습니다.",
"SSE.Controllers.Main.openTextText": "문서 열기 중 ...",
"SSE.Controllers.Main.openTitleText": "문서 열기",
"SSE.Controllers.Main.pastInMergeAreaError": "병합 된 셀의 일부를 변경할 수 없습니다",
"SSE.Controllers.Main.printTextText": "문서 인쇄 중 ...",
"SSE.Controllers.Main.printTitleText": "문서 인쇄",
"SSE.Controllers.Main.reloadButtonText": "Reload Page",
@ -194,7 +195,7 @@
"SSE.Controllers.Main.textClose": "닫기",
"SSE.Controllers.Main.textContactUs": "영업 담당자에게 문의",
"SSE.Controllers.Main.textDone": "완료",
"SSE.Controllers.Main.textLoadingDocument": "문서로드 중",
"SSE.Controllers.Main.textLoadingDocument": "스프레드 시트로드 중",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE 연결 제한",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Password",
@ -375,6 +376,7 @@
"SSE.Views.EditChart.textDisplayUnits": "표시 단위",
"SSE.Views.EditChart.textFill": "채우기",
"SSE.Views.EditChart.textForward": "앞으로 이동",
"SSE.Views.EditChart.textGridlines": "눈금 선",
"SSE.Views.EditChart.textHorAxis": "가로 축",
"SSE.Views.EditChart.textHorizontal": "Horizontal",
"SSE.Views.EditChart.textLabelOptions": "레이블 옵션",

7
apps/spreadsheeteditor/mobile/locale/lv.json
View file

@ -167,14 +167,15 @@
"SSE.Controllers.Main.loadImagesTitleText": "Ielādē attēlus",
"SSE.Controllers.Main.loadImageTextText": "Ielādē attēlu...",
"SSE.Controllers.Main.loadImageTitleText": "Ielādē attēlu",
"SSE.Controllers.Main.loadingDocumentTextText": "Ielādē dokumentu...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Ielādē dokumentu",
"SSE.Controllers.Main.loadingDocumentTextText": "Ielādē izklājlapu...",
"SSE.Controllers.Main.loadingDocumentTitleText": "Ielādē izklājlapu",
"SSE.Controllers.Main.mailMergeLoadFileText": "Ielādē datu avotu...",
"SSE.Controllers.Main.mailMergeLoadFileTitle": "Ielādē datu avotu",
"SSE.Controllers.Main.notcriticalErrorTitle": "Brīdinājums",
"SSE.Controllers.Main.openErrorText": "Faila atvēršanas laikā radās kļūda",
"SSE.Controllers.Main.openTextText": "Dokumenta atvēršana...",
"SSE.Controllers.Main.openTitleText": "Dokumenta atvēršana",
"SSE.Controllers.Main.pastInMergeAreaError": "Nevar mainīt apvienotas šūnas daļu",
"SSE.Controllers.Main.printTextText": "Drukā dokumentu...",
"SSE.Controllers.Main.printTitleText": "Drukā dokumentu",
"SSE.Controllers.Main.reloadButtonText": "Pārlādēt lapu",
@ -194,7 +195,7 @@
"SSE.Controllers.Main.textClose": "Aizvērt",
"SSE.Controllers.Main.textContactUs": "Sazināties ar pārdošanas daļu",
"SSE.Controllers.Main.textDone": "Gatavs",
"SSE.Controllers.Main.textLoadingDocument": "Ielādē dokumentu",
"SSE.Controllers.Main.textLoadingDocument": "Ielādē izklājlapu",
"SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE pieslēguma ierobežojums",
"SSE.Controllers.Main.textOK": "OK",
"SSE.Controllers.Main.textPassword": "Parole",

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