Merge branch 'release/v5.2.0' into develop

This commit is contained in:
Julia Radzhabova 2018-09-28 13:47:04 +03:00
commit f671569c88
1793 changed files with 9579 additions and 6893 deletions

View file

@ -46,6 +46,7 @@
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
fillForms: <can edit forms in view mode> // default = edit || review
}
},
editorConfig: {

View file

@ -187,6 +187,7 @@
.close {
font-size: 28px;
font-family: Arial, sans-serif;
color: #666666;
opacity: 0.8;
display: block;

View file

@ -600,6 +600,9 @@ define([
}
}
if (disabled && this.menu && _.isObject(this.menu) && this.menu.rendered && this.menu.isVisible())
setTimeout(function(){ me.menu.hide()}, 1);
if ( !!me.options.signals ) {
var opts = me.options.signals;
if ( !(opts.indexOf('disabled') < 0) ) {

View file

@ -77,7 +77,7 @@ define([
Common.UI.ComboBorderSize = Common.UI.ComboBox.extend(_.extend({
template: _.template([
'<div class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<div class="form-control" style="<%= style %>"></div>',
'<div class="form-control" style="padding-top:2px; <%= style %>"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',

View file

@ -320,6 +320,33 @@ define([
}
},
selectByRGB: function(rgb, suppressEvent) {
var el = $(this.el);
el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
var color = (typeof(rgb) == 'object') ? rgb.color : rgb;
if (/#?[a-fA-F0-9]{6}/.test(color)) {
color = /#?([a-fA-F0-9]{6})/.exec(color)[1].toUpperCase();
}
if (/^[a-fA-F0-9]{6}|transparent$/.test(color)) {
if (color != this.value || this.options.allowReselect) {
var co = (color == 'transparent') ? el.find('a.color-transparent') : el.find('a.color-' + color).first();
if (co.length==0)
co = el.find('#'+color).first();
if (co.length==0)
co = el.find('a[color="'+color+'"]').first();
if (co.length>0) {
co.addClass(this.selectedCls);
this.value = color;
}
if (suppressEvent !== true) {
this.fireEvent('select', this, color);
}
}
}
},
updateColors: function(effectcolors, standartcolors, value) {
if (effectcolors===undefined || standartcolors===undefined) return;

View file

@ -68,7 +68,7 @@ define([
var me = this;
Common.NotificationCenter.on('layout:changed', function(area){
Common.Utils.asyncCall(function(e) {
if ( e == 'toolbar' && me.panelChat.$el.is(':visible') ) {
if ( (e == 'toolbar' || e == 'status') && me.panelChat.$el.is(':visible') ) {
me.panelChat.updateLayout(true);
me.panelChat.setupAutoSizingTextBox();
}

View file

@ -133,7 +133,7 @@ define([
Common.NotificationCenter.on('app:comment:add', _.bind(this.onAppAddComment, this));
Common.NotificationCenter.on('layout:changed', function(area){
Common.Utils.asyncCall(function(e) {
if ( e == 'toolbar' && this.view.$el.is(':visible') ) {
if ( (e == 'toolbar' || e == 'status') && this.view.$el.is(':visible') ) {
this.onAfterShow();
}
}, this, area);
@ -147,7 +147,7 @@ define([
this.popoverComments = new Common.Collections.Comments();
if (this.popoverComments) {
this.popoverComments.comparator = function (collection) { return -collection.get('time'); };
this.popoverComments.comparator = function (collection) { return collection.get('time'); };
}
this.view = this.createView('Common.Views.Comments', { store: this.collection });
@ -831,9 +831,8 @@ define([
saveTxtReplyId = '',
comment = null,
text = '',
animate = true;
this.popoverComments.reset();
animate = true,
comments = [];
for (i = 0; i < uids.length; ++i) {
saveTxtId = uids[i];
@ -871,11 +870,15 @@ define([
this.isSelectedComment = !hint || !this.hintmode;
this.uids = _.clone(uids);
this.popoverComments.push(comment);
comments.push(comment);
if (!this._dontScrollToComment)
this.view.commentsView.scrollToRecord(comment);
this._dontScrollToComment = false;
}
comments.sort(function (a, b) {
return a.get('time') - b.get('time');
});
this.popoverComments.reset(comments);
if (popover.isVisible()) {
popover.hide();
@ -937,9 +940,7 @@ define([
if (this.isModeChanged)
this.onApiShowComment(uids, posX, posY, leftX);
if (0 === this.popoverComments.length) {
this.popoverComments.reset();
var comments = [];
for (i = 0; i < uids.length; ++i) {
saveTxtId = uids[i];
saveTxtReplyId = uids[i] + '-R';
@ -956,8 +957,12 @@ define([
text = this.subEditStrings[saveTxtReplyId];
}
this.popoverComments.push(comment);
comments.push(comment);
}
comments.sort(function (a, b) {
return a.get('time') - b.get('time');
});
this.popoverComments.reset(comments);
useAnimation = true;
this.getPopover().showComments(useAnimation, undefined, undefined, text);

View file

@ -166,6 +166,7 @@ define([
variation.set_Buttons(itemVar.get('buttons'));
variation.set_Size(itemVar.get('size'));
variation.set_InitOnSelectionChanged(itemVar.get('initOnSelectionChanged'));
variation.set_Events(itemVar.get('events'));
variationsArr.push(variation);
});
plugin.set_Variations(variationsArr);

View file

@ -87,14 +87,13 @@ define([
if (api) {
this.api = api;
if (this.appConfig.isDesktopApp && this.appConfig.isOffline) {
if (this.appConfig.isPasswordSupport)
this.api.asc_registerCallback('asc_onDocumentPassword', _.bind(this.onDocumentPassword, this));
if (this.appConfig.canProtect) {
Common.NotificationCenter.on('protect:sign', _.bind(this.onSignatureRequest, this));
Common.NotificationCenter.on('protect:signature', _.bind(this.onSignatureClick, this));
this.api.asc_registerCallback('asc_onSignatureClick', _.bind(this.onSignatureSign, this));
this.api.asc_registerCallback('asc_onUpdateSignatures', _.bind(this.onApiUpdateSignatures, this));
}
if (this.appConfig.isSignatureSupport) {
Common.NotificationCenter.on('protect:sign', _.bind(this.onSignatureRequest, this));
Common.NotificationCenter.on('protect:signature', _.bind(this.onSignatureClick, this));
this.api.asc_registerCallback('asc_onSignatureClick', _.bind(this.onSignatureSign, this));
this.api.asc_registerCallback('asc_onUpdateSignatures', _.bind(this.onApiUpdateSignatures, this));
}
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this));
}

View file

@ -497,7 +497,7 @@ define([
state = (state == 'on');
this.api.asc_SetTrackRevisions(state);
Common.localStorage.setItem(this.view.appPrefix + "track-changes", state ? 1 : 0);
Common.localStorage.setItem(this.view.appPrefix + "track-changes-" + (this.appConfig.fileKey || ''), state ? 1 : 0);
this.view.turnChanges(state);
}
@ -612,17 +612,9 @@ define([
me.api.asc_SetTrackRevisions(state);
};
if ( config.isReviewOnly ) {
me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);
_setReviewStatus(true);
} else
if ( !me.api.asc_IsTrackRevisions() ) {
_setReviewStatus(false);
} else {
me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);
_setReviewStatus(Common.localStorage.getBool(me.view.appPrefix + "track-changes"));
}
var state = config.isReviewOnly || Common.localStorage.getBool(me.view.appPrefix + "track-changes-" + (config.fileKey || ''));
me.api.asc_HaveRevisionsChanges() && me.view.markChanges(true);
_setReviewStatus(state);
if ( typeof (me.appConfig.customization) == 'object' && (me.appConfig.customization.showReviewChanges==true) ) {
me.dlgChanges = (new Common.Views.ReviewChangesDialog({

View file

@ -586,6 +586,7 @@ Common.Utils.isBrowserSupported = function() {
};
Common.Utils.showBrowserRestriction = function() {
if (document.getElementsByClassName && document.getElementsByClassName('app-error-panel').length>0) return;
var editor = (window.DE ? 'Document' : window.SSE ? 'Spreadsheet' : window.PE ? 'Presentation' : 'that');
var newDiv = document.createElement("div");
newDiv.innerHTML = '<div class="app-error-panel">' +

View file

@ -60,8 +60,7 @@ define([
storeMessages: undefined,
tplUser: ['<li id="<%= user.get("iid") %>"<% if (!user.get("online")) { %> class="offline"<% } %>>',
'<div class="name"><%= scope.getUserName(user.get("username")) %>',
'<div class="color" style="background-color: <%= user.get("color") %>;" ></div>',
'<div class="name"><div class="color" style="background-color: <%= user.get("color") %>;" ></div><%= scope.getUserName(user.get("username")) %>',
'</div>',
'</li>'].join(''),

View file

@ -120,7 +120,7 @@ define([
function onResetUsers(collection, opts) {
var usercount = collection.getEditingCount();
if ( $userList ) {
if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit && !appConfig.canComments) {
if ( usercount > 1 || usercount > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit) {
$userList.html(templateUserList({
users: collection.chain().filter(function(item){return item.get('online') && !item.get('view')}).groupBy(function(item) {return item.get('idOriginal');}).value(),
usertpl: _.template(templateUserItem),
@ -148,7 +148,7 @@ define([
};
function applyUsers(count, originalCount) {
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.canComments; // has other user(s) who edit document
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit; // has other user(s) who edit document
if ( has_edit_users ) {
$btnUsers
.attr('data-toggle', 'dropdown')
@ -181,16 +181,14 @@ define([
if ( !$btnUsers.menu ) {
$panelUsers.removeClass('open');
this.fireEvent('click:users', this);
} else {
var usertip = $btnUsers.data('bs.tooltip');
if ( usertip ) {
if ( usertip.dontShow===undefined)
usertip.dontShow = true;
return false;
}
var usertip = $btnUsers.data('bs.tooltip');
if ( usertip ) {
if ( usertip.dontShow===undefined)
usertip.dontShow = true;
usertip.hide();
usertip.hide();
}
}
}
@ -224,7 +222,7 @@ define([
var editingUsers = storeUsers.getEditingCount();
$btnUsers.tooltip({
title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit && !appConfig.canComments) ? me.tipViewUsers : me.tipAccessRights,
title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit && !appConfig.isRestrictedEdit) ? me.tipViewUsers : me.tipAccessRights,
titleNorm: me.tipAccessRights,
titleExt: me.tipViewUsers,
placement: 'bottom',
@ -240,7 +238,7 @@ define([
});
$labelChangeRights[(!mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length)?'show':'hide']();
$panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit && !appConfig.canComments || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide']();
$panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit || !mode.isOffline && !mode.isReviewOnly && mode.sharingSettingsUrl && mode.sharingSettingsUrl.length) ? 'show' : 'hide']();
if ( $saveStatus ) {
$saveStatus.attr('data-width', me.textSaveExpander);
@ -642,7 +640,7 @@ define([
$btnUsers.addClass('disabled').attr('disabled', 'disabled'); else
$btnUsers.removeClass('disabled').attr('disabled', '');
} else {
function _lockButton(btn) {
var _lockButton = function (btn) {
if ( btn ) {
if ( lock ) {
btn.keepState = {
@ -654,7 +652,7 @@ define([
delete btn.keepState;
}
}
}
};
switch ( alias ) {
case 'undo': _lockButton(me.btnUndo); break;

View file

@ -83,7 +83,7 @@ define([
'style="display: block; ' + '<% if (!isRevision) { %>' + 'padding-left: 40px;' + '<% } %>' + '<% if (canRestore && selected) { %>' + 'padding-bottom: 6px;' + '<% } %>' +'">',
'<div class="user-date"><%= created %></div>',
'<% if (markedAsVersion) { %>',
'<div class="user-version">ver.<%=version%></div>',
'<div class="user-version">' + this.textVer + '<%=version%></div>',
'<% } %>',
'<% if (isRevision && hasChanges) { %>',
'<div class="revision-expand img-commonctrl ' + '<% if (isExpanded) { %>' + 'up' + '<% } %>' + '"></div>',
@ -150,7 +150,8 @@ define([
textHide: 'Collapse',
textCloseHistory: 'Close History',
textHideAll: 'Hide detailed changes',
textShowAll: 'Show detailed changes'
textShowAll: 'Show detailed changes',
textVer: 'ver.'
}, Common.Views.History || {}))
});

View file

@ -53,12 +53,23 @@ define([
var t = this,
_options = {};
var width, height;
if (options.preview) {
width = 414;
height = 277;
} else {
width = (options.type !== Asc.c_oAscAdvancedOptionsID.DRM) ? 340 : (options.warning ? 370 : 262);
height = (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : (options.warning ? 187 : 147);
}
_.extend(_options, {
closable : false,
mode : 1, // open settings
closable : (options.mode==2), // if save settings
preview : options.preview,
warning : options.warning,
width : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM && options.warning) ? 370 : 262),
height : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : (options.warning ? 187 : 147)),
width : width,
height : height,
header : true,
cls : 'open-dlg',
contentTemplate : '',
@ -85,10 +96,10 @@ define([
'</div>',
'<% } %>',
'<% } else { %>',
'<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">',
'<div style="<% if (!!preview && type == Asc.c_oAscAdvancedOptionsID.CSV) { %>width: 230px;margin-right: 10px;display: inline-block;<% } else { %>width: 100%;<% } %>margin-bottom:15px;">',
'<label class="header">' + t.txtEncoding + '</label>',
'<div>',
'<div id="id-codepages-combo" class="input-group-nr" style="display: inline-block; vertical-align: middle;"></div>',
'<div id="id-codepages-combo" class="input-group-nr" style="width: 100%; display: inline-block; vertical-align: middle;"></div>',
'</div>',
'</div>',
'<% if (type == Asc.c_oAscAdvancedOptionsID.CSV) { %>',
@ -120,7 +131,7 @@ define([
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok">' + t.okButtonText + '</button>',
'<% if (closable) { %>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + t.closeButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel" style="margin-left:10px;">' + ((_options.mode == 1) ? t.closeButtonText : t.cancelButtonText) + '</button>',
'<% } %>',
'</div>'
].join('');
@ -211,7 +222,7 @@ define([
delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
(delimiter == -1) && (delimiter = null);
this.handler.call(this, encoding, delimiter, delimiterChar);
this.handler.call(this, state, encoding, delimiter, delimiterChar);
} else {
this.handler.call(this, state, this.inputPwd.getValue());
}
@ -250,16 +261,16 @@ define([
_.template([
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
'<div style="display: inline-block;"><%= item.displayValue %></div>',
'<label style="text-align: right;width:' + lcid_width + 'px;"><%= item.lcid %></label>',
'<div style="display: inline-block;"><%= item.displayValue %></div>',
'<label style="text-align: right;width:' + lcid_width + 'px;"><%= item.lcid %></label>',
'</a></li>',
'<% }); %>'
].join(''));
this.cmbEncoding = new Common.UI.ComboBox({
el: $('#id-codepages-combo', this.$window),
style: 'width: 230px;',
menuStyle: 'min-width: 230px; max-height: 200px;',
style: 'width: 100%;',
menuStyle: 'min-width: 100%; max-height: 200px;',
cls: 'input-group-nr',
menuCls: 'scrollable-menu',
data: listItems,
@ -277,7 +288,7 @@ define([
var ul = this.cmbEncoding.cmpEl.find('ul'),
a = ul.find('li:nth(0) a'),
width = ul.width() - parseInt(a.css('padding-left')) - parseInt(a.css('padding-right')) - 50;
ul.find('li div').width(width + 10);
ul.find('li div').width(width);
}
if (this.type == Asc.c_oAscAdvancedOptionsID.CSV) {

View file

@ -65,7 +65,7 @@ define([
function setEvents() {
var me = this;
if ( me.appConfig.isDesktopApp && me.appConfig.isOffline ) {
if (me.appConfig.isPasswordSupport) {
this.btnsAddPwd.concat(this.btnsChangePwd).forEach(function(button) {
button.on('click', function (b, e) {
me.fireEvent('protect:password', [b, 'add']);
@ -81,19 +81,19 @@ define([
this.btnPwd.menu.on('item:click', function (menu, item, e) {
me.fireEvent('protect:password', [menu, item.value]);
});
}
if (me.appConfig.canProtect) {
if (this.btnSignature.menu)
this.btnSignature.menu.on('item:click', function (menu, item, e) {
me.fireEvent('protect:signature', [item.value, false]);
});
this.btnsInvisibleSignature.forEach(function(button) {
button.on('click', function (b, e) {
me.fireEvent('protect:signature', ['invisible']);
});
if (me.appConfig.isSignatureSupport) {
if (this.btnSignature.menu)
this.btnSignature.menu.on('item:click', function (menu, item, e) {
me.fireEvent('protect:signature', [item.value, false]);
});
}
this.btnsInvisibleSignature.forEach(function(button) {
button.on('click', function (b, e) {
me.fireEvent('protect:signature', ['invisible']);
});
});
}
}
@ -116,7 +116,7 @@ define([
var filter = Common.localStorage.getKeysFilter();
this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : '';
if ( this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
if ( this.appConfig.isPasswordSupport ) {
this.btnAddPwd = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-protect',
@ -131,18 +131,18 @@ define([
menu: true,
visible: false
});
if (this.appConfig.canProtect) {
this.btnSignature = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-signature',
caption: this.txtSignature,
menu: (this.appPrefix !== 'pe-')
});
if (!this.btnSignature.menu)
this.btnsInvisibleSignature.push(this.btnSignature);
}
}
if (this.appConfig.isSignatureSupport) {
this.btnSignature = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-ic-signature',
caption: this.txtSignature,
menu: (this.appPrefix !== 'pe-')
});
if (!this.btnSignature.menu)
this.btnsInvisibleSignature.push(this.btnSignature);
}
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
@ -159,25 +159,26 @@ define([
(new Promise(function (accept, reject) {
accept();
})).then(function(){
if ( config.isDesktopApp && config.isOffline) {
me.btnAddPwd.updateHint(me.hintAddPwd);
me.btnPwd.updateHint(me.hintPwd);
me.btnPwd.setMenu(
new Common.UI.Menu({
items: [
{
caption: me.txtChangePwd,
value: 'add'
},
{
caption: me.txtDeletePwd,
value: 'delete'
}
]
})
);
if ( config.canProtect) {
if ( config.isPasswordSupport) {
me.btnAddPwd.updateHint(me.hintAddPwd);
me.btnPwd.updateHint(me.hintPwd);
me.btnPwd.setMenu(
new Common.UI.Menu({
items: [
{
caption: me.txtChangePwd,
value: 'add'
},
{
caption: me.txtDeletePwd,
value: 'delete'
}
]
})
);
}
if (me.btnSignature) {
me.btnSignature.updateHint((me.btnSignature.menu) ? me.hintSignature : me.txtInvisibleSignature);
me.btnSignature.menu && me.btnSignature.setMenu(
@ -206,9 +207,9 @@ define([
getPanel: function () {
this.$el = $(_.template(template)( {} ));
if ( this.appConfig.isDesktopApp && this.appConfig.isOffline ) {
this.btnAddPwd.render(this.$el.find('#slot-btn-add-password'));
this.btnPwd.render(this.$el.find('#slot-btn-change-password'));
if ( this.appConfig.canProtect ) {
this.btnAddPwd && this.btnAddPwd.render(this.$el.find('#slot-btn-add-password'));
this.btnPwd && this.btnPwd.render(this.$el.find('#slot-btn-change-password'));
this.btnSignature && this.btnSignature.render(this.$el.find('#slot-btn-signature'));
}
return this.$el;

View file

@ -145,7 +145,7 @@ define([
cls : 'input-group-nr',
style : 'width: 234px;',
menuCls : 'scrollable-menu',
menuStyle : 'min-width: 55px;max-height: 270px;',
menuStyle : 'min-width: 234px;max-height: 270px;',
store : new Common.Collections.Fonts(),
recent : 0,
hint : me.tipFontName

View file

@ -10,4 +10,4 @@
<path d="M78,52.7h-.3a14.8,14.8,0,0,0-14,.5,14.8,14.8,0,0,0-14.3-.2h-.1a.3.3,0,0,0-.1.2c0,.1.1.2.3.2h0a14.8,14.8,0,0,1,4.2-.1c4,.3,7.4,1.6,9.8,4.3.2.1.3.1.4,0,3.1-3.5,7.8-4.9,12.8-4.4h1.2a.2.2,0,0,0,.2-.2h0C78.1,52.8,78.1,52.8,78,52.7Z" style="fill: #fff"/>
<path d="M72.2,65.2h0a26,26,0,0,0-25,2.8,26.1,26.1,0,0,0-25.1,2.2h0l-.2.3a.4.4,0,0,0,.4.4h.1a26.7,26.7,0,0,1,7.5-1.1c6.9,0,13.1,1.6,17.7,6h.2c.2,0,.3-.1.3-.2l.3-.3c4.7-6.4,12.5-9.6,21.1-9.6h2.4c.2-.1.4-.2.4-.4Z" style="fill: #fff"/>
</symbol>
</svg>
</svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -15,4 +15,4 @@
<path d="M70.8,47.3l-1-2.7H66.6l-1,2.7h-1l3.2-8.6h.8l3.2,8.6Zm-1.3-3.6L68.6,41a5.6,5.6,0,0,1-.4-1.2c-.1.3-.2.8-.3,1.2l-1,2.7Z" style="fill: #ba4c3f"/>
</g>
</symbol>
</svg>
</svg>

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View file

@ -52,10 +52,9 @@
}
.color {
position: absolute;
top: 0;
left: 0;
margin-top: 1px;
display: inline-block;
vertical-align: middle;
margin: 0 5px 3px 0;
width: 12px;
height: 12px;
border: 1px solid @gray-dark;
@ -65,12 +64,12 @@
font-size: 12px;
font-weight: bold;
display: block;
position: relative;
padding: 0 10px 0 16px;
margin-top: -2px;
padding: 0 10px 0 0;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
line-height: normal;
height: 16px;
}
}

View file

@ -51,7 +51,6 @@
&.right {
flex-grow: 1;
min-width: 100px;
line-height: 20px;
}
.status-label {

View file

@ -142,6 +142,7 @@
.box-panels {
flex-grow: 1;
-ms-flex: 1;
.panel:not(.active) {
display: none;

View file

@ -466,7 +466,8 @@ define([
},
changeToolbarSaveState: function (state) {
this.leftMenu.menuFile.getButton('save').setDisabled(state);
var btnSave = this.leftMenu.menuFile.getButton('save');
btnSave && btnSave.setDisabled(state);
},
/** coauthoring begin **/

View file

@ -150,7 +150,7 @@ define([
item.setDisabled(need_disable);
}, this);
need_disable = paragraph_locked || header_locked || control_plain;
need_disable = paragraph_locked || header_locked || in_header || control_plain;
this.view.btnBookmarks.setDisabled(need_disable);
},
@ -256,8 +256,7 @@ define([
win.show();
break;
case 'remove':
if (currentTOC)
currentTOC = props.get_InternalClass();
currentTOC = (currentTOC && props) ? props.get_InternalClass() : undefined;
this.api.asc_RemoveTableOfContents(currentTOC);
break;
}
@ -265,9 +264,12 @@ define([
},
onTableContentsUpdate: function(type, currentTOC){
if (currentTOC)
currentTOC = this.api.asc_GetTableOfContentsPr(currentTOC).get_InternalClass();
this.api.asc_UpdateTableOfContents(type == 'pages', currentTOC);
var props = this.api.asc_GetTableOfContentsPr(currentTOC);
if (props) {
if (currentTOC && props)
currentTOC = props.get_InternalClass();
this.api.asc_UpdateTableOfContents(type == 'pages', currentTOC);
}
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},

View file

@ -111,6 +111,7 @@ define([
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false};
this.languages = null;
this.translationTable = [];
this.isModalShowed = 0;
// Initialize viewport
if (!Common.Utils.isBrowserSupported()){
@ -180,6 +181,7 @@ define([
this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this));
this.api.asc_registerCallback('asc_onMeta', _.bind(this.onMeta, this));
this.api.asc_registerCallback('asc_onSpellCheckInit', _.bind(this.loadLanguages, this));
this.api.asc_registerCallback('asc_onLicenseError', _.bind(this.onPaidFeatureError, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
@ -244,20 +246,18 @@ define([
Common.NotificationCenter.on({
'modal:show': function(){
me.isModalShowed = true;
me.isModalShowed++;
me.api.asc_enableKeyEvents(false);
},
'modal:close': function(dlg) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
me.isModalShowed = false;
me.isModalShowed--;
if (!me.isModalShowed)
me.api.asc_enableKeyEvents(true);
}
},
'modal:hide': function(dlg) {
if (dlg && dlg.$lastmodal && dlg.$lastmodal.length < 1) {
me.isModalShowed = false;
me.isModalShowed--;
if (!me.isModalShowed)
me.api.asc_enableKeyEvents(true);
}
},
'settings:unitschanged':_.bind(this.unitsChanged, this),
'dataview:focus': function(e){
@ -280,7 +280,7 @@ define([
Common.util.Shortcuts.delegateShortcuts({
shortcuts: {
'command+s,ctrl+s': _.bind(function (e) {
'command+s,ctrl+s,command+p,ctrl+p,command+k,ctrl+k,command+d,ctrl+d': _.bind(function (e) {
e.preventDefault();
e.stopPropagation();
}, this)
@ -665,9 +665,12 @@ define([
action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction});
action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide();
if ((id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && (!this._state.fastCoauth || this._state.usersCount<2 ||
if (this.appOptions.isEdit && (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton']) && (!this._state.fastCoauth || this._state.usersCount<2 ||
this.getApplication().getController('Common.Controllers.ReviewChanges').isPreviewChangesMode()))
this.synchronizeChanges();
else if (this.appOptions.isEdit && (id==Asc.c_oAscAsyncAction['Save'] || id==Asc.c_oAscAsyncAction['ForceSaveButton'] || id == Asc.c_oAscAsyncAction['ApplyChanges']) &&
this._state.fastCoauth)
this.getApplication().getController('Common.Controllers.ReviewChanges').synchronizeChanges();
if ( type == Asc.c_oAscAsyncActionType.BlockInteraction &&
(!this.getApplication().getController('LeftMenu').dlgSearch || !this.getApplication().getController('LeftMenu').dlgSearch.isVisible()) &&
@ -880,7 +883,7 @@ define([
me.api.SetCollaborativeMarksShowType(value == 'all' ? Asc.c_oAscCollaborativeMarksShowType.All :
(value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges));
Common.Utils.InternalSettings.set((me._state.fastCoauth) ? "de-settings-showchanges-fast" : "de-settings-showchanges-strict", value);
} else if (!me.appOptions.isEdit && me.appOptions.canComments) {
} else if (!me.appOptions.isEdit && me.appOptions.isRestrictedEdit) {
me._state.fastCoauth = true;
me.api.asc_SetFastCollaborative(me._state.fastCoauth);
me.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
@ -1041,6 +1044,26 @@ define([
}
},
onPaidFeatureError: function() {
var buttons = [], primary,
mail = (this.appOptions.canBranding) ? ((this.editorConfig && this.editorConfig.customization && this.editorConfig.customization.customer) ? this.editorConfig.customization.customer.mail : '') : 'sales@onlyoffice.com';
if (mail.length>0) {
buttons.push({value: 'contact', caption: this.textContactUs});
primary = 'contact';
}
buttons.push({value: 'close', caption: this.textClose});
Common.UI.info({
title: this.textPaidFeature,
msg : this.textLicencePaidFeature,
buttons: buttons,
primary: primary,
callback: function(btn) {
if (btn == 'contact')
window.open('mailto:'+mail, "_blank");
}
});
},
onOpenDocument: function(progress) {
var elem = document.getElementById('loadmask-text');
var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount());
@ -1087,7 +1110,7 @@ define([
this.appOptions.canHistoryRestore= this.editorConfig.canHistoryRestore && !!this.permissions.changeHistory;
this.appOptions.canUseMailMerge= this.appOptions.canLicense && this.appOptions.canEdit && !this.appOptions.isOffline;
this.appOptions.canSendEmailAddresses = this.appOptions.canLicense && this.editorConfig.canSendEmailAddresses && this.appOptions.canEdit && this.appOptions.canCoAuthoring;
this.appOptions.canComments = this.appOptions.canLicense && (this.permissions.comment===undefined ? this.appOptions.isEdit : this.permissions.comment);
this.appOptions.canComments = this.appOptions.canLicense && (this.permissions.comment===undefined ? this.appOptions.isEdit : this.permissions.comment) && (this.editorConfig.mode !== 'view');
this.appOptions.canComments = this.appOptions.canComments && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false);
this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit;
@ -1098,10 +1121,15 @@ 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.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.isSignatureSupport= this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isSignaturesSupport();
this.appOptions.isPasswordSupport = this.appOptions.isEdit && this.appOptions.isDesktopApp && this.appOptions.isOffline && this.api.asc_isProtectionSupport();
this.appOptions.canProtect = (this.appOptions.isSignatureSupport || this.appOptions.isPasswordSupport);
this.appOptions.canEditContentControl = (this.permissions.modifyContentControl!==false);
this.appOptions.canHelp = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.help===false);
this.appOptions.canFillForms = ((this.permissions.fillForms===undefined) ? this.appOptions.isEdit : this.permissions.fillForms) && (this.editorConfig.mode !== 'view');
this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && (this.appOptions.canComments || this.appOptions.canFillForms);
if (this.appOptions.isRestrictedEdit && this.appOptions.canComments && this.appOptions.canFillForms) // must be one restricted mode, priority for filling forms
this.appOptions.canComments = false;
if ( this.appOptions.isLightVersion ) {
this.appOptions.canUseHistory =
@ -1117,6 +1145,8 @@ define([
this.appOptions.canDownloadOrigin = this.permissions.download !== false && (type && typeof type[1] === 'string');
this.appOptions.canDownload = this.permissions.download !== false && (!type || typeof type[1] !== 'string');
this.appOptions.fileKey = this.document.key;
this.appOptions.canBranding = (licType === Asc.c_oLicenseResult.Success) && (typeof this.editorConfig.customization == 'object');
if (this.appOptions.canBranding)
appHeader.setBranding(this.editorConfig.customization);
@ -1137,8 +1167,9 @@ define([
this.onLongActionBegin(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument);
}
this.api.asc_setViewMode(!this.appOptions.isEdit && !this.appOptions.canComments);
(!this.appOptions.isEdit && this.appOptions.canComments) && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
this.api.asc_setViewMode(!this.appOptions.isEdit && !this.appOptions.isRestrictedEdit);
this.appOptions.isRestrictedEdit && this.appOptions.canComments && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
this.appOptions.isRestrictedEdit && this.appOptions.canFillForms && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms);
this.api.asc_LoadDocument();
},
@ -1169,6 +1200,7 @@ define([
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
},
applyModeEditorElements: function() {
@ -1193,7 +1225,7 @@ define([
reviewController.setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
if (this.appOptions.isDesktopApp && this.appOptions.isOffline)
if (this.appOptions.canProtect)
application.getController('Common.Controllers.Protection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api);
var viewport = this.getApplication().getController('Viewport').getView('Viewport');
@ -1226,7 +1258,6 @@ define([
me.api.asc_SetViewRulers(!Common.localStorage.getBool('de-hidden-rulers'));
me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
me.api.asc_registerCallback('asc_onDocumentCanSaveChanged', _.bind(me.onDocumentCanSaveChanged, me));
/** coauthoring begin **/
me.api.asc_registerCallback('asc_onCollaborativeChanges', _.bind(me.onCollaborativeChanges, me));
@ -1537,8 +1568,7 @@ define([
this.updateWindowTitle();
var toolbarView = this.getApplication().getController('Toolbar').getView();
if (toolbarView && !toolbarView._state.previewmode) {
if (toolbarView && toolbarView.btnCollabChanges && !toolbarView._state.previewmode) {
var isSyncButton = toolbarView.btnCollabChanges.$icon.hasClass('btn-synch'),
forcesave = this.appOptions.forcesave,
isDisabled = !isModified && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave;
@ -1852,23 +1882,26 @@ define([
this.getApplication().getController('Toolbar').getView().updateMetricUnit();
},
onAdvancedOptions: function(advOptions) {
onAdvancedOptions: function(advOptions, mode) {
if (this._state.openDlg) return;
var type = advOptions.asc_getOptionId(),
me = this;
if (type == Asc.c_oAscAdvancedOptionsID.TXT) {
me._state.openDlg = new Common.Views.OpenDialog({
mode: mode,
type: type,
preview: advOptions.asc_getOptions().asc_getData(),
codepages: advOptions.asc_getOptions().asc_getCodePages(),
settings: advOptions.asc_getOptions().asc_getRecommendedSettings(),
api: me.api,
handler: function (encoding) {
handler: function (result, encoding) {
me.isShowOpenDialog = false;
if (me && me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding));
me.loadMask && me.loadMask.show();
if (result == 'ok') {
if (me && me.api) {
me.api.asc_setAdvancedOptions(type, new Asc.asc_CTXTAdvancedOptions(encoding));
me.loadMask && me.loadMask.show();
}
}
me._state.openDlg = null;
}
@ -1967,7 +2000,7 @@ define([
},
onPrint: function() {
if (!this.appOptions.canPrint) return;
if (!this.appOptions.canPrint || this.isModalShowed) return;
if (this.api)
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
@ -2210,7 +2243,7 @@ define([
textStrict: 'Strict mode',
txtErrorLoadHistory: 'Loading history failed',
textBuyNow: 'Visit website',
textNoLicenseTitle: 'ONLYOFFICE open source version',
textNoLicenseTitle: 'ONLYOFFICE connection limitation',
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.',
@ -2265,7 +2298,10 @@ define([
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.'
errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.',
textClose: 'Close',
textPaidFeature: 'Paid feature',
textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.<br>If you need it, please contact Sales Department'
}
})(), DE.Controllers.Main || {}))
});

View file

@ -52,13 +52,6 @@ define([
return {
initialize: function () {
this.addListeners({
'Toolbar': {
'insert:break': function () {
console.log('insert page break');
}
}
});
},
onLaunch: function (view) {

View file

@ -143,27 +143,20 @@ define([
}
}
if ( config.isReviewOnly ) {
if ( config.isReviewOnly || Common.localStorage.getBool("de-track-changes-" + (config.fileKey || ''))) {
_process_changestip();
} else
if ( me.api.asc_IsTrackRevisions() ) {
if ( Common.localStorage.getBool("de-track-changes") ) {
// show tooltip "track changes in this document"
_process_changestip();
} else {
var showNewChangesTip = !Common.localStorage.getBool("de-new-changes");
if ( me.api.asc_HaveRevisionsChanges() && showNewChangesTip ) {
me.btnTurnReview.updateHint('');
} else if ( me.api.asc_IsTrackRevisions() ) {
var showNewChangesTip = !Common.localStorage.getBool("de-new-changes");
if ( me.api.asc_HaveRevisionsChanges() && showNewChangesTip ) {
me.btnTurnReview.updateHint('');
if (me.newChangesTooltip === undefined)
me.newChangesTooltip = me.createChangesTip(me.textHasChanges, 'de-new-changes', true);
if (me.newChangesTooltip === undefined)
me.newChangesTooltip = me.createChangesTip(me.textHasChanges, 'de-new-changes', true);
me.newChangesTooltip.show();
} else
me.btnTurnReview.updateHint(me.tipReview);
}
me.newChangesTooltip.show();
} else
me.btnTurnReview.updateHint(me.tipReview);
}
}
});
},

View file

@ -316,6 +316,9 @@ define([
toolbar.listStyles.on('contextmenu', _.bind(this.onListStyleContextMenu, this));
toolbar.styleMenu.on('hide:before', _.bind(this.onListStyleBeforeHide, this));
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this));
toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this));
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
$('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this));
@ -363,6 +366,7 @@ define([
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings',_.bind(this.onChangeSdtGlobalSettings, this));
},
onChangeCompactView: function(view, compact) {
@ -574,14 +578,14 @@ define([
var width = this._state.pgorient ? w : h,
height = this._state.pgorient ? h : w;
if (Math.abs(this._state.pgsize[0] - w) > 0.01 ||
Math.abs(this._state.pgsize[1] - h) > 0.01) {
if (Math.abs(this._state.pgsize[0] - w) > 0.1 ||
Math.abs(this._state.pgsize[1] - h) > 0.1) {
this._state.pgsize = [w, h];
if (this.toolbar.mnuPageSize) {
this.toolbar.mnuPageSize.clearAll();
_.each(this.toolbar.mnuPageSize.items, function(item){
if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - width) < 0.01 && Math.abs(item.value[1] - height) < 0.01) {
Math.abs(item.value[0] - width) < 0.1 && Math.abs(item.value[1] - height) < 0.1) {
item.setChecked(true);
return false;
}
@ -597,16 +601,16 @@ define([
right = props.get_RightMargin(),
bottom = props.get_BottomMargin();
if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.01 ||
Math.abs(this._state.pgmargins[1] - left) > 0.01 || Math.abs(this._state.pgmargins[2] - bottom) > 0.01 ||
Math.abs(this._state.pgmargins[3] - right) > 0.01) {
if (!this._state.pgmargins || Math.abs(this._state.pgmargins[0] - top) > 0.1 ||
Math.abs(this._state.pgmargins[1] - left) > 0.1 || Math.abs(this._state.pgmargins[2] - bottom) > 0.1 ||
Math.abs(this._state.pgmargins[3] - right) > 0.1) {
this._state.pgmargins = [top, left, bottom, right];
if (this.toolbar.btnPageMargins.menu) {
this.toolbar.btnPageMargins.menu.clearAll();
_.each(this.toolbar.btnPageMargins.menu.items, function(item){
if (item.value && typeof(item.value) == 'object' &&
Math.abs(item.value[0] - top) < 0.01 && Math.abs(item.value[1] - left) < 0.01 &&
Math.abs(item.value[2] - bottom) < 0.01 && Math.abs(item.value[3] - right) < 0.01) {
Math.abs(item.value[0] - top) < 0.1 && Math.abs(item.value[1] - left) < 0.1 &&
Math.abs(item.value[2] - bottom) < 0.1 && Math.abs(item.value[3] - right) < 0.1) {
item.setChecked(true);
return false;
}
@ -743,10 +747,12 @@ define([
need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control;
toolbar.btnsPageBreak.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || !can_add_image || in_equation || control_plain;
toolbar.btnInsertImage.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || in_equation || control_plain;
toolbar.btnInsertShape.setDisabled(need_disable);
toolbar.btnInsertText.setDisabled(need_disable);
need_disable = paragraph_locked || header_locked || !can_add_image || in_equation || control_plain;
toolbar.btnInsertImage.setDisabled(need_disable);
toolbar.btnInsertTextArt.setDisabled(need_disable || in_image || in_footnote);
if (in_chart !== this._state.in_chart) {
@ -885,6 +891,19 @@ define([
this._onInitEditorStyles(styles);
},
onChangeSdtGlobalSettings: function() {
var show = this.api.asc_GetGlobalContentControlShowHighlight();
this.toolbar.mnuNoControlsColor.setChecked(!show, true);
this.toolbar.mnuControlsColorPicker.clearSelection();
if (show){
var clr = this.api.asc_GetGlobalContentControlHighlightColor();
if (clr) {
clr = Common.Utils.ThemeColor.getHexColor(clr.get_r(), clr.get_g(), clr.get_b());
this.toolbar.mnuControlsColorPicker.selectByRGB(clr, true);
}
}
},
onNewDocument: function(btn, e) {
if (this.api)
this.api.OpenNewDocument();
@ -1623,6 +1642,7 @@ define([
var me = this;
(new DE.Views.ControlSettingsDialog({
props: props,
api: me.api,
handler: function(result, value) {
if (result == 'ok') {
me.api.asc_SetContentControlProperties(value, id);
@ -1646,6 +1666,26 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
onNewControlsColor: function(picker, color) {
this.toolbar.mnuControlsColorPicker.addNewColor();
},
onNoControlsColor: function(item) {
this.api.asc_SetGlobalContentControlShowHighlight(!item.isChecked());
if (!item.isChecked())
this.api.asc_SetGlobalContentControlHighlightColor(220, 220, 220);
},
onSelectControlsColor: function(picker, color) {
var clr = Common.Utils.ThemeColor.getRgbColor(color);
if (this.api) {
this.api.asc_SetGlobalContentControlShowHighlight(true);
this.api.asc_SetGlobalContentControlHighlightColor(clr.get_r(), clr.get_g(), clr.get_b());
}
Common.component.Analytics.trackEvent('ToolBar', 'Content Controls Color');
},
onColumnsSelect: function(menu, item) {
if (_.isUndefined(item.value))
return;
@ -2517,6 +2557,9 @@ define([
this.onParagraphColor(this._state.clrshd_asccolor);
}
this._state.clrshd_asccolor = undefined;
updateColors(this.toolbar.mnuControlsColorPicker, 1);
this.onChangeSdtGlobalSettings();
},
_onInitEditorStyles: function(styles) {
@ -2727,7 +2770,7 @@ define([
me.toolbar.btnPaste.$el.detach().appendTo($box);
me.toolbar.btnCopy.$el.removeClass('split');
if ( config.isProtectSupport && config.isOffline ) {
if ( config.canProtect ) {
tab = {action: 'protect', caption: me.toolbar.textTabProtect};
$panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();

View file

@ -224,6 +224,8 @@ define([
checkable: true,
value: 'rulers'
});
if (!config.isEdit)
mnuitemHideRulers.hide();
me.header.mnuitemFitPage = new Common.UI.MenuItem({
caption: me.textFitPage,
@ -343,6 +345,7 @@ define([
me.header.lockHeaderBtns( 'undo', _need_disable );
me.header.lockHeaderBtns( 'redo', _need_disable );
me.header.lockHeaderBtns( 'opts', _need_disable );
me.header.lockHeaderBtns( 'users', _need_disable );
},
onApiZoomChange: function(percent, type) {

View file

@ -123,11 +123,24 @@ define([
el : $('#bookmarks-txt-name'),
allowBlank : true,
validateOnChange: true,
validateOnBlur: false,
validateOnBlur: true,
style : 'width: 195px;',
value : '',
maxLength: 40
}).on('changing', _.bind(this.onNameChanging, this));
maxLength: 40,
validation : function(value) {
var exist = me.props.asc_HaveBookmark(value),
check = me.props.asc_CheckNewBookmarkName(value);
if (exist)
me.bookmarksList.selectRecord(me.bookmarksList.store.findWhere({value: value}));
else
me.bookmarksList.deselectAll();
me.btnAdd.setDisabled(!check && !exist);
me.btnGoto.setDisabled(!exist);
me.btnDelete.setDisabled(!exist);
return (check || _.isEmpty(value)) ? true : me.txtInvalidName;
}
});
this.radioName = new Common.UI.RadioBox({
el: $('#bookmarks-radio-name'),
@ -190,6 +203,12 @@ define([
show: function() {
Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments);
var me = this;
_.delay(function(){
var input = $('input', me.txtName.cmpEl).select();
input.focus();
},100);
},
close: function() {
@ -285,17 +304,6 @@ define([
this.refreshBookmarks();
},
onNameChanging: function (input, value) {
var exist = this.props.asc_HaveBookmark(value);
if (exist)
this.bookmarksList.selectRecord(this.bookmarksList.store.findWhere({value: value}));
else
this.bookmarksList.deselectAll();
this.btnAdd.setDisabled(!this.props.asc_CheckNewBookmarkName(value) && !exist);
this.btnGoto.setDisabled(!exist);
this.btnDelete.setDisabled(!exist);
},
textTitle: 'Bookmarks',
textLocation: 'Location',
textBookmarkName: 'Bookmark name',
@ -305,7 +313,8 @@ define([
textGoto: 'Go to',
textDelete: 'Delete',
textClose: 'Close',
textHidden: 'Hidden bookmarks'
textHidden: 'Hidden bookmarks',
txtInvalidName: 'Bookmark name can only contain letters, digits and underscores, and should begin with the letter'
}, DE.Views.BookmarksDialog || {}))
});

View file

@ -48,8 +48,8 @@ define([
DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
height: 275
contentWidth: 310,
height: 412
},
initialize : function(options) {
@ -63,7 +63,7 @@ define([
'<div class="settings-panel active">',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-large">',
'<td class="padding-small">',
'<label class="input-label">', me.textName, '</label>',
'<div id="control-settings-txt-name"></div>',
'</td>',
@ -74,6 +74,46 @@ define([
'<div id="control-settings-txt-tag"></div>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-large">',
'<div class="separator horizontal"></div>',
'</td>',
'</tr>',
'</table>',
'<table cols="2" style="width: auto;">',
'<tr>',
'<td class="padding-small" colspan="2">',
'<label class="header">', me.textAppearance, '</label>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-small">',
'<label class="input-label" style="margin-right: 10px;">', me.textShowAs,'</label>',
'</td>',
'<td class="padding-small">',
'<div id="control-settings-combo-show" class="input-group-nr" style="display: inline-block; width:120px;"></div>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-small">',
'<label class="input-label" style="margin-right: 10px;">', me.textColor, '</label>',
'</td>',
'<td class="padding-small">',
'<div id="control-settings-color-btn" style="display: inline-block;"></div>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-large" colspan="2">',
'<button type="button" class="btn btn-text-default auto" id="control-settings-btn-all" style="min-width: 98px;">', me.textApplyAll,'</button>',
'</td>',
'</tr>',
'</table>',
'<table cols="1" style="width: 100%;">',
'<tr>',
'<td class="padding-large">',
'<div class="separator horizontal"></div>',
'</td>',
'</tr>',
'<tr>',
'<td class="padding-small">',
'<label class="header">', me.textLock, '</label>',
@ -102,6 +142,7 @@ define([
this.handler = options.handler;
this.props = options.props;
this.api = options.api;
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
@ -116,6 +157,7 @@ define([
validateOnChange: false,
validateOnBlur: false,
style : 'width: 100%;',
maxLength: 64,
value : ''
});
@ -125,9 +167,47 @@ define([
validateOnChange: false,
validateOnBlur: false,
style : 'width: 100%;',
maxLength: 64,
value : ''
});
this.cmbShow = new Common.UI.ComboBox({
el: $('#control-settings-combo-show'),
cls: 'input-group-nr',
menuStyle: 'min-width: 120px;',
editable: false,
data: [
{ displayValue: this.textBox, value: Asc.c_oAscSdtAppearance.Frame },
{ displayValue: this.textNone, value: Asc.c_oAscSdtAppearance.Hidden }
]
});
this.cmbShow.setValue(Asc.c_oAscSdtAppearance.Frame);
this.btnColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
items: [
{ template: _.template('<div id="control-settings-color-menu" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="control-settings-color-new" style="padding-left:12px;">' + me.textNewColor + '</a>') }
]
})
});
this.btnColor.on('render:after', function(btn) {
me.colors = new Common.UI.ThemeColorPalette({
el: $('#control-settings-color-menu')
});
me.colors.on('select', _.bind(me.onColorsSelect, me));
});
this.btnColor.render( $('#control-settings-color-btn'));
this.btnColor.setColor('000000');
this.btnColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colors, this.btnColor));
this.btnApplyAll = new Common.UI.Button({
el: $('#control-settings-btn-all')
});
this.btnApplyAll.on('click', _.bind(this.applyAllClick, this));
this.chLockDelete = new Common.UI.CheckBox({
el: $('#control-settings-chb-lock-delete'),
labelText: this.txtLockDelete
@ -141,7 +221,20 @@ define([
this.afterRender();
},
onColorsSelect: function(picker, color) {
this.btnColor.setColor(color);
},
updateThemeColors: function() {
this.colors.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
},
addNewColor: function(picker, btn) {
picker.addNewColor((typeof(btn.color) == 'object') ? btn.color.color : btn.color);
},
afterRender: function() {
this.updateThemeColors();
this._setDefaults(this.props);
},
@ -157,6 +250,14 @@ define([
val = props.get_Tag();
this.txtTag.setValue(val ? val : '');
val = props.get_Appearance();
(val!==null && val!==undefined) && this.cmbShow.setValue(val);
val = props.get_Color();
val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : '#000000';
this.btnColor.setColor(val);
this.colors.selectByRGB(val,true);
val = props.get_Lock();
(val===undefined) && (val = Asc.c_oAscSdtLockType.Unlocked);
this.chLockDelete.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.SdtLocked);
@ -166,11 +267,12 @@ define([
getSettings: function () {
var props = new AscCommon.CContentControlPr();
props.put_Alias(this.txtName.getValue());
props.put_Tag(this.txtTag.getValue());
props.put_Appearance(this.cmbShow.getValue());
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b());
var lock = Asc.c_oAscSdtLockType.Unlocked;
@ -195,6 +297,16 @@ define([
this.close();
},
applyAllClick: function(btn, eOpts){
if (this.api) {
var props = new AscCommon.CContentControlPr();
props.put_Appearance(this.cmbShow.getValue());
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b());
this.api.asc_SetContentControlProperties(props, null, true);
}
},
textTitle: 'Content Control Settings',
textName: 'Title',
textTag: 'Tag',
@ -202,7 +314,14 @@ define([
txtLockEdit: 'Contents cannot be edited',
textLock: 'Locking',
cancelButtonText: 'Cancel',
okButtonText: 'Ok'
okButtonText: 'Ok',
textShowAs: 'Show as',
textColor: 'Color',
textBox: 'Bounding box',
textNone: 'None',
textNewColor: 'Add New Custom Color',
textApplyAll: 'Apply to All',
textAppearance: 'Appearance'
}, DE.Views.ControlSettingsDialog || {}))
});

View file

@ -53,7 +53,8 @@ define([
'documenteditor/main/app/view/HyperlinkSettingsDialog',
'documenteditor/main/app/view/ParagraphSettingsAdvanced',
'documenteditor/main/app/view/TableSettingsAdvanced',
'documenteditor/main/app/view/ControlSettingsDialog'
'documenteditor/main/app/view/ControlSettingsDialog',
'documenteditor/main/app/view/NumberingValueDialog'
], function ($, _, Backbone, gateway) { 'use strict';
DE.Views.DocumentHolder = Backbone.View.extend(_.extend({
@ -1876,6 +1877,7 @@ define([
if (item.value == 'settings') {
(new DE.Views.ControlSettingsDialog({
props: props,
api: me.api,
handler: function (result, value) {
if (result == 'ok') {
me.api.asc_SetContentControlProperties(value, props.get_InternalId());
@ -1891,6 +1893,29 @@ define([
me.fireEvent('editcomplete', me);
},
onContinueNumbering: function(item, e) {
this.api.asc_ContinueNumbering();
this.fireEvent('editcomplete', this);
},
onStartNumbering: function(startfrom, item, e) {
if (startfrom == 1)
this.api.asc_RestartNumbering(item.value.start);
else {
var me = this;
(new DE.Views.NumberingValueDialog({
title: me.textNumberingValue,
props: item.value,
handler: function (result, value) {
if (result == 'ok')
me.api.asc_RestartNumbering(value);
me.fireEvent('editcomplete', me);
}
})).show();
}
this.fireEvent('editcomplete', this);
},
createDelayedElementsViewer: function() {
var me = this;
@ -1922,7 +1947,7 @@ define([
this.viewModeMenu = new Common.UI.Menu({
initMenu: function (value) {
var isInChart = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ChartProperties())),
signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.asc_getSignatureId() : undefined,
signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
signProps = (signGuid) ? me.api.asc_getSignatureSetup(signGuid) : null,
isInSign = !!signProps && me._canProtect,
canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled;
@ -2408,7 +2433,7 @@ define([
menuImgCut.setDisabled(islocked || !cancopy);
menuImgPaste.setDisabled(islocked);
var signGuid = (value.imgProps && value.imgProps.value && me.mode.canProtect) ? value.imgProps.value.asc_getSignatureId() : undefined,
var signGuid = (value.imgProps && value.imgProps.value && me.mode.isSignatureSupport) ? value.imgProps.value.asc_getSignatureId() : undefined,
isInSign = !!signGuid;
menuSignatureEditSign.setVisible(isInSign);
menuSignatureEditSetup.setVisible(isInSign);
@ -2757,6 +2782,30 @@ define([
})
});
var menuTableStartNewList = new Common.UI.MenuItem({
caption: me.textStartNewList
}).on('click', _.bind(me.onStartNumbering, me, 1));
var menuTableStartNumberingFrom = new Common.UI.MenuItem({
caption: me.textStartNumberingFrom
}).on('click', _.bind(me.onStartNumbering, me, 'advanced'));
var menuTableContinueNumbering = new Common.UI.MenuItem({
caption: me.textContinueNumbering
}).on('click', _.bind(me.onContinueNumbering, me));
var menuNumberingTable = new Common.UI.MenuItem({
caption : me.bulletsText,
menu : new Common.UI.Menu({
menuAlign: 'tl-tr',
items : [
menuTableStartNewList,
menuTableStartNumberingFrom,
menuTableContinueNumbering
]
})
});
this.tableMenu = new Common.UI.Menu({
initMenu: function(value){
// table properties
@ -2800,6 +2849,22 @@ define([
menuTableCut.setDisabled(disabled || !cancopy);
menuTablePaste.setDisabled(disabled);
// bullets & numbering
var listId = me.api.asc_GetCurrentNumberingId(),
in_list = (listId !== null);
menuNumberingTable.setVisible(in_list);
if (in_list) {
var numLvl = me.api.asc_GetNumberingPr(listId).get_Lvl(me.api.asc_GetCurrentNumberingLvl()),
format = numLvl.get_Format(),
start = me.api.asc_GetCalculatedNumberingValue();
menuTableStartNewList.setVisible(numLvl.get_Start()!=start);
menuTableStartNewList.value = {start: numLvl.get_Start()};
menuTableStartNumberingFrom.setVisible(format != Asc.c_oAscNumberingFormat.Bullet);
menuTableStartNumberingFrom.value = {format: format, start: start};
menuTableStartNewList.setCaption((format == Asc.c_oAscNumberingFormat.Bullet) ? me.textSeparateList : me.textStartNewList);
menuTableContinueNumbering.setCaption((format == Asc.c_oAscNumberingFormat.Bullet) ? me.textJoinList : me.textContinueNumbering);
}
// hyperlink properties
var text = null;
if (me.api) {
@ -2807,7 +2872,7 @@ define([
}
menuAddHyperlinkTable.setVisible(value.hyperProps===undefined && text!==false);
menuHyperlinkTable.setVisible(value.hyperProps!==undefined);
menuHyperlinkSeparator.setVisible(menuAddHyperlinkTable.isVisible() || menuHyperlinkTable.isVisible());
menuHyperlinkSeparator.setVisible(menuAddHyperlinkTable.isVisible() || menuHyperlinkTable.isVisible() || menuNumberingTable.isVisible());
menuEditHyperlinkTable.hyperProps = value.hyperProps;
menuRemoveHyperlinkTable.hyperProps = value.hyperProps;
@ -2982,6 +3047,7 @@ define([
/** coauthoring begin **/
menuAddCommentTable,
/** coauthoring end **/
menuNumberingTable,
menuAddHyperlinkTable,
menuHyperlinkTable,
menuHyperlinkSeparator,
@ -3299,6 +3365,22 @@ define([
caption : '--'
});
var menuParaStartNewList = new Common.UI.MenuItem({
caption: me.textStartNewList
}).on('click', _.bind(me.onStartNumbering, me, 1));
var menuParaStartNumberingFrom = new Common.UI.MenuItem({
caption: me.textStartNumberingFrom
}).on('click', _.bind(me.onStartNumbering, me, 'advanced'));
var menuParaContinueNumbering = new Common.UI.MenuItem({
caption: me.textContinueNumbering
}).on('click', _.bind(me.onContinueNumbering, me));
var menuParaNumberingSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.textMenu = new Common.UI.Menu({
initMenu: function(value){
var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties()));
@ -3421,6 +3503,24 @@ define([
if (in_field) {
menuParaRefreshField.options.fieldProps = in_field;
}
var listId = me.api.asc_GetCurrentNumberingId(),
in_list = (listId !== null);
menuParaNumberingSeparator.setVisible(in_list); // hide when first item is selected
menuParaStartNewList.setVisible(in_list);
menuParaStartNumberingFrom.setVisible(in_list);
menuParaContinueNumbering.setVisible(in_list);
if (in_list) {
var numLvl = me.api.asc_GetNumberingPr(listId).get_Lvl(me.api.asc_GetCurrentNumberingLvl()),
format = numLvl.get_Format(),
start = me.api.asc_GetCalculatedNumberingValue();
menuParaStartNewList.setVisible(numLvl.get_Start()!=start);
menuParaStartNewList.value = {start: numLvl.get_Start()};
menuParaStartNumberingFrom.setVisible(format != Asc.c_oAscNumberingFormat.Bullet);
menuParaStartNumberingFrom.value = {format: format, start: start};
menuParaStartNewList.setCaption((format == Asc.c_oAscNumberingFormat.Bullet) ? me.textSeparateList : me.textStartNewList);
menuParaContinueNumbering.setCaption((format == Asc.c_oAscNumberingFormat.Bullet) ? me.textJoinList : me.textContinueNumbering);
}
},
items: [
me.menuSpellPara,
@ -3456,6 +3556,10 @@ define([
menuHyperlinkParaSeparator,
menuAddHyperlinkPara,
menuHyperlinkPara,
menuParaNumberingSeparator,
menuParaStartNewList,
menuParaStartNumberingFrom,
menuParaContinueNumbering,
menuStyleSeparator,
menuStyle
]
@ -3776,7 +3880,14 @@ define([
txtPasteSourceFormat: 'Keep source formatting',
textReplace: 'Replace image',
textFromUrl: 'From URL',
textFromFile: 'From File'
textFromFile: 'From File',
textStartNumberingFrom: 'Set numbering value',
textStartNewList: 'Start new list',
textContinueNumbering: 'Continue numbering',
textSeparateList: 'Separate list',
textJoinList: 'Join to previous list',
textNumberingValue: 'Numbering Value',
bulletsText: 'Bullets and Numbering'
}, DE.Views.DocumentHolder || {}));
});

View file

@ -252,7 +252,7 @@ define([
applyMode: function() {
this.miPrint[this.mode.canPrint?'show':'hide']();
this.miRename[(this.mode.canRename && !this.mode.isDesktopApp) ?'show':'hide']();
this.miProtect[(this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) ?'show':'hide']();
this.miProtect[this.mode.canProtect ?'show':'hide']();
this.miProtect.$el.find('+.devider')[!this.mode.isDisconnected?'show':'hide']();
this.miRecent[this.mode.canOpenRecent?'show':'hide']();
this.miNew[this.mode.canCreateNew?'show':'hide']();
@ -293,7 +293,7 @@ define([
}
}
if (this.mode.isEdit && this.mode.isDesktopApp && this.mode.isOffline) {
if (this.mode.canProtect) {
// this.$el.find('#fm-btn-back').hide();
this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render();
this.panels['protect'].setMode(this.mode);

View file

@ -401,7 +401,7 @@ define([
/** coauthoring begin **/
$('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.coauth.changes', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide']();
$('tr.comments', this.el)[mode.canCoAuthoring && mode.canComments ? 'show' : 'hide']();
$('tr.comments', this.el)[mode.canCoAuthoring && (mode.isEdit || mode.canComments) ? 'show' : 'hide']();
/** coauthoring end **/
},
@ -1240,7 +1240,8 @@ define([
this.btnDeletePwd.render(this.$el.find('#fms-btn-delete-pwd'));
this.btnDeletePwd.on('click', _.bind(this.closeMenu, this));
this.cntPassword = $('#id-fms-view-pwd');
this.cntPassword = $('#id-fms-password');
this.cntPasswordView = $('#id-fms-view-pwd');
this.btnAddInvisibleSign = protection.getButton('signature');
this.btnAddInvisibleSign.render(this.$el.find('#fms-btn-invisible-sign'));
@ -1269,7 +1270,8 @@ define([
setMode: function(mode) {
this.mode = mode;
this.cntSignature.toggleClass('hidden', !this.mode.canProtect);
this.cntSignature.toggleClass('hidden', !this.mode.isSignatureSupport);
this.cntPassword.toggleClass('hidden', !this.mode.isPasswordSupport);
},
setApi: function(o) {
@ -1330,7 +1332,7 @@ define([
},
updateEncrypt: function() {
this.cntPassword.toggleClass('hidden', this.btnAddPwd.isVisible());
this.cntPasswordView.toggleClass('hidden', this.btnAddPwd.isVisible());
},
strProtect: 'Protect Document',

View file

@ -0,0 +1,261 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* NumberingValueDialog.js
*
* Created by Julia Radzhabova on 7/20/18
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/
define([
'common/main/lib/component/Window',
'common/main/lib/component/MetricSpinner'
], function () { 'use strict';
DE.Views.NumberingValueDialog = Common.UI.Window.extend(_.extend({
options: {
width: 214,
header: true,
style: 'min-width: 214px;',
cls: 'modal-dlg'
},
initialize : function(options) {
_.extend(this.options, {
title: this.textTitle
}, options || {});
this.template = [
'<div class="box">',
'<div class="input-row">',
'<div id="id-spin-set-value"></div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
'</div>'
].join('');
this.options.tpl = _.template(this.template)(this.options);
this.props = this.options.props;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
render: function() {
Common.UI.Window.prototype.render.call(this);
this.spnStart = new Common.UI.CustomSpinner({
el: $('#id-spin-set-value'),
step: 1,
width: 182,
defaultUnit : "",
value: 1,
maxValue: 16383,
minValue: 1,
allowDecimal: false,
maskExp: /[0-9]/
});
var $window = this.getChild();
$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.spnStart.on('entervalue', _.bind(this.onPrimary, this));
this.spnStart.$el.find('input').focus();
this.afterRender();
},
afterRender: function() {
this._setDefaults(this.props);
},
_setDefaults: function (props) {
if (props) {
this.spnStart.setValue(props.start);
this.onFormatSelect(props.format);
}
},
_handleInput: function(state) {
if (this.options.handler) {
this.options.handler.call(this, state, this.getSettings());
}
this.close();
},
onBtnClick: function(event) {
this._handleInput(event.currentTarget.attributes['result'].value);
},
getSettings: function() {
return this.spnStart.getNumberValue();
},
onPrimary: function() {
this._handleInput('ok');
return false;
},
onFormatSelect: function(format) {
var maskExp = /[0-9]/;
var me = this;
switch (format) {
case Asc.c_oAscNumberingFormat.UpperRoman: // I, II, III, ...
this.spnStart.options.toCustomFormat = this._10toRome;
this.spnStart.options.fromCustomFormat = this._Rometo10;
maskExp = /[IVXLCDM]/;
break;
case Asc.c_oAscNumberingFormat.LowerRoman: // i, ii, iii, ...
this.spnStart.options.toCustomFormat = function(value) { return me._10toRome(value).toLocaleLowerCase(); };
this.spnStart.options.fromCustomFormat = function(value) { return me._Rometo10(value.toLocaleUpperCase()); };
maskExp = /[ivxlcdm]/;
break;
case Asc.c_oAscNumberingFormat.UpperLetter: // A, B, C, ...
this.spnStart.options.toCustomFormat = this._10toS;
this.spnStart.options.fromCustomFormat = this._Sto10;
maskExp = /[A-Z]/;
break;
case Asc.c_oAscNumberingFormat.LowerLetter: // a, b, c, ...
this.spnStart.options.toCustomFormat = function(value) { return me._10toS(value).toLocaleLowerCase(); };
this.spnStart.options.fromCustomFormat = function(value) { return me._Sto10(value.toLocaleUpperCase()); };
maskExp = /[a-z]/;
break;
default: // 1, 2, 3, ...
this.spnStart.options.toCustomFormat = function(value) { return value; };
this.spnStart.options.fromCustomFormat = function(value) { return value; };
break;
}
this.spnStart.setMask(maskExp);
this.spnStart.setValue(this.spnStart.getValue());
},
_10toS: function(value) {
value = parseInt(value);
var n = Math.ceil(value / 26),
code = String.fromCharCode((value-1) % 26 + "A".charCodeAt(0)) ,
result = '';
for (var i=0; i<n; i++ ) {
result += code;
}
return result;
},
_Sto10: function(str) {
if ( str.length<1 || (new RegExp('[^' + str.charAt(0) + ']')).test(str) || !/[A-Z]/.test(str)) return 1;
var n = str.length-1,
result = str.charCodeAt(0) - "A".charCodeAt(0) + 1;
result += 26*n;
return result;
},
_10toRome: function(value) {
value = parseInt(value);
var result = '',
digits = [
['M', 1000],
['CM', 900],
['D', 500],
['CD', 400],
['C', 100],
['XC', 90],
['L', 50],
['XL', 40],
['X', 10],
['IX', 9],
['V', 5],
['IV', 4],
['I', 1]
];
var val = digits[0][1],
div = Math.floor(value / val),
n = 0;
for (var i=0; i<div; i++)
result += digits[n][0];
value -= div * val;
n++;
while (value>0) {
val = digits[n][1];
div = value - val;
if (div>=0) {
result += digits[n][0];
value = div;
} else
n++;
}
return result;
},
_Rometo10: function(str) {
if ( !/[IVXLCDM]/.test(str) || str.length<1 ) return 1;
var digits = {
'I': 1,
'V': 5,
'X': 10,
'L': 50,
'C': 100,
'D': 500,
'M': 1000
};
var n = str.length-1,
result = digits[str.charAt(n)],
prev = result;
for (var i=n-1; i>=0; i-- ) {
var val = digits[str.charAt(i)];
if (val<prev) {
if (prev/val>10) return 1;
val *= -1;
}
result += val;
}
return result;
},
cancelButtonText: 'Cancel',
okButtonText: 'Ok'
}, DE.Views.NumberingValueDialog || {}))
});

View file

@ -199,7 +199,7 @@ define([
height = this.isOrientPortrait ? props.get_H() : props.get_W();
var rec = this.cmbPreset.store.find(function(item){
var size = item.get('size');
return (Math.abs(size[0] - width) < 0.01 && Math.abs(size[1] - height) < 0.01);
return (Math.abs(size[0] - width) < 0.1 && Math.abs(size[1] - height) < 0.1);
});
this.cmbPreset.setValue((rec) ? rec.get('value') : -1);
}

View file

@ -195,7 +195,7 @@ define([
this.mergeSettings = new DE.Views.MailMergeSettings();
}
if (mode && mode.canProtect) {
if (mode && mode.isSignatureSupport) {
this.btnSignature = new Common.UI.Button({
hint: this.txtSignatureSettings,
asctype: Common.Utils.documentSettingsType.Signature,

View file

@ -1164,7 +1164,7 @@ define([
el: $('#shape-combo-fill-src'),
cls: 'input-group-nr',
style: 'width: 100%;',
menuStyle: 'min-width: 190px;',
menuStyle: 'min-width: 100%;',
editable: false,
data: this._arrFillSrc
});

View file

@ -258,7 +258,7 @@ define([
this.cmbStyles = new Common.UI.ComboBox({
el: $('#tableofcontents-combo-styles'),
cls: 'input-group-nr',
menuStyle: 'min-width: 150px;',
menuStyle: 'min-width: 95px;',
editable: false,
data: [
{ displayValue: this.txtCurrent, value: Asc.c_oAscTOCStylesType.Current },
@ -384,6 +384,10 @@ define([
if (this.chPages.getValue() == 'checked') {
value = props.get_RightAlignTab();
this.chAlign.setValue((value !== null && value !== undefined) ? value : 'indeterminate');
if (this.chAlign.getValue() == 'checked') {
value = props.get_TabLeader();
(value!==undefined) && this.cmbLeader.setValue(value);
}
}
var start = props.get_OutlineStart(),

View file

@ -810,7 +810,7 @@ define([
el: $('#textart-combo-fill-src'),
cls: 'input-group-nr',
style: 'width: 100%;',
menuStyle: 'min-width: 190px;',
menuStyle: 'min-width: 100%;',
editable: false,
data: this._arrFillSrc
});

View file

@ -644,6 +644,23 @@ define([
{
caption: this.mniEditControls,
value: 'settings'
},
{
caption: this.mniHighlightControls,
value: 'highlight',
menu: new Common.UI.Menu({
menuAlign : 'tl-tr',
items: [
this.mnuNoControlsColor = new Common.UI.MenuItem({
id: 'id-toolbar-menu-no-highlight-controls',
caption: this.textNoHighlight,
checkable: true
}),
{caption: '--'},
{template: _.template('<div id="id-toolbar-menu-controls-color" style="width: 169px; height: 220px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-control-color" style="padding-left:12px;">' + this.textNewColor + '</a>')}
]
})
}
]
})
@ -1152,22 +1169,6 @@ define([
]
}
);
Common.NotificationCenter.on('tab:visible', _.bind(function(action, visible){
if (action=='plugins' && visible) {
var compactview = false;
if ( Common.localStorage.itemExists("de-compact-toolbar") ) {
compactview = Common.localStorage.getBool("de-compact-toolbar");
} else if ( config.customization && config.customization.compactToolbar )
compactview = true;
if (!compactview) {
me.setFolded(false);
me.setTab('plugins');
me.fireEvent('view:compact', [me, compactview]);
Common.NotificationCenter.trigger('layout:changed', 'toolbar');
}
}
}, this));
}
return this;
},
@ -1950,6 +1951,12 @@ define([
transparent: true
});
}
if (this.btnContentControls.cmpEl) {
this.mnuControlsColorPicker = new Common.UI.ThemeColorPalette({
el: $('#id-toolbar-menu-controls-color')
});
}
},
updateMetricUnit: function () {
@ -2326,7 +2333,7 @@ define([
textTabFile: 'File',
textTabHome: 'Home',
textTabInsert: 'Insert',
textTabLayout: 'Page Layout',
textTabLayout: 'Layout',
textTabReview: 'Review',
capBtnInsShape: 'Shape',
capBtnInsTextbox: 'Text Box',
@ -2341,12 +2348,12 @@ define([
tipImgAlign: 'Align objects',
tipImgGroup: 'Group objects',
tipImgWrapping: 'Wrap text',
tipSendForward: 'Send forward',
tipSendForward: 'Bring forward',
tipSendBackward: 'Send backward',
capImgAlign: 'Align',
capImgGroup: 'Group',
capImgForward: 'Move forward',
capImgBackward: 'Move backward',
capImgForward: 'Bring Forward',
capImgBackward: 'Send Backward',
capImgWrapping: 'Wrapping',
capBtnComment: 'Comment',
textColumnsCustom: 'Custom Columns',
@ -2359,7 +2366,9 @@ define([
textPlainControl: 'Plain text',
textRemoveControl: 'Remove',
mniEditControls: 'Settings',
tipControls: 'Insert content control'
tipControls: 'Insert content control',
mniHighlightControls: 'Highlight settings',
textNoHighlight: 'No highlighting'
}
})(), DE.Views.Toolbar || {}));
});

View file

@ -168,6 +168,7 @@
"Common.Views.History.textRestore": "Wiederherstellen",
"Common.Views.History.textShow": "Erweitern",
"Common.Views.History.textShowAll": "Wesentliche Änderungen anzeigen",
"Common.Views.History.textVer": "Ver.",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Abbrechen",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Bild-URL einfügen:",
@ -271,6 +272,14 @@
"Common.Views.ReviewChangesDialog.txtReject": "Ablehnen",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Alle Änderungen ablehnen",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Aktuelle Änderungen ablehnen",
"Common.Views.ReviewPopover.textAdd": "Hinzufügen",
"Common.Views.ReviewPopover.textAddReply": "Antwort hinzufügen",
"Common.Views.ReviewPopover.textCancel": "Abbrechen",
"Common.Views.ReviewPopover.textClose": "Schließen",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textOpenAgain": "Erneut öffnen",
"Common.Views.ReviewPopover.textReply": "Antworten",
"Common.Views.ReviewPopover.textResolve": "Lösen",
"Common.Views.SignDialog.cancelButtonText": "Abbrechen",
"Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Fett",
@ -380,10 +389,13 @@
"DE.Controllers.Main.textAnonymous": "Anonym",
"DE.Controllers.Main.textBuyNow": "Webseite besuchen",
"DE.Controllers.Main.textChangesSaved": "Alle Änderungen werden gespeichert",
"DE.Controllers.Main.textClose": "Schließen",
"DE.Controllers.Main.textCloseTip": "Klicken Sie, um den Tipp zu schließen",
"DE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
"DE.Controllers.Main.textLicencePaidFeature": "Die Funktion, die Sie verwenden möchten, ist für zusätzliche Lizenz verfügbar. <br> Wenden Sie sich bei Bedarf an die Verkaufsabteilung",
"DE.Controllers.Main.textLoadingDocument": "Dokument wird geladen...",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Verbindungsbeschränkung",
"DE.Controllers.Main.textPaidFeature": "Kostenpflichtige Funktion",
"DE.Controllers.Main.textShape": "Form",
"DE.Controllers.Main.textStrict": "Formaler Modus",
"DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
@ -806,6 +818,7 @@
"DE.Views.BookmarksDialog.textName": "Name",
"DE.Views.BookmarksDialog.textSort": "Sortieren nach",
"DE.Views.BookmarksDialog.textTitle": "Lesezeichen",
"DE.Views.BookmarksDialog.txtInvalidName": "Der Name des Lesezeichens darf nur Buchstaben, Ziffern und Unterstriche enthalten und sollte mit dem Buchstaben beginnen",
"DE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
"DE.Views.ChartSettings.textArea": "Fläche",
"DE.Views.ChartSettings.textBar": "Balken",
@ -834,8 +847,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Oben und unten",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Abbrechen",
"DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Darstellung",
"DE.Views.ControlSettingsDialog.textApplyAll": "Auf alle anwenden",
"DE.Views.ControlSettingsDialog.textBox": "Begrenzungsrahmen",
"DE.Views.ControlSettingsDialog.textColor": "Farbe",
"DE.Views.ControlSettingsDialog.textLock": "Sperrung",
"DE.Views.ControlSettingsDialog.textName": "Titel",
"DE.Views.ControlSettingsDialog.textNewColor": "Benutzerdefinierte Farbe",
"DE.Views.ControlSettingsDialog.textNone": "Kein",
"DE.Views.ControlSettingsDialog.textShowAs": "Anzeigen als",
"DE.Views.ControlSettingsDialog.textTag": "Tag",
"DE.Views.ControlSettingsDialog.textTitle": "Einstellungen des Inhaltssteuerelements",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Das Inhaltssteuerelement kann nicht gelöscht werden",
@ -855,6 +875,7 @@
"DE.Views.DocumentHolder.alignmentText": "Ausrichtung",
"DE.Views.DocumentHolder.belowText": "Unten",
"DE.Views.DocumentHolder.breakBeforeText": "Seitenumbruch oberhalb",
"DE.Views.DocumentHolder.bulletsText": "Nummerierung und Aufzählungszeichen",
"DE.Views.DocumentHolder.cellAlignText": "Vertikale Ausrichtung in Zellen",
"DE.Views.DocumentHolder.cellText": "Zelle",
"DE.Views.DocumentHolder.centerText": "Zentriert",
@ -910,7 +931,7 @@
"DE.Views.DocumentHolder.strDetails": "Signaturdetails",
"DE.Views.DocumentHolder.strSetup": "Signatureinrichtung",
"DE.Views.DocumentHolder.strSign": "Signieren",
"DE.Views.DocumentHolder.styleText": "Formatting as Style",
"DE.Views.DocumentHolder.styleText": "Formatierung als Formatvorlage",
"DE.Views.DocumentHolder.tableText": "Tabelle",
"DE.Views.DocumentHolder.textAlign": "Ausrichten",
"DE.Views.DocumentHolder.textArrange": "Anordnen",
@ -919,6 +940,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Eine Ebene nach vorne",
"DE.Views.DocumentHolder.textArrangeFront": "In den Vordergrund bringen",
"DE.Views.DocumentHolder.textContentControls": "Inhaltssteuerelement",
"DE.Views.DocumentHolder.textContinueNumbering": "Nummerierung fortführen",
"DE.Views.DocumentHolder.textCopy": "Kopieren",
"DE.Views.DocumentHolder.textCut": "Ausschneiden",
"DE.Views.DocumentHolder.textDistributeCols": "Spalten verteilen",
@ -927,14 +949,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Umbruchsgrenze bearbeiten",
"DE.Views.DocumentHolder.textFromFile": "Aus Datei",
"DE.Views.DocumentHolder.textFromUrl": "Aus URL",
"DE.Views.DocumentHolder.textJoinList": "Mit der vorherigen Liste verbinden",
"DE.Views.DocumentHolder.textNest": "Tabelle schachteln",
"DE.Views.DocumentHolder.textNextPage": "Nächste Seite",
"DE.Views.DocumentHolder.textNumberingValue": "Nummerierungswert",
"DE.Views.DocumentHolder.textPaste": "Einfügen",
"DE.Views.DocumentHolder.textPrevPage": "Vorherige Seite",
"DE.Views.DocumentHolder.textRefreshField": "Feld aktualisieren",
"DE.Views.DocumentHolder.textRemove": "Entfernen",
"DE.Views.DocumentHolder.textRemoveControl": "Inhaltssteuerelement entfernen",
"DE.Views.DocumentHolder.textReplace": "Bild ersetzen",
"DE.Views.DocumentHolder.textSeparateList": "Separate Liste",
"DE.Views.DocumentHolder.textSettings": "Einstellungen",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Unten ausrichten",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Zentriert ausrichten",
@ -942,6 +967,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Mittig ausrichten",
"DE.Views.DocumentHolder.textShapeAlignRight": "Rechtsbündig ausrichten",
"DE.Views.DocumentHolder.textShapeAlignTop": "Oben ausrichten",
"DE.Views.DocumentHolder.textStartNewList": "Neue Liste beginnen",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Nummerierungswert festlegen",
"DE.Views.DocumentHolder.textTOC": "Inhaltsverzeichnis",
"DE.Views.DocumentHolder.textTOCSettings": "Einstellungen für das Inhaltverzeichnis",
"DE.Views.DocumentHolder.textUndo": "Rückgängig machen",
@ -1367,7 +1394,7 @@
"DE.Views.MailMergeSettings.textSendMsg": "Alle E-Mail-Nachrichten sind bereit und werden innerhalb einiger Zeit versendet. <br> Die Geschwindigkeit des Email-Versands hängt von Ihrem Mail-Dienst ab. Sie können an dem Dokument weiterarbeiten oder es schließen. Nachdem Email-Versand werden Sie per E-Mail, die Sie bei der Registriering wervendeten, benachrichtigt.",
"DE.Views.MailMergeSettings.textTo": "Zu",
"DE.Views.MailMergeSettings.txtFirst": "Zum ersten Datensatz",
"DE.Views.MailMergeSettings.txtFromToError": "Der Wert \"Von\" muss kleiner als \"Zu\" sein",
"DE.Views.MailMergeSettings.txtFromToError": "Der Wert \"Von\" muss weniger als \"Bis\" sein",
"DE.Views.MailMergeSettings.txtLast": "Zum letzten Datensatz",
"DE.Views.MailMergeSettings.txtNext": "Zum nächsten Datensatz",
"DE.Views.MailMergeSettings.txtPrev": "Zu den vorherigen Rekord",
@ -1403,6 +1430,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Starten",
"DE.Views.NoteSettingsDialog.textTextBottom": "Unterhalb des Textes",
"DE.Views.NoteSettingsDialog.textTitle": "Hinweise Einstellungen",
"DE.Views.NumberingValueDialog.cancelButtonText": "Abbrechen",
"DE.Views.NumberingValueDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.cancelButtonText": "Abbrechen",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Achtung",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",
@ -1769,6 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Kopfzeile bearbeiten",
"DE.Views.Toolbar.mniHiddenBorders": "Ausgeblendete Tabellenrahmen",
"DE.Views.Toolbar.mniHiddenChars": "Formatierungszeichen",
"DE.Views.Toolbar.mniHighlightControls": "Einstellungen für Hervorhebungen",
"DE.Views.Toolbar.mniImageFromFile": "Bild aus Datei",
"DE.Views.Toolbar.mniImageFromUrl": "Bild aus URL",
"DE.Views.Toolbar.strMenuNoFill": "Keine Füllung",
@ -1806,6 +1836,7 @@
"DE.Views.Toolbar.textMarginsWide": "Breit",
"DE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe",
"DE.Views.Toolbar.textNextPage": "Nächste Seite",
"DE.Views.Toolbar.textNoHighlight": "Ohne Hervorhebung",
"DE.Views.Toolbar.textNone": "Kein",
"DE.Views.Toolbar.textOddPage": "Ungerade Seite",
"DE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder ",

View file

@ -168,6 +168,7 @@
"Common.Views.History.textRestore": "Restore",
"Common.Views.History.textShow": "Expand",
"Common.Views.History.textShowAll": "Show detailed changes",
"Common.Views.History.textVer": "ver.",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@ -391,10 +392,13 @@
"DE.Controllers.Main.textAnonymous": "Anonymous",
"DE.Controllers.Main.textBuyNow": "Visit website",
"DE.Controllers.Main.textChangesSaved": "All changes saved",
"DE.Controllers.Main.textClose": "Close",
"DE.Controllers.Main.textCloseTip": "Click to close the tip",
"DE.Controllers.Main.textContactUs": "Contact sales",
"DE.Controllers.Main.textLicencePaidFeature": "The feature you are trying to use is available for extended license.<br>If you need it, please contact Sales Department",
"DE.Controllers.Main.textLoadingDocument": "Loading document",
"DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE connection limitation",
"DE.Controllers.Main.textPaidFeature": "Paid feature",
"DE.Controllers.Main.textShape": "Shape",
"DE.Controllers.Main.textStrict": "Strict mode",
"DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
@ -817,6 +821,7 @@
"DE.Views.BookmarksDialog.textName": "Name",
"DE.Views.BookmarksDialog.textSort": "Sort by",
"DE.Views.BookmarksDialog.textTitle": "Bookmarks",
"DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"DE.Views.ChartSettings.textArea": "Area",
"DE.Views.ChartSettings.textBar": "Bar",
@ -845,8 +850,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Cancel",
"DE.Views.ControlSettingsDialog.okButtonText": "Ok",
"DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
"DE.Views.ControlSettingsDialog.textApplyAll": "Apply to All",
"DE.Views.ControlSettingsDialog.textBox": "Bounding box",
"DE.Views.ControlSettingsDialog.textColor": "Color",
"DE.Views.ControlSettingsDialog.textLock": "Locking",
"DE.Views.ControlSettingsDialog.textName": "Title",
"DE.Views.ControlSettingsDialog.textNewColor": "Add New Custom Color",
"DE.Views.ControlSettingsDialog.textNone": "None",
"DE.Views.ControlSettingsDialog.textShowAs": "Show as",
"DE.Views.ControlSettingsDialog.textTag": "Tag",
"DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
@ -866,6 +878,7 @@
"DE.Views.DocumentHolder.alignmentText": "Alignment",
"DE.Views.DocumentHolder.belowText": "Below",
"DE.Views.DocumentHolder.breakBeforeText": "Page break before",
"DE.Views.DocumentHolder.bulletsText": "Bullets and Numbering",
"DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"DE.Views.DocumentHolder.cellText": "Cell",
"DE.Views.DocumentHolder.centerText": "Center",
@ -930,6 +943,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"DE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground",
"DE.Views.DocumentHolder.textContentControls": "Content control",
"DE.Views.DocumentHolder.textContinueNumbering": "Continue numbering",
"DE.Views.DocumentHolder.textCopy": "Copy",
"DE.Views.DocumentHolder.textCut": "Cut",
"DE.Views.DocumentHolder.textDistributeCols": "Distribute columns",
@ -938,14 +952,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Edit Wrap Boundary",
"DE.Views.DocumentHolder.textFromFile": "From File",
"DE.Views.DocumentHolder.textFromUrl": "From URL",
"DE.Views.DocumentHolder.textJoinList": "Join to previous list",
"DE.Views.DocumentHolder.textNest": "Nest table",
"DE.Views.DocumentHolder.textNextPage": "Next Page",
"DE.Views.DocumentHolder.textNumberingValue": "Numbering Value",
"DE.Views.DocumentHolder.textPaste": "Paste",
"DE.Views.DocumentHolder.textPrevPage": "Previous Page",
"DE.Views.DocumentHolder.textRefreshField": "Refresh field",
"DE.Views.DocumentHolder.textRemove": "Remove",
"DE.Views.DocumentHolder.textRemoveControl": "Remove content control",
"DE.Views.DocumentHolder.textReplace": "Replace image",
"DE.Views.DocumentHolder.textSeparateList": "Separate list",
"DE.Views.DocumentHolder.textSettings": "Settings",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Align Bottom",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Align Center",
@ -953,6 +970,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Align Middle",
"DE.Views.DocumentHolder.textShapeAlignRight": "Align Right",
"DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"DE.Views.DocumentHolder.textStartNewList": "Start new list",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Set numbering value",
"DE.Views.DocumentHolder.textTOC": "Table of contents",
"DE.Views.DocumentHolder.textTOCSettings": "Table of contents settings",
"DE.Views.DocumentHolder.textUndo": "Undo",
@ -1153,7 +1172,7 @@
"DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs",
"DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments",
"DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Realtime Collaboration Changes",
"DE.Views.FileMenuPanels.Settings.strShowChanges": "Real-time Collaboration Changes",
"DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Turn on spell checking option",
"DE.Views.FileMenuPanels.Settings.strStrict": "Strict",
"DE.Views.FileMenuPanels.Settings.strUnit": "Unit of Measurement",
@ -1427,6 +1446,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Start at",
"DE.Views.NoteSettingsDialog.textTextBottom": "Below text",
"DE.Views.NoteSettingsDialog.textTitle": "Notes Settings",
"DE.Views.NumberingValueDialog.cancelButtonText": "Cancel",
"DE.Views.NumberingValueDialog.okButtonText": "Ok",
"DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",
@ -1442,7 +1463,6 @@
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
"DE.Views.PageSizeDialog.textPreset": "Preset",
"DE.Views.PageSizeDialog.txtCustom": "Custom",
"DE.Views.ParagraphSettings.strLineHeight": "Line Spacing",
"DE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing",
@ -1800,6 +1820,7 @@
"DE.Views.Toolbar.mniEditHeader": "Edit Header",
"DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders",
"DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters",
"DE.Views.Toolbar.mniHighlightControls": "Highlight settings",
"DE.Views.Toolbar.mniImageFromFile": "Image from File",
"DE.Views.Toolbar.mniImageFromUrl": "Image from URL",
"DE.Views.Toolbar.strMenuNoFill": "No Fill",
@ -1837,6 +1858,7 @@
"DE.Views.Toolbar.textMarginsWide": "Wide",
"DE.Views.Toolbar.textNewColor": "Add New Custom Color",
"DE.Views.Toolbar.textNextPage": "Next Page",
"DE.Views.Toolbar.textNoHighlight": "No highlighting",
"DE.Views.Toolbar.textNone": "None",
"DE.Views.Toolbar.textOddPage": "Odd Page",
"DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",

View file

@ -168,6 +168,7 @@
"Common.Views.History.textRestore": "Restaurar",
"Common.Views.History.textShow": "Desplegar",
"Common.Views.History.textShowAll": "Mostrar cambios detallados",
"Common.Views.History.textVer": "ver.",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
"Common.Views.ImageFromUrlDialog.okButtonText": "Aceptar",
"Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:",
@ -192,6 +193,7 @@
"Common.Views.OpenDialog.txtIncorrectPwd": "La contraseña es incorrecta",
"Common.Views.OpenDialog.txtPassword": "Contraseña",
"Common.Views.OpenDialog.txtPreview": "Vista previa",
"Common.Views.OpenDialog.txtProtected": "Una vez que se ha introducido la contraseña y abierto el archivo, la contraseña actual al archivo se restablecerá",
"Common.Views.OpenDialog.txtTitle": "Elegir opciones de %1",
"Common.Views.OpenDialog.txtTitleProtected": "Archivo protegido",
"Common.Views.PasswordDialog.cancelButtonText": "Cancelar",
@ -216,7 +218,7 @@
"Common.Views.Protection.txtEncrypt": "Encriptar",
"Common.Views.Protection.txtInvisibleSignature": "Añadir firma digital",
"Common.Views.Protection.txtSignature": "Firma",
"Common.Views.Protection.txtSignatureLine": "Línea de la firma",
"Common.Views.Protection.txtSignatureLine": "Añadir línea de firma",
"Common.Views.RenameDialog.cancelButtonText": "Cancelar",
"Common.Views.RenameDialog.okButtonText": "Aceptar",
"Common.Views.RenameDialog.textName": "Nombre de archivo",
@ -270,6 +272,14 @@
"Common.Views.ReviewChangesDialog.txtReject": "Rechazar",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Rechazar todos los cambjios",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Rechazar Cambio Actual",
"Common.Views.ReviewPopover.textAdd": "Añadir",
"Common.Views.ReviewPopover.textAddReply": "Añadir respuesta",
"Common.Views.ReviewPopover.textCancel": "Cancelar",
"Common.Views.ReviewPopover.textClose": "Cerrar",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textOpenAgain": "Abrir de nuevo",
"Common.Views.ReviewPopover.textReply": "Responder",
"Common.Views.ReviewPopover.textResolve": "Resolver",
"Common.Views.SignDialog.cancelButtonText": "Cancelar",
"Common.Views.SignDialog.okButtonText": "Aceptar",
"Common.Views.SignDialog.textBold": "Negrilla",
@ -306,6 +316,7 @@
"DE.Controllers.LeftMenu.textReplaceSkipped": "Se ha realizado el reemplazo. {0} ocurrencias fueron saltadas.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "La búsqueda se ha realizado. Ocurrencias reemplazadas: {0}",
"DE.Controllers.LeftMenu.warnDownloadAs": "Si sigue guardando en este formato todas las características a excepción del texto se perderán.<br> ¿Está seguro de que quiere continuar?",
"DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si Usted sigue guardando en este formato, una parte de formateo puede perderse.<br>¿Está seguro de que desea continuar?",
"DE.Controllers.Main.applyChangesTextText": "Cargando cambios...",
"DE.Controllers.Main.applyChangesTitleText": "Cargando cambios",
"DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
@ -322,6 +333,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.",
"DE.Controllers.Main.errorConnectToServer": "No se pudo guardar el documento. Por favor, compruebe la configuración de conexión o póngase en contacto con el administrador.<br>Al hacer clic en el botón \"Aceptar\", se le pedirá que descargue el documento.<br> Encuentre más información acerca de la conexión Servidor de Documentos<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión de base de datos. Por favor póngase en contacto con soporte si el error se mantiene.",
"DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
"DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
"DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
"DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
@ -377,10 +389,13 @@
"DE.Controllers.Main.textAnonymous": "Anónimo",
"DE.Controllers.Main.textBuyNow": "Visitar sitio web",
"DE.Controllers.Main.textChangesSaved": "Todos los cambios son guardados",
"DE.Controllers.Main.textClose": "Cerrar",
"DE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo",
"DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas",
"DE.Controllers.Main.textLicencePaidFeature": "Función que Usted intenta usar es disponible por la licencia avanzada.<br>Si la necesita, por favor, póngase en contacto con departamento de ventas",
"DE.Controllers.Main.textLoadingDocument": "Cargando documento",
"DE.Controllers.Main.textNoLicenseTitle": "Conexión ONLYOFFICE",
"DE.Controllers.Main.textPaidFeature": "Función de pago",
"DE.Controllers.Main.textShape": "Forma",
"DE.Controllers.Main.textStrict": "Modo estricto",
"DE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
@ -444,9 +459,11 @@
"DE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
"DE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior",
"DE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.",
"DE.Controllers.Main.warnLicenseExceeded": "Se ha excedido el número permitido de las conexiones simultáneas al servidor de documentos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
"DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.<br>Por favor, actualice su licencia y después recargue la página.",
"DE.Controllers.Main.warnNoLicense": "Esta versión tiene limitaciones respecto a la cantidad de conexiones concurrentes al servidor del documentos.<br>Si se requiere más, considere la posibilidad de actualizar la licencia actual o de adquirir la licencia comercial.",
"DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
"DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
"DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
"DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado",
"DE.Controllers.Navigation.txtBeginning": "Principio del documento",
"DE.Controllers.Navigation.txtGotoBeginning": "Ir al principio de",
@ -792,12 +809,16 @@
"DE.Controllers.Viewport.textFitPage": "Ajustar a la página",
"DE.Controllers.Viewport.textFitWidth": "Ajustar al ancho",
"DE.Views.BookmarksDialog.textAdd": "Añadir",
"DE.Views.BookmarksDialog.textBookmarkName": "Nombre de marcador",
"DE.Views.BookmarksDialog.textClose": "Cerrar",
"DE.Views.BookmarksDialog.textDelete": "Borrar",
"DE.Views.BookmarksDialog.textGoto": "Pasar a",
"DE.Views.BookmarksDialog.textHidden": "Marcadores ocultados",
"DE.Views.BookmarksDialog.textLocation": "Ubicación",
"DE.Views.BookmarksDialog.textName": "Nombre",
"DE.Views.BookmarksDialog.textSort": "Ordenar por",
"DE.Views.BookmarksDialog.textTitle": "Marcadores",
"DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra",
"DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados",
"DE.Views.ChartSettings.textArea": "Área",
"DE.Views.ChartSettings.textBar": "Barra",
@ -826,8 +847,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Superior e inferior",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Cancelar",
"DE.Views.ControlSettingsDialog.okButtonText": "Ok",
"DE.Views.ControlSettingsDialog.textAppearance": "Aspecto",
"DE.Views.ControlSettingsDialog.textApplyAll": "Aplicar a todo",
"DE.Views.ControlSettingsDialog.textBox": "Cuadro delimitador",
"DE.Views.ControlSettingsDialog.textColor": "Color",
"DE.Views.ControlSettingsDialog.textLock": "Cerrando",
"DE.Views.ControlSettingsDialog.textName": "Título",
"DE.Views.ControlSettingsDialog.textNewColor": "Color personalizado",
"DE.Views.ControlSettingsDialog.textNone": "Ninguno",
"DE.Views.ControlSettingsDialog.textShowAs": "Mostrar como",
"DE.Views.ControlSettingsDialog.textTag": "Etiqueta",
"DE.Views.ControlSettingsDialog.textTitle": "Ajustes de control de contenido",
"DE.Views.ControlSettingsDialog.txtLockDelete": "El control de contenido no puede",
@ -847,6 +875,7 @@
"DE.Views.DocumentHolder.alignmentText": "Alineación",
"DE.Views.DocumentHolder.belowText": "Abajo",
"DE.Views.DocumentHolder.breakBeforeText": "Salto de página antes",
"DE.Views.DocumentHolder.bulletsText": "Viñetas y numeración",
"DE.Views.DocumentHolder.cellAlignText": "Alineación vertical de celda",
"DE.Views.DocumentHolder.cellText": "Celda",
"DE.Views.DocumentHolder.centerText": "Al centro",
@ -911,6 +940,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Traer adelante",
"DE.Views.DocumentHolder.textArrangeFront": "Traer al primer plano",
"DE.Views.DocumentHolder.textContentControls": "Control de contenido",
"DE.Views.DocumentHolder.textContinueNumbering": "Continuar numeración",
"DE.Views.DocumentHolder.textCopy": "Copiar",
"DE.Views.DocumentHolder.textCut": "Cortar",
"DE.Views.DocumentHolder.textDistributeCols": "Distribuir columnas",
@ -919,14 +949,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Editar límite de ajuste",
"DE.Views.DocumentHolder.textFromFile": "De archivo",
"DE.Views.DocumentHolder.textFromUrl": "De URL",
"DE.Views.DocumentHolder.textJoinList": "Juntar con lista anterior",
"DE.Views.DocumentHolder.textNest": "Tabla nido",
"DE.Views.DocumentHolder.textNextPage": "Página siguiente",
"DE.Views.DocumentHolder.textNumberingValue": "Valor de inicio",
"DE.Views.DocumentHolder.textPaste": "Pegar",
"DE.Views.DocumentHolder.textPrevPage": "Página anterior",
"DE.Views.DocumentHolder.textRefreshField": "Actualize el campo",
"DE.Views.DocumentHolder.textRemove": "Eliminar",
"DE.Views.DocumentHolder.textRemoveControl": "Elimine el control de contenido",
"DE.Views.DocumentHolder.textReplace": "Reemplazar imagen",
"DE.Views.DocumentHolder.textSeparateList": "Separar lista",
"DE.Views.DocumentHolder.textSettings": "Ajustes",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Alinear en la parte inferior",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Alinear al centro",
@ -934,6 +967,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Alinear al medio",
"DE.Views.DocumentHolder.textShapeAlignRight": "Alinear a la derecha",
"DE.Views.DocumentHolder.textShapeAlignTop": "Alinear en la parte superior",
"DE.Views.DocumentHolder.textStartNewList": "Iniciar nueva lista",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Establecer valor de inicio",
"DE.Views.DocumentHolder.textTOC": "Tabla de contenidos",
"DE.Views.DocumentHolder.textTOCSettings": "Ajustes de la tabla de contenidos",
"DE.Views.DocumentHolder.textUndo": "Deshacer",
@ -1055,7 +1090,7 @@
"DE.Views.DropcapSettingsAdvanced.textLeft": "Izquierdo",
"DE.Views.DropcapSettingsAdvanced.textMargin": "Margen",
"DE.Views.DropcapSettingsAdvanced.textMove": "Desplazar con texto",
"DE.Views.DropcapSettingsAdvanced.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.DropcapSettingsAdvanced.textNewColor": "Color personalizado",
"DE.Views.DropcapSettingsAdvanced.textNone": "Ningún",
"DE.Views.DropcapSettingsAdvanced.textPage": "Página",
"DE.Views.DropcapSettingsAdvanced.textParagraph": "Párrafo",
@ -1187,12 +1222,14 @@
"DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto seleccionado",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Mostrar",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Enlace externo",
"DE.Views.HyperlinkSettingsDialog.textInternal": "Lugar en documento",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Configuración de hiperenlace",
"DE.Views.HyperlinkSettingsDialog.textTooltip": "Información en pantalla",
"DE.Views.HyperlinkSettingsDialog.textUrl": "Enlace a",
"DE.Views.HyperlinkSettingsDialog.txtBeginning": "Principio del documento",
"DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Marcadores",
"DE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo es obligatorio",
"DE.Views.HyperlinkSettingsDialog.txtHeadings": "Títulos",
"DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Este campo debe ser URL en el formato \"http://www.example.com\"",
"DE.Views.ImageSettings.textAdvanced": "Mostrar ajustes avanzados",
"DE.Views.ImageSettings.textEdit": "Editar",
@ -1285,6 +1322,7 @@
"DE.Views.LeftMenu.tipAbout": "Acerca de programa",
"DE.Views.LeftMenu.tipChat": "Chat",
"DE.Views.LeftMenu.tipComments": "Comentarios",
"DE.Views.LeftMenu.tipNavigation": "Navegación",
"DE.Views.LeftMenu.tipPlugins": "Plugins",
"DE.Views.LeftMenu.tipSearch": "Búsqueda",
"DE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
@ -1305,6 +1343,7 @@
"DE.Views.Links.textGotoFootnote": "Ir a las notas a pie de página",
"DE.Views.Links.textUpdateAll": "Actualize toda la tabla",
"DE.Views.Links.textUpdatePages": "Actualize solo los números de página",
"DE.Views.Links.tipBookmarks": "Crear marcador",
"DE.Views.Links.tipContents": "Introducir tabla de contenidos",
"DE.Views.Links.tipContentsUpdate": "Actualize la tabla de contenidos",
"DE.Views.Links.tipInsertHyperlink": "Añadir hiperenlace",
@ -1391,6 +1430,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Empezar con",
"DE.Views.NoteSettingsDialog.textTextBottom": "Bajo el texto",
"DE.Views.NoteSettingsDialog.textTitle": "Ajustes de las notas a pie de página",
"DE.Views.NumberingValueDialog.cancelButtonText": "Cancelar",
"DE.Views.NumberingValueDialog.okButtonText": "Ok",
"DE.Views.PageMarginsDialog.cancelButtonText": "Cancelar",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Aviso",
"DE.Views.PageMarginsDialog.okButtonText": "Aceptar",
@ -1404,6 +1445,7 @@
"DE.Views.PageSizeDialog.cancelButtonText": "Cancelar",
"DE.Views.PageSizeDialog.okButtonText": "Aceptar",
"DE.Views.PageSizeDialog.textHeight": "Altura",
"DE.Views.PageSizeDialog.textPreset": "Preajuste",
"DE.Views.PageSizeDialog.textTitle": "Tamaño de página",
"DE.Views.PageSizeDialog.textWidth": "Ancho",
"DE.Views.PageSizeDialog.txtCustom": "Personalizado",
@ -1418,7 +1460,7 @@
"DE.Views.ParagraphSettings.textAuto": "Múltiple",
"DE.Views.ParagraphSettings.textBackColor": "Color de fondo",
"DE.Views.ParagraphSettings.textExact": "Exacto",
"DE.Views.ParagraphSettings.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.ParagraphSettings.textNewColor": "Color personalizado",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancelar",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Las pestañas especificadas aparecerán en este campo",
@ -1453,7 +1495,7 @@
"DE.Views.ParagraphSettingsAdvanced.textEffects": "Efectos",
"DE.Views.ParagraphSettingsAdvanced.textLeader": "Director",
"DE.Views.ParagraphSettingsAdvanced.textLeft": "Izquierdo",
"DE.Views.ParagraphSettingsAdvanced.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.ParagraphSettingsAdvanced.textNewColor": "Color personalizado",
"DE.Views.ParagraphSettingsAdvanced.textNone": "Ninguno",
"DE.Views.ParagraphSettingsAdvanced.textPosition": "Posición",
"DE.Views.ParagraphSettingsAdvanced.textRemove": "Eliminar",
@ -1506,7 +1548,7 @@
"DE.Views.ShapeSettings.textGradientFill": "Relleno degradado",
"DE.Views.ShapeSettings.textImageTexture": "Imagen o textura",
"DE.Views.ShapeSettings.textLinear": "Lineal",
"DE.Views.ShapeSettings.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.ShapeSettings.textNewColor": "Color personalizado",
"DE.Views.ShapeSettings.textNoFill": "Sin relleno",
"DE.Views.ShapeSettings.textPatternFill": "Patrón",
"DE.Views.ShapeSettings.textRadial": "Radial",
@ -1615,7 +1657,7 @@
"DE.Views.TableSettings.textHeader": "Encabezado",
"DE.Views.TableSettings.textHeight": "Altura",
"DE.Views.TableSettings.textLast": "Última",
"DE.Views.TableSettings.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.TableSettings.textNewColor": "Color personalizado",
"DE.Views.TableSettings.textOK": "Aceptar",
"DE.Views.TableSettings.textRows": "Filas",
"DE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
@ -1667,7 +1709,7 @@
"DE.Views.TableSettingsAdvanced.textMargins": "Márgenes de celda",
"DE.Views.TableSettingsAdvanced.textMeasure": "medir en",
"DE.Views.TableSettingsAdvanced.textMove": "Desplazar objeto con texto",
"DE.Views.TableSettingsAdvanced.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.TableSettingsAdvanced.textNewColor": "Color personalizado",
"DE.Views.TableSettingsAdvanced.textOnlyCells": "Sólo para celdas seleccionadas",
"DE.Views.TableSettingsAdvanced.textOptions": "Opciones",
"DE.Views.TableSettingsAdvanced.textOverlap": "Superposición",
@ -1720,7 +1762,7 @@
"DE.Views.TextArtSettings.textGradient": "Gradiente",
"DE.Views.TextArtSettings.textGradientFill": "Relleno degradado",
"DE.Views.TextArtSettings.textLinear": "Lineal",
"DE.Views.TextArtSettings.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.TextArtSettings.textNewColor": "Color personalizado",
"DE.Views.TextArtSettings.textNoFill": "Sin relleno",
"DE.Views.TextArtSettings.textRadial": "Radial",
"DE.Views.TextArtSettings.textSelectTexture": "Seleccionar",
@ -1756,6 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Editar encabezado",
"DE.Views.Toolbar.mniHiddenBorders": "Bordes de tabla escogidos",
"DE.Views.Toolbar.mniHiddenChars": "Caracteres no imprimibles",
"DE.Views.Toolbar.mniHighlightControls": "Ajustes de resaltado",
"DE.Views.Toolbar.mniImageFromFile": "Imagen de archivo",
"DE.Views.Toolbar.mniImageFromUrl": "Imagen de URL",
"DE.Views.Toolbar.strMenuNoFill": "Sin relleno",
@ -1791,8 +1834,9 @@
"DE.Views.Toolbar.textMarginsNormal": "Normal",
"DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
"DE.Views.Toolbar.textMarginsWide": "Amplio",
"DE.Views.Toolbar.textNewColor": "Añadir Color Personalizado Nuevo",
"DE.Views.Toolbar.textNewColor": "Color personalizado",
"DE.Views.Toolbar.textNextPage": "Página siguiente",
"DE.Views.Toolbar.textNoHighlight": "No resaltar",
"DE.Views.Toolbar.textNone": "Ningún",
"DE.Views.Toolbar.textOddPage": "Página impar",
"DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados",

View file

@ -150,7 +150,7 @@
"Common.Views.Header.textSaveChanged": "Modifié",
"Common.Views.Header.textSaveEnd": "Toutes les modifications ont été enregistrées",
"Common.Views.Header.textSaveExpander": "Toutes les modifications ont été enregistrées",
"Common.Views.Header.textZoom": "Grossissement",
"Common.Views.Header.textZoom": "Zoom",
"Common.Views.Header.tipAccessRights": "Gérer les droits d'accès au document",
"Common.Views.Header.tipDownload": "Télécharger le fichier",
"Common.Views.Header.tipGoEdit": "Modifier le fichier courant",
@ -168,6 +168,7 @@
"Common.Views.History.textRestore": "Restaurer",
"Common.Views.History.textShow": "Développer",
"Common.Views.History.textShowAll": "Afficher les modifications détaillées",
"Common.Views.History.textVer": "ver. ",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuler",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Coller URL d'image",
@ -192,6 +193,7 @@
"Common.Views.OpenDialog.txtIncorrectPwd": "Le mot de passe est incorrect.",
"Common.Views.OpenDialog.txtPassword": "Mot de passe",
"Common.Views.OpenDialog.txtPreview": "Aperçu",
"Common.Views.OpenDialog.txtProtected": "Une fois le mot de passe saisi et le fichier ouvert, le mot de passe actuel de fichier sera réinitialisé.",
"Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ",
"Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé",
"Common.Views.PasswordDialog.cancelButtonText": "Annuler",
@ -216,7 +218,7 @@
"Common.Views.Protection.txtEncrypt": "Chiffrer",
"Common.Views.Protection.txtInvisibleSignature": "Ajouter une signature électronique",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Zone de signature",
"Common.Views.Protection.txtSignatureLine": "Ajouter la zone de signature",
"Common.Views.RenameDialog.cancelButtonText": "Annuler",
"Common.Views.RenameDialog.okButtonText": "Ok",
"Common.Views.RenameDialog.textName": "Nom de fichier",
@ -270,6 +272,14 @@
"Common.Views.ReviewChangesDialog.txtReject": "Rejeter",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Rejeter toutes les modifications",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Rejeter cette modification",
"Common.Views.ReviewPopover.textAdd": "Ajouter",
"Common.Views.ReviewPopover.textAddReply": "Ajouter Réponse",
"Common.Views.ReviewPopover.textCancel": "Annuler",
"Common.Views.ReviewPopover.textClose": "Fermer",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textOpenAgain": "Ouvrir à nouveau",
"Common.Views.ReviewPopover.textReply": "Répondre",
"Common.Views.ReviewPopover.textResolve": "Résoudre",
"Common.Views.SignDialog.cancelButtonText": "Annuler",
"Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Gras",
@ -306,6 +316,7 @@
"DE.Controllers.LeftMenu.textReplaceSkipped": "Le remplacement est fait. {0} occurrences ont été ignorées.",
"DE.Controllers.LeftMenu.textReplaceSuccess": "La recherche est effectuée. Occurrences ont été remplacées:{0}",
"DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
"DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si vous continuer à sauvegarder dans ce format une partie de la mise en forme peut être supprimée <br>Êtes-vous sûr de vouloir continuer?",
"DE.Controllers.Main.applyChangesTextText": "Chargement des changemets...",
"DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
"DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
@ -322,6 +333,7 @@
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.",
"DE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion de Document Server<a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ici</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données. Si l'erreur persiste veillez contactez l'assistance technique.",
"DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
"DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
"DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
"DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
@ -377,10 +389,13 @@
"DE.Controllers.Main.textAnonymous": "Anonyme",
"DE.Controllers.Main.textBuyNow": "Visiter le site web",
"DE.Controllers.Main.textChangesSaved": "Toutes les modifications ont été enregistrées",
"DE.Controllers.Main.textClose": "Fermer",
"DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil",
"DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
"DE.Controllers.Main.textLicencePaidFeature": "La fonction que vouz essayez d'utiliser est disponible pour la Licence Etendue.<br>Si vous en avez besoin, veuillez contacter Sales Department ",
"DE.Controllers.Main.textLoadingDocument": "Chargement du document",
"DE.Controllers.Main.textNoLicenseTitle": "Limitation de connexion ONLYOFFICE",
"DE.Controllers.Main.textPaidFeature": "Fonction payée",
"DE.Controllers.Main.textShape": "Forme",
"DE.Controllers.Main.textStrict": "Mode strict",
"DE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.<br>Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
@ -444,9 +459,11 @@
"DE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
"DE.Controllers.Main.warnBrowserIE9": "L'application est peu compatible avec IE9. Utilisez IE10 ou version plus récente",
"DE.Controllers.Main.warnBrowserZoom": "Le paramètre actuel de zoom de votre navigateur n'est pas accepté. Veuillez rétablir le niveau de zoom par défaut en appuyant sur Ctrl+0.",
"DE.Controllers.Main.warnLicenseExceeded": "Le nombre de connexions simultanées a été dépassée et le document sera ouvert en mode lecture seule.<br>Veuillez contacter votre administrateur pour plus d'informations.",
"DE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.<br>Veuillez mettre à jour votre licence et actualisez la page.",
"DE.Controllers.Main.warnNoLicense": "Cette version de ONLYOFFICE Editors a certaines limitations pour les connexions simultanées au serveur de documents.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Cette version de ONLYOFFICE Editors a certaines limitations pour les utilisateurs simultanés.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Le nombre d'utilisateurs simultanés a été dépassé et le document sera ouvert en mode lecture seule.<br>Veuillez contacter votre administrateur pour plus d'informations.",
"DE.Controllers.Main.warnNoLicense": "Cette version de ONLYOFFICE Editors a certaines limitations pour les connexions simultanées au serveur de documents.<br>Si vous avez besoin de plus, considérez la possibilité de mettre à jour votre licence actuelle ou d'acheter une licence commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Cette version de ONLYOFFICE Editors a certaines limitations pour les utilisateurs simultanés.<br>Si vous avez besoin de plus, considérez la possibilité de mettre à jour votre licence actuelle ou d'acheter une licence commerciale.",
"DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
"DE.Controllers.Navigation.txtBeginning": "Début du document",
"DE.Controllers.Navigation.txtGotoBeginning": "Aller au début du document",
@ -792,12 +809,16 @@
"DE.Controllers.Viewport.textFitPage": "Ajuster à la page",
"DE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur",
"DE.Views.BookmarksDialog.textAdd": "Ajouter",
"DE.Views.BookmarksDialog.textBookmarkName": "Nom du signet",
"DE.Views.BookmarksDialog.textClose": "Fermer",
"DE.Views.BookmarksDialog.textDelete": "Supprimer",
"DE.Views.BookmarksDialog.textGoto": "Aller à",
"DE.Views.BookmarksDialog.textHidden": "Signets cachés",
"DE.Views.BookmarksDialog.textLocation": "Emplacement",
"DE.Views.BookmarksDialog.textName": "Nom",
"DE.Views.BookmarksDialog.textSort": "Trier par",
"DE.Views.BookmarksDialog.textTitle": "Signets",
"DE.Views.BookmarksDialog.txtInvalidName": "Nom du signet ne peut pas contenir que des lettres, des chiffres et des barres de soulignement et doit commencer avec une lettre",
"DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés",
"DE.Views.ChartSettings.textArea": "En aires",
"DE.Views.ChartSettings.textBar": "En barre",
@ -826,8 +847,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Haut et bas",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Annuler",
"DE.Views.ControlSettingsDialog.okButtonText": "Ok",
"DE.Views.ControlSettingsDialog.textAppearance": "Apparence",
"DE.Views.ControlSettingsDialog.textApplyAll": "Appliquer à tous",
"DE.Views.ControlSettingsDialog.textBox": "Boîte d'encombrement",
"DE.Views.ControlSettingsDialog.textColor": "Couleur",
"DE.Views.ControlSettingsDialog.textLock": "Verrouillage ",
"DE.Views.ControlSettingsDialog.textName": "Titre",
"DE.Views.ControlSettingsDialog.textNewColor": "Couleur personnalisée",
"DE.Views.ControlSettingsDialog.textNone": "Aucun",
"DE.Views.ControlSettingsDialog.textShowAs": "Afficher comme ",
"DE.Views.ControlSettingsDialog.textTag": "Tag",
"DE.Views.ControlSettingsDialog.textTitle": "Paramètres de contrôle du contenu",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Le contrôle du contenu ne peut pas être supprimé",
@ -847,6 +875,7 @@
"DE.Views.DocumentHolder.alignmentText": "Alignement",
"DE.Views.DocumentHolder.belowText": "En dessous",
"DE.Views.DocumentHolder.breakBeforeText": "Saut de page avant",
"DE.Views.DocumentHolder.bulletsText": "Puces et Numérotation",
"DE.Views.DocumentHolder.cellAlignText": "Alignement vertical de la cellule",
"DE.Views.DocumentHolder.cellText": "Cellule",
"DE.Views.DocumentHolder.centerText": "Centre",
@ -911,6 +940,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Avancer",
"DE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan",
"DE.Views.DocumentHolder.textContentControls": "Contrôle du contenu",
"DE.Views.DocumentHolder.textContinueNumbering": "Continuer la numérotation",
"DE.Views.DocumentHolder.textCopy": "Copier",
"DE.Views.DocumentHolder.textCut": "Couper",
"DE.Views.DocumentHolder.textDistributeCols": "Distribuer les colonnes",
@ -919,14 +949,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Modifier les limites du renvoi à la ligne",
"DE.Views.DocumentHolder.textFromFile": "D'un fichier",
"DE.Views.DocumentHolder.textFromUrl": "D'une URL",
"DE.Views.DocumentHolder.textJoinList": "Rejoindre la liste précédente. ",
"DE.Views.DocumentHolder.textNest": "Tableau imbriqué",
"DE.Views.DocumentHolder.textNextPage": "Page suivante",
"DE.Views.DocumentHolder.textNumberingValue": "Valeur initiale",
"DE.Views.DocumentHolder.textPaste": "Coller",
"DE.Views.DocumentHolder.textPrevPage": "Page précédente",
"DE.Views.DocumentHolder.textRefreshField": "Actualiser le champ",
"DE.Views.DocumentHolder.textRemove": "Supprimer",
"DE.Views.DocumentHolder.textRemoveControl": "Supprimer le contrôle du contenu",
"DE.Views.DocumentHolder.textReplace": "Remplacer limage",
"DE.Views.DocumentHolder.textSeparateList": "Liste séparée",
"DE.Views.DocumentHolder.textSettings": "Paramètres",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Aligner en bas",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Aligner au centre",
@ -934,6 +967,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Aligner au milieu",
"DE.Views.DocumentHolder.textShapeAlignRight": "Aligner à droite",
"DE.Views.DocumentHolder.textShapeAlignTop": "Aligner en haut",
"DE.Views.DocumentHolder.textStartNewList": "Commencer une autre liste",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Fixer la valeur initiale",
"DE.Views.DocumentHolder.textTOC": "Table des matières",
"DE.Views.DocumentHolder.textTOCSettings": "Paramètres de la table des matières",
"DE.Views.DocumentHolder.textUndo": "Annuler",
@ -1006,7 +1041,7 @@
"DE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite",
"DE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent",
"DE.Views.DocumentHolder.txtRemoveBar": "Supprimer la barre",
"DE.Views.DocumentHolder.txtRemScripts": "Supprimer scripts",
"DE.Views.DocumentHolder.txtRemScripts": "Supprimer les scripts",
"DE.Views.DocumentHolder.txtRemSubscript": "Supprimer la souscription",
"DE.Views.DocumentHolder.txtRemSuperscript": "Supprimer la suscription",
"DE.Views.DocumentHolder.txtScriptsAfter": "Scripts après le texte",
@ -1218,7 +1253,7 @@
"DE.Views.ImageSettingsAdvanced.cancelButtonText": "Annuler",
"DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Rembourrage texte",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolu",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolue",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignement",
"DE.Views.ImageSettingsAdvanced.textAlt": "Texte de remplacement",
"DE.Views.ImageSettingsAdvanced.textAltDescription": "Description",
@ -1287,6 +1322,7 @@
"DE.Views.LeftMenu.tipAbout": "Au sujet de",
"DE.Views.LeftMenu.tipChat": "Chat",
"DE.Views.LeftMenu.tipComments": "Commentaires",
"DE.Views.LeftMenu.tipNavigation": "Navigation",
"DE.Views.LeftMenu.tipPlugins": "Plug-ins",
"DE.Views.LeftMenu.tipSearch": "Recherche",
"DE.Views.LeftMenu.tipSupport": "Commentaires & assistance",
@ -1307,6 +1343,7 @@
"DE.Views.Links.textGotoFootnote": "Accéder aux notes de bas de page",
"DE.Views.Links.textUpdateAll": "Actualiser le tableau entier",
"DE.Views.Links.textUpdatePages": "Actualiser les numéros de page uniquement",
"DE.Views.Links.tipBookmarks": "Créer un signet",
"DE.Views.Links.tipContents": "Insérer la table des matières",
"DE.Views.Links.tipContentsUpdate": "Actualiser la table des matières",
"DE.Views.Links.tipInsertHyperlink": "Ajouter un lien hypertexte",
@ -1334,7 +1371,7 @@
"DE.Views.MailMergeSettings.downloadMergeTitle": "Fusion",
"DE.Views.MailMergeSettings.errorMailMergeSaveFile": "Fusion a échoué.",
"DE.Views.MailMergeSettings.notcriticalErrorTitle": "Avertissement",
"DE.Views.MailMergeSettings.textAddRecipients": "Ajouter des destinataires d'abord à la liste",
"DE.Views.MailMergeSettings.textAddRecipients": "D'abord ajouter quelques destinataires à la liste",
"DE.Views.MailMergeSettings.textAll": "Tous les enregistrements",
"DE.Views.MailMergeSettings.textCurrent": "Enregistrement actuel",
"DE.Views.MailMergeSettings.textDataSource": "La source de données",
@ -1368,6 +1405,7 @@
"DE.Views.Navigation.txtEmpty": "Ce document ne contient pas d'en-têtes",
"DE.Views.Navigation.txtEmptyItem": "En-tête vide",
"DE.Views.Navigation.txtExpand": "Développer tout",
"DE.Views.Navigation.txtExpandToLevel": "Décomprimer jusqu'au niveau",
"DE.Views.Navigation.txtHeadingAfter": "Nouvel en-tête après",
"DE.Views.Navigation.txtHeadingBefore": "Nouvel en-tête avant",
"DE.Views.Navigation.txtNewHeading": "Nouveau sous-titre",
@ -1392,6 +1430,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Début",
"DE.Views.NoteSettingsDialog.textTextBottom": "Sous le texte",
"DE.Views.NoteSettingsDialog.textTitle": "Paramètres des notes de bas de page",
"DE.Views.NumberingValueDialog.cancelButtonText": "Annuler",
"DE.Views.NumberingValueDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.cancelButtonText": "Annuler",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avertissement",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",
@ -1405,6 +1445,7 @@
"DE.Views.PageSizeDialog.cancelButtonText": "Annuler",
"DE.Views.PageSizeDialog.okButtonText": "Ok",
"DE.Views.PageSizeDialog.textHeight": "Hauteur",
"DE.Views.PageSizeDialog.textPreset": "Prédéfini",
"DE.Views.PageSizeDialog.textTitle": "Taille de la page",
"DE.Views.PageSizeDialog.textWidth": "Largeur",
"DE.Views.PageSizeDialog.txtCustom": "Personnalisé",
@ -1557,8 +1598,8 @@
"DE.Views.Statusbar.tipFitWidth": "Ajuster à la largeur",
"DE.Views.Statusbar.tipSetLang": "Définir la langue du texte",
"DE.Views.Statusbar.tipZoomFactor": "Grossissement",
"DE.Views.Statusbar.tipZoomIn": "Agrandir le zoom",
"DE.Views.Statusbar.tipZoomOut": "Réduire le zoom",
"DE.Views.Statusbar.tipZoomIn": "Zoom avant",
"DE.Views.Statusbar.tipZoomOut": "Zoom arrière",
"DE.Views.Statusbar.txtPageNumInvalid": "Numéro de page non valide",
"DE.Views.StyleTitleDialog.textHeader": "Créer un nouveau style",
"DE.Views.StyleTitleDialog.textNextStyle": "Style du nouveau paragraphe",
@ -1757,6 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Modifier l'en-tête",
"DE.Views.Toolbar.mniHiddenBorders": "Bordures du tableau cachées",
"DE.Views.Toolbar.mniHiddenChars": "Caractères non imprimables",
"DE.Views.Toolbar.mniHighlightControls": "Paramètres de surbrillance",
"DE.Views.Toolbar.mniImageFromFile": "Image à partir d'un fichier",
"DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL",
"DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage",
@ -1794,6 +1836,7 @@
"DE.Views.Toolbar.textMarginsWide": "Large",
"DE.Views.Toolbar.textNewColor": "Couleur personnalisée",
"DE.Views.Toolbar.textNextPage": "Page suivante",
"DE.Views.Toolbar.textNoHighlight": "Pas de surbrillance ",
"DE.Views.Toolbar.textNone": "Aucune",
"DE.Views.Toolbar.textOddPage": "Page impaire",
"DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées",
@ -1898,7 +1941,7 @@
"DE.Views.Toolbar.txtScheme20": "Urbain",
"DE.Views.Toolbar.txtScheme21": "Verve",
"DE.Views.Toolbar.txtScheme3": "Apex",
"DE.Views.Toolbar.txtScheme4": "Aspect",
"DE.Views.Toolbar.txtScheme4": "Proportions",
"DE.Views.Toolbar.txtScheme5": "Civique",
"DE.Views.Toolbar.txtScheme6": "Rotonde",
"DE.Views.Toolbar.txtScheme7": "Capitaux",

View file

@ -271,6 +271,14 @@
"Common.Views.ReviewChangesDialog.txtReject": "Respingi",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Annulla tutte le modifiche",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Annulla la modifica attuale",
"Common.Views.ReviewPopover.textAdd": "Aggiungi",
"Common.Views.ReviewPopover.textAddReply": "Aggiungi risposta",
"Common.Views.ReviewPopover.textCancel": "Annulla",
"Common.Views.ReviewPopover.textClose": "Chiudi",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textOpenAgain": "Apri di nuovo",
"Common.Views.ReviewPopover.textReply": "Rispondi",
"Common.Views.ReviewPopover.textResolve": "Risolvere",
"Common.Views.SignDialog.cancelButtonText": "Annulla",
"Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Grassetto",
@ -322,7 +330,7 @@
"DE.Controllers.Main.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.<br>Si prega di contattare l'amministratore del Server dei Documenti.",
"DE.Controllers.Main.errorBadImageUrl": "URL dell'immagine non corretto",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "Connessione al server persa. Impossibile modificare il documento.",
"DE.Controllers.Main.errorConnectToServer": "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": "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 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.",
@ -855,6 +863,7 @@
"DE.Views.DocumentHolder.alignmentText": "Allineamento",
"DE.Views.DocumentHolder.belowText": "Al di sotto",
"DE.Views.DocumentHolder.breakBeforeText": "Anteponi interruzione",
"DE.Views.DocumentHolder.bulletsText": "Elenco puntato e Numerato",
"DE.Views.DocumentHolder.cellAlignText": "Allineamento verticale celle",
"DE.Views.DocumentHolder.cellText": "Cella",
"DE.Views.DocumentHolder.centerText": "Al centro",
@ -919,6 +928,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Porta avanti",
"DE.Views.DocumentHolder.textArrangeFront": "Porta in primo piano",
"DE.Views.DocumentHolder.textContentControls": "Controllo Contenuto",
"DE.Views.DocumentHolder.textContinueNumbering": "Continua la numerazione",
"DE.Views.DocumentHolder.textCopy": "Copia",
"DE.Views.DocumentHolder.textCut": "Taglia",
"DE.Views.DocumentHolder.textDistributeCols": "Distribuisci colonne",
@ -927,14 +937,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Modifica bordi disposizione testo",
"DE.Views.DocumentHolder.textFromFile": "Da file",
"DE.Views.DocumentHolder.textFromUrl": "Da URL",
"DE.Views.DocumentHolder.textJoinList": "Iscriviti alla lista precedente",
"DE.Views.DocumentHolder.textNest": "Tabella nidificata",
"DE.Views.DocumentHolder.textNextPage": "Pagina successiva",
"DE.Views.DocumentHolder.textNumberingValue": "Numerazione valore",
"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",
"DE.Views.DocumentHolder.textSeparateList": "Elenco separato",
"DE.Views.DocumentHolder.textSettings": "Impostazioni",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Allinea in basso",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Allinea al centro",
@ -942,6 +955,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Allinea in mezzo",
"DE.Views.DocumentHolder.textShapeAlignRight": "Allinea a destra",
"DE.Views.DocumentHolder.textShapeAlignTop": "Allinea in alto",
"DE.Views.DocumentHolder.textStartNewList": "Inizia nuovo elenco",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Imposta il valore numerico",
"DE.Views.DocumentHolder.textTOC": "Sommario",
"DE.Views.DocumentHolder.textTOCSettings": "Impostazioni sommario",
"DE.Views.DocumentHolder.textUndo": "Annulla",
@ -1403,6 +1418,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Inizia da",
"DE.Views.NoteSettingsDialog.textTextBottom": "Sotto al testo",
"DE.Views.NoteSettingsDialog.textTitle": "Impostazioni delle note",
"DE.Views.NumberingValueDialog.cancelButtonText": "Annulla",
"DE.Views.NumberingValueDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.cancelButtonText": "Annulla",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",

View file

@ -168,6 +168,7 @@
"Common.Views.History.textRestore": "Восстановить",
"Common.Views.History.textShow": "Развернуть",
"Common.Views.History.textShowAll": "Показать подробные изменения",
"Common.Views.History.textVer": "вер.",
"Common.Views.ImageFromUrlDialog.cancelButtonText": "Отмена",
"Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:",
@ -271,6 +272,14 @@
"Common.Views.ReviewChangesDialog.txtReject": "Отклонить",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Отклонить все изменения",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Отклонить текущее изменение",
"Common.Views.ReviewPopover.textAdd": "Добавить",
"Common.Views.ReviewPopover.textAddReply": "Добавить ответ",
"Common.Views.ReviewPopover.textCancel": "Отмена",
"Common.Views.ReviewPopover.textClose": "Закрыть",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textOpenAgain": "Открыть снова",
"Common.Views.ReviewPopover.textReply": "Ответить",
"Common.Views.ReviewPopover.textResolve": "Решить",
"Common.Views.SignDialog.cancelButtonText": "Отмена",
"Common.Views.SignDialog.okButtonText": "Ok",
"Common.Views.SignDialog.textBold": "Жирный",
@ -380,10 +389,13 @@
"DE.Controllers.Main.textAnonymous": "Аноним",
"DE.Controllers.Main.textBuyNow": "Перейти на сайт",
"DE.Controllers.Main.textChangesSaved": "Все изменения сохранены",
"DE.Controllers.Main.textClose": "Закрыть",
"DE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку",
"DE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
"DE.Controllers.Main.textLicencePaidFeature": "Функция, которую вы пытаетесь использовать, доступна по расширенной лицензии.<br>Если вам нужна эта функция, обратитесь в отдел продаж",
"DE.Controllers.Main.textLoadingDocument": "Загрузка документа",
"DE.Controllers.Main.textNoLicenseTitle": "Ограничение по числу подключений ONLYOFFICE",
"DE.Controllers.Main.textPaidFeature": "Платная функция",
"DE.Controllers.Main.textShape": "Фигура",
"DE.Controllers.Main.textStrict": "Строгий режим",
"DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.<br>Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.",
@ -806,6 +818,7 @@
"DE.Views.BookmarksDialog.textName": "Имя",
"DE.Views.BookmarksDialog.textSort": "Порядок",
"DE.Views.BookmarksDialog.textTitle": "Закладки",
"DE.Views.BookmarksDialog.txtInvalidName": "Имя закладки может содержать только буквы, цифры и знаки подчеркивания и должно начинаться с буквы.",
"DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры",
"DE.Views.ChartSettings.textArea": "С областями",
"DE.Views.ChartSettings.textBar": "Линейчатая",
@ -834,8 +847,15 @@
"DE.Views.ChartSettings.txtTopAndBottom": "Сверху и снизу",
"DE.Views.ControlSettingsDialog.cancelButtonText": "Отмена",
"DE.Views.ControlSettingsDialog.okButtonText": "Ok",
"DE.Views.ControlSettingsDialog.textAppearance": "Вид",
"DE.Views.ControlSettingsDialog.textApplyAll": "Применить ко всем",
"DE.Views.ControlSettingsDialog.textBox": "С ограничивающей рамкой",
"DE.Views.ControlSettingsDialog.textColor": "Цвет",
"DE.Views.ControlSettingsDialog.textLock": "Блокировка",
"DE.Views.ControlSettingsDialog.textName": "Заголовок",
"DE.Views.ControlSettingsDialog.textNewColor": "Пользовательский цвет",
"DE.Views.ControlSettingsDialog.textNone": "Без рамки",
"DE.Views.ControlSettingsDialog.textShowAs": "Отображать",
"DE.Views.ControlSettingsDialog.textTag": "Тег",
"DE.Views.ControlSettingsDialog.textTitle": "Параметры элемента управления содержимым",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Элемент управления содержимым нельзя удалить",
@ -855,6 +875,7 @@
"DE.Views.DocumentHolder.alignmentText": "Выравнивание",
"DE.Views.DocumentHolder.belowText": "Ниже",
"DE.Views.DocumentHolder.breakBeforeText": "С новой страницы",
"DE.Views.DocumentHolder.bulletsText": "Маркеры и нумерация",
"DE.Views.DocumentHolder.cellAlignText": "Вертикальное выравнивание в ячейках",
"DE.Views.DocumentHolder.cellText": "Ячейку",
"DE.Views.DocumentHolder.centerText": "По центру",
@ -919,6 +940,7 @@
"DE.Views.DocumentHolder.textArrangeForward": "Перенести вперед",
"DE.Views.DocumentHolder.textArrangeFront": "Перенести на передний план",
"DE.Views.DocumentHolder.textContentControls": "Элемент управления содержимым",
"DE.Views.DocumentHolder.textContinueNumbering": "Продолжить нумерацию",
"DE.Views.DocumentHolder.textCopy": "Копировать",
"DE.Views.DocumentHolder.textCut": "Вырезать",
"DE.Views.DocumentHolder.textDistributeCols": "Выровнять ширину столбцов",
@ -927,14 +949,17 @@
"DE.Views.DocumentHolder.textEditWrapBoundary": "Изменить границу обтекания",
"DE.Views.DocumentHolder.textFromFile": "Из файла",
"DE.Views.DocumentHolder.textFromUrl": "По URL",
"DE.Views.DocumentHolder.textJoinList": "Объединить с предыдущим списком",
"DE.Views.DocumentHolder.textNest": "Вставить как вложенную таблицу",
"DE.Views.DocumentHolder.textNextPage": "Следующая страница",
"DE.Views.DocumentHolder.textNumberingValue": "Начальное значение",
"DE.Views.DocumentHolder.textPaste": "Вставить",
"DE.Views.DocumentHolder.textPrevPage": "Предыдущая страница",
"DE.Views.DocumentHolder.textRefreshField": "Обновить поле",
"DE.Views.DocumentHolder.textRemove": "Удалить",
"DE.Views.DocumentHolder.textRemoveControl": "Удалить элемент управления содержимым",
"DE.Views.DocumentHolder.textReplace": "Заменить изображение",
"DE.Views.DocumentHolder.textSeparateList": "Разделить список",
"DE.Views.DocumentHolder.textSettings": "Настройки",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Выровнять по нижнему краю",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Выровнять по центру",
@ -942,6 +967,8 @@
"DE.Views.DocumentHolder.textShapeAlignMiddle": "Выровнять по середине",
"DE.Views.DocumentHolder.textShapeAlignRight": "Выровнять по правому краю",
"DE.Views.DocumentHolder.textShapeAlignTop": "Выровнять по верхнему краю",
"DE.Views.DocumentHolder.textStartNewList": "Начать новый список",
"DE.Views.DocumentHolder.textStartNumberingFrom": "Задать начальное значение",
"DE.Views.DocumentHolder.textTOC": "Оглавление",
"DE.Views.DocumentHolder.textTOCSettings": "Параметры оглавления",
"DE.Views.DocumentHolder.textUndo": "Отменить",
@ -1403,6 +1430,8 @@
"DE.Views.NoteSettingsDialog.textStart": "Начать с",
"DE.Views.NoteSettingsDialog.textTextBottom": "Под текстом",
"DE.Views.NoteSettingsDialog.textTitle": "Параметры сносок",
"DE.Views.NumberingValueDialog.cancelButtonText": "Отмена",
"DE.Views.NumberingValueDialog.okButtonText": "Ok",
"DE.Views.PageMarginsDialog.cancelButtonText": "Отмена",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Внимание",
"DE.Views.PageMarginsDialog.okButtonText": "Ok",
@ -1769,6 +1798,7 @@
"DE.Views.Toolbar.mniEditHeader": "Изменить верхний колонтитул",
"DE.Views.Toolbar.mniHiddenBorders": "Скрытые границы таблиц",
"DE.Views.Toolbar.mniHiddenChars": "Непечатаемые символы",
"DE.Views.Toolbar.mniHighlightControls": "Параметры выделения",
"DE.Views.Toolbar.mniImageFromFile": "Изображение из файла",
"DE.Views.Toolbar.mniImageFromUrl": "Изображение по URL",
"DE.Views.Toolbar.strMenuNoFill": "Без заливки",
@ -1806,6 +1836,7 @@
"DE.Views.Toolbar.textMarginsWide": "Широкие",
"DE.Views.Toolbar.textNewColor": "Пользовательский цвет",
"DE.Views.Toolbar.textNextPage": "Со следующей страницы",
"DE.Views.Toolbar.textNoHighlight": "Без выделения",
"DE.Views.Toolbar.textNone": "Нет",
"DE.Views.Toolbar.textOddPage": "С нечетной страницы",
"DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля",

View file

@ -33,8 +33,8 @@
"name": "Registerkarte Plug-ins"
},
{
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Farbschema ändern",
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Ein neues Dokument erstellen oder ein vorhandenes öffnen",
"headername": "Grundfunktionen"
},
{
@ -42,8 +42,8 @@
"name": "Textpassagen kopieren/einfügen, Aktionen rückgängig machen/wiederholen"
},
{
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Ein neues Dokument erstellen oder ein vorhandenes öffnen"
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Farbschema ändern"
},
{
"src": "UsageInstructions/SetPageParameters.htm",

View file

@ -7,15 +7,16 @@
{"src": "ProgramInterface/ReferencesTab.htm", "name": "References tab"},
{"src": "ProgramInterface/ReviewTab.htm", "name": "Collaboration tab"},
{"src": "ProgramInterface/PluginsTab.htm", "name": "Plugins tab"},
{"src": "UsageInstructions/ChangeColorScheme.htm", "name": "Change color scheme", "headername": "Basic operations"},
{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Create a new document or open an existing one", "headername": "Basic operations"},
{"src": "UsageInstructions/CopyPasteUndoRedo.htm", "name": "Copy/paste text passages, undo/redo your actions"},
{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Create a new document or open an existing one"},
{"src": "UsageInstructions/ChangeColorScheme.htm", "name": "Change color scheme"},
{"src": "UsageInstructions/SetPageParameters.htm", "name": "Set page parameters", "headername": "Page formatting"},
{"src": "UsageInstructions/NonprintingCharacters.htm", "name": "Show/hide nonprinting characters" },
{"src": "UsageInstructions/SectionBreaks.htm", "name": "Insert section breaks" },
{"src": "UsageInstructions/InsertHeadersFooters.htm", "name": "Insert headers and footers"},
{"src": "UsageInstructions/InsertPageNumbers.htm", "name": "Insert page numbers"},
{"src": "UsageInstructions/InsertFootnotes.htm", "name": "Insert footnotes"},
{ "src": "UsageInstructions/InsertFootnotes.htm", "name": "Insert footnotes" },
{"src": "UsageInstructions/InsertBookmarks.htm", "name": "Add bookmarks"},
{"src": "UsageInstructions/AlignText.htm", "name": "Align your text in a paragraph", "headername": "Paragraph formatting"},
{"src": "UsageInstructions/BackgroundColor.htm", "name": "Select background color for a paragraph"},
{"src": "UsageInstructions/ParagraphIndents.htm", "name": "Change paragraph indents"},

View file

@ -29,12 +29,12 @@
<li class="onlineDocumentFeatures"><b>Autosave</b> is used to turn on/off automatic saving of changes you make while editing.</li>
<li class="onlineDocumentFeatures"><b>Co-editing Mode</b> is used to select the display of the changes made during the co-editing:
<ul>
<li>By default the <b>Fast</b> mode is selected, the users who take part in the document co-editing will see the changes in realtime once they are made by other users.</li>
<li>By default the <b>Fast</b> mode is selected, the users who take part in the document co-editing will see the changes in real time once they are made by other users.</li>
<li>If you prefer not to see other user changes (so that they do not disturb you, or for some other reason), select the <b>Strict</b> mode and all the changes will be shown only after you click the <b>Save</b> <img alt="Save icon" src="../images/saveupdate.png" /> icon notifying you that there are changes from other users.</li>
</ul>
</li>
<li class="onlineDocumentFeatures">
<b>Realtime Collaboration Changes</b> is used to specify what changes you want to be highlighted during co-editing:
<b>Real-time Collaboration Changes</b> is used to specify what changes you want to be highlighted during co-editing:
<ul>
<li>Selecting the <b>View None</b> option, changes made during the current session will not be highlighted.</li>
<li>Selecting the <b>View All</b> option, all the changes made during the current session will be highlighted.</li>

View file

@ -18,19 +18,19 @@
<ul>
<li class="onlineDocumentFeatures">simultaneous multi-user access to the edited document</li>
<li class="onlineDocumentFeatures">visual indication of passages that are being edited by other users</li>
<li class="onlineDocumentFeatures">synchronization of changes with one button click</li>
<li class="onlineDocumentFeatures">real-time changes display or synchronization of changes with one button click</li>
<li class="onlineDocumentFeatures">chat to share ideas concerning particular document parts</li>
<li>comments containing the description of a task or problem that should be solved</li>
</ul>
<div class="onlineDocumentFeatures">
<h3>Co-editing</h3>
<p><b>Document Editor</b> allows to select one of the two available co-editing modes. <b>Fast</b> is used by default and shows the changes made by other users in realtime. <b>Strict</b> is selected to hide other user changes until you click the <b>Save</b> <img alt="Save icon" src="../images/saveupdate.png" /> icon to save your own changes and accept the changes made by others. The mode can be selected in the <a href="../HelpfulHints/AdvancedSettings.htm" onclick="onhyperlinkclick(this)">Advanced Settings</a>. It's also possible to choose the necessary mode using the <img alt="Co-editing Mode icon" src="../images/coeditingmode.png" /> <b>Co-editing Mode</b> icon at the <b>Collaboration</b> tab of the top toolbar:</p>
<p><b>Document Editor</b> allows to select one of the two available co-editing modes. <b>Fast</b> is used by default and shows the changes made by other users in real time. <b>Strict</b> is selected to hide other user changes until you click the <b>Save</b> <img alt="Save icon" src="../images/saveupdate.png" /> icon to save your own changes and accept the changes made by others. The mode can be selected in the <a href="../HelpfulHints/AdvancedSettings.htm" onclick="onhyperlinkclick(this)">Advanced Settings</a>. It's also possible to choose the necessary mode using the <img alt="Co-editing Mode icon" src="../images/coeditingmode.png" /> <b>Co-editing Mode</b> icon at the <b>Collaboration</b> tab of the top toolbar:</p>
<p><img alt="Co-editing Mode menu" src="../images/coeditingmodemenu.png" /></p>
<p>When a document is being edited by several users simultaneously in the <b>Strict</b> mode, the edited text passages are marked with dashed lines of different colors. By hovering the mouse cursor over one of the edited passages, the name of the user who is editing it at the moment is displayed. The <b>Fast</b> mode will show the actions and the names of the co-editors once they are editing the text.</p>
<p>The number of users who are working at the current document is specified on the right side of the editor header - <img alt="Number of users icon" src="../images/usersnumber.png" />. If you want to see who exactly are editing the file now, you can click this icon or open the <b>Chat</b> panel with the full list of the users.</p>
<p>When no users are viewing or editing the file, the icon in the editor header will look like <img alt="Manage document access rights icon" src="../images/access_rights.png" /> allowing you to manage the users who have access to the file right from the document: invite new users giving them permissions to edit, read or review the document, or deny some users access rights to the file. Click this icon to manage the access to the file; this can be done both when there are no other users who view or co-edit the document at the moment and when there are other users and the icon looks like <img alt="Number of users icon" src="../images/usersnumber.png" />. It's also possible to set access rights using the <img alt="Sharing icon" src="../images/sharingicon.png" /> <b>Sharing</b> icon at the <b>Collaboration</b> tab of the top toolbar.</p>
<p>As soon as one of the users saves his/her changes by clicking the <img alt="Save icon" src="../images/savewhilecoediting.png" /> icon, the others will see a note within the status bar stating that they have updates. To save the changes you made, so that other users can view them, and get the updates saved by your co-editors, click the <img alt="Save icon" src="../images/saveupdate.png" /> icon in the left upper corner of the top toolbar. The updates will be highlighted for you to check what exactly has been changed.</p>
<p>You can specify what changes you want to be highlighted during co-editing if you click the <b>File</b> tab at the top toolbar, select the <b>Advanced Settings...</b> option and choose between <b>none</b>, <b>all</b> and <b>last</b> realtime collaboration changes. Selecting <b>View all</b> changes, all the changes made during the current session will be highlighted. Selecting <b>View last</b> changes, only the changes made since you last time clicked the <img alt="Save icon" src="../images/saveupdate.png" /> icon will be highlighted. Selecting <b>View None</b> changes, changes made during the current session will not be highlighted.</p>
<p>You can specify what changes you want to be highlighted during co-editing if you click the <b>File</b> tab at the top toolbar, select the <b>Advanced Settings...</b> option and choose between <b>none</b>, <b>all</b> and <b>last</b> real-time collaboration changes. Selecting <b>View all</b> changes, all the changes made during the current session will be highlighted. Selecting <b>View last</b> changes, only the changes made since you last time clicked the <img alt="Save icon" src="../images/saveupdate.png" /> icon will be highlighted. Selecting <b>View None</b> changes, changes made during the current session will not be highlighted.</p>
<h3 id="chat">Chat</h3>
<p>You can use this tool to coordinate the co-editing process on-the-fly, for example, to arrange with your collaborators about who is doing what, which paragraph you are going to edit now etc.</p>
<p>The chat messages are stored during one session only. To discuss the document content it is better to use comments which are stored until you decide to delete them.</p>

View file

@ -20,7 +20,7 @@
<ul>
<li>insert <a href="../UsageInstructions/PageBreaks.htm" onclick="onhyperlinkclick(this)">page breaks</a>, <a href="../UsageInstructions/SectionBreaks.htm" onclick="onhyperlinkclick(this)">section breaks</a> and <a href="../UsageInstructions/SetPageParameters.htm#columns" onclick="onhyperlinkclick(this)">column breaks</a>,</li>
<li>insert <a href="../UsageInstructions/InsertHeadersFooters.htm" onclick="onhyperlinkclick(this)">headers and footers</a> and <a href="../UsageInstructions/InsertPageNumbers.htm" onclick="onhyperlinkclick(this)">page numbers</a>,</li>
<li>insert <a href="../UsageInstructions/InsertTables.htm" onclick="onhyperlinkclick(this)">tables</a>, <a href="../UsageInstructions/InsertImages.htm" onclick="onhyperlinkclick(this)">pictures</a>, <a href="../UsageInstructions/InsertCharts.htm" onclick="onhyperlinkclick(this)">charts</a>, <a href="../UsageInstructions/InsertAutoshapes.htm" onclick="onhyperlinkclick(this)">shapes</a>,</li>
<li>insert <a href="../UsageInstructions/InsertTables.htm" onclick="onhyperlinkclick(this)">tables</a>, <a href="../UsageInstructions/InsertImages.htm" onclick="onhyperlinkclick(this)">images</a>, <a href="../UsageInstructions/InsertCharts.htm" onclick="onhyperlinkclick(this)">charts</a>, <a href="../UsageInstructions/InsertAutoshapes.htm" onclick="onhyperlinkclick(this)">shapes</a>,</li>
<li>insert <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">hyperlinks</a>, <a href="../HelpfulHints/CollaborativeEditing.htm#comments" onclick="onhyperlinkclick(this)">comments</a>,</li>
<li>insert <a href="../UsageInstructions/InsertTextObjects.htm" onclick="onhyperlinkclick(this)">text boxes and Text Art objects</a>, <a href="../UsageInstructions/InsertEquation.htm" onclick="onhyperlinkclick(this)">equations</a>, <a href="../UsageInstructions/InsertDropCap.htm" onclick="onhyperlinkclick(this)">drop caps</a>, <a href="../UsageInstructions/InsertContentControls.htm" onclick="onhyperlinkclick(this)">content controls</a>.</li>
</ul>

View file

@ -20,7 +20,8 @@
<ul>
<li>create and automatically update a <a href="../UsageInstructions/CreateTableOfContents.htm" onclick="onhyperlinkclick(this)">table of contents</a>,</li>
<li>insert <a href="../UsageInstructions/InsertFootnotes.htm" onclick="onhyperlinkclick(this)">footnotes</a>,</li>
<li>insert <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">hyperlinks</a>.</li>
<li>insert <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">hyperlinks</a>,</li>
<li>add <a href="../UsageInstructions/InsertBookmarks.htm" onclick="onhyperlinkclick(this)">bookmarks</a>.</li>
</ul>
</div>
</body>

View file

@ -20,12 +20,17 @@
<li>switch to the <b>Insert</b> or <b>References</b> tab of the top toolbar,</li>
<li>click the <img alt="Hyperlink icon" src="../images/addhyperlink.png" /> <b>Hyperlink</b> icon at the top toolbar,</li>
<li>after that the <b>Hyperlink Settings</b> window will appear where you can specify the hyperlink parameters:
<ul>
<li><b>Link to</b> - enter a URL in the format <em>http://www.example.com</em>.</li>
<li><b>Display</b> - enter a text that will get clickable and lead to the web address specified in the upper field.</li>
<li><b>ScreenTip text</b> - enter a text that will become visible in a small pop-up window that provides a brief note or label pertaining to the hyperlink being pointed to.</li>
</ul>
<p><img alt="Hyperlink Settings window" src="../images/hyperlinkwindow.png" /></p>
<ul>
<li>
Select a link type you wish to insert:
<p>Use the <b>External Link</b> option and enter a URL in the format <em>http://www.example.com</em> in the <b>Link to</b> field below if you need to add a hyperlink leading to an external website.</p>
<p><img alt="Hyperlink Settings window" src="../images/hyperlinkwindow.png" /></p>
<p>Use the <b>Place in Document</b> option and select one of the existing <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">headings</a> in the document text or one of previously added <a href="../UsageInstructions/InsertBookmarks.htm" onclick="onhyperlinkclick(this)">bookmarks</a> if you need to add a hyperlink leading to a certain place in the same document.</p>
<p><img alt="Hyperlink Settings window" src="../images/hyperlinkwindow1.png" /></p>
</li>
<li><b>Display</b> - enter a text that will get clickable and lead to the address specified in the upper field.</li>
<li><b>ScreenTip text</b> - enter a text that will become visible in a small pop-up window that provides a brief note or label pertaining to the hyperlink being pointed to.</li>
</ul>
</li>
<li>Click the <b>OK</b> button.</li>
</ol>

View file

@ -28,8 +28,39 @@
</li>
<li>now each time you press the <b>Enter</b> key at the end of the line a new ordered or unordered list item will appear. To stop that, press the <b>Backspace</b> key and continue with the common text paragraph.</li>
</ol>
<p>You can also change the text indentation in the lists and their nesting using the <b>Multilevel list</b> <img alt="Multilevel list icon" src="../images/outline.png" />, <b>Decrease indent</b> <img alt="Decrease indent icon" src="../images/decreaseindent.png" />, and <b>Increase indent</b> <img alt="Increase indent icon" src="../images/increaseindent.png" /> icons at the <b>Home</b> tab of the top toolbar.</p>
<p>The program also creates numbered lists automatically when you enter digit 1 with a dot or a bracket and a space after it: <b>1.</b>, <b>1)</b>. Bulleted lists can be created automatically when you enter the <b>-</b>, <b>*</b> characters and a space after them.</p>
<p>You can also change the text indentation in the lists and their nesting using the <b>Multilevel list</b> <img alt="Multilevel list icon" src="../images/outline.png" />, <b>Decrease indent</b> <img alt="Decrease indent icon" src="../images/decreaseindent.png" />, and <b>Increase indent</b> <img alt="Increase indent icon" src="../images/increaseindent.png" /> icons at the <b>Home</b> tab of the top toolbar.</p>
<p class="note"><b>Note</b>: the additional indentation and spacing parameters can be changed at the right sidebar and in the advanced settings window. To learn more about it, read the <a href="ParagraphIndents.htm" onclick="onhyperlinkclick(this)">Change paragraph indents</a> and <a href="LineSpacing.htm" onclick="onhyperlinkclick(this)">Set paragraph line spacing</a> section.</p>
<h3>Join and separate lists</h3>
<p>To join a list to the preceding one:</p>
<ol>
<li>click the first item of the second list with the right mouse button,</li>
<li>use the <b>Join to previous list</b> option from the contextual menu.</li>
</ol>
<p>The lists will be joined and the numbering will continue in accordance with the first list numbering.</p>
<p>To separate a list:</p>
<ol>
<li>click the list item where you want to begin a new list with the right mouse button,</li>
<li>use the <b>Separate list</b> option from the contextual menu.</li>
</ol>
<p>The list will be separated, and the numbering in the second list will begin anew.</p>
<h3>Change numbering</h3>
<p>To continue sequential numbering in the second list according to the previous list numbering:</p>
<ol>
<li>click the first item of the second list with the right mouse button,</li>
<li>use the <b>Continue numbering</b> option from the contextual menu.</li>
</ol>
<p>The numbering will continue in accordance with the first list numbering.</p>
<p>To set a certain numbering initial value:</p>
<ol>
<li>click the list item where you want to apply a new numbering value with the right mouse button,</li>
<li>use the <b>Set numbering value</b> option from the contextual menu,</li>
<li>in a new window that opens, set the necessary numeric value and click the <b>OK</b> button.</li>
</ol>
</div>
</body>
</html>

View file

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<title>Add bookmarks</title>
<meta charset="utf-8" />
<meta name="description" content="Bookmarks allow to quickly jump to a certain position in the current document or add a link to this location within the document." />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Поиск" type="text" onkeypress="doSearch(event)">
</div>
<h1>Add bookmarks</h1>
<p>Bookmarks allow to quickly jump to a certain position in the current document or add a link to this location within the document.</p>
<p>To add a bookmark within a document:</p>
<ol>
<li>put the mouse cursor at the beginning of the text passage where you want the bookmark to be added,</li>
<li>switch to the <b>References</b> tab of the top toolbar,</li>
<li>click the <img alt="Bookmark icon" src="../images/bookmark.png" /> <b>Bookmark</b> icon at the top toolbar,</li>
<li>in the <b>Bookmarks</b> window that opens, enter the <b>Bookmark name</b> and click the <b>Add</b> button - a bookmark will be added to the bookmark list displayed below,
<p class="note"><b>Note</b>: the bookmark name should begin wish a letter, but it can also contain numbers. The bookmark name cannot contain spaces, but can include the underscore character "_".</p>
<p><img alt="Bookmarks window" src="../images/bookmark_window.png" /></p>
</li>
</ol>
<p>To go to one of the added bookmarks within the document text:</p>
<ol>
<li>click the <img alt="Bookmark icon" src="../images/bookmark.png" /> <b>Bookmark</b> icon at the <b>References</b> tab of the top toolbar,</li>
<li>in the <b>Bookmarks</b> window that opens, select the bookmark you want to jump to. To easily find the necessary bookmark in the list you can sort the list by bookmark <b>Name</b> or by <b>Location</b> of a bookmark within the document text,</li>
<li>check the <b>Hidden bookmarks</b> option to display hidden bookmarks in the list (i.e. the bookmarks automatically created by the program when adding references to a certain part of the document. For example, if you create a hyperlink to a certain heading within the document, the document editor automatically creates a hidden bookmark to the target of this link).</li>
<li>click the <b>Go to</b> button - the cursor will be positioned in the location within the document where the selected bookmark was added,</li>
<li>click the <b>Close</b> button to close the window.</li>
</ol>
<p>To delete a bookmark select it in the bookmark list and use the <b>Delete</b> button.</p>
<p>To find out how to use bookmarks when creating links please refer to the <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">Add hyperlinks</a> section.</p>
</div>
</body>
</html>

View file

@ -51,7 +51,8 @@
<p>A new window will open where you can adjust the following settings:</p>
<p><img alt="Content Control settings window" src="../images/ccsettingswindow.png" /></p>
<ul>
<li>Specify the content control <b>Title</b> or <b>Tag</b> in the corresponding fields.</li>
<li>Specify the content control <b>Title</b> or <b>Tag</b> in the corresponding fields. The title will be displayed when the control is selected in the document. Tags are used to identify content controls so that you can make reference to them in your code. </li>
<li>Choose if you want to display the content control with a <b>Bounding box</b> or not. Use the <b>None</b> option to display the control without the bounding box. If you select the <b>Bounding box</b> option, you can choose this box <b>Color</b> using the field below.</li>
<li>Protect the content control from being deleted or edited using the option from the <b>Locking</b> section:
<ul>
<li><b>Content control cannot be deleted</b> - check this box to protect the content control from being deleted.</li>
@ -60,6 +61,14 @@
</li>
</ul>
<p>Click the <b>OK</b> button within the settings window to apply the changes.</p>
<p>It's also possible to highlight content controls with a certain color. To highlight controls with a color:</p>
<ol>
<li>Click the button to the left of the control border to select the control,</li>
<li>Click the arrow next to the <img alt="Content Controls icon" src="../images/insertccicon.png" /> <b>Content Controls</b> icon at the top toolbar,</li>
<li>Select the <b>Highlight Settings</b> option from the menu,</li>
<li>Select the necessary color on the available palettes: <b>Theme Colors</b>, <b>Standard Colors</b> or specify a new <b>Custom Color</b>. To remove previously applied color highlighting, use the <b>No highlighting</b> option.</li>
</ol>
<p>The selected highlight options will be applied to all the content controls in the document.</p>
<h3>Removing content controls</h3>
<p>To remove a control and leave all its contents, click the content control to select it, then proceed in one of the following ways:</p>
<ul>

View file

@ -20,11 +20,11 @@
<ol>
<li>place the cursor where you want the image to be put,</li>
<li>switch to the <b>Insert</b> tab of the top toolbar,</li>
<li>click the <img alt="Picture icon" src="../images/image.png" /> <b>Picture</b> icon at the top toolbar,</li>
<li>click the <img alt="Image icon" src="../images/image.png" /> <b>Image</b> icon at the top toolbar,</li>
<li>select one of the following options to load the image:
<ul>
<li>the <b>Picture from File</b> option will open the standard Windows dialog window for file selection. Browse your computer hard disk drive for the necessary file and click the <b>Open</b> button</li>
<li>the <b>Picture from URL</b> option will open the window where you can enter the necessary image web address and click the <b>OK</b> button</li>
<li>the <b>Image from File</b> option will open the standard dialog window for file selection. Browse your computer hard disk drive for the necessary file and click the <b>Open</b> button</li>
<li>the <b>Image from URL</b> option will open the window where you can enter the necessary image web address and click the <b>OK</b> button</li>
</ul>
</li>
<li>once the image is added you can change its size, properties, and position.</li>

View file

@ -35,7 +35,7 @@
<li>Envelope Choukei 3 (11,99cm x 23,49cm)</li>
<li>Super B/A3 (33,02cm x 48,25cm)</li>
</ul>
<p>You can also set a special page size by selecting the <b>Custom Page Size</b> option from the list. The <b>Page Size</b> window will open where you'll be able to set necessary <b>Width</b> and <b>Height</b> values. Enter your new values into the entry fields or adjust the existing values using arrow buttons. When ready, click <b>OK</b> to apply the changes.</p>
<p>You can also set a special page size by selecting the <b>Custom Page Size</b> option from the list. The <b>Page Size</b> window will open where you'll be able to select the necessary <b>Preset</b> (US Letter, US Legal, A4, A5, B5, Envelope #10, Envelope DL, Tabloid, AЗ, Tabloid Oversize, ROC 16K, Envelope Choukei 3, Super B/A3, A0, A1, A2, A6) or set custom <b>Width</b> and <b>Height</b> values. Enter your new values into the entry fields or adjust the existing values using arrow buttons. When ready, click <b>OK</b> to apply the changes.</p>
<p><img alt="Custom Page Size" src="../images/custompagesize.png" /></p>
<h3 id="margins">Page Margins</h3>
<p>Change default margins, i.e. the blank space between the left, right, top and bottom page edges and the paragraph text, clicking the <img alt="Margins icon" src="../images/pagemargins.png" /> <b>Margins</b> icon and selecting one of the available presets: <b>Normal</b>, <b>US Normal</b>, <b>Narrow</b>, <b>Moderate</b>, <b>Wide</b>. You can also use the <b>Custom Margins</b> option to set your own values in the <b>Margins</b> window that opens. Enter the necessary <b>Top</b>, <b>Bottom</b>, <b>Left</b> and <b>Right</b> page margin values into the entry fields or adjust the existing values using arrow buttons. When ready, click <b>OK</b>. The custom margins will be applied to the current document and the <b>Last Custom</b> option with the specified parameters will appear in the <img alt="Margins icon" src="../images/pagemargins.png" /> <b>Margins</b> list so that you can apply them to some other documents.</p>

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

View file

@ -33,8 +33,8 @@
"name": "Pestaña de Plugins"
},
{
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Cambie combinación de colores",
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Cree un documento nuevo o abra el documento existente",
"headername": "Operaciones Básicas"
},
{
@ -42,8 +42,8 @@
"name": "Copie/pegue pasajes de texto, deshaga/rehaga sus acciones"
},
{
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Cree un documento nuevo o abra el documento existente"
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Cambie combinación de colores"
},
{
"src": "UsageInstructions/SetPageParameters.htm",

View file

@ -33,8 +33,8 @@
"name": "Onglet Modules complémentaires"
},
{
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Modifier le jeu de couleurs",
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Créer un nouveau document ou ouvrir un document existant",
"headername": "Opérations de base"
},
{
@ -42,8 +42,8 @@
"name": "Copier/coller les passages de texte, annuler/rétablir vos actions"
},
{
"src": "UsageInstructions/OpenCreateNew.htm",
"name": "Créer un nouveau document ou ouvrir un document existant"
"src": "UsageInstructions/ChangeColorScheme.htm",
"name": "Modifier le jeu de couleurs"
},
{
"src": "UsageInstructions/SetPageParameters.htm",

View file

@ -7,15 +7,16 @@
{"src": "ProgramInterface/ReferencesTab.htm", "name": "Вкладка Ссылки"},
{"src": "ProgramInterface/ReviewTab.htm", "name": "Вкладка Совместная работа"},
{"src": "ProgramInterface/PluginsTab.htm", "name": "Вкладка Плагины" },
{"src": "UsageInstructions/ChangeColorScheme.htm", "name": "Изменение цветовой схемы", "headername": "Базовые операции" },
{"src": "UsageInstructions/OpenCreateNew.htm", "name": "Создание нового документа или открытие существующего", "headername": "Базовые операции" },
{"src":"UsageInstructions/CopyPasteUndoRedo.htm", "name": "Копирование/вставка текста, отмена/повтор действий"},
{"src":"UsageInstructions/OpenCreateNew.htm", "name": "Создание нового документа или открытие существующего"},
{"src":"UsageInstructions/ChangeColorScheme.htm", "name": "Изменение цветовой схемы"},
{"src":"UsageInstructions/SetPageParameters.htm", "name": "Настройка параметров страницы", "headername": "Форматирование страницы" },
{"src":"UsageInstructions/NonprintingCharacters.htm", "name": "Отображение/скрытие непечатаемых символов"},
{"src":"UsageInstructions/SectionBreaks.htm", "name": "Вставка разрывов раздела"},
{"src":"UsageInstructions/InsertHeadersFooters.htm", "name": "Вставка колонтитулов"},
{"src":"UsageInstructions/InsertPageNumbers.htm", "name": "Вставка номеров страниц" },
{"src":"UsageInstructions/InsertFootnotes.htm", "name": "Вставка сносок" },
{ "src": "UsageInstructions/InsertFootnotes.htm", "name": "Вставка сносок" },
{"src": "UsageInstructions/InsertBookmarks.htm", "name": "Добавление закладок"},
{"src":"UsageInstructions/AlignText.htm", "name": "Выравнивание текста в абзаце", "headername": "Форматирование абзаца" },
{"src":"UsageInstructions/BackgroundColor.htm", "name": "Выбор цвета фона для абзаца"},
{"src":"UsageInstructions/ParagraphIndents.htm", "name": "Изменение отступов абзацев"},

View file

@ -18,7 +18,7 @@
<ul>
<li class="onlineDocumentFeatures">одновременный многопользовательский доступ к редактируемому документу</li>
<li class="onlineDocumentFeatures">визуальная индикация фрагментов, которые редактируются другими пользователями</li>
<li class="onlineDocumentFeatures">синхронизация изменений одним нажатием кнопки</li>
<li class="onlineDocumentFeatures">мгновенное отображение изменений или синхронизация изменений одним нажатием кнопки</li>
<li class="onlineDocumentFeatures">чат для обмена идеями по поводу отдельных частей документа</li>
<li>комментарии, содержащие описание задачи или проблемы, которую необходимо решить</li>
</ul>

View file

@ -20,7 +20,8 @@
<ul>
<li>создавать и автоматически обновлять <a href="../UsageInstructions/CreateTableOfContents.htm" onclick="onhyperlinkclick(this)">оглавление</a>,</li>
<li>вставлять <a href="../UsageInstructions/InsertFootnotes.htm" onclick="onhyperlinkclick(this)">сноски</a>,</li>
<li>вставлять <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">гиперссылки</a>.</li>
<li>вставлять <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">гиперссылки</a>,</li>
<li>добавлять <a href="../UsageInstructions/InsertBookmarks.htm" onclick="onhyperlinkclick(this)">закладки</a>.</li>
</ul>
</div>
</body>

View file

@ -20,12 +20,17 @@
<li>перейдите на вкладку <b>Вставка</b> или <b>Сссылки</b> верхней панели инструментов,</li>
<li>нажмите значок <img alt="Значок Гиперссылка" src="../images/addhyperlink.png" /> <b>Гиперссылка</b>,</li>
<li>после этого появится окно <b>Параметры гиперссылки</b>, в котором Вы можете указать параметры гиперссылки:
<ul>
<li><b>Связать с</b> - введите URL-адрес в формате <em>http://www.example.com</em>.</li>
<li><b>Отображать</b> - введите текст, который должен стать ссылкой и будет вести по веб-адресу, указанному в поле выше.</li>
<li><b>Текст подсказки</b> - введите текст краткого примечания к гиперссылке, который будет появляться в маленьком всплывающем окне при наведении на гиперссылку курсора.</li>
</ul>
<p><img alt="Окно Параметры гиперссылки" src="../images/hyperlinkwindow.png" /></p>
<ul>
<li>
берите тип ссылки, которую требуется вставить:
<p>Используйте опцию <b>Внешняя ссылка</b> и введите URL в формате <em>http://www.example.com</em> в расположенном ниже поле <b>Связать с</b>, если вам требуется добавить гиперссылку, ведущую на внешний сайт.</p>
<p><img alt="Окно Параметры гиперссылки" src="../images/hyperlinkwindow.png" /></p>
<p>Используйте опцию <b>Место в документе</b> и выберите один из существующих <a href="../UsageInstructions/FormattingPresets.htm" onclick="onhyperlinkclick(this)">заголовков</a> в тексте документа или одну из ранее добавленных <a href="../UsageInstructions/InsertBookmarks.htm" onclick="onhyperlinkclick(this)">закладок</a>, если вам требуется добавить гиперссылку, ведущую на определенное место в том же самом документе.</p>
<p><img alt="Окно Параметры гиперссылки" src="../images/hyperlinkwindow1.png" /></p>
</li>
<li><b>Отображать</b> - введите текст, который должен стать ссылкой и будет вести по адресу, указанному в поле выше.</li>
<li><b>Текст подсказки</b> - введите текст краткого примечания к гиперссылке, который будет появляться в маленьком всплывающем окне при наведении на гиперссылку курсора.</li>
</ul>
</li>
<li>Нажмите кнопку <b>OK</b>.</li>
</ol>

View file

@ -28,8 +28,39 @@
</li>
<li>теперь при каждом нажатии в конце строки клавиши <b>Enter</b> будет появляться новый элемент упорядоченного или неупорядоченного списка. Чтобы закончить список, нажмите клавишу <b>Backspace</b> и продолжайте текст обычного абзаца.</li>
</ol>
<p>Нумерованные списки также создаются автоматически при вводе цифры 1 с точкой или скобкой и пробелом после нее: <b>1.</b>, <b>1)</b>. Маркированные списки создаются автоматически при вводе символов <b>-</b>, <b>*</b> и пробела после них.</p>
<p>Можно также изменить отступы текста в списках и их вложенность с помощью значков <b>Многоуровневый список</b> <img alt="Значок Многоуровневый список" src="../images/outline.png" />, <b>Уменьшить отступ</b> <img alt="Значок Уменьшить отступ" src="../images/decreaseindent.png" /> и <b>Увеличить отступ</b> <img alt="Значок Увеличить отступ" src="../images/increaseindent.png" /> на вкладке <b>Главная</b> верхней панели инструментов.</p>
<p class="note"><b>Примечание</b>: дополнительные параметры отступов и интервалов можно изменить на правой боковой панели и в окне дополнительных параметров. Чтобы получить дополнительную информацию об этом, прочитайте разделы <a href="ParagraphIndents.htm" onclick="onhyperlinkclick(this)">Изменение отступов абзацев</a> и <a href="LineSpacing.htm" onclick="onhyperlinkclick(this)">Настройка междустрочного интервала в абзацах</a>.</p>
<h3>Объединение и разделение списков</h3>
<p>Для того чтобы объединить список с предыдущим списком:</p>
<ol>
<li>щелкните правой кнопкой мыши по первому пункту второго списка,</li>
<li>используйте опцию контекстного меню <b>Объединить с предыдущим списком</b>.</li>
</ol>
<p>Списки будут объединены, и нумерация будет продолжена в соответствии с нумерацией первого списка.</p>
<p>Для того чтобы разделить список:</p>
<ol>
<li>щелкните правой кнопкой мыши по тому пункту списка, с которого требуется начать новый список,</li>
<li>используйте опцию контекстного меню <b>Начать новый список</b>.</li>
</ol>
<p>Список будет разделен, и во втором списке нумерация начнется заново.</p>
<h3>Изменение нумерации</h3>
<p>Для того чтобы продолжить во втором списке последовательную нумерацию в соответствии с предыдущим списком:</p>
<ol>
<li>щелкните правой кнопкой мыши по первому пункту второго списка,</li>
<li>используйте опцию контекстного меню <b>Продолжить нумерацию</b>.</li>
</ol>
<p>Нумерация будет продолжена в соответствии с нумерацией первого списка.</p>
<p>Для того чтобы задать произвольное начальное значение нумерации:</p>
<ol>
<li>щелкните правой кнопкой мыши по тому пункту списка, к которому требуется применить новое значение нумерации,</li>
<li>используйте опцию контекстного меню <b>Задать начальное значение</b>,</li>
<li>в новом открывшемся окне укажите нужное числовое значение и нажмите кнопку <b>OK</b>.</li>
</ol>
</div>
</body>
</html>

View file

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<title>Добавление закладок</title>
<meta charset="utf-8" />
<meta name="description" content="Закладки позволяют быстро перейти к определенному месту в текущем документе или добавить ссылку на эту позицию внутри документа." />
<link type="text/css" rel="stylesheet" href="../editor.css" />
<script type="text/javascript" src="../callback.js"></script>
<script type="text/javascript" src="../search/js/page-search.js"></script>
</head>
<body>
<div class="mainpart">
<div class="search-field">
<input id="search" class="searchBar" placeholder="Поиск" type="text" onkeypress="doSearch(event)">
</div>
<h1>Добавление закладок</h1>
<p>Закладки позволяют быстро перейти к определенному месту в текущем документе или добавить ссылку на эту позицию внутри документа.</p>
<p>Чтобы добавить в документ закладку:</p>
<ol>
<li>установите курсор в начале фрагмента текста, где надо добавить закладку,</li>
<li>перейдите на вкладку <b>Ссылки</b> верхней панели инструментов,</li>
<li>нажмите на значок <img alt="Значок Закладка" src="../images/bookmark.png" /> <b>Закладка</b> на верхней панели инструментов,</li>
<li>в открывшемся окне <b>Закладки</b> введите <b>Имя закладки</b> и нажмите кнопку <b>Добавить</b> - закладка будет добавлена в список закладок, расположенный ниже,
<p class="note"><b>Примечание</b>: имя закладки должно начинаться с буквы, но оно может также содержать цифры. Имя закладки не может содержать пробелы, но может содержать символ подчеркивания "_".</p>
<p><img alt="Окно Закладки" src="../images/bookmark_window.png" /></p>
</li>
</ol>
<p>Чтобы перейти к одной из добавленных закладок в тексте документа:</p>
<ol>
<li>нажмите на значок <img alt="Значок Закладка" src="../images/bookmark.png" /> <b>Закладка</b> на вкладке <b>Ссылки</b> верхней панели инструментов,</li>
<li>в открывшемся окне <b>Закладки</b> выберите закладку, к которой надо перейти. Чтобы проще найти нужную закладку в списке, его можно сортировать по <b>Имени</b> закладки или по <b>Положению</b> закладки в тексте документа,</li>
<li>отметьте опцию <b>Скрытые закладки</b>, чтобы отобразить в списке скрытые закладки (то есть закладки, автоматически создаваемые программой при добавлении ссылок на какую-то часть документа. Например, если вы создадите гиперссылку на определенный заголовок внутри документа, редактор документов автоматически создаст скрытую закладку на целевой объект этой ссылки).</li>
<li>нажмите кнопку <b>Перейти</b> - курсор будет установлен в том месте документа, где добавлена данная закладка,</li>
<li>нажмите кнопку <b>Закрыть</b>, чтобы закрыть окно.</li>
</ol>
<p>Чтобы удалить закладку, выберите ее в списке закладок и используйте кнопку <b>Удалить</b>.</p>
<p>Чтобы узнать, как использовать закладки при создании ссылок, обратитесь к разделу <a href="../UsageInstructions/AddHyperlinks.htm" onclick="onhyperlinkclick(this)">Добавление гиперссылок</a>.</p>
</div>
</body>
</html>

View file

@ -39,7 +39,7 @@
<ul>
<li>Выберите <b>Тип</b> диаграммы, который требуется применить: гистограмма, график, круговая, линейчатая, с областями, точечная, биржевая.</li>
<li>
Проверьте выбранный <b>Диапазон данных</b> и при необходимости измените его, нажав на кнопку <b>Выбор данных</b> и указав желаемый диапазон данных в следующем формате: <em>Sheet1!A1:B4</em>.
Проверьте выбранный <b>Диапазон данных</b> и при необходимости измените его, нажав на кнопку <b>Выбор данных</b> и указав желаемый диапазон данных в следующем формате: <em>Лист1!A1:B4</em>.
</li>
<li>
Измените способ расположения данных. Можно выбрать ряды данных для использования по оси X: <b>в строках</b> или <b>в столбцах</b>.

View file

@ -51,7 +51,8 @@
<p>Откроется новое окно, в котором можно настроить следующие параметры:</p>
<p><img alt="Окно настроек элемента управления содержимым" src="../images/ccsettingswindow.png" /></p>
<ul>
<li>Укажите <b>Заголовок</b> или <b>Тег</b> элемента управления содержимым в соответствующих полях.</li>
<li>Укажите <b>Заголовок</b> или <b>Тег</b> элемента управления содержимым в соответствующих полях. Заголовок будет отображаться при выделении элемента управления в документе. Теги используются для идентификации элементов управления, чтобы можно было ссылаться на них в коде. </li>
<li>Выберите, требуется ли отображать элемент управления <b>C ограничивающей рамкой</b> или <b>Без рамки</b>. В том случае, если вы выбрали вариант <b>C ограничивающей рамкой</b>, можно выбрать <b>Цвет</b> рамки в расположенном ниже поле.</li>
<li>Защитите элемент управления содержимым от удаления или редактирования, используя параметры из раздела <b>Блокировка</b>:
<ul>
<li><b>Элемент управления содержимым нельзя удалить</b> - отметьте эту опцию, чтобы защитить элемент управления содержимым от удаления.</li>
@ -60,6 +61,14 @@
</li>
</ul>
<p>Нажмите кнопку <b>OK</b> в окне настроек, чтобы применить изменения.</p>
<p>Также доступна возможность выделения элементов управления определенным цветом. Для того, чтобы выделить элементы цветом:</p>
<ol>
<li>Нажмите на кнопку слева от границы элемента управления, чтобы выделить элемент управления,</li>
<li>Нажмите на стрелку рядом со значком <img alt="Значок Элементы управления содержимым" src="../images/insertccicon.png" /> <b>Элементы управления содержимым</b> на верхней панели инструментов,</li>
<li>Выберите в меню опцию <b>Параметры выделения</b>,</li>
<li>Выберите нужный цвет на одной из доступных палитр: <b>Цвета темы</b>, <b>Стандартные цвета</b> или задайте <b>Пользовательский цвет</b>. Чтобы убрать ранее примененное выделение цветом, используйте опцию <b>Без выделения</b>.</li>
</ol>
<p>Выбранные параметры выделения будут применены ко всем элементам управления в документе. </p>
<h3>Удаление элементов управления содержимым</h3>
<p>Чтобы удалить элемент управления и оставить все его содержимое, щелкните по элементу управления содержимым, чтобы выделить его, затем действуйте одним из следующих способов:</p>
<ul>

View file

@ -23,7 +23,7 @@
<li>нажмите значок <img alt="Значок Изображение" src="../images/image.png" /> <b>Изображение</b> на верхней панели инструментов,</li>
<li>для загрузки изображения выберите одну из следующих опций:
<ul>
<li>при выборе опции <b>Изображение из файла</b> откроется стандартное диалоговое окно Windows для выбора файлов. Выберите нужный файл на жестком диске компьютера и нажмите кнопку <b>Открыть</b></li>
<li>при выборе опции <b>Изображение из файла</b> откроется стандартное диалоговое окно для выбора файлов. Выберите нужный файл на жестком диске компьютера и нажмите кнопку <b>Открыть</b></li>
<li>при выборе опции <b>Изображение по URL</b> откроется окно, в котором Вы можете ввести веб-адрес нужного изображения, а затем нажмите кнопку <b>OK</b></li>
</ul>
</li>

View file

@ -35,7 +35,7 @@
<li>Envelope Choukei 3 (11,99 см x 23,49 см)</li>
<li>Super B/A3 (33,02 см x 48,25 см)</li>
</ul>
<p>Можно также задать нестандартный размер страницы, выбрав из списка опцию <b>Особый размер страницы</b>. Откроется окно <b>Размер страницы</b>, в котором можно будет указать нужные значения <b>Ширины</b> и <b>Высоты</b>. Введите новые значения в поля ввода или скорректируйте имеющиеся значения с помощью кнопок со стрелками. Когда все будет готово, нажмите кнопку <b>OK</b>, чтобы применить изменения.</p>
<p>Можно также задать нестандартный размер страницы, выбрав из списка опцию <b>Особый размер страницы</b>. Откроется окно <b>Размер страницы</b>, в котором можно будет выбрать нужную <b>Предустановку</b> (US Letter, US Legal, A4, A5, B5, Envelope #10, Envelope DL, Tabloid, AЗ, Tabloid Oversize, ROC 16K, Envelope Choukei 3, Super B/A3, A0, A1, A2, A6) или указать произвольные значения <b>Ширины</b> и <b>Высоты</b>. Введите новые значения в поля ввода или скорректируйте имеющиеся значения с помощью кнопок со стрелками. Когда все будет готово, нажмите кнопку <b>OK</b>, чтобы применить изменения.</p>
<p><img alt="Особый размер страницы" src="../images/custompagesize.png" /></p>
<h3 id="margins">Поля страницы</h3>
<p>Измените используемые по умолчанию поля, то есть пустое пространство между левым, правым, верхним и нижним краями страницы и текстом абзаца, нажав на значок <img alt="Значок Поля" src="../images/pagemargins.png" /> <b>Поля</b> и выбрав один из доступных предустановленных вариантов: <b>Обычные</b>, <b>Обычные (американский стандарт)</b>, <b>Узкие</b>, <b>Средние</b>, <b>Широкие</b>. Можно также использовать опцию <b>Настраиваемые поля</b> и указать свои собственные значения в открывшемся окне <b>Поля</b>. Введите в поля ввода нужные значения для <b>Верхнего</b>, <b>Нижнего</b>, <b>Левого</b> и <b>Правого</b> полей страницы или скорректируйте имеющиеся значения с помощью кнопок со стрелками. Когда все будет готово, нажмите кнопку <b>OK</b>. Особые поля будут применены к текущему документу, а в списке <img alt="Значок Поля" src="../images/pagemargins.png" /> <b>Поля</b> появится пункт <b>Последние настраиваемые</b> с указанными параметрами, чтобы можно было применить их к каким-то другим документам.</p>

View file

@ -34,7 +34,7 @@
<p>Можно задать следующие параметры:</p>
<ul>
<li><b>Позиция</b> - используется, чтобы задать пользовательские позиции табуляции. Введите в этом поле нужное значение, настройте его более точно, используя кнопки со стрелками, и нажмите на кнопку <b>Задать</b>. Пользовательская позиция табуляции будет добавлена в список в расположенном ниже поле. Если ранее Вы добавили какие-то позиции табуляции при помощи линейки, все эти позиции тоже будут отображены в списке.</li>
<li>Позиция табуляци <b>По умолчанию</b> имеет значение 1.25 см. Это значение можно уменьшить или увеличить, используя кнопки со стрелками или введя в поле нужное значение.</li>
<li>Позиция табуляции <b>По умолчанию</b> имеет значение 1.25 см. Это значение можно уменьшить или увеличить, используя кнопки со стрелками или введя в поле нужное значение.</li>
<li><b>Выравнивание</b> - используется, чтобы задать нужный тип выравнивания для каждой из позиций табуляции в расположенном выше списке. Выделите нужную позицию табуляции в списке, выберите опцию <b>По левому краю</b>, <b>По центру</b> или <b>По правому краю</b> из выпадающего списка и нажмите на кнопку <b>Задать</b>.</li>
<li>
<b>Заполнитель</b> - позволяет выбрать символ, который используется для создания заполнителя для каждой из позиций табуляции. Заполнитель - это строка символов (точек или дефисов), заполняющая пространство между позициями табуляции. Выделите нужную позицию табуляции в списке, выберите тип заполнителя из выпадающего списка и нажмите на кнопку <b>Задать</b>.

View file

@ -41,10 +41,10 @@
<li><img alt="Значок Сортировка по возрастанию" src="../images/sortatoz.png" /> и <img alt="Значок Сортировка по убыванию" src="../images/sortztoa.png" /> - чтобы сортировать данные внутри выделенного диапазона ячеек в порядке возрастания или убывания</li>
<li><img alt="Значок Фильтр" src="../images/sortandfilter.png" /> - чтобы включить фильтр для предварительно выделенного диапазона ячеек или чтобы удалить примененный фильтр</li>
<li><img alt="Значок Очистить фильтр" src="../images/clearfilter.png" /> - чтобы очистить все примененные параметры фильтра
<p class="note"><b>Примечание</b>: для получения дополнительной информации по использованию фильтра можно обратиться к разделу <b>Сортировка и фильтрация данных</b> в справке по <b>Spreadsheet Editor</b>.</p>
<p class="note"><b>Примечание</b>: для получения дополнительной информации по использованию фильтра можно обратиться к разделу <b>Сортировка и фильтрация данных</b> в справке по <b>Редактору таблиц</b>.</p>
</li>
<li><img alt="Значок Поиск" src="../images/searchicon.png" /> - чтобы найти определенное значение и заменить его на другое, если это необходимо
<p class="note"><b>Примечание</b>: для получения дополнительной информации по использованию средства <b>поиска и замены</b> можно обратиться к разделу <b>Функция поиска и замены</b> в справке по <b>Spreadsheet Editor</b>.</p>
<p class="note"><b>Примечание</b>: для получения дополнительной информации по использованию средства <b>поиска и замены</b> можно обратиться к разделу <b>Функция поиска и замены</b> в справке по <b>Редактору таблиц</b>.</p>
</li>
</ul>
</li>

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

View file

@ -64,12 +64,12 @@ define([
{ caption: 'US Letter', subtitle: Common.Utils.String.format('21,59{0} x 27,94{0}', txtCm), value: [215.9, 279.4] },
{ caption: 'US Legal', subtitle: Common.Utils.String.format('21,59{0} x 35,56{0}', txtCm), value: [215.9, 355.6] },
{ caption: 'A4', subtitle: Common.Utils.String.format('21{0} x 29,7{0}', txtCm), value: [210, 297] },
{ caption: 'A5', subtitle: Common.Utils.String.format('14,81{0} x 20,99{0}', txtCm), value: [148.1, 209.9] },
{ caption: 'B5', subtitle: Common.Utils.String.format('17,6{0} x 25,01{0}', txtCm), value: [176, 250.1] },
{ caption: 'A5', subtitle: Common.Utils.String.format('14,8{0} x 21{0}', txtCm), value: [148, 210] },
{ caption: 'B5', subtitle: Common.Utils.String.format('17,6{0} x 25{0}', txtCm), value: [176, 250] },
{ caption: 'Envelope #10', subtitle: Common.Utils.String.format('10,48{0} x 24,13{0}', txtCm), value: [104.8, 241.3] },
{ caption: 'Envelope DL', subtitle: Common.Utils.String.format('11,01{0} x 22,01{0}', txtCm), value: [110.1, 220.1] },
{ caption: 'Tabloid', subtitle: Common.Utils.String.format('27,94{0} x 43,17{0}', txtCm), value: [279.4, 431.7] },
{ caption: 'A3', subtitle: Common.Utils.String.format('29,7{0} x 42,01{0}', txtCm), value: [297, 420.1] },
{ caption: 'Envelope DL', subtitle: Common.Utils.String.format('11{0} x 22{0}', txtCm), value: [110, 220] },
{ caption: 'Tabloid', subtitle: Common.Utils.String.format('27,94{0} x 43,18{0}', txtCm), value: [279.4, 431.8] },
{ caption: 'A3', subtitle: Common.Utils.String.format('29,7{0} x 42{0}', txtCm), value: [297, 420] },
{ caption: 'Tabloid Oversize', subtitle: Common.Utils.String.format('30,48{0} x 45,71{0}', txtCm), value: [304.8, 457.1] },
{ caption: 'ROC 16K', subtitle: Common.Utils.String.format('19,68{0} x 27,3{0}', txtCm), value: [196.8, 273] },
{ caption: 'Envelope Choukei 3', subtitle: Common.Utils.String.format('11,99{0} x 23,49{0}', txtCm), value: [119.9, 234.9] },
@ -409,12 +409,12 @@ define([
var tempW = w; w = h; h = tempW;
}
if (Math.abs(_pageSizesCurrent[0] - w) > 0.01 ||
Math.abs(_pageSizesCurrent[1] - h) > 0.01) {
if (Math.abs(_pageSizesCurrent[0] - w) > 0.1 ||
Math.abs(_pageSizesCurrent[1] - h) > 0.1) {
_pageSizesCurrent = [w, h];
_.find(_pageSizes, function(size, index) {
if (Math.abs(size.value[0] - w) < 0.01 && Math.abs(size.value[1] - h) < 0.01) {
if (Math.abs(size.value[0] - w) < 0.1 && Math.abs(size.value[1] - h) < 0.1) {
_pageSizesIndex = index;
}
}, this);

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Optionen für TXT-Dateien wählen",
"DE.Controllers.Main.applyChangesTextText": "Daten werden geladen...",
"DE.Controllers.Main.applyChangesTitleText": "Daten werden geladen",
"DE.Controllers.Main.closeButtonText": "Datei schließen",
"DE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
"DE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.",
"DE.Controllers.Main.criticalErrorTitle": "Fehler",

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Choose TXT Options",
"DE.Controllers.Main.applyChangesTextText": "Loading data...",
"DE.Controllers.Main.applyChangesTitleText": "Loading Data",
"DE.Controllers.Main.closeButtonText": "Close File",
"DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"DE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
"DE.Controllers.Main.criticalErrorTitle": "Error",
@ -156,7 +157,6 @@
"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",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Elegir opciones de archivo TXT",
"DE.Controllers.Main.applyChangesTextText": "Cargando datos...",
"DE.Controllers.Main.applyChangesTitleText": "Cargando datos",
"DE.Controllers.Main.closeButtonText": "Cerrar archivo",
"DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
"DE.Controllers.Main.criticalErrorExtText": "Pulse 'OK' para volver a la lista de documentos.",
"DE.Controllers.Main.criticalErrorTitle": "Error",
@ -54,8 +55,9 @@
"DE.Controllers.Main.downloadTitleText": "Cargando documento",
"DE.Controllers.Main.errorBadImageUrl": "URL de imagen es incorrecto",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "La conexión al servidor se ha perdido. Usted ya no puede editar.",
"DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, verifique los ajustes de conexión o contacte con su administrador.<br>Cuando Usted pulse el botón 'OK', se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
"DE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, verifique los ajustes de conexión o contacte con su administrador.<br>Cuando pulsa el botón 'OK', se le solicitará que descargue el documento.<br><br>Encuentre más información acerca de la conexión de Servidor de Documentos <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">aquí</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Error externo.<br>Error de conexión a la base de datos. Por favor, contacte con el equipo de soporte técnico.",
"DE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.",
"DE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.",
"DE.Controllers.Main.errorDefaultMessage": "Código de error: %1",
"DE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
@ -121,6 +123,7 @@
"DE.Controllers.Main.txtEditingMode": "Establecer el modo de edición...",
"DE.Controllers.Main.txtFooter": "Pie de página",
"DE.Controllers.Main.txtHeader": "Encabezado",
"DE.Controllers.Main.txtProtected": "Una vez que se ha introducido la contraseña y abierto el archivo, la contraseña actual al archivo se restablecerá",
"DE.Controllers.Main.txtSeries": "Serie",
"DE.Controllers.Main.txtStyle_footnote_text": "Texto de pie de página",
"DE.Controllers.Main.txtStyle_Heading_1": "Título 1",
@ -148,9 +151,11 @@
"DE.Controllers.Main.uploadImageSizeMessage": "Tamaño de imagen máximo está superado.",
"DE.Controllers.Main.uploadImageTextText": "Subiendo imagen...",
"DE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
"DE.Controllers.Main.warnLicenseExceeded": "Se ha excedido el número permitido de las conexiones simultáneas al servidor de documentos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
"DE.Controllers.Main.warnLicenseExp": "Su licencia ha expirado.<br>Por favor, actualice su licencia y después recargue la página.",
"DE.Controllers.Main.warnNoLicense": "Esta versión de ONLYOFFICE Editors tiene ciertas limitaciones respecto a la cantidad de conexiones concurrentes al servidor de documentos.<br>Si requiere más, por favor considere mejorar su licencia actual o adquirir una comercial.",
"DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de ONLYOFFICE Editors tiene varias limitaciones para usuarios actuales.<br>Si necesita más, por favor considere actulizar su licencia actual o comprar una licencia comercial.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Se ha excedido el número permitido de los usuarios simultáneos, y el documento se abrirá para sólo lectura.<br>Por favor, contacte con su administrador para recibir más información.",
"DE.Controllers.Main.warnNoLicense": "Esta versión de los Editores de ONLYOFFICE tiene ciertas limitaciones para el número de conexiones simultáneas al servidor de documentos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
"DE.Controllers.Main.warnNoLicenseUsers": "Esta versión de Editores de ONLYOFFICE tiene ciertas limitaciones para usuarios simultáneos.<br>Si se requiere más, por favor, considere comprar una licencia comercial.",
"DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.",
"DE.Controllers.Search.textNoTextFound": "Texto no es encontrado",
"DE.Controllers.Search.textReplaceAll": "Reemplazar todo",

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Choisir les options TXT",
"DE.Controllers.Main.applyChangesTextText": "Chargement des données...",
"DE.Controllers.Main.applyChangesTitleText": "Chargement des données",
"DE.Controllers.Main.closeButtonText": "Fermer le fichier",
"DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
"DE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
"DE.Controllers.Main.criticalErrorTitle": "Erreur",
@ -54,8 +55,9 @@
"DE.Controllers.Main.downloadTitleText": "Téléchargement du document",
"DE.Controllers.Main.errorBadImageUrl": "L'URL de l'image est incorrecte",
"DE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
"DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au serveur de documents <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ici</a>",
"DE.Controllers.Main.errorConnectToServer": "Impossible d'enregistrer le document. Veuillez vérifier vos paramètres de connexion ou contactez l'administrateur.<br>Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.<br><br>Trouvez plus d'informations sur la connexion au Serveur de Documents <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">ici</a>",
"DE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
"DE.Controllers.Main.errorDataEncrypted": "Les modifications chiffrées ont été reçues, elle ne peuvent pas être déchiffrées.",
"DE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
"DE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
"DE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut être ouvert.",
@ -121,6 +123,7 @@
"DE.Controllers.Main.txtEditingMode": "Définition du mode d'édition...",
"DE.Controllers.Main.txtFooter": "Pied de page",
"DE.Controllers.Main.txtHeader": "En-tête",
"DE.Controllers.Main.txtProtected": "Une fois le mot de passe saisi et le ficher ouvert, le mot de passe actuel sera réinitialisé",
"DE.Controllers.Main.txtSeries": "Séries",
"DE.Controllers.Main.txtStyle_footnote_text": "Texte de la note de bas de page",
"DE.Controllers.Main.txtStyle_Heading_1": "Titre 1",
@ -148,7 +151,9 @@
"DE.Controllers.Main.uploadImageSizeMessage": "La taille de l'image a dépassé la limite maximale.",
"DE.Controllers.Main.uploadImageTextText": "Chargement d'une image en cours...",
"DE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
"DE.Controllers.Main.warnLicenseExceeded": "Le nombre de connexions simultanées sur le serveur de documents a été dépassée et le document sera ouvert en mode lecture seule.<br>Veuillez contacter votre administrateur pour plus d'informations.",
"DE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.<br>Veuillez mettre à jour votre licence et actualisez la page.",
"DE.Controllers.Main.warnLicenseUsersExceeded": "Le nombre d'utilisateurs simultanés a été dépassé et le document sera ouvert en mode lecture seule.<br>Veuillez contacter votre administrateur pour plus d'informations.",
"DE.Controllers.Main.warnNoLicense": "Cette version de ONLYOFFICE Editors a certaines limitations pour les connexions simultanées au serveur de documents.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
"DE.Controllers.Main.warnNoLicenseUsers": "Cette version de ONLYOFFICE Editors a certaines limitations pour les utilisateurs simultanés.<br>Si vous avez besoin de plus, pensez à mettre à jour votre licence actuelle ou à acheter une licence commerciale.",
"DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Seleziona Opzioni TXT",
"DE.Controllers.Main.applyChangesTextText": "Caricamento dei dati in corso...",
"DE.Controllers.Main.applyChangesTitleText": "Caricamento dei dati",
"DE.Controllers.Main.closeButtonText": "Chiudi File",
"DE.Controllers.Main.convertationTimeoutText": "È stato superato il tempo limite della conversione.",
"DE.Controllers.Main.criticalErrorExtText": "Clicca 'OK' per tornare alla lista documento",
"DE.Controllers.Main.criticalErrorTitle": "Errore",

View file

@ -43,6 +43,7 @@
"DE.Controllers.Main.advTxtOptions": "Выбрать параметры текстового файла",
"DE.Controllers.Main.applyChangesTextText": "Загрузка данных...",
"DE.Controllers.Main.applyChangesTitleText": "Загрузка данных",
"DE.Controllers.Main.closeButtonText": "Закрыть файл",
"DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
"DE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.",
"DE.Controllers.Main.criticalErrorTitle": "Ошибка",

View file

@ -354,7 +354,8 @@ define([
},
changeToolbarSaveState: function (state) {
this.leftMenu.menuFile.getButton('save').setDisabled(state);
var btnSave = this.leftMenu.menuFile.getButton('save');
btnSave && btnSave.setDisabled(state);
},
/** coauthoring begin **/

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