diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
index 74667b038..ed34a79cb 100644
--- a/apps/api/documents/api.js
+++ b/apps/api/documents/api.js
@@ -128,7 +128,8 @@
compactHeader: false,
toolbarNoTabs: false,
toolbarHideFileName: false,
- reviewDisplay: 'original'
+ reviewDisplay: 'original',
+ spellcheck: true
},
plugins: {
autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],
@@ -735,8 +736,16 @@
: config.type === "embedded"
? "embed"
: "main";
- path += "/index.html";
+ var index = "/index.html";
+ if (config.editorConfig) {
+ var customization = config.editorConfig.customization;
+ if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs ||
+ (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) {
+ index = "/index_loader.html";
+ }
+ }
+ path += index;
return path;
}
@@ -753,6 +762,11 @@
params += "&customer=ONLYOFFICE";
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + config.editorConfig.customization.loaderLogo;
+ } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
+ if (config.type=='embedded' && config.editorConfig.customization.logo.imageEmbedded)
+ params += "&headerlogo=" + config.editorConfig.customization.logo.imageEmbedded;
+ else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
+ params += "&headerlogo=" + config.editorConfig.customization.logo.image;
}
}
diff --git a/apps/common/locale.js b/apps/common/locale.js
index 3e3bdda3b..9cf5cbf96 100644
--- a/apps/common/locale.js
+++ b/apps/common/locale.js
@@ -36,27 +36,34 @@ if (Common === undefined) {
Common.Locale = new(function() {
"use strict";
- var l10n = {};
+ var l10n = null;
+ var loadcallback,
+ apply = false;
- var _applyLocalization = function() {
+ var _applyLocalization = function(callback) {
try {
- for (var prop in l10n) {
- var p = prop.split('.');
- if (p && p.length > 2) {
+ callback && (loadcallback = callback);
+ if (l10n) {
+ for (var prop in l10n) {
+ var p = prop.split('.');
+ if (p && p.length > 2) {
- var obj = window;
- for (var i = 0; i < p.length - 1; ++i) {
- if (obj[p[i]] === undefined) {
- obj[p[i]] = new Object();
+ var obj = window;
+ for (var i = 0; i < p.length - 1; ++i) {
+ if (obj[p[i]] === undefined) {
+ obj[p[i]] = new Object();
+ }
+ obj = obj[p[i]];
}
- obj = obj[p[i]];
- }
- if (obj) {
- obj[p[p.length - 1]] = l10n[prop];
+ if (obj) {
+ obj[p[p.length - 1]] = l10n[prop];
+ }
}
}
- }
+ loadcallback && loadcallback();
+ } else
+ apply = true;
}
catch (e) {
}
@@ -64,7 +71,7 @@ Common.Locale = new(function() {
var _get = function(prop, scope) {
var res = '';
- if (scope && scope.name) {
+ if (l10n && scope && scope.name) {
res = l10n[scope.name + '.' + prop];
}
@@ -99,10 +106,12 @@ Common.Locale = new(function() {
throw new Error('loaded');
}
}).then(function(json) {
- if ( !!json ) l10n = json;
+ l10n = json || {};
+ apply && _applyLocalization();
}).catch(function(e) {
+ l10n = l10n || {};
+ apply && _applyLocalization();
if ( e.message == 'loaded' ) {
-
} else
console.log('fetch error: ' + e);
});
@@ -110,7 +119,13 @@ Common.Locale = new(function() {
if ( !window.fetch ) {
/* use fetch polifill if native method isn't supported */
- require(['../vendor/fetch/fetch.umd'], _requireLang);
+ var polyfills = ['../vendor/fetch/fetch.umd'];
+ if ( !window.Promise ) {
+ require(['../vendor/es6-promise/es6-promise.auto.min'],
+ function () {
+ require(polyfills, _requireLang);
+ });
+ } else require(polyfills, _requireLang);
} else _requireLang();
return {
diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index 816c88988..e097848f9 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -319,7 +319,7 @@ define([
me.trigger('render:before', me);
- me.cmpEl = $(me.el);
+ me.cmpEl = me.$el || $(me.el);
if (parentEl) {
me.setElement(parentEl, false);
@@ -386,6 +386,18 @@ define([
if (modalParents.length > 0) {
me.btnEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
me.btnMenuEl && me.btnMenuEl.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
+ var onModalClose = function(dlg) {
+ if (modalParents[0] !== dlg.$window[0]) return;
+ var tip = me.btnEl.data('bs.tooltip');
+ if (tip) {
+ if (tip.dontShow===undefined)
+ tip.dontShow = true;
+
+ tip.hide();
+ }
+ Common.NotificationCenter.off({'modal:close': onModalClose});
+ };
+ Common.NotificationCenter.on({'modal:close': onModalClose});
}
}
diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js
index 5aaa8a112..0d3d35c75 100644
--- a/apps/common/main/lib/component/CheckBox.js
+++ b/apps/common/main/lib/component/CheckBox.js
@@ -104,27 +104,25 @@ define([
},
render: function (parentEl) {
- var me = this,
- el = $(this.el);
+ var me = this;
if (!me.rendered) {
if (parentEl) {
this.setElement(parentEl, false);
parentEl.html(this.template({
labelText: this.options.labelText
}));
- el = $(this.el);
} else {
- el.html(this.template({
+ me.$el.html(this.template({
labelText: this.options.labelText
}));
}
- this.$chk = el.find('input[type=button]');
- this.$label = el.find('label');
- this.$chk.on('click', _.bind(this.onItemCheck, this));
- }
+ this.$chk = me.$el.find('input[type=button]');
+ this.$label = me.$el.find('label');
+ this.$chk.on('click', this.onItemCheck.bind(this));
- this.rendered = true;
+ this.rendered = true;
+ }
if (this.options.disabled)
this.setDisabled(this.options.disabled);
diff --git a/apps/common/main/lib/component/ColorPalette.js b/apps/common/main/lib/component/ColorPalette.js
index 106cfb761..ba35ca857 100644
--- a/apps/common/main/lib/component/ColorPalette.js
+++ b/apps/common/main/lib/component/ColorPalette.js
@@ -91,16 +91,14 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ me.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = me.$el || $(this.el);
}
if (!me.rendered) {
- var el = this.cmpEl;
-
- el.on('click', 'span.color-item', _.bind(this.itemClick, this));
+ me.cmpEl.on('click', 'span.color-item', me.itemClick.bind(me));
}
me.rendered = true;
diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js
index 98eadf69d..a6b7e9c9a 100644
--- a/apps/common/main/lib/component/ColorPaletteExt.js
+++ b/apps/common/main/lib/component/ColorPaletteExt.js
@@ -108,12 +108,12 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ this.$el.html(this.cmpEl);
}
- this.cmpEl.on('click', _.bind(this.handleClick, this));
+ this.cmpEl.on('click', me.handleClick.bind(me));
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = me.$el || $(this.el);
}
me.rendered = true;
diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js
index 8b24e3caf..5b7a7f4cc 100644
--- a/apps/common/main/lib/component/ComboBox.js
+++ b/apps/common/main/lib/component/ComboBox.js
@@ -104,8 +104,7 @@ define([
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
this.id = me.options.id || Common.UI.getId();
this.cls = me.options.cls;
@@ -158,10 +157,10 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ this.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = me.$el || $(this.el);
}
if (!me.rendered) {
@@ -194,6 +193,18 @@ define([
var modalParents = el.closest('.asc-window');
if (modalParents.length > 0) {
el.data('bs.tooltip').tip().css('z-index', parseInt(modalParents.css('z-index')) + 10);
+ var onModalClose = function(dlg) {
+ if (modalParents[0] !== dlg.$window[0]) return;
+ var tip = el.data('bs.tooltip');
+ if (tip) {
+ if (tip.dontShow===undefined)
+ tip.dontShow = true;
+
+ tip.hide();
+ }
+ Common.NotificationCenter.off({'modal:close': onModalClose});
+ };
+ Common.NotificationCenter.on({'modal:close': onModalClose});
}
el.find('.dropdown-menu').on('mouseenter', function(){ // hide tooltip when mouse is over menu
@@ -241,7 +252,6 @@ define([
this.scroller = new Common.UI.Scroller(_.extend({
el: $('.dropdown-menu', this.cmpEl),
minScrollbarLength: 40,
- scrollYMarginOffset: 30,
includePadding: true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
@@ -266,7 +276,6 @@ define([
this.scroller = new Common.UI.Scroller(_.extend({
el: $('.dropdown-menu', this.cmpEl),
minScrollbarLength: 40,
- scrollYMarginOffset: 30,
includePadding: true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
@@ -631,7 +640,6 @@ define([
this.scroller = new Common.UI.Scroller(_.extend({
el: $('.dropdown-menu', this.cmpEl),
minScrollbarLength : 40,
- scrollYMarginOffset: 30,
includePadding : true,
wheelSpeed: 10,
alwaysVisibleY: this.scrollAlwaysVisible
diff --git a/apps/common/main/lib/component/ComboDataView.js b/apps/common/main/lib/component/ComboDataView.js
index a667aac1f..ff31ae0aa 100644
--- a/apps/common/main/lib/component/ComboDataView.js
+++ b/apps/common/main/lib/component/ComboDataView.js
@@ -148,7 +148,7 @@ define([
me.trigger('render:before', me);
- me.cmpEl = $(me.el);
+ me.cmpEl = me.$el || $(me.el);
var templateEl = me.template({
id : me.id,
diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index 67a027902..dc309e1d1 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -135,7 +135,7 @@ define([
if (_.isUndefined(this.model.id))
return this;
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template(this.model.toJSON()));
el.addClass('item');
@@ -262,7 +262,6 @@ define([
this.trigger('render:before', this);
- this.cmpEl = $(this.el);
if (parentEl) {
this.setElement(parentEl, false);
this.cmpEl = $(this.template({
@@ -272,6 +271,7 @@ define([
parentEl.html(this.cmpEl);
} else {
+ this.cmpEl = me.$el || $(this.el);
this.cmpEl.html(this.template({
groups: me.groups ? me.groups.toJSON() : null,
style: me.style
@@ -766,6 +766,435 @@ define([
}
});
+ Common.UI.DataViewSimple = Common.UI.BaseView.extend({
+ options : {
+ handleSelect: true,
+ enableKeyEvents: true,
+ keyMoveDirection: 'both', // 'vertical', 'horizontal'
+ restoreHeight: 0,
+ scrollAlwaysVisible: false,
+ useBSKeydown: false
+ },
+
+ template: _.template([
+ '
',
+ '<% _.each(items, function(item) { %>',
+ '<% if (!item.id) item.id = Common.UI.getId(); %>',
+ '
data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
',
+ '<% }) %>',
+ '
'
+ ].join('')),
+
+ initialize : function(options) {
+ Common.UI.BaseView.prototype.initialize.call(this, options);
+ var me = this;
+
+ me.template = me.options.template || me.template;
+ me.store = me.options.store || new Common.UI.DataViewStore();
+ me.itemTemplate = me.options.itemTemplate || null;
+ me.handleSelect = me.options.handleSelect;
+ me.parentMenu = me.options.parentMenu;
+ me.enableKeyEvents= me.options.enableKeyEvents;
+ me.useBSKeydown = me.options.useBSKeydown; // only with enableKeyEvents && parentMenu
+ me.style = me.options.style || '';
+ me.scrollAlwaysVisible = me.options.scrollAlwaysVisible || false;
+ if (me.parentMenu)
+ me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
+ me.rendered = false;
+ if (me.options.keyMoveDirection=='vertical')
+ me.moveKeys = [Common.UI.Keys.UP, Common.UI.Keys.DOWN];
+ else if (me.options.keyMoveDirection=='horizontal')
+ me.moveKeys = [Common.UI.Keys.LEFT, Common.UI.Keys.RIGHT];
+ else
+ me.moveKeys = [Common.UI.Keys.UP, Common.UI.Keys.DOWN, Common.UI.Keys.LEFT, Common.UI.Keys.RIGHT];
+ if (me.options.el)
+ me.render();
+ },
+
+ render: function (parentEl) {
+ var me = this;
+ this.trigger('render:before', this);
+ if (parentEl) {
+ this.setElement(parentEl, false);
+ this.cmpEl = $(this.template({
+ items: me.store.toJSON(),
+ itemTemplate: me.itemTemplate,
+ style: me.style
+ }));
+
+ parentEl.html(this.cmpEl);
+ } else {
+ this.cmpEl = me.$el || $(this.el);
+ this.cmpEl.html(this.template({
+ items: me.store.toJSON(),
+ itemTemplate: me.itemTemplate,
+ style: me.style
+ }));
+ }
+ var modalParents = this.cmpEl.closest('.asc-window');
+ if (modalParents.length < 1)
+ modalParents = this.cmpEl.closest('[id^="menu-container-"]'); // context menu
+ if (modalParents.length > 0) {
+ this.tipZIndex = parseInt(modalParents.css('z-index')) + 10;
+ }
+
+ if (!this.rendered) {
+ if (this.parentMenu) {
+ this.cmpEl.closest('li').css('height', '100%');
+ this.cmpEl.css('height', '100%');
+ this.parentMenu.on('show:after', _.bind(this.alignPosition, this));
+ this.parentMenu.on('show:after', _.bind(this.onAfterShowMenu, this));
+ } else if (this.store.length>0)
+ this.onAfterShowMenu();
+
+ if (this.enableKeyEvents && this.parentMenu && this.handleSelect) {
+ this.parentMenu.on('show:before', function(menu) { me.deselectAll(); });
+ this.parentMenu.on('show:after', function(menu) {
+ Common.NotificationCenter.trigger('dataview:focus');
+ _.delay(function() {
+ menu.cmpEl.find('.dataview').focus();
+ }, 10);
+ }).on('hide:after', function() {
+ Common.NotificationCenter.trigger('dataview:blur');
+ });
+ }
+ this.attachKeyEvents();
+ this.cmpEl.on( "click", "div.item", _.bind(me.onClickItem, me));
+ }
+ if (_.isUndefined(this.scroller)) {
+ this.scroller = new Common.UI.Scroller({
+ el: $(this.el).find('.inner').addBack().filter('.inner'),
+ useKeyboard: this.enableKeyEvents && !this.handleSelect,
+ minScrollbarLength : 40,
+ wheelSpeed: 10,
+ alwaysVisibleY: this.scrollAlwaysVisible
+ });
+ }
+
+ this.rendered = true;
+
+ this.cmpEl.on('click', function(e){
+ if (/dataview/.test(e.target.className)) return false;
+ });
+
+ this.trigger('render:after', this);
+ return this;
+ },
+
+ selectRecord: function(record, suspendEvents) {
+ if (!this.handleSelect)
+ return;
+
+ if (suspendEvents)
+ this.suspendEvents();
+
+ this.deselectAll(suspendEvents);
+
+ if (record) {
+ record.set({selected: true});
+ var idx = _.indexOf(this.store.models, record);
+ if (idx>=0 && this.dataViewItems && this.dataViewItems.length>idx) {
+ this.dataViewItems[idx].el.addClass('selected');
+ }
+ }
+
+ if (suspendEvents)
+ this.resumeEvents();
+ return record;
+ },
+
+ selectByIndex: function(index, suspendEvents) {
+ if (this.store.length > 0 && index > -1 && index < this.store.length) {
+ return this.selectRecord(this.store.at(index), suspendEvents);
+ }
+ },
+
+ deselectAll: function(suspendEvents) {
+ if (suspendEvents)
+ this.suspendEvents();
+
+ _.each(this.store.where({selected: true}), function(record){
+ record.set({selected: false});
+ });
+ this.cmpEl.find('.item.selected').removeClass('selected');
+
+ if (suspendEvents)
+ this.resumeEvents();
+ },
+
+ getSelectedRec: function() {
+ return this.store.findWhere({selected: true});
+ },
+
+ onResetItems: function() {
+ this.dataViewItems && _.each(this.dataViewItems, function(item) {
+ var tip = item.el.data('bs.tooltip');
+ if (tip) {
+ if (tip.dontShow===undefined)
+ tip.dontShow = true;
+ (tip.tip()).remove();
+ }
+ }, this);
+ this.dataViewItems = null;
+
+ var template = _.template([
+ '<% _.each(items, function(item) { %>',
+ '<% if (!item.id) item.id = Common.UI.getId(); %>',
+ ' data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
',
+ '<% }) %>'
+ ].join(''));
+ this.cmpEl && this.cmpEl.find('.inner').html(template({
+ items: this.store.toJSON(),
+ itemTemplate: this.itemTemplate,
+ style : this.style
+ }));
+
+ if (!_.isUndefined(this.scroller)) {
+ this.scroller.destroy();
+ delete this.scroller;
+ }
+
+ this.scroller = new Common.UI.Scroller({
+ el: $(this.el).find('.inner').addBack().filter('.inner'),
+ useKeyboard: this.enableKeyEvents && !this.handleSelect,
+ minScrollbarLength : 40,
+ wheelSpeed: 10,
+ alwaysVisibleY: this.scrollAlwaysVisible
+ });
+
+ if (!this.parentMenu && this.store.length>0)
+ this.onAfterShowMenu();
+ this._layoutParams = undefined;
+ },
+
+ setStore: function(store) {
+ if (store) {
+ this.store = store;
+ this.onResetItems();
+ }
+ },
+
+ onClickItem: function(e) {
+ if ( this.disabled ) return;
+
+ window._event = e; // for FireFox only
+
+ var index = $(e.currentTarget).closest('div.item').index(),
+ record = (index>=0) ? this.store.at(index) : null,
+ view = (index>=0) ? this.dataViewItems[index] : null;
+ if (!record || !view) return;
+
+ record.set({selected: true});
+ var tip = view.el.data('bs.tooltip');
+ if (tip) (tip.tip()).remove();
+
+ if (!this.isSuspendEvents) {
+ this.trigger('item:click', this, view.el, record, e);
+ }
+ },
+
+ onAfterShowMenu: function(e) {
+ if (!this.dataViewItems) {
+ var me = this;
+ this.dataViewItems = [];
+ _.each(this.cmpEl.find('div.item'), function(item, index) {
+ var $item = $(item),
+ rec = me.store.at(index);
+ me.dataViewItems.push({el: $item});
+ if (rec.get('tip')) {
+ $item.tooltip({
+ title : rec.get('tip'),
+ placement : 'cursor',
+ zIndex : me.tipZIndex
+ });
+ }
+ });
+ }
+ },
+
+ scrollToRecord: function (record) {
+ if (!record) return;
+ var innerEl = $(this.el).find('.inner'),
+ inner_top = innerEl.offset().top,
+ idx = _.indexOf(this.store.models, record),
+ div = (idx>=0 && this.dataViewItems.length>idx) ? this.dataViewItems[idx].el : innerEl.find('#' + record.get('id'));
+ if (div.length<=0) return;
+
+ var div_top = div.offset().top,
+ div_first = this.dataViewItems[0].el,
+ div_first_top = (div_first.length>0) ? div_first[0].offsetTop : 0;
+ if (div_top < inner_top + div_first_top || div_top+div.outerHeight() > inner_top + innerEl.height()) {
+ if (this.scroller) {
+ this.scroller.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top, 0);
+ } else {
+ innerEl.scrollTop(innerEl.scrollTop() + div_top - inner_top - div_first_top);
+ }
+ }
+ },
+
+ onKeyDown: function (e, data) {
+ if ( this.disabled ) return;
+ if (data===undefined) data = e;
+ if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) {
+ data.preventDefault();
+ data.stopPropagation();
+ var rec = this.getSelectedRec();
+ if (data.keyCode==Common.UI.Keys.RETURN) {
+ if (this.selectedBeforeHideRec) // only for ComboDataView menuPicker
+ rec = this.selectedBeforeHideRec;
+ this.trigger('item:click', this, this, rec, e);
+ if (this.parentMenu)
+ this.parentMenu.hide();
+ } else {
+ var idx = _.indexOf(this.store.models, rec);
+ if (idx<0) {
+ if (data.keyCode==Common.UI.Keys.LEFT) {
+ var target = $(e.target).closest('.dropdown-submenu.over');
+ if (target.length>0) {
+ target.removeClass('over');
+ target.find('> a').focus();
+ } else
+ idx = 0;
+ } else
+ idx = 0;
+ } else if (this.options.keyMoveDirection == 'both') {
+ if (this._layoutParams === undefined)
+ this.fillIndexesArray();
+ var topIdx = this.dataViewItems[idx].topIdx,
+ leftIdx = this.dataViewItems[idx].leftIdx;
+
+ idx = undefined;
+ if (data.keyCode==Common.UI.Keys.LEFT) {
+ while (idx===undefined) {
+ leftIdx--;
+ if (leftIdx<0) {
+ var target = $(e.target).closest('.dropdown-submenu.over');
+ if (target.length>0) {
+ target.removeClass('over');
+ target.find('> a').focus();
+ break;
+ } else
+ leftIdx = this._layoutParams.columns-1;
+ }
+ idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+ }
+ } else if (data.keyCode==Common.UI.Keys.RIGHT) {
+ while (idx===undefined) {
+ leftIdx++;
+ if (leftIdx>this._layoutParams.columns-1) leftIdx = 0;
+ idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+ }
+ } else if (data.keyCode==Common.UI.Keys.UP) {
+ while (idx===undefined) {
+ topIdx--;
+ if (topIdx<0) topIdx = this._layoutParams.rows-1;
+ idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+ }
+ } else {
+ while (idx===undefined) {
+ topIdx++;
+ if (topIdx>this._layoutParams.rows-1) topIdx = 0;
+ idx = this._layoutParams.itemsIndexes[topIdx][leftIdx];
+ }
+ }
+ } else {
+ idx = (data.keyCode==Common.UI.Keys.UP || data.keyCode==Common.UI.Keys.LEFT)
+ ? Math.max(0, idx-1)
+ : Math.min(this.store.length - 1, idx + 1) ;
+ }
+
+ if (idx !== undefined && idx>=0) rec = this.store.at(idx);
+ if (rec) {
+ this._fromKeyDown = true;
+ this.selectRecord(rec);
+ this._fromKeyDown = false;
+ this.scrollToRecord(rec);
+ }
+ }
+ } else {
+ this.trigger('item:keydown', this, rec, e);
+ }
+ },
+
+ attachKeyEvents: function() {
+ if (this.enableKeyEvents && this.handleSelect) {
+ var el = $(this.el).find('.inner').addBack().filter('.inner');
+ el.addClass('canfocused');
+ el.attr('tabindex', '0');
+ el.on((this.parentMenu && this.useBSKeydown) ? 'dataview:keydown' : 'keydown', _.bind(this.onKeyDown, this));
+ }
+ },
+
+ setDisabled: function(disabled) {
+ this.disabled = disabled;
+ $(this.el).find('.inner').addBack().filter('.inner').toggleClass('disabled', disabled);
+ },
+
+ isDisabled: function() {
+ return this.disabled;
+ },
+
+ alignPosition: function() {
+ var menuRoot = (this.parentMenu.cmpEl.attr('role') === 'menu')
+ ? this.parentMenu.cmpEl
+ : this.parentMenu.cmpEl.find('[role=menu]'),
+ docH = Common.Utils.innerHeight()-10,
+ innerEl = $(this.el).find('.inner').addBack().filter('.inner'),
+ parent = innerEl.parent(),
+ margins = parseInt(parent.css('margin-top')) + parseInt(parent.css('margin-bottom')) + parseInt(menuRoot.css('margin-top')),
+ paddings = parseInt(menuRoot.css('padding-top')) + parseInt(menuRoot.css('padding-bottom')),
+ menuH = menuRoot.outerHeight(),
+ top = parseInt(menuRoot.css('top')),
+ props = {minScrollbarLength : 40};
+ this.scrollAlwaysVisible && (props.alwaysVisibleY = this.scrollAlwaysVisible);
+
+ if (top + menuH > docH ) {
+ innerEl.css('max-height', (docH - top - paddings - margins) + 'px');
+ this.scroller.update(props);
+ } else if ( top + menuH < docH && innerEl.height() < this.options.restoreHeight ) {
+ innerEl.css('max-height', (Math.min(docH - top - paddings - margins, this.options.restoreHeight)) + 'px');
+ this.scroller.update(props);
+ }
+ },
+
+ fillIndexesArray: function() {
+ if (this.dataViewItems.length<=0) return;
+
+ this._layoutParams = {
+ itemsIndexes: [],
+ columns: 0,
+ rows: 0
+ };
+
+ var el = this.dataViewItems[0].el,
+ itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
+ offsetLeft = this.$el.offset().left,
+ offsetTop = el.offset().top,
+ prevtop = -1, topIdx = 0, leftIdx = 0;
+
+ for (var i=0; iprevtop) {
+ prevtop = top;
+ this._layoutParams.itemsIndexes.push([]);
+ topIdx = this._layoutParams.itemsIndexes.length-1;
+ }
+ this._layoutParams.itemsIndexes[topIdx][leftIdx] = i;
+ item.topIdx = topIdx;
+ item.leftIdx = leftIdx;
+ if (this._layoutParams.columns docH) {
menuRoot.css('max-height', (docH - top) + 'px');
(!this.scroller) && (this.scroller = new Common.UI.Scroller({
- el: $(this.el).find('.dropdown-menu '),
+ el: this.$el.find('.dropdown-menu '),
minScrollbarLength: 30,
suppressScrollX: true,
alwaysVisibleY: this.scrollAlwaysVisible
@@ -588,4 +588,447 @@ define([
})()
})
})();
+
+ Common.UI.MenuSimple = Common.UI.BaseView.extend({
+ options : {
+ cls : '',
+ style : '',
+ itemTemplate: null,
+ items : [],
+ menuAlign : 'tl-bl',
+ menuAlignEl : null,
+ offset : [0, 0],
+ cyclic : true,
+ search : false,
+ scrollAlwaysVisible: true
+ },
+
+ template: _.template([
+ ''
+ ].join('')),
+
+ initialize : function(options) {
+ Common.UI.BaseView.prototype.initialize.call(this, options);
+
+ var me = this;
+
+ this.id = this.options.id || Common.UI.getId();
+ this.itemTemplate = this.options.itemTemplate || _.template([
+ ' style="<%= style %>" <% } %>',
+ '<% if(typeof canFocused !== "undefined") { %> tabindex="-1" type="menuitem" <% } %>',
+ '<% if(typeof stopPropagation !== "undefined") { %> data-stopPropagation="true" <% } %>',
+ 'class="<% if (checked) { %> checked <% } %>" >',
+ '<% if (typeof iconCls !== "undefined") { %>',
+ '',
+ '<% } %>',
+ '<%= caption %>',
+ ' '
+ ].join(''));
+ this.rendered = false;
+ this.items = this.options.items || [];
+ this.offset = [0, 0];
+ this.menuAlign = this.options.menuAlign;
+ this.menuAlignEl = this.options.menuAlignEl;
+ this.scrollAlwaysVisible = this.options.scrollAlwaysVisible;
+ this.search = this.options.search;
+
+ if (this.options.restoreHeight) {
+ this.options.restoreHeight = (typeof (this.options.restoreHeight) == "number") ? this.options.restoreHeight : (this.options.maxHeight ? this.options.maxHeight : 100000);
+ !this.options.maxHeight && (this.options.maxHeight = this.options.restoreHeight);
+ }
+
+ if (!this.options.cyclic) this.options.cls += ' no-cyclic';
+
+ if (this.options.el)
+ this.render();
+
+ Common.UI.Menu.Manager.register(this);
+ },
+
+ remove: function() {
+ Common.UI.Menu.Manager.unregister(this);
+ Common.UI.BaseView.prototype.remove.call(this);
+ },
+
+ render: function(parentEl) {
+ var me = this;
+
+ this.trigger('render:before', this);
+
+ this.cmpEl = me.$el || $(this.el);
+
+ parentEl && this.setElement(parentEl, false);
+
+ if (!me.rendered) {
+ this.cmpEl = $(this.template({
+ items: me.items,
+ itemTemplate: me.itemTemplate,
+ options : me.options
+ }));
+
+ parentEl ? parentEl.append(this.cmpEl) : this.$el.append(this.cmpEl);
+ }
+
+ var rootEl = this.cmpEl.parent(),
+ menuRoot = (rootEl.attr('role') === 'menu') ? rootEl : rootEl.find('[role=menu]');
+ this.menuRoot = menuRoot;
+
+ if (menuRoot) {
+ if (!me.rendered) {
+ menuRoot.on( "click", "li", _.bind(me.onItemClick, me));
+ menuRoot.on( "mousedown", "li", _.bind(me.onItemMouseDown, me));
+ }
+
+ if (this.options.maxHeight) {
+ menuRoot.css({'max-height': me.options.maxHeight});
+ this.scroller = new Common.UI.Scroller({
+ el: me.$el.find('.dropdown-menu '),
+ minScrollbarLength: 30,
+ suppressScrollX: true,
+ alwaysVisibleY: this.scrollAlwaysVisible
+ });
+ }
+
+ menuRoot.css({
+ position : 'fixed',
+ right : 'auto',
+ left : -1000,
+ top : -1000
+ });
+
+ this.parentEl = menuRoot.parent();
+
+ this.parentEl.on('show.bs.dropdown', _.bind(me.onBeforeShowMenu, me));
+ this.parentEl.on('shown.bs.dropdown', _.bind(me.onAfterShowMenu, me));
+ this.parentEl.on('hide.bs.dropdown', _.bind(me.onBeforeHideMenu, me));
+ this.parentEl.on('hidden.bs.dropdown', _.bind(me.onAfterHideMenu, me));
+ this.parentEl.on('keydown.after.bs.dropdown', _.bind(me.onAfterKeydownMenu, me));
+
+ menuRoot.hover(
+ function(e) { me.isOver = true;},
+ function(e) { me.isOver = false; }
+ );
+ }
+
+ this.rendered = true;
+
+ this.trigger('render:after', this);
+
+ return this;
+ },
+
+ resetItems: function(items) {
+ this.items = items || [];
+ this.$items = null;
+ var template = _.template([
+ '<% _.each(items, function(item) { %>',
+ '<% if (!item.id) item.id = Common.UI.getId(); %>',
+ '<% item.checked = item.checked || false; %>',
+ '<%= itemTemplate(item) %> ',
+ '<% }) %>'
+ ].join(''));
+ this.cmpEl && this.cmpEl.html(template({
+ items: this.items,
+ itemTemplate: this.itemTemplate,
+ options : this.options
+ }));
+ },
+
+ isVisible: function() {
+ return this.rendered && (this.cmpEl.is(':visible'));
+ },
+
+ show: function() {
+ if (this.rendered && this.parentEl && !this.parentEl.hasClass('open')) {
+ this.cmpEl.dropdown('toggle');
+ }
+ },
+
+ hide: function() {
+ if (this.rendered && this.parentEl) {
+ if ( this.parentEl.hasClass('open') )
+ this.cmpEl.dropdown('toggle');
+ else if (this.parentEl.hasClass('over'))
+ this.parentEl.removeClass('over');
+ }
+ },
+
+ onItemClick: function(e) {
+ if (e.which != 1 && e.which !== undefined)
+ return false;
+
+ var index = $(e.currentTarget).closest('li').index(),
+ item = (index>=0) ? this.items[index] : null;
+ if (!item) return;
+
+ if (item.disabled)
+ return false;
+
+ if (item.checkable && !item.checked)
+ this.setChecked(index, !item.checked);
+
+ this.isOver = false;
+ if (item.stopPropagation) {
+ e.stopPropagation();
+ var me = this;
+ _.delay(function(){
+ me.$el.parent().parent().find('[data-toggle=dropdown]').focus();
+ }, 10);
+ return;
+ }
+ this.trigger('item:click', this, item, e);
+ },
+
+ onItemMouseDown: function(e) {
+ if (e.which != 1) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ return false;
+ }
+ e.stopPropagation();
+ },
+
+ setChecked: function(index, check, suppressEvent) {
+ this.toggle(index, check, suppressEvent);
+ },
+
+ toggle: function(index, toggle, suppressEvent) {
+ var state = !!toggle;
+ var item = this.items[index];
+
+ this.clearAll();
+
+ if (item && item.checkable) {
+ item.checked = state;
+
+ if (this.rendered) {
+ var itemEl = item.el || this.cmpEl.find('#'+item.id);
+ if (itemEl) {
+ itemEl.toggleClass('checked', item.checked);
+ if (!_.isEmpty(item.iconCls)) {
+ itemEl.css('background-image', 'none');
+ }
+ }
+ }
+
+ if (!suppressEvent)
+ this.trigger('item:toggle', this, item, state);
+ }
+ },
+
+ setDisabled: function(disabled) {
+ this.disabled = !!disabled;
+
+ if (this.rendered)
+ this.cmpEl.toggleClass('disabled', this.disabled);
+ },
+
+ isDisabled: function() {
+ return this.disabled;
+ },
+
+ onBeforeShowMenu: function(e) {
+ Common.NotificationCenter.trigger('menu:show');
+ this.trigger('show:before', this, e);
+ this.alignPosition();
+ },
+
+ onAfterShowMenu: function(e) {
+ this.trigger('show:after', this, e);
+ if (this.scroller) {
+ this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
+ var menuRoot = this.menuRoot,
+ $selected = menuRoot.find('> li .checked');
+ if ($selected.length) {
+ var itemTop = $selected.position().top,
+ itemHeight = $selected.height(),
+ listHeight = menuRoot.height();
+ if (itemTop < 0 || itemTop + itemHeight > listHeight) {
+ menuRoot.scrollTop(menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+ }
+ setTimeout(function(){$selected.focus();}, 1);
+ }
+ }
+ this._search = {};
+ if (this.search && !this.$items) {
+ var me = this;
+ this.$items = this.menuRoot.find('> li').find('> a');
+ _.each(this.$items, function(item, index) {
+ me.items[index].el = $(item);
+ });
+ }
+ },
+
+ onBeforeHideMenu: function(e) {
+ this.trigger('hide:before', this, e);
+
+ if (Common.UI.Scroller.isMouseCapture())
+ e.preventDefault();
+ },
+
+ onAfterHideMenu: function(e, isFromInputControl) {
+ this.trigger('hide:after', this, e, isFromInputControl);
+ Common.NotificationCenter.trigger('menu:hide', this, isFromInputControl);
+ },
+
+ onAfterKeydownMenu: function(e) {
+ if (e.keyCode == Common.UI.Keys.RETURN) {
+ var li = $(e.target).closest('li');
+ if (li.length<=0) li = $(e.target).parent().find('li .dataview');
+ if (li.length>0) li.click();
+ if (!li.hasClass('dropdown-submenu'))
+ Common.UI.Menu.Manager.hideAll();
+ if ( $(e.currentTarget).closest('li').hasClass('dropdown-submenu')) {
+ e.stopPropagation();
+ return false;
+ }
+ } else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) {
+ this.fromKeyDown = true;
+ } else if (e.keyCode == Common.UI.Keys.ESC) {
+// Common.NotificationCenter.trigger('menu:afterkeydown', e);
+// return false;
+ } else if (this.search && e.keyCode > 64 && e.keyCode < 91 && e.key){
+ var me = this;
+ clearTimeout(this._search.timer);
+ this._search.timer = setTimeout(function () { me._search = {}; }, 1000);
+
+ (!this._search.text) && (this._search.text = '');
+ (!this._search.char) && (this._search.char = e.key);
+ (this._search.char !== e.key) && (this._search.full = true);
+ this._search.text += e.key;
+ if (this._search.index===undefined) {
+ this._search.index = this.$items.index(this.$items.filter(':focus'));
+ }
+ this.selectCandidate();
+ }
+ },
+
+ selectCandidate: function() {
+ var index = this._search.index || 0,
+ re = new RegExp('^' + ((this._search.full) ? this._search.text : this._search.char), 'i'),
+ itemCandidate, idxCandidate;
+
+ for (var i=0; iindex) {
+ itemCandidate = item;
+ idxCandidate = i;
+ break;
+ }
+ }
+ }
+
+ if (itemCandidate) {
+ this._search.index = idxCandidate;
+ var item = itemCandidate.el;
+ if (this.scroller) {
+ this.scroller.update({alwaysVisibleY: this.scrollAlwaysVisible});
+ var itemTop = item.position().top,
+ itemHeight = item.height(),
+ listHeight = this.menuRoot.height();
+ if (itemTop < 0 || itemTop + itemHeight > listHeight) {
+ this.menuRoot.scrollTop(this.menuRoot.scrollTop() + itemTop + itemHeight - (listHeight/2));
+ }
+ }
+ item.focus();
+ }
+ },
+
+ setOffset: function(offsetX, offsetY) {
+ this.offset[0] = _.isUndefined(offsetX) ? this.offset[0] : offsetX;
+ this.offset[1] = _.isUndefined(offsetY) ? this.offset[1] : offsetY;
+ this.alignPosition();
+ },
+
+ getOffset: function() {
+ return this.offset;
+ },
+
+ alignPosition: function(fixedAlign, fixedOffset) {
+ var menuRoot = this.menuRoot,
+ menuParent = this.menuAlignEl || menuRoot.parent(),
+ m = this.menuAlign.match(/^([a-z]+)-([a-z]+)/),
+ offset = menuParent.offset(),
+ docW = Common.Utils.innerWidth(),
+ docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number
+ menuW = menuRoot.outerWidth(),
+ menuH = menuRoot.outerHeight(),
+ parentW = menuParent.outerWidth(),
+ parentH = menuParent.outerHeight();
+
+ var posMenu = {
+ 'tl': [0, 0],
+ 'bl': [0, menuH],
+ 'tr': [menuW, 0],
+ 'br': [menuW, menuH]
+ };
+ var posParent = {
+ 'tl': [0, 0],
+ 'tr': [parentW, 0],
+ 'bl': [0, parentH],
+ 'br': [parentW, parentH]
+ };
+ var left = offset.left - posMenu[m[1]][0] + posParent[m[2]][0] + this.offset[0];
+ var top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1];
+
+ if (left + menuW > docW)
+ if (menuParent.is('li.dropdown-submenu')) {
+ left = offset.left - menuW + 2;
+ } else {
+ left = docW - menuW;
+ }
+
+ if (this.options.restoreHeight) {
+ if (typeof (this.options.restoreHeight) == "number") {
+ if (top + menuH > docH) {
+ menuRoot.css('max-height', (docH - top) + 'px');
+ (!this.scroller) && (this.scroller = new Common.UI.Scroller({
+ el: this.$el.find('.dropdown-menu '),
+ minScrollbarLength: 30,
+ suppressScrollX: true,
+ alwaysVisibleY: this.scrollAlwaysVisible
+ }));
+ } else if ( top + menuH < docH && menuRoot.height() < this.options.restoreHeight) {
+ menuRoot.css('max-height', (Math.min(docH - top, this.options.restoreHeight)) + 'px');
+ }
+ }
+ } else {
+ if (top + menuH > docH) {
+ if (fixedAlign && typeof fixedAlign == 'string') { // how to align if menu height > window height
+ m = fixedAlign.match(/^([a-z]+)-([a-z]+)/);
+ top = offset.top - posMenu[m[1]][1] + posParent[m[2]][1] + this.offset[1] + (fixedOffset || 0);
+ } else
+ top = docH - menuH;
+ }
+
+ if (top < 0)
+ top = 0;
+ }
+
+ if (this.options.additionalAlign)
+ this.options.additionalAlign.call(this, menuRoot, left, top);
+ else
+ menuRoot.css({left: Math.ceil(left), top: Math.ceil(top)});
+ },
+
+ clearAll: function() {
+ this.cmpEl && this.cmpEl.find('li > a.checked').removeClass('checked');
+ _.each(this.items, function(item){
+ item.checked = false;
+ });
+ }
+ });
+
});
\ No newline at end of file
diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js
index 7b49b77e2..c54501185 100644
--- a/apps/common/main/lib/component/MenuItem.js
+++ b/apps/common/main/lib/component/MenuItem.js
@@ -119,8 +119,7 @@ define([
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
this.id = me.options.id || Common.UI.getId();
this.cls = me.options.cls;
@@ -138,7 +137,7 @@ define([
this.hint = me.options.hint;
this.rendered = false;
- if (this.menu !== null && !(this.menu instanceof Common.UI.Menu)) {
+ if (this.menu !== null && !(this.menu instanceof Common.UI.Menu) && !(this.menu instanceof Common.UI.MenuSimple)) {
this.menu = new Common.UI.Menu(_.extend({}, me.options.menu));
}
@@ -148,7 +147,7 @@ define([
render: function() {
var me = this,
- el = $(this.el);
+ el = me.$el || $(this.el);
me.trigger('render:before', me);
@@ -159,7 +158,7 @@ define([
el.off('click');
Common.UI.ToggleManager.unregister(me);
- $(this.el).html(this.template({
+ el.html(this.template({
id : me.id,
caption : me.caption,
iconCls : me.iconCls,
@@ -170,7 +169,7 @@ define([
if (me.menu) {
el.addClass('dropdown-submenu');
- me.menu.render($(this.el));
+ me.menu.render(el);
el.mouseenter(_.bind(me.menu.alignPosition, me.menu));
// el.focusin(_.bind(me.onFocusItem, me));
el.focusout(_.bind(me.onBlurItem, me));
@@ -214,7 +213,7 @@ define([
}
if (this.disabled)
- $(this.el).toggleClass('disabled', this.disabled);
+ el.toggleClass('disabled', this.disabled);
el.on('click', _.bind(this.onItemClick, this));
el.on('mousedown', _.bind(this.onItemMouseDown, this));
@@ -223,7 +222,7 @@ define([
}
}
- me.cmpEl = $(this.el);
+ me.cmpEl = el;
me.rendered = true;
me.trigger('render:after', me);
diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js
index e64b61522..584db251d 100644
--- a/apps/common/main/lib/component/MetricSpinner.js
+++ b/apps/common/main/lib/component/MetricSpinner.js
@@ -128,7 +128,7 @@ define([
Common.UI.BaseView.prototype.initialize.call(this, options);
var me = this,
- el = $(this.el);
+ el = me.$el || $(this.el);
el.addClass('spinner');
@@ -165,7 +165,7 @@ define([
this.setRawValue(this.value);
if (this.options.width) {
- $(this.el).width(this.options.width);
+ el.width(this.options.width);
}
if (this.options.defaultValue===undefined)
@@ -176,7 +176,7 @@ define([
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template);
this.$input = el.find('.form-control');
@@ -189,7 +189,7 @@ define([
},
setDisabled: function(disabled) {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
if (disabled !== this.disabled) {
el.find('button').toggleClass('disabled', disabled);
el.toggleClass('disabled', disabled);
diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js
index 8b7ff4b6f..9e8e2d159 100644
--- a/apps/common/main/lib/component/RadioBox.js
+++ b/apps/common/main/lib/component/RadioBox.js
@@ -71,13 +71,12 @@ define([
disabled : false,
rendered : false,
- template : _.template(' <%= labelText %> '),
+ template : _.template('<%= labelText %> '),
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
this.name = this.options.name || Common.UI.getId();
@@ -94,13 +93,14 @@ define([
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
labelText: this.options.labelText,
name: this.name
}));
this.$radio = el.find('input[type=button]');
+ this.$label = el.find('label');
this.rendered = true;
return this;
@@ -145,6 +145,10 @@ define([
getValue: function() {
return this.$radio.hasClass('checked');
+ },
+
+ setCaption: function(text) {
+ this.$label.find('span').text(text);
}
});
});
\ No newline at end of file
diff --git a/apps/common/main/lib/component/Scroller.js b/apps/common/main/lib/component/Scroller.js
index 53e3783dd..db564e0d4 100644
--- a/apps/common/main/lib/component/Scroller.js
+++ b/apps/common/main/lib/component/Scroller.js
@@ -78,7 +78,7 @@ define([
render: function() {
var me = this;
- me.cmpEl = $(this.el);
+ me.cmpEl = me.$el || $(this.el);
if (!me.rendered) {
me.cmpEl.perfectScrollbar(_.extend({}, me.options));
diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js
index d11430466..0ee059b7e 100644
--- a/apps/common/main/lib/component/Slider.js
+++ b/apps/common/main/lib/component/Slider.js
@@ -104,8 +104,7 @@ define([
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
me.width = me.options.width;
me.minValue = me.options.minValue;
@@ -131,10 +130,10 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ me.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = me.$el;
}
this.cmpEl.find('.track-center').width(me.options.width - 14);
@@ -299,8 +298,7 @@ define([
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
me.width = me.options.width;
me.minValue = me.options.minValue;
@@ -326,10 +324,10 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ this.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = this.$el;
}
var el = this.cmpEl;
diff --git a/apps/common/main/lib/component/Switcher.js b/apps/common/main/lib/component/Switcher.js
index e393011d2..a474e40ae 100644
--- a/apps/common/main/lib/component/Switcher.js
+++ b/apps/common/main/lib/component/Switcher.js
@@ -65,8 +65,7 @@ define([
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
- var me = this,
- el = $(this.el);
+ var me = this;
me.width = me.options.width;
me.thumbWidth = me.options.thumbWidth;
@@ -89,10 +88,10 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ this.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = this.$el;
}
this.thumb = this.cmpEl.find('.thumb');
diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js
index 1f2868e90..fab6c9640 100644
--- a/apps/common/main/lib/component/TableStyler.js
+++ b/apps/common/main/lib/component/TableStyler.js
@@ -335,10 +335,10 @@ define([
this.setElement(parentEl, false);
parentEl.html(this.cmpEl);
} else {
- $(this.el).html(this.cmpEl);
+ this.$el.html(this.cmpEl);
}
} else {
- this.cmpEl = $(this.el);
+ this.cmpEl = this.$el;
}
me.rendered = true;
diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js
index 98899fd45..10549495c 100644
--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@@ -98,7 +98,7 @@ define([
Common.UI.BaseView.prototype.initialize.call(this, options);
var me = this,
- el = $(this.el);
+ el = me.$el || $(this.el);
this.colors = me.options.colors || this.generateColorData(me.options.themecolors, me.options.effects, me.options.standardcolors, me.options.transparent);
@@ -116,7 +116,7 @@ define([
},
render: function () {
- $(this.el).html(this.template({colors: this.colors}));
+ this.$el.html(this.template({colors: this.colors}));
return this;
},
@@ -144,7 +144,7 @@ define([
},
updateCustomColors: function() {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
if (el) {
var selected = el.find('a.' + this.selectedCls),
color = (selected.length>0 && /color-dynamic/.test(selected[0].className)) ? selected.attr('color') : undefined;
@@ -221,7 +221,7 @@ define([
},
setCustomColor: function(color) {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
color = /#?([a-fA-F0-9]{6})/.exec(color);
if (color) {
this.saveCustomColor(color[1]);
@@ -272,7 +272,7 @@ define([
},
select: function(color, suppressEvent) {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
if (typeof(color) == 'object' ) {
@@ -321,7 +321,7 @@ define([
},
selectByRGB: function(rgb, suppressEvent) {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
var color = (typeof(rgb) == 'object') ? rgb.color : rgb;
@@ -351,7 +351,7 @@ define([
if (effectcolors===undefined || standartcolors===undefined) return;
var me = this,
- el = $(this.el);
+ el = me.$el || $(this.el);
if (me.aColorElements === undefined) {
me.aColorElements = el.find('a.palette-color');
@@ -407,7 +407,7 @@ define([
if (value)
this.select(value, true);
else {
- var selected = $(this.el).find('a.' + this.selectedCls);
+ var selected = el.find('a.' + this.selectedCls);
if (selected.length && selected.hasClass('palette-color-effect')) {
this.value = selected[0].className.match(this.colorRe)[1].toUpperCase();
}
@@ -416,7 +416,7 @@ define([
},
clearSelection: function(suppressEvent) {
- $(this.el).find('a.' + this.selectedCls).removeClass(this.selectedCls);
+ this.$el.find('a.' + this.selectedCls).removeClass(this.selectedCls);
this.value = undefined;
},
diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js
index c95bb9878..d8b645e2c 100644
--- a/apps/common/main/lib/component/TreeView.js
+++ b/apps/common/main/lib/component/TreeView.js
@@ -193,7 +193,7 @@ define([
});
if (view) {
- var innerEl = $(this.el).find('.inner').addBack().filter('.inner');
+ var innerEl = (this.$el || $(this.el)).find('.inner').addBack().filter('.inner');
if (innerEl) {
(this.dataViewItems.length<1) && innerEl.find('.empty-text').remove();
diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index 76432c6f2..606e98736 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -63,6 +63,12 @@
* @cfg {Boolean} animate
* Makes the window to animate while showing or hiding
*
+ * @cfg {Object} buttons
+ * Use an array for predefined buttons (ok, cancel, yes, no): @example ['yes', 'no']
+ * Use a named array for the custom buttons: {value: caption, ...}
+ * @param {String} value will be returned in callback function
+ * @param {String} caption
+ *
* Methods
*
* @method show
@@ -106,12 +112,6 @@
* @window Common.UI.warning
* Shows warning message.
* @cfg {String} msg
- * @cfg {Object} buttons
- * Use an array for predefined buttons (ok, cancel, yes, no): @example ['yes', 'no']
- * Use a named array for the custom buttons: {value: caption, ...}
- * @param {String} value will be returned in callback function
- * @param {String} caption
- *
* @cfg {Function} callback
* @param {String} button
* If the window is closed via shortcut or header's close tool, the 'button' will be 'close'
@@ -167,7 +167,15 @@ define([
'<%= title %>
' +
'' +
'<% } %>' +
- '<%= tpl %>
' +
+ '<%= tpl %>' +
+ '<% if (typeof (buttons) !== "undefined" && _.size(buttons) > 0) { %>' +
+ '' +
+ '<% } %>' +
+ '
' +
'';
function _getMask() {
@@ -399,31 +407,9 @@ define([
Common.UI.alert = function(options) {
var me = this.Window.prototype;
- var arrBtns = {ok: me.okButtonText, cancel: me.cancelButtonText,
- yes: me.yesButtonText, no: me.noButtonText,
- close: me.closeButtonText};
if (!options.buttons) {
- options.buttons = {};
- options.buttons['ok'] = {text: arrBtns['ok'], cls: 'primary'};
- } else {
- if (_.isArray(options.buttons)) {
- if (options.primary==undefined)
- options.primary = 'ok';
- var newBtns = {};
- _.each(options.buttons, function(b){
- if (typeof(b) == 'object') {
- if (b.value !== undefined)
- newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
- } else {
- newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''};
- if (b=='custom')
- newBtns[b].cls += ' custom';
- }
- });
-
- options.buttons = newBtns;
- }
+ options.buttons = ['ok'];
}
options.dontshow = options.dontshow || false;
@@ -435,14 +421,7 @@ define([
'<% if (dontshow) { %>
<% } %>' +
'' +
'' +
- '<% if (dontshow) { %>
<% } %>' +
- '<% if (_.size(buttons) > 0) { %>' +
- '' +
- '<% } %>';
+ '<% if (dontshow) { %>
<% } %>';
_.extend(options, {
cls: 'alert',
@@ -500,7 +479,9 @@ define([
win.on({
'render:after': function(obj){
- obj.getChild('.footer .dlg-btn').on('click', onBtnClick);
+ var footer = obj.getChild('.footer');
+ options.dontshow && footer.addClass('dontshow');
+ footer.find('.dlg-btn').on('click', onBtnClick);
chDontShow = new Common.UI.CheckBox({
el: win.$window.find('.dont-show-checkbox'),
labelText: win.textDontShow
@@ -572,6 +553,29 @@ define([
this.initConfig = {};
this.binding = {};
+ var arrBtns = {ok: this.okButtonText, cancel: this.cancelButtonText,
+ yes: this.yesButtonText, no: this.noButtonText,
+ close: this.closeButtonText};
+
+ if (options.buttons && _.isArray(options.buttons)) {
+ if (options.primary==undefined)
+ options.primary = 'ok';
+ var newBtns = {};
+ _.each(options.buttons, function(b){
+ if (typeof(b) == 'object') {
+ if (b.value !== undefined)
+ newBtns[b.value] = {text: b.caption, cls: 'custom' + ((b.primary || options.primary==b.value) ? ' primary' : '')};
+ } else {
+ newBtns[b] = {text: (b=='custom') ? options.customButtonText : arrBtns[b], cls: (options.primary==b) ? 'primary' : ''};
+ if (b=='custom')
+ newBtns[b].cls += ' custom';
+ }
+ });
+
+ options.buttons = newBtns;
+ options.footerCls = options.footerCls || 'center';
+ }
+
_.extend(this.initConfig, config, options || {});
!this.initConfig.id && (this.initConfig.id = 'window-' + this.cid);
@@ -632,6 +636,8 @@ define([
};
Common.NotificationCenter.on('window:close', this.binding.winclose);
+ this.initConfig.footerCls && this.$window.find('.footer').addClass(this.initConfig.footerCls);
+
this.fireEvent('render:after',this);
return this;
},
diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index cb4c0eae6..c55a79656 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -172,7 +172,7 @@ define([
},
onAfterRender: function(panelPlugins) {
- panelPlugins.viewPluginsList.on('item:click', _.bind(this.onSelectPlugin, this));
+ panelPlugins.viewPluginsList && panelPlugins.viewPluginsList.on('item:click', _.bind(this.onSelectPlugin, this));
this.bindViewEvents(this.panelPlugins, this.events);
var me = this;
Common.NotificationCenter.on({
diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index f6c966be0..e291dc5c0 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -618,7 +618,7 @@ define([
comments.setPreviewMode(disable);
var leftMenu = app.getController('LeftMenu');
- leftMenu.leftMenu.getMenu('file').miProtect.setDisabled(disable);
+ leftMenu.leftMenu.getMenu('file').getButton('protect').setDisabled(disable);
leftMenu.setPreviewMode(disable);
if (this.view) {
@@ -643,7 +643,7 @@ define([
onAppReady: function (config) {
var me = this;
- if ( me.view && Common.localStorage.getBool(me.view.appPrefix + "settings-spellcheck", true) )
+ if ( me.view && Common.localStorage.getBool(me.view.appPrefix + "settings-spellcheck", !(config.customization && config.customization.spellcheck===false)))
me.view.turnSpelling(true);
if ( config.canReview ) {
diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js
index ee19f55bb..b672b15c6 100644
--- a/apps/common/main/lib/util/LanguageInfo.js
+++ b/apps/common/main/lib/util/LanguageInfo.js
@@ -363,6 +363,8 @@ Common.util.LanguageInfo = new(function() {
0x380A : ["es-UY", "Español (Uruguay)", "Spanish (Uruguay)"],
0x200A : ["es-VE", "Español (Republica Bolivariana de Venezuela)", "Spanish (Venezuela)"],
0x040a : ["es-ES_tradnl", "Spanish"],
+ 0x580a : ["es-419", "Español (América Latina y el Caribe)", "Spanish (Latin America and the Caribbean)"],
+ 0x5C0a : ["es-CU", "Español (Cuba)", "Spanish (Cuba)"],
0x001D : ["sv", "Svenska"],
0x081D : ["sv-FI", "Svenska (Finland)", "Swedish (Finland)"],
0x041D : ["sv-SE", "Svenska (Sverige)", "Swedish (Sweden)"],
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
index fe3601e45..f1c758af0 100644
--- a/apps/common/main/lib/util/utils.js
+++ b/apps/common/main/lib/util/utils.js
@@ -87,12 +87,12 @@ Common.Utils = _.extend(new(function() {
isSecure = /^https/i.test(window.location.protocol),
emailRe = /^(mailto:)?([a-z0-9'\._-]+@[a-z0-9\.-]+\.[a-z0-9]{2,4})([a-яё0-9\._%+-=\? :&]*)/i,
ipRe = /^(((https?)|(ftps?)):\/\/)?([\-\wа-яё]*:?[\-\wа-яё]*@)?(((1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9])\.){3}(1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9]))(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/+@:`~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?/i,
- hostnameRe = /^(((https?)|(ftps?)):\/\/)?([\-\wа-яё]*:?[\-\wа-яё]*@)?(([\-\wа-яё]+\.)+[\wа-яё\-]{2,}(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/+@:`'~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/i,
- localRe = /^(((https?)|(ftps?)):\/\/)([\-\wа-яё]*:?[\-\wа-яё]*@)?(([\-\wа-яё]+)(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/+@:`'~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/i,
+ hostnameRe = /^(((https?)|(ftps?)):\/\/)?([\-\wа-яё]*:?[\-\wа-яё]*@)?(([\-\wа-яё]+\.)+[\wа-яё\-]{2,}(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/\+@:`'~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/i,
+ localRe = /^(((https?)|(ftps?)):\/\/)([\-\wа-яё]*:?[\-\wа-яё]*@)?(([\-\wа-яё]+)(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/\+@:`'~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/i,
emailStrongRe = /(mailto:)?([a-z0-9'\._-]+@[a-z0-9\.-]+\.[a-z0-9]{2,4})([a-яё0-9\._%+-=\?:&]*)/ig,
- emailAddStrongRe = /(mailto:|\s[@]|\s[+])?([a-z0-9'\._-]+@[a-z0-9\.-]+\.[a-z0-9]{2,4})([a-яё0-9\._%+-=\?:&]*)/ig,
- ipStrongRe = /(((https?)|(ftps?)):\/\/([\-\wа-яё]*:?[\-\wа-яё]*@)?)(((1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9])\.){3}(1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9]))(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/+@:`~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?/ig,
- hostnameStrongRe = /((((https?)|(ftps?)):\/\/([\-\wа-яё]*:?[\-\wа-яё]*@)?)|(([\-\wа-яё]*:?[\-\wа-яё]*@)?www\.))((([\-\wа-яё]+\.)+[\wа-яё\-]{2,}|([\-\wа-яё]+))(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/+@:`~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/ig,
+ emailAddStrongRe = /(mailto:|\s[@]|\s[+])?([a-z0-9'\._-]+@[a-z0-9\.-]+\.[a-z0-9]{2,4})([a-яё0-9\._%\+-=\?:&]*)/ig,
+ ipStrongRe = /(((https?)|(ftps?)):\/\/([\-\wа-яё]*:?[\-\wа-яё]*@)?)(((1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9])\.){3}(1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9][0-9]|[0-9]))(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/\+@:`~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?/ig,
+ hostnameStrongRe = /((((https?)|(ftps?)):\/\/([\-\wа-яё]*:?[\-\wа-яё]*@)?)|(([\-\wа-яё]*:?[\-\wа-яё]*@)?www\.))((([\-\wа-яё]+\.)+[\wа-яё\-]{2,}|([\-\wа-яё]+))(:\d+)?(\/[%\-\wа-яё]*(\.[\wа-яё]{2,})?(([\wа-яё\-\.\?\\\/\+@:`~=%!,\(\)]*)(\.[\wа-яё]{2,})?)*)*\/?)/ig,
documentSettingsType = {
Paragraph : 0,
Table : 1,
@@ -846,6 +846,47 @@ Common.Utils.injectComponent = function ($slot, cmp) {
}
};
+jQuery.fn.extend({
+ elementById: function (id, parent) {
+ /**
+ * usage: $obj.findById('#id')
+ * $().findById('#id', $obj | node)
+ * $.fn.findById('#id', $obj | node)
+ *
+ * return: dom element
+ * */
+ var _el = document.getElementById(id.substring(1));
+ if ( !_el ) {
+ parent = parent || this;
+ if ( parent instanceof jQuery ) {
+ parent.each(function (i, node) {
+ _el = node.querySelectorAll(id);
+ if ( _el.length == 0 ) {
+ if ( ('#' + node.id) == id ) {
+ _el = node;
+ return false;
+ }
+ } else
+ if ( _el.length ) {
+ _el = _el[0];
+ return false;
+ }
+ })
+ } else {
+ _el = parent.querySelectorAll(id);
+ if ( _el && _el.length ) return _el[0];
+ }
+ }
+
+ return _el;
+ },
+
+ findById: function (id, parent) {
+ var _el = $.fn.elementById.apply(this, arguments);
+ return !!_el ? $(_el) : $();
+ }
+});
+
Common.Utils.InternalSettings.set('toolbar-height-tabs', 32);
Common.Utils.InternalSettings.set('toolbar-height-tabs-top-title', 28);
Common.Utils.InternalSettings.set('toolbar-height-controls', 67);
diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js
index 4a50978b3..5bf6bf72a 100644
--- a/apps/common/main/lib/view/About.js
+++ b/apps/common/main/lib/view/About.js
@@ -45,6 +45,7 @@ define([
Common.Views.About = Common.UI.BaseView.extend(_.extend({
menu: undefined,
+ rendered: false,
options: {
alias: 'Common.Views.About'
},
@@ -152,81 +153,95 @@ define([
},
render: function() {
- var el = $(this.el);
- el.html(this.template({
- publishername: '{{PUBLISHER_NAME}}',
- publisheraddr: '{{PUBLISHER_ADDRESS}}',
- publisherurl: '{{PUBLISHER_URL}}',
- supportemail: '{{SUPPORT_EMAIL}}',
- phonenum: '{{PUBLISHER_PHONE}}',
- scope: this
- }));
+ if ( !this.rendered ) {
+ this.rendered = true;
- el.addClass('about-dlg');
- this.cntLicenseeInfo = $('#id-about-licensee-info');
- this.cntLicensorInfo = $('#id-about-licensor-info');
- this.divCompanyLogo = $('#id-about-company-logo');
- this.lblCompanyName = $('#id-about-company-name');
- this.lblCompanyAddress = $('#id-about-company-address');
- this.lblCompanyMail = $('#id-about-company-mail');
- this.lblCompanyUrl = $('#id-about-company-url');
- this.lblCompanyLic = $('#id-about-company-lic');
+ var _$l = $(this.template({
+ publishername: '{{PUBLISHER_NAME}}',
+ publisheraddr: '{{PUBLISHER_ADDRESS}}',
+ publisherurl: '{{PUBLISHER_URL}}',
+ supportemail: '{{SUPPORT_EMAIL}}',
+ phonenum: '{{PUBLISHER_PHONE}}',
+ scope: this
+ }));
- if (_.isUndefined(this.scroller)) {
- this.scroller = new Common.UI.Scroller({
- el: $(this.el),
- suppressScrollX: true
- });
+ this.cntLicenseeInfo = _$l.findById('#id-about-licensee-info');
+ this.cntLicensorInfo = _$l.findById('#id-about-licensor-info');
+ this.divCompanyLogo = _$l.findById('#id-about-company-logo');
+ this.lblCompanyName = _$l.findById('#id-about-company-name');
+ this.lblCompanyAddress = _$l.findById('#id-about-company-address');
+ this.lblCompanyMail = _$l.findById('#id-about-company-mail');
+ this.lblCompanyUrl = _$l.findById('#id-about-company-url');
+ this.lblCompanyLic = _$l.findById('#id-about-company-lic');
+
+ if ( this.licData )
+ this.setLicInfo(this.licData);
+
+ this.$el.html(_$l);
+ this.$el.addClass('about-dlg');
+
+ if (_.isUndefined(this.scroller)) {
+ this.scroller = new Common.UI.Scroller({
+ el: this.$el,
+ suppressScrollX: true
+ });
+ }
}
return this;
},
setLicInfo: function(data){
- if (data && typeof data == 'object' && typeof(data.customer)=='object') {
- var customer = data.customer;
-
- $('#id-about-licensor-logo').addClass('hidden');
- $('#id-about-licensor-short').removeClass('hidden');
- this.cntLicensorInfo.addClass('hidden');
+ if ( !this.rendered ) {
+ this.licData = data || true;
+ } else {
+ if (data && typeof data == 'object' && typeof(data.customer)=='object') {
+ var customer = data.customer;
- this.cntLicenseeInfo.removeClass('hidden');
- this.cntLicensorInfo.removeClass('margin-bottom');
+ $('#id-about-licensor-logo').addClass('hidden');
+ $('#id-about-licensor-short').removeClass('hidden');
+ this.cntLicensorInfo.addClass('hidden');
- var value = customer.name;
- value && value.length ?
+ this.cntLicenseeInfo.removeClass('hidden');
+ this.cntLicensorInfo.removeClass('margin-bottom');
+
+ var value = customer.name;
+ value && value.length ?
this.lblCompanyName.text(value) :
this.lblCompanyName.parents('tr').addClass('hidden');
- value = customer.address;
- value && value.length ?
+ value = customer.address;
+ value && value.length ?
this.lblCompanyAddress.text(value) :
this.lblCompanyAddress.parents('tr').addClass('hidden');
- (value = customer.mail) && value.length ?
+ (value = customer.mail) && value.length ?
this.lblCompanyMail.attr('href', "mailto:"+value).text(value) :
this.lblCompanyMail.parents('tr').addClass('hidden');
- if ((value = customer.www) && value.length) {
- var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : '';
- this.lblCompanyUrl.attr('href', http+value).text(value);
- } else
- this.lblCompanyUrl.parents('tr').addClass('hidden');
+ if ((value = customer.www) && value.length) {
+ var http = !/^https?:\/{2}/i.test(value) ? "http:\/\/" : '';
+ this.lblCompanyUrl.attr('href', http+value).text(value);
+ } else
+ this.lblCompanyUrl.parents('tr').addClass('hidden');
- (value = customer.info) && value.length ?
+ (value = customer.info) && value.length ?
this.lblCompanyLic.text(value) :
this.lblCompanyLic.parents('tr').addClass('hidden');
- (value = customer.logo) && value.length ?
+ (value = customer.logo) && value.length ?
this.divCompanyLogo.html(' ') :
this.divCompanyLogo.parents('tr').addClass('hidden');
- } else {
- this.cntLicenseeInfo.addClass('hidden');
- this.cntLicensorInfo.addClass('margin-bottom');
+ } else {
+ this.cntLicenseeInfo.addClass('hidden');
+ this.cntLicensorInfo.addClass('margin-bottom');
+ }
}
},
show: function () {
+ if ( !this.rendered ) this.render();
+
Common.UI.BaseView.prototype.show.call(this,arguments);
this.fireEvent('show', this );
},
diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js
index c269de6e4..153bf86b2 100644
--- a/apps/common/main/lib/view/AdvancedSettingsWindow.js
+++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js
@@ -51,7 +51,8 @@ define([
cls: 'advanced-settings-dlg',
toggleGroup: 'advanced-settings-group',
contentTemplate: '',
- items: []
+ items: [],
+ buttons: ['ok', 'cancel']
}, options);
this.template = options.template || [
@@ -64,11 +65,7 @@ define([
'
',
'' + _options.contentTemplate + '
',
'',
- '
',
- ''
+ '
'
].join('');
_options.tpl = _.template(this.template)(_options);
@@ -190,9 +187,6 @@ define([
if (this.storageName)
Common.localStorage.setItem(this.storageName, this.getActiveCategory());
Common.UI.Window.prototype.close.call(this, suppressevent);
- },
-
- cancelButtonText: 'Cancel',
- okButtonText : 'Ok'
+ }
}, Common.Views.AdvancedSettingsWindow || {}));
});
\ No newline at end of file
diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js
index 19ab599fb..03bee46be 100644
--- a/apps/common/main/lib/view/Chat.js
+++ b/apps/common/main/lib/view/Chat.js
@@ -216,6 +216,9 @@ define([
var arr = [], offset, len;
message.replace(Common.Utils.ipStrongRe, function(subStr) {
+ var result = /[\.,\?\+;:=!\(\)]+$/.exec(subStr);
+ if (result)
+ subStr = subStr.substring(0, result.index);
offset = arguments[arguments.length-2];
arr.push({start: offset, end: subStr.length+offset, str: '' + subStr + ' '});
return '';
@@ -223,6 +226,9 @@ define([
if (message.length<1000 || message.search(/\S{255,}/)<0)
message.replace(Common.Utils.hostnameStrongRe, function(subStr) {
+ var result = /[\.,\?\+;:=!\(\)]+$/.exec(subStr);
+ if (result)
+ subStr = subStr.substring(0, result.index);
var ref = (! /(((^https?)|(^ftp)):\/\/)/i.test(subStr) ) ? ('http://' + subStr) : subStr;
offset = arguments[arguments.length-2];
len = subStr.length;
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js
index 788a1df3b..5dc3bcd5b 100644
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@@ -72,6 +72,99 @@ define([
return tpl;
}
+ var CommentsPanelDataView = Common.UI.DataView.extend((function() {
+ return {
+ options : {
+ handleSelect: false,
+ scrollable: true,
+ listenStoreEvents: false,
+ template: _.template('
')
+ },
+
+ getTextBox: function () {
+ var text = $(this.el).find('textarea');
+ return (text && text.length) ? text : undefined;
+ },
+ setFocusToTextBox: function () {
+ var text = $(this.el).find('textarea');
+ if (text && text.length) {
+ var val = text.val();
+ text.focus();
+ text.val('');
+ text.val(val);
+ }
+ },
+ getActiveTextBoxVal: function () {
+ var text = $(this.el).find('textarea');
+ return (text && text.length) ? text.val().trim() : '';
+ },
+ autoHeightTextBox: function () {
+ var view = this,
+ textBox = $(this.el).find('textarea'),
+ domTextBox = null,
+ minHeight = 50,
+ lineHeight = 0,
+ scrollPos = 0,
+ oldHeight = 0,
+ newHeight = 0;
+
+ function updateTextBoxHeight() {
+ if (domTextBox.scrollHeight > domTextBox.clientHeight) {
+ textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
+ } else {
+ oldHeight = domTextBox.clientHeight;
+ if (oldHeight >= minHeight) {
+
+ textBox.css({height: minHeight + 'px'});
+
+ if (domTextBox.scrollHeight > domTextBox.clientHeight) {
+ newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight);
+ textBox.css({height: newHeight + 'px'});
+ }
+ }
+ }
+
+ view.autoScrollToEditButtons();
+ }
+
+ if (textBox && textBox.length) {
+ domTextBox = textBox.get(0);
+
+ if (domTextBox) {
+ lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
+ updateTextBoxHeight();
+ textBox.bind('input propertychange', updateTextBoxHeight)
+ }
+ }
+
+ this.textBox = textBox;
+ },
+ clearTextBoxBind: function () {
+ if (this.textBox) {
+ this.textBox.unbind('input propertychange');
+ this.textBox = undefined;
+ }
+ },
+ autoScrollToEditButtons: function () {
+ var button = $('#id-comments-change'), // TODO: add to cache
+ btnBounds = null,
+ contentBounds = this.el.getBoundingClientRect(),
+ moveY = 0,
+ padding = 7;
+
+ if (button.length) {
+ btnBounds = button.get(0).getBoundingClientRect();
+ if (btnBounds && contentBounds) {
+ moveY = contentBounds.bottom - (btnBounds.bottom + padding);
+ if (moveY < 0) {
+ this.scroller.scrollTop(this.scroller.getScrollTop() - moveY);
+ }
+ }
+ }
+ }
+ }
+ })());
+
Common.Views.Comments = Common.UI.BaseView.extend(_.extend({
el: '#left-panel-comments',
template: _.template(panelTemplate),
@@ -81,11 +174,126 @@ define([
textBoxAutoSizeLocked: undefined, // disable autosize textbox
viewmode: false,
+ _commentsViewOnItemClick: function (picker, item, record, e) {
+ var me = this;
+ var btn, showEditBox, showReplyBox, commentId, replyId, hideAddReply;
+
+ function readdresolves() {
+ me.update();
+ }
+
+ btn = $(e.target);
+ if (btn) {
+ showEditBox = record.get('editText');
+ showReplyBox = record.get('showReply');
+ commentId = record.get('uid');
+ replyId = btn.attr('data-value');
+
+ if (btn.hasClass('btn-edit')) {
+ if (!_.isUndefined(replyId)) {
+ me.fireEvent('comment:closeEditing', [commentId]);
+ me.fireEvent('comment:editReply', [commentId, replyId]);
+
+ me.commentsView.reply = replyId;
+
+ this.autoHeightTextBox();
+
+ readdresolves();
+
+ me.hookTextBox();
+
+ this.autoScrollToEditButtons();
+ this.setFocusToTextBox();
+ } else {
+
+ if (!showEditBox) {
+ me.fireEvent('comment:closeEditing');
+ record.set('editText', true);
+
+ this.autoHeightTextBox();
+ readdresolves();
+ this.setFocusToTextBox();
+ me.hookTextBox();
+ }
+ }
+ } else if (btn.hasClass('btn-delete')) {
+ if (!_.isUndefined(replyId)) {
+ me.fireEvent('comment:removeReply', [commentId, replyId]);
+ } else {
+ me.fireEvent('comment:remove', [commentId]);
+ Common.NotificationCenter.trigger('edit:complete', me);
+ }
+
+ me.fireEvent('comment:closeEditing');
+ readdresolves();
+ } else if (btn.hasClass('user-reply')) {
+ me.fireEvent('comment:closeEditing');
+ record.set('showReply', true);
+
+ readdresolves();
+
+ this.autoHeightTextBox();
+ me.hookTextBox();
+
+ this.autoScrollToEditButtons();
+ this.setFocusToTextBox();
+ } else if (btn.hasClass('btn-reply', false)) {
+ if (showReplyBox) {
+ me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
+ me.fireEvent('comment:closeEditing');
+
+ readdresolves();
+ }
+ } else if (btn.hasClass('btn-close', false)) {
+
+ me.fireEvent('comment:closeEditing', [commentId]);
+
+ } else if (btn.hasClass('btn-inner-edit', false)) {
+ if (!_.isUndefined(me.commentsView.reply)) {
+ me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, this.getActiveTextBoxVal()]);
+ me.commentsView.reply = undefined;
+ } else if (showEditBox) {
+ me.fireEvent('comment:change', [commentId, this.getActiveTextBoxVal()]);
+ }
+
+ me.fireEvent('comment:closeEditing');
+
+ readdresolves();
+
+ } else if (btn.hasClass('btn-inner-close', false)) {
+ me.fireEvent('comment:closeEditing');
+
+ me.commentsView.reply = undefined;
+
+ readdresolves();
+ } else if (btn.hasClass('btn-resolve', false)) {
+ var tip = btn.data('bs.tooltip');
+ if (tip) tip.dontShow = true;
+
+ me.fireEvent('comment:resolve', [commentId]);
+
+ readdresolves();
+ } else if (btn.hasClass('btn-resolve-check', false)) {
+ var tip = btn.data('bs.tooltip');
+ if (tip) tip.dontShow = true;
+
+ me.fireEvent('comment:resolve', [commentId]);
+
+ readdresolves();
+ } else if (!btn.hasClass('msg-reply') &&
+ !btn.hasClass('btn-resolve-check') &&
+ !btn.hasClass('btn-resolve')) {
+ me.fireEvent('comment:show', [commentId, false]);
+ }
+ }
+ },
+
initialize: function (options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
this.store = this.options.store;
},
+
render: function () {
var me = this;
@@ -134,255 +342,51 @@ define([
}
});
}
- var CommentsPanelDataView = Common.UI.DataView.extend((function() {
- return {
+ if (this.commentsView) {
+ this.commentsView.onResetItems();
+ } else {
+ this.commentsView = new CommentsPanelDataView({
+ el: $('.messages-ct',me.el),
+ store: me.store,
+ itemTemplate: _.template(replaceWords(commentsTemplate, {
+ textAddReply: me.textAddReply,
+ textAdd: me.textAdd,
+ textCancel: me.textCancel,
+ textEdit: me.textEdit,
+ textReply: me.textReply,
+ textClose: me.textClose,
+ maxCommLength: Asc.c_oAscMaxCellOrCommentLength
+ }))
+ });
- options : {
- handleSelect: false,
- scrollable: true,
- listenStoreEvents: false,
- template: _.template('
')
- },
-
- getTextBox: function () {
- var text = $(this.el).find('textarea');
- return (text && text.length) ? text : undefined;
- },
- setFocusToTextBox: function () {
- var text = $(this.el).find('textarea');
- if (text && text.length) {
- var val = text.val();
- text.focus();
- text.val('');
- text.val(val);
- }
- },
- getActiveTextBoxVal: function () {
- var text = $(this.el).find('textarea');
- return (text && text.length) ? text.val().trim() : '';
- },
- autoHeightTextBox: function () {
- var view = this,
- textBox = $(this.el).find('textarea'),
- domTextBox = null,
- minHeight = 50,
- lineHeight = 0,
- scrollPos = 0,
- oldHeight = 0,
- newHeight = 0;
-
- function updateTextBoxHeight() {
- if (domTextBox.scrollHeight > domTextBox.clientHeight) {
- textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
- } else {
- oldHeight = domTextBox.clientHeight;
- if (oldHeight >= minHeight) {
-
- textBox.css({height: minHeight + 'px'});
-
- if (domTextBox.scrollHeight > domTextBox.clientHeight) {
- newHeight = Math.max(domTextBox.scrollHeight + lineHeight, minHeight);
- textBox.css({height: newHeight + 'px'});
- }
- }
- }
-
- view.autoScrollToEditButtons();
- }
-
- if (textBox && textBox.length) {
- domTextBox = textBox.get(0);
-
- if (domTextBox) {
- lineHeight = parseInt(textBox.css('lineHeight'), 10) * 0.25;
- updateTextBoxHeight();
- textBox.bind('input propertychange', updateTextBoxHeight)
- }
- }
-
- this.textBox = textBox;
- },
- clearTextBoxBind: function () {
- if (this.textBox) {
- this.textBox.unbind('input propertychange');
- this.textBox = undefined;
- }
- },
- autoScrollToEditButtons: function () {
- var button = $('#id-comments-change'), // TODO: add to cache
- btnBounds = null,
- contentBounds = this.el.getBoundingClientRect(),
- moveY = 0,
- padding = 7;
-
- if (button.length) {
- btnBounds = button.get(0).getBoundingClientRect();
- if (btnBounds && contentBounds) {
- moveY = contentBounds.bottom - (btnBounds.bottom + padding);
- if (moveY < 0) {
- this.scroller.scrollTop(this.scroller.getScrollTop() - moveY);
- }
- }
- }
+ var addtooltip = function (dataview, view, record) {
+ if (view.tipsArray) {
+ view.tipsArray.forEach(function(item){
+ item.remove();
+ });
}
- }
- })());
- if (CommentsPanelDataView) {
- if (this.commentsView) {
- this.commentsView.onResetItems();
- } else {
- this.commentsView = new CommentsPanelDataView({
- el: $('.messages-ct',me.el),
- store: me.store,
- itemTemplate: _.template(replaceWords(commentsTemplate, {
- textAddReply: me.textAddReply,
- textAdd: me.textAdd,
- textCancel: me.textCancel,
- textEdit: me.textEdit,
- textReply: me.textReply,
- textClose: me.textClose,
- maxCommLength: Asc.c_oAscMaxCellOrCommentLength
- }))
+
+ var arr = [],
+ btns = $(view.el).find('.btn-resolve');
+ btns.tooltip({title: me.textResolve, placement: 'cursor'});
+ btns.each(function(idx, item){
+ arr.push($(item).data('bs.tooltip').tip());
});
-
- var addtooltip = function (dataview, view, record) {
- if (view.tipsArray) {
- view.tipsArray.forEach(function(item){
- item.remove();
- });
- }
-
- var arr = [],
- btns = $(view.el).find('.btn-resolve');
- btns.tooltip({title: me.textResolve, placement: 'cursor'});
- btns.each(function(idx, item){
- arr.push($(item).data('bs.tooltip').tip());
- });
- btns = $(view.el).find('.btn-resolve-check');
- btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
- btns.each(function(idx, item){
- arr.push($(item).data('bs.tooltip').tip());
- });
- view.tipsArray = arr;
- };
- this.commentsView.on('item:add', addtooltip);
- this.commentsView.on('item:remove', addtooltip);
- this.commentsView.on('item:change', addtooltip);
-
- this.commentsView.on('item:click', function (picker, item, record, e) {
- var btn, showEditBox, showReplyBox, commentId, replyId, hideAddReply;
-
- function readdresolves() {
- me.update();
- }
-
- btn = $(e.target);
- if (btn) {
- showEditBox = record.get('editText');
- showReplyBox = record.get('showReply');
- commentId = record.get('uid');
- replyId = btn.attr('data-value');
-
- if (btn.hasClass('btn-edit')) {
- if (!_.isUndefined(replyId)) {
- me.fireEvent('comment:closeEditing', [commentId]);
- me.fireEvent('comment:editReply', [commentId, replyId]);
-
- me.commentsView.reply = replyId;
-
- this.autoHeightTextBox();
-
- readdresolves();
-
- me.hookTextBox();
-
- this.autoScrollToEditButtons();
- this.setFocusToTextBox();
- } else {
-
- if (!showEditBox) {
- me.fireEvent('comment:closeEditing');
- record.set('editText', true);
-
- this.autoHeightTextBox();
- readdresolves();
- this.setFocusToTextBox();
- me.hookTextBox();
- }
- }
- } else if (btn.hasClass('btn-delete')) {
- if (!_.isUndefined(replyId)) {
- me.fireEvent('comment:removeReply', [commentId, replyId]);
- } else {
- me.fireEvent('comment:remove', [commentId]);
- Common.NotificationCenter.trigger('edit:complete', me);
- }
-
- me.fireEvent('comment:closeEditing');
- readdresolves();
- } else if (btn.hasClass('user-reply')) {
- me.fireEvent('comment:closeEditing');
- record.set('showReply', true);
-
- readdresolves();
-
- this.autoHeightTextBox();
- me.hookTextBox();
-
- this.autoScrollToEditButtons();
- this.setFocusToTextBox();
- } else if (btn.hasClass('btn-reply', false)) {
- if (showReplyBox) {
- me.fireEvent('comment:addReply', [commentId, this.getActiveTextBoxVal()]);
- me.fireEvent('comment:closeEditing');
-
- readdresolves();
- }
- } else if (btn.hasClass('btn-close', false)) {
-
- me.fireEvent('comment:closeEditing', [commentId]);
-
- } else if (btn.hasClass('btn-inner-edit', false)) {
- if (!_.isUndefined(me.commentsView.reply)) {
- me.fireEvent('comment:changeReply', [commentId, me.commentsView.reply, this.getActiveTextBoxVal()]);
- me.commentsView.reply = undefined;
- } else if (showEditBox) {
- me.fireEvent('comment:change', [commentId, this.getActiveTextBoxVal()]);
- }
-
- me.fireEvent('comment:closeEditing');
-
- readdresolves();
-
- } else if (btn.hasClass('btn-inner-close', false)) {
- me.fireEvent('comment:closeEditing');
-
- me.commentsView.reply = undefined;
-
- readdresolves();
- } else if (btn.hasClass('btn-resolve', false)) {
- var tip = btn.data('bs.tooltip');
- if (tip) tip.dontShow = true;
-
- me.fireEvent('comment:resolve', [commentId]);
-
- readdresolves();
- } else if (btn.hasClass('btn-resolve-check', false)) {
- var tip = btn.data('bs.tooltip');
- if (tip) tip.dontShow = true;
-
- me.fireEvent('comment:resolve', [commentId]);
-
- readdresolves();
- } else if (!btn.hasClass('msg-reply') &&
- !btn.hasClass('btn-resolve-check') &&
- !btn.hasClass('btn-resolve')) {
- me.fireEvent('comment:show', [commentId, false]);
- }
- }
+ btns = $(view.el).find('.btn-resolve-check');
+ btns.tooltip({title: me.textOpenAgain, placement: 'cursor'});
+ btns.each(function(idx, item){
+ arr.push($(item).data('bs.tooltip').tip());
});
- }
+ view.tipsArray = arr;
+ };
+
+ this.commentsView.on({
+ 'item:add': addtooltip,
+ 'item:remove': addtooltip,
+ 'item:change': addtooltip,
+ 'item:click': this._commentsViewOnItemClick.bind(this)
+ });
}
if (!this.rendered) this.setupLayout();
@@ -482,7 +486,7 @@ define([
},
setupLayout: function () {
- var me = this, parent = $(me.el);
+ var me = this, parent = me.$el;
var add = $('.new-comment-ct', me.el),
to = $('.add-link-ct', me.el),
@@ -655,6 +659,9 @@ define([
message = Common.Utils.String.htmlEncode(message);
message.replace(Common.Utils.ipStrongRe, function(subStr) {
+ var result = /[\.,\?\+;:=!\(\)]+$/.exec(subStr);
+ if (result)
+ subStr = subStr.substring(0, result.index);
offset = arguments[arguments.length-2];
arr.push({start: offset, end: subStr.length+offset, str: '' + subStr + ' '});
return '';
@@ -662,6 +669,9 @@ define([
if (message.length<1000 || message.search(/\S{255,}/)<0)
message.replace(Common.Utils.hostnameStrongRe, function(subStr) {
+ var result = /[\.,\?\+;:=!\(\)]+$/.exec(subStr);
+ if (result)
+ subStr = subStr.substring(0, result.index);
var ref = (! /(((^https?)|(^ftp)):\/\/)/i.test(subStr) ) ? ('http://' + subStr) : subStr;
offset = arguments[arguments.length-2];
len = subStr.length;
diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js
index 1b5d6009c..95b1150b0 100644
--- a/apps/common/main/lib/view/CopyWarningDialog.js
+++ b/apps/common/main/lib/view/CopyWarningDialog.js
@@ -50,12 +50,14 @@ define([
options: {
width : 500,
height : 325,
- cls : 'modal-dlg copy-warning'
+ cls : 'modal-dlg copy-warning',
+ buttons: ['ok']
},
initialize : function(options) {
_.extend(this.options, {
- title: this.textTitle
+ title: this.textTitle,
+ buttons: ['ok']
}, options || {});
this.template = [
@@ -77,10 +79,7 @@ define([
'',
'
',
'',
- '
',
- ''
+ '
'
].join('');
this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js
index e7ac52a48..2790ee764 100644
--- a/apps/common/main/lib/view/ExtendedColorDialog.js
+++ b/apps/common/main/lib/view/ExtendedColorDialog.js
@@ -286,7 +286,6 @@ define([
return false;
},
- cancelButtonText: 'Cancel',
addButtonText: 'Add',
textNew: 'New',
textCurrent: 'Current',
diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js
index 6ad1e7317..c5f26a44c 100644
--- a/apps/common/main/lib/view/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/view/ExternalDiagramEditor.js
@@ -61,7 +61,7 @@ define([
'',
'
',
''
].join('');
diff --git a/apps/common/main/lib/view/ExternalMergeEditor.js b/apps/common/main/lib/view/ExternalMergeEditor.js
index 795956662..3fd1e79f1 100644
--- a/apps/common/main/lib/view/ExternalMergeEditor.js
+++ b/apps/common/main/lib/view/ExternalMergeEditor.js
@@ -61,7 +61,7 @@ define([
'',
'
',
''
].join('');
diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 12ce705de..0e2a7619d 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -489,13 +489,13 @@ define([
if ( !config.isEdit ) {
if ( (config.canDownload || config.canDownloadOrigin) && !config.isOffline )
- this.btnDownload = createTitleButton('svg-btn-download', $html.find('#slot-hbtn-download'));
+ this.btnDownload = createTitleButton('svg-btn-download', $html.findById('#slot-hbtn-download'));
if ( config.canPrint )
- this.btnPrint = createTitleButton('svg-btn-print', $html.find('#slot-hbtn-print'));
+ this.btnPrint = createTitleButton('svg-btn-print', $html.findById('#slot-hbtn-print'));
if ( config.canEdit && config.canRequestEditRights )
- this.btnEdit = createTitleButton('svg-btn-edit', $html.find('#slot-hbtn-edit'));
+ this.btnEdit = createTitleButton('svg-btn-edit', $html.findById('#slot-hbtn-edit'));
}
me.btnOptions.render($html.find('#slot-btn-options'));
@@ -519,12 +519,12 @@ define([
me.setUserName(me.options.userName);
if ( config.canPrint && config.isEdit ) {
- me.btnPrint = createTitleButton('svg-btn-print', $('#slot-btn-dt-print', $html), true);
+ me.btnPrint = createTitleButton('svg-btn-print', $html.findById('#slot-btn-dt-print'), true);
}
- me.btnSave = createTitleButton('svg-btn-save', $('#slot-btn-dt-save', $html), true);
- me.btnUndo = createTitleButton('svg-btn-undo', $('#slot-btn-dt-undo', $html), true);
- me.btnRedo = createTitleButton('svg-btn-redo', $('#slot-btn-dt-redo', $html), true);
+ me.btnSave = createTitleButton('svg-btn-save', $html.findById('#slot-btn-dt-save'), true);
+ me.btnUndo = createTitleButton('svg-btn-undo', $html.findById('#slot-btn-dt-undo'), true);
+ me.btnRedo = createTitleButton('svg-btn-redo', $html.findById('#slot-btn-dt-redo'), true);
if ( me.btnSave.$icon.is('svg') ) {
me.btnSave.$icon.addClass('icon-save');
diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js
index 63b0ea685..0f8cfff5e 100644
--- a/apps/common/main/lib/view/ImageFromUrlDialog.js
+++ b/apps/common/main/lib/view/ImageFromUrlDialog.js
@@ -46,7 +46,9 @@ define([
options: {
width: 330,
header: false,
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
initialize : function(options) {
@@ -58,10 +60,6 @@ define([
'' + this.textUrl + ' ',
'',
'
',
- '',
- ''
].join('');
@@ -123,8 +121,6 @@ define([
},
textUrl : 'Paste an image URL:',
- cancelButtonText: 'Cancel',
- okButtonText : 'Ok',
txtEmpty : 'This field is required',
txtNotUrl : 'This field should be a URL in the format \"http://www.example.com\"'
}, Common.Views.ImageFromUrlDialog || {}));
diff --git a/apps/common/main/lib/view/InsertTableDialog.js b/apps/common/main/lib/view/InsertTableDialog.js
index c37c4890b..b4b65d017 100644
--- a/apps/common/main/lib/view/InsertTableDialog.js
+++ b/apps/common/main/lib/view/InsertTableDialog.js
@@ -51,7 +51,8 @@ define([
height: 156,
style: 'min-width: 230px;',
cls: 'modal-dlg',
- split: false
+ split: false,
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
@@ -67,10 +68,6 @@ define([
'',
- '',
- ''
].join('');
@@ -138,8 +135,6 @@ define([
txtColumns: 'Number of Columns',
txtRows: 'Number of Rows',
textInvalidRowsCols: 'You need to specify valid rows and columns count.',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtMinText: 'The minimum value for this field is {0}',
txtMaxText: 'The maximum value for this field is {0}'
}, Common.Views.InsertTableDialog || {}))
diff --git a/apps/common/main/lib/view/LanguageDialog.js b/apps/common/main/lib/view/LanguageDialog.js
index 45a06a46c..ad4216a15 100644
--- a/apps/common/main/lib/view/LanguageDialog.js
+++ b/apps/common/main/lib/view/LanguageDialog.js
@@ -51,25 +51,22 @@ define([
options: {
header: false,
width: 350,
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
template: '' +
- '
' +
- '<%= label %> ' +
- '
' +
- '
' +
- '
' +
- '
' +
- '',
+ '' +
+ '<%= label %> ' +
+ '
' +
+ '' +
+ '
' +
+ '',
initialize : function(options) {
_.extend(this.options, options || {}, {
- label: this.labelSelect,
- btns: {ok: this.btnOk, cancel: this.btnCancel}
+ label: this.labelSelect
});
this.options.tpl = _.template(this.template)(this.options);
@@ -144,8 +141,6 @@ define([
return false;
},
- labelSelect : 'Select document language',
- btnCancel : 'Cancel',
- btnOk : 'Ok'
+ labelSelect : 'Select document language'
}, Common.Views.LanguageDialog || {}))
});
\ No newline at end of file
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index aa7a80a92..467717eb6 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -231,6 +231,9 @@ define([
delimiter = this.cmbDelimiter ? this.cmbDelimiter.getValue() : null,
delimiterChar = (delimiter == -1) ? this.inputDelimiter.getValue() : null;
(delimiter == -1) && (delimiter = null);
+ if (!this.closable && this.type == Common.Utils.importTextType.TXT) { //save last encoding only for opening txt files
+ Common.localStorage.setItem("de-settings-open-encoding", encoding);
+ }
this.handler.call(this, state, encoding, delimiter, delimiterChar);
}
}
@@ -284,11 +287,17 @@ define([
data: listItems,
editable: false,
disabled: true,
+ search: true,
itemsTemplate: itemsTemplate
});
this.cmbEncoding.setDisabled(false);
- this.cmbEncoding.setValue((this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0]);
+ var encoding = (this.settings && this.settings.asc_getCodePage()) ? this.settings.asc_getCodePage() : encodedata[0][0];
+ if (!this.closable && this.type == Common.Utils.importTextType.TXT) { // only for opening txt files
+ var value = Common.localStorage.getItem("de-settings-open-encoding");
+ value && (encoding = parseInt(value));
+ }
+ this.cmbEncoding.setValue(encoding);
if (this.preview)
this.cmbEncoding.on('selected', _.bind(this.onCmbEncodingSelect, this));
@@ -435,8 +444,6 @@ define([
this.updatePreview();
},
- okButtonText : "OK",
- cancelButtonText : "Cancel",
txtDelimiter : "Delimiter",
txtEncoding : "Encoding ",
txtSpace : "Space",
diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js
index a1a26ac4e..09ed9007c 100644
--- a/apps/common/main/lib/view/PasswordDialog.js
+++ b/apps/common/main/lib/view/PasswordDialog.js
@@ -59,7 +59,8 @@ define([
header : true,
cls : 'modal-dlg',
contentTemplate : '',
- title : t.txtTitle
+ title : t.txtTitle,
+ buttons: ['ok', 'cancel']
}, options);
@@ -77,11 +78,7 @@ define([
'',
'
',
'',
- '
',
- ''
+ '
'
].join('');
this.handler = options.handler;
@@ -154,8 +151,6 @@ define([
this.close();
},
- okButtonText : "OK",
- cancelButtonText : "Cancel",
txtTitle : "Set Password",
txtPassword : "Password",
txtDescription : "A Password is required to open this document",
diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index 36c163b9b..0036808f2 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -88,22 +88,22 @@ define([
el && (this.$el = $(el));
this.$el.html(this.template({scope: this}));
- this.viewPluginsList = new Common.UI.DataView({
- el: $('#plugins-list'),
- store: this.storePlugins,
- enableKeyEvents: false,
- itemTemplate: _.template([
- '',
- '
1) ? 1 : 0) + (variations[currentVariation].get("icons").length>2 ? 2 : 0)] %>);">
',
- '<% if (variations.length>1) { %>',
- '
',
- '<% } %>',
- '<%= name %>',
- '
'
- ].join(''))
- });
- this.lockedControls.push(this.viewPluginsList);
- this.viewPluginsList.cmpEl.off('click');
+ // this.viewPluginsList = new Common.UI.DataView({
+ // el: $('#plugins-list'),
+ // store: this.storePlugins,
+ // enableKeyEvents: false,
+ // itemTemplate: _.template([
+ // '',
+ // '
1) ? 1 : 0) + (variations[currentVariation].get("icons").length>2 ? 2 : 0)] %>);">
',
+ // '<% if (variations.length>1) { %>',
+ // '
',
+ // '<% } %>',
+ // '<%= name %>',
+ // '
'
+ // ].join(''))
+ // });
+ // this.lockedControls.push(this.viewPluginsList);
+ // this.viewPluginsList.cmpEl.off('click');
this.pluginName = $('#current-plugin-header label');
this.pluginsPanel = $('#plugins-box');
@@ -190,7 +190,7 @@ define([
item.setDisabled(disable);
});
- this.pluginsMask.css('display', disable ? 'block' : 'none');
+ this.pluginsMask && this.pluginsMask.css('display', disable ? 'block' : 'none');
}
},
@@ -368,7 +368,7 @@ define([
'
',
'',
'<% } %>'
diff --git a/apps/common/main/lib/view/RenameDialog.js b/apps/common/main/lib/view/RenameDialog.js
index 39c550523..023cff6ba 100644
--- a/apps/common/main/lib/view/RenameDialog.js
+++ b/apps/common/main/lib/view/RenameDialog.js
@@ -47,7 +47,9 @@ define([
width: 330,
header: false,
cls: 'modal-dlg',
- filename: ''
+ filename: '',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
initialize : function(options) {
@@ -59,10 +61,6 @@ define([
'' + this.textName + ' ',
'',
'
',
- '',
- ''
].join('');
@@ -128,8 +126,6 @@ define([
},
textName : 'File name',
- cancelButtonText: 'Cancel',
- okButtonText : 'Ok',
txtInvalidName : 'The file name cannot contain any of the following characters: '
}, Common.Views.RenameDialog || {}));
});
\ No newline at end of file
diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js
index 466226e0d..a3f507da5 100644
--- a/apps/common/main/lib/view/ReviewPopover.js
+++ b/apps/common/main/lib/view/ReviewPopover.js
@@ -945,7 +945,7 @@ define([
$this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
this.selectionStart = this.selectionEnd = start + 1;
- event.stopImmediatePropagation();
+ // event.stopImmediatePropagation();
event.preventDefault();
}
@@ -954,28 +954,30 @@ define([
if (this.canRequestUsers) {
textBox && textBox.keydown(function (event) {
- if ( event.keyCode == Common.UI.Keys.SPACE ||
+ if ( event.keyCode == Common.UI.Keys.SPACE || event.keyCode === Common.UI.Keys.TAB ||
event.keyCode == Common.UI.Keys.HOME || event.keyCode == Common.UI.Keys.END || event.keyCode == Common.UI.Keys.RIGHT ||
event.keyCode == Common.UI.Keys.LEFT || event.keyCode == Common.UI.Keys.UP) {
// hide email menu
me.onEmailListMenu();
} else if (event.keyCode == Common.UI.Keys.DOWN) {
- if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible())
- _.delay(function() {
+ if (me.emailMenu && me.emailMenu.rendered && me.emailMenu.isVisible()) {
+ _.delay(function () {
var selected = me.emailMenu.cmpEl.find('li:not(.divider):first');
selected = selected.find('a');
selected.focus();
}, 10);
+ event.preventDefault();
+ }
}
me.e = event;
});
textBox && textBox.on('input', function (event) {
var $this = $(this),
start = this.selectionStart,
- val = $this.val().replace(/[\n]$/, ""),
+ val = $this.val(),
left = 0, right = val.length-1;
for (var i=start-1; i>=0; i--) {
- if (val.charCodeAt(i) == 32 /*space*/ || val.charCodeAt(i) == 13 || val.charCodeAt(i) == 10 || val.charCodeAt(i) == 9) {
+ if (val.charCodeAt(i) == 32 /*space*/ || val.charCodeAt(i) == 13 /*enter*/ || val.charCodeAt(i) == 10 /*new line*/ || val.charCodeAt(i) == 9 /*tab*/) {
left = i+1; break;
}
}
@@ -989,7 +991,8 @@ define([
if (res && res.length>1) {
str = res[1]; // send to show email menu
me.onEmailListMenu(str, left, right);
- }
+ } else
+ me.onEmailListMenu(); // hide email menu
});
}
},
@@ -1118,7 +1121,7 @@ define([
return (item.email && 0 === item.email.toLowerCase().indexOf(str) || item.name && 0 === item.name.toLowerCase().indexOf(str))
});
}
- var tpl = _.template('<%= caption %>
<%= options.value %>
'),
+ var tpl = _.template('<%= Common.Utils.String.htmlEncode(caption) %>
<%= Common.Utils.String.htmlEncode(options.value) %>
'),
divider = false;
_.each(users, function(menuItem, index) {
if (divider && !menuItem.hasAccess) {
@@ -1159,9 +1162,9 @@ define([
insertEmailToTextbox: function(str, left, right) {
var textBox = this.commentsView.getTextBox(),
val = textBox.val();
- textBox.val(val.substring(0, left) + '+' + str + val.substring(right+1, val.length));
+ textBox.val(val.substring(0, left) + '+' + str + ' ' + val.substring(right+1, val.length));
setTimeout(function(){
- textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 1;
+ textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 2;
}, 10);
},
diff --git a/apps/common/main/lib/view/SaveAsDlg.js b/apps/common/main/lib/view/SaveAsDlg.js
index 43afd5d2a..04f1b3c57 100644
--- a/apps/common/main/lib/view/SaveAsDlg.js
+++ b/apps/common/main/lib/view/SaveAsDlg.js
@@ -122,6 +122,8 @@ define([
if (msg && msg.Referer == "onlyoffice") {
if ( !_.isEmpty(msg.error) ) {
this.trigger('saveaserror', this, msg.error);
+ } else if (!_.isEmpty(msg.message)) {
+ Common.NotificationCenter.trigger('showmessage', {msg: msg.message});
}
// if ( !_.isEmpty(msg.folder) ) {
// this.trigger('saveasfolder', this, msg.folder); // save last folder url
diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js
index dbad485c9..683a89eb1 100644
--- a/apps/common/main/lib/view/SearchDialog.js
+++ b/apps/common/main/lib/view/SearchDialog.js
@@ -98,10 +98,10 @@
'',
'
',
''
].join('');
diff --git a/apps/common/main/lib/view/SignDialog.js b/apps/common/main/lib/view/SignDialog.js
index 9452df47f..73e64e658 100644
--- a/apps/common/main/lib/view/SignDialog.js
+++ b/apps/common/main/lib/view/SignDialog.js
@@ -53,7 +53,8 @@ define([
options: {
width: 370,
style: 'min-width: 350px;',
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
@@ -106,10 +107,6 @@ define([
'',
'
',
'',
- '',
- ''
].join('');
@@ -342,8 +339,6 @@ define([
textCertificate: 'Certificate',
textValid: 'Valid from %1 to %2',
textChange: 'Change',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
textInputName: 'Input signer name',
textUseImage: 'or click \'Select Image\' to use a picture as signature',
textSelectImage: 'Select Image',
diff --git a/apps/common/main/lib/view/SignSettingsDialog.js b/apps/common/main/lib/view/SignSettingsDialog.js
index ef425720c..d402926ac 100644
--- a/apps/common/main/lib/view/SignSettingsDialog.js
+++ b/apps/common/main/lib/view/SignSettingsDialog.js
@@ -86,7 +86,7 @@ define([
'
',
'',
'',
- '
',
- ''
+ '
'
].join('');
this.options.tpl = _.template(this.template)(this.options);
@@ -171,8 +168,6 @@ define([
textTitle: 'Columns',
textSpacing: 'Spacing between columns',
textColumns: 'Number of columns',
- textSeparator: 'Column divider',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok'
+ textSeparator: 'Column divider'
}, DE.Views.CustomColumnsDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 3c435dd5e..198369d9d 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -54,7 +54,9 @@ define([
'documenteditor/main/app/view/ParagraphSettingsAdvanced',
'documenteditor/main/app/view/TableSettingsAdvanced',
'documenteditor/main/app/view/ControlSettingsDialog',
- 'documenteditor/main/app/view/NumberingValueDialog'
+ 'documenteditor/main/app/view/NumberingValueDialog',
+ 'documenteditor/main/app/view/CellsRemoveDialog',
+ 'documenteditor/main/app/view/CellsAddDialog'
], function ($, _, Backbone, gateway) { 'use strict';
DE.Views.DocumentHolder = Backbone.View.extend(_.extend({
@@ -741,21 +743,11 @@ define([
};
this.changeLanguageMenu = function(menu) {
- var i;
if (me._currLang.id===null || me._currLang.id===undefined) {
- for (i=0; i-1) && !menu.items[index].checked && menu.setChecked(index, true);
}
};
@@ -1848,11 +1840,6 @@ define([
}
},
- updateThemeColors: function() {
- this.effectcolors = Common.Utils.ThemeColor.getEffectColors();
- this.standartcolors = Common.Utils.ThemeColor.getStandartColors();
- },
-
onCutCopyPaste: function(item, e) {
var me = this;
if (me.api) {
@@ -1906,6 +1893,19 @@ define([
me.fireEvent('editcomplete', me);
},
+ onInsertCaption: function() {
+ var me = this;
+ (new DE.Views.CaptionDialog({
+ isObject: true,
+ handler: function (result, settings) {
+ if (result == 'ok') {
+ me.api.asc_AddObjectCaption(settings);
+ }
+ me.fireEvent('editcomplete', me);
+ }
+ })).show();
+ },
+
onContinueNumbering: function(item, e) {
this.api.asc_ContinueNumbering();
this.fireEvent('editcomplete', this);
@@ -1929,6 +1929,41 @@ define([
this.fireEvent('editcomplete', this);
},
+ onCellsRemove: function() {
+ var me = this;
+ (new DE.Views.CellsRemoveDialog({
+ handler: function (result, value) {
+ if (result == 'ok') {
+ if (value == 'row')
+ me.api.remRow();
+ else if (value == 'col')
+ me.api.remColumn();
+ else
+ me.api.asc_RemoveTableCells();
+ }
+ me.fireEvent('editcomplete', me);
+ }
+ })).show();
+ this.fireEvent('editcomplete', this);
+ },
+
+ onCellsAdd: function() {
+ var me = this;
+ (new DE.Views.CellsAddDialog({
+ handler: function (result, settings) {
+ if (result == 'ok') {
+ if (settings.row) {
+ settings.before ? me.api.addRowAbove(settings.count) : me.api.addRowBelow(settings.count);
+ } else {
+ settings.before ? me.api.addColumnLeft(settings.count) : me.api.addColumnRight(settings.count);
+ }
+ }
+ me.fireEvent('editcomplete', me);
+ }
+ })).show();
+ this.fireEvent('editcomplete', this);
+ },
+
createDelayedElementsViewer: function() {
var me = this;
@@ -2015,6 +2050,16 @@ define([
createDelayedElements: function() {
var me = this;
+ var menuInsertCaption = new Common.UI.MenuItem({
+ caption : me.txtInsertCaption
+ }).on('click', _.bind(me.onInsertCaption, me));
+ var menuInsertCaptionSeparator = new Common.UI.MenuItem({ caption: '--' });
+
+ var menuEquationInsertCaption = new Common.UI.MenuItem({
+ caption : me.txtInsertCaption
+ }).on('click', _.bind(me.onInsertCaption, me));
+ var menuEquationInsertCaptionSeparator = new Common.UI.MenuItem({ caption: '--' });
+
var menuImageAlign = new Common.UI.MenuItem({
caption : me.textAlign,
menu : (function(){
@@ -2497,7 +2542,7 @@ define([
if (menuChartEdit.isVisible())
menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts());
- me.pictureMenu.items[17].setVisible(menuChartEdit.isVisible());
+ me.pictureMenu.items[19].setVisible(menuChartEdit.isVisible());
me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined);
menuImageAdvanced.setDisabled(islocked);
@@ -2550,6 +2595,8 @@ define([
me.menuImageWrap,
menuImgRotate,
{ caption: '--' },
+ menuInsertCaption,
+ menuInsertCaptionSeparator,
me.menuImgCrop,
me.menuOriginalSize,
menuImgReplace,
@@ -2564,6 +2611,10 @@ define([
/* table menu*/
+ var menuTableInsertCaption = new Common.UI.MenuItem({
+ caption : me.txtInsertCaption
+ }).on('click', _.bind(me.onInsertCaption, me));
+
var mnuTableMerge = new Common.UI.MenuItem({
caption : me.mergeCellsText
}).on('click', function(item) {
@@ -2736,13 +2787,21 @@ define([
})
});
+ var langTemplate = _.template([
+ '',
+ '',
+ '<%= caption %>',
+ ' '
+ ].join(''));
+
me.langTableMenu = new Common.UI.MenuItem({
caption : me.langText,
- menu : new Common.UI.Menu({
+ menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
menuAlign: 'tl-tr',
restoreHeight: 285,
items : [],
+ itemTemplate: langTemplate,
search: true
})
});
@@ -2922,7 +2981,7 @@ define([
var isEquation= (value.mathProps && value.mathProps.value);
- for (var i = 8; i < 25; i++) {
+ for (var i = 8; i < 27; i++) {
me.tableMenu.items[i].setVisible(!isEquation);
}
@@ -3138,6 +3197,11 @@ define([
}).on('click', function(item) {
if (me.api)
me.api.addRowBelow();
+ }),
+ new Common.UI.MenuItem({
+ caption: me.textSeveral
+ }).on('click', function(item) {
+ me.onCellsAdd();
})
]
})
@@ -3165,6 +3229,11 @@ define([
}).on('click', function(item) {
if (me.api)
me.api.remTable();
+ }),
+ new Common.UI.MenuItem({
+ caption: me.textCells
+ }).on('click', function(item) {
+ me.onCellsRemove();
})
]
})
@@ -3179,6 +3248,8 @@ define([
menuTableCellAlign,
menuTableDirection,
{ caption: '--' },
+ menuTableInsertCaption,
+ { caption: '--' },
menuTableAdvanced,
{ caption: '--' },
/** coauthoring begin **/
@@ -3379,11 +3450,12 @@ define([
me.langParaMenu = new Common.UI.MenuItem({
caption : me.langText,
- menu : new Common.UI.Menu({
+ menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
menuAlign: 'tl-tr',
restoreHeight: 285,
items : [],
+ itemTemplate: langTemplate,
search: true
})
});
@@ -3627,10 +3699,12 @@ define([
//equation menu
var eqlen = 0;
if (isEquation) {
- eqlen = me.addEquationMenu(true, 13);
+ eqlen = me.addEquationMenu(true, 15);
} else
- me.clearEquationMenu(true, 13);
+ me.clearEquationMenu(true, 15);
menuEquationSeparator.setVisible(isEquation && eqlen>0);
+ menuEquationInsertCaption.setVisible(isEquation);
+ menuEquationInsertCaptionSeparator.setVisible(isEquation);
menuFrameAdvanced.setVisible(value.paraProps.value.get_FramePr() !== undefined);
@@ -3693,6 +3767,8 @@ define([
menuParaCopy,
menuParaPaste,
menuParaPrint,
+ menuEquationInsertCaptionSeparator,
+ menuEquationInsertCaption,
{ caption: '--' },
menuEquationSeparator,
menuParaRemoveControl,
@@ -3781,58 +3857,39 @@ define([
var me = this;
if (langs && langs.length > 0 && me.langParaMenu && me.langTableMenu) {
- me.langParaMenu.menu.removeAll();
- me.langTableMenu.menu.removeAll();
- _.each(langs, function(lang, index){
- me.langParaMenu.menu.addItem(new Common.UI.MenuItem({
+ var arrPara = [], arrTable = [];
+ _.each(langs, function(lang) {
+ var item = {
caption : lang.displayValue,
value : lang.value,
checkable : true,
- toggleGroup : 'popupparalang',
langid : lang.code,
- spellcheck : lang.spellcheck,
- template: _.template([
- '',
- '',
- '<%= caption %>',
- ' '
- ].join(''))
- }).on('click', function(item, e){
- if (me.api){
- if (!_.isUndefined(item.options.langid))
- me.api.put_TextPrLang(item.options.langid);
+ spellcheck : lang.spellcheck
+ };
+ arrPara.push(item);
+ arrTable.push(_.clone(item));
+ });
+ me.langParaMenu.menu.resetItems(arrPara);
+ me.langTableMenu.menu.resetItems(arrTable);
- me._currLang.paraid = item.options.langid;
- me.langParaMenu.menu.currentCheckedItem = item;
+ me.langParaMenu.menu.on('item:click', function(menu, item){
+ if (me.api){
+ if (!_.isUndefined(item.langid))
+ me.api.put_TextPrLang(item.langid);
- me.fireEvent('editcomplete', me);
- }
- }));
+ me._currLang.paraid = item.langid;
+ me.fireEvent('editcomplete', me);
+ }
+ });
- me.langTableMenu.menu.addItem(new Common.UI.MenuItem({
- caption : lang.displayValue,
- value : lang.value,
- checkable : true,
- toggleGroup : 'popuptablelang',
- langid : lang.code,
- spellcheck : lang.spellcheck,
- template: _.template([
- '',
- '',
- '<%= caption %>',
- ' '
- ].join(''))
- }).on('click', function(item, e){
- if (me.api){
- if (!_.isUndefined(item.options.langid))
- me.api.put_TextPrLang(item.options.langid);
+ me.langTableMenu.menu.on('item:click', function(menu, item, e){
+ if (me.api){
+ if (!_.isUndefined(item.langid))
+ me.api.put_TextPrLang(item.langid);
- me._currLang.tableid = item.options.langid;
- me.langTableMenu.menu.currentCheckedItem = item;
-
- me.fireEvent('editcomplete', me);
- }
- }));
+ me._currLang.tableid = item.langid;
+ me.fireEvent('editcomplete', me);
+ }
});
}
},
@@ -4110,7 +4167,10 @@ define([
textCropFit: 'Fit',
textFollow: 'Follow move',
toDictionaryText: 'Add to Dictionary',
- txtPrintSelection: 'Print Selection'
+ txtPrintSelection: 'Print Selection',
+ textCells: 'Cells',
+ textSeveral: 'Several Rows/Columns',
+ txtInsertCaption: 'Insert Caption'
}, DE.Views.DocumentHolder || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
index 5c2488b13..d28c87872 100644
--- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
@@ -1164,8 +1164,6 @@ define([
textBorderColor: 'Border Color',
textBackColor: 'Background Color',
textBorderDesc: 'Click on diagramm or use buttons to select borders',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textPosition: 'Position',
diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js
index bbf120cf3..5fcf1c1d4 100644
--- a/apps/documenteditor/main/app/view/FileMenu.js
+++ b/apps/documenteditor/main/app/view/FileMenu.js
@@ -49,6 +49,7 @@ define([
DE.Views.FileMenu = Common.UI.BaseView.extend(_.extend({
el: '#file-menu-panel',
+ rendered: false,
options: {alias:'FileMenu'},
template: _.template(tpl),
@@ -81,95 +82,109 @@ define([
},
render: function () {
- this.$el = $(this.el);
- this.$el.html(this.template());
+ var $markup = $(this.template());
this.miSave = new Common.UI.MenuItem({
- el : $('#fm-btn-save',this.el),
+ el : $markup.elementById('#fm-btn-save'),
action : 'save',
caption : this.btnSaveCaption,
canFocused: false
});
+ if ( !!this.options.miSave ) {
+ this.miSave.setDisabled(this.options.miSave.isDisabled());
+ delete this.options.miSave;
+ }
+
this.miEdit = new Common.UI.MenuItem({
- el : $('#fm-btn-edit',this.el),
+ el : $markup.elementById('#fm-btn-edit'),
action : 'edit',
caption : this.btnToEditCaption,
canFocused: false
});
this.miDownload = new Common.UI.MenuItem({
- el : $('#fm-btn-download',this.el),
+ el : $markup.elementById('#fm-btn-download'),
action : 'saveas',
caption : this.btnDownloadCaption,
canFocused: false
});
this.miSaveCopyAs = new Common.UI.MenuItem({
- el : $('#fm-btn-save-copy',this.el),
+ el : $markup.elementById('#fm-btn-save-copy'),
action : 'save-copy',
caption : this.btnSaveCopyAsCaption,
canFocused: false
});
this.miSaveAs = new Common.UI.MenuItem({
- el : $('#fm-btn-save-desktop',this.el),
+ el : $markup.elementById('#fm-btn-save-desktop'),
action : 'save-desktop',
caption : this.btnSaveAsCaption,
canFocused: false
});
this.miPrint = new Common.UI.MenuItem({
- el : $('#fm-btn-print',this.el),
+ el : $markup.elementById('#fm-btn-print'),
action : 'print',
caption : this.btnPrintCaption,
canFocused: false
});
this.miRename = new Common.UI.MenuItem({
- el : $('#fm-btn-rename',this.el),
+ el : $markup.elementById('#fm-btn-rename'),
action : 'rename',
caption : this.btnRenameCaption,
canFocused: false
});
+ if ( !!this.options.miRename ) {
+ this.miRename.setDisabled(this.options.miRename.isDisabled());
+ delete this.options.miRename;
+ }
+
this.miProtect = new Common.UI.MenuItem({
- el : $('#fm-btn-protect',this.el),
+ el : $markup.elementById('#fm-btn-protect'),
action : 'protect',
caption : this.btnProtectCaption,
canFocused: false
});
+ if ( !!this.options.miProtect ) {
+ this.miProtect.setDisabled(this.options.miProtect.isDisabled());
+ delete this.options.miProtect;
+ }
+
this.miRecent = new Common.UI.MenuItem({
- el : $('#fm-btn-recent',this.el),
+ el : $markup.elementById('#fm-btn-recent'),
action : 'recent',
caption : this.btnRecentFilesCaption,
canFocused: false
});
this.miNew = new Common.UI.MenuItem({
- el : $('#fm-btn-create',this.el),
+ el : $markup.elementById('#fm-btn-create'),
action : 'new',
caption : this.btnCreateNewCaption,
canFocused: false
});
this.miAccess = new Common.UI.MenuItem({
- el : $('#fm-btn-rights',this.el),
+ el : $markup.elementById('#fm-btn-rights'),
action : 'rights',
caption : this.btnRightsCaption,
canFocused: false
});
this.miHistory = new Common.UI.MenuItem({
- el : $('#fm-btn-history',this.el),
+ el : $markup.elementById('#fm-btn-history'),
action : 'history',
caption : this.btnHistoryCaption,
canFocused: false
});
this.miHelp = new Common.UI.MenuItem({
- el : $('#fm-btn-help',this.el),
+ el : $markup.elementById('#fm-btn-help'),
action : 'help',
caption : this.btnHelpCaption,
canFocused: false
@@ -178,7 +193,7 @@ define([
this.items = [];
this.items.push(
new Common.UI.MenuItem({
- el : $('#fm-btn-return',this.el),
+ el : $markup.elementById('#fm-btn-return'),
action : 'back',
caption : this.btnCloseMenuCaption,
canFocused: false
@@ -194,7 +209,7 @@ define([
this.miRecent,
this.miNew,
new Common.UI.MenuItem({
- el : $('#fm-btn-info',this.el),
+ el : $markup.elementById('#fm-btn-info'),
action : 'info',
caption : this.btnInfoCaption,
canFocused: false
@@ -202,29 +217,31 @@ define([
this.miAccess,
this.miHistory,
new Common.UI.MenuItem({
- el : $('#fm-btn-settings',this.el),
+ el : $markup.elementById('#fm-btn-settings'),
action : 'opts',
caption : this.btnSettingsCaption,
canFocused: false
}),
this.miHelp,
new Common.UI.MenuItem({
- el : $('#fm-btn-back',this.el),
+ el : $markup.elementById('#fm-btn-back'),
+ // el : _get_el('fm-btn-back'),
action : 'exit',
caption : this.btnBackCaption,
canFocused: false
})
);
- var me = this;
- me.panels = {
-// 'saveas' : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
- 'opts' : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
- 'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
- 'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render()
- };
+ this.rendered = true;
+ this.$el.html($markup);
+ this.$el.find('.content-box').hide();
+ this.applyMode();
- me.$el.find('.content-box').hide();
+ if ( !!this.api ) {
+ this.panels['info'].setApi(this.api);
+ if ( this.panels['protect'] )
+ this.panels['protect'].setApi(this.api);
+ }
return this;
},
@@ -232,6 +249,9 @@ define([
show: function(panel, opts) {
if (this.isVisible() && panel===undefined || !this.mode) return;
+ if ( !this.rendered )
+ this.render();
+
var defPanel = (this.mode.canDownload && (!this.mode.isDesktopApp || !this.mode.isOffline)) ? 'saveas' : 'info';
if (!panel)
panel = this.active || defPanel;
@@ -250,6 +270,16 @@ define([
},
applyMode: function() {
+ if (!this.panels) {
+ this.panels = {
+ 'opts' : (new DE.Views.FileMenuPanels.Settings({menu:this})).render(this.$el.find('#panel-settings')),
+ 'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:this})).render(this.$el.find('#panel-info')),
+ 'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:this})).render(this.$el.find('#panel-rights'))
+ };
+ }
+
+ if (!this.mode) return;
+
this.miDownload[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline))?'show':'hide']();
this.miSaveCopyAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && (!this.mode.isDesktopApp || !this.mode.isOffline)) && (this.mode.canRequestSaveAs || this.mode.saveAsUrl) ?'show':'hide']();
this.miSaveAs[((this.mode.canDownload || this.mode.canDownloadOrigin) && this.mode.isDesktopApp && this.mode.isOffline)?'show':'hide']();
@@ -284,32 +314,29 @@ define([
if ( this.mode.canCreateNew ) {
if (this.mode.templates && this.mode.templates.length) {
$('a',this.miNew.$el).text(this.btnCreateNewCaption + '...');
- this.panels['new'] = ((new DE.Views.FileMenuPanels.CreateNew({menu: this, docs: this.mode.templates})).render());
+ !this.panels['new'] && (this.panels['new'] = ((new DE.Views.FileMenuPanels.CreateNew({menu: this, docs: this.mode.templates})).render()));
}
}
- if ( this.mode.canOpenRecent ) {
- if (this.mode.recent){
- this.panels['recent'] = (new DE.Views.FileMenuPanels.RecentFiles({menu:this, recent: this.mode.recent})).render();
- }
+ if ( this.mode.canOpenRecent && this.mode.recent ) {
+ !this.panels['recent'] && (this.panels['recent'] = (new DE.Views.FileMenuPanels.RecentFiles({menu:this, recent: this.mode.recent})).render());
}
if (this.mode.canProtect) {
-// this.$el.find('#fm-btn-back').hide();
- this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render();
+ !this.panels['protect'] && (this.panels['protect'] = (new DE.Views.FileMenuPanels.ProtectDoc({menu:this})).render());
this.panels['protect'].setMode(this.mode);
}
if (this.mode.canDownload) {
- this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render());
+ !this.panels['saveas'] && (this.panels['saveas'] = ((new DE.Views.FileMenuPanels.ViewSaveAs({menu: this})).render()));
} else if (this.mode.canDownloadOrigin)
$('a',this.miDownload.$el).text(this.textDownload);
if (this.mode.canDownload && (this.mode.canRequestSaveAs || this.mode.saveAsUrl)) {
- this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render());
+ !this.panels['save-copy'] && (this.panels['save-copy'] = ((new DE.Views.FileMenuPanels.ViewSaveCopy({menu: this})).render()));
}
- if (this.mode.canHelp) {
+ if (this.mode.canHelp && !this.panels['help']) {
this.panels['help'] = ((new DE.Views.FileMenuPanels.Help({menu: this})).render());
this.panels['help'].setLangConfig(this.mode.lang);
}
@@ -329,13 +356,22 @@ define([
this.mode = mode;
}
- if (!delay) this.applyMode();
+ if (!delay) {
+ if ( this.rendered )
+ this.applyMode();
+ }
+ return this;
},
setApi: function(api) {
this.api = api;
- this.panels['info'].setApi(api);
- if (this.panels['protect']) this.panels['protect'].setApi(api);
+
+ if ( this.rendered ) {
+ this.panels['info'].setApi(api);
+ if (this.panels['protect']) this.panels['protect'].setApi(api);
+ }
+
+ return this;
},
loadDocument: function(data) {
@@ -369,8 +405,11 @@ define([
},
SetDisabled: function(disable) {
- this.miSave[(disable || !this.mode.isEdit)?'hide':'show']();
- this.miRename[(disable || !this.mode.canRename || this.mode.isDesktopApp) ?'hide':'show']();
+ var _btn_save = this.getButton('save'),
+ _btn_rename = this.getButton('rename');
+
+ _btn_save[(disable || !this.mode.isEdit)?'hide':'show']();
+ _btn_rename[(disable || !this.mode.canRename || this.mode.isDesktopApp) ?'hide':'show']();
},
isVisible: function () {
@@ -378,8 +417,27 @@ define([
},
getButton: function(type) {
- if (type == 'save')
- return this.miSave;
+ if ( !this.rendered ) {
+ if (type == 'save') {
+ return this.options.miSave ? this.options.miSave : (this.options.miSave = new Common.UI.MenuItem({}));
+ } else
+ if (type == 'rename') {
+ return this.options.miRename ? this.options.miRename : (this.options.miRename = new Common.UI.MenuItem({}));
+ } else
+ if (type == 'protect') {
+ return this.options.miProtect ? this.options.miProtect : (this.options.miProtect = new Common.UI.MenuItem({}));
+ }
+ } else {
+ if (type == 'save') {
+ return this.miSave;
+ } else
+ if (type == 'rename') {
+ return this.miRename;
+ }else
+ if (type == 'protect') {
+ return this.miProtect;
+ }
+ }
},
btnSaveCaption : 'Save',
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 2538460a4..730665ee5 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -87,12 +87,12 @@ define([
},
render: function() {
- $(this.el).html(this.template({rows:this.formats}));
+ this.$el.html(this.template({rows:this.formats}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -148,12 +148,12 @@ define([
},
render: function() {
- $(this.el).html(this.template({rows:this.formats}));
+ this.$el.html(this.template({rows:this.formats}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -247,61 +247,62 @@ define([
this.menu = options.menu;
},
- render: function() {
- $(this.el).html(this.template({scope: this}));
+ render: function(node) {
+ var me = this;
+ var $markup = $(this.template({scope: this}));
this.chInputMode = new Common.UI.CheckBox({
- el: $('#fms-chb-input-mode'),
+ el: $markup.findById('#fms-chb-input-mode'),
labelText: this.strInputMode
});
/** coauthoring begin **/
this.chLiveComment = new Common.UI.CheckBox({
- el: $('#fms-chb-live-comment'),
+ el: $markup.findById('#fms-chb-live-comment'),
labelText: this.strLiveComment
- }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
- this.chResolvedComment.setDisabled(field.getValue()!=='checked');
- }, this));
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ me.chResolvedComment.setDisabled(field.getValue()!=='checked');
+ });
this.chResolvedComment = new Common.UI.CheckBox({
- el: $('#fms-chb-resolved-comment'),
+ el: $markup.findById('#fms-chb-resolved-comment'),
labelText: this.strResolvedComment
});
/** coauthoring end **/
this.chSpell = new Common.UI.CheckBox({
- el: $('#fms-chb-spell-check'),
+ el: $markup.findById('#fms-chb-spell-check'),
labelText: this.strSpellCheckMode
});
this.chCompatible = new Common.UI.CheckBox({
- el: $('#fms-chb-compatible'),
+ el: $markup.findById('#fms-chb-compatible'),
labelText: this.textOldVersions
});
this.chAutosave = new Common.UI.CheckBox({
- el: $('#fms-chb-autosave'),
+ el: $markup.findById('#fms-chb-autosave'),
labelText: this.strAutosave
- }).on('change', _.bind(function(field, newValue, oldValue, eOpts){
- if (field.getValue()!=='checked' && this.cmbCoAuthMode.getValue()) {
- this.cmbCoAuthMode.setValue(0);
- this.onSelectCoAuthMode(this.cmbCoAuthMode.getSelectedRecord());
+ }).on('change', function(field, newValue, oldValue, eOpts){
+ if (field.getValue()!=='checked' && me.cmbCoAuthMode.getValue()) {
+ me.cmbCoAuthMode.setValue(0);
+ me.onSelectCoAuthMode(me.cmbCoAuthMode.getSelectedRecord());
}
- }, this));
- this.lblAutosave = $('#fms-lbl-autosave');
+ });
+ this.lblAutosave = $markup.findById('#fms-lbl-autosave');
this.chForcesave = new Common.UI.CheckBox({
- el: $('#fms-chb-forcesave'),
+ el: $markup.findById('#fms-chb-forcesave'),
labelText: this.strForcesave
});
this.chAlignGuides = new Common.UI.CheckBox({
- el: $('#fms-chb-align-guides'),
+ el: $markup.findById('#fms-chb-align-guides'),
labelText: this.strAlignGuides
});
this.cmbZoom = new Common.UI.ComboBox({
- el : $('#fms-cmb-zoom'),
+ el : $markup.findById('#fms-cmb-zoom'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -325,7 +326,7 @@ define([
/** coauthoring begin **/
this.cmbShowChanges = new Common.UI.ComboBox({
- el : $('#fms-cmb-show-changes'),
+ el : $markup.findById('#fms-cmb-show-changes'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -337,7 +338,7 @@ define([
});
this.cmbCoAuthMode = new Common.UI.ComboBox({
- el : $('#fms-cmb-coauth-mode'),
+ el : $markup.findById('#fms-cmb-coauth-mode'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -345,17 +346,17 @@ define([
{ value: 1, displayValue: this.strFast, descValue: this.strCoAuthModeDescFast},
{ value: 0, displayValue: this.strStrict, descValue: this.strCoAuthModeDescStrict }
]
- }).on('selected', _.bind( function(combo, record) {
- if (record.value == 1 && (this.chAutosave.getValue()!=='checked'))
- this.chAutosave.setValue(1);
- this.onSelectCoAuthMode(record);
- }, this));
+ }).on('selected', function(combo, record) {
+ if (record.value == 1 && (me.chAutosave.getValue()!=='checked'))
+ me.chAutosave.setValue(1);
+ me.onSelectCoAuthMode(record);
+ });
- this.lblCoAuthMode = $('#fms-lbl-coauth-mode');
+ this.lblCoAuthMode = $markup.findById('#fms-lbl-coauth-mode');
/** coauthoring end **/
this.cmbFontRender = new Common.UI.ComboBox({
- el : $('#fms-cmb-font-render'),
+ el : $markup.find('#fms-cmb-font-render'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -367,7 +368,7 @@ define([
});
this.cmbUnit = new Common.UI.ComboBox({
- el : $('#fms-cmb-unit'),
+ el : $markup.findById('#fms-cmb-unit'),
style : 'width: 160px;',
editable : false,
cls : 'input-group-nr',
@@ -379,18 +380,19 @@ define([
});
this.btnApply = new Common.UI.Button({
- el: '#fms-btn-apply'
+ el: $markup.findById('#fms-btn-apply')
});
- this.btnApply.on('click', _.bind(this.applySettings, this));
+ this.btnApply.on('click', this.applySettings.bind(this));
+
+ this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
-
return this;
},
@@ -564,7 +566,7 @@ define([
},
render: function() {
- $(this.el).html(this.template());
+ this.$el.html(this.template());
this.viewRecentPicker = new Common.UI.DataView({
el: $('#id-recent-view'),
@@ -582,7 +584,7 @@ define([
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -644,14 +646,14 @@ define([
},
render: function() {
- $(this.el).html(this.template({
+ this.$el.html(this.template({
scope: this,
docs: this.options[0].docs
}));
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
@@ -768,6 +770,11 @@ define([
'',
'',
'',
+ ' ',
+ '',
+ ' ',
+ '<%= scope.okButtonText %> ',
+ ' ',
''
].join(''));
@@ -776,25 +783,25 @@ define([
this.menu = options.menu;
this.coreProps = null;
this.authors = [];
+ this._locked = false;
},
- render: function() {
- $(this.el).html(this.template());
-
+ render: function(node) {
var me = this;
+ var $markup = $(me.template({scope: me}));
// server info
- this.lblPlacement = $('#id-info-placement');
- this.lblOwner = $('#id-info-owner');
- this.lblUploaded = $('#id-info-uploaded');
+ this.lblPlacement = $markup.findById('#id-info-placement');
+ this.lblOwner = $markup.findById('#id-info-owner');
+ this.lblUploaded = $markup.findById('#id-info-uploaded');
// statistic info
- this.lblStatPages = $('#id-info-pages');
- this.lblStatWords = $('#id-info-words');
- this.lblStatParagraphs = $('#id-info-paragraphs');
- this.lblStatSymbols = $('#id-info-symbols');
- this.lblStatSpaces = $('#id-info-spaces');
- // this.lblEditTime = $('#id-info-edittime');
+ this.lblStatPages = $markup.findById('#id-info-pages');
+ this.lblStatWords = $markup.findById('#id-info-words');
+ this.lblStatParagraphs = $markup.findById('#id-info-paragraphs');
+ this.lblStatSymbols = $markup.findById('#id-info-symbols');
+ this.lblStatSpaces = $markup.findById('#id-info-spaces');
+ // this.lblEditTime = $markup.find('#id-info-edittime');
// edited info
var keyDownBefore = function(input, e){
@@ -809,101 +816,86 @@ define([
};
this.inputTitle = new Common.UI.InputField({
- el : $('#id-info-title'),
+ el : $markup.findById('#id-info-title'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putTitle(me.inputTitle.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
this.inputSubject = new Common.UI.InputField({
- el : $('#id-info-subject'),
+ el : $markup.findById('#id-info-subject'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putSubject(me.inputSubject.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
this.inputComment = new Common.UI.InputField({
- el : $('#id-info-comment'),
+ el : $markup.findById('#id-info-comment'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putDescription(me.inputComment.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
// modify info
- this.lblModifyDate = $('#id-info-modify-date');
- this.lblModifyBy = $('#id-info-modify-by');
+ this.lblModifyDate = $markup.findById('#id-info-modify-date');
+ this.lblModifyBy = $markup.findById('#id-info-modify-by');
// creation info
- this.lblDate = $('#id-info-date');
- this.lblApplication = $('#id-info-appname');
- this.tblAuthor = $('#id-info-author table');
- this.trAuthor = $('#id-info-add-author').closest('tr');
+ this.lblDate = $markup.findById('#id-info-date');
+ this.lblApplication = $markup.findById('#id-info-appname');
+ this.tblAuthor = $markup.findById('#id-info-author table');
+ this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
this.authorTpl = '
';
this.tblAuthor.on('click', function(e) {
- var btn = $(e.target);
+ var btn = $markup.find(e.target);
if (btn.hasClass('close') && !btn.hasClass('disabled')) {
var el = btn.closest('tr'),
idx = me.tblAuthor.find('tr').index(el);
el.remove();
me.authors.splice(idx, 1);
- if (me.coreProps && me.api) {
- me.coreProps.asc_putCreator(me.authors.join(';'));
- me.api.asc_setCoreProps(me.coreProps);
- }
}
});
this.inputAuthor = new Common.UI.InputField({
- el : $('#id-info-add-author'),
+ el : $markup.findById('#id-info-add-author'),
style : 'width: 200px;',
validateOnBlur: false,
placeHolder: this.txtAddAuthor
- }).on('changed:after', function(input, newValue, oldValue) {
+ }).on('changed:after', function(input, newValue, oldValue, e) {
if (newValue == oldValue) return;
var val = newValue.trim();
if (!!val && val !== oldValue.trim()) {
+ var isFromApply = e && e.relatedTarget && (e.relatedTarget.id == 'fminfo-btn-apply');
val.split(/\s*[,;]\s*/).forEach(function(item){
var str = item.trim();
if (str) {
- var div = $(Common.Utils.String.format(me.authorTpl, Common.Utils.String.htmlEncode(str)));
- me.trAuthor.before(div);
me.authors.push(item);
+ if (!isFromApply) {
+ var div = $(Common.Utils.String.format(me.authorTpl, Common.Utils.String.htmlEncode(str)));
+ me.trAuthor.before(div);
+ }
}
});
- me.inputAuthor.setValue('');
- if (me.coreProps && me.api) {
- me.coreProps.asc_putCreator(me.authors.join(';'));
- me.api.asc_setCoreProps(me.coreProps);
- }
+ !isFromApply && me.inputAuthor.setValue('');
}
}).on('keydown:before', keyDownBefore);
+ this.btnApply = new Common.UI.Button({
+ el: '#fminfo-btn-apply'
+ });
+ this.btnApply.on('click', _.bind(this.applySettings, this));
+
this.rendered = true;
this.updateInfo(this.doc);
+ this.$el = $(node).html($markup);
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
-
return this;
},
@@ -1001,6 +993,7 @@ define([
value = props.asc_getDescription();
this.inputComment.setValue(value || '');
+ this.inputAuthor.setValue('');
this.tblAuthor.find('tr:not(:last-of-type)').remove();
this.authors = [];
value = props.asc_getCreator();//"123\"\"\"\<\>,456";
@@ -1009,7 +1002,9 @@ define([
me.trAuthor.before(div);
me.authors.push(item);
});
+ this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
}
+ this.SetDisabled();
},
_ShowHideInfoItem: function(el, visible) {
@@ -1048,6 +1043,11 @@ define([
},
setMode: function(mode) {
+ this.mode = mode;
+ this.inputAuthor.setVisible(mode.isEdit);
+ this.btnApply.setVisible(mode.isEdit);
+ this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+ this.SetDisabled();
return this;
},
@@ -1095,12 +1095,30 @@ define([
},
onLockCore: function(lock) {
- this.inputTitle.setDisabled(lock);
- this.inputSubject.setDisabled(lock);
- this.inputComment.setDisabled(lock);
- this.inputAuthor.setDisabled(lock);
- this.tblAuthor.find('.close').toggleClass('disabled', lock);
- !lock && this.updateFileInfo();
+ this._locked = lock;
+ this.updateFileInfo();
+ },
+
+ SetDisabled: function() {
+ var disable = !this.mode.isEdit || this._locked;
+ this.inputTitle.setDisabled(disable);
+ this.inputSubject.setDisabled(disable);
+ this.inputComment.setDisabled(disable);
+ this.inputAuthor.setDisabled(disable);
+ this.tblAuthor.find('.close').toggleClass('disabled', this._locked);
+ this.tblAuthor.toggleClass('disabled', disable);
+ this.btnApply.setDisabled(this._locked);
+ },
+
+ applySettings: function() {
+ if (this.coreProps && this.api) {
+ this.coreProps.asc_putTitle(this.inputTitle.getValue());
+ this.coreProps.asc_putSubject(this.inputSubject.getValue());
+ this.coreProps.asc_putDescription(this.inputComment.getValue());
+ this.coreProps.asc_putCreator(this.authors.join(';'));
+ this.api.asc_setCoreProps(this.coreProps);
+ }
+ this.menu.hide();
},
txtPlacement: 'Location',
@@ -1123,7 +1141,8 @@ define([
txtAuthor: 'Author',
txtAddAuthor: 'Add Author',
txtAddText: 'Add Text',
- txtMinutes: 'min'
+ txtMinutes: 'min',
+ okButtonText: 'Apply'
}, DE.Views.FileMenuPanels.DocumentInfo || {}));
DE.Views.FileMenuPanels.DocumentRights = Common.UI.BaseView.extend(_.extend({
@@ -1160,12 +1179,12 @@ define([
this.menu = options.menu;
},
- render: function() {
- $(this.el).html(this.template());
+ render: function(node) {
+ var $markup = $(this.template());
- this.cntRights = $('#id-info-rights');
+ this.cntRights = $markup.findById('#id-info-rights');
this.btnEditRights = new Common.UI.Button({
- el: '#id-info-btn-edit'
+ el: $markup.elementById('#id-info-btn-edit')
});
this.btnEditRights.on('click', _.bind(this.changeAccessRights, this));
@@ -1173,16 +1192,17 @@ define([
this.updateInfo(this.doc);
+ Common.NotificationCenter.on('collaboration:sharing', this.changeAccessRights.bind(this));
+ Common.NotificationCenter.on('collaboration:sharingdeny', this.onLostEditRights.bind(this));
+
+ this.$el = $(node).html($markup);
+
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
-
- Common.NotificationCenter.on('collaboration:sharing', _.bind(this.changeAccessRights, this));
- Common.NotificationCenter.on('collaboration:sharingdeny', _.bind(this.onLostEditRights, this));
-
return this;
},
@@ -1346,7 +1366,7 @@ define([
render: function() {
var me = this;
- $(this.el).html(this.template());
+ this.$el.html(this.template());
this.viewHelpPicker = new Common.UI.DataView({
el: $('#id-help-contents'),
@@ -1486,7 +1506,7 @@ define([
},
render: function() {
- $(this.el).html(this.template({scope: this}));
+ this.$el.html(this.template({scope: this}));
var protection = DE.getController('Common.Controllers.Protection').getView();
@@ -1513,7 +1533,7 @@ define([
this.cntSignatureView = $('#id-fms-signature-view');
if (_.isUndefined(this.scroller)) {
this.scroller = new Common.UI.Scroller({
- el: $(this.el),
+ el: this.$el,
suppressScrollX: true
});
}
diff --git a/apps/documenteditor/main/app/view/HeaderFooterSettings.js b/apps/documenteditor/main/app/view/HeaderFooterSettings.js
index 5b7028254..ae792ce79 100644
--- a/apps/documenteditor/main/app/view/HeaderFooterSettings.js
+++ b/apps/documenteditor/main/app/view/HeaderFooterSettings.js
@@ -84,7 +84,7 @@ define([
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
scope: this
}));
diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
index 34bdb9c88..a51640df5 100644
--- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -57,7 +57,9 @@ define([
options: {
width: 350,
style: 'min-width: 230px;',
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
initialize : function(options) {
@@ -88,10 +90,6 @@ define([
'' + this.textTooltip + ' ',
'',
'
',
- '',
- ''
].join('');
@@ -399,8 +397,6 @@ define([
textUrl: 'Link to',
textDisplay: 'Display',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtEmpty: 'This field is required',
txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"',
textTooltip: 'ScreenTip text',
diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js
index 22ac089b2..84b2e50fd 100644
--- a/apps/documenteditor/main/app/view/ImageSettings.js
+++ b/apps/documenteditor/main/app/view/ImageSettings.js
@@ -82,16 +82,16 @@ define([
this._originalProps = null;
this.render();
-
- this.labelWidth = $(this.el).find('#image-label-width');
- this.labelHeight = $(this.el).find('#image-label-height');
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
scope: this
}));
+
+ this.labelWidth = el.find('#image-label-width');
+ this.labelHeight = el.find('#image-label-height');
},
setApi: function(api) {
diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
index 0191463e3..1dc6a5a6f 100644
--- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
@@ -2029,8 +2029,6 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
textWrapInFrontTooltip: 'In Front',
textTitle: 'Image - Advanced Settings',
textKeepRatio: 'Constant Proportions',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
textBtnWrap: 'Text Wrapping',
textCenter: 'Center',
textCharacter: 'Character',
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 767fd4613..b8e9742e7 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -90,13 +90,11 @@ define([
},
render: function () {
- var el = $(this.el);
- el.html(this.template({
- }));
+ var $markup = $(this.template({}));
this.btnSearch = new Common.UI.Button({
action: 'search',
- el: $('#left-btn-search'),
+ el: $markup.elementById('#left-btn-search'),
hint: this.tipSearch + Common.Utils.String.platformKey('Ctrl+F'),
disabled: true,
enableToggle: true
@@ -104,7 +102,7 @@ define([
this.btnAbout = new Common.UI.Button({
action: 'about',
- el: $('#left-btn-about'),
+ el: $markup.elementById('#left-btn-about'),
hint: this.tipAbout,
enableToggle: true,
disabled: true,
@@ -113,14 +111,14 @@ define([
this.btnSupport = new Common.UI.Button({
action: 'support',
- el: $('#left-btn-support'),
+ el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
disabled: true
});
/** coauthoring begin **/
this.btnComments = new Common.UI.Button({
- el: $('#left-btn-comments'),
+ el: $markup.elementById('#left-btn-comments'),
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
@@ -128,7 +126,7 @@ define([
});
this.btnChat = new Common.UI.Button({
- el: $('#left-btn-chat'),
+ el: $markup.elementById('#left-btn-chat'),
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q'),
enableToggle: true,
disabled: true,
@@ -138,36 +136,37 @@ define([
this.btnComments.hide();
this.btnChat.hide();
- this.btnComments.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnComments.on('toggle', _.bind(this.onBtnCommentsToggle, this));
- this.btnChat.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnComments.on('click', this.onBtnMenuClick.bind(this));
+ this.btnComments.on('toggle', this.onBtnCommentsToggle.bind(this));
+ this.btnChat.on('click', this.onBtnMenuClick.bind(this));
/** coauthoring end **/
this.btnPlugins = new Common.UI.Button({
- el: $('#left-btn-plugins'),
+ el: $markup.elementById('#left-btn-plugins'),
hint: this.tipPlugins,
enableToggle: true,
disabled: true,
toggleGroup: 'leftMenuGroup'
});
this.btnPlugins.hide();
- this.btnPlugins.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnPlugins.on('click', this.onBtnMenuClick.bind(this));
this.btnNavigation = new Common.UI.Button({
- el: $('#left-btn-navigation'),
+ el: $markup.elementById('#left-btn-navigation'),
hint: this.tipNavigation,
enableToggle: true,
disabled: true,
toggleGroup: 'leftMenuGroup'
});
- this.btnNavigation.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnNavigation.on('click', this.onBtnMenuClick.bind(this));
- this.btnSearch.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnAbout.on('toggle', _.bind(this.onBtnMenuToggle, this));
+ this.btnSearch.on('click', this.onBtnMenuClick.bind(this));
+ this.btnAbout.on('toggle', this.onBtnMenuToggle.bind(this));
this.menuFile = new DE.Views.FileMenu();
- this.menuFile.render();
- this.btnAbout.panel = (new Common.Views.About({el: $('#about-menu-panel'), appName: 'Document Editor'})).render();
+ this.btnAbout.panel = new Common.Views.About({el: '#about-menu-panel', appName: 'Document Editor'});
+
+ this.$el.html($markup);
return this;
},
diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js
index c9b83f9d4..e2ec9b0c5 100644
--- a/apps/documenteditor/main/app/view/Links.js
+++ b/apps/documenteditor/main/app/view/Links.js
@@ -105,6 +105,10 @@ define([
this.btnBookmarks.on('click', function (b, e) {
me.fireEvent('links:bookmarks');
});
+
+ this.btnCaption.on('click', function (b, e) {
+ me.fireEvent('links:caption');
+ });
}
return {
@@ -147,6 +151,15 @@ define([
Common.Utils.injectComponent($host.find('#slot-btn-bookmarks'), this.btnBookmarks);
this.paragraphControls.push(this.btnBookmarks);
+ this.btnCaption = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-caption',
+ caption: this.capBtnCaption,
+ disabled: true
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-caption'), this.btnCaption);
+ this.paragraphControls.push(this.btnCaption);
+
this._state = {disabled: false};
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
@@ -160,11 +173,12 @@ define([
(new Promise(function (accept, reject) {
accept();
})).then(function(){
- var contentsTemplate = _.template('
');
+ var contentsTemplate = _.template('
');
me.btnsContents.forEach( function(btn) {
btn.updateHint( me.tipContents );
var _menu = new Common.UI.Menu({
+ cls: 'toc-menu',
items: [
{template: contentsTemplate, offsety: 0, value: 0},
{template: contentsTemplate, offsety: 72, value: 1},
@@ -177,6 +191,7 @@ define([
});
me.contentsMenu = new Common.UI.Menu({
+ cls: 'toc-menu',
items: [
{template: contentsTemplate, offsety: 0, value: 0},
{template: contentsTemplate, offsety: 72, value: 1},
@@ -242,6 +257,7 @@ define([
});
me.btnBookmarks.updateHint(me.tipBookmarks);
+ me.btnCaption.updateHint(me.tipCaption);
setEvents.call(me);
});
@@ -283,7 +299,9 @@ define([
capBtnInsLink: 'Hyperlink',
tipInsertHyperlink: 'Add Hyperlink',
capBtnBookmarks: 'Bookmark',
- tipBookmarks: 'Create a bookmark'
+ tipBookmarks: 'Create a bookmark',
+ capBtnCaption: 'Caption',
+ tipCaption: 'Insert caption'
}
}()), DE.Views.Links || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
index e5f7c82ea..279b2afe5 100644
--- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
+++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
@@ -57,11 +57,7 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
'',
'
' + _.template(contentTemplate)({scope: this}) + '
',
'
',
- '
',
- ''
+ '
'
].join('')
}, options);
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
@@ -264,8 +260,6 @@ define([ 'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
textAttachPdf: 'Attach as PDF',
subjectPlaceholder: 'Theme',
filePlaceholder: 'PDF',
- cancelButtonText: 'Cancel',
- okButtonText: 'Send',
textWarning: 'Warning!',
textWarningMsg: 'Please note that mailing cannot be stopped once your click the \'Send\' button.'
diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js
index fa32bd838..ad24da6ef 100644
--- a/apps/documenteditor/main/app/view/MailMergeSettings.js
+++ b/apps/documenteditor/main/app/view/MailMergeSettings.js
@@ -91,6 +91,31 @@ define([
this.mergeMailData = undefined;
this.render();
+ },
+
+ render: function () {
+ this.$el.html(this.template({
+ scope: this
+ }));
+ },
+
+ setApi: function(api) {
+ this.api = api;
+ if (this.api) {
+ this.api.asc_registerCallback('asc_onPreviewMailMergeResult', _.bind(this.onPreviewMailMergeResult, this));
+ this.api.asc_registerCallback('asc_onEndPreviewMailMergeResult', _.bind(this.onEndPreviewMailMergeResult, this));
+ this.api.asc_registerCallback('asc_onStartMailMerge', _.bind(this.onStartMailMerge, this));
+ this.api.asc_registerCallback('asc_onSaveMailMerge', _.bind(this.onSaveMailMerge, this));
+ this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this));
+ Common.Gateway.on('setemailaddresses', _.bind(this.onSetEmailAddresses, this));
+ Common.Gateway.on('processmailmerge', _.bind(this.onProcessMailMerge, this));
+ }
+ return this;
+ },
+
+ createDelayedControls: function() {
+ var me = this,
+ _set = DE.enumLockMM;
this.btnInsField = new Common.UI.Button({
cls: 'btn-text-menu-default',
@@ -133,32 +158,7 @@ define([
}
});
this.emptyDBControls.push(this.txtFieldNum);
- },
- render: function () {
- this.$el.html(this.template({
- scope: this
- }));
- },
-
- setApi: function(api) {
- this.api = api;
- if (this.api) {
- this.api.asc_registerCallback('asc_onPreviewMailMergeResult', _.bind(this.onPreviewMailMergeResult, this));
- this.api.asc_registerCallback('asc_onEndPreviewMailMergeResult', _.bind(this.onEndPreviewMailMergeResult, this));
- this.api.asc_registerCallback('asc_onStartMailMerge', _.bind(this.onStartMailMerge, this));
- this.api.asc_registerCallback('asc_onSaveMailMerge', _.bind(this.onSaveMailMerge, this));
- this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this));
- Common.Gateway.on('setemailaddresses', _.bind(this.onSetEmailAddresses, this));
- Common.Gateway.on('processmailmerge', _.bind(this.onProcessMailMerge, this));
- }
- return this;
- },
-
- createDelayedControls: function() {
- var me = this,
- _set = DE.enumLockMM;
-
this.btnEditData = new Common.UI.Button({
el: me.$el.find('#mmerge-button-edit-data'),
lock: [_set.preview, _set.lostConnect]
@@ -760,8 +760,8 @@ define([
},
onStartMailMerge: function() {
- this.btnInsField.menu.removeAll();
- this.txtFieldNum.setValue(1);
+ this.btnInsField && this.btnInsField.menu.removeAll();
+ this.txtFieldNum && this.txtFieldNum.setValue(1);
this.ChangeSettings({
recipientsCount: this.api.asc_GetReceptionsCount(),
fieldsList: this.api.asc_GetMailMergeFieldsNameList()
diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
index e5571e63e..2c4bfc099 100644
--- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js
@@ -49,7 +49,8 @@ define([
DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
contentWidth: 300,
- height: 380
+ height: 380,
+ buttons: null
},
initialize : function(options) {
@@ -122,9 +123,9 @@ define([
'',
'',
''
].join('')
}, options);
@@ -427,7 +428,6 @@ define([
textSection: 'Current section',
textApply: 'Apply',
textInsert: 'Insert',
- textCancel: 'Cancel',
textCustom: 'Custom Mark'
}, DE.Views.NoteSettingsDialog || {}))
diff --git a/apps/documenteditor/main/app/view/NumberingValueDialog.js b/apps/documenteditor/main/app/view/NumberingValueDialog.js
index 6590074f3..c7c31cc22 100644
--- a/apps/documenteditor/main/app/view/NumberingValueDialog.js
+++ b/apps/documenteditor/main/app/view/NumberingValueDialog.js
@@ -48,7 +48,8 @@ define([
width: 214,
header: true,
style: 'min-width: 214px;',
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
@@ -61,9 +62,6 @@ define([
'',
- ''
].join('');
@@ -253,9 +251,7 @@ define([
}
return result;
- },
+ }
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok'
}, DE.Views.NumberingValueDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js
index a449691a8..b1c6f83cb 100644
--- a/apps/documenteditor/main/app/view/PageMarginsDialog.js
+++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js
@@ -49,7 +49,8 @@ define([
header: true,
style: 'min-width: 216px;',
cls: 'modal-dlg',
- id: 'window-page-margins'
+ id: 'window-page-margins',
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
@@ -82,11 +83,7 @@ define([
'',
'',
'',
- '
',
- ''
+ '
'
].join('');
this.options.tpl = _.template(this.template)(this.options);
@@ -222,8 +219,6 @@ define([
textLeft: 'Left',
textBottom: 'Bottom',
textRight: 'Right',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
notcriticalErrorTitle: 'Warning',
txtMarginsW: 'Left and right margins are too high for a given page wight',
txtMarginsH: 'Top and bottom margins are too high for a given page height'
diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js
index 057011fd4..ff026d3c8 100644
--- a/apps/documenteditor/main/app/view/PageSizeDialog.js
+++ b/apps/documenteditor/main/app/view/PageSizeDialog.js
@@ -49,7 +49,8 @@ define([
header: true,
style: 'min-width: 216px;',
cls: 'modal-dlg',
- id: 'window-page-size'
+ id: 'window-page-size',
+ buttons: ['ok', 'cancel']
},
initialize : function(options) {
@@ -78,11 +79,7 @@ define([
'',
'',
'',
- '
',
- ''
+ '
'
].join('');
this.options.tpl = _.template(this.template)(this.options);
@@ -223,8 +220,6 @@ define([
textTitle: 'Page Size',
textWidth: 'Width',
textHeight: 'Height',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
textPreset: 'Preset',
txtCustom: 'Custom'
}, DE.Views.PageSizeDialog || {}))
diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js
index 1814951ca..04bee00dd 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettings.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettings.js
@@ -91,10 +91,16 @@ define([
{displayValue: this.textAuto, defaultValue: 1, value: c_paragraphLinerule.LINERULE_AUTO, minValue: 0.5, step: 0.01, defaultUnit: ''},
{displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'}
];
+ },
+
+ render: function () {
+ var $markup = $(this.template({
+ scope: this
+ }));
// Short Size
this.cmbLineRule = new Common.UI.ComboBox({
- el: $('#paragraph-combo-line-rule'),
+ el: $markup.findById('#paragraph-combo-line-rule'),
cls: 'input-group-nr',
menuStyle: 'min-width: 85px;',
editable: false,
@@ -105,7 +111,7 @@ define([
this.lockedControls.push(this.cmbLineRule);
this.numLineHeight = new Common.UI.MetricSpinner({
- el: $('#paragraph-spin-line-height'),
+ el: $markup.findById('#paragraph-spin-line-height'),
step: .01,
width: 85,
value: '',
@@ -117,7 +123,7 @@ define([
this.lockedControls.push(this.numLineHeight);
this.numSpacingBefore = new Common.UI.MetricSpinner({
- el: $('#paragraph-spin-spacing-before'),
+ el: $markup.findById('#paragraph-spin-spacing-before'),
step: .1,
width: 85,
value: '',
@@ -132,7 +138,7 @@ define([
this.lockedControls.push(this.numSpacingBefore);
this.numSpacingAfter = new Common.UI.MetricSpinner({
- el: $('#paragraph-spin-spacing-after'),
+ el: $markup.findById('#paragraph-spin-spacing-after'),
step: .1,
width: 85,
value: '',
@@ -147,7 +153,7 @@ define([
this.lockedControls.push(this.numSpacingAfter);
this.chAddInterval = new Common.UI.CheckBox({
- el: $('#paragraph-checkbox-add-interval'),
+ el: $markup.findById('#paragraph-checkbox-add-interval'),
labelText: this.strSomeParagraphSpace,
disabled: this._locked
});
@@ -158,27 +164,25 @@ define([
disabled: this._locked,
menu : true
});
- this.btnColor.render( $('#paragraph-color-btn'));
+ this.btnColor.render($markup.findById('#paragraph-color-btn'));
this.lockedControls.push(this.btnColor);
- this.numLineHeight.on('change', _.bind(this.onNumLineHeightChange, this));
- this.numSpacingBefore.on('change', _.bind(this.onNumSpacingBeforeChange, this));
- this.numSpacingAfter.on('change', _.bind(this.onNumSpacingAfterChange, this));
- this.chAddInterval.on('change', _.bind(this.onAddIntervalChange, this));
- this.cmbLineRule.on('selected', _.bind(this.onLineRuleSelect, this));
- this.cmbLineRule.on('hide:after', _.bind(this.onHideMenus, this));
- $(this.el).on('click', '#paragraph-advanced-link', _.bind(this.openAdvancedSettings, this));
- this.TextOnlySettings = $('.text-only');
- },
+ this.numLineHeight.on('change', this.onNumLineHeightChange.bind(this));
+ this.numSpacingBefore.on('change', this.onNumSpacingBeforeChange.bind(this));
+ this.numSpacingAfter.on('change', this.onNumSpacingAfterChange.bind(this));
+ this.chAddInterval.on('change', this.onAddIntervalChange.bind(this));
+ this.cmbLineRule.on('selected', this.onLineRuleSelect.bind(this));
+ this.cmbLineRule.on('hide:after', this.onHideMenus.bind(this));
- render: function () {
- var el = $(this.el);
- el.html(this.template({
- scope: this
- }));
-
- this.linkAdvanced = $('#paragraph-advanced-link');
+ this.linkAdvanced = $markup.findById('#paragraph-advanced-link');
this.linkAdvanced.toggleClass('disabled', this._locked);
+
+ this.$el.on('click', '#paragraph-advanced-link', this.openAdvancedSettings.bind(this));
+ this.$el.html($markup);
+
+ this.TextOnlySettings = $('.text-only', this.$el);
+
+ this.rendered = true;
},
setApi: function(api) {
@@ -393,9 +397,9 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.UpdateThemeColors();
this.updateMetricUnit();
- this._initSettings = false;
},
openAdvancedSettings: function(e) {
diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
index 243acbb1a..bfc4f6191 100644
--- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -1446,8 +1446,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textBorderColor: 'Border Color',
textBackColor: 'Background Color',
textBorderDesc: 'Click on diagramm or use buttons to select borders',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textEffects: 'Effects',
diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js
index e33266c43..f1b95cc70 100644
--- a/apps/documenteditor/main/app/view/RightMenu.js
+++ b/apps/documenteditor/main/app/view/RightMenu.js
@@ -146,32 +146,31 @@ define([
},
render: function (mode) {
- var el = $(this.el);
-
this.trigger('render:before', this);
this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu;
var open = !Common.localStorage.getBool("de-hide-right-settings", this.defaultHideRightMenu);
- el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
- el.show();
+ this.$el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
+ this.$el.show();
- el.html(this.template({}));
+ var $markup = $(this.template({}));
+ this.$el.html($markup);
- this.btnText.setElement($('#id-right-menu-text'), false); this.btnText.render();
- this.btnTable.setElement($('#id-right-menu-table'), false); this.btnTable.render();
- this.btnImage.setElement($('#id-right-menu-image'), false); this.btnImage.render();
- this.btnHeaderFooter.setElement($('#id-right-menu-header'), false); this.btnHeaderFooter.render();
- this.btnChart.setElement($('#id-right-menu-chart'), false); this.btnChart.render();
- this.btnShape.setElement($('#id-right-menu-shape'), false); this.btnShape.render();
- this.btnTextArt.setElement($('#id-right-menu-textart'), false); this.btnTextArt.render();
+ this.btnText.setElement($markup.findById('#id-right-menu-text'), false); this.btnText.render();
+ this.btnTable.setElement($markup.findById('#id-right-menu-table'), false); this.btnTable.render();
+ this.btnImage.setElement($markup.findById('#id-right-menu-image'), false); this.btnImage.render();
+ this.btnHeaderFooter.setElement($markup.findById('#id-right-menu-header'), false); this.btnHeaderFooter.render();
+ this.btnChart.setElement($markup.findById('#id-right-menu-chart'), false); this.btnChart.render();
+ this.btnShape.setElement($markup.findById('#id-right-menu-shape'), false); this.btnShape.render();
+ this.btnTextArt.setElement($markup.findById('#id-right-menu-textart'), false); this.btnTextArt.render();
- this.btnText.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnTable.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnImage.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnHeaderFooter.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnChart.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnShape.on('click', _.bind(this.onBtnMenuClick, this));
- this.btnTextArt.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnText.on('click', this.onBtnMenuClick.bind(this));
+ this.btnTable.on('click', this.onBtnMenuClick.bind(this));
+ this.btnImage.on('click', this.onBtnMenuClick.bind(this));
+ this.btnHeaderFooter.on('click', this.onBtnMenuClick.bind(this));
+ this.btnChart.on('click', this.onBtnMenuClick.bind(this));
+ this.btnShape.on('click', this.onBtnMenuClick.bind(this));
+ this.btnTextArt.on('click', this.onBtnMenuClick.bind(this));
this.paragraphSettings = new DE.Views.ParagraphSettings();
this.headerSettings = new DE.Views.HeaderFooterSettings();
@@ -192,8 +191,8 @@ define([
});
this._settings[Common.Utils.documentSettingsType.MailMerge] = {panel: "id-mail-merge-settings", btn: this.btnMailMerge};
- this.btnMailMerge.el = $('#id-right-menu-mail-merge'); this.btnMailMerge.render().setVisible(true);
- this.btnMailMerge.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnMailMerge.el = $markup.findById('#id-right-menu-mail-merge'); this.btnMailMerge.render().setVisible(true);
+ this.btnMailMerge.on('click', this.onBtnMenuClick.bind(this));
this.mergeSettings = new DE.Views.MailMergeSettings();
}
@@ -208,8 +207,8 @@ define([
});
this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature};
- this.btnSignature.el = $('#id-right-menu-signature'); this.btnSignature.render().setVisible(true);
- this.btnSignature.on('click', _.bind(this.onBtnMenuClick, this));
+ this.btnSignature.el = $markup.findById('#id-right-menu-signature'); this.btnSignature.render().setVisible(true);
+ this.btnSignature.on('click', this.onBtnMenuClick.bind(this));
this.signatureSettings = new DE.Views.SignatureSettings();
}
@@ -222,27 +221,29 @@ define([
}
if (open) {
- $('#id-paragraph-settings').parent().css("display", "inline-block" );
- $('#id-paragraph-settings').addClass("active");
+ $markup.findById('#id-paragraph-settings').parent().css("display", "inline-block" );
+ $markup.findById('#id-paragraph-settings').addClass("active");
}
+ // this.$el.html($markup);
this.trigger('render:after', this);
return this;
},
setApi: function(api) {
- this.api = api;
- var fire = function() { this.fireEvent('editcomplete', this); };
- this.paragraphSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.headerSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.imageSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.chartSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.tableSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.shapeSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- this.textartSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- if (this.mergeSettings) this.mergeSettings.setApi(api).on('editcomplete', _.bind( fire, this));
- if (this.signatureSettings) this.signatureSettings.setApi(api).on('editcomplete', _.bind( fire, this));
+ var me = this;
+ me.api = api;
+ var _fire_editcomplete = function() {me.fireEvent('editcomplete', me);};
+ this.paragraphSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.headerSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.imageSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.chartSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.tableSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.shapeSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ this.textartSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ if (this.mergeSettings) this.mergeSettings.setApi(api).on('editcomplete', _fire_editcomplete);
+ if (this.signatureSettings) this.signatureSettings.setApi(api).on('editcomplete', _fire_editcomplete);
},
setMode: function(mode) {
diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index b856e4a8c..1d227611a 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -78,6 +78,7 @@ define([
this.imgprops = null;
this._sendUndoPoint = true;
this._sliderChanged = false;
+ this._texturearray = null;
this.txtPt = Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt);
@@ -100,7 +101,8 @@ define([
DisabledFillPanels: false,
DisabledControls: false,
HideShapeOnlySettings: false,
- HideChangeTypeSettings: false
+ HideChangeTypeSettings: false,
+ isFromImage: false
};
this.lockedControls = [];
this._locked = false;
@@ -126,6 +128,13 @@ define([
this.fillControls = [];
this.render();
+ },
+
+ render: function () {
+ var el = this.$el || $(this.el);
+ el.html(this.template({
+ scope: this
+ }));
this.FillColorContainer = $('#shape-panel-color-fill');
this.FillImageContainer = $('#shape-panel-image-fill');
@@ -136,13 +145,6 @@ define([
this.CanChangeType = $('.change-type');
},
- render: function () {
- var el = $(this.el);
- el.html(this.template({
- scope: this
- }));
- },
-
setApi: function(api) {
this.api = api;
if (this.api) {
@@ -785,7 +787,8 @@ define([
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1';
this.hideChangeTypeSettings(hidechangetype);
- if (!hidechangetype) {
+ this._state.isFromImage = !!shapeprops.get_FromImage();
+ if (!hidechangetype && this.btnChangeShape.menu.items.length) {
this.btnChangeShape.menu.items[0].setVisible(shapeprops.get_FromImage());
this.btnChangeShape.menu.items[1].setVisible(!shapeprops.get_FromImage());
}
@@ -1480,6 +1483,7 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.createDelayedControls();
var global_hatch_menu_map = [
@@ -1513,37 +1517,17 @@ define([
this.PatternFillType = this.patternViewData[0].type;
}
- this.fillAutoShapes();
+ this.onInitStandartTextures();
+ this.onApiAutoShapes();
this.UpdateThemeColors();
- this._initSettings = false;
},
onInitStandartTextures: function(texture) {
var me = this;
if (texture && texture.length>0){
- if (!this.btnTexture) {
- this.btnTexture = new Common.UI.ComboBox({
- el: $('#shape-combo-fill-texture'),
- template: _.template([
- ''
- ].join(''))
- });
- this.textureMenu = new Common.UI.Menu({
- items: [
- { template: _.template('') }
- ]
- });
- this.textureMenu.render($('#shape-combo-fill-texture'));
- this.fillControls.push(this.btnTexture);
- }
-
- var texturearray = [];
+ me._texturearray = [];
_.each(texture, function(item){
- texturearray.push({
+ me._texturearray.push({
imageUrl: item.get_image(),
name : me.textureNames[item.get_id()],
type : item.get_id(),
@@ -1551,15 +1535,41 @@ define([
selected: false
});
});
- var mnuTexturePicker = new Common.UI.DataView({
- el: $('#id-shape-menu-texture'),
- restoreHeight: 174,
- parentMenu: me.textureMenu,
- showLast: false,
- store: new Common.UI.DataViewStore(texturearray),
- itemTemplate: _.template(' ')
+ }
+
+ if (!me._texturearray || me._texturearray.length<1) return;
+ if (!this._initSettings && !this.btnTexture) {
+ this.btnTexture = new Common.UI.ComboBox({
+ el: $('#shape-combo-fill-texture'),
+ template: _.template([
+ ''
+ ].join(''))
});
- mnuTexturePicker.on('item:click', _.bind(this.onSelectTexture, this));
+ this.textureMenu = new Common.UI.Menu({
+ items: [
+ { template: _.template('') }
+ ]
+ });
+ this.textureMenu.render($('#shape-combo-fill-texture'));
+ this.fillControls.push(this.btnTexture);
+
+ var onShowBefore = function(menu) {
+ var mnuTexturePicker = new Common.UI.DataView({
+ el: $('#id-shape-menu-texture'),
+ restoreHeight: 174,
+ parentMenu: menu,
+ showLast: false,
+ store: new Common.UI.DataViewStore(me._texturearray || []),
+ itemTemplate: _.template(' ')
+ });
+ mnuTexturePicker.on('item:click', _.bind(me.onSelectTexture, me));
+ menu.off('show:before', onShowBefore);
+ };
+ this.textureMenu.on('show:before', onShowBefore);
}
},
@@ -1610,49 +1620,66 @@ define([
this.fireEvent('editcomplete', this);
},
+ onApiAutoShapes: function() {
+ var me = this;
+ var onShowBefore = function(menu) {
+ me.fillAutoShapes();
+ menu.off('show:before', onShowBefore);
+ };
+ me.btnChangeShape.menu.on('show:before', onShowBefore);
+ },
+
fillAutoShapes: function() {
var me = this,
- shapesStore = this.application.getCollection('ShapeGroups');
+ shapesStore = this.application.getCollection('ShapeGroups'),
+ count = shapesStore.length;
+
+ var onShowAfter = function(menu) {
+ for (var i=-1; i0; i++) {
+ var store = shapesStore.at(i > -1 ? i : 0).get('groupStore');
+ if (i<0) {
+ store = store.clone();
+ store.shift();
+ }
+ var shapePicker = new Common.UI.DataViewSimple({
+ el: $('#id-shape-menu-shapegroup' + (i+1), menu.items[i+1].$el),
+ store: store,
+ parentMenu: menu.items[i+1].menu,
+ itemTemplate: _.template('\">
')
+ });
+ shapePicker.on('item:click', function(picker, item, record, e) {
+ if (me.api) {
+ me.api.ChangeShapeType(record.get('data').shapeType);
+ me.fireEvent('editcomplete', me);
+ }
+ if (e.type !== 'click')
+ me.btnChangeShape.menu.hide();
+ });
+ }
+ menu.off('show:after', onShowAfter);
+ };
+ me.btnChangeShape.menu.on('show:after', onShowAfter);
- var count = shapesStore.length;
for (var i=-1; i0; i++) {
- var shapeGroup = shapesStore.at(i>-1 ? i : i+1);
+ var shapeGroup = shapesStore.at(i > -1 ? i : i + 1);
var menuItem = new Common.UI.MenuItem({
caption: shapeGroup.get('groupName'),
menu: new Common.UI.Menu({
menuAlign: 'tr-tl',
items: [
- { template: _.template('') }
+ {template: _.template('')}
]
})
});
me.btnChangeShape.menu.addItem(menuItem);
-
- var store = shapeGroup.get('groupStore');
- if (i<0) {
- store = store.clone();
- store.shift();
- }
- var shapePicker = new Common.UI.DataView({
- el: $('#id-shape-menu-shapegroup' + (i+1)),
- store: store,
- parentMenu: menuItem.menu,
- showLast: false,
- itemTemplate: _.template('\">
')
- });
-
- shapePicker.on('item:click', function(picker, item, record, e) {
- if (me.api) {
- me.api.ChangeShapeType(record.get('data').shapeType);
- me.fireEvent('editcomplete', me);
- }
- if (e.type !== 'click')
- me.btnChangeShape.menu.hide();
- });
}
+ me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage);
+ me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage);
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
+
if (!this.btnBackColor) {
// create color buttons
this.btnBackColor = new Common.UI.ColorButton({
@@ -1674,7 +1701,6 @@ define([
});
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
-
this.btnFGColor = new Common.UI.ColorButton({
style: "width:45px;",
menu : new Common.UI.Menu({
@@ -1751,7 +1777,6 @@ define([
this.colorsBorder.on('select', _.bind(this.onColorsBorderSelect, this));
this.btnBorderColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBorder, this.btnBorderColor));
}
-
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsFG.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js
index f8131e80d..c8b9cc613 100644
--- a/apps/documenteditor/main/app/view/Statusbar.js
+++ b/apps/documenteditor/main/app/view/Statusbar.js
@@ -66,7 +66,7 @@ define([
Common.Utils.String.format(this.pageIndexText, model.get('current'), model.get('count')) );
}
- function _clickLanguage(menu, item, state) {
+ function _clickLanguage(menu, item) {
var $parent = menu.$el.parent();
$parent.find('#status-label-lang').text(item.caption);
this.langMenu.prevTip = item.value.value;
@@ -228,13 +228,13 @@ define([
disabled: true
});
- this.langMenu = new Common.UI.Menu({
+ this.langMenu = new Common.UI.MenuSimple({
cls: 'lang-menu',
style: 'margin-top:-5px;',
restoreHeight: 285,
itemTemplate: _.template([
- '',
- '',
+ ' ',
+ '',
'<%= caption %>',
' '
].join('')),
@@ -340,18 +340,18 @@ define([
},
reloadLanguages: function(array) {
- this.langMenu.removeAll();
+ var arr = [],
+ saved = this.langMenu.saved;
_.each(array, function(item) {
- this.langMenu.addItem({
+ arr.push({
caption : item['displayValue'],
value : {value: item['value'], code: item['code']},
checkable : true,
- checked : this.langMenu.saved == item['displayValue'],
- spellcheck : item['spellcheck'],
- toggleGroup : 'language'
+ checked : saved == item['displayValue'],
+ spellcheck : item['spellcheck']
});
- }, this);
-
+ });
+ this.langMenu.resetItems(arr);
if (this.langMenu.items.length>0) {
this.btnLanguage.setDisabled(!!this.mode.isDisconnected);
}
@@ -365,9 +365,9 @@ define([
this.langMenu.prevTip = info.value;
var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; });
- if (lang)
- lang.setChecked(true);
- else {
+ if (lang) {
+ this.langMenu.setChecked(this.langMenu.items.indexOf(lang), true);
+ } else {
this.langMenu.saved = info.displayValue;
this.langMenu.clearAll();
}
diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index 238efe689..5855d3237 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -47,7 +47,9 @@ define([
width: 350,
height: 200,
style: 'min-width: 230px;',
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
initialize : function(options) {
@@ -62,11 +64,6 @@ define([
'' + this.textNextStyle + ' ',
'
',
- '',
-
- ''
].join('');
@@ -105,7 +102,7 @@ define([
this.cmbNextStyle = new Common.UI.ComboBox({
el : $('#id-dlg-style-next-par'),
style : 'width: 100%;',
- menuStyle : 'width: 100%; max-height: 290px;',
+ menuStyle : 'width: 100%; max-height: 210px;',
editable : false,
cls : 'input-group-nr',
data : this.options.formats,
diff --git a/apps/documenteditor/main/app/view/TableFormulaDialog.js b/apps/documenteditor/main/app/view/TableFormulaDialog.js
index 97a377813..ec6900ab3 100644
--- a/apps/documenteditor/main/app/view/TableFormulaDialog.js
+++ b/apps/documenteditor/main/app/view/TableFormulaDialog.js
@@ -47,7 +47,9 @@ define([
options: {
width: 300,
style: 'min-width: 230px;',
- cls: 'modal-dlg'
+ cls: 'modal-dlg',
+ buttons: ['ok', 'cancel'],
+ footerCls: 'right'
},
initialize : function(options) {
@@ -69,11 +71,7 @@ define([
'
',
'
',
'',
- '',
- ''
+ ''
].join('');
this.options.tpl = _.template(this.template)(this.options);
@@ -240,8 +238,6 @@ define([
textFormat: 'Number Format',
textBookmark: 'Paste Bookmark',
textInsertFunction: 'Paste Function',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
textTitle: 'Formula Settings'
}, DE.Views.TableFormulaDialog || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 71a015642..ea5f9d04c 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -120,11 +120,7 @@ define([
'',
'',
'',
- '
',
- ''
+ '
'
].join('')
}, options);
@@ -649,8 +645,6 @@ define([
textRadioStyles: 'Selected styles',
textStyle: 'Style',
textLevel: 'Level',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtCurrent: 'Current',
txtSimple: 'Simple',
txtStandard: 'Standard',
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index ad1d1f911..6a26cf3f9 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -231,7 +231,7 @@ define([
},
render: function () {
- var el = $(this.el);
+ var el = this.$el || $(this.el);
el.html(this.template({
scope: this
}));
@@ -431,10 +431,10 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.updateMetricUnit();
- this._initSettings = false;
},
ChangeSettings: function(props) {
@@ -641,6 +641,7 @@ define([
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
if (!this.btnBackColor) {
// create color buttons
this.btnBorderColor = new Common.UI.ColorButton({
@@ -715,17 +716,25 @@ define([
data[index].set('imageUrl', template.asc_getImage());
});
} else {
- self.cmbTableTemplate.menuPicker.store.reset([]);
var arr = [];
_.each(Templates, function(template){
+ var tip = template.asc_getDisplayName();
+ if (template.asc_getType()==0) {
+ ['Table Grid', 'Plain Table', 'Grid Table', 'List Table', 'Light', 'Dark', 'Colorful', 'Accent'].forEach(function(item){
+ var str = 'txtTable_' + item.replace(' ', '');
+ if (self[str])
+ tip = tip.replace(item, self[str]);
+ });
+
+ }
arr.push({
imageUrl: template.asc_getImage(),
id : Common.UI.getId(),
templateId: template.asc_getId(),
- tip : template.asc_getDisplayName()
+ tip : tip
});
});
- self.cmbTableTemplate.menuPicker.store.add(arr);
+ self.cmbTableTemplate.menuPicker.store.reset(arr);
}
},
@@ -823,8 +832,6 @@ define([
textSelectBorders : 'Select borders that you want to change',
textAdvanced : 'Show advanced settings',
txtNoBorders : 'No borders',
- textOK : 'OK',
- textCancel : 'Cancel',
textNewColor : 'Add New Custom Color',
textTemplate : 'Select From Template',
textRows : 'Rows',
@@ -851,7 +858,15 @@ define([
textWidth: 'Width',
textDistributeRows: 'Distribute rows',
textDistributeCols: 'Distribute columns',
- textAddFormula: 'Add formula'
+ textAddFormula: 'Add formula',
+ txtTable_TableGrid: 'Table Grid',
+ txtTable_PlainTable: 'Plain Table',
+ txtTable_GridTable: 'Grid Table',
+ txtTable_ListTable: 'List Table',
+ txtTable_Light: 'Light',
+ txtTable_Dark: 'Dark',
+ txtTable_Colorful: 'Colorful',
+ txtTable_Accent: 'Accent'
}, DE.Views.TableSettings || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
index 30107783b..ad16dda1d 100644
--- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js
@@ -2131,8 +2131,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
textPreview: 'Preview',
textBorderDesc: 'Click on diagramm or use buttons to select borders',
textTableBackColor: 'Table Background',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
txtNoBorders: 'No borders',
textNewColor: 'Add New Custom Color',
textCenter: 'Center',
diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js
index 663bd9537..4613bf022 100644
--- a/apps/documenteditor/main/app/view/TextArtSettings.js
+++ b/apps/documenteditor/main/app/view/TextArtSettings.js
@@ -105,20 +105,24 @@ define([
this.BorderSize = 0;
this.BorderType = Asc.c_oDashType.solid;
+ DE.getCollection('Common.Collections.TextArt').bind({
+ reset: this.fillTextArt.bind(this)
+ });
+
this.render();
+ },
+
+ render: function () {
+ var el = this.$el || $(this.el);
+ el.html(this.template({
+ scope: this
+ }));
this.FillColorContainer = $('#textart-panel-color-fill');
this.FillGradientContainer = $('#textart-panel-gradient-fill');
this.TransparencyContainer = $('#textart-panel-transparent-fill');
},
- render: function () {
- var el = $(this.el);
- el.html(this.template({
- scope: this
- }));
- },
-
setApi: function(api) {
this.api = api;
return this;
@@ -985,15 +989,17 @@ define([
},
createDelayedElements: function() {
+ this._initSettings = false;
this.createDelayedControls();
this.UpdateThemeColors();
this.fillTransform(this.api.asc_getPropertyEditorTextArts());
- this._initSettings = false;
+ this.fillTextArt();
},
fillTextArt: function() {
+ if (this._initSettings) return;
+
var me = this;
-
if (!this.cmbTextArt) {
this.cmbTextArt = new Common.UI.ComboDataView({
itemWidth: 50,
@@ -1017,6 +1023,10 @@ define([
var models = this.application.getCollection('Common.Collections.TextArt').models,
count = this.cmbTextArt.menuPicker.store.length;
+ if (models.length<1) {
+ DE.getController('Main').fillTextArt(this.api.asc_getTextArtPreviews());
+ return;
+ }
if (count>0 && count==models.length) {
var data = this.cmbTextArt.menuPicker.store.models;
_.each(models, function(template, index){
@@ -1073,6 +1083,7 @@ define([
},
UpdateThemeColors: function() {
+ if (this._initSettings) return;
if (!this.btnBackColor) {
this.btnBorderColor = new Common.UI.ColorButton({
style: "width:45px;",
@@ -1132,7 +1143,6 @@ define([
this.colorsBack.on('select', _.bind(this.onColorsBackSelect, this));
this.btnBackColor.menu.items[1].on('click', _.bind(this.addNewColor, this, this.colorsBack, this.btnBackColor));
}
-
this.colorsBorder.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.colorsGrad.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index 60c729e5b..acdb1b86a 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -506,12 +506,7 @@ define([
cls: 'btn-toolbar x-huge icon-top',
caption: me.capBtnInsChart,
iconCls: 'btn-insertchart',
- menu: new Common.UI.Menu({
- style: 'width: 435px;',
- items: [
- {template: _.template('')}
- ]
- })
+ menu: true
});
this.paragraphControls.push(this.btnInsertChart);
@@ -1270,7 +1265,7 @@ define([
rendererComponents: function (html) {
var $host = $(html);
var _injectComponent = function (id, cmp) {
- Common.Utils.injectComponent($host.find(id), cmp);
+ Common.Utils.injectComponent($host.findById(id), cmp);
};
_injectComponent('#slot-field-fontname', this.cmbFontName);
@@ -1345,7 +1340,7 @@ define([
if ( !config.isEdit ) return;
me.btnsPageBreak.forEach( function(btn) {
- btn.updateHint( me.tipPageBreak );
+ btn.updateHint( [me.textInsPageBreak, me.tipPageBreak] );
var _menu_section_break = new Common.UI.Menu({
menuAlign: 'tl-tr',
@@ -1656,6 +1651,91 @@ define([
this.paragraphControls.push(this.mnuPageNumCurrentPos);
this.paragraphControls.push(this.mnuInsertPageCount);
+ this.btnInsertChart.setMenu( new Common.UI.Menu({
+ style: 'width: 435px;',
+ items: [
+ {template: _.template('')}
+ ]
+ }));
+
+ var onShowBefore = function(menu) {
+ var picker = new Common.UI.DataView({
+ el: $('#id-toolbar-menu-insertchart'),
+ parentMenu: menu,
+ showLast: false,
+ restoreHeight: 421,
+ groups: new Common.UI.DataViewGroupStore([
+ {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
+ {id: 'menu-chart-group-line', caption: me.textLine},
+ {id: 'menu-chart-group-pie', caption: me.textPie},
+ {id: 'menu-chart-group-hbar', caption: me.textBar},
+ {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
+ {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
+ {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
+ // {id: 'menu-chart-group-surface', caption: me.textSurface}
+ ]),
+ store: new Common.UI.DataViewStore([
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked, iconCls: 'column-stack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer, iconCls: 'column-pstack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3d, iconCls: 'column-3d-normal'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStacked3d, iconCls: 'column-3d-stack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barStackedPer3d, iconCls: 'column-3d-pstack'},
+ { group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective, iconCls: 'column-3d-normal-per'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineNormal, iconCls: 'line-normal'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStacked, iconCls: 'line-stack'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.lineStackedPer, iconCls: 'line-pstack'},
+ { group: 'menu-chart-group-line', type: Asc.c_oAscChartTypeSettings.line3d, iconCls: 'line-3d'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie, iconCls: 'pie-normal'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.doughnut, iconCls: 'pie-doughnut'},
+ { group: 'menu-chart-group-pie', type: Asc.c_oAscChartTypeSettings.pie3d, iconCls: 'pie-3d-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal, iconCls: 'bar-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked, iconCls: 'bar-stack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer, iconCls: 'bar-pstack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarNormal3d, iconCls: 'bar-3d-normal'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStacked3d, iconCls: 'bar-3d-stack'},
+ { group: 'menu-chart-group-hbar', type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d, iconCls: 'bar-3d-pstack'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaNormal, iconCls: 'area-normal'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, iconCls: 'area-stack'},
+ { group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, iconCls: 'area-pstack'},
+ { group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, iconCls: 'point-normal'},
+ { group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, iconCls: 'stock-normal'}
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, iconCls: 'surface-normal'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, iconCls: 'surface-wireframe'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, iconCls: 'contour-normal'},
+ // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, iconCls: 'contour-wireframe'}
+
+ ]),
+ itemTemplate: _.template('
')
+ });
+ picker.on('item:click', function (picker, item, record, e) {
+ if (record)
+ me.fireEvent('add:chart', [record.get('type')]);
+ });
+ menu.off('show:before', onShowBefore);
+ };
+ this.btnInsertChart.menu.on('show:before', onShowBefore);
+
+ var onShowBeforeTextArt = function (menu) {
+ var collection = DE.getCollection('Common.Collections.TextArt');
+ if (collection.length<1)
+ DE.getController('Main').fillTextArt(me.api.asc_getTextArtPreviews());
+ var picker = new Common.UI.DataView({
+ el: $('#id-toolbar-menu-insart'),
+ store: collection,
+ parentMenu: menu,
+ showLast: false,
+ itemTemplate: _.template('')
+ });
+ picker.on('item:click', function (picker, item, record, e) {
+ if (record)
+ me.fireEvent('insert:textart', [record.get('data')]);
+ if (e.type !== 'click') menu.hide();
+ });
+ menu.off('show:before', onShowBeforeTextArt);
+ };
+ this.btnInsertTextArt.menu.on('show:before', onShowBeforeTextArt);
+
// set dataviews
var _conf = this.mnuMarkersPicker.conf;
@@ -1773,181 +1853,6 @@ define([
});
_conf && this.mnuPageNumberPosPicker.setDisabled(_conf.disabled);
- this.mnuInsertChartPicker = new Common.UI.DataView({
- el: $('#id-toolbar-menu-insertchart'),
- parentMenu: this.btnInsertChart.menu,
- showLast: false,
- restoreHeight: 421,
- groups: new Common.UI.DataViewGroupStore([
- {id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts},
- {id: 'menu-chart-group-line', caption: me.textLine},
- {id: 'menu-chart-group-pie', caption: me.textPie},
- {id: 'menu-chart-group-hbar', caption: me.textBar},
- {id: 'menu-chart-group-area', caption: me.textArea, inline: true},
- {id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true},
- {id: 'menu-chart-group-stock', caption: me.textStock, inline: true}
- // {id: 'menu-chart-group-surface', caption: me.textSurface}
- ]),
- store: new Common.UI.DataViewStore([
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal,
- allowSelected: true,
- iconCls: 'column-normal',
- selected: true
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStacked,
- allowSelected: true,
- iconCls: 'column-stack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStackedPer,
- allowSelected: true,
- iconCls: 'column-pstack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal3d,
- allowSelected: true,
- iconCls: 'column-3d-normal'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStacked3d,
- allowSelected: true,
- iconCls: 'column-3d-stack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barStackedPer3d,
- allowSelected: true,
- iconCls: 'column-3d-pstack'
- },
- {
- group: 'menu-chart-group-bar',
- type: Asc.c_oAscChartTypeSettings.barNormal3dPerspective,
- allowSelected: true,
- iconCls: 'column-3d-normal-per'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineNormal,
- allowSelected: true,
- iconCls: 'line-normal'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineStacked,
- allowSelected: true,
- iconCls: 'line-stack'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.lineStackedPer,
- allowSelected: true,
- iconCls: 'line-pstack'
- },
- {
- group: 'menu-chart-group-line',
- type: Asc.c_oAscChartTypeSettings.line3d,
- allowSelected: true,
- iconCls: 'line-3d'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.pie,
- allowSelected: true,
- iconCls: 'pie-normal'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.doughnut,
- allowSelected: true,
- iconCls: 'pie-doughnut'
- },
- {
- group: 'menu-chart-group-pie',
- type: Asc.c_oAscChartTypeSettings.pie3d,
- allowSelected: true,
- iconCls: 'pie-3d-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarNormal,
- allowSelected: true,
- iconCls: 'bar-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStacked,
- allowSelected: true,
- iconCls: 'bar-stack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStackedPer,
- allowSelected: true,
- iconCls: 'bar-pstack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarNormal3d,
- allowSelected: true,
- iconCls: 'bar-3d-normal'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStacked3d,
- allowSelected: true,
- iconCls: 'bar-3d-stack'
- },
- {
- group: 'menu-chart-group-hbar',
- type: Asc.c_oAscChartTypeSettings.hBarStackedPer3d,
- allowSelected: true,
- iconCls: 'bar-3d-pstack'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaNormal,
- allowSelected: true,
- iconCls: 'area-normal'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaStacked,
- allowSelected: true,
- iconCls: 'area-stack'
- },
- {
- group: 'menu-chart-group-area',
- type: Asc.c_oAscChartTypeSettings.areaStackedPer,
- allowSelected: true,
- iconCls: 'area-pstack'
- },
- {
- group: 'menu-chart-group-scatter',
- type: Asc.c_oAscChartTypeSettings.scatter,
- allowSelected: true,
- iconCls: 'point-normal'
- },
- {
- group: 'menu-chart-group-stock',
- type: Asc.c_oAscChartTypeSettings.stock,
- allowSelected: true,
- iconCls: 'stock-normal'
- }
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceNormal, allowSelected: true, iconCls: 'surface-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.surfaceWireframe, allowSelected: true, iconCls: 'surface-wireframe'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourNormal, allowSelected: true, iconCls: 'contour-normal'},
- // { group: 'menu-chart-group-surface', type: Asc.c_oAscChartTypeSettings.contourWireframe, allowSelected: true, iconCls: 'contour-wireframe'}
- ]),
- itemTemplate: _.template('
')
- });
-
this.mnuTablePicker = new Common.UI.DimensionPicker({
el: $('#id-toolbar-menu-tablepicker'),
minRows: 8,
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index e4174cfc5..0ec62b179 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -93,10 +93,6 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
template,
'',
'',
- '',
- ''
].join('')
)({
@@ -111,11 +107,14 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.textControls = [];
this.imageControls = [];
this.fontName = 'Arial';
- this.lang = {value: 'en', displayValue: 'English'};
this.text = '';
this.isAutoColor = false;
this.isImageLoaded = false;
+ var lang = options.lang || 'en',
+ val = Common.util.LanguageInfo.getLocalLanguageCode(lang);
+ this.lang = val ? {value: lang, displayValue: Common.util.LanguageInfo.getLocalLanguageName(val)[1], default: true} : {value: 'en', displayValue: 'English', default: true};
+
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
@@ -430,8 +429,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
});
if (data.length) {
me.cmbLang.setData(data);
- me.cmbLang.setValue(me.lang.displayValue);
- me.loadWMText(me.lang.value);
+ var res = me.loadWMText(me.lang.value);
+ if (res && me.lang.default)
+ me.cmbLang.setValue(res);
+ else
+ me.cmbLang.setValue(me.lang.displayValue);
me.cmbLang.setDisabled(!me.radioText.getValue());
me.text && me.cmbText.setValue(me.text);
} else
@@ -477,6 +479,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.cmbText.setData(data);
this.cmbText.setValue(data[0].value);
}
+ return item ? item.get('displayValue') : null;
},
insertFromUrl: function() {
@@ -667,8 +670,6 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
textLayout: 'Layout',
textDiagonal: 'Diagonal',
textHor: 'Horizontal',
- cancelButtonText: 'Cancel',
- okButtonText: 'Ok',
textColor: 'Text color',
textNewColor: 'Add New Custom Color',
textLanguage: 'Language'
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index feb54f25a..ea9a07eba 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -159,45 +159,47 @@ require([
]
});
- Common.Locale.apply();
-
- require([
- 'documenteditor/main/app/controller/Viewport',
- 'documenteditor/main/app/controller/DocumentHolder',
- 'documenteditor/main/app/controller/Toolbar',
- 'documenteditor/main/app/controller/Links',
- 'documenteditor/main/app/controller/Navigation',
- 'documenteditor/main/app/controller/Statusbar',
- 'documenteditor/main/app/controller/RightMenu',
- 'documenteditor/main/app/controller/LeftMenu',
- 'documenteditor/main/app/controller/Main',
- 'documenteditor/main/app/view/FileMenuPanels',
- 'documenteditor/main/app/view/ParagraphSettings',
- 'documenteditor/main/app/view/HeaderFooterSettings',
- 'documenteditor/main/app/view/ImageSettings',
- 'documenteditor/main/app/view/TableSettings',
- 'documenteditor/main/app/view/ShapeSettings',
- 'documenteditor/main/app/view/TextArtSettings',
- 'documenteditor/main/app/view/SignatureSettings',
- 'common/main/lib/util/utils',
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/controller/Fonts',
- 'common/main/lib/controller/History'
- /** coauthoring begin **/
- ,'common/main/lib/controller/Comments'
- ,'common/main/lib/controller/Chat'
- /** coauthoring end **/
- ,'common/main/lib/controller/Plugins'
- ,'documenteditor/main/app/view/ChartSettings'
- ,'common/main/lib/controller/ExternalDiagramEditor'
- ,'common/main/lib/controller/ExternalMergeEditor'
- ,'common/main/lib/controller/ReviewChanges'
- ,'common/main/lib/controller/Protection'
- ,'common/main/lib/controller/Desktop'
- ], function() {
- window.compareVersions = true;
- app.start();
- });
+ Common.Locale.apply(
+ function() {
+ require([
+ 'documenteditor/main/app/controller/Viewport',
+ 'documenteditor/main/app/controller/DocumentHolder',
+ 'documenteditor/main/app/controller/Toolbar',
+ 'documenteditor/main/app/controller/Links',
+ 'documenteditor/main/app/controller/Navigation',
+ 'documenteditor/main/app/controller/Statusbar',
+ 'documenteditor/main/app/controller/RightMenu',
+ 'documenteditor/main/app/controller/LeftMenu',
+ 'documenteditor/main/app/controller/Main',
+ 'documenteditor/main/app/view/FileMenuPanels',
+ 'documenteditor/main/app/view/ParagraphSettings',
+ 'documenteditor/main/app/view/HeaderFooterSettings',
+ 'documenteditor/main/app/view/ImageSettings',
+ 'documenteditor/main/app/view/TableSettings',
+ 'documenteditor/main/app/view/ShapeSettings',
+ 'documenteditor/main/app/view/TextArtSettings',
+ 'documenteditor/main/app/view/SignatureSettings',
+ 'common/main/lib/util/utils',
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/controller/Fonts',
+ 'common/main/lib/controller/History'
+ /** coauthoring begin **/
+ ,'common/main/lib/controller/Comments'
+ ,'common/main/lib/controller/Chat'
+ /** coauthoring end **/
+ ,'common/main/lib/controller/Plugins'
+ ,'documenteditor/main/app/view/ChartSettings'
+ ,'common/main/lib/controller/ExternalDiagramEditor'
+ ,'common/main/lib/controller/ExternalMergeEditor'
+ ,'common/main/lib/controller/ReviewChanges'
+ ,'common/main/lib/controller/Protection'
+ ,'common/main/lib/controller/Desktop'
+ ], function() {
+ window.compareVersions = true;
+ app.start();
+ });
+ }
+ );
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
reqerr = window.requireTimeourError();
diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index 145a0b453..93e36bc17 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -22,161 +22,143 @@
z-index: 1001;
}
- .loader-page {
+ .loadmask > .brendpanel {
width: 100%;
- height: 170px;
- bottom: 42%;
- position: absolute;
- text-align: center;
- line-height: 10px;
+ height: 56px;
+ background: #446995;
}
- .loader-logo {
- max-height: 160px;
- margin-bottom: 10px;
+ .loadmask > .brendpanel > div {
+ display: flex;
+ align-items: center;
}
- .loader-page-romb {
- width: 40px;
+ .loadmask > .brendpanel .spacer {
+ margin-left: auto;
+ }
+
+ .loadmask > .brendpanel .loading-logo {
+ padding: 0 24px 0 12px;
+ max-width: 200px;
+ height: 20px;
+ }
+
+ .loadmask > .brendpanel .loading-logo > img {
display: inline-block;
+ max-width: 100px;
+ max-height: 20px;
+ opacity: 0;
}
- .loader-page-text {
- width: 100%;
- bottom: 42%;
+ .loadmask > .brendpanel .circle {
+ vertical-align: middle;
+ width: 20px;
+ height: 20px;
+ border-radius: 12px;
+ margin: 4px 10px;
+ background: rgba(255, 255, 255, 0.2);
+ }
+
+ .loadmask > .brendpanel .rect {
+ vertical-align: middle;
+ width: 50px;
+ height: 12px;
+ border-radius: 3px;
+ margin: 0 10px;
+ background: rgba(255, 255, 255, 0.2);
+ }
+
+ .loadmask > .sktoolbar {
+ background: #fafafa;
+ border-bottom: 1px solid #e2e2e2;
+ height: 46px;
+ padding: 10px 12px;
+ box-sizing: content-box;
+ }
+
+ .loadmask > .sktoolbar ul {
+ margin: 0;
+ padding: 0;
+ white-space: nowrap;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
+ }
+
+ .loadmask > .sktoolbar li {
+ background: #e2e2e2;
+ border-radius: 3px;
+ width: 20px;
+ height: 20px;
+ display: inline-block;
+ margin-right: 6px;
+ }
+
+ .loadmask > .sktoolbar li.space {
+ background: none;
+ width: 12px;
+ }
+
+ .loadmask > .sktoolbar li.fat {
position: absolute;
- text-align: center;
- color: #888;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- line-height: 20px;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ left: 612px;
+ width: inherit;
+ height: 44px;
}
- .loader-page-text-loading {
- font-size: 14px;
+ .loadmask > .placeholder {
+ background: #fbfbfb;
+ width: 796px;
+ margin: 46px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
}
- .loader-page-text-customer {
- font-size: 16px;
- margin-bottom: 5px;
+ .loadmask > .placeholder > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
}
- .romb {
- width: 40px;
- height: 40px;
- -webkit-transform: rotate(135deg) skew(20deg, 20deg);
- -moz-transform: rotate(135deg) skew(20deg, 20deg);
- -ms-transform: rotate(135deg) skew(20deg, 20deg);
- -o-transform: rotate(135deg) skew(20deg, 20deg);
- position: absolute;
- background: red;
- border-radius: 6px;
- -webkit-animation: movedown 3s infinite ease;
- -moz-animation: movedown 3s infinite ease;
- -ms-animation: movedown 3s infinite ease;
- -o-animation: movedown 3s infinite ease;
- animation: movedown 3s infinite ease;
+ @keyframes flickerAnimation {
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #blue {
- z-index: 3;
- background: #55bce6;
- -webkit-animation-name: blue;
- -moz-animation-name: blue;
- -ms-animation-name: blue;
- -o-animation-name: blue;
- animation-name: blue;
+ @-o-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #red {
- z-index:1;
- background: #de7a59;
- -webkit-animation-name: red;
- -moz-animation-name: red;
- -ms-animation-name: red;
- -o-animation-name: red;
- animation-name: red;
+ @-moz-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #green {
- z-index: 2;
- background: #a1cb5c;
- -webkit-animation-name: green;
- -moz-animation-name: green;
- -ms-animation-name: green;
- -o-animation-name: green;
- animation-name: green;
- }
-
- @-webkit-keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0;}
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0; }
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @-webkit-keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @-webkit-keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
- }
-
- @keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #fff; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
+ @-webkit-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
@@ -278,8 +220,32 @@
+
+
+
+
@@ -299,7 +265,7 @@
-
+
diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy
index 45faf2f30..5a11eb7c6 100644
--- a/apps/documenteditor/main/index.html.deploy
+++ b/apps/documenteditor/main/index.html.deploy
@@ -23,161 +23,143 @@
z-index: 1001;
}
- .loader-page {
+ .loadmask > .brendpanel {
width: 100%;
- height: 170px;
- bottom: 42%;
- position: absolute;
- text-align: center;
- line-height: 10px;
+ height: 56px;
+ background: #446995;
}
- .loader-logo {
- max-height: 160px;
- margin-bottom: 10px;
+ .loadmask > .brendpanel > div {
+ display: flex;
+ align-items: center;
}
- .loader-page-romb {
- width: 40px;
+ .loadmask > .brendpanel .spacer {
+ margin-left: auto;
+ }
+
+ .loadmask > .brendpanel .loading-logo {
+ padding: 0 24px 0 12px;
+ max-width: 200px;
+ height: 20px;
+ }
+
+ .loadmask > .brendpanel .loading-logo > img {
display: inline-block;
+ max-width: 100px;
+ max-height: 20px;
+ opacity: 0;
}
- .loader-page-text {
- width: 100%;
- bottom: 42%;
+ .loadmask > .brendpanel .circle {
+ vertical-align: middle;
+ width: 20px;
+ height: 20px;
+ border-radius: 12px;
+ margin: 4px 10px;
+ background: rgba(255, 255, 255, 0.2);
+ }
+
+ .loadmask > .brendpanel .rect {
+ vertical-align: middle;
+ width: 50px;
+ height: 12px;
+ border-radius: 3px;
+ margin: 0 10px;
+ background: rgba(255, 255, 255, 0.2);
+ }
+
+ .loadmask > .sktoolbar {
+ background: #fafafa;
+ border-bottom: 1px solid #e2e2e2;
+ height: 46px;
+ padding: 10px 12px;
+ box-sizing: content-box;
+ }
+
+ .loadmask > .sktoolbar ul {
+ margin: 0;
+ padding: 0;
+ white-space: nowrap;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
+ }
+
+ .loadmask > .sktoolbar li {
+ background: #e2e2e2;
+ border-radius: 3px;
+ width: 20px;
+ height: 20px;
+ display: inline-block;
+ margin-right: 6px;
+ }
+
+ .loadmask > .sktoolbar li.space {
+ background: none;
+ width: 12px;
+ }
+
+ .loadmask > .sktoolbar li.fat {
position: absolute;
- text-align: center;
- color: #888;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- line-height: 20px;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ left: 612px;
+ width: inherit;
+ height: 44px;
}
- .loader-page-text-loading {
- font-size: 14px;
+ .loadmask > .placeholder {
+ background: #fbfbfb;
+ width: 796px;
+ margin: 46px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
}
- .loader-page-text-customer {
- font-size: 16px;
- margin-bottom: 5px;
+ .loadmask > .placeholder > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
}
- .romb {
- width: 40px;
- height: 40px;
- -webkit-transform: rotate(135deg) skew(20deg, 20deg);
- -moz-transform: rotate(135deg) skew(20deg, 20deg);
- -ms-transform: rotate(135deg) skew(20deg, 20deg);
- -o-transform: rotate(135deg) skew(20deg, 20deg);
- position: absolute;
- background: red;
- border-radius: 6px;
- -webkit-animation: movedown 3s infinite ease;
- -moz-animation: movedown 3s infinite ease;
- -ms-animation: movedown 3s infinite ease;
- -o-animation: movedown 3s infinite ease;
- animation: movedown 3s infinite ease;
+ @keyframes flickerAnimation {
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #blue {
- z-index: 3;
- background: #55bce6;
- -webkit-animation-name: blue;
- -moz-animation-name: blue;
- -ms-animation-name: blue;
- -o-animation-name: blue;
- animation-name: blue;
+ @-o-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #red {
- z-index:1;
- background: #de7a59;
- -webkit-animation-name: red;
- -moz-animation-name: red;
- -ms-animation-name: red;
- -o-animation-name: red;
- animation-name: red;
+ @-moz-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
-
- #green {
- z-index: 2;
- background: #a1cb5c;
- -webkit-animation-name: green;
- -moz-animation-name: green;
- -ms-animation-name: green;
- -o-animation-name: green;
- animation-name: green;
- }
-
- @-webkit-keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0;}
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @keyframes red {
- 0% { top:120px; background: #de7a59; }
- 10% { top:120px; background: #F2CBBF; }
- 14% { background: #f4f4f4; top:120px; }
- 15% { background: #f4f4f4; top:0; }
- 20% { background: #E6E4E4; }
- 30% { background: #D2D2D2; }
- 40% { top:120px; }
- 100% { top:120px; background: #de7a59; }
- }
-
- @-webkit-keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @keyframes green {
- 0% { top:110px; background: #a1cb5c; opacity:1; }
- 10% { top:110px; background: #CBE0AC; opacity:1; }
- 14% { background: #f4f4f4; top:110px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #EFEFEF; top:0; opacity:1; }
- 30% { background:#E6E4E4; }
- 70% { top:110px; }
- 100% { top:110px; background: #a1cb5c; }
- }
-
- @-webkit-keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
- }
-
- @keyframes blue {
- 0% { top:100px; background: #55bce6; opacity:1; }
- 10% { top:100px; background: #BFE8F8; opacity:1; }
- 14% { background: #f4f4f4; top:100px; opacity:1; }
- 15% { background: #f4f4f4; top:0; opacity:1; }
- 20% { background: #f4f4f4; top:0; opacity:0; }
- 25% { background: #f4f4f4; top:0; opacity:0; }
- 45% { background: #EFEFEF; top:0; opacity:0.2; }
- 100% { top:100px; background: #55bce6; }
+ @-webkit-keyframes flickerAnimation{
+ 0% { opacity:0.1; }
+ 50% { opacity:1; }
+ 100% { opacity:0.1; }
}
+
+
+
+
diff --git a/apps/documenteditor/main/index_loader.html b/apps/documenteditor/main/index_loader.html
new file mode 100644
index 000000000..3d0f4b30e
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html
@@ -0,0 +1,303 @@
+
+
+
+ ONLYOFFICE Documents
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy
new file mode 100644
index 000000000..0d2c66fa9
--- /dev/null
+++ b/apps/documenteditor/main/index_loader.html.deploy
@@ -0,0 +1,322 @@
+
+
+
+ ONLYOFFICE Document Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json
index 07d62b2c7..4e54c99bd 100644
--- a/apps/documenteditor/main/locale/bg.json
+++ b/apps/documenteditor/main/locale/bg.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
"Common.UI.ComboDataView.emptyComboText": "Няма стилове",
"Common.UI.ExtendedColorDialog.addButtonText": "Добави",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Откажи ",
"Common.UI.ExtendedColorDialog.textCurrent": "Текущ",
"Common.UI.ExtendedColorDialog.textHexErr": "Въведената стойност е неправилна. Моля, въведете стойност между 000000 и FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Нов",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Задвижвани от",
"Common.Views.About.txtTel": "тел .: ",
"Common.Views.About.txtVersion": "Версия ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Откажи",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "Добре",
"Common.Views.Chat.textSend": "Изпращам",
"Common.Views.Comments.textAdd": "Добави",
"Common.Views.Comments.textAddComment": "Добави",
@@ -173,13 +170,9 @@
"Common.Views.History.textShow": "Разширете",
"Common.Views.History.textShowAll": "Показване на подробни промени",
"Common.Views.History.textVer": "вер.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Откажи",
- "Common.Views.ImageFromUrlDialog.okButtonText": "Добре",
"Common.Views.ImageFromUrlDialog.textUrl": "Поставете URL адрес на изображение:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Това поле е задължително",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Това поле трябва да е URL адрес във формат \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Откажи",
- "Common.Views.InsertTableDialog.okButtonText": "Добре",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Трябва да посочите броя на валидните редове и колони.",
"Common.Views.InsertTableDialog.txtColumns": "Брой колони",
"Common.Views.InsertTableDialog.txtMaxText": "Максималната стойност за това поле е {0}.",
@@ -187,12 +180,8 @@
"Common.Views.InsertTableDialog.txtRows": "Брой редове",
"Common.Views.InsertTableDialog.txtTitle": "Размер на таблицата",
"Common.Views.InsertTableDialog.txtTitleSplit": "Разделена клетка",
- "Common.Views.LanguageDialog.btnCancel": "Откажи",
- "Common.Views.LanguageDialog.btnOk": "Добре",
"Common.Views.LanguageDialog.labelSelect": "Изберете език на документа",
- "Common.Views.OpenDialog.cancelButtonText": "Откажи",
"Common.Views.OpenDialog.closeButtonText": "Затвори файла",
- "Common.Views.OpenDialog.okButtonText": "Добре",
"Common.Views.OpenDialog.txtEncoding": "Кодиране",
"Common.Views.OpenDialog.txtIncorrectPwd": "Паролата е неправилна.",
"Common.Views.OpenDialog.txtPassword": "Парола",
@@ -200,8 +189,6 @@
"Common.Views.OpenDialog.txtProtected": "След като въведете паролата и отворите файла, текущата парола за файла ще бъде нулирана.",
"Common.Views.OpenDialog.txtTitle": "Изберете опции %1",
"Common.Views.OpenDialog.txtTitleProtected": "Защитен файл",
- "Common.Views.PasswordDialog.cancelButtonText": "Откажи",
- "Common.Views.PasswordDialog.okButtonText": "Добре",
"Common.Views.PasswordDialog.txtDescription": "Задайте парола, за да защитите този документ",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Паролата за потвърждение не е идентична",
"Common.Views.PasswordDialog.txtPassword": "Парола",
@@ -223,8 +210,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Добавете електронен подпис",
"Common.Views.Protection.txtSignature": "Подпис",
"Common.Views.Protection.txtSignatureLine": "Добавете линия за подпис",
- "Common.Views.RenameDialog.cancelButtonText": "Откажи",
- "Common.Views.RenameDialog.okButtonText": "Добре",
"Common.Views.RenameDialog.textName": "Име на файла",
"Common.Views.RenameDialog.txtInvalidName": "Името на файла не може да съдържа нито един от следните знаци: ",
"Common.Views.ReviewChanges.hintNext": "За следващата промяна",
@@ -289,8 +274,6 @@
"Common.Views.SaveAsDlg.textTitle": "Папка за запис",
"Common.Views.SelectFileDlg.textLoading": "Зареждане",
"Common.Views.SelectFileDlg.textTitle": "Изберете източник на данни",
- "Common.Views.SignDialog.cancelButtonText": "Откажи",
- "Common.Views.SignDialog.okButtonText": "Добре",
"Common.Views.SignDialog.textBold": "Получер",
"Common.Views.SignDialog.textCertificate": "Сертификат",
"Common.Views.SignDialog.textChange": "Промяна",
@@ -305,8 +288,6 @@
"Common.Views.SignDialog.textValid": "Валидно от %1 до %2",
"Common.Views.SignDialog.tipFontName": "Име на шрифта",
"Common.Views.SignDialog.tipFontSize": "Размер на шрифта",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Откажи",
- "Common.Views.SignSettingsDialog.okButtonText": "Добре",
"Common.Views.SignSettingsDialog.textAllowComment": "Позволете на сигналиста да добави коментар в диалога за подпис",
"Common.Views.SignSettingsDialog.textInfo": "Информация за подписания",
"Common.Views.SignSettingsDialog.textInfoEmail": "Електронна поща",
@@ -1044,8 +1025,6 @@
"DE.Views.ChartSettings.txtTight": "Стегнат",
"DE.Views.ChartSettings.txtTitle": "Диаграма",
"DE.Views.ChartSettings.txtTopAndBottom": "Отгоре и отдолу",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Откажи",
- "DE.Views.ControlSettingsDialog.okButtonText": "Добре",
"DE.Views.ControlSettingsDialog.textAppearance": "Външен вид",
"DE.Views.ControlSettingsDialog.textApplyAll": "Прилага за всички",
"DE.Views.ControlSettingsDialog.textBox": "Ограничителна кутия",
@@ -1060,8 +1039,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Настройки за контрол на съдържанието",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Контролът на съдържанието не може да бъде изтрит",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Съдържанието не може да се редактира",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Откажи",
- "DE.Views.CustomColumnsDialog.okButtonText": "Добре",
"DE.Views.CustomColumnsDialog.textColumns": "Брой колони",
"DE.Views.CustomColumnsDialog.textSeparator": "Разделител на колони",
"DE.Views.CustomColumnsDialog.textSpacing": "Разстояние между колоните",
@@ -1273,8 +1250,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Разгрупира",
"DE.Views.DocumentHolder.updateStyleText": "Актуализирайте стила на %1",
"DE.Views.DocumentHolder.vertAlignText": "Вертикално подравняване",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Откажи ",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "Добре",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Граници и запълване",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Пуснете капачка",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Полета",
@@ -1429,8 +1404,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Горе вляво",
"DE.Views.HeaderFooterSettings.textTopPage": "Начало на страницата",
"DE.Views.HeaderFooterSettings.textTopRight": "Горе в дясно",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Откажи",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "Добре",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Избран фрагмент от текст",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Показ",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Външен линк",
@@ -1472,8 +1445,6 @@
"DE.Views.ImageSettings.txtThrough": "През",
"DE.Views.ImageSettings.txtTight": "Стегнат",
"DE.Views.ImageSettings.txtTopAndBottom": "Отгоре и отдолу",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Откажи ",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "Добре",
"DE.Views.ImageSettingsAdvanced.strMargins": "Попълване на текст",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Абсолютно",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Подравняване",
@@ -1575,7 +1546,6 @@
"DE.Views.Links.tipContentsUpdate": "Обновяване на съдържанието",
"DE.Views.Links.tipInsertHyperlink": "Добави връзка",
"DE.Views.Links.tipNotes": "Вмъкване или редактиране на бележки под линия",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Откажи",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Изпращам",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Тема",
@@ -1636,7 +1606,6 @@
"DE.Views.Navigation.txtSelect": "Изберете съдържание",
"DE.Views.NoteSettingsDialog.textApply": "Приложи",
"DE.Views.NoteSettingsDialog.textApplyTo": "Прилагане на промените към",
- "DE.Views.NoteSettingsDialog.textCancel": "Откажи",
"DE.Views.NoteSettingsDialog.textContinue": "Непрекъснат",
"DE.Views.NoteSettingsDialog.textCustom": "Персонализирана марка",
"DE.Views.NoteSettingsDialog.textDocument": "Целият документ",
@@ -1653,11 +1622,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Започни от",
"DE.Views.NoteSettingsDialog.textTextBottom": "Под текст",
"DE.Views.NoteSettingsDialog.textTitle": "Настройки за бележки",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Откажи",
- "DE.Views.NumberingValueDialog.okButtonText": "Добре",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Откажи",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Внимание",
- "DE.Views.PageMarginsDialog.okButtonText": "Добре",
"DE.Views.PageMarginsDialog.textBottom": "Дъно",
"DE.Views.PageMarginsDialog.textLeft": "Наляво",
"DE.Views.PageMarginsDialog.textRight": "Прав",
@@ -1665,8 +1630,6 @@
"DE.Views.PageMarginsDialog.textTop": "Връх",
"DE.Views.PageMarginsDialog.txtMarginsH": "Горната и долната граници са твърде високи за дадена височина на страницата",
"DE.Views.PageMarginsDialog.txtMarginsW": "Лявото и дясното поле са твърде широки за дадена ширина на страницата",
- "DE.Views.PageSizeDialog.cancelButtonText": "Откажи",
- "DE.Views.PageSizeDialog.okButtonText": "Добре",
"DE.Views.PageSizeDialog.textHeight": "Височина",
"DE.Views.PageSizeDialog.textPreset": "Предварително",
"DE.Views.PageSizeDialog.textTitle": "Размер на страницата",
@@ -1685,14 +1648,11 @@
"DE.Views.ParagraphSettings.textExact": "Точно",
"DE.Views.ParagraphSettings.textNewColor": "Нов потребителски цвят",
"DE.Views.ParagraphSettings.txtAutoText": "Автоматичен",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Откажи",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Посочените раздели ще се появят в това поле",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "Добре",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Всички шапки",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Граници и запълване",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Страницата е прекъсната преди",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Двойно зачертаване",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Първа линия",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Наляво",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Прав",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Поддържайте линиите заедно",
@@ -1836,15 +1796,11 @@
"DE.Views.StyleTitleDialog.textTitle": "Заглавие",
"DE.Views.StyleTitleDialog.txtEmpty": "Това поле е задължително",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Полето не трябва да е празно",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Откажи",
- "DE.Views.TableFormulaDialog.okButtonText": "Добре",
"DE.Views.TableFormulaDialog.textBookmark": "Поставяне на отметката",
"DE.Views.TableFormulaDialog.textFormat": "Формат на номера",
"DE.Views.TableFormulaDialog.textFormula": "Формула",
"DE.Views.TableFormulaDialog.textInsertFunction": "Функция за поставяне",
"DE.Views.TableFormulaDialog.textTitle": "Настройки на формулата",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Откажи",
- "DE.Views.TableOfContentsSettings.okButtonText": "Добре",
"DE.Views.TableOfContentsSettings.strAlign": "Надясно подравнете номерата на страниците",
"DE.Views.TableOfContentsSettings.strLinks": "Форматиране на съдържанието като връзки",
"DE.Views.TableOfContentsSettings.strShowPages": "Показване на номера на страници",
@@ -1884,7 +1840,6 @@
"DE.Views.TableSettings.textBanded": "На ивици",
"DE.Views.TableSettings.textBorderColor": "Цвят",
"DE.Views.TableSettings.textBorders": "Стил на границите",
- "DE.Views.TableSettings.textCancel": "Откажи",
"DE.Views.TableSettings.textCellSize": "Размер на клетката",
"DE.Views.TableSettings.textColumns": "Колони",
"DE.Views.TableSettings.textDistributeCols": "Разпределете колони",
@@ -1896,7 +1851,6 @@
"DE.Views.TableSettings.textHeight": "Височина",
"DE.Views.TableSettings.textLast": "Последно",
"DE.Views.TableSettings.textNewColor": "Нов потребителски цвят",
- "DE.Views.TableSettings.textOK": "Добре",
"DE.Views.TableSettings.textRows": "Редове",
"DE.Views.TableSettings.textSelectBorders": "Изберете граници, които искате да промените, като използвате избрания по-горе стил",
"DE.Views.TableSettings.textTemplate": "Изберете от шаблон",
@@ -1913,8 +1867,6 @@
"DE.Views.TableSettings.tipRight": "Задайте само външна дясна граница",
"DE.Views.TableSettings.tipTop": "Задайте само външна горна граница",
"DE.Views.TableSettings.txtNoBorders": "Няма граници",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Откажи",
- "DE.Views.TableSettingsAdvanced.okButtonText": "Добре",
"DE.Views.TableSettingsAdvanced.textAlign": "Подравняване",
"DE.Views.TableSettingsAdvanced.textAlignment": "Подравняване",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Разстояние между клетките",
diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json
index d6f6aecca..f6ff9fd4f 100644
--- a/apps/documenteditor/main/locale/cs.json
+++ b/apps/documenteditor/main/locale/cs.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení",
"Common.UI.ComboDataView.emptyComboText": "Žádné styly",
"Common.UI.ExtendedColorDialog.addButtonText": "Přidat",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Zrušit",
"Common.UI.ExtendedColorDialog.textCurrent": "Aktuální",
"Common.UI.ExtendedColorDialog.textHexErr": "Zadaná hodnota není správná. Zadejte prosím hodnotu mezi 000000 a FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nový",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Poháněno",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Verze",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Zrušit",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Poslat",
"Common.Views.Comments.textAdd": "Přidat",
"Common.Views.Comments.textAddComment": "Přidat",
@@ -157,13 +154,9 @@
"Common.Views.History.textRestore": "Obnovit",
"Common.Views.History.textShow": "Rozšířit",
"Common.Views.History.textShowAll": "Zobrazit detailní změny",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Zrušit",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Vložit URL obrázku:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Toto pole je povinné",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Toto pole musí být URL adresa ve formátu \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Zrušit",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Musíte stanovit platný počet řádků a sloupců.",
"Common.Views.InsertTableDialog.txtColumns": "Počet sloupců",
"Common.Views.InsertTableDialog.txtMaxText": "Maximální hodnota tohoto pole je {0}.",
@@ -171,11 +164,7 @@
"Common.Views.InsertTableDialog.txtRows": "Počet řádků",
"Common.Views.InsertTableDialog.txtTitle": "Velikost tabulky",
"Common.Views.InsertTableDialog.txtTitleSplit": "Rozdělit buňku",
- "Common.Views.LanguageDialog.btnCancel": "Zrušit",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Vybrat jazyk dokumentu",
- "Common.Views.OpenDialog.cancelButtonText": "Zrušit",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Kódování",
"Common.Views.OpenDialog.txtIncorrectPwd": "Heslo je nesprávné",
"Common.Views.OpenDialog.txtPassword": "Heslo",
@@ -187,8 +176,6 @@
"Common.Views.Plugins.textLoading": "Nahrávám ...",
"Common.Views.Plugins.textStart": "Začátek",
"Common.Views.Plugins.textStop": "Stop",
- "Common.Views.RenameDialog.cancelButtonText": "Zrušit",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Název souboru",
"Common.Views.RenameDialog.txtInvalidName": "Název souboru nesmí obsahovat žádný z následujících znaků:",
"Common.Views.ReviewChanges.hintNext": "K další změně",
@@ -727,8 +714,6 @@
"DE.Views.ChartSettings.txtTight": "Těsný",
"DE.Views.ChartSettings.txtTitle": "Graf",
"DE.Views.ChartSettings.txtTopAndBottom": "Nahoře a dole",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Zrušit",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Počet sloupců",
"DE.Views.CustomColumnsDialog.textSeparator": "Rozdělovač sloupců",
"DE.Views.CustomColumnsDialog.textSpacing": "Vzdálenost mezi sloupci",
@@ -899,8 +884,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Oddělit",
"DE.Views.DocumentHolder.updateStyleText": "Aktualizovat %1 styl",
"DE.Views.DocumentHolder.vertAlignText": "Svislé zarovnání",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Zrušit",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Ohraničení a výplň",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Iniciála",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Okraje",
@@ -1035,8 +1018,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Nahoře uprostřed",
"DE.Views.HeaderFooterSettings.textTopLeft": "Nahoře vlevo",
"DE.Views.HeaderFooterSettings.textTopRight": "Nahoře vpravo",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Zrušit",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Vybrat část textu",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Zobrazit",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Nastavení hypertextového odkazu",
@@ -1063,8 +1044,6 @@
"DE.Views.ImageSettings.txtThrough": "Přes",
"DE.Views.ImageSettings.txtTight": "Těsný",
"DE.Views.ImageSettings.txtTopAndBottom": "Nahoře a dole",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Zrušit",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Vnitřní odsazení textu",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolutně",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Zarovnání",
@@ -1140,7 +1119,6 @@
"DE.Views.LeftMenu.tipSupport": "Zpětná vazba a Podpora",
"DE.Views.LeftMenu.tipTitles": "Nadpisy",
"DE.Views.LeftMenu.txtDeveloper": "VÝVOJÁŘSKÝ REŽIM",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Zrušit",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Poslat",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Téma",
@@ -1190,7 +1168,6 @@
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Spuštění hromadné korespondence se nezdařilo",
"DE.Views.NoteSettingsDialog.textApply": "Použít",
"DE.Views.NoteSettingsDialog.textApplyTo": "Použít změny do",
- "DE.Views.NoteSettingsDialog.textCancel": "Zrušit",
"DE.Views.NoteSettingsDialog.textContinue": "Nepřetržitý",
"DE.Views.NoteSettingsDialog.textCustom": "Vlastní značka",
"DE.Views.NoteSettingsDialog.textDocument": "Celý dokument",
@@ -1207,9 +1184,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Začít na",
"DE.Views.NoteSettingsDialog.textTextBottom": "Pod textem",
"DE.Views.NoteSettingsDialog.textTitle": "Nastavení poznámek",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1217,8 +1192,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
@@ -1235,14 +1208,11 @@
"DE.Views.ParagraphSettings.textExact": "Přesně",
"DE.Views.ParagraphSettings.textNewColor": "Přidat novou vlastní barvu",
"DE.Views.ParagraphSettings.txtAutoText": "Automaticky",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Zrušit",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Specifikované tabulátory se objeví v tomto poli",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Všechno velkým",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Ohraničení a výplň",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Rozdělit stránku před",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dvojité přeškrtnutí",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "První řádek",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Vlevo",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Vpravo",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Ponechat řádky pohromadě",
@@ -1381,7 +1351,6 @@
"DE.Views.TableSettings.textBanded": "Pruhovaný",
"DE.Views.TableSettings.textBorderColor": "Barva",
"DE.Views.TableSettings.textBorders": "Styl ohraničení",
- "DE.Views.TableSettings.textCancel": "Zrušit",
"DE.Views.TableSettings.textColumns": "Sloupce",
"DE.Views.TableSettings.textEdit": "Řádky a sloupce",
"DE.Views.TableSettings.textEmptyTemplate": "Žádné šablony",
@@ -1389,7 +1358,6 @@
"DE.Views.TableSettings.textHeader": "Záhlaví",
"DE.Views.TableSettings.textLast": "Poslední",
"DE.Views.TableSettings.textNewColor": "Přidat novou vlastní barvu",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Řádky",
"DE.Views.TableSettings.textSelectBorders": "Vyberte ohraničení, na které chcete použít styl vybraný výše.",
"DE.Views.TableSettings.textTemplate": "Vybrat ze šablony",
@@ -1405,8 +1373,6 @@
"DE.Views.TableSettings.tipRight": "Nastavit pouze vnější pravé ohraničení",
"DE.Views.TableSettings.tipTop": "Nastavit pouze vnější horní ohraničení",
"DE.Views.TableSettings.txtNoBorders": "Bez ohraničení",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Zrušit",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Zarovnání",
"DE.Views.TableSettingsAdvanced.textAlignment": "Zarovnání",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Povolit odsazení mezi buňkami",
diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json
index 67c6cd4d3..98d65e25e 100644
--- a/apps/documenteditor/main/locale/de.json
+++ b/apps/documenteditor/main/locale/de.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen",
"Common.UI.ComboDataView.emptyComboText": "Keine Formate",
"Common.UI.ExtendedColorDialog.addButtonText": "Hinzufügen",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Abbrechen",
"Common.UI.ExtendedColorDialog.textCurrent": "Aktuell",
"Common.UI.ExtendedColorDialog.textHexErr": "Der eingegebene Wert ist falsch. Bitte geben Sie einen Wert zwischen 000000 und FFFFFF ein.",
"Common.UI.ExtendedColorDialog.textNew": "Neu",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Betrieben von",
"Common.Views.About.txtTel": "Tel.: ",
"Common.Views.About.txtVersion": "Version ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Abbrechen",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Senden",
"Common.Views.Comments.textAdd": "Hinzufügen",
"Common.Views.Comments.textAddComment": "Hinzufügen",
@@ -173,13 +170,9 @@
"Common.Views.History.textShow": "Erweitern",
"Common.Views.History.textShowAll": "Wesentliche Änderungen anzeigen",
"Common.Views.History.textVer": "Ver.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Abbrechen",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Bild-URL einfügen:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Dieses Feld ist erforderlich",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" sein",
- "Common.Views.InsertTableDialog.cancelButtonText": "Abbrechen",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Sie müssen eine gültige Anzahl der Zeilen und Spalten angeben.",
"Common.Views.InsertTableDialog.txtColumns": "Anzahl von Spalten",
"Common.Views.InsertTableDialog.txtMaxText": "Der maximale Wert für dieses Feld ist {0}.",
@@ -187,12 +180,8 @@
"Common.Views.InsertTableDialog.txtRows": "Anzahl von Zeilen",
"Common.Views.InsertTableDialog.txtTitle": "Größe der Tabelle",
"Common.Views.InsertTableDialog.txtTitleSplit": "Zelle teilen",
- "Common.Views.LanguageDialog.btnCancel": "Abbrechen",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Sprache des Dokuments wählen",
- "Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
"Common.Views.OpenDialog.closeButtonText": "Datei schließen",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Zeichenkodierung",
"Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.",
"Common.Views.OpenDialog.txtPassword": "Kennwort",
@@ -200,8 +189,6 @@
"Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.",
"Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
"Common.Views.OpenDialog.txtTitleProtected": "Geschützte Datei",
- "Common.Views.PasswordDialog.cancelButtonText": "Abbrechen",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Legen Sie ein Passwort fest, um dieses Dokument zu schützen",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Bestätigungseingabe ist nicht identisch",
"Common.Views.PasswordDialog.txtPassword": "Kennwort",
@@ -223,8 +210,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Fügen Sie eine digitale Signatur hinzu",
"Common.Views.Protection.txtSignature": "Signatur",
"Common.Views.Protection.txtSignatureLine": "Signaturzeile hinzufügen",
- "Common.Views.RenameDialog.cancelButtonText": "Abbrechen",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Dateiname",
"Common.Views.RenameDialog.txtInvalidName": "Dieser Dateiname darf keines der folgenden Zeichen enthalten:",
"Common.Views.ReviewChanges.hintNext": "Zur nächsten Änderung",
@@ -289,8 +274,6 @@
"Common.Views.SaveAsDlg.textTitle": "Ordner fürs Speichern",
"Common.Views.SelectFileDlg.textLoading": "Ladevorgang",
"Common.Views.SelectFileDlg.textTitle": "Datenquelle auswählen",
- "Common.Views.SignDialog.cancelButtonText": "Abbrechen",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Fett",
"Common.Views.SignDialog.textCertificate": "Zertifikat",
"Common.Views.SignDialog.textChange": "Ändern",
@@ -305,8 +288,6 @@
"Common.Views.SignDialog.textValid": "Gültig von% 1 bis% 2",
"Common.Views.SignDialog.tipFontName": "Schriftart",
"Common.Views.SignDialog.tipFontSize": "Schriftgrad",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Abbrechen",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Signaturgeber verfügt über die Möglichkeit, einen Kommentar im Signaturdialog hinzuzufügen",
"Common.Views.SignSettingsDialog.textInfo": "Signaturgeberinformationen",
"Common.Views.SignSettingsDialog.textInfoEmail": "Email Adresse",
@@ -1044,8 +1025,6 @@
"DE.Views.ChartSettings.txtTight": "Passend",
"DE.Views.ChartSettings.txtTitle": "Diagramm",
"DE.Views.ChartSettings.txtTopAndBottom": "Oben und unten",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Abbrechen",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Darstellung",
"DE.Views.ControlSettingsDialog.textApplyAll": "Auf alle anwenden",
"DE.Views.ControlSettingsDialog.textBox": "Begrenzungsrahmen",
@@ -1060,8 +1039,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Einstellungen des Inhaltssteuerelements",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Das Inhaltssteuerelement kann nicht gelöscht werden",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Der Inhalt kann nicht bearbeitet werden",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Abbrechen",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Anzahl von Spalten",
"DE.Views.CustomColumnsDialog.textSeparator": "Spaltenunterteilers",
"DE.Views.CustomColumnsDialog.textSpacing": "Abstand zwischen Spalten",
@@ -1273,8 +1250,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Gruppierung aufheben",
"DE.Views.DocumentHolder.updateStyleText": "Format aktualisieren %1",
"DE.Views.DocumentHolder.vertAlignText": "Vertikale Ausrichtung",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Abbrechen",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Rahmen & Füllung",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Initialbuchstaben ",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Ränder",
@@ -1429,8 +1404,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Oben links",
"DE.Views.HeaderFooterSettings.textTopPage": "Seitenanfang",
"DE.Views.HeaderFooterSettings.textTopRight": "Oben rechts",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Abbrechen",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Gewählter Textabschnitt",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Anzeigen",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Externer Link",
@@ -1472,8 +1445,6 @@
"DE.Views.ImageSettings.txtThrough": "Durchgehend",
"DE.Views.ImageSettings.txtTight": "Passend",
"DE.Views.ImageSettings.txtTopAndBottom": "Oben und unten",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Abbrechen",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Ränder um den Text",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolut",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Ausrichtung",
@@ -1575,7 +1546,6 @@
"DE.Views.Links.tipContentsUpdate": "Inhaltsverzeichnis aktualisieren",
"DE.Views.Links.tipInsertHyperlink": "Hyperlink hinzufügen",
"DE.Views.Links.tipNotes": "Fußnoten einfügen oder bearbeiten",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Abbrechen",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Senden",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Thema",
@@ -1636,7 +1606,6 @@
"DE.Views.Navigation.txtSelect": "Inhalt auswählen",
"DE.Views.NoteSettingsDialog.textApply": "Anwenden",
"DE.Views.NoteSettingsDialog.textApplyTo": "Änderungen anwenden",
- "DE.Views.NoteSettingsDialog.textCancel": "Abbrechen",
"DE.Views.NoteSettingsDialog.textContinue": "Kontinuierlich",
"DE.Views.NoteSettingsDialog.textCustom": "Benutzerdefiniert",
"DE.Views.NoteSettingsDialog.textDocument": "Das ganze Dokument",
@@ -1653,11 +1622,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Starten",
"DE.Views.NoteSettingsDialog.textTextBottom": "Unterhalb des Textes",
"DE.Views.NoteSettingsDialog.textTitle": "Hinweise Einstellungen",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Abbrechen",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Abbrechen",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Achtung",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Unten",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Rechts",
@@ -1665,8 +1630,6 @@
"DE.Views.PageMarginsDialog.textTop": "Oben",
"DE.Views.PageMarginsDialog.txtMarginsH": "Die oberen und unteren Ränder sind zu hoch für eingegebene Seitenhöhe",
"DE.Views.PageMarginsDialog.txtMarginsW": "Die Ränder rechts und links sind bei gegebener Seitenbreite zu breit. ",
- "DE.Views.PageSizeDialog.cancelButtonText": "Abbrechen",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Höhe",
"DE.Views.PageSizeDialog.textPreset": "Voreinstellung",
"DE.Views.PageSizeDialog.textTitle": "Seitenformat",
@@ -1685,14 +1648,11 @@
"DE.Views.ParagraphSettings.textExact": "Genau",
"DE.Views.ParagraphSettings.textNewColor": "Benutzerdefinierte Farbe",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Abbrechen",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Die festgelegten Registerkarten werden in diesem Feld erscheinen",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Alle Großbuchstaben",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Rahmen & Füllung",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Seitenumbruch oberhalb",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Doppeltes Durchstreichen",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Erste Zeile",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Links",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Rechts",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Absatz zusammenhalten",
@@ -1836,15 +1796,11 @@
"DE.Views.StyleTitleDialog.textTitle": "Titel",
"DE.Views.StyleTitleDialog.txtEmpty": "Dieses Feld ist erforderlich",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Das Feld darf nicht leer sein",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Abbrechen",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Lesezeichen einfügen",
"DE.Views.TableFormulaDialog.textFormat": "Zahlenformat",
"DE.Views.TableFormulaDialog.textFormula": "Formula",
"DE.Views.TableFormulaDialog.textInsertFunction": "Funktion einfügen",
"DE.Views.TableFormulaDialog.textTitle": "Formel-Einstellungen",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Abbrechen",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Seitenzahlen rechtsbündig",
"DE.Views.TableOfContentsSettings.strLinks": "Inhaltsverzeichnis als Links formatieren",
"DE.Views.TableOfContentsSettings.strShowPages": "Seitenzahlen anzeigen",
@@ -1884,7 +1840,6 @@
"DE.Views.TableSettings.textBanded": "Gestreift",
"DE.Views.TableSettings.textBorderColor": "Farbe",
"DE.Views.TableSettings.textBorders": "Stil des Rahmens",
- "DE.Views.TableSettings.textCancel": "Abbrechen",
"DE.Views.TableSettings.textCellSize": "Zellengröße",
"DE.Views.TableSettings.textColumns": "Spalten",
"DE.Views.TableSettings.textDistributeCols": "Spalten verteilen",
@@ -1896,7 +1851,6 @@
"DE.Views.TableSettings.textHeight": "Höhe",
"DE.Views.TableSettings.textLast": "Letzte",
"DE.Views.TableSettings.textNewColor": "Benutzerdefinierte Farbe",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Zeilen",
"DE.Views.TableSettings.textSelectBorders": "Wählen Sie Rahmenlinien, auf die ein anderer Stil angewandt wird",
"DE.Views.TableSettings.textTemplate": "Vorlage auswählen",
@@ -1913,8 +1867,6 @@
"DE.Views.TableSettings.tipRight": "Nur äußere rechte Rahmenlinie festlegen",
"DE.Views.TableSettings.tipTop": "Nur äußere obere Rahmenlinie festlegen",
"DE.Views.TableSettings.txtNoBorders": "Keine Rahmen",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Abbrechen",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Ausrichtung",
"DE.Views.TableSettingsAdvanced.textAlignment": "Ausrichtung",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Abstand zwischen Zellen zulassen",
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 875b4acdd..a421025a7 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
"Common.UI.ExtendedColorDialog.addButtonText": "Add",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Cancel",
"Common.UI.ExtendedColorDialog.textCurrent": "Current",
"Common.UI.ExtendedColorDialog.textHexErr": "The entered value is incorrect. Please enter a value between 000000 and FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "New",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Version ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Cancel",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Send",
"Common.Views.Comments.textAdd": "Add",
"Common.Views.Comments.textAddComment": "Add Comment",
@@ -174,13 +171,9 @@
"Common.Views.History.textShow": "Expand",
"Common.Views.History.textShowAll": "Show detailed changes",
"Common.Views.History.textVer": "ver.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format",
- "Common.Views.InsertTableDialog.cancelButtonText": "Cancel",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "You need to specify valid rows and columns count.",
"Common.Views.InsertTableDialog.txtColumns": "Number of Columns",
"Common.Views.InsertTableDialog.txtMaxText": "The maximum value for this field is {0}.",
@@ -188,12 +181,8 @@
"Common.Views.InsertTableDialog.txtRows": "Number of Rows",
"Common.Views.InsertTableDialog.txtTitle": "Table Size",
"Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell",
- "Common.Views.LanguageDialog.btnCancel": "Cancel",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Select document language",
- "Common.Views.OpenDialog.cancelButtonText": "Cancel",
"Common.Views.OpenDialog.closeButtonText": "Close File",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.",
"Common.Views.OpenDialog.txtPassword": "Password",
@@ -201,8 +190,6 @@
"Common.Views.OpenDialog.txtProtected": "Once you enter the password and open the file, the current password to the file will be reset.",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtTitleProtected": "Protected File",
- "Common.Views.PasswordDialog.cancelButtonText": "Cancel",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Set a password to protect this document",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Confirmation password is not identical",
"Common.Views.PasswordDialog.txtPassword": "Password",
@@ -224,8 +211,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Add digital signature",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Add signature line",
- "Common.Views.RenameDialog.cancelButtonText": "Cancel",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "File name",
"Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ",
"Common.Views.ReviewChanges.hintNext": "To next change",
@@ -291,8 +276,6 @@
"Common.Views.SaveAsDlg.textTitle": "Folder for save",
"Common.Views.SelectFileDlg.textLoading": "Loading",
"Common.Views.SelectFileDlg.textTitle": "Select Data Source",
- "Common.Views.SignDialog.cancelButtonText": "Cancel",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Bold",
"Common.Views.SignDialog.textCertificate": "Certificate",
"Common.Views.SignDialog.textChange": "Change",
@@ -307,8 +290,6 @@
"Common.Views.SignDialog.textValid": "Valid from %1 to %2",
"Common.Views.SignDialog.tipFontName": "Font Name",
"Common.Views.SignDialog.tipFontSize": "Font Size",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Cancel",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Allow signer to add comment in the signature dialog",
"Common.Views.SignSettingsDialog.textInfo": "Signer Info",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -352,6 +333,7 @@
"DE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document. Use the 'Save as...' option to save the file backup copy to your computer hard drive.",
"DE.Controllers.Main.errorEmailClient": "No email client could be found.",
"DE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.",
+ "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server. Please contact your Document Server administrator for details.",
"DE.Controllers.Main.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
"DE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor",
"DE.Controllers.Main.errorKeyExpire": "Key descriptor expired",
@@ -665,7 +647,9 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server. If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users. If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
- "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server. Please contact your Document Server administrator for details.",
+ "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.",
+ "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.",
+ "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -1009,6 +993,8 @@
"DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
"DE.Controllers.Viewport.textFitPage": "Fit to Page",
"DE.Controllers.Viewport.textFitWidth": "Fit to Width",
+ "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:",
+ "DE.Views.AddNewCaptionLabelDialog.textLabelError": "Label must not be empty."
"DE.Views.BookmarksDialog.textAdd": "Add",
"DE.Views.BookmarksDialog.textBookmarkName": "Bookmark name",
"DE.Views.BookmarksDialog.textClose": "Close",
@@ -1022,6 +1008,39 @@
"DE.Views.BookmarksDialog.textSort": "Sort by",
"DE.Views.BookmarksDialog.textTitle": "Bookmarks",
"DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
+ "DE.Views.CaptionDialog.textTitle": "Insert Caption",
+ "DE.Views.CaptionDialog.textCaption": "Caption",
+ "DE.Views.CaptionDialog.textInsert": "Insert",
+ "DE.Views.CaptionDialog.textLabel": "Label",
+ "DE.Views.CaptionDialog.textAdd": "Add label",
+ "DE.Views.CaptionDialog.textDelete": "Delete label",
+ "DE.Views.CaptionDialog.textNumbering": "Numbering",
+ "DE.Views.CaptionDialog.textChapterInc": "Include chapter number",
+ "DE.Views.CaptionDialog.textChapter": "Chapter starts with style",
+ "DE.Views.CaptionDialog.textSeparator": "Use separator",
+ "DE.Views.CaptionDialog.textExamples": "Examples: Table 2-A, Image 1.IV",
+ "DE.Views.CaptionDialog.textBefore": "Before",
+ "DE.Views.CaptionDialog.textAfter": "After",
+ "DE.Views.CaptionDialog.textHyphen": "hyphen",
+ "DE.Views.CaptionDialog.textPeriod": "period",
+ "DE.Views.CaptionDialog.textColon": "colon",
+ "DE.Views.CaptionDialog.textLongDash": "long dash",
+ "DE.Views.CaptionDialog.textDash": "dash",
+ "DE.Views.CaptionDialog.textEquation": "Equation",
+ "DE.Views.CaptionDialog.textFigure": "Figure",
+ "DE.Views.CaptionDialog.textTable": "Table",
+ "DE.Views.CaptionDialog.textExclude": "Exclude label from caption",
+ "DE.Views.CellsAddDialog.textCol": "Columns",
+ "DE.Views.CellsAddDialog.textDown": "Below the cursor",
+ "DE.Views.CellsAddDialog.textLeft": "To the left",
+ "DE.Views.CellsAddDialog.textRight": "To the right",
+ "DE.Views.CellsAddDialog.textRow": "Rows",
+ "DE.Views.CellsAddDialog.textTitle": "Insert Several",
+ "DE.Views.CellsAddDialog.textUp": "Above the cursor",
+ "DE.Views.CellsRemoveDialog.textCol": "Delete entire column",
+ "DE.Views.CellsRemoveDialog.textLeft": "Shift cells left",
+ "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
+ "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"DE.Views.ChartSettings.textArea": "Area",
"DE.Views.ChartSettings.textBar": "Bar",
@@ -1048,8 +1067,6 @@
"DE.Views.ChartSettings.txtTight": "Tight",
"DE.Views.ChartSettings.txtTitle": "Chart",
"DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Cancel",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Appearance",
"DE.Views.ControlSettingsDialog.textApplyAll": "Apply to All",
"DE.Views.ControlSettingsDialog.textBox": "Bounding box",
@@ -1064,8 +1081,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Content Control Settings",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Content control cannot be deleted",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Contents cannot be edited",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancel",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Number of columns",
"DE.Views.CustomColumnsDialog.textSeparator": "Column divider",
"DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",
@@ -1143,6 +1158,7 @@
"DE.Views.DocumentHolder.textArrangeBackward": "Send Backward",
"DE.Views.DocumentHolder.textArrangeForward": "Bring Forward",
"DE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground",
+ "DE.Views.DocumentHolder.textCells": "Cells",
"DE.Views.DocumentHolder.textContentControls": "Content control",
"DE.Views.DocumentHolder.textContinueNumbering": "Continue numbering",
"DE.Views.DocumentHolder.textCopy": "Copy",
@@ -1174,6 +1190,7 @@
"DE.Views.DocumentHolder.textRotate90": "Rotate 90° Clockwise",
"DE.Views.DocumentHolder.textSeparateList": "Separate list",
"DE.Views.DocumentHolder.textSettings": "Settings",
+ "DE.Views.DocumentHolder.textSeveral": "Several Rows/Columns",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Align Bottom",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Align Center",
"DE.Views.DocumentHolder.textShapeAlignLeft": "Align Left",
@@ -1279,8 +1296,7 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
+ "DE.Views.DocumentHolder.txtInsertCaption": "Insert Caption",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1347,6 +1363,7 @@
"DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank text document which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a document of a certain type or purpose where some styles have already been pre-applied.",
"DE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Text Document",
"DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates",
+ "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Apply",
"DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author",
"DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text",
"DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Application",
@@ -1446,8 +1463,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Top left",
"DE.Views.HeaderFooterSettings.textTopPage": "Top of Page",
"DE.Views.HeaderFooterSettings.textTopRight": "Top right",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancel",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Selected text fragment",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Display",
"DE.Views.HyperlinkSettingsDialog.textExternal": "External Link",
@@ -1489,8 +1504,6 @@
"DE.Views.ImageSettings.txtThrough": "Through",
"DE.Views.ImageSettings.txtTight": "Tight",
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancel",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Text Padding",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignment",
@@ -1592,7 +1605,6 @@
"DE.Views.Links.tipContentsUpdate": "Refresh table of contents",
"DE.Views.Links.tipInsertHyperlink": "Add hyperlink",
"DE.Views.Links.tipNotes": "Insert or edit footnotes",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1653,7 +1665,6 @@
"DE.Views.Navigation.txtSelect": "Select content",
"DE.Views.NoteSettingsDialog.textApply": "Apply",
"DE.Views.NoteSettingsDialog.textApplyTo": "Apply changes to",
- "DE.Views.NoteSettingsDialog.textCancel": "Cancel",
"DE.Views.NoteSettingsDialog.textContinue": "Continuous",
"DE.Views.NoteSettingsDialog.textCustom": "Custom Mark",
"DE.Views.NoteSettingsDialog.textDocument": "Whole document",
@@ -1670,11 +1681,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Start at",
"DE.Views.NoteSettingsDialog.textTextBottom": "Below text",
"DE.Views.NoteSettingsDialog.textTitle": "Notes Settings",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Cancel",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1682,8 +1689,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textPreset": "Preset",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
@@ -1702,15 +1707,12 @@
"DE.Views.ParagraphSettings.textExact": "Exactly",
"DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
"DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
- "del_DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
@@ -1875,15 +1877,11 @@
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
"DE.Views.StyleTitleDialog.txtSameAs": "Same as created new style",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Cancel",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",
"DE.Views.TableFormulaDialog.textFormat": "Number Format",
"DE.Views.TableFormulaDialog.textFormula": "Formula",
"DE.Views.TableFormulaDialog.textInsertFunction": "Paste Function",
"DE.Views.TableFormulaDialog.textTitle": "Formula Settings",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancel",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Right align page numbers",
"DE.Views.TableOfContentsSettings.strLinks": "Format Table of Contents as links",
"DE.Views.TableOfContentsSettings.strShowPages": "Show page numbers",
@@ -1923,7 +1921,6 @@
"DE.Views.TableSettings.textBanded": "Banded",
"DE.Views.TableSettings.textBorderColor": "Color",
"DE.Views.TableSettings.textBorders": "Borders Style",
- "DE.Views.TableSettings.textCancel": "Cancel",
"DE.Views.TableSettings.textCellSize": "Cell Size",
"DE.Views.TableSettings.textColumns": "Columns",
"DE.Views.TableSettings.textDistributeCols": "Distribute columns",
@@ -1935,7 +1932,6 @@
"DE.Views.TableSettings.textHeight": "Height",
"DE.Views.TableSettings.textLast": "Last",
"DE.Views.TableSettings.textNewColor": "Add New Custom Color",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Rows",
"DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above",
"DE.Views.TableSettings.textTemplate": "Select From Template",
@@ -1952,8 +1948,14 @@
"DE.Views.TableSettings.tipRight": "Set outer right border only",
"DE.Views.TableSettings.tipTop": "Set outer top border only",
"DE.Views.TableSettings.txtNoBorders": "No borders",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Cancel",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
+ "DE.Views.TableSettings.txtTable_TableGrid": "Table Grid",
+ "DE.Views.TableSettings.txtTable_PlainTable": "Plain Table",
+ "DE.Views.TableSettings.txtTable_GridTable": "Grid Table",
+ "DE.Views.TableSettings.txtTable_ListTable": "List Table",
+ "DE.Views.TableSettings.txtTable_Light": "Light",
+ "DE.Views.TableSettings.txtTable_Dark": "Dark",
+ "DE.Views.TableSettings.txtTable_Colorful": "Colorful",
+ "DE.Views.TableSettings.txtTable_Accent": "Accent",
"DE.Views.TableSettingsAdvanced.textAlign": "Alignment",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Spacing between cells",
@@ -2236,8 +2238,6 @@
"DE.Views.Toolbar.txtScheme7": "Equity",
"DE.Views.Toolbar.txtScheme8": "Flow",
"DE.Views.Toolbar.txtScheme9": "Foundry",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancel",
- "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
"DE.Views.WatermarkSettingsDialog.textBold": "Bold",
"DE.Views.WatermarkSettingsDialog.textColor": "Text color",
diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json
index 00be95128..a952d19f2 100644
--- a/apps/documenteditor/main/locale/es.json
+++ b/apps/documenteditor/main/locale/es.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
"Common.UI.ComboDataView.emptyComboText": "Sin estilo",
"Common.UI.ExtendedColorDialog.addButtonText": "Añadir",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Cancelar",
"Common.UI.ExtendedColorDialog.textCurrent": "Actual",
"Common.UI.ExtendedColorDialog.textHexErr": "El valor introducido es incorrecto. Por favor, introduzca un valor de 000000 a FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nuevo",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Desarrollado por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versión ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Cancelar",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar",
"Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Añadir",
"Common.Views.Comments.textAddComment": "Añadir",
@@ -174,13 +171,9 @@
"Common.Views.History.textShow": "Desplegar",
"Common.Views.History.textShowAll": "Mostrar cambios detallados",
"Common.Views.History.textVer": "ver.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
- "Common.Views.ImageFromUrlDialog.okButtonText": "Aceptar",
"Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo es obligatorio",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "El campo debe ser URL en el formato \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Cancelar",
- "Common.Views.InsertTableDialog.okButtonText": "Aceptar",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Debe especificar número válido de filas y columnas",
"Common.Views.InsertTableDialog.txtColumns": "Número de columnas",
"Common.Views.InsertTableDialog.txtMaxText": "El valor máximo para este campo es{0}.",
@@ -188,12 +181,8 @@
"Common.Views.InsertTableDialog.txtRows": "Número de filas",
"Common.Views.InsertTableDialog.txtTitle": "Tamaño de tabla",
"Common.Views.InsertTableDialog.txtTitleSplit": "Dividir celda",
- "Common.Views.LanguageDialog.btnCancel": "Cancelar",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Seleccionar el idioma de documento",
- "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
"Common.Views.OpenDialog.closeButtonText": "Cerrar archivo",
- "Common.Views.OpenDialog.okButtonText": "Aceptar",
"Common.Views.OpenDialog.txtEncoding": "Codificación",
"Common.Views.OpenDialog.txtIncorrectPwd": "La contraseña es incorrecta",
"Common.Views.OpenDialog.txtPassword": "Contraseña",
@@ -201,8 +190,6 @@
"Common.Views.OpenDialog.txtProtected": "Una vez que se ha introducido la contraseña y abierto el archivo, la contraseña actual al archivo se restablecerá",
"Common.Views.OpenDialog.txtTitle": "Elegir opciones de %1",
"Common.Views.OpenDialog.txtTitleProtected": "Archivo protegido",
- "Common.Views.PasswordDialog.cancelButtonText": "Cancelar",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Establezca una contraseña para proteger",
"Common.Views.PasswordDialog.txtIncorrectPwd": "La contraseña de confirmación es",
"Common.Views.PasswordDialog.txtPassword": "Contraseña",
@@ -224,8 +211,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Añadir firma digital",
"Common.Views.Protection.txtSignature": "Firma",
"Common.Views.Protection.txtSignatureLine": "Añadir línea de firma",
- "Common.Views.RenameDialog.cancelButtonText": "Cancelar",
- "Common.Views.RenameDialog.okButtonText": "Aceptar",
"Common.Views.RenameDialog.textName": "Nombre de archivo",
"Common.Views.RenameDialog.txtInvalidName": "El nombre de archivo no debe contener los símbolos siguientes:",
"Common.Views.ReviewChanges.hintNext": "Al siguiente cambio",
@@ -290,8 +275,6 @@
"Common.Views.SaveAsDlg.textTitle": "Carpeta para guardar",
"Common.Views.SelectFileDlg.textLoading": "Cargando",
"Common.Views.SelectFileDlg.textTitle": "Seleccionar fuente de datos",
- "Common.Views.SignDialog.cancelButtonText": "Cancelar",
- "Common.Views.SignDialog.okButtonText": "Aceptar",
"Common.Views.SignDialog.textBold": "Negrilla",
"Common.Views.SignDialog.textCertificate": "Certificar",
"Common.Views.SignDialog.textChange": "Cambiar",
@@ -306,8 +289,6 @@
"Common.Views.SignDialog.textValid": "Válido desde %1 hasta %2",
"Common.Views.SignDialog.tipFontName": "Nombre del tipo de letra",
"Common.Views.SignDialog.tipFontSize": "Tamaño del tipo de letra",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Cancelar",
- "Common.Views.SignSettingsDialog.okButtonText": "Aceptar",
"Common.Views.SignSettingsDialog.textAllowComment": "Permitir a quien firma añadir comentarios en el diálogo de firma",
"Common.Views.SignSettingsDialog.textInfo": "Información de quien firma",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -1045,8 +1026,6 @@
"DE.Views.ChartSettings.txtTight": "Estrecho",
"DE.Views.ChartSettings.txtTitle": "Gráfico",
"DE.Views.ChartSettings.txtTopAndBottom": "Superior e inferior",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Cancelar",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Aspecto",
"DE.Views.ControlSettingsDialog.textApplyAll": "Aplicar a todo",
"DE.Views.ControlSettingsDialog.textBox": "Cuadro delimitador",
@@ -1061,8 +1040,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Ajustes de control de contenido",
"DE.Views.ControlSettingsDialog.txtLockDelete": "El control de contenido no puede",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Los contenidos no se pueden editar",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancelar",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Número de columnas",
"DE.Views.CustomColumnsDialog.textSeparator": "Divisor de columnas",
"DE.Views.CustomColumnsDialog.textSpacing": "Espacio entre columnas",
@@ -1274,8 +1251,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Desagrupar",
"DE.Views.DocumentHolder.updateStyleText": "Actualizar estilo %1",
"DE.Views.DocumentHolder.vertAlignText": "Alineación vertical",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Bordes y relleno",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Letra capital",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Márgenes",
@@ -1439,8 +1414,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Superior izquierdo",
"DE.Views.HeaderFooterSettings.textTopPage": "Principio de la página",
"DE.Views.HeaderFooterSettings.textTopRight": "Superior derecho",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "Aceptar",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto seleccionado",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Mostrar",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Enlace externo",
@@ -1482,8 +1455,6 @@
"DE.Views.ImageSettings.txtThrough": "A través",
"DE.Views.ImageSettings.txtTight": "Estrecho",
"DE.Views.ImageSettings.txtTopAndBottom": "Superior e inferior",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.ImageSettingsAdvanced.strMargins": "Márgenes interiores",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alineación",
@@ -1585,7 +1556,6 @@
"DE.Views.Links.tipContentsUpdate": "Actualize la tabla de contenidos",
"DE.Views.Links.tipInsertHyperlink": "Añadir hiperenlace",
"DE.Views.Links.tipNotes": "Introducir o editar notas a pie de página",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Enviar",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Tema",
@@ -1646,7 +1616,6 @@
"DE.Views.Navigation.txtSelect": "Seleccione contenido",
"DE.Views.NoteSettingsDialog.textApply": "Aplicar",
"DE.Views.NoteSettingsDialog.textApplyTo": "Aplicar cambios a",
- "DE.Views.NoteSettingsDialog.textCancel": "Cancelar",
"DE.Views.NoteSettingsDialog.textContinue": "Continua",
"DE.Views.NoteSettingsDialog.textCustom": "Símbolo especial",
"DE.Views.NoteSettingsDialog.textDocument": "Todo el documento",
@@ -1663,11 +1632,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Empezar con",
"DE.Views.NoteSettingsDialog.textTextBottom": "Bajo el texto",
"DE.Views.NoteSettingsDialog.textTitle": "Ajustes de las notas a pie de página",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Cancelar",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancelar",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Aviso",
- "DE.Views.PageMarginsDialog.okButtonText": "Aceptar",
"DE.Views.PageMarginsDialog.textBottom": "Inferior",
"DE.Views.PageMarginsDialog.textLeft": "Izquierdo",
"DE.Views.PageMarginsDialog.textRight": "Derecho",
@@ -1675,8 +1640,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Márgenes superior e inferior son demasiado altos para una altura de página determinada ",
"DE.Views.PageMarginsDialog.txtMarginsW": "Márgenes izquierdo y derecho son demasiado grandes para una anchura determinada de la página",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancelar",
- "DE.Views.PageSizeDialog.okButtonText": "Aceptar",
"DE.Views.PageSizeDialog.textHeight": "Altura",
"DE.Views.PageSizeDialog.textPreset": "Preajuste",
"DE.Views.PageSizeDialog.textTitle": "Tamaño de página",
@@ -1695,14 +1658,11 @@
"DE.Views.ParagraphSettings.textExact": "Exacto",
"DE.Views.ParagraphSettings.textNewColor": "Color personalizado",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancelar",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Las pestañas especificadas aparecerán en este campo",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Mayúsculas",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordes y relleno",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Salto de página antes",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Doble tachado",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Primera línea",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Izquierdo",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Derecho",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Mantener líneas juntas",
@@ -1846,15 +1806,11 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "Este campo es obligatorio",
"DE.Views.StyleTitleDialog.txtNotEmpty": "El campo no puede estar vacío",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Cancelar",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Pegar marcador",
"DE.Views.TableFormulaDialog.textFormat": "Formato de número",
"DE.Views.TableFormulaDialog.textFormula": "Fórmula",
"DE.Views.TableFormulaDialog.textInsertFunction": "Pegar función",
"DE.Views.TableFormulaDialog.textTitle": "Ajustes de fórmula",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancelar",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Alinee los números de página a la derecha",
"DE.Views.TableOfContentsSettings.strLinks": "Formatear tabla de contenidos",
"DE.Views.TableOfContentsSettings.strShowPages": "Mostrar números de página",
@@ -1894,7 +1850,6 @@
"DE.Views.TableSettings.textBanded": "Con bandas",
"DE.Views.TableSettings.textBorderColor": "Color",
"DE.Views.TableSettings.textBorders": "Estilo de bordes",
- "DE.Views.TableSettings.textCancel": "Cancelar",
"DE.Views.TableSettings.textCellSize": "Tamaño de la celda",
"DE.Views.TableSettings.textColumns": "Columnas",
"DE.Views.TableSettings.textDistributeCols": "Distribuir columnas",
@@ -1906,7 +1861,6 @@
"DE.Views.TableSettings.textHeight": "Altura",
"DE.Views.TableSettings.textLast": "Última",
"DE.Views.TableSettings.textNewColor": "Color personalizado",
- "DE.Views.TableSettings.textOK": "Aceptar",
"DE.Views.TableSettings.textRows": "Filas",
"DE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
"DE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
@@ -1923,8 +1877,6 @@
"DE.Views.TableSettings.tipRight": "Fijar sólo borde exterior derecho",
"DE.Views.TableSettings.tipTop": "Fijar sólo borde exterior superior",
"DE.Views.TableSettings.txtNoBorders": "Sin bordes",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.TableSettingsAdvanced.okButtonText": "Aceptar",
"DE.Views.TableSettingsAdvanced.textAlign": "Alineación",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alineación",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacio entre celdas",
@@ -2207,8 +2159,6 @@
"DE.Views.Toolbar.txtScheme7": "Equidad ",
"DE.Views.Toolbar.txtScheme8": "Flujo",
"DE.Views.Toolbar.txtScheme9": "Fundición",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Cancelar",
- "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
"DE.Views.WatermarkSettingsDialog.textBold": "Negrita",
"DE.Views.WatermarkSettingsDialog.textColor": "Color de texto",
diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json
index 8836db53d..fbb89fd72 100644
--- a/apps/documenteditor/main/locale/fr.json
+++ b/apps/documenteditor/main/locale/fr.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
"Common.UI.ComboDataView.emptyComboText": "Aucun style",
"Common.UI.ExtendedColorDialog.addButtonText": "Ajouter",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler",
"Common.UI.ExtendedColorDialog.textCurrent": "Actuelle",
"Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte. Entrez une valeur de 000000 à FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nouvelle",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tél.: ",
"Common.Views.About.txtVersion": "Version ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Annuler",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Envoyer",
"Common.Views.Comments.textAdd": "Ajouter",
"Common.Views.Comments.textAddComment": "Ajouter",
@@ -174,13 +171,9 @@
"Common.Views.History.textShow": "Développer",
"Common.Views.History.textShowAll": "Afficher les modifications détaillées",
"Common.Views.History.textVer": "ver. ",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuler",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Coller URL d'image",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Ce champ est obligatoire",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Annuler",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Specifiez les lignes valides et le total des colonnes.",
"Common.Views.InsertTableDialog.txtColumns": "Nombre de colonnes",
"Common.Views.InsertTableDialog.txtMaxText": "La valeur maximale pour ce champ est {0}.",
@@ -188,12 +181,8 @@
"Common.Views.InsertTableDialog.txtRows": "Nombre de lignes",
"Common.Views.InsertTableDialog.txtTitle": "Taille du tableau",
"Common.Views.InsertTableDialog.txtTitleSplit": "Fractionner la cellule",
- "Common.Views.LanguageDialog.btnCancel": "Annuler",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Sélectionner la langue du document",
- "Common.Views.OpenDialog.cancelButtonText": "Annuler",
"Common.Views.OpenDialog.closeButtonText": "Fermer le fichier",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Codage ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Le mot de passe est incorrect.",
"Common.Views.OpenDialog.txtPassword": "Mot de passe",
@@ -201,8 +190,6 @@
"Common.Views.OpenDialog.txtProtected": "Une fois le mot de passe saisi et le fichier ouvert, le mot de passe actuel de fichier sera réinitialisé.",
"Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ",
"Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé",
- "Common.Views.PasswordDialog.cancelButtonText": "Annuler",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Indiquez un mot de passe pour protéger ce document",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Le mot de passe de confirmation n'est pas identique",
"Common.Views.PasswordDialog.txtPassword": "Mot de passe",
@@ -224,8 +211,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Ajouter une signature électronique",
"Common.Views.Protection.txtSignature": "Signature",
"Common.Views.Protection.txtSignatureLine": "Ajouter la zone de signature",
- "Common.Views.RenameDialog.cancelButtonText": "Annuler",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Nom de fichier",
"Common.Views.RenameDialog.txtInvalidName": "Un nom de fichier ne peut pas contenir les caractères suivants :",
"Common.Views.ReviewChanges.hintNext": "À la modification suivante",
@@ -290,8 +275,6 @@
"Common.Views.SaveAsDlg.textTitle": "Dossier pour enregistrement",
"Common.Views.SelectFileDlg.textLoading": "Chargement",
"Common.Views.SelectFileDlg.textTitle": "Sélectionnez la source de données",
- "Common.Views.SignDialog.cancelButtonText": "Annuler",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Gras",
"Common.Views.SignDialog.textCertificate": "Certificat",
"Common.Views.SignDialog.textChange": "Modifier",
@@ -306,8 +289,6 @@
"Common.Views.SignDialog.textValid": "Valide de %1 à %2",
"Common.Views.SignDialog.tipFontName": "Nom de la police",
"Common.Views.SignDialog.tipFontSize": "Taille de la police",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Annuler",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Autoriser le signataire à ajouter un commentaire dans la boîte de dialogue de la signature",
"Common.Views.SignSettingsDialog.textInfo": "Information à propos du signataire",
"Common.Views.SignSettingsDialog.textInfoEmail": "Adresse de messagerie",
@@ -1045,8 +1026,6 @@
"DE.Views.ChartSettings.txtTight": "Rapproché",
"DE.Views.ChartSettings.txtTitle": "Graphique",
"DE.Views.ChartSettings.txtTopAndBottom": "Haut et bas",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Annuler",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Apparence",
"DE.Views.ControlSettingsDialog.textApplyAll": "Appliquer à tous",
"DE.Views.ControlSettingsDialog.textBox": "Boîte d'encombrement",
@@ -1061,8 +1040,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Paramètres de contrôle du contenu",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Le contrôle du contenu ne peut pas être supprimé",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Le contenu ne peut pas être modifié",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Annuler",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Nombre de colonnes",
"DE.Views.CustomColumnsDialog.textSeparator": "Diviseur de colonne",
"DE.Views.CustomColumnsDialog.textSpacing": "Espacement entre les colonnes",
@@ -1274,8 +1251,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Dissocier",
"DE.Views.DocumentHolder.updateStyleText": "Mettre à jour le style %1 ",
"DE.Views.DocumentHolder.vertAlignText": "Alignement vertical",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Annuler",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Bordures et remplissage",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Lettrine",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Marges",
@@ -1435,8 +1410,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "En haut à gauche",
"DE.Views.HeaderFooterSettings.textTopPage": "Haut de page",
"DE.Views.HeaderFooterSettings.textTopRight": "En haut à droite",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuler",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Fragment du texte sélectionné",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Afficher",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Lien externe",
@@ -1478,8 +1451,6 @@
"DE.Views.ImageSettings.txtThrough": "Au travers",
"DE.Views.ImageSettings.txtTight": "Rapproché",
"DE.Views.ImageSettings.txtTopAndBottom": "Haut et bas",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Annuler",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Rembourrage texte",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolue",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignement",
@@ -1581,7 +1552,6 @@
"DE.Views.Links.tipContentsUpdate": "Actualiser la table des matières",
"DE.Views.Links.tipInsertHyperlink": "Ajouter un lien hypertexte",
"DE.Views.Links.tipNotes": "Insérer ou modifier les notes de bas de page",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Annuler",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Envoyer",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Thème",
@@ -1642,7 +1612,6 @@
"DE.Views.Navigation.txtSelect": "Sélectionner le contenu",
"DE.Views.NoteSettingsDialog.textApply": "Appliquer",
"DE.Views.NoteSettingsDialog.textApplyTo": "Appliquer les modifications",
- "DE.Views.NoteSettingsDialog.textCancel": "Annuler",
"DE.Views.NoteSettingsDialog.textContinue": "Continue",
"DE.Views.NoteSettingsDialog.textCustom": "Marque personnalisée",
"DE.Views.NoteSettingsDialog.textDocument": "À tout le document",
@@ -1659,11 +1628,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Début",
"DE.Views.NoteSettingsDialog.textTextBottom": "Sous le texte",
"DE.Views.NoteSettingsDialog.textTitle": "Paramètres des notes de bas de page",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Annuler",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Annuler",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avertissement",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bas",
"DE.Views.PageMarginsDialog.textLeft": "Gauche",
"DE.Views.PageMarginsDialog.textRight": "Droite",
@@ -1671,8 +1636,6 @@
"DE.Views.PageMarginsDialog.textTop": "Haut",
"DE.Views.PageMarginsDialog.txtMarginsH": "Les marges supérieure et inférieure sont trop élevés pour une hauteur de page donnée",
"DE.Views.PageMarginsDialog.txtMarginsW": "Les marges gauche et droite sont trop larges pour une largeur de page donnée",
- "DE.Views.PageSizeDialog.cancelButtonText": "Annuler",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Hauteur",
"DE.Views.PageSizeDialog.textPreset": "Prédéfini",
"DE.Views.PageSizeDialog.textTitle": "Taille de la page",
@@ -1691,14 +1654,11 @@
"DE.Views.ParagraphSettings.textExact": "Exactement",
"DE.Views.ParagraphSettings.textNewColor": "Couleur personnalisée",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Annuler",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Les onglets spécifiés s'affichent dans ce champ",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Toutes en majuscules",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordures et remplissage",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Saut de page avant",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double barré",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Première ligne",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A gauche",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "A droite",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Lignes solidaires",
@@ -1842,15 +1802,11 @@
"DE.Views.StyleTitleDialog.textTitle": "Titre",
"DE.Views.StyleTitleDialog.txtEmpty": "Ce champ est obligatoire",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Le champ ne doit pas être vide",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Annuler",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Coller Signet ",
"DE.Views.TableFormulaDialog.textFormat": "Format de nombre",
"DE.Views.TableFormulaDialog.textFormula": "Formule",
"DE.Views.TableFormulaDialog.textInsertFunction": "Coller Fonction",
"DE.Views.TableFormulaDialog.textTitle": "Paramètres de formule",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Annuler",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Aligner les numéros de page à droite",
"DE.Views.TableOfContentsSettings.strLinks": "Mettre la table des matières sous forme de liens",
"DE.Views.TableOfContentsSettings.strShowPages": "Afficher les numéros de page",
@@ -1890,7 +1846,6 @@
"DE.Views.TableSettings.textBanded": "Bordé",
"DE.Views.TableSettings.textBorderColor": "Couleur",
"DE.Views.TableSettings.textBorders": "Style des bordures",
- "DE.Views.TableSettings.textCancel": "Annuler",
"DE.Views.TableSettings.textCellSize": "Taille de la cellule",
"DE.Views.TableSettings.textColumns": "Colonnes",
"DE.Views.TableSettings.textDistributeCols": "Distribuer les colonnes",
@@ -1902,7 +1857,6 @@
"DE.Views.TableSettings.textHeight": "Hauteur",
"DE.Views.TableSettings.textLast": "Dernier",
"DE.Views.TableSettings.textNewColor": "Couleur personnalisée",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Lignes",
"DE.Views.TableSettings.textSelectBorders": "Sélectionnez les bordures à modifier en appliquant le style choisi ci-dessus",
"DE.Views.TableSettings.textTemplate": "Sélectionner à partir d'un modèle",
@@ -1919,8 +1873,6 @@
"DE.Views.TableSettings.tipRight": "Seulement bordure extérieure droite",
"DE.Views.TableSettings.tipTop": "Seulement bordure extérieure supérieure",
"DE.Views.TableSettings.txtNoBorders": "Pas de bordures",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Annuler",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Alignement",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alignement",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Espacement entre les cellules",
@@ -2201,7 +2153,6 @@
"DE.Views.Toolbar.txtScheme7": "Capitaux",
"DE.Views.Toolbar.txtScheme8": "Flux",
"DE.Views.Toolbar.txtScheme9": "Fonderie",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annuler",
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
"DE.Views.WatermarkSettingsDialog.textBold": "Gras",
"DE.Views.WatermarkSettingsDialog.textColor": "Couleur du texte",
diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json
index 79648d6e5..56702bfc9 100644
--- a/apps/documenteditor/main/locale/hu.json
+++ b/apps/documenteditor/main/locale/hu.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek",
"Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok",
"Common.UI.ExtendedColorDialog.addButtonText": "Hozzáad",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Mégsem",
"Common.UI.ExtendedColorDialog.textCurrent": "Aktuális",
"Common.UI.ExtendedColorDialog.textHexErr": "A megadott érték helytelen. Kérjük, adjon meg egy értéket 000000 és FFFFFF között",
"Common.UI.ExtendedColorDialog.textNew": "Új",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "Tel.: ",
"Common.Views.About.txtVersion": "Verzió",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Mégsem",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Küldés",
"Common.Views.Comments.textAdd": "Hozzáad",
"Common.Views.Comments.textAddComment": "Hozzászólás hozzáadása",
@@ -167,13 +164,9 @@
"Common.Views.History.textShow": "Kibont",
"Common.Views.History.textShowAll": "Módosítások részletes megjelenítése",
"Common.Views.History.textVer": "ver.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Mégsem",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Illesszen be egy kép hivatkozást:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Ez egy szükséges mező",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Ennek a mezőnek hivatkozásnak kell lennie a \"http://www.example.com\" formátumban",
- "Common.Views.InsertTableDialog.cancelButtonText": "Mégsem",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Adjon meg valós sor és oszlop darabszámot.",
"Common.Views.InsertTableDialog.txtColumns": "Oszlopok száma",
"Common.Views.InsertTableDialog.txtMaxText": "A mező maximális értéke {0}.",
@@ -181,12 +174,8 @@
"Common.Views.InsertTableDialog.txtRows": "Sorok száma",
"Common.Views.InsertTableDialog.txtTitle": "Táblázat méret",
"Common.Views.InsertTableDialog.txtTitleSplit": "Cella felosztása",
- "Common.Views.LanguageDialog.btnCancel": "Mégsem",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Dokumentum nyelvének kiválasztása",
- "Common.Views.OpenDialog.cancelButtonText": "Mégsem",
"Common.Views.OpenDialog.closeButtonText": "Fájl bezárása",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Kódol",
"Common.Views.OpenDialog.txtIncorrectPwd": "Hibás jelszó.",
"Common.Views.OpenDialog.txtPassword": "Jelszó",
@@ -194,8 +183,6 @@
"Common.Views.OpenDialog.txtProtected": "Miután megadta a jelszót és megnyitotta a fájlt, az aktuális jelszó visszaáll.",
"Common.Views.OpenDialog.txtTitle": "Válassza a %1 opciót",
"Common.Views.OpenDialog.txtTitleProtected": "Védett fájl",
- "Common.Views.PasswordDialog.cancelButtonText": "Mégsem",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Állítson be jelszót a dokumentum védelmére",
"Common.Views.PasswordDialog.txtIncorrectPwd": "A jelszavak nem azonosak",
"Common.Views.PasswordDialog.txtPassword": "Jelszó",
@@ -217,8 +204,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Digitális aláírás hozzáadása",
"Common.Views.Protection.txtSignature": "Aláírás",
"Common.Views.Protection.txtSignatureLine": "Aláírás sor hozzáadása",
- "Common.Views.RenameDialog.cancelButtonText": "Mégsem",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Fájl név",
"Common.Views.RenameDialog.txtInvalidName": "A fájlnév nem tartalmazhatja a következő karaktereket:",
"Common.Views.ReviewChanges.hintNext": "A következő változáshoz",
@@ -282,8 +267,6 @@
"Common.Views.SaveAsDlg.textTitle": "Mentési mappa",
"Common.Views.SelectFileDlg.textLoading": "Betöltés",
"Common.Views.SelectFileDlg.textTitle": "Adatforrás kiválasztása",
- "Common.Views.SignDialog.cancelButtonText": "Mégsem",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Félkövér",
"Common.Views.SignDialog.textCertificate": "Tanúsítvány",
"Common.Views.SignDialog.textChange": "Módosítás",
@@ -298,8 +281,6 @@
"Common.Views.SignDialog.textValid": "Érvényes %1 és %2 között",
"Common.Views.SignDialog.tipFontName": "Betűtípus neve",
"Common.Views.SignDialog.tipFontSize": "Betűméret",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Mégsem",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Engedélyezi az aláírónak hozzászólás hozzáadását az aláírási párbeszédablakban",
"Common.Views.SignSettingsDialog.textInfo": "Aláíró infó",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -967,8 +948,6 @@
"DE.Views.ChartSettings.txtTight": "Szűken",
"DE.Views.ChartSettings.txtTitle": "Diagram",
"DE.Views.ChartSettings.txtTopAndBottom": "Felül - alul",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Mégsem",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Megjelenítés",
"DE.Views.ControlSettingsDialog.textApplyAll": "Mindenre alkalmaz",
"DE.Views.ControlSettingsDialog.textBox": "Kötő keret",
@@ -982,8 +961,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Tartalomkezelő beállításai",
"DE.Views.ControlSettingsDialog.txtLockDelete": "A tartalomkezelő nem törölhető",
"DE.Views.ControlSettingsDialog.txtLockEdit": "A tartalom nem szerkeszthető",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Mégsem",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Hasábok száma",
"DE.Views.CustomColumnsDialog.textSeparator": "Hasáb elválasztó",
"DE.Views.CustomColumnsDialog.textSpacing": "Hasábtávolság",
@@ -1193,8 +1170,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Csoport szétválasztása",
"DE.Views.DocumentHolder.updateStyleText": "%1 stílust frissít",
"DE.Views.DocumentHolder.vertAlignText": "Függőleges rendezés",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Mégsem",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Szegélyek és kitöltés",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Iniciálé",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margók",
@@ -1349,8 +1324,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Bal felső",
"DE.Views.HeaderFooterSettings.textTopPage": "Oldal teteje",
"DE.Views.HeaderFooterSettings.textTopRight": "Jobb felső",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Mégsem",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Kiválasztott szövegrészlet",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Megjelenít",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Külső hivatkozás",
@@ -1392,8 +1365,6 @@
"DE.Views.ImageSettings.txtThrough": "Körbefutva",
"DE.Views.ImageSettings.txtTight": "Szűken",
"DE.Views.ImageSettings.txtTopAndBottom": "Felül - alul",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Mégsem",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Szöveg távolság",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Abszolút",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Elrendezés",
@@ -1495,7 +1466,6 @@
"DE.Views.Links.tipContentsUpdate": "Tartalomjegyzék frissítése",
"DE.Views.Links.tipInsertHyperlink": "Hivatkozás hozzáadása",
"DE.Views.Links.tipNotes": "Lábjegyzet beszúrása vagy szerkesztése",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Mégsem",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Küldés",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Téma",
@@ -1556,7 +1526,6 @@
"DE.Views.Navigation.txtSelect": "Tartalom kiválasztása",
"DE.Views.NoteSettingsDialog.textApply": "Alkalmaz",
"DE.Views.NoteSettingsDialog.textApplyTo": "Alkalmazás",
- "DE.Views.NoteSettingsDialog.textCancel": "Mégsem",
"DE.Views.NoteSettingsDialog.textContinue": "Folyamatos",
"DE.Views.NoteSettingsDialog.textCustom": "Egyéni jel",
"DE.Views.NoteSettingsDialog.textDocument": "Teljes dokumentum",
@@ -1573,11 +1542,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Kezdés",
"DE.Views.NoteSettingsDialog.textTextBottom": "Alsó szöveg",
"DE.Views.NoteSettingsDialog.textTitle": "Jegyzet beállítások",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Mégsem",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Mégsem",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Figyelmeztetés",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Alsó",
"DE.Views.PageMarginsDialog.textLeft": "Bal",
"DE.Views.PageMarginsDialog.textRight": "Jobb",
@@ -1585,8 +1550,6 @@
"DE.Views.PageMarginsDialog.textTop": "Felső",
"DE.Views.PageMarginsDialog.txtMarginsH": "A felső és alsó margók túl magasak az adott oldalmagassághoz",
"DE.Views.PageMarginsDialog.txtMarginsW": "A szélső margók túl szélesek az adott oldal szélességéhez",
- "DE.Views.PageSizeDialog.cancelButtonText": "Mégsem",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Magasság",
"DE.Views.PageSizeDialog.textPreset": "Előzetes beállítás",
"DE.Views.PageSizeDialog.textTitle": "Lap méret",
@@ -1605,14 +1568,11 @@
"DE.Views.ParagraphSettings.textExact": "Pontosan",
"DE.Views.ParagraphSettings.textNewColor": "Új egyedi szín hozzáadása",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Mégsem",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "A megadott lapok ezen a területen jelennek meg.",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Minden nagybetű",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Szegélyek és kitöltés",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Oldaltörés elötte",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Duplán áthúzott",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Első sor",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Bal",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Jobb",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Sorok egyben tartása",
@@ -1756,13 +1716,9 @@
"DE.Views.StyleTitleDialog.textTitle": "Cím",
"DE.Views.StyleTitleDialog.txtEmpty": "Ez egy szükséges mező",
"DE.Views.StyleTitleDialog.txtNotEmpty": "A mező nem lehet üres",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Mégse",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textFormat": "Számformátum",
"DE.Views.TableFormulaDialog.textFormula": "Függvény",
"DE.Views.TableFormulaDialog.textTitle": "Függvény beállítások",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Mégsem",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Jobbra rendezett oldalszámok",
"DE.Views.TableOfContentsSettings.strLinks": "Tartalomjegyzék formázása hivatkozásként",
"DE.Views.TableOfContentsSettings.strShowPages": "Oldalszámok megjelenítése",
@@ -1802,7 +1758,6 @@
"DE.Views.TableSettings.textBanded": "Csíkos",
"DE.Views.TableSettings.textBorderColor": "Szín",
"DE.Views.TableSettings.textBorders": "Szegély stílus",
- "DE.Views.TableSettings.textCancel": "Mégsem",
"DE.Views.TableSettings.textCellSize": "Cella méret",
"DE.Views.TableSettings.textColumns": "Oszlopok",
"DE.Views.TableSettings.textDistributeCols": "Oszlopok elosztása",
@@ -1814,7 +1769,6 @@
"DE.Views.TableSettings.textHeight": "Magasság",
"DE.Views.TableSettings.textLast": "Utolsó",
"DE.Views.TableSettings.textNewColor": "Új egyedi szín hozzáadása",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Sorok",
"DE.Views.TableSettings.textSelectBorders": "Válassza ki a szegélyeket, amelyeket módosítani szeretne, a fenti stílus kiválasztásával",
"DE.Views.TableSettings.textTemplate": "Választás a sablonokból",
@@ -1831,8 +1785,6 @@
"DE.Views.TableSettings.tipRight": "Csak külső, jobb szegély beállítása",
"DE.Views.TableSettings.tipTop": "Csak külső, felső szegély beállítása",
"DE.Views.TableSettings.txtNoBorders": "Nincsenek szegélyek",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Mégsem",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Elrendezés",
"DE.Views.TableSettingsAdvanced.textAlignment": "Elrendezés",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Cellák közti tér",
diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json
index adba75904..c30118951 100644
--- a/apps/documenteditor/main/locale/it.json
+++ b/apps/documenteditor/main/locale/it.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
"Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
"Common.UI.ExtendedColorDialog.addButtonText": "Aggiungi",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Annulla",
"Common.UI.ExtendedColorDialog.textCurrent": "Attuale",
"Common.UI.ExtendedColorDialog.textHexErr": "Il valore inserito non è corretto. Inserisci un valore tra 000000 e FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nuovo",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Con tecnologia",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versione ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Annulla",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Invia",
"Common.Views.Comments.textAdd": "Aggiungi",
"Common.Views.Comments.textAddComment": "Aggiungi",
@@ -174,13 +171,9 @@
"Common.Views.History.textShow": "Espandi",
"Common.Views.History.textShowAll": "Mostra modifiche dettagliate",
"Common.Views.History.textVer": "ver.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annulla",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Incolla URL immagine:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Questo campo è richiesto",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Il formato URL richiesto è \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Annulla",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Specifica il numero di righe e colonne valido.",
"Common.Views.InsertTableDialog.txtColumns": "Numero di colonne",
"Common.Views.InsertTableDialog.txtMaxText": "Il valore massimo di questo campo è {0}.",
@@ -188,12 +181,8 @@
"Common.Views.InsertTableDialog.txtRows": "Numero di righe",
"Common.Views.InsertTableDialog.txtTitle": "Dimensioni tabella",
"Common.Views.InsertTableDialog.txtTitleSplit": "Dividi cella",
- "Common.Views.LanguageDialog.btnCancel": "Annulla",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Seleziona la lingua del documento",
- "Common.Views.OpenDialog.cancelButtonText": "Annulla",
"Common.Views.OpenDialog.closeButtonText": "Chiudi File",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Codificazione",
"Common.Views.OpenDialog.txtIncorrectPwd": "Password errata",
"Common.Views.OpenDialog.txtPassword": "Password",
@@ -201,8 +190,6 @@
"Common.Views.OpenDialog.txtProtected": "Una volta inserita la password e aperto il file, verrà ripristinata la password corrente sul file.",
"Common.Views.OpenDialog.txtTitle": "Seleziona parametri %1",
"Common.Views.OpenDialog.txtTitleProtected": "File protetto",
- "Common.Views.PasswordDialog.cancelButtonText": "Annulla",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "É richiesta la password per proteggere il documento",
"Common.Views.PasswordDialog.txtIncorrectPwd": "la password di conferma non corrisponde",
"Common.Views.PasswordDialog.txtPassword": "Password",
@@ -224,8 +211,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Aggiungi firma digitale",
"Common.Views.Protection.txtSignature": "Firma",
"Common.Views.Protection.txtSignatureLine": "Riga della firma",
- "Common.Views.RenameDialog.cancelButtonText": "Annulla",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Nome del file",
"Common.Views.RenameDialog.txtInvalidName": "Il nome del file non può contenere nessuno dei seguenti caratteri:",
"Common.Views.ReviewChanges.hintNext": "Alla modifica successiva",
@@ -291,8 +276,6 @@
"Common.Views.SaveAsDlg.textTitle": "Cartella di salvataggio",
"Common.Views.SelectFileDlg.textLoading": "Caricamento",
"Common.Views.SelectFileDlg.textTitle": "Seleziona Sorgente Dati",
- "Common.Views.SignDialog.cancelButtonText": "Annulla",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Grassetto",
"Common.Views.SignDialog.textCertificate": "Certificato",
"Common.Views.SignDialog.textChange": "Cambia",
@@ -307,8 +290,6 @@
"Common.Views.SignDialog.textValid": "Valido dal %1 al %2",
"Common.Views.SignDialog.tipFontName": "Nome carattere",
"Common.Views.SignDialog.tipFontSize": "Dimensione carattere",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Annulla",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Consenti al firmatario di aggiungere commenti nella finestra di firma",
"Common.Views.SignSettingsDialog.textInfo": "Informazioni sul Firmatario",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -1047,8 +1028,6 @@
"DE.Views.ChartSettings.txtTight": "Ravvicinato",
"DE.Views.ChartSettings.txtTitle": "Grafico",
"DE.Views.ChartSettings.txtTopAndBottom": "Sopra e sotto",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Annulla",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Aspetto",
"DE.Views.ControlSettingsDialog.textApplyAll": "Applica a tutti",
"DE.Views.ControlSettingsDialog.textBox": "Rettangolo di selezione",
@@ -1063,8 +1042,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Impostazioni di controllo del contenuto",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Il controllo del contenuto non può essere eliminato",
"DE.Views.ControlSettingsDialog.txtLockEdit": "I contenuti non possono essere modificati",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Annulla",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Numero di colonne",
"DE.Views.CustomColumnsDialog.textSeparator": "Divisore Colonna",
"DE.Views.CustomColumnsDialog.textSpacing": "spaziatura fra le colonne",
@@ -1278,8 +1255,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Separa",
"DE.Views.DocumentHolder.updateStyleText": "Aggiorna stile %1",
"DE.Views.DocumentHolder.vertAlignText": "Allineamento verticale",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Annulla",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Bordi e riempimento",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Capolettera",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margini",
@@ -1445,8 +1420,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "In alto a sinistra",
"DE.Views.HeaderFooterSettings.textTopPage": "Inizio pagina",
"DE.Views.HeaderFooterSettings.textTopRight": "In alto a destra",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annulla",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Testo selezionato",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Visualizza",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Collegamento esterno",
@@ -1488,8 +1461,6 @@
"DE.Views.ImageSettings.txtThrough": "All'interno",
"DE.Views.ImageSettings.txtTight": "Ravvicinato",
"DE.Views.ImageSettings.txtTopAndBottom": "Sopra e sotto",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Annulla",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Spaziatura interna",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Assoluto",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Allineamento",
@@ -1591,7 +1562,6 @@
"DE.Views.Links.tipContentsUpdate": "Aggiorna Sommario",
"DE.Views.Links.tipInsertHyperlink": "Aggiungi collegamento ipertestuale",
"DE.Views.Links.tipNotes": "Inserisci o modifica Note a piè di pagina",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Annulla",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Tema",
@@ -1652,7 +1622,6 @@
"DE.Views.Navigation.txtSelect": "Scegli contenuto",
"DE.Views.NoteSettingsDialog.textApply": "Applica",
"DE.Views.NoteSettingsDialog.textApplyTo": "Applica modifiche a",
- "DE.Views.NoteSettingsDialog.textCancel": "Annulla",
"DE.Views.NoteSettingsDialog.textContinue": "Continua",
"DE.Views.NoteSettingsDialog.textCustom": "Simbolo personalizzato",
"DE.Views.NoteSettingsDialog.textDocument": "Tutto il documento",
@@ -1669,11 +1638,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Inizia da",
"DE.Views.NoteSettingsDialog.textTextBottom": "Sotto al testo",
"DE.Views.NoteSettingsDialog.textTitle": "Impostazioni delle note",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Annulla",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Annulla",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Avviso",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "In basso",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1681,8 +1646,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "I margini superiore e inferiore sono troppo alti per una determinata altezza di pagina",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Annulla",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textPreset": "Preimpostazione",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
@@ -1701,15 +1664,12 @@
"DE.Views.ParagraphSettings.textExact": "Esatta",
"DE.Views.ParagraphSettings.textNewColor": "Colore personalizzato",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Annulla",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Le schede specificate appariranno in questo campo",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Maiuscole",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordi e riempimento",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Anteponi interruzione",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Barrato doppio",
"DE.Views.ParagraphSettingsAdvanced.strIndent": "Rientri",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Prima riga",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "A sinistra",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interlinea",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Livello del contorno",
@@ -1873,15 +1833,11 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "Campo obbligatorio",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Annulla",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textBookmark": "Incolla il segnalibro",
"DE.Views.TableFormulaDialog.textFormat": "Formato del numero",
"DE.Views.TableFormulaDialog.textFormula": "Formula",
"DE.Views.TableFormulaDialog.textInsertFunction": "Incolla la funzione",
"DE.Views.TableFormulaDialog.textTitle": "Impostazioni della formula",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Annulla",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Numeri di pagina allineati a destra",
"DE.Views.TableOfContentsSettings.strLinks": "Formato Sommario come collegamenti",
"DE.Views.TableOfContentsSettings.strShowPages": "Mostra numeri di pagina",
@@ -1921,7 +1877,6 @@
"DE.Views.TableSettings.textBanded": "Altera",
"DE.Views.TableSettings.textBorderColor": "Colore",
"DE.Views.TableSettings.textBorders": "Stile bordo",
- "DE.Views.TableSettings.textCancel": "Annulla",
"DE.Views.TableSettings.textCellSize": "Dimensioni cella",
"DE.Views.TableSettings.textColumns": "Colonne",
"DE.Views.TableSettings.textDistributeCols": "Distribuisci colonne",
@@ -1933,7 +1888,6 @@
"DE.Views.TableSettings.textHeight": "Altezza",
"DE.Views.TableSettings.textLast": "Ultima",
"DE.Views.TableSettings.textNewColor": "Colore personalizzato",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Righe",
"DE.Views.TableSettings.textSelectBorders": "Seleziona i bordi che desideri modificare applicando lo stile scelto sopra",
"DE.Views.TableSettings.textTemplate": "Seleziona da modello",
@@ -1950,8 +1904,6 @@
"DE.Views.TableSettings.tipRight": "Imposta solo bordo esterno destro",
"DE.Views.TableSettings.tipTop": "Imposta solo bordo esterno superiore",
"DE.Views.TableSettings.txtNoBorders": "Nessun bordo",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Annulla",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Allineamento",
"DE.Views.TableSettingsAdvanced.textAlignment": "Allineamento",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Consenti spaziatura tra celle",
@@ -2234,8 +2186,6 @@
"DE.Views.Toolbar.txtScheme7": "Universo",
"DE.Views.Toolbar.txtScheme8": "Flusso",
"DE.Views.Toolbar.txtScheme9": "Galassia",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Annulla",
- "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
"DE.Views.WatermarkSettingsDialog.textBold": "Grassetto",
"DE.Views.WatermarkSettingsDialog.textColor": "Colore del testo",
diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json
index 351481f2c..3c72ec997 100644
--- a/apps/documenteditor/main/locale/ja.json
+++ b/apps/documenteditor/main/locale/ja.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし",
"Common.UI.ComboDataView.emptyComboText": "スタイルなし",
"Common.UI.ExtendedColorDialog.addButtonText": "追加",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "キャンセル",
"Common.UI.ExtendedColorDialog.textCurrent": "現在",
"Common.UI.ExtendedColorDialog.textHexErr": "入力された値が正しくありません。 000000〜FFFFFFの数値を入力してください。",
"Common.UI.ExtendedColorDialog.textNew": "新しい",
@@ -104,8 +103,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "電話番号:",
"Common.Views.About.txtVersion": "バージョン",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "キャンセル",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "送信",
"Common.Views.Comments.textAdd": "追加",
"Common.Views.Comments.textAddComment": "コメントの追加",
@@ -136,21 +133,15 @@
"Common.Views.ExternalMergeEditor.textSave": "保存&終了",
"Common.Views.ExternalMergeEditor.textTitle": "差し込み印刷の宛先",
"Common.Views.Header.textBack": "ドキュメントに移動",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "キャンセル",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "画像のURLの貼り付け",
"Common.Views.ImageFromUrlDialog.txtEmpty": "このフィールドは必須項目です",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "このフィールドは「http://www.example.com」の形式のURLである必要があります。",
- "Common.Views.InsertTableDialog.cancelButtonText": "キャンセル",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "有効な行と列の数を指定する必要があります。",
"Common.Views.InsertTableDialog.txtColumns": "列数",
"Common.Views.InsertTableDialog.txtMaxText": "このフィールドの最大値は{0}です。",
"Common.Views.InsertTableDialog.txtMinText": "このフィールドの最小値は{0}です。",
"Common.Views.InsertTableDialog.txtRows": "行数",
"Common.Views.InsertTableDialog.txtTitle": "表のサイズ",
- "Common.Views.OpenDialog.cancelButtonText": "キャンセル",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "エンコード",
"Common.Views.OpenDialog.txtTitle": "%1オプションの選択",
"Common.Views.ReviewChanges.txtAccept": "同意する",
@@ -786,8 +777,6 @@
"DE.Views.DocumentHolder.txtUngroup": "グループ化解除",
"DE.Views.DocumentHolder.updateStyleText": "%1スタイルの更新",
"DE.Views.DocumentHolder.vertAlignText": "垂直方向の配置",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "キャンセル",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "罫線と塗りつぶし",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "ドロップ キャップ",
"DE.Views.DropcapSettingsAdvanced.strMargins": "余白",
@@ -915,8 +904,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "上中央",
"DE.Views.HeaderFooterSettings.textTopLeft": "左上",
"DE.Views.HeaderFooterSettings.textTopRight": "右上",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "キャンセル",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "テキスト フラグメントの選択",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "ディスプレイ",
"DE.Views.HyperlinkSettingsDialog.textTitle": "ハイパーリンクの設定",
@@ -940,8 +927,6 @@
"DE.Views.ImageSettings.txtThrough": "スルー",
"DE.Views.ImageSettings.txtTight": "外周",
"DE.Views.ImageSettings.txtTopAndBottom": "上と下",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "キャンセル",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "テキストの埋め込み文字",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "アブソリュート",
"DE.Views.ImageSettingsAdvanced.textAlignment": "配置",
@@ -1010,7 +995,6 @@
"DE.Views.LeftMenu.tipSearch": "検索",
"DE.Views.LeftMenu.tipSupport": "フィードバック&サポート",
"DE.Views.LeftMenu.tipTitles": "タイトル",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "キャンセル",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "送信",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "テーマ",
@@ -1058,9 +1042,7 @@
"DE.Views.MailMergeSettings.txtPrev": "前のレコード",
"DE.Views.MailMergeSettings.txtUntitled": "無題",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "マージの開始に失敗しました",
- "DE.Views.PageMarginsDialog.cancelButtonText": "キャンセル",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "警告",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "下",
"DE.Views.PageMarginsDialog.textLeft": "左",
"DE.Views.PageMarginsDialog.textRight": "右",
@@ -1068,8 +1050,6 @@
"DE.Views.PageMarginsDialog.textTop": "トップ",
"DE.Views.PageMarginsDialog.txtMarginsH": "指定されたページの高さのために上下の余白は高すぎます。",
"DE.Views.PageMarginsDialog.txtMarginsW": "左右の余白の合計がページの幅を超えています。",
- "DE.Views.PageSizeDialog.cancelButtonText": "キャンセル",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "高さ",
"DE.Views.PageSizeDialog.textTitle": "ページ サイズ",
"DE.Views.PageSizeDialog.textWidth": "幅",
@@ -1086,14 +1066,11 @@
"DE.Views.ParagraphSettings.textExact": "固定値",
"DE.Views.ParagraphSettings.textNewColor": "ユーザー設定の色の追加",
"DE.Views.ParagraphSettings.txtAutoText": "自動",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "キャンセル",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "指定されたタブは、このフィールドに表示されます。",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "全てのキャップ",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "罫線と塗りつぶし",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "前に改ページ",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "二重取り消し線",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "最初の行",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "左",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "右に",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "段落を分割しない",
@@ -1231,7 +1208,6 @@
"DE.Views.TableSettings.textBanded": "縞模様",
"DE.Views.TableSettings.textBorderColor": "色",
"DE.Views.TableSettings.textBorders": "罫線のスタイル",
- "DE.Views.TableSettings.textCancel": "キャンセル",
"DE.Views.TableSettings.textColumns": "列",
"DE.Views.TableSettings.textEdit": "行/列",
"DE.Views.TableSettings.textEmptyTemplate": "テンプレートなし",
@@ -1239,7 +1215,6 @@
"DE.Views.TableSettings.textHeader": "ヘッダー",
"DE.Views.TableSettings.textLast": "最後",
"DE.Views.TableSettings.textNewColor": "ユーザー設定の色の追加",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "行",
"DE.Views.TableSettings.textSelectBorders": "選択したスタイルを適用する罫線を選択してください。 ",
"DE.Views.TableSettings.textTemplate": "テンプレートから選択する",
@@ -1255,8 +1230,6 @@
"DE.Views.TableSettings.tipRight": "外部の罫線(右)だけを設定します。",
"DE.Views.TableSettings.tipTop": "外部の罫線(上)だけを設定します。",
"DE.Views.TableSettings.txtNoBorders": "罫線なし",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "キャンセル",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "配置",
"DE.Views.TableSettingsAdvanced.textAlignment": "配置",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "セルの間隔を指定する",
diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json
index e0e631514..a5fff7061 100644
--- a/apps/documenteditor/main/locale/ko.json
+++ b/apps/documenteditor/main/locale/ko.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "테두리 없음",
"Common.UI.ComboDataView.emptyComboText": "스타일 없음",
"Common.UI.ExtendedColorDialog.addButtonText": "Add",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "취소",
"Common.UI.ExtendedColorDialog.textCurrent": "현재",
"Common.UI.ExtendedColorDialog.textHexErr": "입력 한 값이 잘못되었습니다. 000000에서 FFFFFF 사이의 값을 입력하십시오.",
"Common.UI.ExtendedColorDialog.textNew": "New",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel .:",
"Common.Views.About.txtVersion": "버전",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "취소",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "보내기",
"Common.Views.Comments.textAdd": "추가",
"Common.Views.Comments.textAddComment": "덧글 추가",
@@ -166,13 +163,9 @@
"Common.Views.History.textRestore": "복원",
"Common.Views.History.textShow": "확장",
"Common.Views.History.textShowAll": "자세한 변경 사항 표시",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "취소",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "이미지 URL 붙여 넣기 :",
"Common.Views.ImageFromUrlDialog.txtEmpty": "이 입력란은 필수 항목",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "이 필드는 \"http://www.example.com\"형식의 URL이어야합니다.",
- "Common.Views.InsertTableDialog.cancelButtonText": "취소",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "유효한 행 및 열 수를 지정해야합니다.",
"Common.Views.InsertTableDialog.txtColumns": "열 수",
"Common.Views.InsertTableDialog.txtMaxText": "이 필드의 최대 값은 {0}입니다.",
@@ -180,20 +173,14 @@
"Common.Views.InsertTableDialog.txtRows": "행 수",
"Common.Views.InsertTableDialog.txtTitle": "표 크기",
"Common.Views.InsertTableDialog.txtTitleSplit": "셀 분할",
- "Common.Views.LanguageDialog.btnCancel": "취소",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "문서 언어 선택",
- "Common.Views.OpenDialog.cancelButtonText": "취소",
"Common.Views.OpenDialog.closeButtonText": "파일 닫기",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "인코딩",
"Common.Views.OpenDialog.txtIncorrectPwd": "비밀번호가 맞지 않음",
"Common.Views.OpenDialog.txtPassword": "비밀번호",
"Common.Views.OpenDialog.txtPreview": "미리보기",
"Common.Views.OpenDialog.txtTitle": "% 1 옵션 선택",
"Common.Views.OpenDialog.txtTitleProtected": "보호 된 파일",
- "Common.Views.PasswordDialog.cancelButtonText": "취소",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "문서 보호용 비밀번호를 세팅하세요",
"Common.Views.PasswordDialog.txtIncorrectPwd": "확인 비밀번호가 같지 않음",
"Common.Views.PasswordDialog.txtPassword": "암호",
@@ -215,8 +202,6 @@
"Common.Views.Protection.txtInvisibleSignature": "디지털 서명을 추가",
"Common.Views.Protection.txtSignature": "서명",
"Common.Views.Protection.txtSignatureLine": "서명 라인",
- "Common.Views.RenameDialog.cancelButtonText": "취소",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "파일 이름",
"Common.Views.RenameDialog.txtInvalidName": "파일 이름에 다음 문자를 포함 할 수 없습니다 :",
"Common.Views.ReviewChanges.hintNext": "다음 변경 사항",
@@ -268,8 +253,6 @@
"Common.Views.ReviewChangesDialog.txtReject": "거부",
"Common.Views.ReviewChangesDialog.txtRejectAll": "모든 변경 사항 거부",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "현재 변경 거부",
- "Common.Views.SignDialog.cancelButtonText": "취소",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "볼드체",
"Common.Views.SignDialog.textCertificate": "인증",
"Common.Views.SignDialog.textChange": "변경",
@@ -284,8 +267,6 @@
"Common.Views.SignDialog.textValid": "%1에서 %2까지 유효",
"Common.Views.SignDialog.tipFontName": "폰트명",
"Common.Views.SignDialog.tipFontSize": "글꼴 크기",
- "Common.Views.SignSettingsDialog.cancelButtonText": "취소",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "서명 대화창에 서명자의 코멘트 추가 허용",
"Common.Views.SignSettingsDialog.textInfo": "서명자 정보",
"Common.Views.SignSettingsDialog.textInfoEmail": "이메일",
@@ -821,16 +802,12 @@
"DE.Views.ChartSettings.txtTight": "Tight",
"DE.Views.ChartSettings.txtTitle": "차트",
"DE.Views.ChartSettings.txtTopAndBottom": "상단 및 하단",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "취소",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textLock": "잠그기",
"DE.Views.ControlSettingsDialog.textName": "제목",
"DE.Views.ControlSettingsDialog.textTag": "꼬리표",
"DE.Views.ControlSettingsDialog.textTitle": "콘텐트 제어 세팅",
"DE.Views.ControlSettingsDialog.txtLockDelete": "콘텐트 제어가 삭제될 수 없슴",
"DE.Views.ControlSettingsDialog.txtLockEdit": "콘텐트가 편집될 수 없슴",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "취소",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "열 수",
"DE.Views.CustomColumnsDialog.textSeparator": "열 구분선",
"DE.Views.CustomColumnsDialog.textSpacing": "열 사이의 간격",
@@ -1024,8 +1001,6 @@
"DE.Views.DocumentHolder.txtUngroup": "그룹 해제",
"DE.Views.DocumentHolder.updateStyleText": "%1 스타일 업데이트",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "취소",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "테두리 및 채우기",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "드롭 캡",
"DE.Views.DropcapSettingsAdvanced.strMargins": "여백",
@@ -1178,8 +1153,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "왼쪽 상단",
"DE.Views.HeaderFooterSettings.textTopPage": "페이지 시작",
"DE.Views.HeaderFooterSettings.textTopRight": "오른쪽 상단",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "취소",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "선택한 텍스트 조각",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "표시",
"DE.Views.HyperlinkSettingsDialog.textExternal": "외부 링크",
@@ -1209,8 +1182,6 @@
"DE.Views.ImageSettings.txtThrough": "통해",
"DE.Views.ImageSettings.txtTight": "Tight",
"DE.Views.ImageSettings.txtTopAndBottom": "상단 및 하단",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "취소",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "텍스트 채우기",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolute",
"DE.Views.ImageSettingsAdvanced.textAlignment": "정렬",
@@ -1305,7 +1276,6 @@
"DE.Views.Links.tipContentsUpdate": "콘텐트 테이블 새로고침",
"DE.Views.Links.tipInsertHyperlink": "하이퍼 링크 추가",
"DE.Views.Links.tipNotes": "각주 삽입 또는 편집",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "취소",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "보내기",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "테마",
@@ -1366,7 +1336,6 @@
"DE.Views.Navigation.txtSelect": "콘텐트 선택",
"DE.Views.NoteSettingsDialog.textApply": "적용",
"DE.Views.NoteSettingsDialog.textApplyTo": "변경 사항 적용",
- "DE.Views.NoteSettingsDialog.textCancel": "취소",
"DE.Views.NoteSettingsDialog.textContinue": "연속",
"DE.Views.NoteSettingsDialog.textCustom": "사용자 정의 표시",
"DE.Views.NoteSettingsDialog.textDocument": "전체 문서",
@@ -1383,9 +1352,7 @@
"DE.Views.NoteSettingsDialog.textStart": "시작 시간",
"DE.Views.NoteSettingsDialog.textTextBottom": "텍스트 아래에",
"DE.Views.NoteSettingsDialog.textTitle": "메모 설정",
- "DE.Views.PageMarginsDialog.cancelButtonText": "취소",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "경고",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "왼쪽",
"DE.Views.PageMarginsDialog.textRight": "오른쪽",
@@ -1393,8 +1360,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "주어진 페이지 높이에 대해 위쪽 및 아래쪽 여백이 너무 높습니다.",
"DE.Views.PageMarginsDialog.txtMarginsW": "왼쪽 및 오른쪽 여백이 주어진 페이지 너비에 비해 너무 넓습니다.",
- "DE.Views.PageSizeDialog.cancelButtonText": "취소",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "높이",
"DE.Views.PageSizeDialog.textTitle": "페이지 크기",
"DE.Views.PageSizeDialog.textWidth": "너비",
@@ -1412,14 +1377,11 @@
"DE.Views.ParagraphSettings.textExact": "정확히",
"DE.Views.ParagraphSettings.textNewColor": "새 사용자 지정 색 추가",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "취소",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "지정된 탭이이 필드에 나타납니다",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "모든 대문자",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "테두리 및 채우기",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "전에 페이지 나누기",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "이중 취소 선",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "줄을 함께 유지",
@@ -1556,8 +1518,6 @@
"DE.Views.StyleTitleDialog.textTitle": "제목",
"DE.Views.StyleTitleDialog.txtEmpty": "이 입력란은 필수 항목",
"DE.Views.StyleTitleDialog.txtNotEmpty": "필드가 비어 있어서는 안됩니다.",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "취소",
- "DE.Views.TableOfContentsSettings.okButtonText": "확인",
"DE.Views.TableOfContentsSettings.strAlign": "오른쪽 정렬 페이지 번호",
"DE.Views.TableOfContentsSettings.strLinks": "콘텐츠 테이블을 포맷하세요",
"DE.Views.TableOfContentsSettings.strShowPages": "페이지 번호를 보여주세요",
@@ -1596,7 +1556,6 @@
"DE.Views.TableSettings.textBanded": "줄무늬",
"DE.Views.TableSettings.textBorderColor": "Color",
"DE.Views.TableSettings.textBorders": "테두리 스타일",
- "DE.Views.TableSettings.textCancel": "취소",
"DE.Views.TableSettings.textCellSize": "셀 크기",
"DE.Views.TableSettings.textColumns": "열",
"DE.Views.TableSettings.textDistributeCols": "컬럼 배포",
@@ -1608,7 +1567,6 @@
"DE.Views.TableSettings.textHeight": "높이",
"DE.Views.TableSettings.textLast": "Last",
"DE.Views.TableSettings.textNewColor": "새 사용자 지정 색 추가",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "행",
"DE.Views.TableSettings.textSelectBorders": "위에서 선택한 스타일 적용을 변경하려는 테두리 선택",
"DE.Views.TableSettings.textTemplate": "템플릿에서 선택",
@@ -1625,8 +1583,6 @@
"DE.Views.TableSettings.tipRight": "바깥 쪽 테두리 만 설정",
"DE.Views.TableSettings.tipTop": "바깥 쪽 테두리 만 설정",
"DE.Views.TableSettings.txtNoBorders": "테두리 없음",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "취소",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "정렬",
"DE.Views.TableSettingsAdvanced.textAlignment": "정렬",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "셀 사이의 간격",
diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json
index 7eaa4c94c..59f73caf2 100644
--- a/apps/documenteditor/main/locale/lv.json
+++ b/apps/documenteditor/main/locale/lv.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
"Common.UI.ComboDataView.emptyComboText": "No styles",
"Common.UI.ExtendedColorDialog.addButtonText": "Pievienot",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Atcelt",
"Common.UI.ExtendedColorDialog.textCurrent": "Current",
"Common.UI.ExtendedColorDialog.textHexErr": "The entered value is incorrect. Please enter a value between 000000 and FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "New",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Version ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Atcelt",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Sūtīt",
"Common.Views.Comments.textAdd": "Pievienot",
"Common.Views.Comments.textAddComment": "Pievienot",
@@ -163,13 +160,9 @@
"Common.Views.History.textRestore": "Atjaunot",
"Common.Views.History.textShow": "Izvērst",
"Common.Views.History.textShowAll": "Rādīt detalizētas izmaiņas",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Atcelt",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Ielīmēt attēla URL:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Šis lauks ir nepieciešams",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Šis lauks jābūt URL formātā \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Atcelt",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Jums jānorāda derīgo rindas un kolonnas skaitu.",
"Common.Views.InsertTableDialog.txtColumns": "Kolonnu skaits",
"Common.Views.InsertTableDialog.txtMaxText": "Maksimālā vērtība šajā jomā ir {0}.",
@@ -177,20 +170,14 @@
"Common.Views.InsertTableDialog.txtRows": "Rindu skaits",
"Common.Views.InsertTableDialog.txtTitle": "Tabulas izmērs",
"Common.Views.InsertTableDialog.txtTitleSplit": "Sadalīt šūnu",
- "Common.Views.LanguageDialog.btnCancel": "Atcelt",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Izvēlēties dokumenta valodu",
- "Common.Views.OpenDialog.cancelButtonText": "Cancel",
"Common.Views.OpenDialog.closeButtonText": "Aizvērt failu",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Parole nav pareiza.",
"Common.Views.OpenDialog.txtPassword": "Parole",
"Common.Views.OpenDialog.txtPreview": "Priekšskatījums",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtTitleProtected": "Aizsargāts fails",
- "Common.Views.PasswordDialog.cancelButtonText": "Atcelt",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Lai pasargātu šo dokumentu, uzstādiet paroli",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Apstiprinājuma parole nesakrīt",
"Common.Views.PasswordDialog.txtPassword": "Parole",
@@ -212,8 +199,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Pievienot digitālo parakstu",
"Common.Views.Protection.txtSignature": "Paraksts",
"Common.Views.Protection.txtSignatureLine": "Paraksta līnija",
- "Common.Views.RenameDialog.cancelButtonText": "Atcelt",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Faila nosaukums",
"Common.Views.RenameDialog.txtInvalidName": "Faila nosaukums nedrīkst saturēt šādas zīmes:",
"Common.Views.ReviewChanges.hintNext": "Uz nākamo izmaiņu",
@@ -265,8 +250,6 @@
"Common.Views.ReviewChangesDialog.txtReject": "Noraidīt",
"Common.Views.ReviewChangesDialog.txtRejectAll": "Noraidīt visas izmaiņas",
"Common.Views.ReviewChangesDialog.txtRejectCurrent": "Noraidīt šībrīža izmaiņu",
- "Common.Views.SignDialog.cancelButtonText": "Atcelt",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Treknraksts",
"Common.Views.SignDialog.textCertificate": "sertifikāts",
"Common.Views.SignDialog.textChange": "Izmainīt",
@@ -281,8 +264,6 @@
"Common.Views.SignDialog.textValid": "Derīgs no %1 līdz %2",
"Common.Views.SignDialog.tipFontName": "Fonts",
"Common.Views.SignDialog.tipFontSize": "Fonta izmērs",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Atcelt",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Atļaut parakstītājam pievienot komentāru paraksta logā",
"Common.Views.SignSettingsDialog.textInfo": "Informācija par parakstītāju",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-pasts",
@@ -818,16 +799,12 @@
"DE.Views.ChartSettings.txtTight": "Tight",
"DE.Views.ChartSettings.txtTitle": "Chart",
"DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Atcelt",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textLock": "Bloķēšana",
"DE.Views.ControlSettingsDialog.textName": "Nosaukums",
"DE.Views.ControlSettingsDialog.textTag": "Birka",
"DE.Views.ControlSettingsDialog.textTitle": "Satura kontroles uzstādījumi",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Satura kontrole nevar tikt dzēsta",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Saturu nevar rediģēt",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Atcelt",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Kolonnu skaits",
"DE.Views.CustomColumnsDialog.textSeparator": "Kolonnu sadalītājs",
"DE.Views.CustomColumnsDialog.textSpacing": "Atstarpe starp kolonnām",
@@ -1021,8 +998,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertikālā Līdzināšana",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
@@ -1175,8 +1150,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "augšā pa kreisi",
"DE.Views.HeaderFooterSettings.textTopPage": "Lappuses augšpuse",
"DE.Views.HeaderFooterSettings.textTopRight": "augšā pa labi",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Atcelt",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Atlasīts teksta fragments",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Radīt",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Ārējā saite",
@@ -1206,8 +1179,6 @@
"DE.Views.ImageSettings.txtThrough": "Through",
"DE.Views.ImageSettings.txtTight": "Tight",
"DE.Views.ImageSettings.txtTopAndBottom": "Top and bottom",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Atcelt",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Margins",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolūtā",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alignment",
@@ -1302,7 +1273,6 @@
"DE.Views.Links.tipContentsUpdate": "Atsvaidzināt satura rādītāju",
"DE.Views.Links.tipInsertHyperlink": "Pievienot hipersaiti",
"DE.Views.Links.tipNotes": "Ievietot vai rediģēt apakšējās piezīmes",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1363,7 +1333,6 @@
"DE.Views.Navigation.txtSelect": "Izvēlēties saturu",
"DE.Views.NoteSettingsDialog.textApply": "Piemērot",
"DE.Views.NoteSettingsDialog.textApplyTo": "Piemērot izmaiņas",
- "DE.Views.NoteSettingsDialog.textCancel": "Atcelt",
"DE.Views.NoteSettingsDialog.textContinue": "Nepārtraukts",
"DE.Views.NoteSettingsDialog.textCustom": "Pielāgotā zīme",
"DE.Views.NoteSettingsDialog.textDocument": "Viss dokuments",
@@ -1380,9 +1349,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Sākt ar",
"DE.Views.NoteSettingsDialog.textTextBottom": "Zem teksta",
"DE.Views.NoteSettingsDialog.textTitle": "Piezīmju uzstādījumi",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
- "DE.Views.PageMarginsDialog.okButtonText": "Ok",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1390,8 +1357,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
@@ -1409,14 +1374,11 @@
"DE.Views.ParagraphSettings.textExact": "Tieši",
"DE.Views.ParagraphSettings.textNewColor": "Pievienot jauno krāsu",
"DE.Views.ParagraphSettings.txtAutoText": "Auto",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Atcelt",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Apmales & Fons",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Lappuses pārtraukums pirms",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Pirma līnija",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Pa kreisi",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Pa labi",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Turēt līnijas kopā",
@@ -1553,8 +1515,6 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Atcelt",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Lappušu numuru labais izlīdzinājums",
"DE.Views.TableOfContentsSettings.strLinks": "Formatēt satura rādītāju kā saites",
"DE.Views.TableOfContentsSettings.strShowPages": "Rādīt lappušu numurus",
@@ -1593,7 +1553,6 @@
"DE.Views.TableSettings.textBanded": "Banded",
"DE.Views.TableSettings.textBorderColor": "Krāsa",
"DE.Views.TableSettings.textBorders": "Apmales stils",
- "DE.Views.TableSettings.textCancel": "Atcelt",
"DE.Views.TableSettings.textCellSize": "Šūnas izmērs",
"DE.Views.TableSettings.textColumns": "Columns",
"DE.Views.TableSettings.textDistributeCols": "Izplatīt kolonnas",
@@ -1605,7 +1564,6 @@
"DE.Views.TableSettings.textHeight": "Augstums",
"DE.Views.TableSettings.textLast": "Last",
"DE.Views.TableSettings.textNewColor": "Pievienot jauno krāsu",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Rows",
"DE.Views.TableSettings.textSelectBorders": "Apmales stilu piemerošanai",
"DE.Views.TableSettings.textTemplate": "Select From Template",
@@ -1622,8 +1580,6 @@
"DE.Views.TableSettings.tipRight": "Set Outer Right Border Only",
"DE.Views.TableSettings.tipTop": "Set Outer Top Border Only",
"DE.Views.TableSettings.txtNoBorders": "Nav apmales",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Atcelt",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Nolīdzināšana",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alignment",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Atļaut atstarpes starp šūnām",
diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json
index 5877b35b7..3932555fa 100644
--- a/apps/documenteditor/main/locale/nl.json
+++ b/apps/documenteditor/main/locale/nl.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen",
"Common.UI.ComboDataView.emptyComboText": "Geen stijlen",
"Common.UI.ExtendedColorDialog.addButtonText": "Toevoegen",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuleren",
"Common.UI.ExtendedColorDialog.textCurrent": "Huidig",
"Common.UI.ExtendedColorDialog.textHexErr": "De ingevoerde waarde is onjuist. Voer een waarde tussen 000000 en FFFFFF in.",
"Common.UI.ExtendedColorDialog.textNew": "Nieuw",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Aangedreven door",
"Common.Views.About.txtTel": "Tel.:",
"Common.Views.About.txtVersion": "Versie",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Annuleren",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Verzenden",
"Common.Views.Comments.textAdd": "Toevoegen",
"Common.Views.Comments.textAddComment": "Opmerking toevoegen",
@@ -172,13 +169,9 @@
"Common.Views.History.textRestore": "Herstellen",
"Common.Views.History.textShow": "Uitvouwen",
"Common.Views.History.textShowAll": "Details wijzigingen tonen",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuleren",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "URL van een afbeelding plakken:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Dit veld is vereist",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Dit veld moet een URL in de notatie \"http://www.voorbeeld.com\" bevatten",
- "Common.Views.InsertTableDialog.cancelButtonText": "Annuleren",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "u moet een geldig aantal rijen en kolommen opgeven.",
"Common.Views.InsertTableDialog.txtColumns": "Aantal kolommen",
"Common.Views.InsertTableDialog.txtMaxText": "De maximumwaarde voor dit veld is {0}.",
@@ -186,20 +179,14 @@
"Common.Views.InsertTableDialog.txtRows": "Aantal rijen",
"Common.Views.InsertTableDialog.txtTitle": "Tabelgrootte",
"Common.Views.InsertTableDialog.txtTitleSplit": "Cel Splitsen",
- "Common.Views.LanguageDialog.btnCancel": "Annuleren",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Taal van document selecteren",
- "Common.Views.OpenDialog.cancelButtonText": "Annuleren",
"Common.Views.OpenDialog.closeButtonText": "Bestand sluiten",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Versleuteling",
"Common.Views.OpenDialog.txtIncorrectPwd": "Wachtwoord is niet juist",
"Common.Views.OpenDialog.txtPassword": "Wachtwoord",
"Common.Views.OpenDialog.txtPreview": "Voorbeeld",
"Common.Views.OpenDialog.txtTitle": "Opties voor %1 kiezen",
"Common.Views.OpenDialog.txtTitleProtected": "Beschermd bestand",
- "Common.Views.PasswordDialog.cancelButtonText": "Annuleren",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Pas een wachtwoord toe om dit document te beveiligen",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Bevestig wachtwoord is niet identiek",
"Common.Views.PasswordDialog.txtPassword": "Wachtwoord",
@@ -221,8 +208,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Digitale handtekening toevoegen",
"Common.Views.Protection.txtSignature": "Handtekening",
"Common.Views.Protection.txtSignatureLine": "Handtekening lijn",
- "Common.Views.RenameDialog.cancelButtonText": "Annuleren",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Bestandsnaam",
"Common.Views.RenameDialog.txtInvalidName": "De bestandsnaam mag geen van de volgende tekens bevatten:",
"Common.Views.ReviewChanges.hintNext": "Naar Volgende Wijziging",
@@ -286,8 +271,6 @@
"Common.Views.SaveAsDlg.textTitle": "Map voor opslaan",
"Common.Views.SelectFileDlg.textLoading": "Laden",
"Common.Views.SelectFileDlg.textTitle": "Gegevensbron selecteren",
- "Common.Views.SignDialog.cancelButtonText": "Annuleren",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Vet",
"Common.Views.SignDialog.textCertificate": "Certificaat",
"Common.Views.SignDialog.textChange": "Wijzigen",
@@ -302,8 +285,6 @@
"Common.Views.SignDialog.textValid": "Geldig van %1 tot %2",
"Common.Views.SignDialog.tipFontName": "Lettertype",
"Common.Views.SignDialog.tipFontSize": "Tekengrootte",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Annuleren",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Sta ondertekenaar toe commentaar toe te voegen in het handtekening venster.",
"Common.Views.SignSettingsDialog.textInfo": "Ondertekenaar info",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -918,8 +899,6 @@
"DE.Views.ChartSettings.txtTight": "Strak",
"DE.Views.ChartSettings.txtTitle": "Grafiek",
"DE.Views.ChartSettings.txtTopAndBottom": "Boven en onder",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Annuleren",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Verschijning",
"DE.Views.ControlSettingsDialog.textApplyAll": "Op alles toepassen",
"DE.Views.ControlSettingsDialog.textColor": "Kleur",
@@ -933,8 +912,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Inhoud beheer instellingen",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Inhoud beheer kan niet verwijderd worden",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Inhoud kan niet aangepast worden",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Annuleren",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Aantal kolommen",
"DE.Views.CustomColumnsDialog.textSeparator": "Scheidingsmarkering kolommen",
"DE.Views.CustomColumnsDialog.textSpacing": "Afstand tussen kolommen",
@@ -1139,8 +1116,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Groepering opheffen",
"DE.Views.DocumentHolder.updateStyleText": "Stijl %1 bijwerken",
"DE.Views.DocumentHolder.vertAlignText": "Verticale uitlijning",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Annuleren",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Randen & opvulling",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Decoratieve initiaal",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Marges",
@@ -1295,8 +1270,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Linksboven",
"DE.Views.HeaderFooterSettings.textTopPage": "Bovenaan de pagina",
"DE.Views.HeaderFooterSettings.textTopRight": "Rechtsboven",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuleren",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Geselecteerd tekstfragment",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Weergeven",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Externe koppeling",
@@ -1335,8 +1308,6 @@
"DE.Views.ImageSettings.txtThrough": "Door",
"DE.Views.ImageSettings.txtTight": "Strak",
"DE.Views.ImageSettings.txtTopAndBottom": "Boven en onder",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Annuleren",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Opvulling van tekst",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluut",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Uitlijning",
@@ -1434,7 +1405,6 @@
"DE.Views.Links.tipContentsUpdate": "Inhoudsopgave verversen",
"DE.Views.Links.tipInsertHyperlink": "Hyperlink toevoegen",
"DE.Views.Links.tipNotes": "Voetnoten invoegen of bewerken",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Annuleren",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Verzenden",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Thema",
@@ -1495,7 +1465,6 @@
"DE.Views.Navigation.txtSelect": "Selecteer inhoud",
"DE.Views.NoteSettingsDialog.textApply": "Toepassen",
"DE.Views.NoteSettingsDialog.textApplyTo": "Wijzigingen toepassen op",
- "DE.Views.NoteSettingsDialog.textCancel": "Annuleren",
"DE.Views.NoteSettingsDialog.textContinue": "Doorlopend",
"DE.Views.NoteSettingsDialog.textCustom": "Aangepaste markering",
"DE.Views.NoteSettingsDialog.textDocument": "Hele document",
@@ -1512,11 +1481,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Beginnen bij",
"DE.Views.NoteSettingsDialog.textTextBottom": "Onder tekst",
"DE.Views.NoteSettingsDialog.textTitle": "Instellingen voor notities",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Annuleren",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Annuleren",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Waarschuwing",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Onder",
"DE.Views.PageMarginsDialog.textLeft": "Links",
"DE.Views.PageMarginsDialog.textRight": "Rechts",
@@ -1524,8 +1489,6 @@
"DE.Views.PageMarginsDialog.textTop": "Boven",
"DE.Views.PageMarginsDialog.txtMarginsH": "Boven- en ondermarges zijn te hoog voor de opgegeven paginahoogte",
"DE.Views.PageMarginsDialog.txtMarginsW": "Linker- en rechtermarge zijn te breed voor opgegeven paginabreedte",
- "DE.Views.PageSizeDialog.cancelButtonText": "Annuleren",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Hoogte",
"DE.Views.PageSizeDialog.textTitle": "Paginaformaat",
"DE.Views.PageSizeDialog.textWidth": "Breedte",
@@ -1543,14 +1506,11 @@
"DE.Views.ParagraphSettings.textExact": "Exact",
"DE.Views.ParagraphSettings.textNewColor": "Nieuwe aangepaste kleur toevoegen",
"DE.Views.ParagraphSettings.txtAutoText": "Automatisch",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Annuleren",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "De opgegeven tabbladen worden in dit veld weergegeven",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Allemaal hoofdletters",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Randen & opvulling",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Pagina-einde vóór",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dubbel doorhalen",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Eerste regel",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Links",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Rechts",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Regels bijeenhouden",
@@ -1692,12 +1652,8 @@
"DE.Views.StyleTitleDialog.textTitle": "Titel",
"DE.Views.StyleTitleDialog.txtEmpty": "Dit veld is vereist",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Veld mag niet leeg zijn",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Annuleren",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textFormula": "Formule",
"DE.Views.TableFormulaDialog.textTitle": "Formule instellingen",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Annuleren",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strAlign": "Paginanummers rechts uitlijnen",
"DE.Views.TableOfContentsSettings.strLinks": "Inhoudsopgave als link gebruiken",
"DE.Views.TableOfContentsSettings.strShowPages": "Toon paginanummers",
@@ -1737,7 +1693,6 @@
"DE.Views.TableSettings.textBanded": "Gestreept",
"DE.Views.TableSettings.textBorderColor": "Kleur",
"DE.Views.TableSettings.textBorders": "Randstijl",
- "DE.Views.TableSettings.textCancel": "Annuleren",
"DE.Views.TableSettings.textCellSize": "Celgrootte",
"DE.Views.TableSettings.textColumns": "Kolommen",
"DE.Views.TableSettings.textDistributeCols": "Kolommen verdelen",
@@ -1749,7 +1704,6 @@
"DE.Views.TableSettings.textHeight": "Hoogte",
"DE.Views.TableSettings.textLast": "Laatste",
"DE.Views.TableSettings.textNewColor": "Nieuwe aangepaste kleur toevoegen",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Rijen",
"DE.Views.TableSettings.textSelectBorders": "Selecteer de randen die u wilt wijzigen door de hierboven gekozen stijl toe te passen",
"DE.Views.TableSettings.textTemplate": "Selecteren uit sjabloon",
@@ -1766,8 +1720,6 @@
"DE.Views.TableSettings.tipRight": "Alleen buitenrand rechts instellen",
"DE.Views.TableSettings.tipTop": "Alleen buitenrand boven instellen",
"DE.Views.TableSettings.txtNoBorders": "Geen randen",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Annuleren",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Uitlijning",
"DE.Views.TableSettingsAdvanced.textAlignment": "Uitlijning",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Afstand tussen cellen",
diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json
index a2dc3d868..39dc4be3e 100644
--- a/apps/documenteditor/main/locale/pl.json
+++ b/apps/documenteditor/main/locale/pl.json
@@ -49,6 +49,9 @@
"Common.Controllers.ReviewChanges.textParaDeleted": "Usunięty akapit ",
"Common.Controllers.ReviewChanges.textParaFormatted": "Sformatowany akapit",
"Common.Controllers.ReviewChanges.textParaInserted": "Wstawiony akapit ",
+ "Common.Controllers.ReviewChanges.textParaMoveFromDown": "Przesunięto w dół: ",
+ "Common.Controllers.ReviewChanges.textParaMoveFromUp": "Przesunięto w górę: ",
+ "Common.Controllers.ReviewChanges.textParaMoveTo": "Przesunięto: ",
"Common.Controllers.ReviewChanges.textPosition": "Pozycja",
"Common.Controllers.ReviewChanges.textRight": "Wyrównaj do prawej",
"Common.Controllers.ReviewChanges.textShape": "Kształt",
@@ -60,6 +63,7 @@
"Common.Controllers.ReviewChanges.textStrikeout": "Skreślenie",
"Common.Controllers.ReviewChanges.textSubScript": "Indeks",
"Common.Controllers.ReviewChanges.textSuperScript": "Indeks górny",
+ "Common.Controllers.ReviewChanges.textTableChanged": "Ustawienia tabeli zmienione ",
"Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki",
"Common.Controllers.ReviewChanges.textUnderline": "Podkreśl",
"Common.Controllers.ReviewChanges.textWidow": "Kontrola okna",
@@ -67,7 +71,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi",
"Common.UI.ComboDataView.emptyComboText": "Brak styli",
"Common.UI.ExtendedColorDialog.addButtonText": "Dodaj",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Anuluj",
"Common.UI.ExtendedColorDialog.textCurrent": "Obecny",
"Common.UI.ExtendedColorDialog.textHexErr": "Wprowadzona wartość jest nieprawidłowa. Wprowadź wartość w zakresie od 000000 do FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nowy",
@@ -106,8 +109,6 @@
"Common.Views.About.txtPoweredBy": "zasilany przez",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Wersja",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Anuluj",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Wyślij",
"Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj komentarz",
@@ -150,6 +151,7 @@
"Common.Views.Header.tipDownload": "Pobierz plik",
"Common.Views.Header.tipGoEdit": "Edytuj bieżący plik",
"Common.Views.Header.tipPrint": "Drukuj plik",
+ "Common.Views.Header.tipViewSettings": "Wyświetl ustawienia",
"Common.Views.Header.tipViewUsers": "Wyświetl użytkowników i zarządzaj prawami dostępu do dokumentu",
"Common.Views.Header.txtAccessRights": "Zmień prawa dostępu",
"Common.Views.Header.txtRename": "Zmień nazwę",
@@ -159,13 +161,9 @@
"Common.Views.History.textRestore": "Przywróć",
"Common.Views.History.textShow": "Rozszerz",
"Common.Views.History.textShowAll": "Pokaż szczegółowe zmiany",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Anuluj",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Wklej link URL do obrazu:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "To pole jest wymagane",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "To pole powinno być adresem URL w formacie \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Anuluj",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Musisz podać liczby wierszy i kolumn.",
"Common.Views.InsertTableDialog.txtColumns": "Ilość kolumn",
"Common.Views.InsertTableDialog.txtMaxText": "Maksymalna wartość dla tego pola to {0}",
@@ -173,19 +171,15 @@
"Common.Views.InsertTableDialog.txtRows": "Liczba wierszy",
"Common.Views.InsertTableDialog.txtTitle": "Rozmiar tablicy",
"Common.Views.InsertTableDialog.txtTitleSplit": "Podziel komórkę",
- "Common.Views.LanguageDialog.btnCancel": "Anuluj",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Wybierz język dokumentu",
- "Common.Views.OpenDialog.cancelButtonText": "Anuluj",
"Common.Views.OpenDialog.closeButtonText": "Zamknij plik",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Kodowanie",
"Common.Views.OpenDialog.txtIncorrectPwd": "Hasło jest nieprawidłowe.",
"Common.Views.OpenDialog.txtPassword": "Hasło",
"Common.Views.OpenDialog.txtTitle": "Wybierz %1 opcji",
"Common.Views.OpenDialog.txtTitleProtected": "Plik chroniony",
- "Common.Views.PasswordDialog.cancelButtonText": "Anuluj",
- "Common.Views.PasswordDialog.okButtonText": "OK",
+ "Common.Views.PasswordDialog.txtDescription": "Ustaw hasło aby zabezpieczyć ten dokument",
+ "Common.Views.PasswordDialog.txtIncorrectPwd": "Hasła nie są takie same",
"Common.Views.PluginDlg.textLoading": "Ładowanie",
"Common.Views.Plugins.groupCaption": "Wtyczki",
"Common.Views.Plugins.strPlugins": "Wtyczki",
@@ -196,11 +190,10 @@
"Common.Views.Protection.hintPwd": "Zmień lub usuń hasło",
"Common.Views.Protection.txtAddPwd": "Dodaj hasło",
"Common.Views.Protection.txtChangePwd": "Zmień hasło",
+ "Common.Views.Protection.txtDeletePwd": "Usuń hasło",
"Common.Views.Protection.txtEncrypt": "Szyfruj",
"Common.Views.Protection.txtInvisibleSignature": "Dodaj podpis cyfrowy",
"Common.Views.Protection.txtSignatureLine": "Dodaj linię do podpisu",
- "Common.Views.RenameDialog.cancelButtonText": "Anuluj",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Nazwa pliku",
"Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:",
"Common.Views.ReviewChanges.hintNext": "Do następnej zmiany",
@@ -222,6 +215,7 @@
"Common.Views.ReviewChanges.txtCoAuthMode": "Tryb współtworzenia",
"Common.Views.ReviewChanges.txtDocLang": "Język",
"Common.Views.ReviewChanges.txtFinal": "Wszystkie zmiany zostały zaakceptowane (podgląd)",
+ "Common.Views.ReviewChanges.txtHistory": "Historia wersji",
"Common.Views.ReviewChanges.txtMarkup": "Wszystkie zmiany (edycja)",
"Common.Views.ReviewChanges.txtNext": "Do następnej zmiany",
"Common.Views.ReviewChanges.txtOriginal": "Wszystkie zmiany odrzucone (podgląd)",
@@ -247,14 +241,13 @@
"Common.Views.ReviewPopover.textCancel": "Anuluj",
"Common.Views.ReviewPopover.textClose": "Zamknij",
"Common.Views.ReviewPopover.textEdit": "OK",
- "Common.Views.SignDialog.cancelButtonText": "Anuluj",
- "Common.Views.SignDialog.okButtonText": "OK",
+ "Common.Views.ReviewPopover.textResolve": "Rozwiąż",
"Common.Views.SignDialog.textBold": "Pogrubienie",
+ "Common.Views.SignDialog.textCertificate": "Certyfikat",
"Common.Views.SignDialog.textChange": "Zmień",
"Common.Views.SignDialog.textItalic": "Kursywa",
+ "Common.Views.SignDialog.textPurpose": "Cel podpisywania tego dokumentu",
"Common.Views.SignDialog.textTitle": "Podpisz dokument",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Anuluj",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
"Common.Views.SignSettingsDialog.textShowDate": "Pokaż datę wykonania podpisu",
"DE.Controllers.LeftMenu.leavePageText": "Wszystkie niezapisane zmiany w tym dokumencie zostaną utracone. Kliknij przycisk \"Anuluj\", a następnie \"Zapisz\", aby je zapisać. Kliknij \"OK\", aby usunąć wszystkie niezapisane zmiany.",
@@ -360,6 +353,8 @@
"DE.Controllers.Main.txtFiguredArrows": "Strzałki",
"DE.Controllers.Main.txtFirstPage": "Pierwsza strona",
"DE.Controllers.Main.txtFooter": "Stopka",
+ "DE.Controllers.Main.txtHeader": "Nagłówek",
+ "DE.Controllers.Main.txtHyperlink": "Link",
"DE.Controllers.Main.txtLines": "Linie",
"DE.Controllers.Main.txtMath": "Matematyczne",
"DE.Controllers.Main.txtNeedSynchronize": "Masz aktualizacje",
@@ -397,6 +392,7 @@
"DE.Controllers.Main.txtShape_star7": "Gwiazda 7-ramienna",
"DE.Controllers.Main.txtShape_star8": "Gwiazda 8-ramienna",
"DE.Controllers.Main.txtStarsRibbons": "Gwiazdy i wstążki",
+ "DE.Controllers.Main.txtStyle_footnote_text": "Przypis",
"DE.Controllers.Main.txtStyle_Heading_1": "Nagłówek 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Nagłówek 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Nagłówek 3",
@@ -804,16 +800,14 @@
"DE.Views.ChartSettings.txtTight": "szczelnie",
"DE.Views.ChartSettings.txtTitle": "Wykres",
"DE.Views.ChartSettings.txtTopAndBottom": "Góra i dół",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Anuluj",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textAppearance": "Wygląd",
"DE.Views.ControlSettingsDialog.textApplyAll": "Zastosuj wszędzie",
"DE.Views.ControlSettingsDialog.textColor": "Kolor",
"DE.Views.ControlSettingsDialog.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.ControlSettingsDialog.textNone": "Brak",
"DE.Views.ControlSettingsDialog.textShowAs": "Pokaż jako",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Anuluj",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
+ "DE.Views.ControlSettingsDialog.textTitle": "Ustawienia kontroli treści",
+ "DE.Views.ControlSettingsDialog.txtLockDelete": "Nie można usunąć kontroli treści",
"DE.Views.CustomColumnsDialog.textColumns": "Ilość kolumn",
"DE.Views.CustomColumnsDialog.textSeparator": "Podział kolumn",
"DE.Views.CustomColumnsDialog.textSpacing": "Przerwa między kolumnami",
@@ -827,6 +821,7 @@
"DE.Views.DocumentHolder.alignmentText": "Wyrównanie",
"DE.Views.DocumentHolder.belowText": "Poniżej",
"DE.Views.DocumentHolder.breakBeforeText": "Przerwanie strony przed",
+ "DE.Views.DocumentHolder.bulletsText": "Punktory i numeracja",
"DE.Views.DocumentHolder.cellAlignText": "Wyrównanie pionowe komórki",
"DE.Views.DocumentHolder.cellText": "Komórka",
"DE.Views.DocumentHolder.centerText": "Środek",
@@ -843,9 +838,9 @@
"DE.Views.DocumentHolder.editChartText": "Edytuj dane",
"DE.Views.DocumentHolder.editFooterText": "Edytuj stopkę",
"DE.Views.DocumentHolder.editHeaderText": "Edytuj nagłówek",
- "DE.Views.DocumentHolder.editHyperlinkText": "Edytuj hiperlink",
+ "DE.Views.DocumentHolder.editHyperlinkText": "Edytuj link",
"DE.Views.DocumentHolder.guestText": "Gość",
- "DE.Views.DocumentHolder.hyperlinkText": "Hiperlink",
+ "DE.Views.DocumentHolder.hyperlinkText": "Link",
"DE.Views.DocumentHolder.ignoreAllSpellText": "Ignoruj wszystko",
"DE.Views.DocumentHolder.ignoreSpellText": "Ignoruj",
"DE.Views.DocumentHolder.imageText": "Zaawansowane ustawienia obrazu",
@@ -865,7 +860,7 @@
"DE.Views.DocumentHolder.noSpellVariantsText": "Brak wariantów",
"DE.Views.DocumentHolder.originalSizeText": "Domyślny rozmiar",
"DE.Views.DocumentHolder.paragraphText": "Akapit",
- "DE.Views.DocumentHolder.removeHyperlinkText": "Usuń hiperlink",
+ "DE.Views.DocumentHolder.removeHyperlinkText": "Usuń link",
"DE.Views.DocumentHolder.rightText": "Prawy",
"DE.Views.DocumentHolder.rowText": "Wiersz",
"DE.Views.DocumentHolder.saveStyleText": "Utwórz nowy styl",
@@ -878,6 +873,7 @@
"DE.Views.DocumentHolder.spellcheckText": "Sprawdzanie pisowni",
"DE.Views.DocumentHolder.splitCellsText": "Podziel komórkę...",
"DE.Views.DocumentHolder.splitCellTitleText": "Podziel komórkę",
+ "DE.Views.DocumentHolder.strDelete": "Usuń podpis",
"DE.Views.DocumentHolder.styleText": "Formatowanie jako Styl",
"DE.Views.DocumentHolder.tableText": "Tabela",
"DE.Views.DocumentHolder.textAlign": "Wyrównaj",
@@ -886,16 +882,22 @@
"DE.Views.DocumentHolder.textArrangeBackward": "Przenieś do tyłu",
"DE.Views.DocumentHolder.textArrangeForward": "Przenieś do przodu",
"DE.Views.DocumentHolder.textArrangeFront": "Przejdź na pierwszy plan",
+ "DE.Views.DocumentHolder.textContentControls": "Kontrola treści",
"DE.Views.DocumentHolder.textCopy": "Kopiuj",
"DE.Views.DocumentHolder.textCrop": "Przytnij",
"DE.Views.DocumentHolder.textCropFill": "Wypełnij",
"DE.Views.DocumentHolder.textCut": "Wytnij",
+ "DE.Views.DocumentHolder.textEditControls": "Ustawienia kontroli treści",
"DE.Views.DocumentHolder.textEditWrapBoundary": "Edytuj granicę owinięcia",
"DE.Views.DocumentHolder.textFlipH": "Odwróć w poziomie",
"DE.Views.DocumentHolder.textFlipV": "Odwróć w pionie",
"DE.Views.DocumentHolder.textNextPage": "Następna strona",
"DE.Views.DocumentHolder.textPaste": "Wklej",
"DE.Views.DocumentHolder.textPrevPage": "Poprzednia strona",
+ "DE.Views.DocumentHolder.textRefreshField": "Odśwież pole",
+ "DE.Views.DocumentHolder.textRemove": "Usuń",
+ "DE.Views.DocumentHolder.textRemoveControl": "Usuń kontrolę treści",
+ "DE.Views.DocumentHolder.textSettings": "Ustawienia",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Wyrównaj do dołu",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Wyrównaj do środka",
"DE.Views.DocumentHolder.textShapeAlignLeft": "Wyrównaj do lewej",
@@ -903,9 +905,14 @@
"DE.Views.DocumentHolder.textShapeAlignRight": "Wyrównaj do prawej",
"DE.Views.DocumentHolder.textShapeAlignTop": "Wyrównaj do góry",
"DE.Views.DocumentHolder.textTOC": "Spis treści",
+ "DE.Views.DocumentHolder.textTOCSettings": "Ustawienia tabeli zawartości",
"DE.Views.DocumentHolder.textUndo": "Cofnij",
+ "DE.Views.DocumentHolder.textUpdateAll": "Odśwież całą tabelę",
+ "DE.Views.DocumentHolder.textUpdatePages": "Odśwież wyłącznie numery stron",
+ "DE.Views.DocumentHolder.textUpdateTOC": "Odśwież tabelę zawartości",
"DE.Views.DocumentHolder.textWrap": "Styl zawijania",
"DE.Views.DocumentHolder.tipIsLocked": "Ten element jest obecnie edytowany przez innego użytkownika.",
+ "DE.Views.DocumentHolder.toDictionaryText": "Dodaj do słownika",
"DE.Views.DocumentHolder.txtAddBottom": "Dodaj dolną krawędź",
"DE.Views.DocumentHolder.txtAddFractionBar": "Dadaj pasek ułamka",
"DE.Views.DocumentHolder.txtAddHor": "Dodaj poziomą linie",
@@ -989,8 +996,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Rozgrupuj",
"DE.Views.DocumentHolder.updateStyleText": "Aktualizuj %1 styl",
"DE.Views.DocumentHolder.vertAlignText": "Wyrównaj pionowo",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Anuluj",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Obramowania i wypełnienie",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Inicjały",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Marginesy",
@@ -1060,6 +1065,8 @@
"DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikacja",
"DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
"DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu",
+ "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Komentarz",
+ "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Utworzono",
"DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ładowanie...",
"DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strony",
"DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Akapity",
@@ -1075,6 +1082,8 @@
"DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Ostrzeżenie",
"DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edytuj dokument",
"DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?",
+ "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Ten dokument został zabezpieczony hasłem",
+ "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Ten dokument musi zostać podpisany.",
"DE.Views.FileMenuPanels.Settings.okButtonText": "Zatwierdź",
"DE.Views.FileMenuPanels.Settings.strAlignGuides": "Włącz prowadnice wyrównania",
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "Włącz auto odzyskiwanie",
@@ -1100,6 +1109,7 @@
"DE.Views.FileMenuPanels.Settings.textAlignGuides": "Porady wyrównania",
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Automatyczne odzyskiwanie",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatyczny zapis",
+ "DE.Views.FileMenuPanels.Settings.textCompatible": "Kompatybilność",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Wyłączony",
"DE.Views.FileMenuPanels.Settings.textForceSave": "Zapisz na serwer",
"DE.Views.FileMenuPanels.Settings.textMinute": "Każda minuta",
@@ -1132,11 +1142,10 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Górny środek",
"DE.Views.HeaderFooterSettings.textTopLeft": "Lewy górny",
"DE.Views.HeaderFooterSettings.textTopRight": "Prawy górny",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Anuluj",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Wybrany fragment tekstu",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Pokaż",
- "DE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia hiperlinku",
+ "DE.Views.HyperlinkSettingsDialog.textExternal": "Link zewnętrzny",
+ "DE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia linków",
"DE.Views.HyperlinkSettingsDialog.textTooltip": "Tekst wskazówki na ekranie",
"DE.Views.HyperlinkSettingsDialog.textUrl": "Link do",
"DE.Views.HyperlinkSettingsDialog.txtBeginning": "Początek dokumentu",
@@ -1166,8 +1175,6 @@
"DE.Views.ImageSettings.txtThrough": "Przez",
"DE.Views.ImageSettings.txtTight": "szczelnie",
"DE.Views.ImageSettings.txtTopAndBottom": "Góra i dół",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Anuluj",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Wypełnienie tekstem",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Bezwzględny",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Wyrównanie",
@@ -1239,18 +1246,30 @@
"DE.Views.LeftMenu.tipAbout": "O programie",
"DE.Views.LeftMenu.tipChat": "Czat",
"DE.Views.LeftMenu.tipComments": "Komentarze",
+ "DE.Views.LeftMenu.tipNavigation": "Nawigacja",
"DE.Views.LeftMenu.tipPlugins": "Wtyczki",
"DE.Views.LeftMenu.tipSearch": "Szukaj",
"DE.Views.LeftMenu.tipSupport": "Opinie i wsparcie",
"DE.Views.LeftMenu.tipTitles": "Tytuły",
"DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA",
"DE.Views.Links.capBtnBookmarks": "Zakładka",
+ "DE.Views.Links.capBtnContentsUpdate": "Odśwież",
"DE.Views.Links.capBtnInsContents": "Spis treści",
+ "DE.Views.Links.capBtnInsFootnote": "Przypis",
+ "DE.Views.Links.capBtnInsLink": "Link",
+ "DE.Views.Links.confirmDeleteFootnotes": "Czy chcesz usunąć wszystkie przypisy?",
+ "DE.Views.Links.mniDelFootnote": "Usuń wszystkie przypisy",
"DE.Views.Links.mniInsFootnote": "Wstaw przypis",
+ "DE.Views.Links.mniNoteSettings": "Ustawienia notatek",
+ "DE.Views.Links.textContentsRemove": "Usuń tabelę zawartości",
+ "DE.Views.Links.textContentsSettings": "Ustawienia",
+ "DE.Views.Links.textGotoFootnote": "Idź do przypisów",
+ "DE.Views.Links.textUpdateAll": "Odśwież całą tabelę",
+ "DE.Views.Links.textUpdatePages": "Odśwież wyłącznie numery stron",
"DE.Views.Links.tipBookmarks": "Utwórz zakładkę",
- "DE.Views.Links.tipInsertHyperlink": "Dodaj hiperłącze",
+ "DE.Views.Links.tipContentsUpdate": "Odśwież tabelę zawartości",
+ "DE.Views.Links.tipInsertHyperlink": "Dodaj link",
"DE.Views.Links.tipNotes": "Wstawianie lub edytowanie przypisów",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Anuluj",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Wyślij",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Motyw",
@@ -1299,10 +1318,10 @@
"DE.Views.MailMergeSettings.txtUntitled": "Niezatytułowany",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Rozpoczęcie scalania nie powiodło się",
"DE.Views.Navigation.txtCollapse": "Zwiń wszystko",
+ "DE.Views.Navigation.txtEmpty": "Ten dokument nie zawiera nagłówków",
"DE.Views.Navigation.txtExpand": "Rozwiń wszystko",
"DE.Views.NoteSettingsDialog.textApply": "Zatwierdź",
"DE.Views.NoteSettingsDialog.textApplyTo": "Zatwierdź zmiany do",
- "DE.Views.NoteSettingsDialog.textCancel": "Anuluj",
"DE.Views.NoteSettingsDialog.textContinue": "Ciągły",
"DE.Views.NoteSettingsDialog.textCustom": "Znak niestandardowy",
"DE.Views.NoteSettingsDialog.textDocument": "Cały dokument",
@@ -1319,11 +1338,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Zacznij w",
"DE.Views.NoteSettingsDialog.textTextBottom": "Poniżej tekstu",
"DE.Views.NoteSettingsDialog.textTitle": "Ustawienia notatek",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Anuluj",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Anuluj",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Ostrzeżenie",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Dół",
"DE.Views.PageMarginsDialog.textLeft": "Lewy",
"DE.Views.PageMarginsDialog.textRight": "Prawy",
@@ -1331,8 +1346,6 @@
"DE.Views.PageMarginsDialog.textTop": "Góra",
"DE.Views.PageMarginsDialog.txtMarginsH": "Górne i dolne marginesy są za wysokie dla danej wysokości strony",
"DE.Views.PageMarginsDialog.txtMarginsW": "Lewe i prawe marginesy są zbyt szerokie dla danej szerokości strony",
- "DE.Views.PageSizeDialog.cancelButtonText": "Anuluj",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Wysokość",
"DE.Views.PageSizeDialog.textTitle": "Rozmiar strony",
"DE.Views.PageSizeDialog.textWidth": "Szerokość",
@@ -1350,16 +1363,15 @@
"DE.Views.ParagraphSettings.textExact": "Dokładnie",
"DE.Views.ParagraphSettings.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.ParagraphSettings.txtAutoText": "Automatyczny",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Anuluj",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "W tym polu zostaną wyświetlone określone karty",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Wszystkie duże litery",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Obramowania i wypełnienie",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Przerwanie strony przed",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Podwójne przekreślenie",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Pierwszy wiersz",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Prawy",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "po",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Przed",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Trzymaj wiersze razem",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Trzymaj dalej",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Wewnętrzne pola",
@@ -1368,22 +1380,26 @@
"DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Wcięcia i miejsca docelowe",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Umieszczenie",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Małe litery",
+ "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu",
"DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślony",
"DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks",
"DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Indeks górny",
"DE.Views.ParagraphSettingsAdvanced.strTabs": "Karta",
"DE.Views.ParagraphSettingsAdvanced.textAlign": "Wyrównanie",
+ "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Co najmniej",
"DE.Views.ParagraphSettingsAdvanced.textBackColor": "Kolor tła",
"DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Kolor obramowania",
"DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Kliknij na diagram lub użyj przycisków, aby wybrać granice i zastosuj do nich wybrany styl",
"DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Rozmiar obramowania",
"DE.Views.ParagraphSettingsAdvanced.textBottom": "Dół",
+ "DE.Views.ParagraphSettingsAdvanced.textCentered": "Wyśrodkowane",
"DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Rozstaw znaków",
"DE.Views.ParagraphSettingsAdvanced.textDefault": "Domyślna zakładka",
"DE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty",
"DE.Views.ParagraphSettingsAdvanced.textLeft": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.ParagraphSettingsAdvanced.textNone": "Brak",
+ "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(brak)",
"DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozycja",
"DE.Views.ParagraphSettingsAdvanced.textRemove": "Usuń",
"DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Usuń wszystko",
@@ -1404,6 +1420,7 @@
"DE.Views.ParagraphSettingsAdvanced.tipOuter": "Ustaw tylko obramowanie zewnętrzne",
"DE.Views.ParagraphSettingsAdvanced.tipRight": "Ustaw tylko obramowanie prawej krawędzi",
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Ustaw tylko górną krawędź",
+ "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatyczny",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Bez krawędzi",
"DE.Views.RightMenu.txtChartSettings": "Ustawienia wykresu",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Ustawienia nagłówka i stopki",
@@ -1411,6 +1428,7 @@
"DE.Views.RightMenu.txtMailMergeSettings": "Ustawienia korespondencji seryjnej",
"DE.Views.RightMenu.txtParagraphSettings": "Ustawienia akapitu",
"DE.Views.RightMenu.txtShapeSettings": "Ustawienia kształtu",
+ "DE.Views.RightMenu.txtSignatureSettings": "Ustawienia podpisów",
"DE.Views.RightMenu.txtTableSettings": "Ustawienia tabeli",
"DE.Views.RightMenu.txtTextArtSettings": "Ustawienia tekstu",
"DE.Views.ShapeSettings.strBackground": "Kolor tła",
@@ -1466,8 +1484,10 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Góra i dół",
"DE.Views.ShapeSettings.txtWood": "Drewno",
"DE.Views.SignatureSettings.notcriticalErrorTitle": "Ostrzeżenie",
+ "DE.Views.SignatureSettings.strDelete": "Usuń podpis",
"DE.Views.SignatureSettings.txtContinueEditing": "Edytuj mimo wszystko",
"DE.Views.SignatureSettings.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?",
+ "DE.Views.SignatureSettings.txtRequestedSignatures": "Ten dokument musi zostać podpisany.",
"DE.Views.Statusbar.goToPageText": "Idź do strony",
"DE.Views.Statusbar.pageIndexText": "Strona {0} z {1}",
"DE.Views.Statusbar.tipFitPage": "Dopasuj do strony",
@@ -1482,11 +1502,8 @@
"DE.Views.StyleTitleDialog.textTitle": "Tytuł",
"DE.Views.StyleTitleDialog.txtEmpty": "To pole jest wymagane",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Pole nie może być puste",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Anuluj",
- "DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textInsertFunction": "Wklej funkcję",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Anuluj",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
+ "DE.Views.TableFormulaDialog.textTitle": "Ustawienia formuł",
"DE.Views.TableOfContentsSettings.strShowPages": "Pokaż numery stron",
"DE.Views.TableOfContentsSettings.textNone": "Brak",
"DE.Views.TableOfContentsSettings.textStyle": "Styl",
@@ -1514,7 +1531,6 @@
"DE.Views.TableSettings.textBanded": "Na przemian",
"DE.Views.TableSettings.textBorderColor": "Kolor",
"DE.Views.TableSettings.textBorders": "Style obramowań",
- "DE.Views.TableSettings.textCancel": "Anuluj",
"DE.Views.TableSettings.textCellSize": "Rozmiar komórki",
"DE.Views.TableSettings.textColumns": "Kolumny",
"DE.Views.TableSettings.textEdit": "Wiersze i Kolumny",
@@ -1523,7 +1539,6 @@
"DE.Views.TableSettings.textHeader": "Nagłówek",
"DE.Views.TableSettings.textLast": "Ostatni",
"DE.Views.TableSettings.textNewColor": "Nowy niestandardowy kolor",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Wiersze",
"DE.Views.TableSettings.textSelectBorders": "Wybierz obramowania, które chcesz zmienić stosując styl wybrany powyżej",
"DE.Views.TableSettings.textTemplate": "Wybierz z szablonu",
@@ -1539,8 +1554,6 @@
"DE.Views.TableSettings.tipRight": "Ustaw tylko obramowanie prawej krawędzi",
"DE.Views.TableSettings.tipTop": "Ustaw tylko obramowanie górnej krawędzi",
"DE.Views.TableSettings.txtNoBorders": "Bez krawędzi",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Anuluj",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Wyrównanie",
"DE.Views.TableSettingsAdvanced.textAlignment": "Wyrównanie",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Rozstaw między komórkami",
@@ -1661,6 +1674,7 @@
"DE.Views.Toolbar.mniEditHeader": "Edytuj nagłówek",
"DE.Views.Toolbar.mniHiddenBorders": "Ukryte obramowanie tabeli",
"DE.Views.Toolbar.mniHiddenChars": "Znaki niedrukowane",
+ "DE.Views.Toolbar.mniHighlightControls": "Ustawienia wyróżniania",
"DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku",
"DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL",
"DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia",
@@ -1678,6 +1692,7 @@
"DE.Views.Toolbar.textColumnsThree": "Trzy",
"DE.Views.Toolbar.textColumnsTwo": "Dwa",
"DE.Views.Toolbar.textContPage": "Ciągła strona",
+ "DE.Views.Toolbar.textEditWatermark": "Własny znak wodny",
"DE.Views.Toolbar.textEvenPage": "Z parzystej strony",
"DE.Views.Toolbar.textInMargin": "W marginesie",
"DE.Views.Toolbar.textInsColumnBreak": "Wstaw podział kolumny",
@@ -1698,6 +1713,7 @@
"DE.Views.Toolbar.textMarginsWide": "Szeroki",
"DE.Views.Toolbar.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.Toolbar.textNextPage": "Następna strona",
+ "DE.Views.Toolbar.textNoHighlight": "Brak wyróżnienia",
"DE.Views.Toolbar.textNone": "Żaden",
"DE.Views.Toolbar.textOddPage": "Nieparzysta strona",
"DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy",
@@ -1705,6 +1721,8 @@
"DE.Views.Toolbar.textPie": "Kołowe",
"DE.Views.Toolbar.textPoint": "XY (Punktowy)",
"DE.Views.Toolbar.textPortrait": "Portret",
+ "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści",
+ "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny",
"DE.Views.Toolbar.textRight": "Prawo:",
"DE.Views.Toolbar.textStock": "Zbiory",
"DE.Views.Toolbar.textStrikeout": "Skreślenie",
@@ -1783,7 +1801,10 @@
"DE.Views.Toolbar.tipShowHiddenChars": "Znaki niedrukowane",
"DE.Views.Toolbar.tipSynchronize": "Dokument został zmieniony przez innego użytkownika. Kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.",
"DE.Views.Toolbar.tipUndo": "Cofnij",
+ "DE.Views.Toolbar.tipWatermark": "Edytuj znak wodny",
+ "DE.Views.Toolbar.txtMarginAlign": "Wyrównaj do marginesów",
"DE.Views.Toolbar.txtObjectsAlign": "Wyrównaj zaznaczone obiekty",
+ "DE.Views.Toolbar.txtPageAlign": "Wyrównaj do strony",
"DE.Views.Toolbar.txtScheme1": "Biuro",
"DE.Views.Toolbar.txtScheme10": "Mediana",
"DE.Views.Toolbar.txtScheme11": "Metro",
@@ -1805,5 +1826,8 @@
"DE.Views.Toolbar.txtScheme7": "Kapitał",
"DE.Views.Toolbar.txtScheme8": "Przepływ",
"DE.Views.Toolbar.txtScheme9": "Odlewnia",
- "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor"
+ "DE.Views.WatermarkSettingsDialog.textAuto": "Automatyczny",
+ "DE.Views.WatermarkSettingsDialog.textBold": "Pogrubienie",
+ "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor",
+ "DE.Views.WatermarkSettingsDialog.textTitle": "Ustawienia znaków wodnych"
}
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json
index e844f522e..0f19f069c 100644
--- a/apps/documenteditor/main/locale/pt.json
+++ b/apps/documenteditor/main/locale/pt.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas",
"Common.UI.ComboDataView.emptyComboText": "Sem estilos",
"Common.UI.ExtendedColorDialog.addButtonText": "Adicionar",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Cancelar",
"Common.UI.ExtendedColorDialog.textCurrent": "Atual",
"Common.UI.ExtendedColorDialog.textHexErr": "O valor inserido está incorreto. Insira um valor entre 000000 e FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Novo",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Desenvolvido por",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Versão",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Cancelar",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Enviar",
"Common.Views.Comments.textAdd": "Adicionar",
"Common.Views.Comments.textAddComment": "Adicionar",
@@ -158,13 +155,9 @@
"Common.Views.History.textRestore": "Restaurar",
"Common.Views.History.textShow": "Expandir",
"Common.Views.History.textShowAll": "Mostrar alterações detalhadas",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancelar",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Colar uma URL de imagem:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo é obrigatório",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo deve ser uma URL no formato \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Cancelar",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Você precisa especificar a contagem de linhas e colunas válida.",
"Common.Views.InsertTableDialog.txtColumns": "Número de colunas",
"Common.Views.InsertTableDialog.txtMaxText": "O valor máximo para este campo é {0}.",
@@ -172,12 +165,8 @@
"Common.Views.InsertTableDialog.txtRows": "Número de linhas",
"Common.Views.InsertTableDialog.txtTitle": "Tamanho da tabela",
"Common.Views.InsertTableDialog.txtTitleSplit": "Dividir célula",
- "Common.Views.LanguageDialog.btnCancel": "Cancelar",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Selecionar idioma do documento",
- "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
"Common.Views.OpenDialog.closeButtonText": "Fechar Arquivo",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Senha incorreta.",
"Common.Views.OpenDialog.txtPassword": "Senha",
@@ -200,8 +189,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Inserir assinatura digital",
"Common.Views.Protection.txtSignature": "Assinatura",
"Common.Views.Protection.txtSignatureLine": "Linha de assinatura",
- "Common.Views.RenameDialog.cancelButtonText": "Cancelar",
- "Common.Views.RenameDialog.okButtonText": "Aceitar",
"Common.Views.RenameDialog.textName": "Nome de arquivo",
"Common.Views.RenameDialog.txtInvalidName": "Nome de arquivo não pode conter os seguintes caracteres:",
"Common.Views.ReviewChanges.hintNext": "Para a próxima alteração",
@@ -788,8 +775,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Propriedades do controle de conteúdo",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Controle de Conteúdo não pode ser excluído",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Conteúdo não pode ser editado",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Cancelar",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Número de colunas",
"DE.Views.CustomColumnsDialog.textSeparator": "Divisor de coluna",
"DE.Views.CustomColumnsDialog.textSpacing": "Espaçamento entre colunas",
@@ -973,8 +958,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Desagrupar",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Alinhamento vertical",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Bordas e preenchimento",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Letra capitular",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margens",
@@ -1123,8 +1106,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Superior esquerdo",
"DE.Views.HeaderFooterSettings.textTopPage": "Topo da Página",
"DE.Views.HeaderFooterSettings.textTopRight": "Superior direito",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmento de texto selecionado",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Exibir",
"DE.Views.HyperlinkSettingsDialog.textInternal": "Colocar no Documento",
@@ -1154,8 +1135,6 @@
"DE.Views.ImageSettings.txtThrough": "Através",
"DE.Views.ImageSettings.txtTight": "Justo",
"DE.Views.ImageSettings.txtTopAndBottom": "Parte superior e inferior",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Preenchimento de texto",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absoluto",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Alinhamento",
@@ -1241,7 +1220,6 @@
"DE.Views.Links.tipBookmarks": "Criar Favorito",
"DE.Views.Links.tipContents": "Inserir tabela de conteúdo",
"DE.Views.Links.tipContentsUpdate": "Atualizar a tabela de conteúdo",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancelar",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1300,7 +1278,6 @@
"DE.Views.Navigation.txtSelect": "Selecionar conteúdo",
"DE.Views.NoteSettingsDialog.textApply": "Aplicar",
"DE.Views.NoteSettingsDialog.textApplyTo": "Aplicar alterações a",
- "DE.Views.NoteSettingsDialog.textCancel": "Cancelar",
"DE.Views.NoteSettingsDialog.textContinue": "Contínua",
"DE.Views.NoteSettingsDialog.textCustom": "Marca personalizada",
"DE.Views.NoteSettingsDialog.textDocument": "Documento inteiro",
@@ -1317,9 +1294,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Começar em",
"DE.Views.NoteSettingsDialog.textTextBottom": "Abaixo do texto",
"DE.Views.NoteSettingsDialog.textTitle": "Definições de Notas",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancelar",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Aviso",
- "DE.Views.PageMarginsDialog.okButtonText": "Aceitar",
"DE.Views.PageMarginsDialog.textBottom": "Inferior",
"DE.Views.PageMarginsDialog.textLeft": "Esquerda",
"DE.Views.PageMarginsDialog.textRight": "Direita",
@@ -1327,8 +1302,6 @@
"DE.Views.PageMarginsDialog.textTop": "Parte superior",
"DE.Views.PageMarginsDialog.txtMarginsH": "Margens superior e inferior são muito altas para uma determinada altura da página",
"DE.Views.PageMarginsDialog.txtMarginsW": "Margens são muito grandes para uma determinada largura da página",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancelar",
- "DE.Views.PageSizeDialog.okButtonText": "Aceitar",
"DE.Views.PageSizeDialog.textHeight": "Altura",
"DE.Views.PageSizeDialog.textTitle": "Tamanho da página",
"DE.Views.PageSizeDialog.textWidth": "Largura",
@@ -1345,14 +1318,11 @@
"DE.Views.ParagraphSettings.textExact": "Exatamente",
"DE.Views.ParagraphSettings.textNewColor": "Adicionar nova cor personalizada",
"DE.Views.ParagraphSettings.txtAutoText": "Automático",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancelar",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "As abas especificadas aparecerão neste campo",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Todas maiúsculas",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Bordas e Preenchimento",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Quebra de página antes",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Tachado duplo",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Primeira linha",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Esquerda",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Direita",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Manter as linhas juntas",
@@ -1480,7 +1450,6 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Cancelar",
"DE.Views.TableOfContentsSettings.strAlign": "Números de página alinhados à direita",
"DE.Views.TableOfContentsSettings.strLinks": "Formatar tabela de conteúdo como links",
"DE.Views.TableOfContentsSettings.strShowPages": "Mostrar números de páginas",
@@ -1516,7 +1485,6 @@
"DE.Views.TableSettings.textBanded": "Em tiras",
"DE.Views.TableSettings.textBorderColor": "Cor",
"DE.Views.TableSettings.textBorders": "Estilo de bordas",
- "DE.Views.TableSettings.textCancel": "Cancelar",
"DE.Views.TableSettings.textColumns": "Colunas",
"DE.Views.TableSettings.textDistributeCols": "Colunas distribuídas",
"DE.Views.TableSettings.textDistributeRows": "Linhas distribuídas",
@@ -1526,7 +1494,6 @@
"DE.Views.TableSettings.textHeader": "Cabeçalho",
"DE.Views.TableSettings.textLast": "Último",
"DE.Views.TableSettings.textNewColor": "Adicionar nova cor personalizada",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Linhas",
"DE.Views.TableSettings.textSelectBorders": "Selecione as bordas que você deseja alterar aplicando o estilo escolhido acima",
"DE.Views.TableSettings.textTemplate": "Selecionar a partir do modelo",
@@ -1542,8 +1509,6 @@
"DE.Views.TableSettings.tipRight": "Definir apenas borda direita externa",
"DE.Views.TableSettings.tipTop": "Definir apenas borda superior externa",
"DE.Views.TableSettings.txtNoBorders": "Sem bordas",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Cancelar",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Alinhamento",
"DE.Views.TableSettingsAdvanced.textAlignment": "Alinhamento",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Permitir espaçamento entre células",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 57a23f1b8..07a382893 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -13,7 +13,7 @@
"Common.Controllers.ReviewChanges.textAtLeast": "Минимум",
"Common.Controllers.ReviewChanges.textAuto": "Авто",
"Common.Controllers.ReviewChanges.textBaseline": "Базовая линия",
- "Common.Controllers.ReviewChanges.textBold": "Жирный",
+ "Common.Controllers.ReviewChanges.textBold": "Полужирный",
"Common.Controllers.ReviewChanges.textBreakBefore": "С новой страницы",
"Common.Controllers.ReviewChanges.textCaps": "Все прописные",
"Common.Controllers.ReviewChanges.textCenter": "Выравнивание по центру",
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ",
"Common.UI.ComboDataView.emptyComboText": "Без стилей",
"Common.UI.ExtendedColorDialog.addButtonText": "Добавить",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Отмена",
"Common.UI.ExtendedColorDialog.textCurrent": "Текущий",
"Common.UI.ExtendedColorDialog.textHexErr": "Введено некорректное значение. Пожалуйста, введите значение от 000000 до FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Новый",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "Разработано",
"Common.Views.About.txtTel": "тел.: ",
"Common.Views.About.txtVersion": "Версия ",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Отмена",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.textAdd": "Добавить",
"Common.Views.Comments.textAddComment": "Добавить",
@@ -174,13 +171,9 @@
"Common.Views.History.textShow": "Развернуть",
"Common.Views.History.textShowAll": "Показать подробные изменения",
"Common.Views.History.textVer": "вер.",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Отмена",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Это поле обязательно для заполнения",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Отмена",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Необходимо указать допустимое количество строк и столбцов.",
"Common.Views.InsertTableDialog.txtColumns": "Количество столбцов",
"Common.Views.InsertTableDialog.txtMaxText": "Максимальное значение для этого поля - {0}.",
@@ -188,12 +181,8 @@
"Common.Views.InsertTableDialog.txtRows": "Количество строк",
"Common.Views.InsertTableDialog.txtTitle": "Размер таблицы",
"Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку",
- "Common.Views.LanguageDialog.btnCancel": "Отмена",
- "Common.Views.LanguageDialog.btnOk": "ОК",
"Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа",
- "Common.Views.OpenDialog.cancelButtonText": "Отмена",
"Common.Views.OpenDialog.closeButtonText": "Закрыть файл",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Кодировка",
"Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.",
"Common.Views.OpenDialog.txtPassword": "Пароль",
@@ -201,8 +190,6 @@
"Common.Views.OpenDialog.txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен.",
"Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1",
"Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл",
- "Common.Views.PasswordDialog.cancelButtonText": "Отмена",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtDescription": "Задайте пароль, чтобы защитить этот документ",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Пароль и его подтверждение не совпадают",
"Common.Views.PasswordDialog.txtPassword": "Пароль",
@@ -224,8 +211,6 @@
"Common.Views.Protection.txtInvisibleSignature": "Добавить цифровую подпись",
"Common.Views.Protection.txtSignature": "Подпись",
"Common.Views.Protection.txtSignatureLine": "Добавить строку подписи",
- "Common.Views.RenameDialog.cancelButtonText": "Отмена",
- "Common.Views.RenameDialog.okButtonText": "ОК",
"Common.Views.RenameDialog.textName": "Имя файла",
"Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ",
"Common.Views.ReviewChanges.hintNext": "К следующему изменению",
@@ -291,9 +276,7 @@
"Common.Views.SaveAsDlg.textTitle": "Папка для сохранения",
"Common.Views.SelectFileDlg.textLoading": "Загрузка",
"Common.Views.SelectFileDlg.textTitle": "Выбрать источник данных",
- "Common.Views.SignDialog.cancelButtonText": "Отмена",
- "Common.Views.SignDialog.okButtonText": "ОК",
- "Common.Views.SignDialog.textBold": "Жирный",
+ "Common.Views.SignDialog.textBold": "Полужирный",
"Common.Views.SignDialog.textCertificate": "Сертификат",
"Common.Views.SignDialog.textChange": "Изменить",
"Common.Views.SignDialog.textInputName": "Введите имя подписывающего",
@@ -307,8 +290,6 @@
"Common.Views.SignDialog.textValid": "Действителен с %1 по %2",
"Common.Views.SignDialog.tipFontName": "Шрифт",
"Common.Views.SignDialog.tipFontSize": "Размер шрифта",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Отмена",
- "Common.Views.SignSettingsDialog.okButtonText": "ОК",
"Common.Views.SignSettingsDialog.textAllowComment": "Разрешить подписывающему добавлять примечания в окне подписи",
"Common.Views.SignSettingsDialog.textInfo": "Сведения о подписывающем",
"Common.Views.SignSettingsDialog.textInfoEmail": "Адрес электронной почты",
@@ -665,6 +646,7 @@
"DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов. Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей. Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.",
"DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.",
+ "DE.Controllers.Main.txtNoText": "Ошибка! Текст указанного стиля в документе отсутствует.",
"DE.Controllers.Navigation.txtBeginning": "Начало документа",
"DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа",
"DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения",
@@ -1047,8 +1029,6 @@
"DE.Views.ChartSettings.txtTight": "По контуру",
"DE.Views.ChartSettings.txtTitle": "Диаграмма",
"DE.Views.ChartSettings.txtTopAndBottom": "Сверху и снизу",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Отмена",
- "DE.Views.ControlSettingsDialog.okButtonText": "ОК",
"DE.Views.ControlSettingsDialog.textAppearance": "Вид",
"DE.Views.ControlSettingsDialog.textApplyAll": "Применить ко всем",
"DE.Views.ControlSettingsDialog.textBox": "С ограничивающей рамкой",
@@ -1063,8 +1043,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "Параметры элемента управления содержимым",
"DE.Views.ControlSettingsDialog.txtLockDelete": "Элемент управления содержимым нельзя удалить",
"DE.Views.ControlSettingsDialog.txtLockEdit": "Содержимое нельзя редактировать",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Отмена",
- "DE.Views.CustomColumnsDialog.okButtonText": "ОК",
"DE.Views.CustomColumnsDialog.textColumns": "Количество колонок",
"DE.Views.CustomColumnsDialog.textSeparator": "Разделитель",
"DE.Views.CustomColumnsDialog.textSpacing": "Интервал между колонками",
@@ -1209,7 +1187,7 @@
"DE.Views.DocumentHolder.txtDeleteBreak": "Удалить принудительный разрыв",
"DE.Views.DocumentHolder.txtDeleteChars": "Удалить вложенные знаки",
"DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Удалить вложенные знаки и разделители",
- "DE.Views.DocumentHolder.txtDeleteEq": "Удалить формулу",
+ "DE.Views.DocumentHolder.txtDeleteEq": "Удалить уравнение",
"DE.Views.DocumentHolder.txtDeleteGroupChar": "Удалить символ",
"DE.Views.DocumentHolder.txtDeleteRadical": "Удалить радикал",
"DE.Views.DocumentHolder.txtDistribHor": "Распределить по горизонтали",
@@ -1240,8 +1218,8 @@
"DE.Views.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после",
"DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед",
"DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
- "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после",
- "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед",
+ "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после",
+ "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
"DE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов",
"DE.Views.DocumentHolder.txtLimitOver": "Предел над текстом",
@@ -1278,8 +1256,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Разгруппировать",
"DE.Views.DocumentHolder.updateStyleText": "Обновить стиль %1",
"DE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Отмена",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "ОК",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Границы и заливка",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Буквица",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Поля",
@@ -1445,8 +1421,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "Сверху слева",
"DE.Views.HeaderFooterSettings.textTopPage": "Вверху страницы",
"DE.Views.HeaderFooterSettings.textTopRight": "Сверху справа",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Отмена",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Выделенный фрагмент текста",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Отображать",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Внешняя ссылка",
@@ -1488,8 +1462,6 @@
"DE.Views.ImageSettings.txtThrough": "Сквозное",
"DE.Views.ImageSettings.txtTight": "По контуру",
"DE.Views.ImageSettings.txtTopAndBottom": "Сверху и снизу",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Отмена",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Поля вокруг текста",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Абсолютная",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Выравнивание",
@@ -1591,7 +1563,6 @@
"DE.Views.Links.tipContentsUpdate": "Обновить оглавление",
"DE.Views.Links.tipInsertHyperlink": "Добавить гиперссылку",
"DE.Views.Links.tipNotes": "Вставить или редактировать сноски",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Отмена",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Отправить",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Тема",
@@ -1652,7 +1623,6 @@
"DE.Views.Navigation.txtSelect": "Выделить содержимое",
"DE.Views.NoteSettingsDialog.textApply": "Применить",
"DE.Views.NoteSettingsDialog.textApplyTo": "Применить изменения",
- "DE.Views.NoteSettingsDialog.textCancel": "Отмена",
"DE.Views.NoteSettingsDialog.textContinue": "Непрерывная",
"DE.Views.NoteSettingsDialog.textCustom": "Особый символ",
"DE.Views.NoteSettingsDialog.textDocument": "Ко всему документу",
@@ -1669,11 +1639,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Начать с",
"DE.Views.NoteSettingsDialog.textTextBottom": "Под текстом",
"DE.Views.NoteSettingsDialog.textTitle": "Параметры сносок",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Отмена",
- "DE.Views.NumberingValueDialog.okButtonText": "ОК",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Отмена",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Внимание",
- "DE.Views.PageMarginsDialog.okButtonText": "ОК",
"DE.Views.PageMarginsDialog.textBottom": "Нижнее",
"DE.Views.PageMarginsDialog.textLeft": "Левое",
"DE.Views.PageMarginsDialog.textRight": "Правое",
@@ -1681,8 +1647,6 @@
"DE.Views.PageMarginsDialog.textTop": "Верхнее",
"DE.Views.PageMarginsDialog.txtMarginsH": "Верхнее и нижнее поля слишком высокие для заданной высоты страницы",
"DE.Views.PageMarginsDialog.txtMarginsW": "Левое и правое поля слишком широкие для заданной ширины страницы",
- "DE.Views.PageSizeDialog.cancelButtonText": "Отмена",
- "DE.Views.PageSizeDialog.okButtonText": "ОК",
"DE.Views.PageSizeDialog.textHeight": "Высота",
"DE.Views.PageSizeDialog.textPreset": "Предустановка",
"DE.Views.PageSizeDialog.textTitle": "Размер страницы",
@@ -1701,15 +1665,12 @@
"DE.Views.ParagraphSettings.textExact": "Точно",
"DE.Views.ParagraphSettings.textNewColor": "Пользовательский цвет",
"DE.Views.ParagraphSettings.txtAutoText": "Авто",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Отмена",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "В этом поле появятся позиции табуляции, которые вы зададите",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Все прописные",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Границы и заливка",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "С новой страницы",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Двойное зачёркивание",
"DE.Views.ParagraphSettingsAdvanced.strIndent": "Отступы",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Первая строка",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Слева",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Междустрочный интервал",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Уровень структуры",
@@ -1874,15 +1835,11 @@
"DE.Views.StyleTitleDialog.txtEmpty": "Это поле необходимо заполнить",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Поле не может быть пустым",
"DE.Views.StyleTitleDialog.txtSameAs": "Такой же, как создаваемый стиль",
- "DE.Views.TableFormulaDialog.cancelButtonText": "Отмена",
- "DE.Views.TableFormulaDialog.okButtonText": "ОК",
"DE.Views.TableFormulaDialog.textBookmark": "Вставить закладку",
"DE.Views.TableFormulaDialog.textFormat": "Формат числа",
"DE.Views.TableFormulaDialog.textFormula": "Формула",
"DE.Views.TableFormulaDialog.textInsertFunction": "Вставить функцию",
"DE.Views.TableFormulaDialog.textTitle": "Настройки формулы",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Отмена",
- "DE.Views.TableOfContentsSettings.okButtonText": "ОК",
"DE.Views.TableOfContentsSettings.strAlign": "Номера страниц по правому краю",
"DE.Views.TableOfContentsSettings.strLinks": "Форматировать оглавление как ссылки",
"DE.Views.TableOfContentsSettings.strShowPages": "Показать номера страниц",
@@ -1922,7 +1879,6 @@
"DE.Views.TableSettings.textBanded": "Чередовать",
"DE.Views.TableSettings.textBorderColor": "Цвет",
"DE.Views.TableSettings.textBorders": "Стиль границ",
- "DE.Views.TableSettings.textCancel": "Отмена",
"DE.Views.TableSettings.textCellSize": "Размер ячейки",
"DE.Views.TableSettings.textColumns": "Столбцы",
"DE.Views.TableSettings.textDistributeCols": "Выровнять ширину столбцов",
@@ -1934,7 +1890,6 @@
"DE.Views.TableSettings.textHeight": "Высота",
"DE.Views.TableSettings.textLast": "Последний",
"DE.Views.TableSettings.textNewColor": "Пользовательский цвет",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Строки",
"DE.Views.TableSettings.textSelectBorders": "Выберите границы, к которым надо применить выбранный стиль",
"DE.Views.TableSettings.textTemplate": "По шаблону",
@@ -1951,8 +1906,14 @@
"DE.Views.TableSettings.tipRight": "Задать только внешнюю правую границу",
"DE.Views.TableSettings.tipTop": "Задать только внешнюю верхнюю границу",
"DE.Views.TableSettings.txtNoBorders": "Без границ",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Отмена",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
+ "DE.Views.TableSettings.txtTable_TableGrid": "Сетка таблицы",
+ "DE.Views.TableSettings.txtTable_PlainTable": "Таблица простая",
+ "DE.Views.TableSettings.txtTable_GridTable": "Таблица-сетка",
+ "DE.Views.TableSettings.txtTable_ListTable": "Список-таблица",
+ "DE.Views.TableSettings.txtTable_Light": "светлая",
+ "DE.Views.TableSettings.txtTable_Dark": "темная",
+ "DE.Views.TableSettings.txtTable_Colorful": "цветная",
+ "DE.Views.TableSettings.txtTable_Accent": "акцент",
"DE.Views.TableSettingsAdvanced.textAlign": "Выравнивание",
"DE.Views.TableSettingsAdvanced.textAlignment": "Выравнивание",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Интервалы между ячейками",
@@ -2084,7 +2045,7 @@
"DE.Views.Toolbar.textArea": "С областями",
"DE.Views.Toolbar.textAutoColor": "Автоматический",
"DE.Views.Toolbar.textBar": "Линейчатая",
- "DE.Views.Toolbar.textBold": "Жирный",
+ "DE.Views.Toolbar.textBold": "Полужирный",
"DE.Views.Toolbar.textBottom": "Нижнее: ",
"DE.Views.Toolbar.textCharts": "Диаграммы",
"DE.Views.Toolbar.textColumn": "Гистограмма",
@@ -2235,10 +2196,8 @@
"DE.Views.Toolbar.txtScheme7": "Справедливость",
"DE.Views.Toolbar.txtScheme8": "Поток",
"DE.Views.Toolbar.txtScheme9": "Литейная",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Отмена",
- "DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
"DE.Views.WatermarkSettingsDialog.textAuto": "Авто",
- "DE.Views.WatermarkSettingsDialog.textBold": "Жирный",
+ "DE.Views.WatermarkSettingsDialog.textBold": "Полужирный",
"DE.Views.WatermarkSettingsDialog.textColor": "Цвет текста",
"DE.Views.WatermarkSettingsDialog.textDiagonal": "По диагонали",
"DE.Views.WatermarkSettingsDialog.textFont": "Шрифт",
diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json
index 27fc20fe5..42302003e 100644
--- a/apps/documenteditor/main/locale/sk.json
+++ b/apps/documenteditor/main/locale/sk.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania",
"Common.UI.ComboDataView.emptyComboText": "Žiadne štýly",
"Common.UI.ExtendedColorDialog.addButtonText": "Pridať",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Zrušiť",
"Common.UI.ExtendedColorDialog.textCurrent": "Aktuálny",
"Common.UI.ExtendedColorDialog.textHexErr": "Zadaná hodnota je nesprávna. Prosím, zadajte číselnú hodnotu medzi 000000 a FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Nový",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Poháňaný ",
"Common.Views.About.txtTel": "tel.:",
"Common.Views.About.txtVersion": "Verzia",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Zrušiť",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Poslať",
"Common.Views.Comments.textAdd": "Pridať",
"Common.Views.Comments.textAddComment": "Pridať komentár",
@@ -160,13 +157,9 @@
"Common.Views.History.textRestore": "Obnoviť",
"Common.Views.History.textShow": "Expandovať/rozšíriť",
"Common.Views.History.textShowAll": "Zobraziť detailné zmeny",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Zrušiť",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Vložte obrázok URL:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Toto pole sa vyžaduje",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Toto pole by malo byť vo formáte 'http://www.example.com'",
- "Common.Views.InsertTableDialog.cancelButtonText": "Zrušiť",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Musíte zadať počet platných riadkov a stĺpcov.",
"Common.Views.InsertTableDialog.txtColumns": "Počet stĺpcov",
"Common.Views.InsertTableDialog.txtMaxText": "Maximálna hodnota pre toto pole je {0}.",
@@ -174,19 +167,13 @@
"Common.Views.InsertTableDialog.txtRows": "Počet riadkov",
"Common.Views.InsertTableDialog.txtTitle": "Veľkosť tabuľky",
"Common.Views.InsertTableDialog.txtTitleSplit": "Rozdeliť bunku",
- "Common.Views.LanguageDialog.btnCancel": "Zrušiť",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Vybrať jazyk dokumentu",
- "Common.Views.OpenDialog.cancelButtonText": "Zrušiť",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Kódovanie",
"Common.Views.OpenDialog.txtIncorrectPwd": "Heslo je nesprávne.",
"Common.Views.OpenDialog.txtPassword": "Heslo",
"Common.Views.OpenDialog.txtPreview": "Náhľad",
"Common.Views.OpenDialog.txtTitle": "Vyberte %1 možností",
"Common.Views.OpenDialog.txtTitleProtected": "Chránený súbor",
- "Common.Views.PasswordDialog.cancelButtonText": "Zrušiť",
- "Common.Views.PasswordDialog.okButtonText": "OK",
"Common.Views.PasswordDialog.txtIncorrectPwd": "Heslá sa nezhodujú",
"Common.Views.PluginDlg.textLoading": "Nahrávanie",
"Common.Views.Plugins.groupCaption": "Pluginy",
@@ -201,8 +188,6 @@
"Common.Views.Protection.txtDeletePwd": "Odstrániť heslo",
"Common.Views.Protection.txtInvisibleSignature": "Pridajte digitálny podpis",
"Common.Views.Protection.txtSignature": "Podpis",
- "Common.Views.RenameDialog.cancelButtonText": "Zrušiť",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Názov súboru",
"Common.Views.RenameDialog.txtInvalidName": "Názov súboru nemôže obsahovať žiadny z nasledujúcich znakov:",
"Common.Views.ReviewChanges.hintNext": "K ďalšej zmene",
@@ -246,8 +231,6 @@
"Common.Views.ReviewPopover.textCancel": "Zrušiť",
"Common.Views.ReviewPopover.textClose": "Zatvoriť",
"Common.Views.ReviewPopover.textEdit": "OK",
- "Common.Views.SignDialog.cancelButtonText": "Zrušiť",
- "Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Tučné",
"Common.Views.SignDialog.textCertificate": "Certifikát",
"Common.Views.SignDialog.textChange": "Zmeniť",
@@ -262,8 +245,6 @@
"Common.Views.SignDialog.textValid": "Platný od %1 do %2",
"Common.Views.SignDialog.tipFontName": "Názov písma",
"Common.Views.SignDialog.tipFontSize": "Veľkosť písma",
- "Common.Views.SignSettingsDialog.cancelButtonText": "Zrušiť",
- "Common.Views.SignSettingsDialog.okButtonText": "OK",
"Common.Views.SignSettingsDialog.textAllowComment": "Povoliť signatárovi pridať komentár do podpisového dialógu",
"Common.Views.SignSettingsDialog.textInfo": "Informácie o signatárovi",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-mail",
@@ -791,11 +772,7 @@
"DE.Views.ChartSettings.txtTight": "Tesný",
"DE.Views.ChartSettings.txtTitle": "Graf",
"DE.Views.ChartSettings.txtTopAndBottom": "Hore a dole",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "Zrušiť",
- "DE.Views.ControlSettingsDialog.okButtonText": "OK",
"DE.Views.ControlSettingsDialog.textNewColor": "Pridať novú vlastnú farbu",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Zrušiť",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Počet stĺpcov",
"DE.Views.CustomColumnsDialog.textSeparator": "Rozdeľovač stĺpcov",
"DE.Views.CustomColumnsDialog.textSpacing": "Medzera medzi stĺpcami",
@@ -970,8 +947,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Oddeliť",
"DE.Views.DocumentHolder.updateStyleText": "Aktualizovať %1 štýl",
"DE.Views.DocumentHolder.vertAlignText": "Vertikálne zarovnanie",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Zrušiť",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Orámovanie a výplň",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Iniciála",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Okraje",
@@ -1111,8 +1086,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Hore v strede",
"DE.Views.HeaderFooterSettings.textTopLeft": "Hore vľavo",
"DE.Views.HeaderFooterSettings.textTopRight": "Hore vpravo",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Zrušiť",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Vybraný textový úryvok",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Zobraziť",
"DE.Views.HyperlinkSettingsDialog.textExternal": "Externý odkaz",
@@ -1141,8 +1114,6 @@
"DE.Views.ImageSettings.txtThrough": "Cez",
"DE.Views.ImageSettings.txtTight": "Tesný",
"DE.Views.ImageSettings.txtTopAndBottom": "Hore a dole",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Zrušiť",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Textová výplň",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Absolútny",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Zarovnanie",
@@ -1224,7 +1195,6 @@
"DE.Views.Links.mniDelFootnote": "Odstrániť všetky poznámky pod čiarou",
"DE.Views.Links.textContentsSettings": "Nastavenia",
"DE.Views.Links.tipInsertHyperlink": "Pridať odkaz",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Zrušiť",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Poslať",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Téma",
@@ -1275,7 +1245,6 @@
"DE.Views.Navigation.txtExpand": "Rozbaliť všetko",
"DE.Views.NoteSettingsDialog.textApply": "Použiť",
"DE.Views.NoteSettingsDialog.textApplyTo": "Použiť zmeny na",
- "DE.Views.NoteSettingsDialog.textCancel": "Zrušiť",
"DE.Views.NoteSettingsDialog.textContinue": "Nepretržitý",
"DE.Views.NoteSettingsDialog.textCustom": "Vlastná značka",
"DE.Views.NoteSettingsDialog.textDocument": "Celý dokument",
@@ -1292,11 +1261,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Začať na",
"DE.Views.NoteSettingsDialog.textTextBottom": "Pod textom",
"DE.Views.NoteSettingsDialog.textTitle": "Nastavenia poznámok",
- "DE.Views.NumberingValueDialog.cancelButtonText": "Zrušiť",
- "DE.Views.NumberingValueDialog.okButtonText": "OK",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Zrušiť",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Upozornenie",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Dole",
"DE.Views.PageMarginsDialog.textLeft": "Vľavo",
"DE.Views.PageMarginsDialog.textRight": "Vpravo",
@@ -1304,8 +1269,6 @@
"DE.Views.PageMarginsDialog.textTop": "Hore",
"DE.Views.PageMarginsDialog.txtMarginsH": "Horné a spodné okraje sú pre danú výšku stránky príliš vysoké",
"DE.Views.PageMarginsDialog.txtMarginsW": "Ľavé a pravé okraje sú príliš široké pre danú šírku stránky",
- "DE.Views.PageSizeDialog.cancelButtonText": "Zrušiť",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Výška",
"DE.Views.PageSizeDialog.textTitle": "Veľkosť stránky",
"DE.Views.PageSizeDialog.textWidth": "Šírka",
@@ -1322,14 +1285,11 @@
"DE.Views.ParagraphSettings.textExact": "Presne",
"DE.Views.ParagraphSettings.textNewColor": "Pridať novú vlastnú farbu",
"DE.Views.ParagraphSettings.txtAutoText": "Automaticky",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Zrušiť",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Špecifikované tabulátory sa objavia v tomto poli",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Všetko veľkým",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Orámovanie a výplň",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Zlom strany pred",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dvojité prečiarknutie",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Prvý riadok",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Vľavo",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Vpravo",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Zviazať riadky dohromady",
@@ -1454,8 +1414,6 @@
"DE.Views.StyleTitleDialog.textTitle": "Názov",
"DE.Views.StyleTitleDialog.txtEmpty": "Toto pole sa vyžaduje",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Pole nesmie byť prázdne",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "Zrušiť",
- "DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.textStyle": "Štýl",
"DE.Views.TableSettings.deleteColumnText": "Odstrániť stĺpec",
"DE.Views.TableSettings.deleteRowText": "Odstrániť riadok",
@@ -1477,7 +1435,6 @@
"DE.Views.TableSettings.textBanded": "Pruhovaný/pásikovaný",
"DE.Views.TableSettings.textBorderColor": "Farba",
"DE.Views.TableSettings.textBorders": "Štýl orámovania",
- "DE.Views.TableSettings.textCancel": "Zrušiť",
"DE.Views.TableSettings.textCellSize": "Veľkosť bunky",
"DE.Views.TableSettings.textColumns": "Stĺpce",
"DE.Views.TableSettings.textEdit": "Riadky a stĺpce",
@@ -1486,7 +1443,6 @@
"DE.Views.TableSettings.textHeader": "Hlavička",
"DE.Views.TableSettings.textLast": "Trvať/posledný",
"DE.Views.TableSettings.textNewColor": "Pridať novú vlastnú farbu",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Riadky",
"DE.Views.TableSettings.textSelectBorders": "Vyberte orámovanie, ktoré chcete zmeniť podľa vyššie uvedeného štýlu",
"DE.Views.TableSettings.textTemplate": "Vybrať zo šablóny",
@@ -1502,8 +1458,6 @@
"DE.Views.TableSettings.tipRight": "Nastaviť len pravé vonkajšie orámovanie",
"DE.Views.TableSettings.tipTop": "Nastaviť len horné vonkajšie orámovanie",
"DE.Views.TableSettings.txtNoBorders": "Bez orámovania",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Zrušiť",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Zarovnanie",
"DE.Views.TableSettingsAdvanced.textAlignment": "Zarovnanie",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Medzera medzi bunkami",
diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json
index 2a214f389..4d4421e09 100644
--- a/apps/documenteditor/main/locale/sl.json
+++ b/apps/documenteditor/main/locale/sl.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej",
"Common.UI.ComboDataView.emptyComboText": "Ni slogov",
"Common.UI.ExtendedColorDialog.addButtonText": "Dodaj",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Prekliči",
"Common.UI.ExtendedColorDialog.textCurrent": "trenuten",
"Common.UI.ExtendedColorDialog.textHexErr": "Vnesena vrednost je nepravilna. Prosim vnesite vrednost med 000000 in FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Novo",
@@ -101,8 +100,6 @@
"Common.Views.About.txtPoweredBy": "Poganja",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Različica",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Prekliči",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Pošlji",
"Common.Views.Comments.textAdd": "Dodaj",
"Common.Views.Comments.textAddComment": "Dodaj",
@@ -133,21 +130,15 @@
"Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
"Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
"Common.Views.Header.textBack": "Pojdi v dokumente",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Prekliči",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Prilepi URL slike:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "To polje je obvezno",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "To polje mora biti URL v \"http://www.example.com\" formatu",
- "Common.Views.InsertTableDialog.cancelButtonText": "Prekliči",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Določiti morate veljaven seštevek vrstic in stolpcev.",
"Common.Views.InsertTableDialog.txtColumns": "Število stolpcev",
"Common.Views.InsertTableDialog.txtMaxText": "Maksimalna vrednost za to polje je {0}.",
"Common.Views.InsertTableDialog.txtMinText": "Minimalna vrednost za to polje je {0}.",
"Common.Views.InsertTableDialog.txtRows": "Število vrstic",
"Common.Views.InsertTableDialog.txtTitle": "Velikost tabele",
- "Common.Views.OpenDialog.cancelButtonText": "Cancel",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.ReviewChanges.txtAccept": "Accept",
@@ -783,8 +774,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Razdruži",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertikalna poravnava",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Prekliči",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Obrobe & Zapolnitev",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Spustni pokrovček",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Meje",
@@ -909,8 +898,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Središče vrha",
"DE.Views.HeaderFooterSettings.textTopLeft": "Levo vrha",
"DE.Views.HeaderFooterSettings.textTopRight": "Vrh desno",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Prekliči",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Izbran fragment besedila",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Zaslon",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Nastavitve hiperpovezave",
@@ -934,8 +921,6 @@
"DE.Views.ImageSettings.txtThrough": "Preko",
"DE.Views.ImageSettings.txtTight": "Tesen",
"DE.Views.ImageSettings.txtTopAndBottom": "Vrh in Dno",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Prekliči",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Oblazinjenje besedila",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Poravnava",
"DE.Views.ImageSettingsAdvanced.textArrows": "Puščice",
@@ -1000,7 +985,6 @@
"DE.Views.LeftMenu.tipSearch": "Iskanje",
"DE.Views.LeftMenu.tipSupport": "Povratne informacije & Pomoč",
"DE.Views.LeftMenu.tipTitles": "Naslovi",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1048,9 +1032,7 @@
"DE.Views.MailMergeSettings.txtPrev": "To previous record",
"DE.Views.MailMergeSettings.txtUntitled": "Untitled",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1058,8 +1040,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
@@ -1076,14 +1056,11 @@
"DE.Views.ParagraphSettings.textExact": "Točno",
"DE.Views.ParagraphSettings.textNewColor": "Dodaj novo barvo po meri",
"DE.Views.ParagraphSettings.txtAutoText": "Samodejno",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Prekliči",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Določeni zavihki se bodo pojavili v tem polju",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Vse z veliko",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Obrobe & Zapolnitev",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Prelom strani pred",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dvojno prečrtanje",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Prva vrsta",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Levo",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Desno",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Linije ohrani skupaj",
@@ -1221,7 +1198,6 @@
"DE.Views.TableSettings.textBanded": "Odvisen",
"DE.Views.TableSettings.textBorderColor": "Barva",
"DE.Views.TableSettings.textBorders": "Stil obrob",
- "DE.Views.TableSettings.textCancel": "Prekliči",
"DE.Views.TableSettings.textColumns": "Stolpci",
"DE.Views.TableSettings.textEdit": "Vrste & Stolpci",
"DE.Views.TableSettings.textEmptyTemplate": "Ni predlog",
@@ -1229,7 +1205,6 @@
"DE.Views.TableSettings.textHeader": "Glava",
"DE.Views.TableSettings.textLast": "zadnji",
"DE.Views.TableSettings.textNewColor": "Dodaj novo barvo po meri",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Vrste",
"DE.Views.TableSettings.textSelectBorders": "Izberite meje katere želite spremeniti z uporabo zgoraj izbranega sloga",
"DE.Views.TableSettings.textTemplate": "Izberi z predloge",
@@ -1245,8 +1220,6 @@
"DE.Views.TableSettings.tipRight": "Nastavi le zunanjo desno mejo",
"DE.Views.TableSettings.tipTop": "Nastavi le zunanjo zgornjo mejo",
"DE.Views.TableSettings.txtNoBorders": "Ni mej",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Prekliči",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Poravnava",
"DE.Views.TableSettingsAdvanced.textAlignment": "Poravnava",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Dovoli razmak med celicami",
diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json
index 9c2b4754d..b24a217b5 100644
--- a/apps/documenteditor/main/locale/tr.json
+++ b/apps/documenteditor/main/locale/tr.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok",
"Common.UI.ComboDataView.emptyComboText": "Stil yok",
"Common.UI.ExtendedColorDialog.addButtonText": "Ekle",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "İptal Et",
"Common.UI.ExtendedColorDialog.textCurrent": "Mevcut",
"Common.UI.ExtendedColorDialog.textHexErr": "Girilen değer yanlış. Lütfen 000000 ile FFFFFF arasında değer giriniz.",
"Common.UI.ExtendedColorDialog.textNew": "Yeni",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel:",
"Common.Views.About.txtVersion": "Versiyon",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "İptal Et",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "TAMAM",
"Common.Views.Chat.textSend": "Gönder",
"Common.Views.Comments.textAdd": "Ekle",
"Common.Views.Comments.textAddComment": "Yorum Ekle",
@@ -160,13 +157,9 @@
"Common.Views.History.textRestore": "Geri yükle",
"Common.Views.History.textShow": "Genişlet",
"Common.Views.History.textShowAll": "Ayrıntılı değişiklikleri göster",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "İptal Et",
- "Common.Views.ImageFromUrlDialog.okButtonText": "TAMAM",
"Common.Views.ImageFromUrlDialog.textUrl": "Resim URL'sini yapıştır:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Bu alan gereklidir",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Bu alan \"http://www.example.com\" formatında URL olmalıdır",
- "Common.Views.InsertTableDialog.cancelButtonText": "İptal Et",
- "Common.Views.InsertTableDialog.okButtonText": "TAMAM",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Geçerli satır ve sütun miktarı belirtmelisiniz.",
"Common.Views.InsertTableDialog.txtColumns": "Sütun Sayısı",
"Common.Views.InsertTableDialog.txtMaxText": "Bu alan için maksimum değer: {0}.",
@@ -174,19 +167,13 @@
"Common.Views.InsertTableDialog.txtRows": "Sıra Sayısı",
"Common.Views.InsertTableDialog.txtTitle": "Tablo Boyutu",
"Common.Views.InsertTableDialog.txtTitleSplit": "Hücreyi Böl",
- "Common.Views.LanguageDialog.btnCancel": "İptal",
- "Common.Views.LanguageDialog.btnOk": "Tamam",
"Common.Views.LanguageDialog.labelSelect": "Belge dilini seçin",
- "Common.Views.OpenDialog.cancelButtonText": "Cancel",
"Common.Views.OpenDialog.closeButtonText": "Dosyayı Kapat",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Encoding ",
"Common.Views.OpenDialog.txtIncorrectPwd": "Şifre hatalı.",
"Common.Views.OpenDialog.txtPassword": "Şifre",
"Common.Views.OpenDialog.txtTitle": "Choose %1 options",
"Common.Views.OpenDialog.txtTitleProtected": "Korumalı dosya",
- "Common.Views.PasswordDialog.cancelButtonText": "İptal",
- "Common.Views.PasswordDialog.okButtonText": "Tamam",
"Common.Views.PasswordDialog.txtPassword": "Parola",
"Common.Views.PluginDlg.textLoading": "Yükleniyor",
"Common.Views.Plugins.groupCaption": "Eklentiler",
@@ -194,8 +181,6 @@
"Common.Views.Plugins.textLoading": "Yükleniyor",
"Common.Views.Plugins.textStart": "Başlat",
"Common.Views.Plugins.textStop": "Bitir",
- "Common.Views.RenameDialog.cancelButtonText": "İptal",
- "Common.Views.RenameDialog.okButtonText": "Tamam",
"Common.Views.RenameDialog.textName": "Dosya adı",
"Common.Views.RenameDialog.txtInvalidName": "Dosya adı aşağıdaki karakterlerden herhangi birini içeremez:",
"Common.Views.ReviewChanges.hintNext": "Sonraki değişikliğe",
@@ -238,14 +223,10 @@
"Common.Views.ReviewPopover.textClose": "Kapat",
"Common.Views.ReviewPopover.textEdit": "Tamam",
"Common.Views.ReviewPopover.textReply": "Yanıtla",
- "Common.Views.SignDialog.cancelButtonText": "İptal",
- "Common.Views.SignDialog.okButtonText": "Tamam",
"Common.Views.SignDialog.textBold": "Kalın",
"Common.Views.SignDialog.textCertificate": "Sertifika",
"Common.Views.SignDialog.textChange": "Değiştir",
"Common.Views.SignDialog.textItalic": "İtalik",
- "Common.Views.SignSettingsDialog.cancelButtonText": "İptal",
- "Common.Views.SignSettingsDialog.okButtonText": "Tamam",
"Common.Views.SignSettingsDialog.textInfoEmail": "E-posta",
"Common.Views.SignSettingsDialog.textInfoName": "İsim",
"DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost. Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
@@ -766,13 +747,9 @@
"DE.Views.ChartSettings.txtTight": "Sıkı",
"DE.Views.ChartSettings.txtTitle": "Grafik",
"DE.Views.ChartSettings.txtTopAndBottom": "Üst ve alt",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "İptal",
- "DE.Views.ControlSettingsDialog.okButtonText": "Tamam",
"DE.Views.ControlSettingsDialog.textColor": "Renk",
"DE.Views.ControlSettingsDialog.textName": "Başlık",
"DE.Views.ControlSettingsDialog.textTag": "Etiket",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "İptal",
- "DE.Views.CustomColumnsDialog.okButtonText": "Tamam",
"DE.Views.CustomColumnsDialog.textColumns": "Sütun sayısı",
"DE.Views.CustomColumnsDialog.textSeparator": "Sütun ayracı",
"DE.Views.CustomColumnsDialog.textSpacing": "Sütunlar arasında boşluk",
@@ -946,8 +923,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Gruptan çıkar",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Dikey Hizalama",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "İptal Et",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "Tamam",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Sınırlar & Dolgu",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Büyük Harf",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Kenar Boşlukları",
@@ -1085,8 +1060,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Üst Orta",
"DE.Views.HeaderFooterSettings.textTopLeft": "Üst Sol",
"DE.Views.HeaderFooterSettings.textTopRight": "Üst Sağ",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "İptal Et",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "TAMAM",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Seçili metin parçası",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Görüntüle",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink Settings",
@@ -1116,8 +1089,6 @@
"DE.Views.ImageSettings.txtThrough": "Sonu",
"DE.Views.ImageSettings.txtTight": "Sıkı",
"DE.Views.ImageSettings.txtTopAndBottom": "Üst ve alt",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "İptal Et",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "TAMAM",
"DE.Views.ImageSettingsAdvanced.strMargins": "Metin Dolgulama",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Mutlak",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Hiza",
@@ -1194,7 +1165,6 @@
"DE.Views.LeftMenu.tipSupport": "Geri Bildirim & Destek",
"DE.Views.LeftMenu.tipTitles": "Başlıklar",
"DE.Views.LeftMenu.txtDeveloper": "GELİŞTİRİCİ MODU",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Cancel",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Send",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1245,7 +1215,6 @@
"DE.Views.Navigation.txtCollapse": "Hepsini daralt",
"DE.Views.NoteSettingsDialog.textApply": "Uygula",
"DE.Views.NoteSettingsDialog.textApplyTo": "Değişiklikleri uygula",
- "DE.Views.NoteSettingsDialog.textCancel": "İptal",
"DE.Views.NoteSettingsDialog.textContinue": "Sürekli",
"DE.Views.NoteSettingsDialog.textCustom": "Özel mark",
"DE.Views.NoteSettingsDialog.textDocument": "Tüm döküman",
@@ -1262,11 +1231,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Başlatma zamanı",
"DE.Views.NoteSettingsDialog.textTextBottom": "Aşağıdaki metin",
"DE.Views.NoteSettingsDialog.textTitle": "Not ayarları",
- "DE.Views.NumberingValueDialog.cancelButtonText": "İptal",
- "DE.Views.NumberingValueDialog.okButtonText": "Tamam",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Cancel",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Bottom",
"DE.Views.PageMarginsDialog.textLeft": "Left",
"DE.Views.PageMarginsDialog.textRight": "Right",
@@ -1274,8 +1239,6 @@
"DE.Views.PageMarginsDialog.textTop": "Top",
"DE.Views.PageMarginsDialog.txtMarginsH": "Top and bottom margins are too high for a given page height",
"DE.Views.PageMarginsDialog.txtMarginsW": "Left and right margins are too wide for a given page width",
- "DE.Views.PageSizeDialog.cancelButtonText": "Cancel",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Height",
"DE.Views.PageSizeDialog.textTitle": "Page Size",
"DE.Views.PageSizeDialog.textWidth": "Width",
@@ -1292,14 +1255,11 @@
"DE.Views.ParagraphSettings.textExact": "Tam olarak",
"DE.Views.ParagraphSettings.textNewColor": "Yeni Özel Renk Ekle",
"DE.Views.ParagraphSettings.txtAutoText": "Otomatik",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "İptal Et",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Belirtilen sekmeler bu alanda görünecektir",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "TAMAM",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Tüm başlıklar",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Sınırlar & Dolgu",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Şundan önce sayfa kesmesi:",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Üstü çift çizili",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "İlk Satır",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Sol",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Sağ",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Satırları birlikte tut",
@@ -1422,10 +1382,6 @@
"DE.Views.StyleTitleDialog.textTitle": "Title",
"DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
"DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
- "DE.Views.TableFormulaDialog.cancelButtonText": "İptal",
- "DE.Views.TableFormulaDialog.okButtonText": "Tamam",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "İptal",
- "DE.Views.TableOfContentsSettings.okButtonText": "Tamam",
"DE.Views.TableOfContentsSettings.textLeader": "Lider",
"DE.Views.TableOfContentsSettings.textLevel": "Seviye",
"DE.Views.TableOfContentsSettings.textLevels": "Seviyeler",
@@ -1450,7 +1406,6 @@
"DE.Views.TableSettings.textBanded": "Bağlı",
"DE.Views.TableSettings.textBorderColor": "Renk",
"DE.Views.TableSettings.textBorders": "Sınır Stili",
- "DE.Views.TableSettings.textCancel": "İptal Et",
"DE.Views.TableSettings.textCellSize": "Hücre boyutu",
"DE.Views.TableSettings.textColumns": "Sütunlar",
"DE.Views.TableSettings.textEdit": "Satırlar & Sütunlar",
@@ -1459,7 +1414,6 @@
"DE.Views.TableSettings.textHeader": "Üst Başlık",
"DE.Views.TableSettings.textLast": "Son",
"DE.Views.TableSettings.textNewColor": "Yeni Özel Renk Ekle",
- "DE.Views.TableSettings.textOK": "TAMAM",
"DE.Views.TableSettings.textRows": "Satırlar",
"DE.Views.TableSettings.textSelectBorders": "Yukarıda seçilen stili uygulayarak değiştirmek istediğiniz sınırları seçin",
"DE.Views.TableSettings.textTemplate": "Şablondan Seç",
@@ -1476,8 +1430,6 @@
"DE.Views.TableSettings.tipRight": "Sadece Dış Sağ Sınırı Belirle",
"DE.Views.TableSettings.tipTop": "Sadece Dış Üst Sınırı Belirle",
"DE.Views.TableSettings.txtNoBorders": "Sınır yok",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "İptal Et",
- "DE.Views.TableSettingsAdvanced.okButtonText": "TAMAM",
"DE.Views.TableSettingsAdvanced.textAlign": "Hiza",
"DE.Views.TableSettingsAdvanced.textAlignment": "Hiza",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Hücreler arası aralığa izin ver",
@@ -1739,8 +1691,6 @@
"DE.Views.Toolbar.txtScheme7": "Net Değer",
"DE.Views.Toolbar.txtScheme8": "Yayılma",
"DE.Views.Toolbar.txtScheme9": "Döküm",
- "DE.Views.WatermarkSettingsDialog.cancelButtonText": "İptal",
- "DE.Views.WatermarkSettingsDialog.okButtonText": "Tamam",
"DE.Views.WatermarkSettingsDialog.textAuto": "Otomatik",
"DE.Views.WatermarkSettingsDialog.textBold": "Kalın",
"DE.Views.WatermarkSettingsDialog.textHor": "Yatay",
diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json
index fb64df8c9..57ab248b1 100644
--- a/apps/documenteditor/main/locale/uk.json
+++ b/apps/documenteditor/main/locale/uk.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів",
"Common.UI.ComboDataView.emptyComboText": "Немає стилів",
"Common.UI.ExtendedColorDialog.addButtonText": "Додати",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Скасувати",
"Common.UI.ExtendedColorDialog.textCurrent": "В данний час",
"Common.UI.ExtendedColorDialog.textHexErr": "Введене значення невірно. Будь ласка, введіть значення між 000000 та FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Новий",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Під керуванням",
"Common.Views.About.txtTel": "Тел.:",
"Common.Views.About.txtVersion": "Версія",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Скасувати",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "Ок",
"Common.Views.Chat.textSend": "Надіслати",
"Common.Views.Comments.textAdd": "Додати",
"Common.Views.Comments.textAddComment": "Добавити коментар",
@@ -157,13 +154,9 @@
"Common.Views.History.textRestore": "Відновити",
"Common.Views.History.textShow": "Розгорнути",
"Common.Views.History.textShowAll": "Показати детальні зміни",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Скасувати",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OК",
"Common.Views.ImageFromUrlDialog.textUrl": "Вставити URL зображення:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Це поле є обов'язковим",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Це поле має бути URL-адресою у форматі \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Скасувати",
- "Common.Views.InsertTableDialog.okButtonText": "OК",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Потрібно вказати дійсні рядки та стовпці.",
"Common.Views.InsertTableDialog.txtColumns": "Номер стовпчиків",
"Common.Views.InsertTableDialog.txtMaxText": "Максимальне значення для цього поля - {0}.",
@@ -171,11 +164,7 @@
"Common.Views.InsertTableDialog.txtRows": "Номер рядків",
"Common.Views.InsertTableDialog.txtTitle": "Розмір таблиці",
"Common.Views.InsertTableDialog.txtTitleSplit": "Розщеплені клітини",
- "Common.Views.LanguageDialog.btnCancel": "Скасувати",
- "Common.Views.LanguageDialog.btnOk": "Ок",
"Common.Views.LanguageDialog.labelSelect": "Виберіть мову документа",
- "Common.Views.OpenDialog.cancelButtonText": "Скасувати",
- "Common.Views.OpenDialog.okButtonText": "OК",
"Common.Views.OpenDialog.txtEncoding": "Кодування",
"Common.Views.OpenDialog.txtPassword": "Пароль",
"Common.Views.OpenDialog.txtTitle": "Виберіть параметри% 1",
@@ -186,8 +175,6 @@
"Common.Views.Plugins.textLoading": "Завантаження",
"Common.Views.Plugins.textStart": "Початок",
"Common.Views.Plugins.textStop": "Зупинитись",
- "Common.Views.RenameDialog.cancelButtonText": "Скасувати",
- "Common.Views.RenameDialog.okButtonText": "Ок",
"Common.Views.RenameDialog.textName": "Ім'я файлу",
"Common.Views.RenameDialog.txtInvalidName": "Ім'я файлу не може містити жодного з наступних символів:",
"Common.Views.ReviewChanges.hintNext": "До наступної зміни",
@@ -723,8 +710,6 @@
"DE.Views.ChartSettings.txtTight": "Тісно",
"DE.Views.ChartSettings.txtTitle": "Діаграма",
"DE.Views.ChartSettings.txtTopAndBottom": "Верх і низ",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Скасувати",
- "DE.Views.CustomColumnsDialog.okButtonText": "Ок",
"DE.Views.CustomColumnsDialog.textColumns": "Номер стовпчиків",
"DE.Views.CustomColumnsDialog.textSeparator": "Дільник колонки",
"DE.Views.CustomColumnsDialog.textSpacing": "Розміщення між стовпцями",
@@ -895,8 +880,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Розпакувати",
"DE.Views.DocumentHolder.updateStyleText": "Оновити стиль %1",
"DE.Views.DocumentHolder.vertAlignText": "Вертикальне вирівнювання",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Скасувати",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "Ок",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Межі та заповнення",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Буквиця",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Поля",
@@ -1031,8 +1014,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Центр зверху",
"DE.Views.HeaderFooterSettings.textTopLeft": "Верх зліва",
"DE.Views.HeaderFooterSettings.textTopRight": "Верх справа",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Скасувати",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OК",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Виберіть текстовий фрагмент",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Дісплей",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Налаштування гіперсилки",
@@ -1059,8 +1040,6 @@
"DE.Views.ImageSettings.txtThrough": "Через",
"DE.Views.ImageSettings.txtTight": "Тісно",
"DE.Views.ImageSettings.txtTopAndBottom": "Верх і низ",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Скасувати",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OК",
"DE.Views.ImageSettingsAdvanced.strMargins": "Текстове накладення тексту",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Абсолютно",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Вирівнювання",
@@ -1136,7 +1115,6 @@
"DE.Views.LeftMenu.tipSupport": "Відгуки і підтримка",
"DE.Views.LeftMenu.tipTitles": "Назви",
"DE.Views.LeftMenu.txtDeveloper": "Режим розробника",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Скасувати",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Надіслати",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Тема",
@@ -1186,7 +1164,6 @@
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Початок злиття не вдався",
"DE.Views.NoteSettingsDialog.textApply": "Застосувати",
"DE.Views.NoteSettingsDialog.textApplyTo": "Застосувати зміни до",
- "DE.Views.NoteSettingsDialog.textCancel": "Скасувати",
"DE.Views.NoteSettingsDialog.textContinue": "Безперервний",
"DE.Views.NoteSettingsDialog.textCustom": "Користувальницький знак",
"DE.Views.NoteSettingsDialog.textDocument": "Весь документ",
@@ -1203,9 +1180,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Розпочати з",
"DE.Views.NoteSettingsDialog.textTextBottom": "Нижче тексту",
"DE.Views.NoteSettingsDialog.textTitle": "Налаштування приміток",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Скасувати",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Застереження",
- "DE.Views.PageMarginsDialog.okButtonText": "Ок",
"DE.Views.PageMarginsDialog.textBottom": "Внизу",
"DE.Views.PageMarginsDialog.textLeft": "Лівий",
"DE.Views.PageMarginsDialog.textRight": "Право",
@@ -1213,8 +1188,6 @@
"DE.Views.PageMarginsDialog.textTop": "Верх",
"DE.Views.PageMarginsDialog.txtMarginsH": "Верхні та нижні поля занадто високі для заданої висоти сторінки",
"DE.Views.PageMarginsDialog.txtMarginsW": "Ліве та праве поля занадто широкі для заданої ширини сторінки",
- "DE.Views.PageSizeDialog.cancelButtonText": "Скасувати",
- "DE.Views.PageSizeDialog.okButtonText": "Ок",
"DE.Views.PageSizeDialog.textHeight": "Висота",
"DE.Views.PageSizeDialog.textTitle": "Розмір сторінки",
"DE.Views.PageSizeDialog.textWidth": "Ширина",
@@ -1231,14 +1204,11 @@
"DE.Views.ParagraphSettings.textExact": "Точно",
"DE.Views.ParagraphSettings.textNewColor": "Додати новий спеціальний колір",
"DE.Views.ParagraphSettings.txtAutoText": "Авто",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Скасувати",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Вказані вкладки з'являться в цьому полі",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OК",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Всі шапки",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Межі та заповнення",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Розрив сторінки перед",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Подвійне перекреслення",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Перша лінія",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Лівий",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Право",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Тримайте лінії разом",
@@ -1377,7 +1347,6 @@
"DE.Views.TableSettings.textBanded": "У смужку",
"DE.Views.TableSettings.textBorderColor": "Колір",
"DE.Views.TableSettings.textBorders": "Стиль меж",
- "DE.Views.TableSettings.textCancel": "Скасувати",
"DE.Views.TableSettings.textColumns": "Колонки",
"DE.Views.TableSettings.textEdit": "Рядки і колони",
"DE.Views.TableSettings.textEmptyTemplate": "Немає шаблонів",
@@ -1385,7 +1354,6 @@
"DE.Views.TableSettings.textHeader": "Заголовок",
"DE.Views.TableSettings.textLast": "Останній",
"DE.Views.TableSettings.textNewColor": "Додати новий спеціальний колір",
- "DE.Views.TableSettings.textOK": "OК",
"DE.Views.TableSettings.textRows": "Рядки",
"DE.Views.TableSettings.textSelectBorders": "Виберіть кордони, які ви хочете змінити, застосувавши обраний вище стиль",
"DE.Views.TableSettings.textTemplate": "Виберіть з шаблону",
@@ -1401,8 +1369,6 @@
"DE.Views.TableSettings.tipRight": "Встановити лише зовнішній правий кордон",
"DE.Views.TableSettings.tipTop": "Встановити лише зовнішній верхній край",
"DE.Views.TableSettings.txtNoBorders": "Немає кордонів",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Скасувати",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OК",
"DE.Views.TableSettingsAdvanced.textAlign": "Вирівнювання",
"DE.Views.TableSettingsAdvanced.textAlignment": "Вирівнювання",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Розміщення між клітинами",
diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json
index e526d1e21..9c313813a 100644
--- a/apps/documenteditor/main/locale/vi.json
+++ b/apps/documenteditor/main/locale/vi.json
@@ -67,7 +67,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền",
"Common.UI.ComboDataView.emptyComboText": "Không có kiểu",
"Common.UI.ExtendedColorDialog.addButtonText": "Thêm",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "Hủy",
"Common.UI.ExtendedColorDialog.textCurrent": "Hiện tại",
"Common.UI.ExtendedColorDialog.textHexErr": "Giá trị đã nhập không chính xác. Nhập một giá trị thuộc từ 000000 đến FFFFFF.",
"Common.UI.ExtendedColorDialog.textNew": "Mới",
@@ -106,8 +105,6 @@
"Common.Views.About.txtPoweredBy": "Được hỗ trợ bởi",
"Common.Views.About.txtTel": "ĐT.: ",
"Common.Views.About.txtVersion": "Phiên bản",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "Hủy",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "OK",
"Common.Views.Chat.textSend": "Gửi",
"Common.Views.Comments.textAdd": "Thêm",
"Common.Views.Comments.textAddComment": "Thêm bình luận",
@@ -157,13 +154,9 @@
"Common.Views.History.textRestore": "Khôi phục",
"Common.Views.History.textShow": "Mở rộng",
"Common.Views.History.textShowAll": "Hiển thị thay đổi chi tiết",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "Hủy",
- "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
"Common.Views.ImageFromUrlDialog.textUrl": "Dán URL hình ảnh:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "Trường bắt buộc",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "Trường này phải là một URL có định dạng \"http://www.example.com\"",
- "Common.Views.InsertTableDialog.cancelButtonText": "Hủy",
- "Common.Views.InsertTableDialog.okButtonText": "OK",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "Bạn cần xác định số hàng và cột hợp lệ.",
"Common.Views.InsertTableDialog.txtColumns": "Số cột",
"Common.Views.InsertTableDialog.txtMaxText": "Giá trị lớn nhất cho trường này là {0}.",
@@ -171,11 +164,7 @@
"Common.Views.InsertTableDialog.txtRows": "Số hàng",
"Common.Views.InsertTableDialog.txtTitle": "Kích thước bảng",
"Common.Views.InsertTableDialog.txtTitleSplit": "Tách ô",
- "Common.Views.LanguageDialog.btnCancel": "Hủy",
- "Common.Views.LanguageDialog.btnOk": "OK",
"Common.Views.LanguageDialog.labelSelect": "Chọn ngôn ngữ tài liệu",
- "Common.Views.OpenDialog.cancelButtonText": "Hủy",
- "Common.Views.OpenDialog.okButtonText": "OK",
"Common.Views.OpenDialog.txtEncoding": "Mã hóa",
"Common.Views.OpenDialog.txtIncorrectPwd": "Mật khẩu không đúng.",
"Common.Views.OpenDialog.txtPassword": "Mật khẩu",
@@ -187,8 +176,6 @@
"Common.Views.Plugins.textLoading": "Đang tải",
"Common.Views.Plugins.textStart": "Bắt đầu",
"Common.Views.Plugins.textStop": "Dừng",
- "Common.Views.RenameDialog.cancelButtonText": "Hủy",
- "Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Tên file",
"Common.Views.RenameDialog.txtInvalidName": "Tên file không được chứa bất kỳ ký tự nào sau đây:",
"Common.Views.ReviewChanges.hintNext": "Đến thay đổi tiếp theo",
@@ -724,8 +711,6 @@
"DE.Views.ChartSettings.txtTight": "Sát",
"DE.Views.ChartSettings.txtTitle": "Biểu đồ",
"DE.Views.ChartSettings.txtTopAndBottom": "Trên cùng và dưới cùng",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "Hủy",
- "DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Số cột",
"DE.Views.CustomColumnsDialog.textSeparator": "Chia cột",
"DE.Views.CustomColumnsDialog.textSpacing": "Khoảng cách giữa các cột",
@@ -896,8 +881,6 @@
"DE.Views.DocumentHolder.txtUngroup": "Bỏ nhóm",
"DE.Views.DocumentHolder.updateStyleText": "Cập nhật kiểu %1",
"DE.Views.DocumentHolder.vertAlignText": "Căn chỉnh dọc",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Hủy",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Viền & Đổ màu",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Lề",
@@ -1032,8 +1015,6 @@
"DE.Views.HeaderFooterSettings.textTopCenter": "Phía trên chính giữa",
"DE.Views.HeaderFooterSettings.textTopLeft": "Phía trên bên trái",
"DE.Views.HeaderFooterSettings.textTopRight": "Phía trên bên phải",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "Hủy",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Đoạn văn bản đã chọn",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Hiển thị",
"DE.Views.HyperlinkSettingsDialog.textTitle": "Cài đặt Siêu liên kết",
@@ -1060,8 +1041,6 @@
"DE.Views.ImageSettings.txtThrough": "Xuyên qua",
"DE.Views.ImageSettings.txtTight": "Sát",
"DE.Views.ImageSettings.txtTopAndBottom": "Trên cùng và dưới cùng",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "Hủy",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "OK",
"DE.Views.ImageSettingsAdvanced.strMargins": "Thêm padding cho văn bản",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "Tuyệt đối",
"DE.Views.ImageSettingsAdvanced.textAlignment": "Căn chỉnh",
@@ -1137,7 +1116,6 @@
"DE.Views.LeftMenu.tipSupport": "Phản hồi & Hỗ trợ",
"DE.Views.LeftMenu.tipTitles": "Tiêu đề",
"DE.Views.LeftMenu.txtDeveloper": "CHẾ ĐỘ NHÀ PHÁT TRIỂN",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "Hủy",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "Gửi",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1187,7 +1165,6 @@
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Không thể bắt đầu trộn",
"DE.Views.NoteSettingsDialog.textApply": "Áp dụng",
"DE.Views.NoteSettingsDialog.textApplyTo": "Áp dụng thay đổi cho",
- "DE.Views.NoteSettingsDialog.textCancel": "Hủy",
"DE.Views.NoteSettingsDialog.textContinue": "Liên tục",
"DE.Views.NoteSettingsDialog.textCustom": "Tùy chỉnh dấu",
"DE.Views.NoteSettingsDialog.textDocument": "Toàn bộ tài liệu",
@@ -1204,9 +1181,7 @@
"DE.Views.NoteSettingsDialog.textStart": "Bắt đầu tại",
"DE.Views.NoteSettingsDialog.textTextBottom": "Dưới văn bản",
"DE.Views.NoteSettingsDialog.textTitle": "Cài đặt Ghi chú",
- "DE.Views.PageMarginsDialog.cancelButtonText": "Hủy",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Cảnh báo",
- "DE.Views.PageMarginsDialog.okButtonText": "OK",
"DE.Views.PageMarginsDialog.textBottom": "Dưới cùng",
"DE.Views.PageMarginsDialog.textLeft": "Trái",
"DE.Views.PageMarginsDialog.textRight": "Bên phải",
@@ -1214,8 +1189,6 @@
"DE.Views.PageMarginsDialog.textTop": "Trên cùng",
"DE.Views.PageMarginsDialog.txtMarginsH": "Lề trên và dưới cùng quá cao nên không thể làm chiều cao của trang",
"DE.Views.PageMarginsDialog.txtMarginsW": "Lề trái và phải quá rộng nên không thể làm chiều rộng của trang",
- "DE.Views.PageSizeDialog.cancelButtonText": "Hủy",
- "DE.Views.PageSizeDialog.okButtonText": "OK",
"DE.Views.PageSizeDialog.textHeight": "Chiều cao",
"DE.Views.PageSizeDialog.textTitle": "Kích thước trang",
"DE.Views.PageSizeDialog.textWidth": "Chiều rộng",
@@ -1232,14 +1205,11 @@
"DE.Views.ParagraphSettings.textExact": "Chính xác",
"DE.Views.ParagraphSettings.textNewColor": "Thêm màu tùy chỉnh mới",
"DE.Views.ParagraphSettings.txtAutoText": "Tự động",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Hủy",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "Các tab được chỉ định sẽ xuất hiện trong trường này",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "OK",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Tất cả Drop cap",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Viền & Đổ màu",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Ngắt trang đằng trước",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Gạch đôi giữa chữ",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Dòng đầu tiên",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Trái",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Bên phải",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Giữ các dòng cùng nhau",
@@ -1378,7 +1348,6 @@
"DE.Views.TableSettings.textBanded": "Gắn dải màu",
"DE.Views.TableSettings.textBorderColor": "Màu sắc",
"DE.Views.TableSettings.textBorders": "Kiểu đường viền",
- "DE.Views.TableSettings.textCancel": "Hủy",
"DE.Views.TableSettings.textColumns": "Cột",
"DE.Views.TableSettings.textEdit": "Hàng & Cột",
"DE.Views.TableSettings.textEmptyTemplate": "Không có template",
@@ -1386,7 +1355,6 @@
"DE.Views.TableSettings.textHeader": "Header",
"DE.Views.TableSettings.textLast": "Cuối cùng",
"DE.Views.TableSettings.textNewColor": "Thêm màu tùy chỉnh mới",
- "DE.Views.TableSettings.textOK": "OK",
"DE.Views.TableSettings.textRows": "Hàng",
"DE.Views.TableSettings.textSelectBorders": "Chọn đường viền bạn muốn thay đổi áp dụng kiểu đã chọn ở trên",
"DE.Views.TableSettings.textTemplate": "Chọn từ Template",
@@ -1402,8 +1370,6 @@
"DE.Views.TableSettings.tipRight": "Chỉ đặt viền ngoài bên phải",
"DE.Views.TableSettings.tipTop": "Chỉ đặt viền ngoài trên cùng",
"DE.Views.TableSettings.txtNoBorders": "Không viền",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "Hủy",
- "DE.Views.TableSettingsAdvanced.okButtonText": "OK",
"DE.Views.TableSettingsAdvanced.textAlign": "Căn chỉnh",
"DE.Views.TableSettingsAdvanced.textAlignment": "Căn chỉnh",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "Khoảng cách giữa các ô",
diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json
index 1f709890a..9ad2eda28 100644
--- a/apps/documenteditor/main/locale/zh.json
+++ b/apps/documenteditor/main/locale/zh.json
@@ -73,7 +73,6 @@
"Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框",
"Common.UI.ComboDataView.emptyComboText": "没有风格",
"Common.UI.ExtendedColorDialog.addButtonText": "添加",
- "Common.UI.ExtendedColorDialog.cancelButtonText": "取消",
"Common.UI.ExtendedColorDialog.textCurrent": "当前",
"Common.UI.ExtendedColorDialog.textHexErr": "输入的值不正确。 请输入000000和FFFFFF之间的值。",
"Common.UI.ExtendedColorDialog.textNew": "新",
@@ -112,8 +111,6 @@
"Common.Views.About.txtPoweredBy": "技术支持",
"Common.Views.About.txtTel": "电话:",
"Common.Views.About.txtVersion": "版本",
- "Common.Views.AdvancedSettingsWindow.cancelButtonText": "取消",
- "Common.Views.AdvancedSettingsWindow.okButtonText": "确定",
"Common.Views.Chat.textSend": "发送",
"Common.Views.Comments.textAdd": "添加",
"Common.Views.Comments.textAddComment": "发表评论",
@@ -173,13 +170,9 @@
"Common.Views.History.textShow": "扩大",
"Common.Views.History.textShowAll": "显示详细的更改",
"Common.Views.History.textVer": "版本",
- "Common.Views.ImageFromUrlDialog.cancelButtonText": "取消",
- "Common.Views.ImageFromUrlDialog.okButtonText": "确定",
"Common.Views.ImageFromUrlDialog.textUrl": "粘贴图片网址:",
"Common.Views.ImageFromUrlDialog.txtEmpty": "这是必填栏",
"Common.Views.ImageFromUrlDialog.txtNotUrl": "该字段应该是“http://www.example.com”格式的URL",
- "Common.Views.InsertTableDialog.cancelButtonText": "取消",
- "Common.Views.InsertTableDialog.okButtonText": "确定",
"Common.Views.InsertTableDialog.textInvalidRowsCols": "您需要指定有效的行数和列数。",
"Common.Views.InsertTableDialog.txtColumns": "列数",
"Common.Views.InsertTableDialog.txtMaxText": "该字段的最大值为{0}。",
@@ -187,12 +180,8 @@
"Common.Views.InsertTableDialog.txtRows": "行数",
"Common.Views.InsertTableDialog.txtTitle": "表格大小",
"Common.Views.InsertTableDialog.txtTitleSplit": "拆分单元格",
- "Common.Views.LanguageDialog.btnCancel": "取消",
- "Common.Views.LanguageDialog.btnOk": "确定",
"Common.Views.LanguageDialog.labelSelect": "选择文档语言",
- "Common.Views.OpenDialog.cancelButtonText": "取消",
"Common.Views.OpenDialog.closeButtonText": "关闭文件",
- "Common.Views.OpenDialog.okButtonText": "确定",
"Common.Views.OpenDialog.txtEncoding": "编码",
"Common.Views.OpenDialog.txtIncorrectPwd": "密码错误",
"Common.Views.OpenDialog.txtPassword": "密码",
@@ -200,8 +189,6 @@
"Common.Views.OpenDialog.txtProtected": "在您输入密码和打开文件后,该文件的当前密码将被重置。",
"Common.Views.OpenDialog.txtTitle": "选择%1个选项",
"Common.Views.OpenDialog.txtTitleProtected": "受保护的文件",
- "Common.Views.PasswordDialog.cancelButtonText": "取消",
- "Common.Views.PasswordDialog.okButtonText": "确定",
"Common.Views.PasswordDialog.txtDescription": "设置密码以保护此文档",
"Common.Views.PasswordDialog.txtIncorrectPwd": "确认密码不一致",
"Common.Views.PasswordDialog.txtPassword": "密码",
@@ -223,8 +210,6 @@
"Common.Views.Protection.txtInvisibleSignature": "添加数字签名",
"Common.Views.Protection.txtSignature": "签名",
"Common.Views.Protection.txtSignatureLine": "添加签名行",
- "Common.Views.RenameDialog.cancelButtonText": "取消",
- "Common.Views.RenameDialog.okButtonText": "确定",
"Common.Views.RenameDialog.textName": "文件名",
"Common.Views.RenameDialog.txtInvalidName": "文件名不能包含以下任何字符:",
"Common.Views.ReviewChanges.hintNext": "下一个变化",
@@ -289,8 +274,6 @@
"Common.Views.SaveAsDlg.textTitle": "保存文件夹",
"Common.Views.SelectFileDlg.textLoading": "载入中",
"Common.Views.SelectFileDlg.textTitle": "选择数据源",
- "Common.Views.SignDialog.cancelButtonText": "取消",
- "Common.Views.SignDialog.okButtonText": "确定",
"Common.Views.SignDialog.textBold": "加粗",
"Common.Views.SignDialog.textCertificate": "证书",
"Common.Views.SignDialog.textChange": "修改",
@@ -305,8 +288,6 @@
"Common.Views.SignDialog.textValid": "从%1到%2有效",
"Common.Views.SignDialog.tipFontName": "字体名称",
"Common.Views.SignDialog.tipFontSize": "字体大小",
- "Common.Views.SignSettingsDialog.cancelButtonText": "取消",
- "Common.Views.SignSettingsDialog.okButtonText": "确定",
"Common.Views.SignSettingsDialog.textAllowComment": "允许签名者在签名对话框中添加注释",
"Common.Views.SignSettingsDialog.textInfo": "签名者信息",
"Common.Views.SignSettingsDialog.textInfoEmail": "电子邮件",
@@ -1044,8 +1025,6 @@
"DE.Views.ChartSettings.txtTight": "紧",
"DE.Views.ChartSettings.txtTitle": "图表",
"DE.Views.ChartSettings.txtTopAndBottom": "上下",
- "DE.Views.ControlSettingsDialog.cancelButtonText": "取消",
- "DE.Views.ControlSettingsDialog.okButtonText": "确定",
"DE.Views.ControlSettingsDialog.textAppearance": "外观",
"DE.Views.ControlSettingsDialog.textApplyAll": "全部应用",
"DE.Views.ControlSettingsDialog.textBox": "边界框",
@@ -1060,8 +1039,6 @@
"DE.Views.ControlSettingsDialog.textTitle": "内容控制设置",
"DE.Views.ControlSettingsDialog.txtLockDelete": "无法删除内容控制",
"DE.Views.ControlSettingsDialog.txtLockEdit": "无法编辑内容",
- "DE.Views.CustomColumnsDialog.cancelButtonText": "取消",
- "DE.Views.CustomColumnsDialog.okButtonText": "确定",
"DE.Views.CustomColumnsDialog.textColumns": "列数",
"DE.Views.CustomColumnsDialog.textSeparator": "列分隔符",
"DE.Views.CustomColumnsDialog.textSpacing": "列之间的间距",
@@ -1273,8 +1250,6 @@
"DE.Views.DocumentHolder.txtUngroup": "取消组合",
"DE.Views.DocumentHolder.updateStyleText": "更新%1样式",
"DE.Views.DocumentHolder.vertAlignText": "垂直对齐",
- "DE.Views.DropcapSettingsAdvanced.cancelButtonText": "取消",
- "DE.Views.DropcapSettingsAdvanced.okButtonText": "确定",
"DE.Views.DropcapSettingsAdvanced.strBorders": "边框和填充",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "下沉",
"DE.Views.DropcapSettingsAdvanced.strMargins": "边距",
@@ -1429,8 +1404,6 @@
"DE.Views.HeaderFooterSettings.textTopLeft": "左上",
"DE.Views.HeaderFooterSettings.textTopPage": "页面顶部",
"DE.Views.HeaderFooterSettings.textTopRight": "右上",
- "DE.Views.HyperlinkSettingsDialog.cancelButtonText": "取消",
- "DE.Views.HyperlinkSettingsDialog.okButtonText": "确定",
"DE.Views.HyperlinkSettingsDialog.textDefault": "所选文本片段",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "展示",
"DE.Views.HyperlinkSettingsDialog.textExternal": "外部链接",
@@ -1472,8 +1445,6 @@
"DE.Views.ImageSettings.txtThrough": "通过",
"DE.Views.ImageSettings.txtTight": "紧",
"DE.Views.ImageSettings.txtTopAndBottom": "上下",
- "DE.Views.ImageSettingsAdvanced.cancelButtonText": "取消",
- "DE.Views.ImageSettingsAdvanced.okButtonText": "确定",
"DE.Views.ImageSettingsAdvanced.strMargins": "文字填充",
"DE.Views.ImageSettingsAdvanced.textAbsoluteWH": "绝对",
"DE.Views.ImageSettingsAdvanced.textAlignment": "校准",
@@ -1575,7 +1546,6 @@
"DE.Views.Links.tipContentsUpdate": "刷新目录",
"DE.Views.Links.tipInsertHyperlink": "添加超链接",
"DE.Views.Links.tipNotes": "插入或编辑脚注",
- "DE.Views.MailMergeEmailDlg.cancelButtonText": "取消",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
"DE.Views.MailMergeEmailDlg.okButtonText": "发送",
"DE.Views.MailMergeEmailDlg.subjectPlaceholder": "主题",
@@ -1636,7 +1606,6 @@
"DE.Views.Navigation.txtSelect": "选择内容",
"DE.Views.NoteSettingsDialog.textApply": "应用",
"DE.Views.NoteSettingsDialog.textApplyTo": "应用更改",
- "DE.Views.NoteSettingsDialog.textCancel": "取消",
"DE.Views.NoteSettingsDialog.textContinue": "连续",
"DE.Views.NoteSettingsDialog.textCustom": "自定义标记",
"DE.Views.NoteSettingsDialog.textDocument": "整个文件",
@@ -1653,11 +1622,7 @@
"DE.Views.NoteSettingsDialog.textStart": "开始",
"DE.Views.NoteSettingsDialog.textTextBottom": "文字下方",
"DE.Views.NoteSettingsDialog.textTitle": "笔记设置",
- "DE.Views.NumberingValueDialog.cancelButtonText": "取消",
- "DE.Views.NumberingValueDialog.okButtonText": "确定",
- "DE.Views.PageMarginsDialog.cancelButtonText": "取消",
"DE.Views.PageMarginsDialog.notcriticalErrorTitle": "警告",
- "DE.Views.PageMarginsDialog.okButtonText": "确定",
"DE.Views.PageMarginsDialog.textBottom": "底部",
"DE.Views.PageMarginsDialog.textLeft": "左",
"DE.Views.PageMarginsDialog.textRight": "右",
@@ -1665,8 +1630,6 @@
"DE.Views.PageMarginsDialog.textTop": "顶部",
"DE.Views.PageMarginsDialog.txtMarginsH": "顶部和底部边距对于给定的页面高度来说太高",
"DE.Views.PageMarginsDialog.txtMarginsW": "对于给定的页面宽度,左右边距太宽",
- "DE.Views.PageSizeDialog.cancelButtonText": "取消",
- "DE.Views.PageSizeDialog.okButtonText": "确定",
"DE.Views.PageSizeDialog.textHeight": "高度",
"DE.Views.PageSizeDialog.textPreset": "预设",
"DE.Views.PageSizeDialog.textTitle": "页面大小",
@@ -1685,14 +1648,11 @@
"DE.Views.ParagraphSettings.textExact": "精确地",
"DE.Views.ParagraphSettings.textNewColor": "添加新的自定义颜色",
"DE.Views.ParagraphSettings.txtAutoText": "自动",
- "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "取消",
"DE.Views.ParagraphSettingsAdvanced.noTabs": "指定的选项卡将显示在此字段中",
- "DE.Views.ParagraphSettingsAdvanced.okButtonText": "确定",
"DE.Views.ParagraphSettingsAdvanced.strAllCaps": "全部大写",
"DE.Views.ParagraphSettingsAdvanced.strBorders": "边框和填充",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "分页前",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "双删除线",
- "DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "第一行",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "左",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "右",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "保持同一行",
@@ -1836,15 +1796,11 @@
"DE.Views.StyleTitleDialog.textTitle": "标题",
"DE.Views.StyleTitleDialog.txtEmpty": "这是必填栏",
"DE.Views.StyleTitleDialog.txtNotEmpty": "区域不能为空",
- "DE.Views.TableFormulaDialog.cancelButtonText": "取消",
- "DE.Views.TableFormulaDialog.okButtonText": "确定",
"DE.Views.TableFormulaDialog.textBookmark": "粘贴书签",
"DE.Views.TableFormulaDialog.textFormat": "数字格式",
"DE.Views.TableFormulaDialog.textFormula": "公式",
"DE.Views.TableFormulaDialog.textInsertFunction": "粘贴函数",
"DE.Views.TableFormulaDialog.textTitle": "公式设置",
- "DE.Views.TableOfContentsSettings.cancelButtonText": "取消",
- "DE.Views.TableOfContentsSettings.okButtonText": "确定",
"DE.Views.TableOfContentsSettings.strAlign": "右对齐页码",
"DE.Views.TableOfContentsSettings.strLinks": "格式化目录作为链接",
"DE.Views.TableOfContentsSettings.strShowPages": "显示页码",
@@ -1884,7 +1840,6 @@
"DE.Views.TableSettings.textBanded": "带状",
"DE.Views.TableSettings.textBorderColor": "颜色",
"DE.Views.TableSettings.textBorders": "边框风格",
- "DE.Views.TableSettings.textCancel": "取消",
"DE.Views.TableSettings.textCellSize": "单元格大小",
"DE.Views.TableSettings.textColumns": "列",
"DE.Views.TableSettings.textDistributeCols": "分布列",
@@ -1896,7 +1851,6 @@
"DE.Views.TableSettings.textHeight": "高度",
"DE.Views.TableSettings.textLast": "最后",
"DE.Views.TableSettings.textNewColor": "添加新的自定义颜色",
- "DE.Views.TableSettings.textOK": "确定",
"DE.Views.TableSettings.textRows": "行",
"DE.Views.TableSettings.textSelectBorders": "选择您要更改应用样式的边框",
"DE.Views.TableSettings.textTemplate": "从模板中选择",
@@ -1913,8 +1867,6 @@
"DE.Views.TableSettings.tipRight": "仅设置外边界",
"DE.Views.TableSettings.tipTop": "仅限外部边框",
"DE.Views.TableSettings.txtNoBorders": "没有边框",
- "DE.Views.TableSettingsAdvanced.cancelButtonText": "取消",
- "DE.Views.TableSettingsAdvanced.okButtonText": "确定",
"DE.Views.TableSettingsAdvanced.textAlign": "校准",
"DE.Views.TableSettingsAdvanced.textAlignment": "校准",
"DE.Views.TableSettingsAdvanced.textAllowSpacing": "细胞之间的距离",
diff --git a/apps/documenteditor/main/resources/img/toolbar-menu.png b/apps/documenteditor/main/resources/img/toolbar-menu.png
index a4206c637..087a12a6f 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar-menu.png and b/apps/documenteditor/main/resources/img/toolbar-menu.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png
index 66d04ce47..72c646c68 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar-menu@2x.png and b/apps/documenteditor/main/resources/img/toolbar-menu@2x.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/contents.png b/apps/documenteditor/main/resources/img/toolbar/contents.png
index 83210bd7a..a778df998 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/contents.png and b/apps/documenteditor/main/resources/img/toolbar/contents.png differ
diff --git a/apps/documenteditor/main/resources/img/toolbar/contents@2x.png b/apps/documenteditor/main/resources/img/toolbar/contents@2x.png
index e1946694c..5f84a8441 100644
Binary files a/apps/documenteditor/main/resources/img/toolbar/contents@2x.png and b/apps/documenteditor/main/resources/img/toolbar/contents@2x.png differ
diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less
index a16802d19..4f7c8b1cc 100644
--- a/apps/documenteditor/main/resources/less/app.less
+++ b/apps/documenteditor/main/resources/less/app.less
@@ -144,4 +144,29 @@
}
@huge-icon-size: 37px;
-@x-huge-icon-size: 45px;
\ No newline at end of file
+@x-huge-icon-size: 45px;
+
+// Skeleton of document
+
+.doc-placeholder {
+ background: #fbfbfb;
+ width: 100%;
+ max-width: 796px;
+ margin: 40px auto;
+ height: 100%;
+ border: 1px solid #dfdfdf;
+ padding-top: 50px;
+
+ -webkit-animation: flickerAnimation 2s infinite ease-in-out;
+ -moz-animation: flickerAnimation 2s infinite ease-in-out;
+ -o-animation: flickerAnimation 2s infinite ease-in-out;
+ animation: flickerAnimation 2s infinite ease-in-out;
+
+ > .line {
+ height: 15px;
+ margin: 30px 80px;
+ background: #e2e2e2;
+ overflow: hidden;
+ position: relative;
+ }
+}
\ No newline at end of file
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index a0e59baba..39e72988b 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -39,12 +39,15 @@
height: 38px;
}
-.dropdown-menu {
+.dropdown-menu.toc-menu {
+ @contents-menu-item-height: 72px;
+ --bckgHOffset: 0px;
+
> li > a.item-contents {
div {
.background-ximage('@{app-image-path}/toolbar/contents.png', '@{app-image-path}/toolbar/contents@2x.png', 246px);
width: 246px;
- height: 72px;
+ height: @contents-menu-item-height;
.box-shadow(0 0 0 1px @gray);
@@ -62,6 +65,17 @@
}
}
}
+
+ .loop(@counter) when (@counter > 0) {
+ .loop((@counter - 1));
+ li:nth-child(@{counter}) > a.item-contents {
+ div {
+ background-position: 0 calc(~"var(--bckgHOffset) - " (@counter - 1)*@contents-menu-item-height);
+ }
+ }
+ }
+
+ .loop(2);
}
.color-schemas-menu {
diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js
index db28adc5d..b5ab49951 100644
--- a/apps/documenteditor/mobile/app-dev.js
+++ b/apps/documenteditor/mobile/app-dev.js
@@ -155,8 +155,6 @@ require([
]
});
- Common.Locale.apply();
-
var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link');
@@ -198,34 +196,36 @@ require([
//Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
- require([
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/util/utils',
- 'common/mobile/lib/controller/Plugins',
- 'documenteditor/mobile/app/controller/Editor',
- 'documenteditor/mobile/app/controller/Toolbar',
- 'documenteditor/mobile/app/controller/Search',
- 'documenteditor/mobile/app/controller/Main',
- 'documenteditor/mobile/app/controller/DocumentHolder',
- 'documenteditor/mobile/app/controller/Settings',
- 'documenteditor/mobile/app/controller/edit/EditContainer',
- 'documenteditor/mobile/app/controller/edit/EditText',
- 'documenteditor/mobile/app/controller/edit/EditParagraph',
- 'documenteditor/mobile/app/controller/edit/EditHeader',
- 'documenteditor/mobile/app/controller/edit/EditTable',
- 'documenteditor/mobile/app/controller/edit/EditImage',
- 'documenteditor/mobile/app/controller/edit/EditShape',
- 'documenteditor/mobile/app/controller/edit/EditChart',
- 'documenteditor/mobile/app/controller/edit/EditHyperlink',
- 'documenteditor/mobile/app/controller/add/AddContainer',
- 'documenteditor/mobile/app/controller/add/AddTable',
- 'documenteditor/mobile/app/controller/add/AddShape',
- 'documenteditor/mobile/app/controller/add/AddImage',
- 'documenteditor/mobile/app/controller/add/AddOther',
- 'common/mobile/lib/controller/Collaboration'
- ], function() {
- window.compareVersions = true;
- app.start();
+ Common.Locale.apply(function() {
+ require([
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/util/utils',
+ 'common/mobile/lib/controller/Plugins',
+ 'documenteditor/mobile/app/controller/Editor',
+ 'documenteditor/mobile/app/controller/Toolbar',
+ 'documenteditor/mobile/app/controller/Search',
+ 'documenteditor/mobile/app/controller/Main',
+ 'documenteditor/mobile/app/controller/DocumentHolder',
+ 'documenteditor/mobile/app/controller/Settings',
+ 'documenteditor/mobile/app/controller/edit/EditContainer',
+ 'documenteditor/mobile/app/controller/edit/EditText',
+ 'documenteditor/mobile/app/controller/edit/EditParagraph',
+ 'documenteditor/mobile/app/controller/edit/EditHeader',
+ 'documenteditor/mobile/app/controller/edit/EditTable',
+ 'documenteditor/mobile/app/controller/edit/EditImage',
+ 'documenteditor/mobile/app/controller/edit/EditShape',
+ 'documenteditor/mobile/app/controller/edit/EditChart',
+ 'documenteditor/mobile/app/controller/edit/EditHyperlink',
+ 'documenteditor/mobile/app/controller/add/AddContainer',
+ 'documenteditor/mobile/app/controller/add/AddTable',
+ 'documenteditor/mobile/app/controller/add/AddShape',
+ 'documenteditor/mobile/app/controller/add/AddImage',
+ 'documenteditor/mobile/app/controller/add/AddOther',
+ 'common/mobile/lib/controller/Collaboration'
+ ], function() {
+ window.compareVersions = true;
+ app.start();
+ });
});
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js
index cfd2b1b40..dba0a47b4 100644
--- a/apps/documenteditor/mobile/app.js
+++ b/apps/documenteditor/mobile/app.js
@@ -166,8 +166,6 @@ require([
]
});
- Common.Locale.apply();
-
var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link');
@@ -209,33 +207,35 @@ require([
//Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
- require([
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/util/utils',
- 'common/mobile/lib/controller/Plugins',
- 'documenteditor/mobile/app/controller/Editor',
- 'documenteditor/mobile/app/controller/Toolbar',
- 'documenteditor/mobile/app/controller/Search',
- 'documenteditor/mobile/app/controller/Main',
- 'documenteditor/mobile/app/controller/DocumentHolder',
- 'documenteditor/mobile/app/controller/Settings',
- 'documenteditor/mobile/app/controller/edit/EditContainer',
- 'documenteditor/mobile/app/controller/edit/EditText',
- 'documenteditor/mobile/app/controller/edit/EditParagraph',
- 'documenteditor/mobile/app/controller/edit/EditHeader',
- 'documenteditor/mobile/app/controller/edit/EditTable',
- 'documenteditor/mobile/app/controller/edit/EditImage',
- 'documenteditor/mobile/app/controller/edit/EditShape',
- 'documenteditor/mobile/app/controller/edit/EditChart',
- 'documenteditor/mobile/app/controller/edit/EditHyperlink',
- 'documenteditor/mobile/app/controller/add/AddContainer',
- 'documenteditor/mobile/app/controller/add/AddTable',
- 'documenteditor/mobile/app/controller/add/AddShape',
- 'documenteditor/mobile/app/controller/add/AddImage',
- 'documenteditor/mobile/app/controller/add/AddOther',
- 'common/mobile/lib/controller/Collaboration'
- ], function() {
- app.start();
+ Common.Locale.apply(function() {
+ require([
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/util/utils',
+ 'common/mobile/lib/controller/Plugins',
+ 'documenteditor/mobile/app/controller/Editor',
+ 'documenteditor/mobile/app/controller/Toolbar',
+ 'documenteditor/mobile/app/controller/Search',
+ 'documenteditor/mobile/app/controller/Main',
+ 'documenteditor/mobile/app/controller/DocumentHolder',
+ 'documenteditor/mobile/app/controller/Settings',
+ 'documenteditor/mobile/app/controller/edit/EditContainer',
+ 'documenteditor/mobile/app/controller/edit/EditText',
+ 'documenteditor/mobile/app/controller/edit/EditParagraph',
+ 'documenteditor/mobile/app/controller/edit/EditHeader',
+ 'documenteditor/mobile/app/controller/edit/EditTable',
+ 'documenteditor/mobile/app/controller/edit/EditImage',
+ 'documenteditor/mobile/app/controller/edit/EditShape',
+ 'documenteditor/mobile/app/controller/edit/EditChart',
+ 'documenteditor/mobile/app/controller/edit/EditHyperlink',
+ 'documenteditor/mobile/app/controller/add/AddContainer',
+ 'documenteditor/mobile/app/controller/add/AddTable',
+ 'documenteditor/mobile/app/controller/add/AddShape',
+ 'documenteditor/mobile/app/controller/add/AddImage',
+ 'documenteditor/mobile/app/controller/add/AddOther',
+ 'common/mobile/lib/controller/Collaboration'
+ ], function() {
+ app.start();
+ });
});
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index deecc10f8..199a5a109 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -220,6 +220,9 @@ define([
if (me.editorConfig.lang)
me.api.asc_setLocale(me.editorConfig.lang);
+ if (!me.editorConfig.customization || !(me.editorConfig.customization.loaderName || me.editorConfig.customization.loaderLogo))
+ $('#editor_sdk').append('');
+
// if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
// Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
},
@@ -535,7 +538,8 @@ define([
value = Common.localStorage.getItem("de-show-tableline");
me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true);
- value = Common.localStorage.getBool("de-mobile-spellcheck", false);
+ value = Common.localStorage.getBool("de-mobile-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false));
+ Common.Utils.InternalSettings.set("de-mobile-spellcheck", value);
me.api.asc_setSpellCheck(value);
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
@@ -604,7 +608,22 @@ define([
me.applyLicense();
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
+
+ if (!me.appOptions.canReview) {
+ var canViewReview = me.appOptions.isEdit || me.api.asc_HaveRevisionsChanges(true);
+ DE.getController('Common.Controllers.Collaboration').setCanViewReview(canViewReview);
+ if (canViewReview) {
+ var viewReviewMode = Common.localStorage.getItem("de-view-review-mode");
+ if (viewReviewMode===null)
+ viewReviewMode = me.appOptions.customization && /^(original|final|markup)$/i.test(me.appOptions.customization.reviewDisplay) ? me.appOptions.customization.reviewDisplay.toLocaleLowerCase() : 'original';
+ viewReviewMode = me.appOptions.isEdit ? 'markup' : viewReviewMode;
+ DE.getController('Common.Controllers.Collaboration').turnDisplayMode(viewReviewMode);
+ }
+ }
+
Common.Gateway.documentReady();
+
+ $('.doc-placeholder').remove();
},
onLicenseChanged: function(params) {
diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 8269cbea5..ba3138074 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -229,7 +229,7 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content');
} else if ('#settings-advanced-view' == pageId) {
me.initPageAdvancedSettings();
- $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false));
+ $('#settings-spellcheck input:checkbox').attr('checked', Common.Utils.InternalSettings.get("de-mobile-spellcheck"));
$('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me));
$('#settings-no-characters input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-no-characters") == 'true') ? true : false);
$('#settings-no-characters input:checkbox').single('change', _.bind(me.onNoCharacters, me));
@@ -262,7 +262,7 @@ define([
$('#settings-print').single('click', _.bind(me.onPrint, me));
$('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me));
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-document').addClass('disabled');
}
var _userCount = DE.getController('Main').returnUserCount();
@@ -378,7 +378,7 @@ define([
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
$unitMeasurement.val([value]);
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-no-characters').addClass('disabled');
$('#settings-hidden-borders').addClass('disabled');
}
@@ -543,6 +543,7 @@ define([
var $checkbox = $(e.currentTarget),
state = $checkbox.is(':checked');
Common.localStorage.setItem("de-mobile-spellcheck", state ? 1 : 0);
+ Common.Utils.InternalSettings.set("de-mobile-spellcheck", state);
this.api && this.api.asc_setSpellCheck(state);
},
diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js
index ccd784064..d5ed2de7f 100644
--- a/apps/documenteditor/mobile/app/controller/Toolbar.js
+++ b/apps/documenteditor/mobile/app/controller/Toolbar.js
@@ -153,7 +153,7 @@ define([
},
setDisplayMode: function(displayMode) {
- stateDisplayMode = displayMode == "Final" || displayMode == "Original" ? true : false;
+ stateDisplayMode = displayMode == "final" || displayMode == "original" ? true : false;
var selected = this.api.getSelectedElements();
this.onApiFocusObject(selected);
},
diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html
index 5f3b6495a..0a15273f4 100644
--- a/apps/documenteditor/mobile/index.html
+++ b/apps/documenteditor/mobile/index.html
@@ -16,172 +16,107 @@
+
+
diff --git a/apps/documenteditor/mobile/index.html.deploy b/apps/documenteditor/mobile/index.html.deploy
index dc911efec..99874965a 100644
--- a/apps/documenteditor/mobile/index.html.deploy
+++ b/apps/documenteditor/mobile/index.html.deploy
@@ -15,172 +15,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+