Merge branch 'develop' into feature/force-save

This commit is contained in:
Julia Radzhabova 2017-03-14 14:08:47 +03:00
commit e2ef004b34
62 changed files with 2507 additions and 865 deletions

View file

@ -96,7 +96,7 @@
info: 'Some info', info: 'Some info',
logo: '' logo: ''
}, },
about: false, about: true,
feedback: { feedback: {
visible: false, visible: false,
url: http://... url: http://...
@ -259,25 +259,29 @@
}; };
var _onMessage = function(msg) { var _onMessage = function(msg) {
if (msg && msg.frameEditorId == placeholderId) { if ( msg ) {
var events = _config.events || {}, if ( msg.type === "onExternalPluginMessage" ) {
handler = events[msg.event], _sendCommand(msg);
res;
if (msg.event === 'onRequestEditRights' && !handler) {
_applyEditRights(false, 'handler is\'n defined');
} else } else
if (msg.event === 'onInternalMessage' && msg.data && msg.data.type == 'localstorage') { if ( msg.frameEditorId == placeholderId ) {
_callLocalStorage(msg.data.data); var events = _config.events || {},
} else { handler = events[msg.event],
if (msg.event === 'onReady') { res;
_onReady();
}
if (handler) { if (msg.event === 'onRequestEditRights' && !handler) {
res = handler.call(_self, { target: _self, data: msg.data }); _applyEditRights(false, 'handler is\'n defined');
if (msg.event === 'onSave' && res !== false) { } else if (msg.event === 'onInternalMessage' && msg.data && msg.data.type == 'localstorage') {
_processSaveResult(true); _callLocalStorage(msg.data.data);
} else {
if (msg.event === 'onReady') {
_onReady();
}
if (handler) {
res = handler.call(_self, {target: _self, data: msg.data});
if (msg.event === 'onSave' && res !== false) {
_processSaveResult(true);
}
} }
} }
} }
@ -518,7 +522,8 @@
var data = { var data = {
type: evt.type, type: evt.type,
x: evt.x - r.left, x: evt.x - r.left,
y: evt.y - r.top y: evt.y - r.top,
event: evt
}; };
_sendCommand({ _sendCommand({
@ -565,7 +570,7 @@
lang: 'en', lang: 'en',
canCoAuthoring: true, canCoAuthoring: true,
customization: { customization: {
about: false, about: true,
feedback: false feedback: false
} }
} }

View file

@ -57,6 +57,7 @@ define([
this.currentArrColors = []; this.currentArrColors = [];
this.currentDocId = ''; this.currentDocId = '';
this.currentDocIdPrev = ''; this.currentDocIdPrev = '';
this.currentRev = 0;
}, },
events: { events: {
@ -74,6 +75,7 @@ define([
setApi: function(api) { setApi: function(api) {
this.api = api; this.api = api;
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
this.api.asc_registerCallback('asc_onExpiredToken', _.bind(this.onExpiredToken, this));
return this; return this;
}, },
@ -127,6 +129,7 @@ define([
this.currentArrColors = record.get('arrColors'); this.currentArrColors = record.get('arrColors');
this.currentDocId = record.get('docId'); this.currentDocId = record.get('docId');
this.currentDocIdPrev = record.get('docIdPrev'); this.currentDocIdPrev = record.get('docIdPrev');
this.currentRev = rev;
if ( _.isEmpty(url) || (urlGetTime - record.get('urlGetTime') > 5 * 60000)) { if ( _.isEmpty(url) || (urlGetTime - record.get('urlGetTime') > 5 * 60000)) {
_.delay(function() { _.delay(function() {
@ -142,6 +145,7 @@ define([
hist.asc_setCurrentChangeId(this.currentChangeId); hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors); hist.asc_setArrColors(this.currentArrColors);
hist.asc_setToken(token); hist.asc_setToken(token);
hist.asc_setIsRequested(false);
this.api.asc_showRevision(hist); this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController('Common.Controllers.Comments'); var commentsController = this.getApplication().getController('Common.Controllers.Comments');
@ -191,6 +195,7 @@ define([
hist.asc_setCurrentChangeId(this.currentChangeId); hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors); hist.asc_setArrColors(this.currentArrColors);
hist.asc_setToken(token); hist.asc_setToken(token);
hist.asc_setIsRequested(true);
this.api.asc_showRevision(hist); this.api.asc_showRevision(hist);
var commentsController = this.getApplication().getController('Common.Controllers.Comments'); var commentsController = this.getApplication().getController('Common.Controllers.Comments');
@ -199,6 +204,12 @@ define([
} }
}, },
onExpiredToken: function() {
_.delay(function() {
Common.Gateway.requestHistoryData(this.currentRev); // получаем url-ы для ревизий
}, 10);
},
onClickBackToDocument: function () { onClickBackToDocument: function () {
// reload editor // reload editor
Common.Gateway.requestHistoryClose(); Common.Gateway.requestHistoryClose();

View file

@ -873,7 +873,7 @@ define([
pluginsController.setApi(me.api); pluginsController.setApi(me.api);
me.updatePlugins(me.plugins, false); me.updatePlugins(me.plugins, false);
me.requestPlugins('../../../../sdkjs-plugins/config.json'); me.requestPlugins('../../../../plugins.json');
me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me)); me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
documentHolderController.setApi(me.api); documentHolderController.setApi(me.api);
@ -1500,8 +1500,12 @@ define([
hidePreloader: function() { hidePreloader: function() {
if (!this._state.customizationDone) { if (!this._state.customizationDone) {
this._state.customizationDone = true; this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp) if (this.appOptions.customization) {
this.appOptions.customization.about = true; if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) { if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
@ -1961,11 +1965,18 @@ define([
return null; return null;
}; };
var arr = []; var arr = [],
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.log("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
var value = _getPluginJson(item); var value = _getPluginJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1983,7 +1994,7 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && pluginStore.findWhere({baseUrl : item.baseUrl})) return; if (uiCustomize!==undefined && (pluginStore.findWhere({baseUrl : item.baseUrl}) || pluginStore.findWhere({guid : item.guid}))) return;
var variations = item.variations, var variations = item.variations,
variationsArr = []; variationsArr = [];
@ -1995,12 +2006,19 @@ define([
} }
} }
if (isSupported && (isEdit || itemVar.isViewer)) { if (isSupported && (isEdit || itemVar.isViewer)) {
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) : item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) :
variationsArr.push(new Common.Models.PluginVariation({ variationsArr.push(new Common.Models.PluginVariation({
description: itemVar.description, description: itemVar.description,
index: variationsArr.length, index: variationsArr.length,
url : itemVar.url, url : (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/")+1) ) : itemVar.url,
icons : itemVar.icons, icons : icons,
isViewer: itemVar.isViewer, isViewer: itemVar.isViewer,
EditorsSupport: itemVar.EditorsSupport, EditorsSupport: itemVar.EditorsSupport,
isVisual: itemVar.isVisual, isVisual: itemVar.isVisual,
@ -2157,4 +2175,4 @@ define([
textChangesSaved: 'All changes saved' textChangesSaved: 'All changes saved'
} }
})(), DE.Controllers.Main || {})) })(), DE.Controllers.Main || {}))
}); });

View file

@ -92,11 +92,11 @@ define([
me.api.asc_GetDefaultTableStyles(); me.api.asc_GetDefaultTableStyles();
} }
$('#add-table li').single('click', _.buffered(this.onStyleClick, 300, this)); $('#add-table li').single('click', _.buffered(this.onStyleClick, 100, this));
}, },
onViewRender: function () { onViewRender: function () {
$('#add-table li').single('click', _.buffered(this.onStyleClick, 300, this)); $('#add-table li').single('click', _.buffered(this.onStyleClick, 100, this));
}, },
onStyleClick: function (e) { onStyleClick: function (e) {
@ -104,64 +104,66 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
type = $target.data('type'); type = $target.data('type');
if ($('.modal.modal-in').length > 0) {
return
}
DE.getController('AddContainer').hideModal(); DE.getController('AddContainer').hideModal();
_.delay(function () { if ($target) {
if ($target) { var picker;
var picker; var modal = uiApp.modal({
var modal = uiApp.modal({ title: me.textTableSize,
title: me.textTableSize, text: '',
text: '', afterText:
afterText: '<div class="content-block">' +
'<div class="content-block">' + '<div class="row">' +
'<div class="row">' + '<div class="col-50">' + me.textColumns + '</div>' +
'<div class="col-50">' + me.textColumns + '</div>' + '<div class="col-50">' + me.textRows + '</div>' +
'<div class="col-50">' + me.textRows + '</div>' + '</div>' +
'</div>' + '<div id="picker-table-size"></div>' +
'<div id="picker-table-size"></div>' + '</div>',
'</div>', buttons: [
buttons: [ {
{ text: me.textCancel
text: me.textCancel },
}, {
{ text: 'OK',
text: 'OK', bold: true,
bold: true, onClick: function () {
onClick: function () { var size = picker.value;
var size = picker.value;
if (me.api) { if (me.api) {
me.api.put_Table(parseInt(size[0]), parseInt(size[1])); me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
var properties = new Asc.CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableStyle(type); properties.put_TableStyle(type);
me.api.tblApply(properties); me.api.tblApply(properties);
}
} }
} }
] }
}); ]
});
picker = uiApp.picker({ picker = uiApp.picker({
container: '#picker-table-size', container: '#picker-table-size',
toolbar: false, toolbar: false,
rotateEffect: true, rotateEffect: true,
value: [3, 3], value: [3, 3],
cols: [{ cols: [{
textAlign: 'left', textAlign: 'left',
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}, { }, {
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}] }]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(modal).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
}); });
} }
}, 300);
}, },
// Public // Public

View file

@ -54,7 +54,8 @@ define([
var _stack = [], var _stack = [],
_chartObject = undefined, _chartObject = undefined,
_shapeObject = undefined, _shapeObject = undefined,
_metricText = Common.Utils.Metric.getCurrentMetricName(); _metricText = Common.Utils.Metric.getCurrentMetricName(),
_borderColor = 'transparent';
var wrapTypesTransform = (function() { var wrapTypesTransform = (function() {
var map = [ var map = [
@ -80,7 +81,7 @@ define([
return obj.ui === type; return obj.ui === type;
})[0]; })[0];
return record ? record.sdk : 0; return record ? record.sdk : 0;
}, }
} }
})(); })();
@ -260,13 +261,18 @@ define([
paletteFillColor && paletteFillColor.select(color); paletteFillColor && paletteFillColor.select(color);
// Init border color // Init border color
var stroke = shapeProperties.get_stroke(), me._initBorderColorView();
strokeType = stroke.get_type(); },
color = 'transparent'; _initBorderColorView: function () {
var me = this,
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { var color = 'transparent';
sdkColor = stroke.get_color();
if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var sdkColor = stroke.get_color();
if (sdkColor) { if (sdkColor) {
if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@ -277,6 +283,7 @@ define([
} }
} }
} }
_borderColor = color;
paletteBorderColor && paletteBorderColor.select(color); paletteBorderColor && paletteBorderColor.select(color);
$('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))) $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@ -440,29 +447,20 @@ define([
var me = this, var me = this,
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
currentShape = _shapeObject.get_ShapeProperties(),
image = new Asc.asc_CImgProperty(), image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = currentShape.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderColor == 'transparent')
stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
stroke.put_width(value * 25.4 / 72.0); stroke.put_width(value * 25.4 / 72.0);
} }
@ -470,6 +468,7 @@ define([
image.put_ShapeProperties(shape); image.put_ShapeProperties(shape);
me.api.ImgApply(image); me.api.ImgApply(image);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -506,8 +505,9 @@ define([
currentShape = _shapeObject.get_ShapeProperties(); currentShape = _shapeObject.get_ShapeProperties();
$('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color;
if (me.api && currentShape) { if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();

View file

@ -261,8 +261,16 @@ define([
$layoutPages.prop('outerHTML') + $layoutPages.prop('outerHTML') +
'</div>' + '</div>' +
'</div>' '</div>'
)).on('close', function (e) { )).on('opened', function () {
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function (e) {
mainView.showNavbar(); mainView.showNavbar();
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
mainView.hideNavbar(); mainView.hideNavbar();
} else { } else {
@ -289,9 +297,17 @@ define([
$overlay.addClass('modal-overlay-visible') $overlay.addClass('modal-overlay-visible')
} }
}); });
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function () { }).on('close', function () {
$overlay.off('removeClass'); $overlay.off('removeClass');
$overlay.removeClass('modal-overlay-visible') $overlay.removeClass('modal-overlay-visible')
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
} }

View file

@ -53,7 +53,8 @@ define([
// Private // Private
var _stack = [], var _stack = [],
_shapeObject = undefined, _shapeObject = undefined,
_metricText = Common.Utils.Metric.getCurrentMetricName(); _metricText = Common.Utils.Metric.getCurrentMetricName(),
_borderColor = 'transparent';
var wrapTypesTransform = (function() { var wrapTypesTransform = (function() {
var map = [ var map = [
@ -79,7 +80,7 @@ define([
return obj.ui === type; return obj.ui === type;
})[0]; })[0];
return record ? record.sdk : 0; return record ? record.sdk : 0;
}, }
} }
})(); })();
@ -101,7 +102,7 @@ define([
} }
}); });
return index return index;
}, },
sizeByValue: function (value) { sizeByValue: function (value) {
@ -254,13 +255,18 @@ define([
paletteFillColor && paletteFillColor.select(color); paletteFillColor && paletteFillColor.select(color);
// Init border color // Init border color
var stroke = shapeProperties.get_stroke(), me._initBorderColorView();
strokeType = stroke.get_type(); },
color = 'transparent'; _initBorderColorView: function () {
var me = this,
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
stroke = _shapeObject.get_ShapeProperties().get_stroke();
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { var color = 'transparent';
sdkColor = stroke.get_color();
if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var sdkColor = stroke.get_color();
if (sdkColor) { if (sdkColor) {
if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@ -271,6 +277,7 @@ define([
} }
} }
} }
_borderColor = color;
paletteBorderColor && paletteBorderColor.select(color); paletteBorderColor && paletteBorderColor.select(color);
$('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))) $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@ -407,29 +414,20 @@ define([
var me = this, var me = this,
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
currentShape = _shapeObject.get_ShapeProperties(),
image = new Asc.asc_CImgProperty(), image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = currentShape.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderColor == 'transparent')
stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
stroke.put_width(value * 25.4 / 72.0); stroke.put_width(value * 25.4 / 72.0);
} }
@ -437,6 +435,7 @@ define([
image.put_ShapeProperties(shape); image.put_ShapeProperties(shape);
me.api.ImgApply(image); me.api.ImgApply(image);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -494,8 +493,9 @@ define([
currentShape = _shapeObject.get_ShapeProperties(); currentShape = _shapeObject.get_ShapeProperties();
$('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color;
if (me.api && currentShape) { if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();

View file

@ -80,14 +80,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index;
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -207,7 +212,7 @@ define([
$('#table-option-repeatasheader input').prop('checked', _tableObject.get_RowsInHeader()); $('#table-option-repeatasheader input').prop('checked', _tableObject.get_RowsInHeader());
$('#table-option-resizetofit input').prop('checked', _tableObject.get_TableLayout()==Asc.c_oAscTableLayout.AutoFit); $('#table-option-resizetofit input').prop('checked', _tableObject.get_TableLayout()==Asc.c_oAscTableLayout.AutoFit);
var margins = _tableObject.get_DefaultMargins(); var margins = _tableObject.get_CellMargins();
if (margins) { if (margins) {
var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left()); var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left());
$('#table-options-margins input').val(distance); $('#table-options-margins input').val(distance);
@ -313,7 +318,7 @@ define([
// }); // });
// } // }
$('#edit-table-bordersize input').val([borderSizeTransform.sizeByIndex(_cellBorderWidth)]); $('#edit-table-bordersize input').val([borderSizeTransform.indexSizeByValue(_cellBorderWidth)]);
$('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText); $('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText);
var borderPalette = me.getView('EditTable').paletteBorderColor; var borderPalette = me.getView('EditTable').paletteBorderColor;

View file

@ -86,10 +86,13 @@ define([
// Render layout // Render layout
render: function () { render: function () {
var shapes = Common.SharedSettings.get('shapes').slice();
shapes.splice(0, 1); // Remove line shapes
this.layout = $('<div/>').append(this.template({ this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
shapes : Common.SharedSettings.get('shapes'), shapes : shapes,
scope : this scope : this
})); }));

View file

@ -652,7 +652,7 @@ define([
pluginsController.setApi(me.api); pluginsController.setApi(me.api);
me.updatePlugins(me.plugins, false); me.updatePlugins(me.plugins, false);
me.requestPlugins('../../../../sdkjs-plugins/config.json'); me.requestPlugins('../../../../plugins.json');
me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me)); me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
documentHolderController.setApi(me.api); documentHolderController.setApi(me.api);
@ -1253,8 +1253,12 @@ define([
hidePreloader: function() { hidePreloader: function() {
if (!this._state.customizationDone) { if (!this._state.customizationDone) {
this._state.customizationDone = true; this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp) if (this.appOptions.customization) {
this.appOptions.customization.about = true; if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) { if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
@ -1724,11 +1728,18 @@ define([
return null; return null;
}; };
var arr = []; var arr = [],
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.log("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
var value = _getPluginJson(item); var value = _getPluginJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1746,6 +1757,8 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && (pluginStore.findWhere({baseUrl : item.baseUrl}) || pluginStore.findWhere({guid : item.guid}))) return;
var variations = item.variations, var variations = item.variations,
variationsArr = []; variationsArr = [];
variations.forEach(function(itemVar){ variations.forEach(function(itemVar){
@ -1756,12 +1769,19 @@ define([
} }
} }
if (isSupported && (isEdit || itemVar.isViewer)){ if (isSupported && (isEdit || itemVar.isViewer)){
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) : item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) :
variationsArr.push(new Common.Models.PluginVariation({ variationsArr.push(new Common.Models.PluginVariation({
description: itemVar.description, description: itemVar.description,
index: variationsArr.length, index: variationsArr.length,
url : itemVar.url, url : (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/")+1) ) : itemVar.url,
icons : itemVar.icons, icons : icons,
isViewer: itemVar.isViewer, isViewer: itemVar.isViewer,
EditorsSupport: itemVar.EditorsSupport, EditorsSupport: itemVar.EditorsSupport,
isVisual: itemVar.isVisual, isVisual: itemVar.isVisual,

View file

@ -60,8 +60,7 @@ define([
_linkType = c_oHyperlinkType.WebLink, _linkType = c_oHyperlinkType.WebLink,
_slideLink = 0, _slideLink = 0,
_slideNum = 0, _slideNum = 0,
_slidesCount = 0, _slidesCount = 0;
_isDisplayChanged = false;
return { return {
models: [], models: [],
@ -106,7 +105,6 @@ define([
if ($target && $target.prop('id') === 'add-link') { if ($target && $target.prop('id') === 'add-link') {
_linkType = c_oHyperlinkType.WebLink; _linkType = c_oHyperlinkType.WebLink;
_slideLink = _slideNum = 0; _slideLink = _slideNum = 0;
_isDisplayChanged = false;
var text = this.api.can_AddHyperlink(); var text = this.api.can_AddHyperlink();
if (text !== false) { if (text !== false) {
$('#add-link-display input').val((text !== null) ? text : this.textDefault); $('#add-link-display input').val((text !== null) ? text : this.textDefault);
@ -170,9 +168,6 @@ define([
$('#page-addlink-type li').single('click', _.buffered(me.onLinkType, 100, me)); $('#page-addlink-type li').single('click', _.buffered(me.onLinkType, 100, me));
$('#page-addlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me)); $('#page-addlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
$('#addlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me)); $('#addlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
$('#add-link-display input[type="text"]').single('input', _.bind(function(e) {
_isDisplayChanged = true;
}, this));
me.initSettings(pageId); me.initSettings(pageId);
}, },
@ -232,7 +227,7 @@ define([
def_display = slidetip; def_display = slidetip;
} }
if (!$('#add-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) { if (!$('#add-link-display').hasClass('disabled')) {
props.put_Text(_.isEmpty(display) ? def_display : display); props.put_Text(_.isEmpty(display) ? def_display : display);
} else } else
props.put_Text(null); props.put_Text(null);

View file

@ -91,64 +91,66 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
type = $target.data('type'); type = $target.data('type');
if ($('.modal.modal-in').length > 0) {
return;
}
PE.getController('AddContainer').hideModal(); PE.getController('AddContainer').hideModal();
_.delay(function () { if ($target) {
if ($target) { var picker;
var picker; var modal = uiApp.modal({
var modal = uiApp.modal({ title: me.textTableSize,
title: me.textTableSize, text: '',
text: '', afterText:
afterText: '<div class="content-block">' +
'<div class="content-block">' + '<div class="row">' +
'<div class="row">' + '<div class="col-50">' + me.textColumns + '</div>' +
'<div class="col-50">' + me.textColumns + '</div>' + '<div class="col-50">' + me.textRows + '</div>' +
'<div class="col-50">' + me.textRows + '</div>' + '</div>' +
'</div>' + '<div id="picker-table-size"></div>' +
'<div id="picker-table-size"></div>' + '</div>',
'</div>', buttons: [
buttons: [ {
{ text: me.textCancel
text: me.textCancel },
}, {
{ text: 'OK',
text: 'OK', bold: true,
bold: true, onClick: function () {
onClick: function () { var size = picker.value;
var size = picker.value;
if (me.api) { if (me.api) {
me.api.put_Table(parseInt(size[0]), parseInt(size[1])); me.api.put_Table(parseInt(size[0]), parseInt(size[1]));
var properties = new Asc.CTableProp(); var properties = new Asc.CTableProp();
properties.put_TableStyle(type); properties.put_TableStyle(type);
me.api.tblApply(properties); me.api.tblApply(properties);
}
} }
} }
] }
}); ]
});
picker = uiApp.picker({ picker = uiApp.picker({
container: '#picker-table-size', container: '#picker-table-size',
toolbar: false, toolbar: false,
rotateEffect: true, rotateEffect: true,
value: [3, 3], value: [3, 3],
cols: [{ cols: [{
textAlign: 'left', textAlign: 'left',
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}, { }, {
values: [1,2,3,4,5,6,7,8,9,10] values: [1,2,3,4,5,6,7,8,9,10]
}] }]
}); });
// Vertical align // Vertical align
$$(modal).css({ $$(modal).css({
marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px' marginTop: - Math.round($$(modal).outerHeight() / 2) + 'px'
}); });
} }
}, 300);
}, },
// Public // Public

View file

@ -54,7 +54,8 @@ define([
var _stack = [], var _stack = [],
_chartObject = undefined, _chartObject = undefined,
_shapeObject = undefined, _shapeObject = undefined,
_metricText = Common.Utils.Metric.getCurrentMetricName(); _metricText = Common.Utils.Metric.getCurrentMetricName(),
_borderColor = 'transparent';
var borderSizeTransform = (function() { var borderSizeTransform = (function() {
var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6]; var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6];
@ -66,14 +67,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -157,9 +163,10 @@ define([
$('.chart-types li[data-type=' + type + ']').addClass('active'); $('.chart-types li[data-type=' + type + ']').addClass('active');
// Init style border size // Init style border size
var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4; var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4,
$('#edit-chart-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]); borderType = _shapeObject.get_stroke().get_type();
$('#edit-chart-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText); $('#edit-chart-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
$('#edit-chart-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me)); paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me));
paletteBorderColor && paletteBorderColor.on('select', _.bind(me.onBorderColor, me)); paletteBorderColor && paletteBorderColor.on('select', _.bind(me.onBorderColor, me));
@ -188,13 +195,18 @@ define([
paletteFillColor && paletteFillColor.select(color); paletteFillColor && paletteFillColor.select(color);
// Init border color // Init border color
var stroke = shapeProperties.get_stroke(), me._initBorderColorView();
strokeType = stroke.get_type(); },
color = 'transparent'; _initBorderColorView: function () {
var me = this,
paletteBorderColor = me.getView('EditChart').paletteBorderColor,
stroke = _shapeObject.get_stroke();
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { var color = 'transparent';
sdkColor = stroke.get_color();
if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var sdkColor = stroke.get_color();
if (sdkColor) { if (sdkColor) {
if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@ -205,6 +217,7 @@ define([
} }
} }
} }
_borderColor = color;
paletteBorderColor && paletteBorderColor.select(color); paletteBorderColor && paletteBorderColor.select(color);
$('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))) $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@ -292,33 +305,25 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = _shapeObject.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderColor == 'transparent')
stroke.asc_putPrstDash(currentStroke.asc_getPrstDash()); stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
stroke.put_width(value * 25.4 / 72.0); stroke.put_width(value * 25.4 / 72.0);
} }
shape.put_stroke(stroke); shape.put_stroke(stroke);
me.api.ShapeApply(shape); me.api.ShapeApply(shape);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -352,8 +357,9 @@ define([
var me = this; var me = this;
$('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color;
if (me.api && _shapeObject) { if (me.api && _shapeObject && _shapeObject.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var shape = new Asc.asc_CShapeProperty(), var shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();

View file

@ -261,9 +261,18 @@ define([
$layoutPages.prop('outerHTML') + $layoutPages.prop('outerHTML') +
'</div>' + '</div>' +
'</div>' '</div>'
)).on('close', function (e) { )).on('opened', function () {
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function (e) {
mainView.showNavbar(); mainView.showNavbar();
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
mainView.hideNavbar(); mainView.hideNavbar();
} else { } else {
me.picker = uiApp.popover( me.picker = uiApp.popover(
@ -289,9 +298,17 @@ define([
$overlay.addClass('modal-overlay-visible') $overlay.addClass('modal-overlay-visible')
} }
}); });
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function () { }).on('close', function () {
$overlay.off('removeClass'); $overlay.off('removeClass');
$overlay.removeClass('modal-overlay-visible') $overlay.removeClass('modal-overlay-visible')
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
} }

View file

@ -65,8 +65,7 @@ define([
_linkType = c_oHyperlinkType.WebLink, _linkType = c_oHyperlinkType.WebLink,
_slideLink = 0, _slideLink = 0,
_slideNum = 0, _slideNum = 0,
_slidesCount = 0, _slidesCount = 0;
_isDisplayChanged = false;
return { return {
models: [], models: [],
@ -213,9 +212,6 @@ define([
$('#page-editlink-type li').single('click', _.buffered(me.onLinkType, 100, me)); $('#page-editlink-type li').single('click', _.buffered(me.onLinkType, 100, me));
$('#page-editlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me)); $('#page-editlink-slidenumber li').single('click', _.buffered(me.onSlideLink, 100, me));
$('#editlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me)); $('#editlink-slide-number .button').single('click',_.buffered(me.onSlideNumber, 100, me));
$('#edit-link-display input[type="text"]').single('input', _.bind(function(e) {
_isDisplayChanged = true;
}, this));
me.initSettings(pageId); me.initSettings(pageId);
}, },
@ -275,7 +271,7 @@ define([
def_display = slidetip; def_display = slidetip;
} }
if (!$('#edit-link-display').hasClass('disabled') && (_isDisplayChanged || _.isEmpty(display))) { if (!$('#edit-link-display').hasClass('disabled')) {
props.put_Text(_.isEmpty(display) ? def_display : display); props.put_Text(_.isEmpty(display) ? def_display : display);
} else } else
props.put_Text(null); props.put_Text(null);

View file

@ -53,7 +53,8 @@ define([
// Private // Private
var _stack = [], var _stack = [],
_shapeObject = undefined, _shapeObject = undefined,
_metricText = Common.Utils.Metric.getCurrentMetricName(); _metricText = Common.Utils.Metric.getCurrentMetricName(),
_borderColor = 'transparent';
var borderSizeTransform = (function() { var borderSizeTransform = (function() {
var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6]; var _sizes = [0, 0.5, 1, 1.5, 2.25, 3, 4.5, 6];
@ -65,14 +66,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -146,9 +152,10 @@ define([
paletteBorderColor = me.getView('EditShape').paletteBorderColor; paletteBorderColor = me.getView('EditShape').paletteBorderColor;
// Init style border size // Init style border size
var borderSize = _shapeObject.get_stroke().get_width() * 72.0 / 25.4; var borderSize = _shapeObject.get_stroke().get_width() * 72.0 / 25.4,
$('#edit-shape-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]); borderType = _shapeObject.get_stroke().get_type();
$('#edit-shape-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText); $('#edit-shape-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
$('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
// Init style opacity // Init style opacity
$('#edit-shape-effect input').val([_shapeObject.get_fill().asc_getTransparent() ? _shapeObject.get_fill().asc_getTransparent() / 2.55 : 100]); $('#edit-shape-effect input').val([_shapeObject.get_fill().asc_getTransparent() ? _shapeObject.get_fill().asc_getTransparent() / 2.55 : 100]);
@ -181,13 +188,18 @@ define([
paletteFillColor && paletteFillColor.select(color); paletteFillColor && paletteFillColor.select(color);
// Init border color // Init border color
var stroke = _shapeObject.get_stroke(), me._initBorderColorView();
strokeType = stroke.get_type(); },
color = 'transparent'; _initBorderColorView: function () {
var me = this,
paletteBorderColor = me.getView('EditShape').paletteBorderColor,
stroke = _shapeObject.get_stroke();
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { var color = 'transparent';
sdkColor = stroke.get_color();
if (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var sdkColor = stroke.get_color();
if (sdkColor) { if (sdkColor) {
if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { if (sdkColor.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
@ -198,6 +210,7 @@ define([
} }
} }
} }
_borderColor = color;
paletteBorderColor && paletteBorderColor.select(color); paletteBorderColor && paletteBorderColor.select(color);
$('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))) $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)))
@ -266,33 +279,25 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = _shapeObject.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderColor == 'transparent')
stroke.asc_putPrstDash(currentStroke.asc_getPrstDash()); stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderColor)));
stroke.put_width(value * 25.4 / 72.0); stroke.put_width(value * 25.4 / 72.0);
} }
shape.put_stroke(stroke); shape.put_stroke(stroke);
me.api.ShapeApply(shape); me.api.ShapeApply(shape);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -344,8 +349,9 @@ define([
var me = this; var me = this;
$('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color;
if (me.api && _shapeObject) { if (me.api && _shapeObject && _shapeObject.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var shape = new Asc.asc_CShapeProperty(), var shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();

View file

@ -69,14 +69,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index;
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -182,7 +187,7 @@ define([
}, },
_initTableOptionsView: function() { _initTableOptionsView: function() {
var margins = _tableObject.get_DefaultMargins(); var margins = _tableObject.get_CellMargins();
if (margins) { if (margins) {
var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left()); var distance = Common.Utils.Metric.fnRecalcFromMM(margins.get_Left());
$('#table-options-margins input').val(distance); $('#table-options-margins input').val(distance);
@ -262,7 +267,7 @@ define([
// }); // });
// } // }
$('#edit-table-bordersize input').val([borderSizeTransform.sizeByIndex(_cellBorderWidth)]); $('#edit-table-bordersize input').val([borderSizeTransform.indexSizeByValue(_cellBorderWidth)]);
$('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText); $('#edit-table-bordersize .item-after').text(borderSizeTransform.sizeByValue(_cellBorderWidth) + ' ' + _metricText);
var borderPalette = me.getView('EditTable').paletteBorderColor; var borderPalette = me.getView('EditTable').paletteBorderColor;
@ -342,7 +347,7 @@ define([
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
properties = new Asc.CTableProp(), properties = new Asc.CTableProp(),
margins = new Asc.asc_CPaddings(); margins = new Asc.CMargins();
$('#table-options-margins .item-after').text(value + ' ' + _metricText); $('#table-options-margins .item-after').text(value + ' ' + _metricText);
@ -352,8 +357,9 @@ define([
margins.put_Right(value); margins.put_Right(value);
margins.put_Bottom(value); margins.put_Bottom(value);
margins.put_Left(value); margins.put_Left(value);
margins.put_Flag(2);
properties.put_DefaultMargins(margins); properties.put_CellMargins(margins);
me.api.tblApply(properties); me.api.tblApply(properties);
}, },

View file

@ -42,7 +42,7 @@
</li> </li>
<li> <li>
<% if (android) { %> <% if (android) { %>
<a id="image-default" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a> <a id="image-remove" class="button button-raised button-fill" style="margin: 20px 16px; background-color: #f44336;"><%= scope.textRemove %></a>
<% } else { %> <% } else { %>
<a id="image-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemove %></a> <a id="image-remove" class="item-link list-button" style="text-align: center; color: #f00"><%= scope.textRemove %></a>
<% } %> <% } %>

View file

@ -6,7 +6,7 @@
<div class="center"> <div class="center">
<form class="searchbar search"> <form class="searchbar search">
<div class="searchbar-input search"> <div class="searchbar-input search">
<input type="search" placeholder="Search"><a href="#" class="searchbar-clear"></a> <input type="search" placeholder="<%= scope.textSearch %>"><a href="#" class="searchbar-clear"></a>
</div> </div>
</form> </form>
</div> </div>

View file

@ -131,7 +131,9 @@ define([
uiApp.hideNavbar(searchBar); uiApp.hideNavbar(searchBar);
}, 10); }, 10);
} }
} },
textSearch: 'Search'
} }
})(), PE.Views.Search || {})) })(), PE.Views.Search || {}))
}); });

View file

@ -86,10 +86,13 @@ define([
// Render layout // Render layout
render: function () { render: function () {
var shapes = Common.SharedSettings.get('shapes').slice();
shapes.splice(0, 1); // Remove line shapes
this.layout = $('<div/>').append(this.template({ this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
shapes : Common.SharedSettings.get('shapes'), shapes : shapes,
scope : this scope : this
})); }));

View file

@ -0,0 +1,429 @@
{
"Common.UI.ThemeColorPalette.textStandartColors": "Standardfarben",
"Common.UI.ThemeColorPalette.textThemeColors": "Designfarben",
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"PE.Controllers.AddContainer.textImage": "Bild",
"PE.Controllers.AddContainer.textLink": "Link",
"PE.Controllers.AddContainer.textShape": "Form",
"PE.Controllers.AddContainer.textSlide": "Folie",
"PE.Controllers.AddContainer.textTable": "Tabelle",
"PE.Controllers.AddImage.textEmptyImgUrl": "Sie müssen eine Bild-URL angeben.",
"PE.Controllers.AddImage.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
"PE.Controllers.AddLink.textDefault": "Ausgewählter Text",
"PE.Controllers.AddLink.textExternalLink": "Externer Link",
"PE.Controllers.AddLink.textFirst": "Erste Folie",
"PE.Controllers.AddLink.textInternalLink": "Folie in dieser Präsentation",
"PE.Controllers.AddLink.textLast": "Letzte Folie",
"PE.Controllers.AddLink.textNext": "Nächste Folie",
"PE.Controllers.AddLink.textPrev": "Vorherige Folie",
"PE.Controllers.AddLink.textSlide": "Folie",
"PE.Controllers.AddLink.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
"PE.Controllers.AddTable.textCancel": "Abbrechen",
"PE.Controllers.AddTable.textColumns": "Spalten",
"PE.Controllers.AddTable.textRows": "Zeilen",
"PE.Controllers.AddTable.textTableSize": "Tabellengröße",
"PE.Controllers.DocumentHolder.menuAddLink": "Link hinzufügen",
"PE.Controllers.DocumentHolder.menuCopy": "Kopieren",
"PE.Controllers.DocumentHolder.menuCut": "Ausschneiden",
"PE.Controllers.DocumentHolder.menuDelete": "Löschen",
"PE.Controllers.DocumentHolder.menuEdit": "Bearbeiten",
"PE.Controllers.DocumentHolder.menuOpenLink": "Link öffnen",
"PE.Controllers.DocumentHolder.menuPaste": "Einfügen",
"PE.Controllers.EditContainer.textChart": "Diagramm",
"PE.Controllers.EditContainer.textHyperlink": "Hyperlink",
"PE.Controllers.EditContainer.textImage": "Bild",
"PE.Controllers.EditContainer.textSettings": "Einstellungen",
"PE.Controllers.EditContainer.textShape": "Form",
"PE.Controllers.EditContainer.textSlide": "Folie",
"PE.Controllers.EditContainer.textTable": "Tabelle",
"PE.Controllers.EditContainer.textText": "Text",
"PE.Controllers.EditImage.textEmptyImgUrl": "Sie müssen eine Bild-URL angeben.",
"PE.Controllers.EditImage.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
"PE.Controllers.EditLink.textDefault": "Ausgewählter Text",
"PE.Controllers.EditLink.textExternalLink": "Externer Link",
"PE.Controllers.EditLink.textFirst": "Erste Folie",
"PE.Controllers.EditLink.textInternalLink": "Folie in dieser Präsentation",
"PE.Controllers.EditLink.textLast": "Letzte Folie",
"PE.Controllers.EditLink.textNext": "Nächste Folie",
"PE.Controllers.EditLink.textPrev": "Vorherige Folie",
"PE.Controllers.EditLink.textSlide": "Folie",
"PE.Controllers.EditLink.txtNotUrl": "Dieser Bereich soll ein URL in der Format \"http://www.example.com\" sein.",
"PE.Controllers.EditSlide.textSec": "s",
"PE.Controllers.EditText.textAuto": "Automatisch",
"PE.Controllers.EditText.textFonts": "Schriftarten",
"PE.Controllers.EditText.textPt": "pt",
"PE.Controllers.Main.advDRMEnterPassword": "Kennwort eingeben",
"PE.Controllers.Main.advDRMOptions": "Geschützte Datei",
"PE.Controllers.Main.advDRMPassword": "Kennwort",
"PE.Controllers.Main.applyChangesTextText": "Daten werden geladen...",
"PE.Controllers.Main.applyChangesTitleText": "Daten werden geladen",
"PE.Controllers.Main.convertationTimeoutText": "Timeout für die Konvertierung wurde überschritten.",
"PE.Controllers.Main.criticalErrorExtText": "Drücken Sie \"OK\", um zur Dokumentenliste zurückzukehren.",
"PE.Controllers.Main.criticalErrorTitle": "Fehler",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"PE.Controllers.Main.downloadErrorText": "Herinterladen ist fehlgeschlagen.",
"PE.Controllers.Main.downloadTextText": "Dokument wird heruntergeladen...",
"PE.Controllers.Main.downloadTitleText": "Herunterladen des Dokuments",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Verbindung zum Server ist verloren gegangen. Sie können nicht mehr editieren.",
"PE.Controllers.Main.errorConnectToServer": "Das Dokument konnte nicht gespeichert werden. Bitte überprüfen Sie die Verbindungseinstellungen, oder kontaktieren Sie Ihren Administrator.<br>Wann Sie auf den Button \"OK\" klicken, werden Sie aufgefordert, das Dokument herunterzuladen.<br><br>Mehr Information zur Verbindung des Dokument Servers finden Sie <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">hier</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.<br>Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.",
"PE.Controllers.Main.errorDataRange": "Falscher Datenbereich.",
"PE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1",
"PE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt.",
"PE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor",
"PE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen",
"PE.Controllers.Main.errorProcessSaveResult": "Fehler beim Speichern von Daten.",
"PE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.",
"PE.Controllers.Main.errorStockChart": "Falsche Reihenfolge der Zeilen. Um ein Kursdiagramm zu erstellen, ordnen Sie die Daten auf dem Blatt folgendermaßen an:<br> Eröffnungspreis, Höchstpreis, Tiefstpreis, Schlusskurs.",
"PE.Controllers.Main.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
"PE.Controllers.Main.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.",
"PE.Controllers.Main.errorUsersExceed": "Die Anzahl der Benutzer ist überschritten ",
"PE.Controllers.Main.errorViewerDisconnect": "Die Verbindung ist verloren. Man kann das Dokument anschauen.<br>Es ist aber momentan nicht möglich, ihn herunterzuladen oder auszudrücken bis die Verbindung wiederhergestellt wird.",
"PE.Controllers.Main.leavePageText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\", um auf automatisches Speichern des Dokumentes zu warten. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
"PE.Controllers.Main.loadFontsTextText": "Daten werden geladen...",
"PE.Controllers.Main.loadFontsTitleText": "Daten werden geladen",
"PE.Controllers.Main.loadFontTextText": "Daten werden geladen...",
"PE.Controllers.Main.loadFontTitleText": "Daten werden geladen",
"PE.Controllers.Main.loadImagesTextText": "Bilder werden geladen...",
"PE.Controllers.Main.loadImagesTitleText": "Bilder werden geladen",
"PE.Controllers.Main.loadImageTextText": "Bild wird geladen...",
"PE.Controllers.Main.loadImageTitleText": "Bild wird geladen",
"PE.Controllers.Main.loadingDocumentTextText": "Präsentation wird geladen...\t",
"PE.Controllers.Main.loadingDocumentTitleText": "Präsentation wird geladen ",
"PE.Controllers.Main.loadThemeTextText": "Design wird geladen...",
"PE.Controllers.Main.loadThemeTitleText": "Laden des Designs",
"PE.Controllers.Main.notcriticalErrorTitle": "Achtung",
"PE.Controllers.Main.openErrorText": "Beim Öffnen dieser Datei ist ein Fehler aufgetreten",
"PE.Controllers.Main.openTextText": "Dokument wird geöffnet...",
"PE.Controllers.Main.openTitleText": "Das Dokument wird geöffnet",
"PE.Controllers.Main.printTextText": "Dokument wird ausgedruckt...",
"PE.Controllers.Main.printTitleText": "Drucken des Dokuments",
"PE.Controllers.Main.reloadButtonText": "Seite neu laden",
"PE.Controllers.Main.requestEditFailedMessageText": "Das Dokument wurde gerade von einem anderen Benutzer bearbeitet. Bitte versuchen Sie es später erneut.",
"PE.Controllers.Main.requestEditFailedTitleText": "Zugriff verweigert",
"PE.Controllers.Main.saveErrorText": "Beim Speichern dieser Datei ist ein Fehler aufgetreten",
"PE.Controllers.Main.savePreparingText": "Speichervorbereitung",
"PE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...",
"PE.Controllers.Main.saveTextText": "Dokument wird gespeichert...",
"PE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...",
"PE.Controllers.Main.splitDividerErrorText": "Die Anzahl der Zeilen muss einen Divisor von %1 sein. ",
"PE.Controllers.Main.splitMaxColsErrorText": "Spaltenanzahl muss weniger als %1 sein",
"PE.Controllers.Main.splitMaxRowsErrorText": "Die Anzahl der Zeilen muss weniger als %1 sein",
"PE.Controllers.Main.textAnonymous": "Anonym",
"PE.Controllers.Main.textBack": "Zurück",
"PE.Controllers.Main.textBuyNow": "Webseite besuchen",
"PE.Controllers.Main.textCancel": "Abbrechen",
"PE.Controllers.Main.textClose": "Schließen",
"PE.Controllers.Main.textCloseTip": "Um den Tipp zu schließen, tippen Sie darauf.",
"PE.Controllers.Main.textContactUs": "Verkaufsteam kontaktieren",
"PE.Controllers.Main.textDone": "Fertig",
"PE.Controllers.Main.textLoadingDocument": "Präsentation wird geladen ",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE Open Source Version",
"PE.Controllers.Main.textOK": "OK",
"PE.Controllers.Main.textPassword": "Kennwort",
"PE.Controllers.Main.textPreloader": "Ladevorgang...",
"PE.Controllers.Main.textShape": "Form",
"PE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind für den halbformalen Zusammenbearbeitungsmodus deaktiviert.",
"PE.Controllers.Main.textUsername": "Benutzername",
"PE.Controllers.Main.titleLicenseExp": "Lizenz ist abgelaufen",
"PE.Controllers.Main.titleServerVersion": "Editor wurde aktualisiert",
"PE.Controllers.Main.txtArt": "Hier den Text eingeben",
"PE.Controllers.Main.txtBasicShapes": "Standardformen",
"PE.Controllers.Main.txtButtons": "Buttons",
"PE.Controllers.Main.txtCallouts": "Legenden",
"PE.Controllers.Main.txtCharts": "Diagramme",
"PE.Controllers.Main.txtDiagramTitle": "Diagrammtitel",
"PE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...",
"PE.Controllers.Main.txtFiguredArrows": "Geformte Pfeile",
"PE.Controllers.Main.txtLines": "Linien",
"PE.Controllers.Main.txtMath": "Mathematik",
"PE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen",
"PE.Controllers.Main.txtRectangles": "Rechtecke",
"PE.Controllers.Main.txtSeries": "Reihen",
"PE.Controllers.Main.txtSldLtTBlank": "Leer",
"PE.Controllers.Main.txtSldLtTChart": "Diagramm",
"PE.Controllers.Main.txtSldLtTChartAndTx": "Diagramm und Text",
"PE.Controllers.Main.txtSldLtTClipArtAndTx": "ClipArt und Text",
"PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "ClipArt und vertikaler Text",
"PE.Controllers.Main.txtSldLtTCust": "Benutzerdefiniert",
"PE.Controllers.Main.txtSldLtTDgm": "Schema",
"PE.Controllers.Main.txtSldLtTFourObj": "Vier Objekte",
"PE.Controllers.Main.txtSldLtTMediaAndTx": "Medien und Text",
"PE.Controllers.Main.txtSldLtTObj": "Titel und Objekt",
"PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Objekt und zwei Objekte",
"PE.Controllers.Main.txtSldLtTObjAndTx": "Objekt und Text",
"PE.Controllers.Main.txtSldLtTObjOnly": "Objekt",
"PE.Controllers.Main.txtSldLtTObjOverTx": "Objekt über Text",
"PE.Controllers.Main.txtSldLtTObjTx": "Titel, Objekt und Beschriftung",
"PE.Controllers.Main.txtSldLtTPicTx": "Bild und Überschrift",
"PE.Controllers.Main.txtSldLtTSecHead": "Überschrift des Abschnitts",
"PE.Controllers.Main.txtSldLtTTbl": "Tabelle",
"PE.Controllers.Main.txtSldLtTTitle": "Titel\t",
"PE.Controllers.Main.txtSldLtTTitleOnly": "Nur Titel",
"PE.Controllers.Main.txtSldLtTTwoColTx": "Zweispaltiger Text",
"PE.Controllers.Main.txtSldLtTTwoObj": "Zwei Objekte",
"PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Zwei Objekte und Objekt",
"PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Zwei Objekte und Text",
"PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Zwei Objekte über Text",
"PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Zwei Texte und zwei Objekte",
"PE.Controllers.Main.txtSldLtTTx": "Text",
"PE.Controllers.Main.txtSldLtTTxAndChart": "Text und Diagramm",
"PE.Controllers.Main.txtSldLtTTxAndClipArt": "Text und ClipArt",
"PE.Controllers.Main.txtSldLtTTxAndMedia": "Text und Medien",
"PE.Controllers.Main.txtSldLtTTxAndObj": "Text und Objekt",
"PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Text und zwei Objekte",
"PE.Controllers.Main.txtSldLtTTxOverObj": "Text über Objekt",
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertikaler Titel und Text",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertikaler Titel und Text über Diagramm",
"PE.Controllers.Main.txtSldLtTVertTx": "Vertikaler Text",
"PE.Controllers.Main.txtStarsRibbons": "Sterne & Bänder",
"PE.Controllers.Main.txtXAxis": "x-Achse",
"PE.Controllers.Main.txtYAxis": "y-Achse",
"PE.Controllers.Main.unknownErrorText": "Unbekannter Fehler.",
"PE.Controllers.Main.unsupportedBrowserErrorText ": "Ihr Webbrowser wird nicht unterstützt.",
"PE.Controllers.Main.uploadImageExtMessage": "Unbekanntes Bildformat.",
"PE.Controllers.Main.uploadImageFileCountMessage": "Keine Bilder sind hochgeladen.",
"PE.Controllers.Main.uploadImageSizeMessage": "Die maximal zulässige Bildgröße ist überschritten.",
"PE.Controllers.Main.uploadImageTextText": "Bild wird hochgeladen...",
"PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
"PE.Controllers.Main.warnLicenseExp": "Ihre Lizenz ist abgelaufen.<br>Bitte aktualisieren Sie Ihre Lizenz und laden Sie die Seite neu.",
"PE.Controllers.Main.warnNoLicense": "Sie nutzen die Open Source Version von ONLYOFFICE. Die Version hat gewisse Einschränkungen für gleichzeitige Verbindungen zu Dokumentenserver (20 Verbindungen in einer Zeit).<br>Wenn Sie mehr Verbindungen benötigen, erwerben Sie eine kommerzielle Lizenz.",
"PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
"PE.Controllers.Search.textNoTextFound": "Der Text wurde nicht gefunden.",
"PE.Controllers.Settings.notcriticalErrorTitle": "Achtung",
"PE.Controllers.Settings.txtLoading": "Ladevorgang...",
"PE.Controllers.Toolbar.dlgLeaveMsgText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie \"Auf dieser Seite bleiben\", um auf automatisches Speichern des Dokumentes zu warten. Klicken Sie \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.",
"PE.Controllers.Toolbar.dlgLeaveTitleText": "Sie verlassen die Anwendung",
"PE.Controllers.Toolbar.leaveButtonText": "Seite verlassen",
"PE.Controllers.Toolbar.stayButtonText": "Auf dieser Seite bleiben",
"PE.Views.AddImage.textAddress": "Adresse",
"PE.Views.AddImage.textBack": "Zurück",
"PE.Views.AddImage.textFromLibrary": "Bild aus der Bibliothek",
"PE.Views.AddImage.textFromURL": "Bild aus URL",
"PE.Views.AddImage.textImageURL": "Bild-URL",
"PE.Views.AddImage.textInsertImage": "Bild einfügen",
"PE.Views.AddImage.textLinkSettings": "Verknüpfungseinstellungen",
"PE.Views.AddLink.textBack": "Zurück",
"PE.Views.AddLink.textDisplay": "Anzeigen",
"PE.Views.AddLink.textExternalLink": "Externer Link",
"PE.Views.AddLink.textFirst": "Erste Folie",
"PE.Views.AddLink.textInsert": "Einfügen",
"PE.Views.AddLink.textInternalLink": "Folie in dieser Präsentation",
"PE.Views.AddLink.textLast": "Letzte Folie",
"PE.Views.AddLink.textLink": "Link",
"PE.Views.AddLink.textLinkSlide": "Verknüpfen mit",
"PE.Views.AddLink.textLinkType": "Hyperlinktyp",
"PE.Views.AddLink.textNext": "Nächste Folie",
"PE.Views.AddLink.textNumber": "Foliennummer",
"PE.Views.AddLink.textPrev": "Vorherige Folie",
"PE.Views.AddLink.textTip": "Info-Tipp",
"PE.Views.EditChart.textAlign": "Ausrichtung",
"PE.Views.EditChart.textAlignBottom": "Unten ausrichten",
"PE.Views.EditChart.textAlignCenter": "Zentriert ausrichten",
"PE.Views.EditChart.textAlignLeft": "Links ausrichten",
"PE.Views.EditChart.textAlignMiddle": "Mittig ausrichten",
"PE.Views.EditChart.textAlignRight": "Rechts ausrichten",
"PE.Views.EditChart.textAlignTop": "Oben ausrichten",
"PE.Views.EditChart.textBack": "Zurück",
"PE.Views.EditChart.textBackward": "Rückwärts navigieren",
"PE.Views.EditChart.textBorder": "Rahmen",
"PE.Views.EditChart.textColor": "Farbe",
"PE.Views.EditChart.textFill": "Füllung",
"PE.Views.EditChart.textForward": "Vorwärts navigieren",
"PE.Views.EditChart.textRemoveChart": "Diagramm entfernen",
"PE.Views.EditChart.textReorder": "Neu ordnen",
"PE.Views.EditChart.textSize": "Größe",
"PE.Views.EditChart.textStyle": "Stil",
"PE.Views.EditChart.textToBackground": "In den Hintergrund",
"PE.Views.EditChart.textToForeground": "In den Vordergrund ",
"PE.Views.EditChart.textType": "Typ",
"PE.Views.EditChart.txtDistribHor": "Horizontal verteilen",
"PE.Views.EditChart.txtDistribVert": "Vertikal verteilen",
"PE.Views.EditImage.textAddress": "Adresse",
"PE.Views.EditImage.textAlign": "Ausrichtung",
"PE.Views.EditImage.textAlignBottom": "Unten ausrichten",
"PE.Views.EditImage.textAlignCenter": "Zentriert ausrichten",
"PE.Views.EditImage.textAlignLeft": "Links ausrichten",
"PE.Views.EditImage.textAlignMiddle": "Mittig ausrichten",
"PE.Views.EditImage.textAlignRight": "Rechts ausrichten",
"PE.Views.EditImage.textAlignTop": "Oben ausrichten",
"PE.Views.EditImage.textBack": "Zurück",
"PE.Views.EditImage.textBackward": "Rückwärts navigieren",
"PE.Views.EditImage.textDefault": "Standardgröße",
"PE.Views.EditImage.textForward": "Vorwärts navigieren",
"PE.Views.EditImage.textFromLibrary": "Bild aus der Bibliothek",
"PE.Views.EditImage.textFromURL": "Bild aus URL",
"PE.Views.EditImage.textImageURL": "Bild-URL",
"PE.Views.EditImage.textLinkSettings": "Verknüpfungseinstellungen",
"PE.Views.EditImage.textRemove": "Bild entfernen",
"PE.Views.EditImage.textReorder": "Neu ordnen",
"PE.Views.EditImage.textReplace": "Ersetzen",
"PE.Views.EditImage.textReplaceImg": "Bild ersetzen",
"PE.Views.EditImage.textToBackground": "In den Hintergrund",
"PE.Views.EditImage.textToForeground": "In den Vordergrund ",
"PE.Views.EditImage.txtDistribHor": "Horizontal verteilen",
"PE.Views.EditImage.txtDistribVert": "Vertikal verteilen",
"PE.Views.EditLink.textBack": "Zurück",
"PE.Views.EditLink.textDisplay": "Anzeigen",
"PE.Views.EditLink.textEdit": "Link bearbeiten",
"PE.Views.EditLink.textExternalLink": "Externer Link",
"PE.Views.EditLink.textFirst": "Erste Folie",
"PE.Views.EditLink.textInternalLink": "Folie in dieser Präsentation",
"PE.Views.EditLink.textLast": "Letzte Folie",
"PE.Views.EditLink.textLink": "Link",
"PE.Views.EditLink.textLinkSlide": "Verknüpfen mit",
"PE.Views.EditLink.textLinkType": "Hyperlinktyp",
"PE.Views.EditLink.textNext": "Nächste Folie",
"PE.Views.EditLink.textNumber": "Foliennummer",
"PE.Views.EditLink.textPrev": "Vorherige Folie",
"PE.Views.EditLink.textRemove": "Link entfernen",
"PE.Views.EditLink.textTip": "Info-Tipp",
"PE.Views.EditShape.textAlign": "Ausrichtung",
"PE.Views.EditShape.textAlignBottom": "Unten ausrichten",
"PE.Views.EditShape.textAlignCenter": "Zentriert ausrichten",
"PE.Views.EditShape.textAlignLeft": "Links ausrichten",
"PE.Views.EditShape.textAlignMiddle": "Mittig ausrichten",
"PE.Views.EditShape.textAlignRight": "Rechts ausrichten",
"PE.Views.EditShape.textAlignTop": "Oben ausrichten",
"PE.Views.EditShape.textBack": "Zurück",
"PE.Views.EditShape.textBackward": "Rückwärts navigieren",
"PE.Views.EditShape.textBorder": "Rahmen",
"PE.Views.EditShape.textColor": "Farbe",
"PE.Views.EditShape.textEffects": "Effekte",
"PE.Views.EditShape.textFill": "Füllung",
"PE.Views.EditShape.textForward": "Vorwärts navigieren",
"PE.Views.EditShape.textOpacity": "Intransparenz",
"PE.Views.EditShape.textRemoveShape": "AutoForm entfernen",
"PE.Views.EditShape.textReorder": "Neu ordnen",
"PE.Views.EditShape.textReplace": "Ersetzen",
"PE.Views.EditShape.textSize": "Größe",
"PE.Views.EditShape.textStyle": "Stil",
"PE.Views.EditShape.textToBackground": "In den Hintergrund",
"PE.Views.EditShape.textToForeground": "In den Vordergrund ",
"PE.Views.EditShape.txtDistribHor": "Horizontal verteilen",
"PE.Views.EditShape.txtDistribVert": "Vertikal verteilen",
"PE.Views.EditSlide.textApplyAll": "Auf alle Folien anwenden",
"PE.Views.EditSlide.textBack": "Zurück",
"PE.Views.EditSlide.textBlack": "Durch Schwarz",
"PE.Views.EditSlide.textBottom": "Unten",
"PE.Views.EditSlide.textBottomLeft": "Unten links",
"PE.Views.EditSlide.textBottomRight": "Unten rechts",
"PE.Views.EditSlide.textClock": "Uhr",
"PE.Views.EditSlide.textClockwise": "Im Uhrzeigersinn",
"PE.Views.EditSlide.textColor": "Farbe",
"PE.Views.EditSlide.textCounterclockwise": "Gegen Uhrzeigersinn",
"PE.Views.EditSlide.textCover": "Bedecken",
"PE.Views.EditSlide.textDelay": "Verzögern",
"PE.Views.EditSlide.textDuplicateSlide": "Folie duplizieren",
"PE.Views.EditSlide.textDuration": "Dauer",
"PE.Views.EditSlide.textEffect": "Effekt",
"PE.Views.EditSlide.textFade": "Einblendung",
"PE.Views.EditSlide.textFill": "Füllung",
"PE.Views.EditSlide.textHorizontalIn": "Horizontal nach innen",
"PE.Views.EditSlide.textHorizontalOut": "Horizontal nach außen",
"PE.Views.EditSlide.textLayout": "Layout",
"PE.Views.EditSlide.textLeft": "Links",
"PE.Views.EditSlide.textNone": "Kein",
"PE.Views.EditSlide.textOpacity": "Intransparenz",
"PE.Views.EditSlide.textPush": "Schieben",
"PE.Views.EditSlide.textRemoveSlide": "Folie löschen",
"PE.Views.EditSlide.textRight": "Rechts",
"PE.Views.EditSlide.textSmoothly": "Gleitend",
"PE.Views.EditSlide.textSplit": "Aufteilen",
"PE.Views.EditSlide.textStartOnClick": "Bei Klicken beginnen",
"PE.Views.EditSlide.textStyle": "Stil",
"PE.Views.EditSlide.textTheme": "Thema",
"PE.Views.EditSlide.textTop": "Oben",
"PE.Views.EditSlide.textTopLeft": "\tOben links",
"PE.Views.EditSlide.textTopRight": "Oben rechts",
"PE.Views.EditSlide.textTransition": "Übergang",
"PE.Views.EditSlide.textType": "Typ",
"PE.Views.EditSlide.textUnCover": "Aufdecken",
"PE.Views.EditSlide.textVerticalIn": "Vertikal nach innen",
"PE.Views.EditSlide.textVerticalOut": "Vertikal nach außen",
"PE.Views.EditSlide.textWedge": "Keil",
"PE.Views.EditSlide.textWipe": "Wischen",
"PE.Views.EditSlide.textZoom": "Zoom",
"PE.Views.EditSlide.textZoomIn": "Vergrößern",
"PE.Views.EditSlide.textZoomOut": "Verkleinern",
"PE.Views.EditSlide.textZoomRotate": "Zoom und Drehung",
"PE.Views.EditTable.textAlign": "Ausrichtung",
"PE.Views.EditTable.textAlignBottom": "Unten ausrichten",
"PE.Views.EditTable.textAlignCenter": "Zentriert ausrichten",
"PE.Views.EditTable.textAlignLeft": "Links ausrichten",
"PE.Views.EditTable.textAlignMiddle": "Mittig ausrichten",
"PE.Views.EditTable.textAlignRight": "Rechts ausrichten",
"PE.Views.EditTable.textAlignTop": "Oben ausrichten",
"PE.Views.EditTable.textBack": "Zurück",
"PE.Views.EditTable.textBackward": "Rückwärts navigieren",
"PE.Views.EditTable.textBandedColumn": "Gebänderte Spalten",
"PE.Views.EditTable.textBandedRow": "Gebänderte Zeilen",
"PE.Views.EditTable.textBorder": "Rahmen",
"PE.Views.EditTable.textCellMargins": "Zellenränder",
"PE.Views.EditTable.textColor": "Farbe",
"PE.Views.EditTable.textFill": "Füllung",
"PE.Views.EditTable.textFirstColumn": "Erste Spalte",
"PE.Views.EditTable.textForward": "Vorwärts navigieren",
"PE.Views.EditTable.textHeaderRow": "Kopfzeile",
"PE.Views.EditTable.textLastColumn": "Letzte Spalte",
"PE.Views.EditTable.textOptions": "Optionen",
"PE.Views.EditTable.textRemoveTable": "Tabelle entfernen",
"PE.Views.EditTable.textReorder": "Neu ordnen",
"PE.Views.EditTable.textSize": "Größe",
"PE.Views.EditTable.textStyle": "Stil",
"PE.Views.EditTable.textStyleOptions": "Formatoptionen",
"PE.Views.EditTable.textTableOptions": "Tabellenoptionen",
"PE.Views.EditTable.textToBackground": "In den Hintergrund",
"PE.Views.EditTable.textToForeground": "In den Vordergrund ",
"PE.Views.EditTable.textTotalRow": "Ergebniszeile",
"PE.Views.EditTable.txtDistribHor": "Horizontal verteilen",
"PE.Views.EditTable.txtDistribVert": "Vertikal verteilen",
"PE.Views.EditText.textAdditional": "Zusätzlich",
"PE.Views.EditText.textAdditionalFormat": "Zusätzliche Formatierung",
"PE.Views.EditText.textAfter": "Nach Absatz",
"PE.Views.EditText.textAllCaps": "Alle Großbuchstaben",
"PE.Views.EditText.textAutomatic": "Automatisch",
"PE.Views.EditText.textBack": "Zurück",
"PE.Views.EditText.textBefore": "Vor Absatz",
"PE.Views.EditText.textBullets": "Aufzählung",
"PE.Views.EditText.textDblStrikethrough": "Doppeltes Durchstreichen\t",
"PE.Views.EditText.textDblSuperscript": "Hochgestellt",
"PE.Views.EditText.textFontColor": "Schriftfarbe",
"PE.Views.EditText.textFontColors": "Schriftfarben",
"PE.Views.EditText.textFonts": "Schriftarten",
"PE.Views.EditText.textFromText": "Abstand vom Text",
"PE.Views.EditText.textLetterSpacing": "Zeichenabstand",
"PE.Views.EditText.textLineSpacing": "Zeilenabstand",
"PE.Views.EditText.textNone": "Kein",
"PE.Views.EditText.textNumbers": "Nummern",
"PE.Views.EditText.textSize": "Größe",
"PE.Views.EditText.textSmallCaps": "Kapitälchen",
"PE.Views.EditText.textStrikethrough": "Durchgestrichen",
"PE.Views.EditText.textSubscript": "Tiefgestellt",
"PE.Views.Search.textSearch": "Search",
"PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
"PE.Views.Settings.mniSlideWide": "Breitbildschirm (16:9)",
"PE.Views.Settings.textAbout": "Über",
"PE.Views.Settings.textAddress": "Adresse",
"PE.Views.Settings.textAuthor": "Autor",
"PE.Views.Settings.textBack": "Zurück",
"PE.Views.Settings.textCreateDate": "Erstellungsdatum",
"PE.Views.Settings.textDone": "Fertig",
"PE.Views.Settings.textDownload": "Herunterladen",
"PE.Views.Settings.textDownloadAs": "Herunterladen als...",
"PE.Views.Settings.textEditPresent": "Präsentation bearbeiten",
"PE.Views.Settings.textEmail": "E-Email",
"PE.Views.Settings.textFind": "Suchen",
"PE.Views.Settings.textHelp": "Hilfe",
"PE.Views.Settings.textLoading": "Ladevorgang...",
"PE.Views.Settings.textPresentInfo": "Päsentation Infos",
"PE.Views.Settings.textPresentSetup": "Präsentation-Einstellungen",
"PE.Views.Settings.textPresentTitle": "Titel der Präsentation",
"PE.Views.Settings.textSettings": "Einstellungen",
"PE.Views.Settings.textSlideSize": "Foliengröße",
"PE.Views.Settings.textTel": "Tel.",
"PE.Views.Settings.textVersion": "Version",
"PE.Views.Settings.unknownText": "Unbekannt",
"PE.Views.Toolbar.textBack": "Zurück"
}

873
apps/presentationeditor/mobile/locale/en.json Normal file → Executable file
View file

@ -1,446 +1,429 @@
{ {
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt",
"Common.Utils.Metric.txtPt": "pt", "PE.Controllers.AddContainer.textImage": "Image",
"PE.Controllers.AddContainer.textLink": "Link",
"PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "PE.Controllers.AddContainer.textShape": "Shape",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor", "PE.Controllers.AddContainer.textSlide": "Slide",
"PE.Controllers.Main.criticalErrorTitle": "Error", "PE.Controllers.AddContainer.textTable": "Table",
"PE.Controllers.Main.notcriticalErrorTitle": "Warning", "PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.Main.errorDefaultMessage": "Error code: %1", "PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.Main.criticalErrorExtText": "Press 'Ok' to to back to document list.", "PE.Controllers.AddLink.textDefault": "Selected text",
"PE.Controllers.Main.openTitleText": "Opening Document", "PE.Controllers.AddLink.textExternalLink": "External Link",
"PE.Controllers.Main.openTextText": "Opening document...", "PE.Controllers.AddLink.textFirst": "First Slide",
"PE.Controllers.Main.saveTitleText": "Saving Document", "PE.Controllers.AddLink.textInternalLink": "Slide in this Presentation",
"PE.Controllers.Main.saveTextText": "Saving document...", "PE.Controllers.AddLink.textLast": "Last Slide",
"PE.Controllers.Main.loadFontsTitleText": "Loading Data", "PE.Controllers.AddLink.textNext": "Next Slide",
"PE.Controllers.Main.loadFontsTextText": "Loading data...", "PE.Controllers.AddLink.textPrev": "Previous Slide",
"PE.Controllers.Main.loadImagesTitleText": "Loading Images", "PE.Controllers.AddLink.textSlide": "Slide",
"PE.Controllers.Main.loadImagesTextText": "Loading images...", "PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.Main.loadFontTitleText": "Loading Data", "PE.Controllers.AddTable.textCancel": "Cancel",
"PE.Controllers.Main.loadFontTextText": "Loading data...", "PE.Controllers.AddTable.textColumns": "Columns",
"PE.Controllers.Main.loadImageTitleText": "Loading Image", "PE.Controllers.AddTable.textRows": "Rows",
"PE.Controllers.Main.loadImageTextText": "Loading image...", "PE.Controllers.AddTable.textTableSize": "Table Size",
"PE.Controllers.Main.downloadTitleText": "Downloading Document", "PE.Controllers.DocumentHolder.menuAddLink": "Add Link",
"PE.Controllers.Main.downloadTextText": "Downloading document...", "PE.Controllers.DocumentHolder.menuCopy": "Copy",
"PE.Controllers.Main.printTitleText": "Printing Document", "PE.Controllers.DocumentHolder.menuCut": "Cut",
"PE.Controllers.Main.printTextText": "Printing document...", "PE.Controllers.DocumentHolder.menuDelete": "Delete",
"PE.Controllers.Main.uploadImageTitleText": "Uploading Image", "PE.Controllers.DocumentHolder.menuEdit": "Edit",
"PE.Controllers.Main.uploadImageTextText": "Uploading image...", "PE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
"PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.", "PE.Controllers.DocumentHolder.menuPaste": "Paste",
"PE.Controllers.Main.uploadImageExtMessage": "Unknown image format.", "PE.Controllers.EditContainer.textChart": "Chart",
"PE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.", "PE.Controllers.EditContainer.textHyperlink": "Hyperlink",
"PE.Controllers.Main.reloadButtonText": "Reload Page", "PE.Controllers.EditContainer.textImage": "Image",
"PE.Controllers.Main.unknownErrorText": "Unknown error.", "PE.Controllers.EditContainer.textSettings": "Settings",
"PE.Controllers.Main.convertationTimeoutText": "Convertation timeout exceeded.", "PE.Controllers.EditContainer.textShape": "Shape",
"PE.Controllers.Main.downloadErrorText": "Download failed.", "PE.Controllers.EditContainer.textSlide": "Slide",
"PE.Controllers.Main.unsupportedBrowserErrorText ": "Your browser is not supported.", "PE.Controllers.EditContainer.textTable": "Table",
"PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1", "PE.Controllers.EditContainer.textText": "Text",
"PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1", "PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.",
"PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1", "PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.Main.requestEditFailedTitleText": "Access denied", "PE.Controllers.EditLink.textDefault": "Selected text",
"PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.", "PE.Controllers.EditLink.textExternalLink": "External Link",
"PE.Controllers.Main.txtSldLtTBlank": "Blank", "PE.Controllers.EditLink.textFirst": "First Slide",
"PE.Controllers.Main.txtSldLtTChart": "Chart", "PE.Controllers.EditLink.textInternalLink": "Slide in this Presentation",
"PE.Controllers.Main.txtSldLtTChartAndTx": "Chart and Text", "PE.Controllers.EditLink.textLast": "Last Slide",
"PE.Controllers.Main.txtSldLtTClipArtAndTx": "Clip Art and Text", "PE.Controllers.EditLink.textNext": "Next Slide",
"PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Clip Art and Vertical Text", "PE.Controllers.EditLink.textPrev": "Previous Slide",
"PE.Controllers.Main.txtSldLtTCust": "Custom", "PE.Controllers.EditLink.textSlide": "Slide",
"PE.Controllers.Main.txtSldLtTDgm": "Diagram", "PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'",
"PE.Controllers.Main.txtSldLtTFourObj": "Four Objects", "PE.Controllers.EditSlide.textSec": "s",
"PE.Controllers.Main.txtSldLtTMediaAndTx": "Media and Text", "PE.Controllers.EditText.textAuto": "Auto",
"PE.Controllers.Main.txtSldLtTObj": "Title and Object", "PE.Controllers.EditText.textFonts": "Fonts",
"PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Object and Two Object", "PE.Controllers.EditText.textPt": "pt",
"PE.Controllers.Main.txtSldLtTObjAndTx": "Object and Text", "PE.Controllers.Main.advDRMEnterPassword": "Enter your password:",
"PE.Controllers.Main.txtSldLtTObjOnly": "Object", "PE.Controllers.Main.advDRMOptions": "Protected File",
"PE.Controllers.Main.txtSldLtTObjOverTx": "Object over Text", "PE.Controllers.Main.advDRMPassword": "Password",
"PE.Controllers.Main.txtSldLtTObjTx": "Title, Object, and Caption", "PE.Controllers.Main.applyChangesTextText": "Loading data...",
"PE.Controllers.Main.txtSldLtTPicTx": "Picture and Caption", "PE.Controllers.Main.applyChangesTitleText": "Loading Data",
"PE.Controllers.Main.txtSldLtTSecHead": "Section Header", "PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"PE.Controllers.Main.txtSldLtTTbl": "Table", "PE.Controllers.Main.criticalErrorExtText": "Press 'OK' to return to document list.",
"PE.Controllers.Main.txtSldLtTTitle": "Title", "PE.Controllers.Main.criticalErrorTitle": "Error",
"PE.Controllers.Main.txtSldLtTTitleOnly": "Title Only", "PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"PE.Controllers.Main.txtSldLtTTwoColTx": "Two Column Text", "PE.Controllers.Main.downloadErrorText": "Download failed.",
"PE.Controllers.Main.txtSldLtTTwoObj": "Two Objects", "PE.Controllers.Main.downloadTextText": "Downloading document...",
"PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Two Objects and Object", "PE.Controllers.Main.downloadTitleText": "Downloading Document",
"PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Two Objects and Text", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.",
"PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Two Objects over Text", "PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Two Text and Two Objects", "PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.",
"PE.Controllers.Main.txtSldLtTTx": "Text", "PE.Controllers.Main.errorDataRange": "Incorrect data range.",
"PE.Controllers.Main.txtSldLtTTxAndChart": "Text and Chart", "PE.Controllers.Main.errorDefaultMessage": "Error code: %1",
"PE.Controllers.Main.txtSldLtTTxAndClipArt": "Text and Clip Art", "PE.Controllers.Main.errorFilePassProtect": "The document is password protected.",
"PE.Controllers.Main.txtSldLtTTxAndMedia": "Text and Media", "PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
"PE.Controllers.Main.txtSldLtTTxAndObj": "Text and Object", "PE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
"PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Text and Two Objects", "PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.",
"PE.Controllers.Main.txtSldLtTTxOverObj": "Text over Object", "PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.",
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertical Title and Text", "PE.Controllers.Main.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertical Title and Text Over Chart", "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
"PE.Controllers.Main.txtSldLtTVertTx": "Vertical Text", "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.",
"PE.Controllers.Main.textLoadingDocument": "Loading presentation", "PE.Controllers.Main.errorUsersExceed": "The number of users was exceeded",
"PE.Controllers.Main.loadThemeTitleText": "Loading Theme", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.",
"PE.Controllers.Main.loadThemeTextText": "Loading theme...", "PE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"PE.Controllers.Main.txtBasicShapes": "Basic Shapes", "PE.Controllers.Main.loadFontsTextText": "Loading data...",
"PE.Controllers.Main.txtFiguredArrows": "Figured Arrows", "PE.Controllers.Main.loadFontsTitleText": "Loading Data",
"PE.Controllers.Main.txtMath": "Math", "PE.Controllers.Main.loadFontTextText": "Loading data...",
"PE.Controllers.Main.txtCharts": "Charts", "PE.Controllers.Main.loadFontTitleText": "Loading Data",
"PE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons", "PE.Controllers.Main.loadImagesTextText": "Loading images...",
"PE.Controllers.Main.txtCallouts": "Callouts", "PE.Controllers.Main.loadImagesTitleText": "Loading Images",
"PE.Controllers.Main.txtButtons": "Buttons", "PE.Controllers.Main.loadImageTextText": "Loading image...",
"PE.Controllers.Main.txtRectangles": "Rectangles", "PE.Controllers.Main.loadImageTitleText": "Loading Image",
"PE.Controllers.Main.txtLines": "Lines", "PE.Controllers.Main.loadingDocumentTextText": "Loading presentation...",
"PE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "PE.Controllers.Main.loadingDocumentTitleText": "Loading presentation",
"PE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "PE.Controllers.Main.loadThemeTextText": "Loading theme...",
"PE.Controllers.Main.errorUsersExceed": "Count of users was exceed", "PE.Controllers.Main.loadThemeTitleText": "Loading Theme",
"PE.Controllers.Main.txtEditingMode": "Set editing mode...", "PE.Controllers.Main.notcriticalErrorTitle": "Warning",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. You can't edit anymore.", "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
"PE.Controllers.Main.errorFilePassProtect": "The document is password protected.", "PE.Controllers.Main.openTextText": "Opening document...",
"PE.Controllers.Main.textAnonymous": "Anonymous", "PE.Controllers.Main.openTitleText": "Opening Document",
"PE.Controllers.Main.txtNeedSynchronize": "You have an updates", "PE.Controllers.Main.printTextText": "Printing document...",
"PE.Controllers.Main.applyChangesTitleText": "Loading Data", "PE.Controllers.Main.printTitleText": "Printing Document",
"PE.Controllers.Main.applyChangesTextText": "Loading data...", "PE.Controllers.Main.reloadButtonText": "Reload Page",
"PE.Controllers.Main.savePreparingText": "Preparing to save", "PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
"PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.requestEditFailedTitleText": "Access denied",
"PE.Controllers.Main.loadingDocumentTitleText": "Loading presentation", "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
"PE.Controllers.Main.loadingDocumentTextText": "Loading presentation...", "PE.Controllers.Main.savePreparingText": "Preparing to save",
"PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
"PE.Controllers.Main.errorProcessSaveResult": "Saving is failed.", "PE.Controllers.Main.saveTextText": "Saving document...",
"PE.Controllers.Main.textCloseTip": "\nClick to close the tip.", "PE.Controllers.Main.saveTitleText": "Saving Document",
"PE.Controllers.Main.textShape": "Shape", "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1",
"PE.Controllers.Main.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.", "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1",
"PE.Controllers.Main.errorDataRange": "Incorrect data range.", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1",
"PE.Controllers.Main.errorDatabaseConnection": "External error.<br>Database connection error. Please, contact support.", "PE.Controllers.Main.textAnonymous": "Anonymous",
"PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "PE.Controllers.Main.textBack": "Back",
"PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.textBuyNow": "Visit website",
"PE.Controllers.Main.txtDiagramTitle": "Chart Title", "PE.Controllers.Main.textCancel": "Cancel",
"PE.Controllers.Main.txtXAxis": "X Axis", "PE.Controllers.Main.textClose": "Close",
"PE.Controllers.Main.txtYAxis": "Y Axis", "PE.Controllers.Main.textCloseTip": "Tap to close the tip.",
"PE.Controllers.Main.txtSeries": "Seria", "PE.Controllers.Main.textContactUs": "Contact sales",
"PE.Controllers.Main.txtArt": "Your text here", "PE.Controllers.Main.textDone": "Done",
"PE.Controllers.Main.errorConnectToServer": " The document could not be saved. Please check connection settings or contact your administrator.<br>When you click the 'OK' button, you will be prompted to download the document.<br><br>Find more information about connecting Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>", "PE.Controllers.Main.textLoadingDocument": "Loading presentation",
"PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
"PE.Controllers.Main.textBuyNow": "Visit website", "PE.Controllers.Main.textOK": "OK",
"PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", "PE.Controllers.Main.textPassword": "Password",
"PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.textPreloader": "Loading... ",
"PE.Controllers.Main.textContactUs": "Contact sales", "PE.Controllers.Main.textShape": "Shape",
"PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download or print until the connection is restored.", "PE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.",
"PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.", "PE.Controllers.Main.textUsername": "Username",
"PE.Controllers.Main.titleLicenseExp": "License expired", "PE.Controllers.Main.titleLicenseExp": "License expired",
"PE.Controllers.Main.openErrorText": "An error has occurred while opening the file", "PE.Controllers.Main.titleServerVersion": "Editor updated",
"PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", "PE.Controllers.Main.txtArt": "Your text here",
"PE.Controllers.Main.advDRMOptions": "Protected File", "PE.Controllers.Main.txtBasicShapes": "Basic Shapes",
"PE.Controllers.Main.advDRMEnterPassword": "You password please:", "PE.Controllers.Main.txtButtons": "Buttons",
"PE.Controllers.Main.advDRMPassword": "Password", "PE.Controllers.Main.txtCallouts": "Callouts",
"PE.Controllers.Main.textOK": "OK", "PE.Controllers.Main.txtCharts": "Charts",
"PE.Controllers.Main.textCancel": "Cancel", "PE.Controllers.Main.txtDiagramTitle": "Chart Title",
"PE.Controllers.Main.textPreloader": "Loading... ", "PE.Controllers.Main.txtEditingMode": "Set editing mode...",
"PE.Controllers.Main.textUsername": "Username", "PE.Controllers.Main.txtFiguredArrows": "Figured Arrows",
"PE.Controllers.Main.textPassword": "Password", "PE.Controllers.Main.txtLines": "Lines",
"PE.Controllers.Main.textBack": "Back", "PE.Controllers.Main.txtMath": "Math",
"PE.Controllers.Main.textClose": "Close", "PE.Controllers.Main.txtNeedSynchronize": "You have updates",
"PE.Controllers.Main.textDone": "Done", "PE.Controllers.Main.txtRectangles": "Rectangles",
"PE.Controllers.Main.titleServerVersion": "Editor updated", "PE.Controllers.Main.txtSeries": "Series",
"PE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", "PE.Controllers.Main.txtSldLtTBlank": "Blank",
"PE.Controllers.Main.txtSldLtTChart": "Chart",
"PE.Controllers.DocumentHolder.menuCut": "Cut", "PE.Controllers.Main.txtSldLtTChartAndTx": "Chart and Text",
"PE.Controllers.DocumentHolder.menuCopy": "Copy", "PE.Controllers.Main.txtSldLtTClipArtAndTx": "Clip Art and Text",
"PE.Controllers.DocumentHolder.menuPaste": "Paste", "PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Clip Art and Vertical Text",
"PE.Controllers.DocumentHolder.menuEdit": "Edit", "PE.Controllers.Main.txtSldLtTCust": "Custom",
"PE.Controllers.DocumentHolder.menuDelete": "Delete", "PE.Controllers.Main.txtSldLtTDgm": "Diagram",
"PE.Controllers.DocumentHolder.menuAddLink": "Add Link", "PE.Controllers.Main.txtSldLtTFourObj": "Four Objects",
"PE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "PE.Controllers.Main.txtSldLtTMediaAndTx": "Media and Text",
"PE.Controllers.Main.txtSldLtTObj": "Title and Object",
"PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Object and Two Objects",
"PE.Controllers.Main.txtSldLtTObjAndTx": "Object and Text",
"PE.Controllers.Settings.txtLoading": "Loading...", "PE.Controllers.Main.txtSldLtTObjOnly": "Object",
"PE.Controllers.Settings.notcriticalErrorTitle": "Warning", "PE.Controllers.Main.txtSldLtTObjOverTx": "Object over Text",
"PE.Views.Settings.unknownText": "Unknown", "PE.Controllers.Main.txtSldLtTObjTx": "Title, Object, and Caption",
"PE.Views.Settings.textSettings": "Settings", "PE.Controllers.Main.txtSldLtTPicTx": "Picture and Caption",
"PE.Views.Settings.textDone": "Done", "PE.Controllers.Main.txtSldLtTSecHead": "Section Header",
"PE.Views.Settings.textFind": "Find", "PE.Controllers.Main.txtSldLtTTbl": "Table",
"PE.Views.Settings.textEditPresent": "Edit Presentation", "PE.Controllers.Main.txtSldLtTTitle": "Title",
"PE.Views.Settings.textPresentSetup": "Presentation Setup", "PE.Controllers.Main.txtSldLtTTitleOnly": "Title Only",
"PE.Views.Settings.textDownload": "Download", "PE.Controllers.Main.txtSldLtTTwoColTx": "Two Column Text",
"PE.Views.Settings.textPresentInfo": "Presentation Info", "PE.Controllers.Main.txtSldLtTTwoObj": "Two Objects",
"PE.Views.Settings.textHelp": "Help", "PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Two Objects and Object",
"PE.Views.Settings.textAbout": "About", "PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Two Objects and Text",
"PE.Views.Settings.textBack": "Back", "PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Two Objects over Text",
"PE.Views.Settings.textPresentTitle": "Presentation title", "PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Two Text and Two Objects",
"PE.Views.Settings.textLoading": "Loading...", "PE.Controllers.Main.txtSldLtTTx": "Text",
"PE.Views.Settings.textAuthor": "Author", "PE.Controllers.Main.txtSldLtTTxAndChart": "Text and Chart",
"PE.Views.Settings.textCreateDate": "Create date", "PE.Controllers.Main.txtSldLtTTxAndClipArt": "Text and Clip Art",
"PE.Views.Settings.textDownloadAs": "Download As...", "PE.Controllers.Main.txtSldLtTTxAndMedia": "Text and Media",
"PE.Views.Settings.textVersion": "Version", "PE.Controllers.Main.txtSldLtTTxAndObj": "Text and Object",
"PE.Views.Settings.textAddress": "address", "PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Text and Two Objects",
"PE.Views.Settings.textEmail": "email", "PE.Controllers.Main.txtSldLtTTxOverObj": "Text over Object",
"PE.Views.Settings.textTel": "tel", "PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Vertical Title and Text",
"PE.Views.Settings.textSlideSize": "Slide Size", "PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Vertical Title and Text Over Chart",
"PE.Views.Settings.mniSlideStandard": "Standard (4:3)", "PE.Controllers.Main.txtSldLtTVertTx": "Vertical Text",
"PE.Views.Settings.mniSlideWide": "Widescreen (16:9)", "PE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons",
"PE.Controllers.Main.txtXAxis": "X Axis",
"PE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application", "PE.Controllers.Main.txtYAxis": "Y Axis",
"PE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "PE.Controllers.Main.unknownErrorText": "Unknown error.",
"PE.Controllers.Toolbar.leaveButtonText": "Leave this Page", "PE.Controllers.Main.unsupportedBrowserErrorText ": "Your browser is not supported.",
"PE.Controllers.Toolbar.stayButtonText": "Stay on this Page", "PE.Controllers.Main.uploadImageExtMessage": "Unknown image format.",
"PE.Views.Toolbar.textBack": "Back", "PE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.",
"PE.Controllers.Main.uploadImageSizeMessage": "Maximium image size limit exceeded.",
"PE.Controllers.AddContainer.textTable": "Table", "PE.Controllers.Main.uploadImageTextText": "Uploading image...",
"PE.Controllers.AddContainer.textShape": "Shape", "PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
"PE.Controllers.AddContainer.textSlide": "Slide", "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
"PE.Controllers.AddContainer.textImage": "Image", "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
"PE.Controllers.AddContainer.textLink": "Link", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PE.Controllers.Search.textNoTextFound": "Text not Found",
"PE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning",
"PE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "PE.Controllers.Settings.txtLoading": "Loading...",
"PE.Views.AddImage.textFromLibrary": "Picture from Library", "PE.Controllers.Toolbar.dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"PE.Views.AddImage.textFromURL": "Picture from URL", "PE.Controllers.Toolbar.dlgLeaveTitleText": "You leave the application",
"PE.Views.AddImage.textBack": "Back", "PE.Controllers.Toolbar.leaveButtonText": "Leave this Page",
"PE.Views.AddImage.textLinkSettings": "Link Settings", "PE.Controllers.Toolbar.stayButtonText": "Stay on this Page",
"PE.Views.AddImage.textAddress": "Address", "PE.Views.AddImage.textAddress": "Address",
"PE.Views.AddImage.textImageURL": "Image URL", "PE.Views.AddImage.textBack": "Back",
"PE.Views.AddImage.textInsertImage": "Insert Image", "PE.Views.AddImage.textFromLibrary": "Picture from Library",
"PE.Views.AddImage.textFromURL": "Picture from URL",
"PE.Controllers.AddLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "PE.Views.AddImage.textImageURL": "Image URL",
"PE.Controllers.AddLink.textDefault": "Selected text", "PE.Views.AddImage.textInsertImage": "Insert Image",
"PE.Controllers.AddLink.textNext": "Next Slide", "PE.Views.AddImage.textLinkSettings": "Link Settings",
"PE.Controllers.AddLink.textPrev": "Previous Slide", "PE.Views.AddLink.textBack": "Back",
"PE.Controllers.AddLink.textFirst": "First Slide", "PE.Views.AddLink.textDisplay": "Display",
"PE.Controllers.AddLink.textLast": "Last Slide", "PE.Views.AddLink.textExternalLink": "External Link",
"PE.Controllers.AddLink.textSlide": "Slide", "PE.Views.AddLink.textFirst": "First Slide",
"PE.Controllers.AddLink.textExternalLink": "External Link", "PE.Views.AddLink.textInsert": "Insert",
"PE.Controllers.AddLink.textInternalLink": "Slide in this Presentation", "PE.Views.AddLink.textInternalLink": "Slide in this Presentation",
"PE.Views.AddLink.textLinkType": "Link Type", "PE.Views.AddLink.textLast": "Last Slide",
"PE.Views.AddLink.textExternalLink": "External Link", "PE.Views.AddLink.textLink": "Link",
"PE.Views.AddLink.textInternalLink": "Slide in this Presentation", "PE.Views.AddLink.textLinkSlide": "Link to",
"PE.Views.AddLink.textLink": "Link", "PE.Views.AddLink.textLinkType": "Link Type",
"PE.Views.AddLink.textLinkSlide": "Link to", "PE.Views.AddLink.textNext": "Next Slide",
"PE.Views.AddLink.textBack": "Back", "PE.Views.AddLink.textNumber": "Slide Number",
"PE.Views.AddLink.textDisplay": "Display", "PE.Views.AddLink.textPrev": "Previous Slide",
"PE.Views.AddLink.textTip": "Screen Tip", "PE.Views.AddLink.textTip": "Screen Tip",
"PE.Views.AddLink.textInsert": "Insert", "PE.Views.EditChart.textAlign": "Align",
"PE.Views.AddLink.textNext": "Next Slide", "PE.Views.EditChart.textAlignBottom": "Align Bottom",
"PE.Views.AddLink.textPrev": "Previous Slide", "PE.Views.EditChart.textAlignCenter": "Align Center",
"PE.Views.AddLink.textFirst": "First Slide", "PE.Views.EditChart.textAlignLeft": "Align Left",
"PE.Views.AddLink.textLast": "Last Slide", "PE.Views.EditChart.textAlignMiddle": "Align Middle",
"PE.Views.AddLink.textNumber": "Slide Number", "PE.Views.EditChart.textAlignRight": "Align Right",
"PE.Views.EditChart.textAlignTop": "Align Top",
"PE.Controllers.AddTable.textTableSize": "Table Size", "PE.Views.EditChart.textBack": "Back",
"PE.Controllers.AddTable.textColumns": "Columns", "PE.Views.EditChart.textBackward": "Move Backward",
"PE.Controllers.AddTable.textRows": "Rows", "PE.Views.EditChart.textBorder": "Border",
"PE.Controllers.AddTable.textCancel": "Cancel", "PE.Views.EditChart.textColor": "Color",
"PE.Views.EditChart.textFill": "Fill",
"PE.Views.EditChart.textStyle": "Style", "PE.Views.EditChart.textForward": "Move Forward",
"PE.Views.EditChart.textReorder": "Reorder", "PE.Views.EditChart.textRemoveChart": "Remove Chart",
"PE.Views.EditChart.textRemoveChart": "Remove Chart", "PE.Views.EditChart.textReorder": "Reorder",
"PE.Views.EditChart.textBack": "Back", "PE.Views.EditChart.textSize": "Size",
"PE.Views.EditChart.textToForeground": "Bring to Foreground", "PE.Views.EditChart.textStyle": "Style",
"PE.Views.EditChart.textToBackground": "Send to Background", "PE.Views.EditChart.textToBackground": "Send to Background",
"PE.Views.EditChart.textForward": "Move Forward", "PE.Views.EditChart.textToForeground": "Bring to Foreground",
"PE.Views.EditChart.textBackward": "Move Backward", "PE.Views.EditChart.textType": "Type",
"PE.Views.EditChart.textType": "Type", "PE.Views.EditChart.txtDistribHor": "Distribute Horizontally",
"PE.Views.EditChart.textFill": "Fill", "PE.Views.EditChart.txtDistribVert": "Distribute Vertically",
"PE.Views.EditChart.textBorder": "Border", "PE.Views.EditImage.textAddress": "Address",
"PE.Views.EditChart.textSize": "Size", "PE.Views.EditImage.textAlign": "Align",
"PE.Views.EditChart.textColor": "Color", "PE.Views.EditImage.textAlignBottom": "Align Bottom",
"PE.Views.EditChart.textAlign": "Align", "PE.Views.EditImage.textAlignCenter": "Align Center",
"PE.Views.EditChart.textAlignLeft": "Align Left", "PE.Views.EditImage.textAlignLeft": "Align Left",
"PE.Views.EditChart.textAlignRight": "Align Right", "PE.Views.EditImage.textAlignMiddle": "Align Middle",
"PE.Views.EditChart.textAlignCenter": "Align Center", "PE.Views.EditImage.textAlignRight": "Align Right",
"PE.Views.EditChart.textAlignTop": "Align Top", "PE.Views.EditImage.textAlignTop": "Align Top",
"PE.Views.EditChart.textAlignBottom": "Align Bottom", "PE.Views.EditImage.textBack": "Back",
"PE.Views.EditChart.textAlignMiddle": "Align Middle", "PE.Views.EditImage.textBackward": "Move Backward",
"PE.Views.EditChart.txtDistribHor": "Distribute Horizontally", "PE.Views.EditImage.textDefault": "Default Size",
"PE.Views.EditChart.txtDistribVert": "Distribute Vertically", "PE.Views.EditImage.textForward": "Move Forward",
"PE.Views.EditImage.textFromLibrary": "Picture from Library",
"PE.Controllers.EditContainer.textSettings": "Settings", "PE.Views.EditImage.textFromURL": "Picture from URL",
"PE.Controllers.EditContainer.textText": "Text", "PE.Views.EditImage.textImageURL": "Image URL",
"PE.Controllers.EditContainer.textSlide": "Slide", "PE.Views.EditImage.textLinkSettings": "Link Settings",
"PE.Controllers.EditContainer.textTable": "Table", "PE.Views.EditImage.textRemove": "Remove Image",
"PE.Controllers.EditContainer.textShape": "Shape", "PE.Views.EditImage.textReorder": "Reorder",
"PE.Controllers.EditContainer.textImage": "Image", "PE.Views.EditImage.textReplace": "Replace",
"PE.Controllers.EditContainer.textChart": "Chart", "PE.Views.EditImage.textReplaceImg": "Replace Image",
"PE.Controllers.EditContainer.textHyperlink": "Hyperlink", "PE.Views.EditImage.textToBackground": "Send to Background",
"PE.Views.EditImage.textToForeground": "Bring to Foreground",
"PE.Controllers.EditImage.textEmptyImgUrl": "You need to specify image URL.", "PE.Views.EditImage.txtDistribHor": "Distribute Horizontally",
"PE.Controllers.EditImage.txtNotUrl": "This field should be a URL in the format 'http://www.example.com", "PE.Views.EditImage.txtDistribVert": "Distribute Vertically",
"PE.Views.EditImage.textReplace": "Replace", "PE.Views.EditLink.textBack": "Back",
"PE.Views.EditImage.textReorder": "Reorder", "PE.Views.EditLink.textDisplay": "Display",
"PE.Views.EditImage.textDefault": "Default Size", "PE.Views.EditLink.textEdit": "Edit Link",
"PE.Views.EditImage.textRemove": "Remove Image", "PE.Views.EditLink.textExternalLink": "External Link",
"PE.Views.EditImage.textBack": "Back", "PE.Views.EditLink.textFirst": "First Slide",
"PE.Views.EditImage.textToForeground": "Bring to Foreground", "PE.Views.EditLink.textInternalLink": "Slide in this Presentation",
"PE.Views.EditImage.textToBackground": "Send to Background", "PE.Views.EditLink.textLast": "Last Slide",
"PE.Views.EditImage.textForward": "Move Forward", "PE.Views.EditLink.textLink": "Link",
"PE.Views.EditImage.textBackward": "Move Backward", "PE.Views.EditLink.textLinkSlide": "Link to",
"PE.Views.EditImage.textFromLibrary": "Picture from Library", "PE.Views.EditLink.textLinkType": "Link Type",
"PE.Views.EditImage.textFromURL": "Picture from URL", "PE.Views.EditLink.textNext": "Next Slide",
"PE.Views.EditImage.textLinkSettings": "Link Settings", "PE.Views.EditLink.textNumber": "Slide Number",
"PE.Views.EditImage.textAddress": "Address", "PE.Views.EditLink.textPrev": "Previous Slide",
"PE.Views.EditImage.textImageURL": "Image URL", "PE.Views.EditLink.textRemove": "Remove Link",
"PE.Views.EditImage.textReplaceImg": "Replace Image", "PE.Views.EditLink.textTip": "Screen Tip",
"PE.Views.EditImage.textAlign": "Align", "PE.Views.EditShape.textAlign": "Align",
"PE.Views.EditImage.textAlignLeft": "Align Left", "PE.Views.EditShape.textAlignBottom": "Align Bottom",
"PE.Views.EditImage.textAlignRight": "Align Right", "PE.Views.EditShape.textAlignCenter": "Align Center",
"PE.Views.EditImage.textAlignCenter": "Align Center", "PE.Views.EditShape.textAlignLeft": "Align Left",
"PE.Views.EditImage.textAlignTop": "Align Top", "PE.Views.EditShape.textAlignMiddle": "Align Middle",
"PE.Views.EditImage.textAlignBottom": "Align Bottom", "PE.Views.EditShape.textAlignRight": "Align Right",
"PE.Views.EditImage.textAlignMiddle": "Align Middle", "PE.Views.EditShape.textAlignTop": "Align Top",
"PE.Views.EditImage.txtDistribHor": "Distribute Horizontally", "PE.Views.EditShape.textBack": "Back",
"PE.Views.EditImage.txtDistribVert": "Distribute Vertically", "PE.Views.EditShape.textBackward": "Move Backward",
"PE.Views.EditShape.textBorder": "Border",
"PE.Controllers.EditLink.txtNotUrl": "This field should be a URL in the format 'http://www.example.com'", "PE.Views.EditShape.textColor": "Color",
"PE.Controllers.EditLink.textDefault": "Selected text", "PE.Views.EditShape.textEffects": "Effects",
"PE.Controllers.EditLink.textNext": "Next Slide", "PE.Views.EditShape.textFill": "Fill",
"PE.Controllers.EditLink.textPrev": "Previous Slide", "PE.Views.EditShape.textForward": "Move Forward",
"PE.Controllers.EditLink.textFirst": "First Slide", "PE.Views.EditShape.textOpacity": "Opacity",
"PE.Controllers.EditLink.textLast": "Last Slide", "PE.Views.EditShape.textRemoveShape": "Remove Shape",
"PE.Controllers.EditLink.textSlide": "Slide", "PE.Views.EditShape.textReorder": "Reorder",
"PE.Controllers.EditLink.textExternalLink": "External Link", "PE.Views.EditShape.textReplace": "Replace",
"PE.Controllers.EditLink.textInternalLink": "Slide in this Presentation", "PE.Views.EditShape.textSize": "Size",
"PE.Views.EditLink.textLinkType": "Link Type", "PE.Views.EditShape.textStyle": "Style",
"PE.Views.EditLink.textExternalLink": "External Link", "PE.Views.EditShape.textToBackground": "Send to Background",
"PE.Views.EditLink.textInternalLink": "Slide in this Presentation", "PE.Views.EditShape.textToForeground": "Bring to Foreground",
"PE.Views.EditLink.textLink": "Link", "PE.Views.EditShape.txtDistribHor": "Distribute Horizontally",
"PE.Views.EditLink.textLinkSlide": "Link to", "PE.Views.EditShape.txtDistribVert": "Distribute Vertically",
"PE.Views.EditLink.textBack": "Back", "PE.Views.EditSlide.textApplyAll": "Apply to All Slides",
"PE.Views.EditLink.textDisplay": "Display", "PE.Views.EditSlide.textBack": "Back",
"PE.Views.EditLink.textTip": "Screen Tip", "PE.Views.EditSlide.textBlack": "Through Black",
"PE.Views.EditLink.textNext": "Next Slide", "PE.Views.EditSlide.textBottom": "Bottom",
"PE.Views.EditLink.textPrev": "Previous Slide", "PE.Views.EditSlide.textBottomLeft": "Bottom-Left",
"PE.Views.EditLink.textFirst": "First Slide", "PE.Views.EditSlide.textBottomRight": "Bottom-Right",
"PE.Views.EditLink.textLast": "Last Slide", "PE.Views.EditSlide.textClock": "Clock",
"PE.Views.EditLink.textNumber": "Slide Number", "PE.Views.EditSlide.textClockwise": "Clockwise",
"PE.Views.EditLink.textEdit": "Edit Link", "PE.Views.EditSlide.textColor": "Color",
"PE.Views.EditLink.textRemove": "Remove Link", "PE.Views.EditSlide.textCounterclockwise": "Counterclockwise",
"PE.Views.EditSlide.textCover": "Cover",
"PE.Views.EditShape.textStyle": "Style", "PE.Views.EditSlide.textDelay": "Delay",
"PE.Views.EditShape.textReplace": "Replace", "PE.Views.EditSlide.textDuplicateSlide": "Duplicate Slide",
"PE.Views.EditShape.textReorder": "Reorder", "PE.Views.EditSlide.textDuration": "Duration",
"PE.Views.EditShape.textRemoveShape": "Remove Shape", "PE.Views.EditSlide.textEffect": "Effect",
"PE.Views.EditShape.textBack": "Back", "PE.Views.EditSlide.textFade": "Fade",
"PE.Views.EditShape.textToForeground": "Bring to Foreground", "PE.Views.EditSlide.textFill": "Fill",
"PE.Views.EditShape.textToBackground": "Send to Background", "PE.Views.EditSlide.textHorizontalIn": "Horizontal In",
"PE.Views.EditShape.textForward": "Move Forward", "PE.Views.EditSlide.textHorizontalOut": "Horizontal Out",
"PE.Views.EditShape.textBackward": "Move Backward", "PE.Views.EditSlide.textLayout": "Layout",
"PE.Views.EditShape.textFill": "Fill", "PE.Views.EditSlide.textLeft": "Left",
"PE.Views.EditShape.textBorder": "Border", "PE.Views.EditSlide.textNone": "None",
"PE.Views.EditShape.textEffects": "Effects", "PE.Views.EditSlide.textOpacity": "Opacity",
"PE.Views.EditShape.textSize": "Size", "PE.Views.EditSlide.textPush": "Push",
"PE.Views.EditShape.textColor": "Color", "PE.Views.EditSlide.textRemoveSlide": "Delete Slide",
"PE.Views.EditShape.textOpacity": "Opacity", "PE.Views.EditSlide.textRight": "Right",
"PE.Views.EditShape.textAlign": "Align", "PE.Views.EditSlide.textSmoothly": "Smoothly",
"PE.Views.EditShape.textAlignLeft": "Align Left", "PE.Views.EditSlide.textSplit": "Split",
"PE.Views.EditShape.textAlignRight": "Align Right", "PE.Views.EditSlide.textStartOnClick": "Start On Click",
"PE.Views.EditShape.textAlignCenter": "Align Center", "PE.Views.EditSlide.textStyle": "Style",
"PE.Views.EditShape.textAlignTop": "Align Top", "PE.Views.EditSlide.textTheme": "Theme",
"PE.Views.EditShape.textAlignBottom": "Align Bottom", "PE.Views.EditSlide.textTop": "Top",
"PE.Views.EditShape.textAlignMiddle": "Align Middle", "PE.Views.EditSlide.textTopLeft": "Top-Left",
"PE.Views.EditShape.txtDistribHor": "Distribute Horizontally", "PE.Views.EditSlide.textTopRight": "Top-Right",
"PE.Views.EditShape.txtDistribVert": "Distribute Vertically", "PE.Views.EditSlide.textTransition": "Transition",
"PE.Views.EditSlide.textType": "Type",
"PE.Controllers.EditSlide.textSec": "s", "PE.Views.EditSlide.textUnCover": "UnCover",
"PE.Views.EditSlide.textTheme": "Theme", "PE.Views.EditSlide.textVerticalIn": "Vertical In",
"PE.Views.EditSlide.textStyle": "Style", "PE.Views.EditSlide.textVerticalOut": "Vertical Out",
"PE.Views.EditSlide.textLayout": "Layout", "PE.Views.EditSlide.textWedge": "Wedge",
"PE.Views.EditSlide.textTransition": "Transition", "PE.Views.EditSlide.textWipe": "Wipe",
"PE.Views.EditSlide.textRemoveSlide": "Delete Slide", "PE.Views.EditSlide.textZoom": "Zoom",
"PE.Views.EditSlide.textDuplicateSlide": "Duplicate Slide", "PE.Views.EditSlide.textZoomIn": "Zoom In",
"PE.Views.EditSlide.textBack": "Back", "PE.Views.EditSlide.textZoomOut": "Zoom Out",
"PE.Views.EditSlide.textFill": "Fill", "PE.Views.EditSlide.textZoomRotate": "Zoom and Rotate",
"PE.Views.EditSlide.textEffect": "Effect", "PE.Views.EditTable.textAlign": "Align",
"PE.Views.EditSlide.textType": "Type", "PE.Views.EditTable.textAlignBottom": "Align Bottom",
"PE.Views.EditSlide.textDuration": "Duration", "PE.Views.EditTable.textAlignCenter": "Align Center",
"PE.Views.EditSlide.textColor": "Color", "PE.Views.EditTable.textAlignLeft": "Align Left",
"PE.Views.EditSlide.textOpacity": "Opacity", "PE.Views.EditTable.textAlignMiddle": "Align Middle",
"PE.Views.EditSlide.textNone": "None", "PE.Views.EditTable.textAlignRight": "Align Right",
"PE.Views.EditSlide.textFade": "Fade", "PE.Views.EditTable.textAlignTop": "Align Top",
"PE.Views.EditSlide.textPush": "Push", "PE.Views.EditTable.textBack": "Back",
"PE.Views.EditSlide.textWipe": "Wipe", "PE.Views.EditTable.textBackward": "Move Backward",
"PE.Views.EditSlide.textSplit": "Split", "PE.Views.EditTable.textBandedColumn": "Banded Column",
"PE.Views.EditSlide.textUnCover": "UnCover", "PE.Views.EditTable.textBandedRow": "Banded Row",
"PE.Views.EditSlide.textCover": "Cover", "PE.Views.EditTable.textBorder": "Border",
"PE.Views.EditSlide.textClock": "Clock", "PE.Views.EditTable.textCellMargins": "Cell Margins",
"PE.Views.EditSlide.textZoom": "Zoom", "PE.Views.EditTable.textColor": "Color",
"PE.Views.EditSlide.textSmoothly": "Smoothly", "PE.Views.EditTable.textFill": "Fill",
"PE.Views.EditSlide.textBlack": "Through Black", "PE.Views.EditTable.textFirstColumn": "First Column",
"PE.Views.EditSlide.textLeft": "Left", "PE.Views.EditTable.textForward": "Move Forward",
"PE.Views.EditSlide.textTop": "Top", "PE.Views.EditTable.textHeaderRow": "Header Row",
"PE.Views.EditSlide.textRight": "Right", "PE.Views.EditTable.textLastColumn": "Last Column",
"PE.Views.EditSlide.textBottom": "Bottom", "PE.Views.EditTable.textOptions": "Options",
"PE.Views.EditSlide.textTopLeft": "Top-Left", "PE.Views.EditTable.textRemoveTable": "Remove Table",
"PE.Views.EditSlide.textTopRight": "Top-Right", "PE.Views.EditTable.textReorder": "Reorder",
"PE.Views.EditSlide.textBottomLeft": "Bottom-Left", "PE.Views.EditTable.textSize": "Size",
"PE.Views.EditSlide.textBottomRight": "Bottom-Right", "PE.Views.EditTable.textStyle": "Style",
"PE.Views.EditSlide.textVerticalIn": "Vertical In", "PE.Views.EditTable.textStyleOptions": "Style Options",
"PE.Views.EditSlide.textVerticalOut": "Vertical Out", "PE.Views.EditTable.textTableOptions": "Table Options",
"PE.Views.EditSlide.textHorizontalIn": "Horizontal In", "PE.Views.EditTable.textToBackground": "Send to Background",
"PE.Views.EditSlide.textHorizontalOut": "Horizontal Out", "PE.Views.EditTable.textToForeground": "Bring to Foreground",
"PE.Views.EditSlide.textClockwise": "Clockwise", "PE.Views.EditTable.textTotalRow": "Total Row",
"PE.Views.EditSlide.textCounterclockwise": "Counterclockwise", "PE.Views.EditTable.txtDistribHor": "Distribute Horizontally",
"PE.Views.EditSlide.textWedge": "Wedge", "PE.Views.EditTable.txtDistribVert": "Distribute Vertically",
"PE.Views.EditSlide.textZoomIn": "Zoom In", "PE.Views.EditText.textAdditional": "Additional",
"PE.Views.EditSlide.textZoomOut": "Zoom Out", "PE.Views.EditText.textAdditionalFormat": "Additional Formatting",
"PE.Views.EditSlide.textZoomRotate": "Zoom and Rotate", "PE.Views.EditText.textAfter": "After",
"PE.Views.EditSlide.textStartOnClick": "Start On Click", "PE.Views.EditText.textAllCaps": "All Caps",
"PE.Views.EditSlide.textDelay": "Delay", "PE.Views.EditText.textAutomatic": "Automatic",
"PE.Views.EditSlide.textApplyAll": "Apply to All Slides", "PE.Views.EditText.textBack": "Back",
"PE.Views.EditText.textBefore": "Before",
"PE.Views.EditTable.textRemoveTable": "Remove Table", "PE.Views.EditText.textBullets": "Bullets",
"PE.Views.EditTable.textTableOptions": "Table Options", "PE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
"PE.Views.EditTable.textStyle": "Style", "PE.Views.EditText.textDblSuperscript": "Superscript",
"PE.Views.EditTable.textBack": "Back", "PE.Views.EditText.textFontColor": "Font Color",
"PE.Views.EditTable.textOptions": "Options", "PE.Views.EditText.textFontColors": "Font Colors",
"PE.Views.EditTable.textCellMargins": "Cell Margins", "PE.Views.EditText.textFonts": "Fonts",
"PE.Views.EditTable.textFill": "Fill", "PE.Views.EditText.textFromText": "Distance from Text",
"PE.Views.EditTable.textBorder": "Border", "PE.Views.EditText.textLetterSpacing": "Letter Spacing",
"PE.Views.EditTable.textStyleOptions": "Style Options", "PE.Views.EditText.textLineSpacing": "Line Spacing",
"PE.Views.EditTable.textSize": "Size", "PE.Views.EditText.textNone": "None",
"PE.Views.EditTable.textColor": "Color", "PE.Views.EditText.textNumbers": "Numbers",
"PE.Views.EditTable.textHeaderRow": "Header Row", "PE.Views.EditText.textSize": "Size",
"PE.Views.EditTable.textTotalRow": "Total Row", "PE.Views.EditText.textSmallCaps": "Small Caps",
"PE.Views.EditTable.textBandedRow": "Banded Row", "PE.Views.EditText.textStrikethrough": "Strikethrough",
"PE.Views.EditTable.textFirstColumn": "First Column", "PE.Views.EditText.textSubscript": "Subscript",
"PE.Views.EditTable.textLastColumn": "Last Column", "PE.Views.Search.textSearch": "Search",
"PE.Views.EditTable.textBandedColumn": "Banded Column", "PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
"PE.Views.EditTable.textReorder": "Reorder", "PE.Views.Settings.mniSlideWide": "Widescreen (16:9)",
"PE.Views.EditTable.textToForeground": "Bring to Foreground", "PE.Views.Settings.textAbout": "About",
"PE.Views.EditTable.textToBackground": "Send to Background", "PE.Views.Settings.textAddress": "address",
"PE.Views.EditTable.textForward": "Move Forward", "PE.Views.Settings.textAuthor": "Author",
"PE.Views.EditTable.textBackward": "Move Backward", "PE.Views.Settings.textBack": "Back",
"PE.Views.EditTable.textAlign": "Align", "PE.Views.Settings.textCreateDate": "Creation date",
"PE.Views.EditTable.textAlignLeft": "Align Left", "PE.Views.Settings.textDone": "Done",
"PE.Views.EditTable.textAlignRight": "Align Right", "PE.Views.Settings.textDownload": "Download",
"PE.Views.EditTable.textAlignCenter": "Align Center", "PE.Views.Settings.textDownloadAs": "Download As...",
"PE.Views.EditTable.textAlignTop": "Align Top", "PE.Views.Settings.textEditPresent": "Edit Presentation",
"PE.Views.EditTable.textAlignBottom": "Align Bottom", "PE.Views.Settings.textEmail": "email",
"PE.Views.EditTable.textAlignMiddle": "Align Middle", "PE.Views.Settings.textFind": "Find",
"PE.Views.EditTable.txtDistribHor": "Distribute Horizontally", "PE.Views.Settings.textHelp": "Help",
"PE.Views.EditTable.txtDistribVert": "Distribute Vertically", "PE.Views.Settings.textLoading": "Loading...",
"PE.Views.Settings.textPresentInfo": "Presentation Info",
"PE.Controllers.EditText.textFonts": "Fonts", "PE.Views.Settings.textPresentSetup": "Presentation Setup",
"PE.Controllers.EditText.textAuto": "Auto", "PE.Views.Settings.textPresentTitle": "Presentation title",
"PE.Controllers.EditText.textPt": "pt", "PE.Views.Settings.textSettings": "Settings",
"PE.Views.EditText.textFonts": "Fonts", "PE.Views.Settings.textSlideSize": "Slide Size",
"PE.Views.EditText.textFontColor": "Font Color", "PE.Views.Settings.textTel": "tel",
"PE.Views.EditText.textAdditionalFormat": "Additional Formatting", "PE.Views.Settings.textVersion": "Version",
"PE.Views.EditText.textBack": "Back", "PE.Views.Settings.unknownText": "Unknown",
"PE.Views.EditText.textSize": "Size", "PE.Views.Toolbar.textBack": "Back"
"PE.Views.EditText.textFontColors": "Font Colors",
"PE.Views.EditText.textAutomatic": "Automatic",
"PE.Views.EditText.textAdditional": "Additional",
"PE.Views.EditText.textStrikethrough": "Strikethrough",
"PE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
"PE.Views.EditText.textDblSuperscript": "Superscript",
"PE.Views.EditText.textSubscript": "Subscript",
"PE.Views.EditText.textSmallCaps": "Small Caps",
"PE.Views.EditText.textAllCaps": "All Caps",
"PE.Views.EditText.textLetterSpacing": "Letter Spacing",
"PE.Views.EditText.textFromText": "Distance from Text",
"PE.Views.EditText.textBefore": "Before",
"PE.Views.EditText.textAfter": "After",
"PE.Views.EditText.textLineSpacing": "Line Spacing",
"PE.Views.EditText.textBullets": "Bullets",
"PE.Views.EditText.textNone": "None",
"PE.Views.EditText.textNumbers": "Numbers"
} }

View file

@ -0,0 +1,429 @@
{
"Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
"Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
"Common.Utils.Metric.txtCm": "cm",
"Common.Utils.Metric.txtPt": "pt",
"PE.Controllers.AddContainer.textImage": "Image",
"PE.Controllers.AddContainer.textLink": "Lien",
"PE.Controllers.AddContainer.textShape": "Forme",
"PE.Controllers.AddContainer.textSlide": "Diapositive",
"PE.Controllers.AddContainer.textTable": "Tableau",
"PE.Controllers.AddImage.textEmptyImgUrl": "Spécifiez l'URL de l'image",
"PE.Controllers.AddImage.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
"PE.Controllers.AddLink.textDefault": "Texte sélectionné",
"PE.Controllers.AddLink.textExternalLink": "Lien externe",
"PE.Controllers.AddLink.textFirst": "Première diapositive",
"PE.Controllers.AddLink.textInternalLink": "Diapositive dans cette présentation",
"PE.Controllers.AddLink.textLast": "Dernière diapositive",
"PE.Controllers.AddLink.textNext": "Diapositive suivante",
"PE.Controllers.AddLink.textPrev": "Diapositive précédente",
"PE.Controllers.AddLink.textSlide": "Diapositive",
"PE.Controllers.AddLink.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
"PE.Controllers.AddTable.textCancel": "Annuler",
"PE.Controllers.AddTable.textColumns": "Colonnes",
"PE.Controllers.AddTable.textRows": "Lignes",
"PE.Controllers.AddTable.textTableSize": "Taille du tableau",
"PE.Controllers.DocumentHolder.menuAddLink": "Ajouter le lien",
"PE.Controllers.DocumentHolder.menuCopy": "Copier",
"PE.Controllers.DocumentHolder.menuCut": "Couper",
"PE.Controllers.DocumentHolder.menuDelete": "Supprimer",
"PE.Controllers.DocumentHolder.menuEdit": "Modifier",
"PE.Controllers.DocumentHolder.menuOpenLink": "Ouvrir le lien",
"PE.Controllers.DocumentHolder.menuPaste": "Coller",
"PE.Controllers.EditContainer.textChart": "Graphique",
"PE.Controllers.EditContainer.textHyperlink": "Lien hypertexte",
"PE.Controllers.EditContainer.textImage": "Image",
"PE.Controllers.EditContainer.textSettings": "Paramètres",
"PE.Controllers.EditContainer.textShape": "Forme",
"PE.Controllers.EditContainer.textSlide": "Diapositive",
"PE.Controllers.EditContainer.textTable": "Tableau",
"PE.Controllers.EditContainer.textText": "Texte",
"PE.Controllers.EditImage.textEmptyImgUrl": "Spécifiez l'URL de l'image",
"PE.Controllers.EditImage.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
"PE.Controllers.EditLink.textDefault": "Texte sélectionné",
"PE.Controllers.EditLink.textExternalLink": "Lien externe",
"PE.Controllers.EditLink.textFirst": "Première diapositive",
"PE.Controllers.EditLink.textInternalLink": "Diapositive dans cette présentation",
"PE.Controllers.EditLink.textLast": "Dernière diapositive",
"PE.Controllers.EditLink.textNext": "Diapositive suivante",
"PE.Controllers.EditLink.textPrev": "Diapositive précédente",
"PE.Controllers.EditLink.textSlide": "Diapositive",
"PE.Controllers.EditLink.txtNotUrl": "Ce champ doit être une URL au format 'http://www.example.com'",
"PE.Controllers.EditSlide.textSec": "sec",
"PE.Controllers.EditText.textAuto": "Auto",
"PE.Controllers.EditText.textFonts": "Polices",
"PE.Controllers.EditText.textPt": "pt",
"PE.Controllers.Main.advDRMEnterPassword": "Entrez votre mot de passe:",
"PE.Controllers.Main.advDRMOptions": "Fichier protégé",
"PE.Controllers.Main.advDRMPassword": " Mot de passe",
"PE.Controllers.Main.applyChangesTextText": "Chargement des données en cours...",
"PE.Controllers.Main.applyChangesTitleText": "Chargement des données",
"PE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.",
"PE.Controllers.Main.criticalErrorExtText": "Appuyez sur OK pour revenir à la liste des documents.",
"PE.Controllers.Main.criticalErrorTitle": "Erreur",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"PE.Controllers.Main.downloadErrorText": "Échec du téléchargement.",
"PE.Controllers.Main.downloadTextText": "Téléchargement du document...",
"PE.Controllers.Main.downloadTitleText": "Téléchargement du document",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "La connexion au serveur perdue. Désolé, vous ne pouvez plus modifier le document.",
"PE.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>Pour en savoir plus sur la connexion de Document Server <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">here</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Erreur externe.<br>Erreur de connexion à la base de données.Contactez le support.",
"PE.Controllers.Main.errorDataRange": "Plage de données incorrecte.",
"PE.Controllers.Main.errorDefaultMessage": "Code d'erreur: %1",
"PE.Controllers.Main.errorFilePassProtect": "Le document est protégé par un mot de passe.",
"PE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu",
"PE.Controllers.Main.errorKeyExpire": "Descripteur clé a expiré",
"PE.Controllers.Main.errorProcessSaveResult": "Échec de lenregistrement.",
"PE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.",
"PE.Controllers.Main.errorStockChart": "L'ordre des lignes est incorrect. Pour créer un graphique boursier, organisez vos données sur la feuille de calcul dans l'ordre suivant:<br> cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.",
"PE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
"PE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier.",
"PE.Controllers.Main.errorUsersExceed": "Le nombre des utilisateurs a été dépassé",
"PE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,<br>mais ne pouvez pas le télécharger jusqu'à ce que la connexion soit rétablie.",
"PE.Controllers.Main.leavePageText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
"PE.Controllers.Main.loadFontsTextText": "Chargement des données en cours...",
"PE.Controllers.Main.loadFontsTitleText": "Chargement des données",
"PE.Controllers.Main.loadFontTextText": "Chargement des données en cours...",
"PE.Controllers.Main.loadFontTitleText": "Chargement des données",
"PE.Controllers.Main.loadImagesTextText": "Chargement des images en cours...",
"PE.Controllers.Main.loadImagesTitleText": "Chargement des images",
"PE.Controllers.Main.loadImageTextText": "Chargement d'une image en cours...",
"PE.Controllers.Main.loadImageTitleText": "Chargement d'une image",
"PE.Controllers.Main.loadingDocumentTextText": "Chargement de la présentation...",
"PE.Controllers.Main.loadingDocumentTitleText": "Chargement de la présentation",
"PE.Controllers.Main.loadThemeTextText": "Chargement du thème en cours...",
"PE.Controllers.Main.loadThemeTitleText": "Chargement du thème",
"PE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
"PE.Controllers.Main.openErrorText": "Une erreur sest produite lors de louverture du fichier",
"PE.Controllers.Main.openTextText": "Ouverture du document...",
"PE.Controllers.Main.openTitleText": "Ouverture du document",
"PE.Controllers.Main.printTextText": "Impression du document...",
"PE.Controllers.Main.printTitleText": "Impression du document",
"PE.Controllers.Main.reloadButtonText": "Recharger la page",
"PE.Controllers.Main.requestEditFailedMessageText": "Quelqu'un est en train de modifier ce document. Veuillez réessayer plus tard.",
"PE.Controllers.Main.requestEditFailedTitleText": "Accès refusé",
"PE.Controllers.Main.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier",
"PE.Controllers.Main.savePreparingText": "Préparation à l'enregistrement ",
"PE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement est en cours. Veuillez patienter...",
"PE.Controllers.Main.saveTextText": "Enregistrement du document...",
"PE.Controllers.Main.saveTitleText": "Enregistrement du document",
"PE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1",
"PE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doit être moins que %1",
"PE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être moins que %1",
"PE.Controllers.Main.textAnonymous": "Anonyme",
"PE.Controllers.Main.textBack": "Retour",
"PE.Controllers.Main.textBuyNow": "Visiter le site web",
"PE.Controllers.Main.textCancel": "Annuler",
"PE.Controllers.Main.textClose": "Fermer",
"PE.Controllers.Main.textCloseTip": "Appuyez sur le conseil pour le fermer",
"PE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
"PE.Controllers.Main.textDone": "Terminé",
"PE.Controllers.Main.textLoadingDocument": "Chargement de la présentation",
"PE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE",
"PE.Controllers.Main.textOK": "OK",
"PE.Controllers.Main.textPassword": "Mot de passe",
"PE.Controllers.Main.textPreloader": "Chargement en cours...",
"PE.Controllers.Main.textShape": "Forme",
"PE.Controllers.Main.textTryUndoRedo": "Les fonctions Annuler/Rétablir sont désactivées pour le mode collaboratif rapide.",
"PE.Controllers.Main.textUsername": "Nom d'utilisateur",
"PE.Controllers.Main.titleLicenseExp": "Licence expirée",
"PE.Controllers.Main.titleServerVersion": "L'éditeur est mis à jour",
"PE.Controllers.Main.txtArt": "Entrez votre texte",
"PE.Controllers.Main.txtBasicShapes": "Formes de base",
"PE.Controllers.Main.txtButtons": "Boutons",
"PE.Controllers.Main.txtCallouts": "Légendes",
"PE.Controllers.Main.txtCharts": "Graphiques",
"PE.Controllers.Main.txtDiagramTitle": "Titre du graphique",
"PE.Controllers.Main.txtEditingMode": "Définition du mode d'édition...",
"PE.Controllers.Main.txtFiguredArrows": "Flèches figurées",
"PE.Controllers.Main.txtLines": "Lignes",
"PE.Controllers.Main.txtMath": "Maths",
"PE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour",
"PE.Controllers.Main.txtRectangles": "Rectangles",
"PE.Controllers.Main.txtSeries": "Série",
"PE.Controllers.Main.txtSldLtTBlank": "Vide",
"PE.Controllers.Main.txtSldLtTChart": "Graphique",
"PE.Controllers.Main.txtSldLtTChartAndTx": "Graphique et texte",
"PE.Controllers.Main.txtSldLtTClipArtAndTx": "Clip Art et texte",
"PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Clip Art et texte vertical",
"PE.Controllers.Main.txtSldLtTCust": "Personnalisé",
"PE.Controllers.Main.txtSldLtTDgm": "Diagramme",
"PE.Controllers.Main.txtSldLtTFourObj": "Quatre objets",
"PE.Controllers.Main.txtSldLtTMediaAndTx": "Média et texte",
"PE.Controllers.Main.txtSldLtTObj": "Titre et objet",
"PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Objet et deux objets",
"PE.Controllers.Main.txtSldLtTObjAndTx": "Objet et texte",
"PE.Controllers.Main.txtSldLtTObjOnly": "Objet",
"PE.Controllers.Main.txtSldLtTObjOverTx": "Objet sur texte",
"PE.Controllers.Main.txtSldLtTObjTx": "Titre, objet et légende",
"PE.Controllers.Main.txtSldLtTPicTx": "Image et légende",
"PE.Controllers.Main.txtSldLtTSecHead": "En-tête de section",
"PE.Controllers.Main.txtSldLtTTbl": "Tableau",
"PE.Controllers.Main.txtSldLtTTitle": "Diapositive de titre",
"PE.Controllers.Main.txtSldLtTTitleOnly": "Titre seul",
"PE.Controllers.Main.txtSldLtTTwoColTx": "Texte de deux colonnes",
"PE.Controllers.Main.txtSldLtTTwoObj": "Deux objets",
"PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Deux objets et objet",
"PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Deux objet et texte",
"PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Deux objets sur texte",
"PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Deux textes et deux objets",
"PE.Controllers.Main.txtSldLtTTx": "Texte",
"PE.Controllers.Main.txtSldLtTTxAndChart": "Texte et graphique",
"PE.Controllers.Main.txtSldLtTTxAndClipArt": "Texte et Clip Art",
"PE.Controllers.Main.txtSldLtTTxAndMedia": "Texte et média",
"PE.Controllers.Main.txtSldLtTTxAndObj": "Texte et objet",
"PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Texte et deux objets",
"PE.Controllers.Main.txtSldLtTTxOverObj": "Texte sur objet",
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Titre vertical et texte",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Titre vertical et texte sur graphique",
"PE.Controllers.Main.txtSldLtTVertTx": "Texte vertical",
"PE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans",
"PE.Controllers.Main.txtXAxis": "Axe X",
"PE.Controllers.Main.txtYAxis": "Axe Y",
"PE.Controllers.Main.unknownErrorText": "Erreur inconnue.",
"PE.Controllers.Main.unsupportedBrowserErrorText ": "Votre navigateur n'est pas pris en charge.",
"PE.Controllers.Main.uploadImageExtMessage": "Format d'image inconnu.",
"PE.Controllers.Main.uploadImageFileCountMessage": "Aucune image chargée.",
"PE.Controllers.Main.uploadImageSizeMessage": "La taille de l'image a dépassé la limite maximale.",
"PE.Controllers.Main.uploadImageTextText": "Chargement d'une image en cours...",
"PE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
"PE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.<br>Veuillez mettre à jour votre licence et actualisez la page.",
"PE.Controllers.Main.warnNoLicense": "Vous utilisez la version open source de ONLYOFFICE. La version a des limitations en connexions simultanées au serveur de documents (20 connexions à la fois).<br>Pour en avoir plus, veuillez envisager l'achat d'une licence commerciale.",
"PE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
"PE.Controllers.Search.textNoTextFound": "Le texte est introuvable",
"PE.Controllers.Settings.notcriticalErrorTitle": "Avertissement",
"PE.Controllers.Settings.txtLoading": "Chargement en cours...",
"PE.Controllers.Toolbar.dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette Page' pour la sauvegarde automatique du document. Cliquez sur 'Quitter cette Page' pour ignorer toutes les modifications non enregistrées.",
"PE.Controllers.Toolbar.dlgLeaveTitleText": "Vous quittez l'application",
"PE.Controllers.Toolbar.leaveButtonText": "Quitter cette page",
"PE.Controllers.Toolbar.stayButtonText": "Rester sur cette page",
"PE.Views.AddImage.textAddress": "Adresse",
"PE.Views.AddImage.textBack": "Retour",
"PE.Views.AddImage.textFromLibrary": "Image de la bibliothèque",
"PE.Views.AddImage.textFromURL": "Image à partir d'une URL",
"PE.Views.AddImage.textImageURL": "URL d'une image",
"PE.Views.AddImage.textInsertImage": "Insérer une image",
"PE.Views.AddImage.textLinkSettings": "Paramètres de lien",
"PE.Views.AddLink.textBack": "Retour",
"PE.Views.AddLink.textDisplay": "Afficher",
"PE.Views.AddLink.textExternalLink": "Lien externe",
"PE.Views.AddLink.textFirst": "Première diapositive",
"PE.Views.AddLink.textInsert": "Insérer",
"PE.Views.AddLink.textInternalLink": "Diapositive dans cette présentation",
"PE.Views.AddLink.textLast": "Dernière diapositive",
"PE.Views.AddLink.textLink": "Lien",
"PE.Views.AddLink.textLinkSlide": "Lier à",
"PE.Views.AddLink.textLinkType": "Type de lien",
"PE.Views.AddLink.textNext": "Diapositive suivante",
"PE.Views.AddLink.textNumber": "Numéro de diapositive",
"PE.Views.AddLink.textPrev": "Diapositive précédente",
"PE.Views.AddLink.textTip": "Info-bulle",
"PE.Views.EditChart.textAlign": "Aligner",
"PE.Views.EditChart.textAlignBottom": "Aligner en bas",
"PE.Views.EditChart.textAlignCenter": "Aligner au centre",
"PE.Views.EditChart.textAlignLeft": "Aligner à gauche",
"PE.Views.EditChart.textAlignMiddle": "Aligner au milieu",
"PE.Views.EditChart.textAlignRight": "Aligner à droite",
"PE.Views.EditChart.textAlignTop": "Aligner en haut",
"PE.Views.EditChart.textBack": "Retour",
"PE.Views.EditChart.textBackward": "Déplacer vers l'arrière",
"PE.Views.EditChart.textBorder": "Bordure",
"PE.Views.EditChart.textColor": "Couleur",
"PE.Views.EditChart.textFill": "Remplissage",
"PE.Views.EditChart.textForward": "Déplacer vers l'avant",
"PE.Views.EditChart.textRemoveChart": "Supprimer le graphique",
"PE.Views.EditChart.textReorder": "Réorganiser",
"PE.Views.EditChart.textSize": "Taille",
"PE.Views.EditChart.textStyle": "Style",
"PE.Views.EditChart.textToBackground": "Mettre en arrière-plan",
"PE.Views.EditChart.textToForeground": "Mettre au premier plan",
"PE.Views.EditChart.textType": "Type",
"PE.Views.EditChart.txtDistribHor": "Distribuer horizontalement",
"PE.Views.EditChart.txtDistribVert": "Distribuer verticalement",
"PE.Views.EditImage.textAddress": "Adresse",
"PE.Views.EditImage.textAlign": "Aligner",
"PE.Views.EditImage.textAlignBottom": "Aligner en bas",
"PE.Views.EditImage.textAlignCenter": "Aligner au centre",
"PE.Views.EditImage.textAlignLeft": "Aligner à gauche",
"PE.Views.EditImage.textAlignMiddle": "Aligner au milieu",
"PE.Views.EditImage.textAlignRight": "Aligner à droite",
"PE.Views.EditImage.textAlignTop": "Aligner en haut",
"PE.Views.EditImage.textBack": "Retour",
"PE.Views.EditImage.textBackward": "Déplacer vers l'arrière",
"PE.Views.EditImage.textDefault": "Taille par défaut",
"PE.Views.EditImage.textForward": "Déplacer vers l'avant",
"PE.Views.EditImage.textFromLibrary": "Image de la bibliothèque",
"PE.Views.EditImage.textFromURL": "Image à partir d'une URL",
"PE.Views.EditImage.textImageURL": "URL d'une image",
"PE.Views.EditImage.textLinkSettings": "Paramètres de lien",
"PE.Views.EditImage.textRemove": "Supprimer l'image",
"PE.Views.EditImage.textReorder": "Réorganiser",
"PE.Views.EditImage.textReplace": "Remplacer",
"PE.Views.EditImage.textReplaceImg": "Remplacer limage",
"PE.Views.EditImage.textToBackground": "Mettre en arrière-plan",
"PE.Views.EditImage.textToForeground": "Mettre au premier plan",
"PE.Views.EditImage.txtDistribHor": "Distribuer horizontalement",
"PE.Views.EditImage.txtDistribVert": "Distribuer verticalement",
"PE.Views.EditLink.textBack": "Retour",
"PE.Views.EditLink.textDisplay": "Afficher",
"PE.Views.EditLink.textEdit": "Modifier le lien",
"PE.Views.EditLink.textExternalLink": "Lien externe",
"PE.Views.EditLink.textFirst": "Première diapositive",
"PE.Views.EditLink.textInternalLink": "Diapositive dans cette présentation",
"PE.Views.EditLink.textLast": "Dernière diapositive",
"PE.Views.EditLink.textLink": "Lien",
"PE.Views.EditLink.textLinkSlide": "Lier à",
"PE.Views.EditLink.textLinkType": "Type de lien",
"PE.Views.EditLink.textNext": "Diapositive suivante",
"PE.Views.EditLink.textNumber": "Numéro de diapositive",
"PE.Views.EditLink.textPrev": "Diapositive précédente",
"PE.Views.EditLink.textRemove": "Supprimer le lien",
"PE.Views.EditLink.textTip": "Info-bulle",
"PE.Views.EditShape.textAlign": "Aligner",
"PE.Views.EditShape.textAlignBottom": "Aligner en bas",
"PE.Views.EditShape.textAlignCenter": "Aligner au centre",
"PE.Views.EditShape.textAlignLeft": "Aligner à gauche",
"PE.Views.EditShape.textAlignMiddle": "Aligner au milieu",
"PE.Views.EditShape.textAlignRight": "Aligner à droite",
"PE.Views.EditShape.textAlignTop": "Aligner en haut",
"PE.Views.EditShape.textBack": "Retour",
"PE.Views.EditShape.textBackward": "Déplacer vers l'arrière",
"PE.Views.EditShape.textBorder": "Bordure",
"PE.Views.EditShape.textColor": "Couleur",
"PE.Views.EditShape.textEffects": "Effets",
"PE.Views.EditShape.textFill": "Remplissage",
"PE.Views.EditShape.textForward": "Déplacer vers l'avant",
"PE.Views.EditShape.textOpacity": "Opacité",
"PE.Views.EditShape.textRemoveShape": "Supprimer la forme",
"PE.Views.EditShape.textReorder": "Réorganiser",
"PE.Views.EditShape.textReplace": "Remplacer",
"PE.Views.EditShape.textSize": "Taille",
"PE.Views.EditShape.textStyle": "Style",
"PE.Views.EditShape.textToBackground": "Mettre en arrière-plan",
"PE.Views.EditShape.textToForeground": "Mettre au premier plan",
"PE.Views.EditShape.txtDistribHor": "Distribuer horizontalement",
"PE.Views.EditShape.txtDistribVert": "Distribuer verticalement",
"PE.Views.EditSlide.textApplyAll": "Appliquer à toutes les diapositives",
"PE.Views.EditSlide.textBack": "Retour",
"PE.Views.EditSlide.textBlack": "À travers le noir",
"PE.Views.EditSlide.textBottom": "En bas",
"PE.Views.EditSlide.textBottomLeft": "Bas à gauche",
"PE.Views.EditSlide.textBottomRight": "Bas à droite",
"PE.Views.EditSlide.textClock": "Horloge",
"PE.Views.EditSlide.textClockwise": "Dans le sens des aiguilles d'une montre",
"PE.Views.EditSlide.textColor": "Couleur",
"PE.Views.EditSlide.textCounterclockwise": "Dans le sens inverse des aiguilles d'une montre",
"PE.Views.EditSlide.textCover": "Couvrir",
"PE.Views.EditSlide.textDelay": "Retard",
"PE.Views.EditSlide.textDuplicateSlide": "Dupliquer la diapositive",
"PE.Views.EditSlide.textDuration": "Durée",
"PE.Views.EditSlide.textEffect": "Effet",
"PE.Views.EditSlide.textFade": "Fondu",
"PE.Views.EditSlide.textFill": "Remplissage",
"PE.Views.EditSlide.textHorizontalIn": "Horizontal intérieur",
"PE.Views.EditSlide.textHorizontalOut": "Horizontal extérieur",
"PE.Views.EditSlide.textLayout": "Disposition",
"PE.Views.EditSlide.textLeft": "À gauche",
"PE.Views.EditSlide.textNone": "Aucun",
"PE.Views.EditSlide.textOpacity": "Opacité",
"PE.Views.EditSlide.textPush": "Expulsion",
"PE.Views.EditSlide.textRemoveSlide": "Supprimer la diapositive",
"PE.Views.EditSlide.textRight": "À droite",
"PE.Views.EditSlide.textSmoothly": "Transition douce",
"PE.Views.EditSlide.textSplit": "Fractionner",
"PE.Views.EditSlide.textStartOnClick": "Démarrer en cliquant",
"PE.Views.EditSlide.textStyle": "Style",
"PE.Views.EditSlide.textTheme": "Thème",
"PE.Views.EditSlide.textTop": "En haut",
"PE.Views.EditSlide.textTopLeft": "Haut à gauche",
"PE.Views.EditSlide.textTopRight": "Haut à droite",
"PE.Views.EditSlide.textTransition": "Transition",
"PE.Views.EditSlide.textType": "Type",
"PE.Views.EditSlide.textUnCover": "Découvrir",
"PE.Views.EditSlide.textVerticalIn": "Vertical intérieur",
"PE.Views.EditSlide.textVerticalOut": "Vertical extérieur ",
"PE.Views.EditSlide.textWedge": "Coin",
"PE.Views.EditSlide.textWipe": "Balayer",
"PE.Views.EditSlide.textZoom": "Zoom",
"PE.Views.EditSlide.textZoomIn": "Agrandir",
"PE.Views.EditSlide.textZoomOut": "Diminuer",
"PE.Views.EditSlide.textZoomRotate": "Zoom et rotation",
"PE.Views.EditTable.textAlign": "Aligner",
"PE.Views.EditTable.textAlignBottom": "Aligner en bas",
"PE.Views.EditTable.textAlignCenter": "Aligner au centre",
"PE.Views.EditTable.textAlignLeft": "Aligner à gauche",
"PE.Views.EditTable.textAlignMiddle": "Aligner au milieu",
"PE.Views.EditTable.textAlignRight": "Aligner à droite",
"PE.Views.EditTable.textAlignTop": "Aligner en haut",
"PE.Views.EditTable.textBack": "Retour",
"PE.Views.EditTable.textBackward": "Déplacer vers l'arrière",
"PE.Views.EditTable.textBandedColumn": "Colonne à bandes",
"PE.Views.EditTable.textBandedRow": "Ligne à bandes",
"PE.Views.EditTable.textBorder": "Bordure",
"PE.Views.EditTable.textCellMargins": "Marges de la cellule",
"PE.Views.EditTable.textColor": "Couleur",
"PE.Views.EditTable.textFill": "Remplissage",
"PE.Views.EditTable.textFirstColumn": "Première colonne",
"PE.Views.EditTable.textForward": "Déplacer vers l'avant",
"PE.Views.EditTable.textHeaderRow": "Ligne den-tête",
"PE.Views.EditTable.textLastColumn": "Dernière colonne",
"PE.Views.EditTable.textOptions": "Options",
"PE.Views.EditTable.textRemoveTable": "Supprimer la table",
"PE.Views.EditTable.textReorder": "Réorganiser",
"PE.Views.EditTable.textSize": "Taille",
"PE.Views.EditTable.textStyle": "Style",
"PE.Views.EditTable.textStyleOptions": "Options de style",
"PE.Views.EditTable.textTableOptions": "Options du tableau",
"PE.Views.EditTable.textToBackground": "Mettre en arrière-plan",
"PE.Views.EditTable.textToForeground": "Mettre au premier plan",
"PE.Views.EditTable.textTotalRow": "Ligne de total",
"PE.Views.EditTable.txtDistribHor": "Distribuer horizontalement",
"PE.Views.EditTable.txtDistribVert": "Distribuer verticalement",
"PE.Views.EditText.textAdditional": "Supplémentaire",
"PE.Views.EditText.textAdditionalFormat": "Supplémentaire",
"PE.Views.EditText.textAfter": "Après",
"PE.Views.EditText.textAllCaps": "Majuscules",
"PE.Views.EditText.textAutomatic": "Automatique",
"PE.Views.EditText.textBack": "Retour",
"PE.Views.EditText.textBefore": "Avant",
"PE.Views.EditText.textBullets": "Puces",
"PE.Views.EditText.textDblStrikethrough": "Double biffés",
"PE.Views.EditText.textDblSuperscript": "Exposant",
"PE.Views.EditText.textFontColor": "Couleur de police",
"PE.Views.EditText.textFontColors": "Couleurs de police",
"PE.Views.EditText.textFonts": "Polices",
"PE.Views.EditText.textFromText": "Distance du texte",
"PE.Views.EditText.textLetterSpacing": "Espacement entre les lettres",
"PE.Views.EditText.textLineSpacing": "Interligne",
"PE.Views.EditText.textNone": "Aucun",
"PE.Views.EditText.textNumbers": "Numéros",
"PE.Views.EditText.textSize": "Taille",
"PE.Views.EditText.textSmallCaps": "Petites majuscules",
"PE.Views.EditText.textStrikethrough": "Barré",
"PE.Views.EditText.textSubscript": "Indice",
"PE.Views.Search.textSearch": "Search",
"PE.Views.Settings.mniSlideStandard": "Standard (4:3)",
"PE.Views.Settings.mniSlideWide": "Écran large (16:9)",
"PE.Views.Settings.textAbout": "À propos du produit",
"PE.Views.Settings.textAddress": "adresse",
"PE.Views.Settings.textAuthor": "Auteur",
"PE.Views.Settings.textBack": "Retour",
"PE.Views.Settings.textCreateDate": "Date de création",
"PE.Views.Settings.textDone": "Terminé",
"PE.Views.Settings.textDownload": "Télécharger",
"PE.Views.Settings.textDownloadAs": "Télécharger comme...",
"PE.Views.Settings.textEditPresent": "Modifier la présentation",
"PE.Views.Settings.textEmail": "e-mail",
"PE.Views.Settings.textFind": "Trouver",
"PE.Views.Settings.textHelp": "Aide",
"PE.Views.Settings.textLoading": "Chargement en cours...",
"PE.Views.Settings.textPresentInfo": "Infos sur présentation",
"PE.Views.Settings.textPresentSetup": "Paramètres de la présentation",
"PE.Views.Settings.textPresentTitle": "Titre de la présentation",
"PE.Views.Settings.textSettings": "Paramètres",
"PE.Views.Settings.textSlideSize": "Taille de la diapositive",
"PE.Views.Settings.textTel": "Tél.",
"PE.Views.Settings.textVersion": "Version",
"PE.Views.Settings.unknownText": "Inconnu",
"PE.Views.Toolbar.textBack": "Retour"
}

View file

@ -0,0 +1,429 @@
{
"Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета",
"Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы",
"Common.Utils.Metric.txtCm": "см",
"Common.Utils.Metric.txtPt": "пт",
"PE.Controllers.AddContainer.textImage": "Картинка",
"PE.Controllers.AddContainer.textLink": "Ссылка",
"PE.Controllers.AddContainer.textShape": "Фигура",
"PE.Controllers.AddContainer.textSlide": "Слайд",
"PE.Controllers.AddContainer.textTable": "Таблица",
"PE.Controllers.AddImage.textEmptyImgUrl": "Необходимо указать URL изображения.",
"PE.Controllers.AddImage.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
"PE.Controllers.AddLink.textDefault": "Выделенный текст",
"PE.Controllers.AddLink.textExternalLink": "Внешняя ссылка",
"PE.Controllers.AddLink.textFirst": "Первый слайд",
"PE.Controllers.AddLink.textInternalLink": "Слайд в этой презентации",
"PE.Controllers.AddLink.textLast": "Последний слайд",
"PE.Controllers.AddLink.textNext": "Следующий слайд",
"PE.Controllers.AddLink.textPrev": "Предыдущий слайд",
"PE.Controllers.AddLink.textSlide": "Слайд",
"PE.Controllers.AddLink.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
"PE.Controllers.AddTable.textCancel": "Отмена",
"PE.Controllers.AddTable.textColumns": "Столбцы",
"PE.Controllers.AddTable.textRows": "Строки",
"PE.Controllers.AddTable.textTableSize": "Размер таблицы",
"PE.Controllers.DocumentHolder.menuAddLink": "Добавить ссылку",
"PE.Controllers.DocumentHolder.menuCopy": "Копировать",
"PE.Controllers.DocumentHolder.menuCut": "Вырезать",
"PE.Controllers.DocumentHolder.menuDelete": "Удалить",
"PE.Controllers.DocumentHolder.menuEdit": "Редактировать",
"PE.Controllers.DocumentHolder.menuOpenLink": "Перейти по ссылке",
"PE.Controllers.DocumentHolder.menuPaste": "Вставить",
"PE.Controllers.EditContainer.textChart": "Диаграмма",
"PE.Controllers.EditContainer.textHyperlink": "Гиперссылка",
"PE.Controllers.EditContainer.textImage": "Изображение",
"PE.Controllers.EditContainer.textSettings": "Настройки",
"PE.Controllers.EditContainer.textShape": "Фигура",
"PE.Controllers.EditContainer.textSlide": "Слайд",
"PE.Controllers.EditContainer.textTable": "Таблица",
"PE.Controllers.EditContainer.textText": "Текст",
"PE.Controllers.EditImage.textEmptyImgUrl": "Необходимо указать URL изображения.",
"PE.Controllers.EditImage.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
"PE.Controllers.EditLink.textDefault": "Выделенный текст",
"PE.Controllers.EditLink.textExternalLink": "Внешняя ссылка",
"PE.Controllers.EditLink.textFirst": "Первый слайд",
"PE.Controllers.EditLink.textInternalLink": "Слайд в этой презентации",
"PE.Controllers.EditLink.textLast": "Последний слайд",
"PE.Controllers.EditLink.textNext": "Следующий слайд",
"PE.Controllers.EditLink.textPrev": "Предыдущий слайд",
"PE.Controllers.EditLink.textSlide": "Слайд",
"PE.Controllers.EditLink.txtNotUrl": "Это поле должно быть URL-адресом в формате 'http://www.example.com'",
"PE.Controllers.EditSlide.textSec": "сек",
"PE.Controllers.EditText.textAuto": "Авто",
"PE.Controllers.EditText.textFonts": "Шрифты",
"PE.Controllers.EditText.textPt": "пт",
"PE.Controllers.Main.advDRMEnterPassword": "Введите пароль:",
"PE.Controllers.Main.advDRMOptions": "Защищенный файл",
"PE.Controllers.Main.advDRMPassword": "Пароль",
"PE.Controllers.Main.applyChangesTextText": "Загрузка данных...",
"PE.Controllers.Main.applyChangesTitleText": "Загрузка данных",
"PE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.",
"PE.Controllers.Main.criticalErrorExtText": "Нажмите 'OK' для возврата к списку документов.",
"PE.Controllers.Main.criticalErrorTitle": "Ошибка",
"PE.Controllers.Main.defaultTitleText": "ONLYOFFICE Presentation Editor",
"PE.Controllers.Main.downloadErrorText": "Загрузка не удалась.",
"PE.Controllers.Main.downloadTextText": "Загрузка документа...",
"PE.Controllers.Main.downloadTitleText": "Загрузка документа",
"PE.Controllers.Main.errorCoAuthoringDisconnect": "Подключение к серверу прервано. Редактирование недоступно.",
"PE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.<br>Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.<br><br>Дополнительную информацию о подключении Сервера документов можно найти <a href=\"https://api.onlyoffice.com/editors/callback\" target=\"_blank\">здесь</a>",
"PE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.<br>Ошибка подключения к базе данных. Пожалуйста, обратитесь в службу технической поддержки.",
"PE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.",
"PE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1",
"PE.Controllers.Main.errorFilePassProtect": "Документ защищен паролем.",
"PE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа",
"PE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек",
"PE.Controllers.Main.errorProcessSaveResult": "Не удалось завершить сохранение.",
"PE.Controllers.Main.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.",
"PE.Controllers.Main.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:<br> цена открытия, максимальная цена, минимальная цена, цена закрытия.",
"PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.",
"PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.",
"PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей",
"PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,<br>но не сможете скачать или напечатать его до восстановления подключения.",
"PE.Controllers.Main.leavePageText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
"PE.Controllers.Main.loadFontsTextText": "Загрузка данных...",
"PE.Controllers.Main.loadFontsTitleText": "Загрузка данных",
"PE.Controllers.Main.loadFontTextText": "Загрузка данных...",
"PE.Controllers.Main.loadFontTitleText": "Загрузка данных",
"PE.Controllers.Main.loadImagesTextText": "Загрузка изображений...",
"PE.Controllers.Main.loadImagesTitleText": "Загрузка изображений",
"PE.Controllers.Main.loadImageTextText": "Загрузка изображения...",
"PE.Controllers.Main.loadImageTitleText": "Загрузка изображения",
"PE.Controllers.Main.loadingDocumentTextText": "Загрузка презентации...",
"PE.Controllers.Main.loadingDocumentTitleText": "Загрузка презентации",
"PE.Controllers.Main.loadThemeTextText": "Загрузка темы...",
"PE.Controllers.Main.loadThemeTitleText": "Загрузка темы",
"PE.Controllers.Main.notcriticalErrorTitle": "Внимание",
"PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка",
"PE.Controllers.Main.openTextText": "Открытие документа...",
"PE.Controllers.Main.openTitleText": "Открытие документа",
"PE.Controllers.Main.printTextText": "Печать документа...",
"PE.Controllers.Main.printTitleText": "Печать документа",
"PE.Controllers.Main.reloadButtonText": "Обновить страницу",
"PE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.",
"PE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен",
"PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка",
"PE.Controllers.Main.savePreparingText": "Подготовка к сохранению",
"PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...",
"PE.Controllers.Main.saveTextText": "Сохранение документа...",
"PE.Controllers.Main.saveTitleText": "Сохранение документа",
"PE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1",
"PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1",
"PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1",
"PE.Controllers.Main.textAnonymous": "Анонимный пользователь",
"PE.Controllers.Main.textBack": "Назад",
"PE.Controllers.Main.textBuyNow": "Перейти на сайт",
"PE.Controllers.Main.textCancel": "Отмена",
"PE.Controllers.Main.textClose": "Закрыть",
"PE.Controllers.Main.textCloseTip": "Коснитесь, чтобы закрыть подсказку.",
"PE.Controllers.Main.textContactUs": "Связаться с отделом продаж",
"PE.Controllers.Main.textDone": "Готово",
"PE.Controllers.Main.textLoadingDocument": "Загрузка презентации",
"PE.Controllers.Main.textNoLicenseTitle": "Open source версия ONLYOFFICE",
"PE.Controllers.Main.textOK": "OK",
"PE.Controllers.Main.textPassword": "Пароль",
"PE.Controllers.Main.textPreloader": "Загрузка...",
"PE.Controllers.Main.textShape": "Фигура",
"PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.",
"PE.Controllers.Main.textUsername": "Имя пользователя",
"PE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии",
"PE.Controllers.Main.titleServerVersion": "Редактор обновлен",
"PE.Controllers.Main.txtArt": "Введите ваш текст",
"PE.Controllers.Main.txtBasicShapes": "Основные фигуры",
"PE.Controllers.Main.txtButtons": "Кнопки",
"PE.Controllers.Main.txtCallouts": "Выноски",
"PE.Controllers.Main.txtCharts": "Схемы",
"PE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы",
"PE.Controllers.Main.txtEditingMode": "Установка режима редактирования...",
"PE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки",
"PE.Controllers.Main.txtLines": "Линии",
"PE.Controllers.Main.txtMath": "Математические знаки",
"PE.Controllers.Main.txtNeedSynchronize": "Есть обновления",
"PE.Controllers.Main.txtRectangles": "Прямоугольники",
"PE.Controllers.Main.txtSeries": "Ряд",
"PE.Controllers.Main.txtSldLtTBlank": "Пустой слайд",
"PE.Controllers.Main.txtSldLtTChart": "Диаграмма",
"PE.Controllers.Main.txtSldLtTChartAndTx": "Диаграмма и текст",
"PE.Controllers.Main.txtSldLtTClipArtAndTx": "Графика и текст",
"PE.Controllers.Main.txtSldLtTClipArtAndVertTx": "Графика и вертикальный текст",
"PE.Controllers.Main.txtSldLtTCust": "Особый",
"PE.Controllers.Main.txtSldLtTDgm": "Схема",
"PE.Controllers.Main.txtSldLtTFourObj": "Четыре объекта",
"PE.Controllers.Main.txtSldLtTMediaAndTx": "Медиаклип и текст",
"PE.Controllers.Main.txtSldLtTObj": "Заголовок и объект",
"PE.Controllers.Main.txtSldLtTObjAndTwoObj": "Объект и два объекта",
"PE.Controllers.Main.txtSldLtTObjAndTx": "Объект и текст",
"PE.Controllers.Main.txtSldLtTObjOnly": "Объект",
"PE.Controllers.Main.txtSldLtTObjOverTx": "Объект над текстом",
"PE.Controllers.Main.txtSldLtTObjTx": "Заголовок, объект и подпись",
"PE.Controllers.Main.txtSldLtTPicTx": "Рисунок с подписью",
"PE.Controllers.Main.txtSldLtTSecHead": "Заголовок раздела",
"PE.Controllers.Main.txtSldLtTTbl": "Таблица",
"PE.Controllers.Main.txtSldLtTTitle": "Титульный слайд",
"PE.Controllers.Main.txtSldLtTTitleOnly": "Только заголовок",
"PE.Controllers.Main.txtSldLtTTwoColTx": "Текст в две колонки",
"PE.Controllers.Main.txtSldLtTTwoObj": "Два объекта",
"PE.Controllers.Main.txtSldLtTTwoObjAndObj": "Два объекта и объект",
"PE.Controllers.Main.txtSldLtTTwoObjAndTx": "Два объекта и текст",
"PE.Controllers.Main.txtSldLtTTwoObjOverTx": "Два объекта над текстом",
"PE.Controllers.Main.txtSldLtTTwoTxTwoObj": "Два текста и два объекта",
"PE.Controllers.Main.txtSldLtTTx": "Текст",
"PE.Controllers.Main.txtSldLtTTxAndChart": "Текст и диаграмма",
"PE.Controllers.Main.txtSldLtTTxAndClipArt": "Текст и графика",
"PE.Controllers.Main.txtSldLtTTxAndMedia": "Текст и медиаклип",
"PE.Controllers.Main.txtSldLtTTxAndObj": "Текст и объект",
"PE.Controllers.Main.txtSldLtTTxAndTwoObj": "Текст и два объекта",
"PE.Controllers.Main.txtSldLtTTxOverObj": "Текст над объектом",
"PE.Controllers.Main.txtSldLtTVertTitleAndTx": "Вертикальный заголовок и текст",
"PE.Controllers.Main.txtSldLtTVertTitleAndTxOverChart": "Вертикальный заголовок и текст над диаграммой",
"PE.Controllers.Main.txtSldLtTVertTx": "Вертикальный текст",
"PE.Controllers.Main.txtStarsRibbons": "Звезды и ленты",
"PE.Controllers.Main.txtXAxis": "Ось X",
"PE.Controllers.Main.txtYAxis": "Ось Y",
"PE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",
"PE.Controllers.Main.unsupportedBrowserErrorText ": "Ваш браузер не поддерживается.",
"PE.Controllers.Main.uploadImageExtMessage": "Неизвестный формат изображения.",
"PE.Controllers.Main.uploadImageFileCountMessage": "Ни одного изображения не загружено.",
"PE.Controllers.Main.uploadImageSizeMessage": "Превышен максимальный размер изображения.",
"PE.Controllers.Main.uploadImageTextText": "Загрузка изображения...",
"PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения",
"PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.<br>Обновите лицензию, а затем обновите страницу.",
"PE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).<br>Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
"PE.Controllers.Search.textNoTextFound": "Текст не найден",
"PE.Controllers.Settings.notcriticalErrorTitle": "Внимание",
"PE.Controllers.Settings.txtLoading": "Загрузка...",
"PE.Controllers.Toolbar.dlgLeaveMsgText": "В документе есть несохраненные изменения. Нажмите 'Остаться на странице', чтобы дождаться автосохранения документа. Нажмите 'Уйти со страницы', чтобы сбросить все несохраненные изменения.",
"PE.Controllers.Toolbar.dlgLeaveTitleText": "Вы выходите из приложения",
"PE.Controllers.Toolbar.leaveButtonText": "Уйти со страницы",
"PE.Controllers.Toolbar.stayButtonText": "Остаться на странице",
"PE.Views.AddImage.textAddress": "Адрес",
"PE.Views.AddImage.textBack": "Назад",
"PE.Views.AddImage.textFromLibrary": "Изображение из библиотеки",
"PE.Views.AddImage.textFromURL": "Изображение по URL",
"PE.Views.AddImage.textImageURL": "URL изображения",
"PE.Views.AddImage.textInsertImage": "Вставить изображение",
"PE.Views.AddImage.textLinkSettings": "Настройки ссылки",
"PE.Views.AddLink.textBack": "Назад",
"PE.Views.AddLink.textDisplay": "Отображать",
"PE.Views.AddLink.textExternalLink": "Внешняя ссылка",
"PE.Views.AddLink.textFirst": "Первый слайд",
"PE.Views.AddLink.textInsert": "Вставить",
"PE.Views.AddLink.textInternalLink": "Слайд в этой презентации",
"PE.Views.AddLink.textLast": "Последний слайд",
"PE.Views.AddLink.textLink": "Ссылка",
"PE.Views.AddLink.textLinkSlide": "Связать с",
"PE.Views.AddLink.textLinkType": "Тип ссылки",
"PE.Views.AddLink.textNext": "Следующий слайд",
"PE.Views.AddLink.textNumber": "Номер слайда",
"PE.Views.AddLink.textPrev": "Предыдущий слайд",
"PE.Views.AddLink.textTip": "Подсказка",
"PE.Views.EditChart.textAlign": "Выравнивание",
"PE.Views.EditChart.textAlignBottom": "По нижнему краю",
"PE.Views.EditChart.textAlignCenter": "По центру",
"PE.Views.EditChart.textAlignLeft": "По левому краю",
"PE.Views.EditChart.textAlignMiddle": "По середине",
"PE.Views.EditChart.textAlignRight": "По правому краю",
"PE.Views.EditChart.textAlignTop": "По верхнему краю",
"PE.Views.EditChart.textBack": "Назад",
"PE.Views.EditChart.textBackward": "Перенести назад",
"PE.Views.EditChart.textBorder": "Граница",
"PE.Views.EditChart.textColor": "Цвет",
"PE.Views.EditChart.textFill": "Заливка",
"PE.Views.EditChart.textForward": "Перенести вперед",
"PE.Views.EditChart.textRemoveChart": "Удалить диаграмму",
"PE.Views.EditChart.textReorder": "Порядок",
"PE.Views.EditChart.textSize": "Размер",
"PE.Views.EditChart.textStyle": "Стиль",
"PE.Views.EditChart.textToBackground": "Перенести на задний план",
"PE.Views.EditChart.textToForeground": "Перенести на передний план",
"PE.Views.EditChart.textType": "Тип",
"PE.Views.EditChart.txtDistribHor": "Распределить по горизонтали",
"PE.Views.EditChart.txtDistribVert": "Распределить по вертикали",
"PE.Views.EditImage.textAddress": "Адрес",
"PE.Views.EditImage.textAlign": "Выравнивание",
"PE.Views.EditImage.textAlignBottom": "По нижнему краю",
"PE.Views.EditImage.textAlignCenter": "По центру",
"PE.Views.EditImage.textAlignLeft": "По левому краю",
"PE.Views.EditImage.textAlignMiddle": "По середине",
"PE.Views.EditImage.textAlignRight": "По правому краю",
"PE.Views.EditImage.textAlignTop": "По верхнему краю",
"PE.Views.EditImage.textBack": "Назад",
"PE.Views.EditImage.textBackward": "Перенести назад",
"PE.Views.EditImage.textDefault": "Размер по умолчанию",
"PE.Views.EditImage.textForward": "Перенести вперед",
"PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки",
"PE.Views.EditImage.textFromURL": "Изображение по URL",
"PE.Views.EditImage.textImageURL": "URL изображения",
"PE.Views.EditImage.textLinkSettings": "Настройки ссылки",
"PE.Views.EditImage.textRemove": "Удалить изображение",
"PE.Views.EditImage.textReorder": "Порядок",
"PE.Views.EditImage.textReplace": "Заменить",
"PE.Views.EditImage.textReplaceImg": "Заменить изображение",
"PE.Views.EditImage.textToBackground": "Перенести на задний план",
"PE.Views.EditImage.textToForeground": "Перенести на передний план",
"PE.Views.EditImage.txtDistribHor": "Распределить по горизонтали",
"PE.Views.EditImage.txtDistribVert": "Распределить по вертикали",
"PE.Views.EditLink.textBack": "Назад",
"PE.Views.EditLink.textDisplay": "Отображать",
"PE.Views.EditLink.textEdit": "Редактировать ссылку",
"PE.Views.EditLink.textExternalLink": "Внешняя ссылка",
"PE.Views.EditLink.textFirst": "Первый слайд",
"PE.Views.EditLink.textInternalLink": "Слайд в этой презентации",
"PE.Views.EditLink.textLast": "Последний слайд",
"PE.Views.EditLink.textLink": "Ссылка",
"PE.Views.EditLink.textLinkSlide": "Связать с",
"PE.Views.EditLink.textLinkType": "Тип ссылки",
"PE.Views.EditLink.textNext": "Следующий слайд",
"PE.Views.EditLink.textNumber": "Номер слайда",
"PE.Views.EditLink.textPrev": "Предыдущий слайд",
"PE.Views.EditLink.textRemove": "Удалить ссылку",
"PE.Views.EditLink.textTip": "Подсказка",
"PE.Views.EditShape.textAlign": "Выравнивание",
"PE.Views.EditShape.textAlignBottom": "По нижнему краю",
"PE.Views.EditShape.textAlignCenter": "По центру",
"PE.Views.EditShape.textAlignLeft": "По левому краю",
"PE.Views.EditShape.textAlignMiddle": "По середине",
"PE.Views.EditShape.textAlignRight": "По правому краю",
"PE.Views.EditShape.textAlignTop": "По верхнему краю",
"PE.Views.EditShape.textBack": "Назад",
"PE.Views.EditShape.textBackward": "Перенести назад",
"PE.Views.EditShape.textBorder": "Граница",
"PE.Views.EditShape.textColor": "Цвет",
"PE.Views.EditShape.textEffects": "Эффекты",
"PE.Views.EditShape.textFill": "Заливка",
"PE.Views.EditShape.textForward": "Перенести вперед",
"PE.Views.EditShape.textOpacity": "Прозрачность",
"PE.Views.EditShape.textRemoveShape": "Удалить фигуру",
"PE.Views.EditShape.textReorder": "Порядок",
"PE.Views.EditShape.textReplace": "Заменить",
"PE.Views.EditShape.textSize": "Размер",
"PE.Views.EditShape.textStyle": "Стиль",
"PE.Views.EditShape.textToBackground": "Перенести на задний план",
"PE.Views.EditShape.textToForeground": "Перенести на передний план",
"PE.Views.EditShape.txtDistribHor": "Распределить по горизонтали",
"PE.Views.EditShape.txtDistribVert": "Распределить по вертикали",
"PE.Views.EditSlide.textApplyAll": "Применить ко всем слайдам",
"PE.Views.EditSlide.textBack": "Назад",
"PE.Views.EditSlide.textBlack": "Через черное",
"PE.Views.EditSlide.textBottom": "Снизу",
"PE.Views.EditSlide.textBottomLeft": "Снизу слева",
"PE.Views.EditSlide.textBottomRight": "Снизу справа",
"PE.Views.EditSlide.textClock": "Часы",
"PE.Views.EditSlide.textClockwise": "По часовой стрелке",
"PE.Views.EditSlide.textColor": "Цвет",
"PE.Views.EditSlide.textCounterclockwise": "Против часовой стрелки",
"PE.Views.EditSlide.textCover": "Наплыв",
"PE.Views.EditSlide.textDelay": "Задержка",
"PE.Views.EditSlide.textDuplicateSlide": "Дублировать слайд",
"PE.Views.EditSlide.textDuration": "Длительность",
"PE.Views.EditSlide.textEffect": "Эффект",
"PE.Views.EditSlide.textFade": "Выцветание",
"PE.Views.EditSlide.textFill": "Заливка",
"PE.Views.EditSlide.textHorizontalIn": "По горизонтали внутрь",
"PE.Views.EditSlide.textHorizontalOut": "По горизонтали наружу",
"PE.Views.EditSlide.textLayout": "Макет",
"PE.Views.EditSlide.textLeft": "Слева",
"PE.Views.EditSlide.textNone": "Нет",
"PE.Views.EditSlide.textOpacity": "Прозрачность",
"PE.Views.EditSlide.textPush": "Задвигание",
"PE.Views.EditSlide.textRemoveSlide": "Удалить слайд",
"PE.Views.EditSlide.textRight": "Справа",
"PE.Views.EditSlide.textSmoothly": "Плавно",
"PE.Views.EditSlide.textSplit": "Панорама",
"PE.Views.EditSlide.textStartOnClick": "Запускать щелчком",
"PE.Views.EditSlide.textStyle": "Стиль",
"PE.Views.EditSlide.textTheme": "Тема",
"PE.Views.EditSlide.textTop": "Сверху",
"PE.Views.EditSlide.textTopLeft": "Сверху слева",
"PE.Views.EditSlide.textTopRight": "Сверху справа",
"PE.Views.EditSlide.textTransition": "Переход",
"PE.Views.EditSlide.textType": "Тип",
"PE.Views.EditSlide.textUnCover": "Открывание",
"PE.Views.EditSlide.textVerticalIn": "По вертикали внутрь",
"PE.Views.EditSlide.textVerticalOut": "По вертикали наружу",
"PE.Views.EditSlide.textWedge": "Симметрично по кругу",
"PE.Views.EditSlide.textWipe": "Появление",
"PE.Views.EditSlide.textZoom": "Масштабирование",
"PE.Views.EditSlide.textZoomIn": "Увеличение",
"PE.Views.EditSlide.textZoomOut": "Уменьшение",
"PE.Views.EditSlide.textZoomRotate": "Увеличение с поворотом",
"PE.Views.EditTable.textAlign": "Выравнивание",
"PE.Views.EditTable.textAlignBottom": "По нижнему краю",
"PE.Views.EditTable.textAlignCenter": "По центру",
"PE.Views.EditTable.textAlignLeft": "По левому краю",
"PE.Views.EditTable.textAlignMiddle": "По середине",
"PE.Views.EditTable.textAlignRight": "По правому краю",
"PE.Views.EditTable.textAlignTop": "По верхнему краю",
"PE.Views.EditTable.textBack": "Назад",
"PE.Views.EditTable.textBackward": "Перенести назад",
"PE.Views.EditTable.textBandedColumn": "Чередовать столбцы",
"PE.Views.EditTable.textBandedRow": "Чередовать строки",
"PE.Views.EditTable.textBorder": "Граница",
"PE.Views.EditTable.textCellMargins": "Поля ячейки",
"PE.Views.EditTable.textColor": "Цвет",
"PE.Views.EditTable.textFill": "Заливка",
"PE.Views.EditTable.textFirstColumn": "Первый столбец",
"PE.Views.EditTable.textForward": "Перенести вперед",
"PE.Views.EditTable.textHeaderRow": "Строка заголовка",
"PE.Views.EditTable.textLastColumn": "Последний столбец",
"PE.Views.EditTable.textOptions": "Параметры",
"PE.Views.EditTable.textRemoveTable": "Удалить таблицу",
"PE.Views.EditTable.textReorder": "Порядок",
"PE.Views.EditTable.textSize": "Размер",
"PE.Views.EditTable.textStyle": "Стиль",
"PE.Views.EditTable.textStyleOptions": "Настройки стиля",
"PE.Views.EditTable.textTableOptions": "Настройки таблицы",
"PE.Views.EditTable.textToBackground": "Перенести на задний план",
"PE.Views.EditTable.textToForeground": "Перенести на передний план",
"PE.Views.EditTable.textTotalRow": "Строка итогов",
"PE.Views.EditTable.txtDistribHor": "Распределить по горизонтали",
"PE.Views.EditTable.txtDistribVert": "Распределить по вертикали",
"PE.Views.EditText.textAdditional": "Дополнительно",
"PE.Views.EditText.textAdditionalFormat": "Дополнительно",
"PE.Views.EditText.textAfter": "После",
"PE.Views.EditText.textAllCaps": "Все прописные",
"PE.Views.EditText.textAutomatic": "Автоматический",
"PE.Views.EditText.textBack": "Назад",
"PE.Views.EditText.textBefore": "Перед",
"PE.Views.EditText.textBullets": "Маркеры",
"PE.Views.EditText.textDblStrikethrough": "Двойное зачёркивание",
"PE.Views.EditText.textDblSuperscript": "Надстрочные",
"PE.Views.EditText.textFontColor": "Цвет шрифта",
"PE.Views.EditText.textFontColors": "Цвета шрифта",
"PE.Views.EditText.textFonts": "Шрифты",
"PE.Views.EditText.textFromText": "Расстояние до текста",
"PE.Views.EditText.textLetterSpacing": "Интервал",
"PE.Views.EditText.textLineSpacing": "Междустрочный интервал",
"PE.Views.EditText.textNone": "Нет",
"PE.Views.EditText.textNumbers": "Нумерация",
"PE.Views.EditText.textSize": "Размер",
"PE.Views.EditText.textSmallCaps": "Малые прописные",
"PE.Views.EditText.textStrikethrough": "Зачеркнутый",
"PE.Views.EditText.textSubscript": "Подстрочные",
"PE.Views.Search.textSearch": "Найти",
"PE.Views.Settings.mniSlideStandard": "Стандартный (4:3)",
"PE.Views.Settings.mniSlideWide": "Широкоэкранный (16:9)",
"PE.Views.Settings.textAbout": "О продукте",
"PE.Views.Settings.textAddress": "адрес",
"PE.Views.Settings.textAuthor": "Автор",
"PE.Views.Settings.textBack": "Назад",
"PE.Views.Settings.textCreateDate": "Дата создания",
"PE.Views.Settings.textDone": "Готово",
"PE.Views.Settings.textDownload": "Скачать",
"PE.Views.Settings.textDownloadAs": "Скачать как...",
"PE.Views.Settings.textEditPresent": "Редактировать",
"PE.Views.Settings.textEmail": "email",
"PE.Views.Settings.textFind": "Найти",
"PE.Views.Settings.textHelp": "Справка",
"PE.Views.Settings.textLoading": "Загрузка...",
"PE.Views.Settings.textPresentInfo": "Информация о презентации",
"PE.Views.Settings.textPresentSetup": "Настройка презентации",
"PE.Views.Settings.textPresentTitle": "Название презентации",
"PE.Views.Settings.textSettings": "Настройки",
"PE.Views.Settings.textSlideSize": "Размер слайда",
"PE.Views.Settings.textTel": "Телефон",
"PE.Views.Settings.textVersion": "Версия",
"PE.Views.Settings.unknownText": "Неизвестно",
"PE.Views.Toolbar.textBack": "Назад"
}

View file

@ -253,6 +253,8 @@ define([
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this));
this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this)); // Alt + Down this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this)); // Alt + Down
this.api.asc_registerCallback('asc_onFormulaCompleteMenu', _.bind(this.onFormulaCompleteMenu, this)); this.api.asc_registerCallback('asc_onFormulaCompleteMenu', _.bind(this.onFormulaCompleteMenu, this));
this.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(this.onShowSpecialPasteOptions, this));
this.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(this.onHideSpecialPasteOptions, this));
return this; return this;
}, },
@ -695,12 +697,15 @@ define([
(new SSE.Views.ChartSettingsDlg( (new SSE.Views.ChartSettingsDlg(
{ {
chartSettings: props, chartSettings: props,
imageSettings: item.chartInfo,
isChart: true, isChart: true,
api: me.api, api: me.api,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
me.api.asc_editChartDrawingObject(value.chartSettings); me.api.asc_editChartDrawingObject(value.chartSettings);
if (value.imageSettings)
me.api.asc_setGraphicObjectProps(value.imageSettings);
} }
} }
Common.NotificationCenter.trigger('edit:complete', me); Common.NotificationCenter.trigger('edit:complete', me);
@ -1205,6 +1210,7 @@ define([
isshapemenu = true; isshapemenu = true;
} }
} else if ( elValue.asc_getChartProperties() ) { } else if ( elValue.asc_getChartProperties() ) {
documentHolder.mnuChartEdit.chartInfo = elValue;
ischartmenu = true; ischartmenu = true;
has_chartprops = true; has_chartprops = true;
} }
@ -1594,6 +1600,89 @@ define([
} }
}, },
onShowSpecialPasteOptions: function(specialPasteShowOptions) {
var me = this,
documentHolderView = me.documentHolder,
coord = specialPasteShowOptions.asc_getCellCoord(),
pasteContainer = documentHolderView.cmpEl.find('#special-paste-container'),
pasteItems = specialPasteShowOptions.asc_getOptions();
// Prepare menu container
if (pasteContainer.length < 1) {
me._arrSpecialPaste = [];
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.paste] = me.txtPaste;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormula] = me.txtPasteFormulas;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaNumberFormat] = me.txtPasteFormulaNumFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaAllFormatting] = me.txtPasteKeepSourceFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaWithoutBorders] = me.txtPasteBorders;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.formulaColumnWidth] = me.txtPasteColWidths;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.mergeConditionalFormating] = me.txtPasteMerge;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyValues] = me.txtPasteValues;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueNumberFormat] = me.txtPasteValNumFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.valueAllFormating] = me.txtPasteValFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.pasteOnlyFormating] = me.txtPasteFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.transpose] = me.txtPasteTranspose;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.link] = me.txtPasteLink;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.picture] = me.txtPastePicture;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.linkedPicture] = me.txtPasteLinkPicture;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.sourceformatting] = me.txtPasteSourceFormat;
me._arrSpecialPaste[Asc.c_oSpecialPasteProps.destinationFormatting] = me.txtPasteDestFormat;
pasteContainer = $('<div id="special-paste-container" style="position: absolute;"><div id="id-document-holder-btn-special-paste"></div></div>');
documentHolderView.cmpEl.append(pasteContainer);
me.btnSpecialPaste = new Common.UI.Button({
cls : 'btn-toolbar',
iconCls : 'btn-paste',
menu : new Common.UI.Menu({items: []})
});
me.btnSpecialPaste.render($('#id-document-holder-btn-special-paste')) ;
}
if (pasteItems.length>0) {
var menu = me.btnSpecialPaste.menu;
for (var i = 0; i < menu.items.length; i++) {
menu.removeItem(menu.items[i]);
i--;
}
var group_prev = -1;
_.each(pasteItems, function(menuItem, index) {
var group = (menuItem<7) ? 0 : (menuItem>9 ? 2 : 1);
if (group_prev !== group && group_prev>=0)
menu.addItem(new Common.UI.MenuItem({ caption: '--' }));
group_prev = group;
var mnu = new Common.UI.MenuItem({
caption: me._arrSpecialPaste[menuItem],
value: menuItem,
checkable: true,
toggleGroup : 'specialPasteGroup'
}).on('click', function(item, e) {
var props = new Asc.SpecialPasteProps();
props.asc_setProps(item.value);
me.api.asc_SpecialPaste(props);
setTimeout(function(){menu.hide();}, 100);
});
menu.addItem(mnu);
});
(menu.items.length>0) && menu.items[0].setChecked(true, true);
}
if (coord.asc_getX()<0 || coord.asc_getY()<0) {
if (pasteContainer.is(':visible')) pasteContainer.hide();
} else {
var showPoint = [coord.asc_getX() + coord.asc_getWidth() + 3, coord.asc_getY() + coord.asc_getHeight() + 3];
pasteContainer.css({left: showPoint[0], top : showPoint[1]});
pasteContainer.show();
}
},
onHideSpecialPasteOptions: function() {
var pasteContainer = this.documentHolder.cmpEl.find('#special-paste-container');
if (pasteContainer.is(':visible'))
pasteContainer.hide();
},
onCellsRange: function(status) { onCellsRange: function(status) {
this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None); this.rangeSelectionMode = (status != Asc.c_oAscSelectionDialogType.None);
}, },
@ -2323,7 +2412,24 @@ define([
txtExpandSort: 'The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?', txtExpandSort: 'The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?',
txtExpand: 'Expand and sort', txtExpand: 'Expand and sort',
txtSorting: 'Sorting', txtSorting: 'Sorting',
txtSortSelected: 'Sort selected' txtSortSelected: 'Sort selected',
txtPaste: 'Paste',
txtPasteFormulas: 'Paste only formula',
txtPasteFormulaNumFormat: 'Formula + number format',
txtPasteKeepSourceFormat: 'Formula + all formatting',
txtPasteBorders: 'Formula without borders',
txtPasteColWidths: 'Formula + column width',
txtPasteMerge: 'Merge conditional formatting',
txtPasteTranspose: 'Transpose',
txtPasteValues: 'Paste only value',
txtPasteValNumFormat: 'Value + number format',
txtPasteValFormat: 'Value + all formatting',
txtPasteFormat: 'Paste only formatting',
txtPasteLink: 'Paste Link',
txtPastePicture: 'Picture',
txtPasteLinkPicture: 'Linked Picture',
txtPasteSourceFormat: 'Source formatting',
txtPasteDestFormat: 'Destination formatting'
}, SSE.Controllers.DocumentHolder || {})); }, SSE.Controllers.DocumentHolder || {}));
}); });

View file

@ -363,7 +363,7 @@ define([
var editor = document.getElementById('editor_sdk'); var editor = document.getElementById('editor_sdk');
if (editor) { if (editor) {
var rect = editor.getBoundingClientRect(); var rect = editor.getBoundingClientRect();
var event = window.event || arguments.callee.caller.arguments[0]; var event = data.event || {};
this.api.asc_onMouseUp(event, data.x - rect.left, data.y - rect.top); this.api.asc_onMouseUp(event, data.x - rect.left, data.y - rect.top);
} }
} }
@ -630,7 +630,7 @@ define([
if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) { if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
pluginsController.setApi(me.api); pluginsController.setApi(me.api);
me.updatePlugins(me.plugins, false); me.updatePlugins(me.plugins, false);
me.requestPlugins('../../../../sdkjs-plugins/config.json'); me.requestPlugins('../../../../plugins.json');
me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me)); me.api.asc_registerCallback('asc_onPluginsInit', _.bind(me.updatePluginsList, me));
} }
@ -1387,8 +1387,12 @@ define([
hidePreloader: function() { hidePreloader: function() {
if (!this._state.customizationDone) { if (!this._state.customizationDone) {
this._state.customizationDone = true; this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp) if (this.appOptions.customization) {
this.appOptions.customization.about = true; if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) { if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);
@ -1944,11 +1948,18 @@ define([
return null; return null;
}; };
var arr = []; var arr = [],
baseUrl = _.isEmpty(plugins.url) ? "" : plugins.url;
if (baseUrl !== "")
console.log("Obsolete: The url parameter is deprecated. Please check the documentation for new plugin connection configuration.");
pluginsData.forEach(function(item){ pluginsData.forEach(function(item){
item = baseUrl + item; // for compatibility with previouse version of server, where plugins.url is used.
var value = _getPluginJson(item); var value = _getPluginJson(item);
if (value) { if (value) {
value.baseUrl = item.substring(0, item.lastIndexOf("config.json")); value.baseUrl = item.substring(0, item.lastIndexOf("config.json"));
value.oldVersion = (baseUrl !== "");
arr.push(value); arr.push(value);
} }
}); });
@ -1966,6 +1977,8 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && (pluginStore.findWhere({baseUrl : item.baseUrl}) || pluginStore.findWhere({guid : item.guid}))) return;
var variations = item.variations, var variations = item.variations,
variationsArr = []; variationsArr = [];
variations.forEach(function(itemVar){ variations.forEach(function(itemVar){
@ -1976,12 +1989,19 @@ define([
} }
} }
if (isSupported && (isEdit || itemVar.isViewer)) { if (isSupported && (isEdit || itemVar.isViewer)) {
var icons = itemVar.icons;
if (item.oldVersion) { // for compatibility with previouse version of server, where plugins.url is used.
icons = [];
itemVar.icons.forEach(function(icon){
icons.push(icon.substring(icon.lastIndexOf("\/")+1));
});
}
item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) : item.isUICustomizer ? arrUI.push(item.baseUrl + itemVar.url) :
variationsArr.push(new Common.Models.PluginVariation({ variationsArr.push(new Common.Models.PluginVariation({
description: itemVar.description, description: itemVar.description,
index: variationsArr.length, index: variationsArr.length,
url : itemVar.url, url : (item.oldVersion) ? (itemVar.url.substring(itemVar.url.lastIndexOf("\/")+1) ) : itemVar.url,
icons : itemVar.icons, icons : icons,
isViewer: itemVar.isViewer, isViewer: itemVar.isViewer,
EditorsSupport: itemVar.EditorsSupport, EditorsSupport: itemVar.EditorsSupport,
isVisual: itemVar.isVisual, isVisual: itemVar.isVisual,

View file

@ -750,18 +750,30 @@ define([
var win, props; var win, props;
if (me.api){ if (me.api){
props = me.api.asc_getChartObject(); props = me.api.asc_getChartObject();
var selectedObjects = me.api.asc_getGraphicObjectProps(),
imageSettings = null;
for (var i = 0; i < selectedObjects.length; i++) {
if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
var elValue = selectedObjects[i].asc_getObjectValue();
if ( elValue.asc_getChartProperties() )
imageSettings = elValue;
}
}
if (props) { if (props) {
var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText); var ischartedit = ( me.toolbar.mode.isEditDiagram || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText);
(new SSE.Views.ChartSettingsDlg( (new SSE.Views.ChartSettingsDlg(
{ {
chartSettings: props, chartSettings: props,
imageSettings: imageSettings,
isChart: true, isChart: true,
api: me.api, api: me.api,
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
if (me.api) { if (me.api) {
(ischartedit) ? me.api.asc_editChartDrawingObject(value.chartSettings) : me.api.asc_addChartDrawingObject(value.chartSettings); (ischartedit) ? me.api.asc_editChartDrawingObject(value.chartSettings) : me.api.asc_addChartDrawingObject(value.chartSettings);
if (value.imageSettings)
me.api.asc_setGraphicObjectProps(value.imageSettings);
} }
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);

View file

@ -198,6 +198,23 @@
"SSE.Controllers.DocumentHolder.txtTop": "Top", "SSE.Controllers.DocumentHolder.txtTop": "Top",
"SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text",
"SSE.Controllers.DocumentHolder.txtWidth": "Width", "SSE.Controllers.DocumentHolder.txtWidth": "Width",
"SSE.Controllers.DocumentHolder.txtPaste": "Paste",
"SSE.Controllers.DocumentHolder.txtPasteFormulas": "Paste only formula",
"SSE.Controllers.DocumentHolder.txtPasteFormulaNumFormat": "Formula + number format",
"SSE.Controllers.DocumentHolder.txtPasteKeepSourceFormat": "Formula + all formatting",
"SSE.Controllers.DocumentHolder.txtPasteBorders": "Formula without borders",
"SSE.Controllers.DocumentHolder.txtPasteColWidths": "Formula + column width",
"SSE.Controllers.DocumentHolder.txtPasteMerge": "Merge conditional formatting",
"SSE.Controllers.DocumentHolder.txtPasteTranspose": "Transpose",
"SSE.Controllers.DocumentHolder.txtPasteValues": "Paste only value",
"SSE.Controllers.DocumentHolder.txtPasteValNumFormat": "Value + number format",
"SSE.Controllers.DocumentHolder.txtPasteValFormat": "Value + all formatting",
"SSE.Controllers.DocumentHolder.txtPasteFormat": "Paste only formatting",
"SSE.Controllers.DocumentHolder.txtPasteLink": "Paste link",
"SSE.Controllers.DocumentHolder.txtPastePicture": "Picture",
"SSE.Controllers.DocumentHolder.txtPasteLinkPicture": "Linked picture",
"SSE.Controllers.DocumentHolder.txtPasteSourceFormat": "Source formatting",
"SSE.Controllers.DocumentHolder.txtPasteDestFormat": "Destination formatting",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
"SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByColumns": "By columns",
"SSE.Controllers.LeftMenu.textByRows": "By rows", "SSE.Controllers.LeftMenu.textByRows": "By rows",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -258,3 +258,10 @@
border: 1px solid @gray; border: 1px solid @gray;
.background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px); .background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px);
} }
#special-paste-container {
position: absolute;
z-index: @zindex-dropdown - 20;
background-color: @gray-light;
border: 1px solid @gray;
}

View file

@ -58,13 +58,15 @@ define([
], ],
initialize: function () { initialize: function () {
Common.NotificationCenter.on('addcontainer:show', _.bind(this.initEvents, this)); var me = this;
Common.NotificationCenter.on('document:ready', _.bind(this.onDocumentReady, this));
this.addListeners({ Common.NotificationCenter.on('addcontainer:show', _.bind(me.initEvents, me));
Common.NotificationCenter.on('document:ready', _.bind(me.onDocumentReady, me));
me.addListeners({
'AddFunction': { 'AddFunction': {
'function:insert': this.onInsertFunction.bind(this), 'function:insert': me.onInsertFunction.bind(me),
'function:info': this.onFunctionInfo.bind(this) 'function:info': me.onFunctionInfo.bind(me)
} }
}); });
}, },
@ -75,12 +77,6 @@ define([
onLaunch: function () { onLaunch: function () {
this.createView('AddFunction').render(); this.createView('AddFunction').render();
var me = this;
_.defer(function () {
me.api.asc_setLocalization(fc);
me.fillFunctions.call(me);
});
}, },
initEvents: function () { initEvents: function () {
@ -90,35 +86,67 @@ define([
var me = this; var me = this;
_.defer(function () { _.defer(function () {
me.api.asc_setLocalization(fc); var editorLang = SSE.getController("Main").editorConfig.lang;
me.fillFunctions.call(me);
var localizationFunctions = function(data) {
fc = data;
me.api.asc_setLocalization(fc);
me.fillFunctions.call(me);
};
$.getJSON(Common.Utils.String.format("{0}/{1}.json", "resources/l10n/functions", editorLang), function(json) {
localizationFunctions(json);
}).fail(function() {
localizationFunctions(fc);
});
}); });
}, },
fillFunctions: function() { fillFunctions: function() {
var functions = {}; var me = this,
var jsonDescr = JSON.parse(fd); functions = {},
editorLang = SSE.getController("Main").editorConfig.lang;
var grouparr = this.api.asc_getFormulasInfo(); var localizationFunctionsDesc = function (data) {
for (var g in grouparr) { var jsonDesc = {},
var group = grouparr[g]; view = me.getView('AddFunction');
var groupname = group.asc_getGroupName();
var funcarr = group.asc_getFormulasArray();
for (var f in funcarr) { fd = data;
var func = funcarr[f];
var _name = func.asc_getName(); try {
functions[_name] = { jsonDesc = JSON.parse(fd);
type: _name, } catch (e) {
group: groupname, jsonDesc = fd
caption: func.asc_getLocaleName(),
args: jsonDescr[_name].a || '',
descr: jsonDescr[_name].d || ''
};
} }
}
this.getView('AddFunction').setFunctions(functions); var grouparr = me.api.asc_getFormulasInfo();
for (var g in grouparr) {
var group = grouparr[g];
var groupname = group.asc_getGroupName();
var funcarr = group.asc_getFormulasArray();
for (var f in funcarr) {
var func = funcarr[f];
var _name = func.asc_getName();
functions[_name] = {
type: _name,
group: groupname,
caption: func.asc_getLocaleName(),
args: jsonDesc[_name].a || '',
descr: jsonDesc[_name].d || ''
};
}
}
view.setFunctions(functions);
view.render();
};
$.getJSON(Common.Utils.String.format("{0}/{1}_desc.json", "resources/l10n/functions", editorLang), function(json) {
localizationFunctionsDesc(json);
}).fail(function() {
localizationFunctionsDesc(fd);
});
}, },
onInsertFunction: function (type) { onInsertFunction: function (type) {

View file

@ -73,9 +73,12 @@ define([
link.asc_setHyperlinkUrl(url); link.asc_setHyperlinkUrl(url);
display = url; display = url;
} else { } else {
if ( !/^[A-Z]+[1-9]\d*:[A-Z]+[1-9]\d*$/.test(args.url) || var isValid = /^[A-Z]+[1-9]\d*:[A-Z]+[1-9]\d*$/.test(args.url);
!/^[A-Z]+[1-9]\d*$/.test(args.url) )
{ if (!isValid)
isValid = /^[A-Z]+[1-9]\d*$/.test(args.url);
if (!isValid) {
uiApp.alert(this.textInvalidRange); uiApp.alert(this.textInvalidRange);
return; return;
} }

View file

@ -265,7 +265,7 @@ define([
initBorderStyle: function () { initBorderStyle: function () {
$('.page[data-page=edit-border-style] a[data-type]').single('click', _.bind(this.onBorderStyle, this)); $('.page[data-page=edit-border-style] a[data-type]').single('click', _.bind(this.onBorderStyle, this));
$('#edit-border-color .color-preview').css('background-color', '#' + _borderInfo.color); $('#edit-border-color .color-preview').css('background-color', '#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color));
$('#edit-border-size select').val(_borderInfo.width); $('#edit-border-size select').val(_borderInfo.width);
$('#edit-border-size .item-after').text($('#edit-border-size select option[value=' +_borderInfo.width + ']').text()); $('#edit-border-size .item-after').text($('#edit-border-size select option[value=' +_borderInfo.width + ']').text());

View file

@ -69,14 +69,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -212,25 +217,29 @@ define([
// Init border // Init border
var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4; var borderSize = shapeProperties.get_stroke().get_width() * 72.0 / 25.4,
$('#edit-chart-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]); borderType = shapeProperties.get_stroke().get_type();
$('#edit-chart-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText); $('#edit-chart-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
$('#edit-chart-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
$('#edit-chart-bordersize input').single('change touchend', _.buffered(me.onBorderSize, 100, me)); $('#edit-chart-bordersize input').single('change touchend', _.buffered(me.onBorderSize, 100, me));
$('#edit-chart-bordersize input').single('input', _.bind(me.onBorderSizeChanging, me)); $('#edit-chart-bordersize input').single('input', _.bind(me.onBorderSizeChanging, me));
var stroke = shapeProperties.get_stroke(), // Init border color
strokeType = stroke.get_type(); me._initBorderColorView();
},
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) { _initBorderColorView: function () {
_borderInfo.color = me._sdkToThemeColor(stroke.get_color()); var me = this,
} stroke = _shapeObject.get_ShapeProperties().get_stroke();
_borderInfo.color = (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) ? me._sdkToThemeColor(stroke.get_color()) : 'transparent';
$('#edit-chart-bordercolor .color-preview').css('background-color', $('#edit-chart-bordercolor .color-preview').css('background-color',
('transparent' == _borderInfo.color) ('transparent' == _borderInfo.color)
? _borderInfo.color ? _borderInfo.color
: ('#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color)) : ('#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color))
) );
}, },
initLayoutPage: function () { initLayoutPage: function () {
@ -618,29 +627,20 @@ define([
var me = this, var me = this,
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
currentShape = _shapeObject.get_ShapeProperties(),
image = new Asc.asc_CImgProperty(), image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = currentShape.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderInfo.color == 'transparent')
stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderInfo.color)));
stroke.put_width(value * 25.4 / 72.0); stroke.put_width(value * 25.4 / 72.0);
} }
@ -648,6 +648,7 @@ define([
image.put_ShapeProperties(shape); image.put_ShapeProperties(shape);
me.api.asc_setGraphicObjectProps(image); me.api.asc_setGraphicObjectProps(image);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -660,14 +661,13 @@ define([
currentShape = _shapeObject.get_ShapeProperties(); currentShape = _shapeObject.get_ShapeProperties();
$('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderInfo.color = color;
if (me.api && currentShape) { if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();
_borderInfo.color = Common.Utils.ThemeColor.getRgbColor(color);
if (currentShape.get_stroke().get_width() < 0.01) { if (currentShape.get_stroke().get_width() < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
@ -1032,7 +1032,12 @@ define([
chartObject = this.api.asc_getChartObject(); chartObject = this.api.asc_getChartObject();
if (!_.isUndefined(chartObject) && value && value.length > 0) { if (!_.isUndefined(chartObject) && value && value.length > 0) {
var intValue = parseInt(value);
chartObject[propertyMethod](parseInt(value)); chartObject[propertyMethod](parseInt(value));
if ("putDataLabelsPos" == propertyMethod && intValue != 0)
chartObject["putShowVal"](true);
this.api.asc_editChartDrawingObject(chartObject); this.api.asc_editChartDrawingObject(chartObject);
} }
}, },

View file

@ -262,9 +262,17 @@ define([
$layoutPages.prop('outerHTML') + $layoutPages.prop('outerHTML') +
'</div>' + '</div>' +
'</div>' '</div>'
)).on('close', function (e) { )).on('opened', function () {
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function (e) {
mainView.showNavbar(); mainView.showNavbar();
Common.NotificationCenter.trigger('layout:changed','navbar', {hidden:false}); Common.NotificationCenter.trigger('layout:changed','navbar', {hidden:false});
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
mainView.hideNavbar(); mainView.hideNavbar();
Common.NotificationCenter.trigger('layout:changed','navbar', {hidden:true}); Common.NotificationCenter.trigger('layout:changed','navbar', {hidden:true});
@ -292,9 +300,17 @@ define([
$overlay.addClass('modal-overlay-visible') $overlay.addClass('modal-overlay-visible')
} }
}); });
if (_.isFunction(me.api.asc_OnShowContextMenu)) {
me.api.asc_OnShowContextMenu()
}
}).on('close', function () { }).on('close', function () {
$overlay.off('removeClass'); $overlay.off('removeClass');
$overlay.removeClass('modal-overlay-visible') $overlay.removeClass('modal-overlay-visible')
}).on('closed', function () {
if (_.isFunction(me.api.asc_OnHideContextMenu)) {
me.api.asc_OnHideContextMenu()
}
}); });
} }

View file

@ -67,14 +67,19 @@ define([
return _sizes[index]; return _sizes[index];
}, },
sizeByValue: function (value) { indexSizeByValue: function (value) {
var index = 0; var index = 0;
_.each(_sizes, function (size, idx) { _.each(_sizes, function (size, idx) {
if (Math.abs(size - value) < 0.25) { if (Math.abs(size - value) < 0.25) {
index = idx; index = idx;
} }
}); });
return _sizes[index];
return index;
},
sizeByValue: function (value) {
return _sizes[this.indexSizeByValue(value)];
} }
} }
})(); })();
@ -173,25 +178,16 @@ define([
// Init border // Init border
var borderSize = this._mm2pt(shapeProperties.get_stroke().get_width()); var borderSize = me._mm2pt(shapeProperties.get_stroke().get_width()),
$('#edit-shape-bordersize input').val([borderSizeTransform.sizeByIndex(borderSize)]); borderType = shapeProperties.get_stroke().get_type();
$('#edit-shape-bordersize .item-after').text(borderSizeTransform.sizeByValue(borderSize) + ' ' + _metricText); $('#edit-shape-bordersize input').val([(borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.indexSizeByValue(borderSize)]);
$('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText);
$('#edit-shape-bordersize input').single('change touchend', _.buffered(me.onBorderSize, 100, me)); $('#edit-shape-bordersize input').single('change touchend', _.buffered(me.onBorderSize, 100, me));
$('#edit-shape-bordersize input').single('input', _.bind(me.onBorderSizeChanging, me)); $('#edit-shape-bordersize input').single('input', _.bind(me.onBorderSizeChanging, me));
var stroke = shapeProperties.get_stroke(), // Init border color
strokeType = stroke.get_type(); me._initBorderColorView();
if (stroke && strokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
_borderInfo.color = me._sdkToThemeColor(stroke.get_color());
}
$('#edit-shape-bordercolor .color-preview').css('background-color',
('transparent' == _borderInfo.color)
? _borderInfo.color
: ('#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color))
)
// Effect // Effect
// Init style opacity // Init style opacity
@ -201,6 +197,19 @@ define([
$('#edit-shape-effect input').single('input', _.bind(me.onOpacityChanging, me)); $('#edit-shape-effect input').single('input', _.bind(me.onOpacityChanging, me));
}, },
_initBorderColorView: function () {
var me = this,
stroke = _shapeObject.get_ShapeProperties().get_stroke();
_borderInfo.color = (stroke && stroke.get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) ? me._sdkToThemeColor(stroke.get_color()) : 'transparent';
$('#edit-shape-bordercolor .color-preview').css('background-color',
('transparent' == _borderInfo.color)
? _borderInfo.color
: ('#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color))
);
},
initReplacePage: function () { initReplacePage: function () {
$('.shape-replace li').single('click', _.buffered(this.onReplace, 100, this)); $('.shape-replace li').single('click', _.buffered(this.onReplace, 100, this));
}, },
@ -263,36 +272,28 @@ define([
var me = this, var me = this,
$target = $(e.currentTarget), $target = $(e.currentTarget),
value = $target.val(), value = $target.val(),
currentShape = _shapeObject.get_ShapeProperties(),
image = new Asc.asc_CImgProperty(), image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(), stroke = new Asc.asc_CStroke();
currentColor = Common.Utils.ThemeColor.getRgbColor('000000');
value = borderSizeTransform.sizeByIndex(parseInt(value)); value = borderSizeTransform.sizeByIndex(parseInt(value));
var currentStroke = currentShape.get_stroke();
if (currentStroke) {
var currentStrokeType = currentStroke.get_type();
if (currentStrokeType == Asc.c_oAscStrokeType.STROKE_COLOR) {
currentColor = currentStroke.get_color();
}
}
if (value < 0.01) { if (value < 0.01) {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE); stroke.put_type(Asc.c_oAscStrokeType.STROKE_NONE);
} else { } else {
stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR); stroke.put_type(Asc.c_oAscStrokeType.STROKE_COLOR);
stroke.put_color(currentColor); if (_borderInfo.color == 'transparent')
stroke.put_width(this._pt2mm(value)); stroke.put_color(Common.Utils.ThemeColor.getRgbColor({color: '000000', effectId: 29}));
else
stroke.put_color(Common.Utils.ThemeColor.getRgbColor(Common.Utils.ThemeColor.colorValue2EffectId(_borderInfo.color)));
stroke.put_width(me._pt2mm(value));
} }
shape.put_stroke(stroke); shape.put_stroke(stroke);
image.asc_putShapeProperties(shape); image.asc_putShapeProperties(shape);
me.api.asc_setGraphicObjectProps(image); me.api.asc_setGraphicObjectProps(image);
me._initBorderColorView(); // when select STROKE_NONE or change from STROKE_NONE to STROKE_COLOR
}, },
onBorderSizeChanging: function (e) { onBorderSizeChanging: function (e) {
@ -350,8 +351,9 @@ define([
currentShape = _shapeObject.get_ShapeProperties(); currentShape = _shapeObject.get_ShapeProperties();
$('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderInfo.color = color;
if (me.api && currentShape) { if (me.api && currentShape && currentShape.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_COLOR) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
shape = new Asc.asc_CShapeProperty(), shape = new Asc.asc_CShapeProperty(),
stroke = new Asc.asc_CStroke(); stroke = new Asc.asc_CStroke();
@ -370,8 +372,6 @@ define([
me.api.asc_setGraphicObjectProps(image); me.api.asc_setGraphicObjectProps(image);
} }
}, },
// API handlers // API handlers
@ -399,6 +399,10 @@ define([
return; return;
} }
if (_stack.length < 1) {
_stack = this.api.asc_getGraphicObjectProps();
}
var shapes = []; var shapes = [];
_.each(_stack, function (object) { _.each(_stack, function (object) {

View file

@ -151,8 +151,7 @@ define([
var color = _fontInfo.asc_getColor(), var color = _fontInfo.asc_getColor(),
clr = me._sdkToThemeColor(color); clr = me._sdkToThemeColor(color);
$('#text-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); $('#font-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr));
// Align // Align
$('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none'); $('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none');
@ -279,7 +278,7 @@ define([
onTextColor:function (palette, color) { onTextColor:function (palette, color) {
this.api.asc_setCellTextColor(Common.Utils.ThemeColor.getRgbColor(color)); this.api.asc_setCellTextColor(Common.Utils.ThemeColor.getRgbColor(color));
$('#text-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color)); $('#font-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color));
}, },
onHAlignChange: function (e) { onHAlignChange: function (e) {

View file

@ -47,7 +47,7 @@
<div id="add-function-group"> <div id="add-function-group">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= textBack %></span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= groupname %></div> <div class="center sliding"><%= groupname %></div>
</div> </div>
</div> </div>
@ -79,7 +79,7 @@
<div id="add-function-info"> <div id="add-function-info">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= textBack %></span><% } %></a></div> <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span><%= scope.textBack %></span><% } %></a></div>
<div class="center sliding"><%= caption %></div> <div class="center sliding"><%= caption %></div>
</div> </div>
</div> </div>

View file

@ -2,7 +2,7 @@
<div id="addlink-root-view"> <div id="addlink-root-view">
<div class="page" data-page="add-link"> <div class="page" data-page="add-link">
<div class="page-content"> <div class="page-content">
<div class="list-block"> <div class="list-block" style="<%= android ? 'margin-bottom: 0' : '' %>">
<ul> <ul>
<li> <li>
<a id="add-link-type" class="item-link smart-select"> <a id="add-link-type" class="item-link smart-select">
@ -30,25 +30,33 @@
</div> </div>
</a> </a>
</li> </li>
<div id="add-link-range" class="item-content"> <% if (android) { %>
<div class="item-inner"> </ul>
<div class="item-title label"><%= scope.textRange %></div> </div>
<div class="item-after"> <div class="list-block" style="margin-top: 0">
<div class="item-input"> <ul>
<input type="text" class="field right range" placeholder="<%= scope.textRequired %>"> <% } %>
</div> <li>
<div id="add-link-range" class="item-content">
<div class="item-inner">
<div class="item-title label"><%= scope.textRange %></div>
<% if (!android) { %><div class="item-after"><% } %>
<div class="item-input">
<input type="text" class="field right range" placeholder="<%= scope.textRequired %>">
</div>
<% if (!android) { %></div><% } %>
</div> </div>
</div> </div>
</div> </li>
<li> <li>
<div id="add-link-url" class="item-content"> <div id="add-link-url" class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title label"><%= scope.textLink %></div> <div class="item-title label"><%= scope.textLink %></div>
<div class="item-after"> <% if (!android) { %><div class="item-after"><% } %>
<div class="item-input"> <div class="item-input">
<input type="url" class="field right" placeholder="<%= scope.textRequired %>"> <input type="url" class="field right" placeholder="<%= scope.textRequired %>">
</div> </div>
</div> <% if (!android) { %></div><% } %>
</div> </div>
</div> </div>
</li> </li>
@ -56,11 +64,11 @@
<div id="add-link-display" class="item-content"> <div id="add-link-display" class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title label"><%= scope.textDisplay %></div> <div class="item-title label"><%= scope.textDisplay %></div>
<div class="item-after"> <% if (!android) { %><div class="item-after"><% } %>
<div class="item-input"> <div class="item-input">
<input type="text" class="field right"> <input type="text" class="field right">
</div> </div>
</div> <% if (!android) { %></div><% } %>
</div> </div>
</div> </div>
</li> </li>
@ -68,11 +76,11 @@
<div id="add-link-tip" class="item-content"> <div id="add-link-tip" class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title label"><%= scope.textTip %></div> <div class="item-title label"><%= scope.textTip %></div>
<div class="item-after"> <% if (!android) { %><div class="item-after"><% } %>
<div class="item-input"> <div class="item-input">
<input type="text" class="field right"> <input type="text" class="field right">
</div> </div>
</div> <% if (!android) { %></div><% } %>
</div> </div>
</div> </div>
</li> </li>

View file

@ -461,7 +461,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="content-block-title"><%= scope.textTickOptions %>Tick Options</div> <div class="content-block-title"><%= scope.textTickOptions %></div>
<div class="list-block"> <div class="list-block">
<ul> <ul>
<li> <li>
@ -480,7 +480,7 @@
<select name="vertical-axis-tick-minor"></select> <select name="vertical-axis-tick-minor"></select>
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title"><%= scope.textMajorType %></div> <div class="item-title"><%= scope.textMinorType %></div>
<div class="item-after"><%= scope.textNone %></div> <div class="item-after"><%= scope.textNone %></div>
</div> </div>
</div> </div>
@ -596,7 +596,7 @@
<select name="horizontal-axis-tick-minor"></select> <select name="horizontal-axis-tick-minor"></select>
<div class="item-content"> <div class="item-content">
<div class="item-inner"> <div class="item-inner">
<div class="item-title"><%= scope.textMajorType %></div> <div class="item-title"><%= scope.textMinorType %></div>
<div class="item-after"><%= scope.textNone %></div> <div class="item-after"><%= scope.textNone %></div>
</div> </div>
</div> </div>

View file

@ -24,7 +24,7 @@
</div> </div>
</li> </li>
<li> <li>
<a id="text-color" class="item-link" data-page="#edit-text-color"> <a id="font-color" class="item-link" data-page="#edit-text-color">
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %> <% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner"> <div class="item-inner">

View file

@ -89,7 +89,7 @@ define([
].join('')); ].join(''));
var $target = $('#' + _anchorId) var $target = $('#' + _anchorId)
.css({left: posX, top: posY}); .css({left: posX, top: Math.max(0, posY)});
uiApp.closeModal('.document-menu.modal-in'); uiApp.closeModal('.document-menu.modal-in');

View file

@ -53,7 +53,7 @@ define([
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
view : viewid, view : viewid,
textBack : 'Back' scope : this
}; };
_.extend(_params, args); _.extend(_params, args);
@ -94,6 +94,8 @@ define([
// Render layout // Render layout
render: function () { render: function () {
var me = this;
var quickFunctions = [ var quickFunctions = [
{caption: 'SUM', type: 'SUM'}, {caption: 'SUM', type: 'SUM'},
{caption: 'MIN', type: 'MIN'}, {caption: 'MIN', type: 'MIN'},
@ -101,24 +103,30 @@ define([
{caption: 'COUNT', type: 'COUNT'} {caption: 'COUNT', type: 'COUNT'}
]; ];
this.groups = { if (me.functions) {
'DateAndTime': this.sCatDateAndTime, _.each(quickFunctions, function (quickFunction) {
'Engineering': this.sCatEngineering, quickFunction.caption = me.functions[quickFunction.type].caption
'TextAndData': this.sCatTextAndData, });
'Statistical': this.sCatStatistical, }
'Financial': this.sCatFinancial,
'Mathematic': this.sCatMathematic, me.groups = {
'LookupAndReference': this.sCatLookupAndReference, 'DateAndTime': me.sCatDateAndTime,
'Information': this.sCatInformation, 'Engineering': me.sCatEngineering,
'Logical': this.sCatLogical 'TextAndData': me.sCatTextAndData,
'Statistical': me.sCatStatistical,
'Financial': me.sCatFinancial,
'Mathematic': me.sCatMathematic,
'LookupAndReference': me.sCatLookupAndReference,
'Information': me.sCatInformation,
'Logical': me.sCatLogical
}; };
this.layout = $('<div/>').append(_.template(this.template, { me.layout = $('<div/>').append(_.template(me.template, {
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
textGroups : this.textGroups, textGroups : me.textGroups,
quick : quickFunctions, quick : quickFunctions,
groups : this.groups, groups : me.groups,
view : 'root' view : 'root'
})); }));
@ -180,6 +188,7 @@ define([
}, },
textGroups: 'CATEGORIES', textGroups: 'CATEGORIES',
textBack: 'Back',
sCatLogical: 'Logical', sCatLogical: 'Logical',
// sCatCube: 'Cube', // sCatCube: 'Cube',
// sCatDatabase: 'Database', // sCatDatabase: 'Database',

View file

@ -215,6 +215,16 @@ define([
}) })
); );
var $view = $('.settings');
if ($view.length > 0) {
$view.find('#add-link-sheet select').html(
_.template(tpl, {
worksheets: sheets
})
);
}
var active = _.findWhere(sheets, {active:true}); var active = _.findWhere(sheets, {active:true});
if ( active ) if ( active )
this.setActiveWorksheet(active.value, active.caption); this.setActiveWorksheet(active.value, active.caption);

View file

@ -259,6 +259,7 @@ define([
textValReverseOrder: 'Values in Reverse Order', textValReverseOrder: 'Values in Reverse Order',
textTickOptions: 'Tick Options', textTickOptions: 'Tick Options',
textMajorType: 'Major Type', textMajorType: 'Major Type',
textMinorType: 'Minor Type',
textLabelOptions: 'Label Options', textLabelOptions: 'Label Options',
textLabelPos: 'Label Position', textLabelPos: 'Label Position',
textAxisPosition: 'Axis Position', textAxisPosition: 'Axis Position',

View file

@ -81,11 +81,14 @@ define([
// Render layout // Render layout
render: function () { render: function () {
var shapes = Common.SharedSettings.get('shapes').slice();
shapes.splice(0, 1); // Remove line shapes
this.layout = $('<div/>').append(this.template({ this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
imgpath : '../../common/mobile/resources/img/shapes', imgpath : '../../common/mobile/resources/img/shapes',
shapes : Common.SharedSettings.get('shapes'), shapes : shapes,
scope : this scope : this
})); }));

View file

@ -222,6 +222,7 @@
"SSE.Views.AddFunction.sCatStatistical": "Statistisch", "SSE.Views.AddFunction.sCatStatistical": "Statistisch",
"SSE.Views.AddFunction.sCatTextAndData": "Text und Daten", "SSE.Views.AddFunction.sCatTextAndData": "Text und Daten",
"SSE.Views.AddFunction.textGroups": "Kategorien", "SSE.Views.AddFunction.textGroups": "Kategorien",
"SSE.Views.AddFunction.textBack": "Zurück",
"SSE.Views.AddLink.textAddLink": "Link hinzufügen", "SSE.Views.AddLink.textAddLink": "Link hinzufügen",
"SSE.Views.AddLink.textAddress": "Adresse", "SSE.Views.AddLink.textAddress": "Adresse",
"SSE.Views.AddLink.textDisplay": "Anzeigen", "SSE.Views.AddLink.textDisplay": "Anzeigen",

View file

@ -224,6 +224,7 @@
"SSE.Views.AddFunction.sCatStatistical": "Statistical", "SSE.Views.AddFunction.sCatStatistical": "Statistical",
"SSE.Views.AddFunction.sCatTextAndData": "Text and data", "SSE.Views.AddFunction.sCatTextAndData": "Text and data",
"SSE.Views.AddFunction.textGroups": "Categories", "SSE.Views.AddFunction.textGroups": "Categories",
"SSE.Views.AddFunction.textBack": "Back",
"SSE.Views.AddLink.textAddLink": "Add Link", "SSE.Views.AddLink.textAddLink": "Add Link",
"SSE.Views.AddLink.textAddress": "Address", "SSE.Views.AddLink.textAddress": "Address",
"SSE.Views.AddLink.textDisplay": "Display", "SSE.Views.AddLink.textDisplay": "Display",
@ -325,6 +326,7 @@
"SSE.Views.EditChart.textMajorType": "Major Type", "SSE.Views.EditChart.textMajorType": "Major Type",
"SSE.Views.EditChart.textMaxValue": "Maximum Value", "SSE.Views.EditChart.textMaxValue": "Maximum Value",
"SSE.Views.EditChart.textMinor": "Minor", "SSE.Views.EditChart.textMinor": "Minor",
"SSE.Views.EditChart.textMinorType": "Minor Type",
"SSE.Views.EditChart.textMinValue": "Minimum Value", "SSE.Views.EditChart.textMinValue": "Minimum Value",
"SSE.Views.EditChart.textNone": "None", "SSE.Views.EditChart.textNone": "None",
"SSE.Views.EditChart.textNoOverlay": "No Overlay", "SSE.Views.EditChart.textNoOverlay": "No Overlay",

View file

@ -222,6 +222,7 @@
"SSE.Views.AddFunction.sCatStatistical": "Statistiques", "SSE.Views.AddFunction.sCatStatistical": "Statistiques",
"SSE.Views.AddFunction.sCatTextAndData": "Texte et données", "SSE.Views.AddFunction.sCatTextAndData": "Texte et données",
"SSE.Views.AddFunction.textGroups": "Catégories", "SSE.Views.AddFunction.textGroups": "Catégories",
"SSE.Views.AddFunction.textBack": "Retour",
"SSE.Views.AddLink.textAddLink": "Ajouter le lien", "SSE.Views.AddLink.textAddLink": "Ajouter le lien",
"SSE.Views.AddLink.textAddress": "Adresse", "SSE.Views.AddLink.textAddress": "Adresse",
"SSE.Views.AddLink.textDisplay": "Afficher", "SSE.Views.AddLink.textDisplay": "Afficher",

View file

@ -222,6 +222,7 @@
"SSE.Views.AddFunction.sCatStatistical": "Статистические", "SSE.Views.AddFunction.sCatStatistical": "Статистические",
"SSE.Views.AddFunction.sCatTextAndData": "Текст и данные", "SSE.Views.AddFunction.sCatTextAndData": "Текст и данные",
"SSE.Views.AddFunction.textGroups": "Категории", "SSE.Views.AddFunction.textGroups": "Категории",
"SSE.Views.AddFunction.textBack": "Назад",
"SSE.Views.AddLink.textAddLink": "Добавить ссылку", "SSE.Views.AddLink.textAddLink": "Добавить ссылку",
"SSE.Views.AddLink.textAddress": "Адрес", "SSE.Views.AddLink.textAddress": "Адрес",
"SSE.Views.AddLink.textDisplay": "Отображать", "SSE.Views.AddLink.textDisplay": "Отображать",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -336,6 +336,12 @@
"cwd": "../apps/spreadsheeteditor/mobile/locale/", "cwd": "../apps/spreadsheeteditor/mobile/locale/",
"src": "*", "src": "*",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/" "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/"
},
{
"expand": true,
"cwd": "../apps/spreadsheeteditor/mobile/resources/l10n/functions/",
"src": "*",
"dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/resources/l10n/functions/"
} }
], ],
"images-app": [ "images-app": [