From dfa807f4b11166df3bf8877234720cdda22a6509 Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Tue, 13 Aug 2019 14:34:20 +0300 Subject: [PATCH 01/86] [comapre] Add scripts --- apps/documenteditor/sdk_dev_scripts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js index 7eb434600..6e1046429 100644 --- a/apps/documenteditor/sdk_dev_scripts.js +++ b/apps/documenteditor/sdk_dev_scripts.js @@ -13,6 +13,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/TableId.js", "../../../../sdkjs/common/TableIdChanges.js", "../../../../sdkjs/common/macros.js", + "../../../../sdkjs/common/delta.js", "../../../../sdkjs/common/NumFormat.js", "../../../../sdkjs/common/SerializeChart.js", "../../../../sdkjs/common/AdvancedOptions.js", @@ -91,6 +92,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js", "../../../../sdkjs/word/Editor/CollaborativeEditing.js", "../../../../sdkjs/word/Editor/DocumentContentElementBase.js", + "../../../../sdkjs/word/Editor/DocumentComparison.js", "../../../../sdkjs/word/Editor/ParagraphContentBase.js", "../../../../sdkjs/word/Editor/Comments.js", "../../../../sdkjs/word/Editor/CommentsChanges.js", From 9b0047189df3920013de45579a3e1bcfbf0f3f68 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 13 Aug 2019 17:40:52 +0300 Subject: [PATCH 02/86] [DE] Compare two documents --- .../main/lib/controller/ReviewChanges.js | 53 ++++++++++++++++++- .../main/lib/view/ImageFromUrlDialog.js | 2 +- apps/common/main/lib/view/ReviewChanges.js | 47 +++++++++++++++- apps/documenteditor/main/app/view/Toolbar.js | 4 +- apps/documenteditor/main/locale/en.json | 7 +++ 5 files changed, 106 insertions(+), 7 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 9fe50e74d..b1aa9de10 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -74,7 +74,8 @@ define([ 'reviewchange:reject': _.bind(this.onRejectClick, this), 'reviewchange:delete': _.bind(this.onDeleteClick, this), 'reviewchange:preview': _.bind(this.onBtnPreviewClick, this), - 'reviewchanges:view': _.bind(this.onReviewViewClick, this), + 'reviewchange:view': _.bind(this.onReviewViewClick, this), + 'reviewchange:compare': _.bind(this.onCompareClick, this), 'lang:document': _.bind(this.onDocLanguage, this), 'collaboration:coauthmode': _.bind(this.onCoAuthMode, this) }, @@ -554,6 +555,53 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.view); }, + onCompareClick: function(item) { + if (this.api) { + if (item === 'file') { + // if (this.api) + // this.api.asc_addDocument(); + Common.NotificationCenter.trigger('edit:complete', this.view); + } else if (item === 'url') { + var me = this; + (new Common.Views.ImageFromUrlDialog({ + title: me.textUrl, + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + var checkUrl = value.replace(/ /g, ''); + if (!_.isEmpty(checkUrl)) { + // me.api.AddDocumentUrl(checkUrl); + } + } + Common.NotificationCenter.trigger('edit:complete', me.view); + } + } + })).show(); + } else if (item === 'storage') { + // if (this.toolbar.mode.canRequestInsertImage) { + // Common.Gateway.requestInsertImage(); + // } else { + // (new Common.Views.SelectFileDlg({ + // fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") + // })).on('selectfile', function(obj, file){ + // me.insertImage(file); + // }).show(); + // } + } else if (item === 'settings') { + // show settings dialog + } + } + Common.NotificationCenter.trigger('edit:complete', this.view); + }, + + insertImage: function(data) { + if (data && data.url) { + this.toolbar.fireEvent('insertimage', this.toolbar); + this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); + } + }, + turnDisplayMode: function(mode) { if (this.api) { if (mode === 'final') @@ -797,6 +845,7 @@ define([ textTableRowsDel: 'Table Rows Deleted', textParaMoveTo: 'Moved:', textParaMoveFromUp: 'Moved Up:', - textParaMoveFromDown: 'Moved Down:' + textParaMoveFromDown: 'Moved Down:', + textUrl: 'Paste a document URL' }, Common.Controllers.ReviewChanges || {})); }); \ No newline at end of file diff --git a/apps/common/main/lib/view/ImageFromUrlDialog.js b/apps/common/main/lib/view/ImageFromUrlDialog.js index 63b0ea685..9f25ef434 100644 --- a/apps/common/main/lib/view/ImageFromUrlDialog.js +++ b/apps/common/main/lib/view/ImageFromUrlDialog.js @@ -55,7 +55,7 @@ define([ this.template = [ '
', '
', - '', + '', '
', '
', '
', diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 2325f1b31..5e5f4daaf 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -79,6 +79,10 @@ define([ '' + '' + '
' + + '
' + + '' + + '
' + + '
' + '
' + '' + '
' + @@ -115,6 +119,14 @@ define([ me.fireEvent('reviewchange:reject', [menu, item]); }); + this.btnCompare.on('click', function (e) { + me.fireEvent('reviewchange:compare', ['file']); + }); + + this.btnCompare.menu.on('item:click', function (menu, item, e) { + me.fireEvent('reviewchange:compare', [item.value]); + }); + this.btnsTurnReview.forEach(function (button) { button.on('click', _click_turnpreview.bind(me)); }); @@ -129,7 +141,7 @@ define([ }); this.btnReviewView && this.btnReviewView.menu.on('item:click', function (menu, item, e) { - me.fireEvent('reviewchanges:view', [menu, item]); + me.fireEvent('reviewchange:view', [menu, item]); }); } @@ -188,6 +200,13 @@ define([ iconCls: 'review-deny' }); + this.btnCompare = new Common.UI.Button({ + cls : 'btn-toolbar x-huge icon-top', + caption : this.txtCompare, + split : true, + iconCls: 'review-deny' + }); + this.btnTurnOn = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-ic-review', @@ -348,6 +367,17 @@ define([ ); me.btnReject.updateHint([me.tipRejectCurrent, me.txtRejectChanges]); + me.btnCompare.setMenu(new Common.UI.Menu({ + items: [ + {caption: me.mniFromFile, value: 'file'}, + {caption: me.mniFromUrl, value: 'url'}, + {caption: me.mniFromStorage, value: 'storage'}, + {caption: '--'}, + {caption: me.mniSettings, value: 'settings'} + ] + })); + me.btnCompare.updateHint(me.tipCompare); + me.btnAccept.setDisabled(config.isReviewOnly); me.btnReject.setDisabled(config.isReviewOnly); } @@ -400,6 +430,7 @@ define([ var separator_sharing = !(me.btnSharing || me.btnCoAuthMode) ? me.$el.find('.separator.sharing') : '.separator.sharing', separator_comments = !(config.canComments && config.canCoAuthoring) ? me.$el.find('.separator.comments') : '.separator.comments', separator_review = !(config.canReview || config.canViewReview) ? me.$el.find('.separator.review') : '.separator.review', + separator_compare = !config.canReview ? me.$el.find('.separator.compare') : '.separator.compare', separator_chat = !me.btnChat ? me.$el.find('.separator.chat') : '.separator.chat', separator_last; @@ -418,6 +449,11 @@ define([ else separator_last = separator_review; + if (typeof separator_compare == 'object') + separator_compare.hide().prev('.group').hide(); + else + separator_last = separator_compare; + if (typeof separator_chat == 'object') separator_chat.hide().prev('.group').hide(); else @@ -438,6 +474,7 @@ define([ if ( this.appConfig.canReview ) { this.btnAccept.render(this.$el.find('#btn-change-accept')); this.btnReject.render(this.$el.find('#btn-change-reject')); + this.btnCompare.render(this.$el.find('#btn-compare')); this.btnTurnOn.render(this.$el.find('#btn-review-on')); } this.btnPrev && this.btnPrev.render(this.$el.find('#btn-change-prev')); @@ -609,7 +646,13 @@ define([ txtFinalCap: 'Final', txtOriginalCap: 'Original', strFastDesc: 'Real-time co-editing. All changes are saved automatically.', - strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.' + strStrictDesc: 'Use the \'Save\' button to sync the changes you and others make.', + txtCompare: 'Compare', + tipCompare: 'Compare current document with another one', + mniFromFile: 'Document from File', + mniFromUrl: 'Document from URL', + mniFromStorage: 'Document from Storage', + mniSettings: 'Comparison Settings' } }()), Common.Views.ReviewChanges || {})); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 6a1ee4caa..9a4365729 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2272,8 +2272,8 @@ define([ tipBack: 'Back', tipInsertShape: 'Insert Autoshape', tipInsertEquation: 'Insert Equation', - mniImageFromFile: 'Image from file', - mniImageFromUrl: 'Image from url', + mniImageFromFile: 'Image from File', + mniImageFromUrl: 'Image from URL', mniCustomTable: 'Insert Custom Table', textTitleError: 'Error', textInsertPageNumber: 'Insert page number', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 135c39df3..e8842a041 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -69,6 +69,7 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -268,6 +269,12 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", + "Common.Views.ReviewChanges.txtCompare": "Compare", + "Common.Views.ReviewChanges.tipCompare": "Compare current document with another one", + "Common.Views.ReviewChanges.mniFromFile": "Document from File", + "Common.Views.ReviewChanges.mniFromUrl": "Document from URL", + "Common.Views.ReviewChanges.mniFromStorage": "Document from Storage", + "Common.Views.ReviewChanges.mniSettings": "Comparison Settings", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.txtAccept": "Accept", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes", From 8ae13a7fdecc50325a3f02c293d80c23cad61e13 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Aug 2019 11:07:24 +0300 Subject: [PATCH 03/86] [DE] Add settings for comparison of documents --- .../main/lib/controller/ReviewChanges.js | 26 ++- .../main/app/controller/Toolbar.js | 3 +- .../main/app/view/CompareSettingsDialog.js | 154 ++++++++++++++++++ apps/documenteditor/main/locale/en.json | 4 + 4 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 apps/documenteditor/main/app/view/CompareSettingsDialog.js diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index b1aa9de10..3eff2a871 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -96,7 +96,7 @@ define([ this.collection = this.getApplication().getCollection('Common.Collections.ReviewChanges'); this.userCollection = this.getApplication().getCollection('Common.Collections.Users'); - this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false}; + this._state = {posx: -1000, posy: -1000, popoverVisible: false, previewMode: false, compareSettings: null /*new AscCommon.CComparisonPr()*/}; Common.NotificationCenter.on('reviewchanges:turn', this.onTurnPreview.bind(this)); Common.NotificationCenter.on('spelling:turn', this.onTurnSpelling.bind(this)); @@ -559,7 +559,7 @@ define([ if (this.api) { if (item === 'file') { // if (this.api) - // this.api.asc_addDocument(); + // this.api.asc_addDocument(me._state.compareSettings); Common.NotificationCenter.trigger('edit:complete', this.view); } else if (item === 'url') { var me = this; @@ -570,7 +570,7 @@ define([ if (me.api) { var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { - // me.api.AddDocumentUrl(checkUrl); + // me.api.AddDocumentUrl(checkUrl, me._state.compareSettings); } } Common.NotificationCenter.trigger('edit:complete', me.view); @@ -584,21 +584,29 @@ define([ // (new Common.Views.SelectFileDlg({ // fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") // })).on('selectfile', function(obj, file){ - // me.insertImage(file); + // me.selectFile(file, me._state.compareSettings); // }).show(); // } } else if (item === 'settings') { - // show settings dialog + var me = this; + (new DE.Views.CompareSettingsDialog({ + props: me._state.compareSettings, + handler: function(result, value) { + if (result == 'ok') { + me._state.compareSettings = value; + } + + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + })).show(); } } Common.NotificationCenter.trigger('edit:complete', this.view); }, - insertImage: function(data) { + selectFile: function(data) { if (data && data.url) { - this.toolbar.fireEvent('insertimage', this.toolbar); - this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); + // this.api.AddDocumentUrl(data.url, this._state.compareSettings, data.token);// for loading from storage } }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index f093edef4..ff10841e2 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -56,7 +56,8 @@ define([ 'documenteditor/main/app/controller/PageLayout', 'documenteditor/main/app/view/CustomColumnsDialog', 'documenteditor/main/app/view/ControlSettingsDialog', - 'documenteditor/main/app/view/WatermarkSettingsDialog' + 'documenteditor/main/app/view/WatermarkSettingsDialog', + 'documenteditor/main/app/view/CompareSettingsDialog' ], function () { 'use strict'; diff --git a/apps/documenteditor/main/app/view/CompareSettingsDialog.js b/apps/documenteditor/main/app/view/CompareSettingsDialog.js new file mode 100644 index 000000000..20fc1bc1b --- /dev/null +++ b/apps/documenteditor/main/app/view/CompareSettingsDialog.js @@ -0,0 +1,154 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ + +/** + * CompareSettingsDialog.js.js + * + * Created by Julia Radzhabova on 14.08.2019 + * Copyright (c) 2019 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'common/main/lib/util/utils', + 'common/main/lib/component/CheckBox', + 'common/main/lib/component/InputField', + 'common/main/lib/view/AdvancedSettingsWindow' +], function () { 'use strict'; + + DE.Views.CompareSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ + options: { + contentWidth: 220, + height: 160 + }, + + initialize : function(options) { + var me = this; + + _.extend(this.options, { + title: this.textTitle, + template: [ + '
', + '
', + '
', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '
', + '', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '', + '', + '
' + ].join('') + }, options); + + this.handler = options.handler; + this.props = options.props; + + Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.Views.AdvancedSettingsWindow.prototype.render.call(this); + var me = this; + + this.radioChar = new Common.UI.RadioBox({ + el: $('#compare-settings-radio-char'), + labelText: this.textChar, + name: 'asc-radio-compare-show' + }); + + this.radioWord = new Common.UI.RadioBox({ + el: $('#compare-settings-radio-word'), + labelText: this.textWord, + name: 'asc-radio-compare-show', + checked: true + }); + + this.afterRender(); + }, + + afterRender: function() { + this._setDefaults(this.props); + }, + + show: function() { + Common.Views.AdvancedSettingsWindow.prototype.show.apply(this, arguments); + }, + + _setDefaults: function (props) { + if (props) { + // var val = props.get_ShowAt(); + // val ? this.radioChar.setValue(true, true) : this.radioWord.setValue(true, true); + } + }, + + getSettings: function () { + // var props = new AscCommon.CComparisonPr(); + // props.put_ShowAt(this.radioChar.getValue()); + // return props; + }, + + onDlgBtnClick: function(event) { + var me = this; + var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event; + if (state == 'ok') { + this.handler && this.handler.call(this, state, this.getSettings()); + } + + this.close(); + }, + + textTitle: 'Comparison Settings', + textShow: 'Show changes at', + textChar: 'Character level', + textWord: 'Word level' + + }, DE.Views.CompareSettingsDialog || {})) +}); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e8842a041..082b4f28b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1054,6 +1054,10 @@ "DE.Views.ChartSettings.txtTight": "Tight", "DE.Views.ChartSettings.txtTitle": "Chart", "DE.Views.ChartSettings.txtTopAndBottom": "Top and bottom", + "DE.Views.CompareSettingsDialog.textTitle": "Comparison Settings", + "DE.Views.CompareSettingsDialog.textShow": "Show changes at", + "DE.Views.CompareSettingsDialog.textChar": "Character level", + "DE.Views.CompareSettingsDialog.textWord": "Word level", "DE.Views.ControlSettingsDialog.cancelButtonText": "Cancel", "DE.Views.ControlSettingsDialog.okButtonText": "OK", "DE.Views.ControlSettingsDialog.textAppearance": "Appearance", From 322888f37d32df875df95660a08f5891529b2e8c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Aug 2019 16:18:57 +0300 Subject: [PATCH 04/86] [DE] Compare documents: use sdk methods --- apps/common/main/lib/controller/ReviewChanges.js | 10 +++++++--- .../main/app/view/CompareSettingsDialog.js | 14 +++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 3eff2a871..5eea76e1f 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -557,9 +557,13 @@ define([ onCompareClick: function(item) { if (this.api) { + if (!this._state.compareSettings) { + this._state.compareSettings = new AscCommonWord.ComparisonOptions(); + this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char")); + } if (item === 'file') { - // if (this.api) - // this.api.asc_addDocument(me._state.compareSettings); + if (this.api) + this.api.asc_CompareDocumentFile(this._state.compareSettings); Common.NotificationCenter.trigger('edit:complete', this.view); } else if (item === 'url') { var me = this; @@ -570,7 +574,7 @@ define([ if (me.api) { var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { - // me.api.AddDocumentUrl(checkUrl, me._state.compareSettings); + me.api.asc_CompareDocumentUrl(checkUrl, me._state.compareSettings); } } Common.NotificationCenter.trigger('edit:complete', me.view); diff --git a/apps/documenteditor/main/app/view/CompareSettingsDialog.js b/apps/documenteditor/main/app/view/CompareSettingsDialog.js index 20fc1bc1b..dbf6f5c46 100644 --- a/apps/documenteditor/main/app/view/CompareSettingsDialog.js +++ b/apps/documenteditor/main/app/view/CompareSettingsDialog.js @@ -107,8 +107,7 @@ define([ this.radioWord = new Common.UI.RadioBox({ el: $('#compare-settings-radio-word'), labelText: this.textWord, - name: 'asc-radio-compare-show', - checked: true + name: 'asc-radio-compare-show' }); this.afterRender(); @@ -124,15 +123,15 @@ define([ _setDefaults: function (props) { if (props) { - // var val = props.get_ShowAt(); - // val ? this.radioChar.setValue(true, true) : this.radioWord.setValue(true, true); + var value = props.getWords(); + (value==false) ? this.radioChar.setValue(true, true) : this.radioWord.setValue(true, true); } }, getSettings: function () { - // var props = new AscCommon.CComparisonPr(); - // props.put_ShowAt(this.radioChar.getValue()); - // return props; + var props = new AscCommonWord.ComparisonOptions(); + props.putWords(this.radioWord.getValue()); + return props; }, onDlgBtnClick: function(event) { @@ -140,6 +139,7 @@ define([ var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event; if (state == 'ok') { this.handler && this.handler.call(this, state, this.getSettings()); + Common.localStorage.setItem("de-compare-char", this.radioChar.getValue()); } this.close(); From fa4e0a6cda0ca7fa70577e3456126d8cc0815163 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Oct 2019 17:33:29 +0300 Subject: [PATCH 05/86] [DE] Add asc_onAcceptChangesBeforeCompare event --- .../main/lib/controller/ReviewChanges.js | 20 ++++++++++++++++++- apps/documenteditor/main/locale/en.json | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index ff9b70a8d..659b45025 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -125,6 +125,7 @@ define([ this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.onApiShowChange, this)); this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this)); } + this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); } }, @@ -624,6 +625,22 @@ define([ } }, + onAcceptChangesBeforeCompare: function(callback) { + var me = this; + Common.UI.warning({ + width: 550, + msg: this.textAcceptBeforeCompare, + buttons: ['yes', 'no'], + primary: 'yes', + callback: function(result) { + _.defer(function() { + if (callback) callback.call(result=='yes'); + }); + Common.NotificationCenter.trigger('edit:complete', this.view); + } + }); + }, + turnDisplayMode: function(mode) { if (this.api) { if (mode === 'final') @@ -893,6 +910,7 @@ define([ textParaMoveTo: 'Moved:', textParaMoveFromUp: 'Moved Up:', textParaMoveFromDown: 'Moved Down:', - textUrl: 'Paste a document URL' + textUrl: 'Paste a document URL', + textAcceptBeforeCompare: 'In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?' }, Common.Controllers.ReviewChanges || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index fcd0043ea..4b6a86242 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -70,6 +70,7 @@ "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL", + "Common.Controllers.ReviewChanges.textAcceptBeforeCompare": "In order to compare documents all the tracked changes in them will be considered to have been accepted. Do you want to continue?", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", From 5c05508dcff669cb55c4928f9ccb87cb5efb4a47 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 11 Oct 2019 15:12:59 +0300 Subject: [PATCH 06/86] [DE] Compare files: add errors. --- apps/api/documents/api.js | 1 + apps/common/Gateway.js | 8 ++++++++ .../main/lib/controller/ReviewChanges.js | 20 ++++++++++++------- apps/common/main/lib/view/ReviewChanges.js | 1 + .../main/app/controller/Main.js | 20 +++++++++++++++++-- apps/documenteditor/main/locale/en.json | 3 +++ 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 59985afe8..5782fb9f7 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -206,6 +206,7 @@ _config.editorConfig.canRequestSaveAs = _config.events && !!_config.events.onRequestSaveAs; _config.editorConfig.canRequestInsertImage = _config.events && !!_config.events.onRequestInsertImage; _config.editorConfig.canRequestMailMergeRecipients = _config.events && !!_config.events.onRequestMailMergeRecipients; + _config.editorConfig.canRequestCompareFile = _config.events && !!_config.events.onRequestCompareFile; _config.frameEditorId = placeholderId; var onMouseUp = function (evt) { diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index b8e90ebad..b8726a329 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -118,6 +118,10 @@ if (Common === undefined) { 'setMailMergeRecipients': function(data) { $me.trigger('setmailmergerecipients', data); + }, + + 'compareFile': function(data) { + $me.trigger('comparefile', data); } }; @@ -308,6 +312,10 @@ if (Common === undefined) { _postMessage({event:'onRequestMailMergeRecipients'}) }, + requestCompareFile: function () { + _postMessage({event:'onRequestCompareFile'}) + }, + on: function(event, handler){ var localHandler = function(event, data){ handler.call(me, data) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 659b45025..ab0f5760c 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -127,6 +127,8 @@ define([ } this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); + + Common.Gateway.on('comparefile', _.bind(this.compareFile, this)); } }, @@ -593,13 +595,13 @@ define([ } })).show(); } else if (item === 'storage') { - // if (this.toolbar.mode.canRequestInsertImage) { - // Common.Gateway.requestInsertImage(); + // if (this.appConfig.canRequestCompareFile) { + // Common.Gateway.requestCompareFile(); // } else { // (new Common.Views.SelectFileDlg({ - // fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "ImagesOnly") - // })).on('selectfile', function(obj, file){ - // me.selectFile(file, me._state.compareSettings); + // fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "DocumentsOnly") + // })).on('comparefile', function(obj, file){ + // me.compareFile(file, me._state.compareSettings); // }).show(); // } } else if (item === 'settings') { @@ -619,9 +621,13 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.view); }, - selectFile: function(data) { + compareFile: function(data) { + if (!this._state.compareSettings) { + this._state.compareSettings = new AscCommonWord.ComparisonOptions(); + this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char")); + } if (data && data.url) { - // this.api.AddDocumentUrl(data.url, this._state.compareSettings, data.token);// for loading from storage + this.api.asc_CompareDocumentUrl(data.url, this._state.compareSettings, data.token);// for loading from storage } }, diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 5e5f4daaf..35069f1c9 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -376,6 +376,7 @@ define([ {caption: me.mniSettings, value: 'settings'} ] })); + me.btnCompare.menu.items[2].setVisible(me.appConfig.canRequestCompareFile || me.appConfig.fileChoiceUrl && me.appConfig.fileChoiceUrl.indexOf("{documentType}")>-1); me.btnCompare.updateHint(me.tipCompare); me.btnAccept.setDisabled(config.isReviewOnly); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c17bb472a..c29231e22 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -351,6 +351,7 @@ define([ this.appOptions.canRequestSendNotify = this.editorConfig.canRequestSendNotify; this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs; this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage; + this.appOptions.canRequestCompareFile = this.editorConfig.canRequestCompareFile; this.appOptions.canRequestMailMergeRecipients = this.editorConfig.canRequestMailMergeRecipients; appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header'); @@ -1384,6 +1385,18 @@ define([ config.msg = this.uploadImageFileCountMessage; break; + case Asc.c_oAscError.ID.UplDocumentSize: + config.msg = this.uploadDocSizeMessage; + break; + + case Asc.c_oAscError.ID.UplDocumentExt: + config.msg = this.uploadDocExtMessage; + break; + + case Asc.c_oAscError.ID.UplDocumentFileCount: + config.msg = this.uploadDocFileCountMessage; + break; + case Asc.c_oAscError.ID.SplitCellMaxRows: config.msg = this.splitMaxRowsErrorText.replace('%1', errData.get_Value()); break; @@ -2157,7 +2170,7 @@ define([ uploadImageTextText: 'Uploading image...', savePreparingText: 'Preparing to save', savePreparingTitle: 'Preparing to save. Please wait...', - uploadImageSizeMessage: 'Maximium image size limit exceeded.', + uploadImageSizeMessage: 'Maximum image size limit exceeded.', uploadImageExtMessage: 'Unknown image format.', uploadImageFileCountMessage: 'No images uploaded.', reloadButtonText: 'Reload Page', @@ -2473,7 +2486,10 @@ define([ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', txtMainDocOnly: 'Error! Main Document Only.', txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.', - txtNoText: 'Error! No text of specified style in document.' + txtNoText: 'Error! No text of specified style in document.', + uploadDocSizeMessage: 'Maximum document size limit exceeded.', + uploadDocExtMessage: 'Unknown document format.', + uploadDocFileCountMessage: 'No documents uploaded.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 4b6a86242..bc08a9de5 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -641,6 +641,9 @@ "DE.Controllers.Main.txtZeroDivide": "Zero Divide", "DE.Controllers.Main.unknownErrorText": "Unknown error.", "DE.Controllers.Main.unsupportedBrowserErrorText": "Your browser is not supported.", + "DE.Controllers.Main.uploadDocSizeMessage": "Maximum document size limit exceeded.", + "DE.Controllers.Main.uploadDocExtMessage": "Unknown document format.", + "DE.Controllers.Main.uploadDocFileCountMessage": "No documents uploaded.", "DE.Controllers.Main.uploadImageExtMessage": "Unknown image format.", "DE.Controllers.Main.uploadImageFileCountMessage": "No images uploaded.", "DE.Controllers.Main.uploadImageSizeMessage": "Maximum image size limit exceeded.", From 3facb70ebad3aa260189ff025b4d68571466d6e8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 Oct 2019 10:58:18 +0300 Subject: [PATCH 07/86] [DE] Compare: use loading from fileChoiceUrl --- apps/common/main/lib/controller/ReviewChanges.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index ab0f5760c..b06d4be0a 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -595,14 +595,15 @@ define([ } })).show(); } else if (item === 'storage') { + var me = this; // if (this.appConfig.canRequestCompareFile) { // Common.Gateway.requestCompareFile(); // } else { - // (new Common.Views.SelectFileDlg({ - // fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "DocumentsOnly") - // })).on('comparefile', function(obj, file){ - // me.compareFile(file, me._state.compareSettings); - // }).show(); + (new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.appConfig.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "DocumentsOnly") + })).on('selectfile', function(obj, file){ + me.compareFile(file, me._state.compareSettings); + }).show(); // } } else if (item === 'settings') { var me = this; From e605452cfb34b615342d33531d024ec8af71b88e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 Oct 2019 11:44:38 +0300 Subject: [PATCH 08/86] [DE] Compare use onRequestCompareFile/setRevisedFile for loading file --- apps/api/documents/api.js | 10 +++++++++- apps/common/Gateway.js | 4 ++-- .../main/lib/controller/ReviewChanges.js | 18 ++++++++---------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 5782fb9f7..e46df27fd 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -576,6 +576,13 @@ }); }; + var _setRevisedFile = function(data) { + _sendCommand({ + command: 'setRevisedFile', + data: data + }); + }; + var _processMouse = function(evt) { var r = iframe.getBoundingClientRect(); var data = { @@ -620,7 +627,8 @@ showSharingSettings : _showSharingSettings, setSharingSettings : _setSharingSettings, insertImage : _insertImage, - setMailMergeRecipients: _setMailMergeRecipients + setMailMergeRecipients: _setMailMergeRecipients, + setRevisedFile : _setRevisedFile } }; diff --git a/apps/common/Gateway.js b/apps/common/Gateway.js index b8726a329..6d45aa3a7 100644 --- a/apps/common/Gateway.js +++ b/apps/common/Gateway.js @@ -120,8 +120,8 @@ if (Common === undefined) { $me.trigger('setmailmergerecipients', data); }, - 'compareFile': function(data) { - $me.trigger('comparefile', data); + 'setRevisedFile': function(data) { + $me.trigger('setrevisedfile', data); } }; diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index b06d4be0a..2b0415dcf 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -128,7 +128,7 @@ define([ this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); - Common.Gateway.on('comparefile', _.bind(this.compareFile, this)); + Common.Gateway.on('setrevisedfile', _.bind(this.setRevisedFile, this)); } }, @@ -570,6 +570,7 @@ define([ onCompareClick: function(item) { if (this.api) { + var me = this; if (!this._state.compareSettings) { this._state.compareSettings = new AscCommonWord.ComparisonOptions(); this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char")); @@ -579,7 +580,6 @@ define([ this.api.asc_CompareDocumentFile(this._state.compareSettings); Common.NotificationCenter.trigger('edit:complete', this.view); } else if (item === 'url') { - var me = this; (new Common.Views.ImageFromUrlDialog({ title: me.textUrl, handler: function(result, value) { @@ -595,18 +595,16 @@ define([ } })).show(); } else if (item === 'storage') { - var me = this; - // if (this.appConfig.canRequestCompareFile) { - // Common.Gateway.requestCompareFile(); - // } else { + if (this.appConfig.canRequestCompareFile) { + Common.Gateway.requestCompareFile(); + } else { (new Common.Views.SelectFileDlg({ fileChoiceUrl: this.appConfig.fileChoiceUrl.replace("{fileExt}", "").replace("{documentType}", "DocumentsOnly") })).on('selectfile', function(obj, file){ - me.compareFile(file, me._state.compareSettings); + me.setRevisedFile(file, me._state.compareSettings); }).show(); - // } + } } else if (item === 'settings') { - var me = this; (new DE.Views.CompareSettingsDialog({ props: me._state.compareSettings, handler: function(result, value) { @@ -622,7 +620,7 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.view); }, - compareFile: function(data) { + setRevisedFile: function(data) { if (!this._state.compareSettings) { this._state.compareSettings = new AscCommonWord.ComparisonOptions(); this._state.compareSettings.putWords(!Common.localStorage.getBool("de-compare-char")); From dfd3f3f3eaef9096dec7129583cd7fae7be743b8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 15 Oct 2019 12:52:23 +0300 Subject: [PATCH 09/86] [DE] Change icon for compare button --- apps/common/main/lib/view/ReviewChanges.js | 2 +- apps/common/main/resources/less/toolbar.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 35069f1c9..21dd2a1d1 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -204,7 +204,7 @@ define([ cls : 'btn-toolbar x-huge icon-top', caption : this.txtCompare, split : true, - iconCls: 'review-deny' + iconCls: 'btn-compare' }); this.btnTurnOn = new Common.UI.Button({ diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index cbab0599b..e3d40846f 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -533,6 +533,7 @@ .button-normal-icon(btn-caption, 76, @toolbar-big-icon-size); .button-normal-icon(btn-calculation, 80, @toolbar-big-icon-size); .button-normal-icon(btn-scale, 81, @toolbar-big-icon-size); +.button-normal-icon(btn-compare, 82, @toolbar-big-icon-size); [applang=ru] { .btn-toolbar { From a32ac3ec9e8c34c3b482785c305edc7751cabfe2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Oct 2019 10:22:23 +0300 Subject: [PATCH 10/86] [DE] Compare: refactoring --- apps/documenteditor/main/app/view/CompareSettingsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/CompareSettingsDialog.js b/apps/documenteditor/main/app/view/CompareSettingsDialog.js index e758e3e2f..d7c9f84ba 100644 --- a/apps/documenteditor/main/app/view/CompareSettingsDialog.js +++ b/apps/documenteditor/main/app/view/CompareSettingsDialog.js @@ -135,7 +135,7 @@ define([ var state = (typeof(event) == 'object') ? event.currentTarget.attributes['result'].value : event; if (state == 'ok') { this.handler && this.handler.call(this, state, this.getSettings()); - Common.localStorage.setItem("de-compare-char", this.radioChar.getValue()); + Common.localStorage.setBool("de-compare-char", this.radioChar.getValue()); } this.close(); From e7aca2fdbaa90f861d238ec49f65c303573287d2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 21 Oct 2019 17:04:16 +0300 Subject: [PATCH 11/86] [DE] Calendar --- apps/common/main/lib/view/Calendar.js | 292 ++++++++++++++++++ apps/common/main/resources/less/calendar.less | 49 +++ .../main/resources/less/app.less | 1 + 3 files changed, 342 insertions(+) create mode 100644 apps/common/main/lib/view/Calendar.js create mode 100644 apps/common/main/resources/less/calendar.less diff --git a/apps/common/main/lib/view/Calendar.js b/apps/common/main/lib/view/Calendar.js new file mode 100644 index 000000000..7e433f35b --- /dev/null +++ b/apps/common/main/lib/view/Calendar.js @@ -0,0 +1,292 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +/** + * Calendar.js + * + * Created by Julia Svinareva on 18/10/19 + * Copyright (c) 2019 Ascensio System SIA. All rights reserved. + * + */ + + +if (Common === undefined) + var Common = {}; + +define([ + 'common/main/lib/component/Window', + 'underscore' +], function (base, _) { + 'use strict'; + + Common.Views.Calendar = Common.UI.Window.extend(_.extend({ + + // Window + + initialize: function (options) { + var _options = {}; + + _.extend(_options, { + closable: false, + width: 192, + height: 214, + header: false, + modal: false, + alias: 'Common.Views.Calendar', + firstNumber: 0, // 0 or 6 + cls: 'calendar-window' + }, options); + + this.template = options.template || [ + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + + '
', + '
', + '
', + '
', + '
', + '
' + ].join(''); + + this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember]; + this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday]; + + + + _options.tpl = _.template(this.template)(_options); + + Common.UI.Window.prototype.initialize.call(this, _options); + + return this; + }, + render: function () { + Common.UI.Window.prototype.render.call(this); + + var me = this, + window = this.$window; + + window.css({ + height: '', + minHeight: '', + overflow: 'hidden', + position: 'absolute', + zIndex: '990' + }); + + var body = window.find('.body'); + if (body) { + body.css('position', 'relative'); + } + + me.btnPrev = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'mmerge-prev', + }); + me.btnPrev.render(me.$window.find('#prev-arrow')); + + me.btnNext = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'mmerge-next', + }); + me.btnNext.render(me.$window.find('#next-arrow')); + + me.topTitle = _.template([ + '', + '' + ].join('')); + me.$window.find('.calendar-header .title').html(me.topTitle); + + var dayNamesTemplate = ''; + me.dayNamesShort.forEach(function (item) { + dayNamesTemplate += ''; + }); + me.$window.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate)); + + }, + + getCalendarPopover: function (options) { + if (!this.popover) + this.popover = new Common.Views.Calendar(options); + return this.popover; + }, + + showCalendarPopover: function (animate, loadText, focus, showText) { + this.options.animate = animate; + + Common.UI.Window.prototype.show.call(this); + if (this.scroller) { + this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: true}); + } + }, + + setLeftTop: function (posX, posY) { + if (!this.$window) + this.render(); + + if (_.isUndefined(posX) && _.isUndefined(posY)) + return; + + var calendarView = $('#id-popover'), + editorView = $('#editor_sdk'), + editorBounds = null, + sdkBoundsHeight = 0, + sdkBoundsTop = 0, + sdkBoundsLeft = 0, + sdkPanelRight = '', + sdkPanelRightWidth = 0, + sdkPanelLeft = '', + sdkPanelLeftWidth = 0, + sdkPanelThumbs = '', // for PE + sdkPanelThumbsWidth = 0, // for PE + sdkPanelTop = '', + sdkPanelHeight = 0, + leftPos = 0, + windowWidth = 0, + outerHeight = 0, + topPos = 0, + sdkBoundsTopPos = 0; + + if (calendarView && editorView && editorView.get(0)) { + editorBounds = editorView.get(0).getBoundingClientRect(); + if (editorBounds) { + //sdkBoundsHeight = editorBounds.height - this.sdkBounds.padding * 2; + + this.$window.css({maxHeight: sdkBoundsHeight + 'px'}); + + //this.sdkBounds.width = editorBounds.width; + //this.sdkBounds.height = editorBounds.height; + + // LEFT CORNER + + if (!_.isUndefined(posX)) { + + sdkPanelRight = $('#id_vertical_scroll'); + if (sdkPanelRight.length) { + sdkPanelRightWidth = (sdkPanelRight.css('display') !== 'none') ? sdkPanelRight.width() : 0; + } else { + sdkPanelRight = $('#ws-v-scrollbar'); + if (sdkPanelRight.length) { + sdkPanelRightWidth = (sdkPanelRight.css('display') !== 'none') ? sdkPanelRight.width() : 0; + } + } + + //this.sdkBounds.width -= sdkPanelRightWidth; + + sdkPanelLeft = $('#id_panel_left'); + if (sdkPanelLeft.length) { + sdkPanelLeftWidth = (sdkPanelLeft.css('display') !== 'none') ? sdkPanelLeft.width() : 0; + } + sdkPanelThumbs = $('#id_panel_thumbnails'); + if (sdkPanelThumbs.length) { + sdkPanelThumbsWidth = (sdkPanelThumbs.css('display') !== 'none') ? sdkPanelThumbs.width() : 0; + //this.sdkBounds.width -= sdkPanelThumbsWidth; + } + + //leftPos = Math.min(sdkBoundsLeft + posX + this.arrow.width, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25); + leftPos = posX; + //leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + this.arrow.width, leftPos); + + /*if (!_.isUndefined(leftX)) { + windowWidth = this.$window.outerWidth(); + if (windowWidth) { + if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (this.leftX > windowWidth)) { + leftPos = this.leftX - windowWidth + sdkBoundsLeft - this.arrow.width; + arrowView.removeClass('left').addClass('right'); + } else { + leftPos = sdkBoundsLeft + posX + this.arrow.width; + } + } + }*/ + + this.$window.css('left', leftPos + 'px'); + } + + // TOP CORNER + + if (!_.isUndefined(posY)) { + /*sdkPanelTop = $('#id_panel_top'); + sdkBoundsTopPos = sdkBoundsTop; + if (sdkPanelTop.length) { + sdkPanelHeight = (sdkPanelTop.css('display') !== 'none') ? sdkPanelTop.height() : 0; + sdkBoundsTopPos += this.sdkBounds.paddingTop; + } else { + sdkPanelTop = $('#ws-h-scrollbar'); + if (sdkPanelTop.length) { + sdkPanelHeight = (sdkPanelTop.css('display') !== 'none') ? sdkPanelTop.height() : 0; + } + }*/ + + //this.sdkBounds.height -= sdkPanelHeight; + + outerHeight = this.$window.outerHeight(); + + //topPos = Math.min(sdkBoundsTop + sdkBoundsHeight - outerHeight, this.arrowPosY + sdkBoundsTop - this.arrow.height); + topPos = posY; + //topPos = Math.max(topPos, sdkBoundsTopPos); + + this.$window.css('top', topPos + 'px'); + } + } + } + }, + + textJanuary: 'January', + textFebruary: 'February', + textMarch: 'March', + textApril: 'April', + textMay: 'May', + textJune: 'June', + textJuly: 'July', + textAugust: 'August', + textSeptember: 'September', + textOctober: 'October', + textNovember: 'November', + textDecember: 'December', + textShortSunday: 'Su', + textShortMonday: 'Mo', + textShortTuesday: 'Tu', + textShortWednesday: 'We', + textShortThursday: 'Th', + textShortFriday: 'Fr', + textShortSaturday: 'Sa' + + }, Common.Views.Calendar || {})) +}); \ No newline at end of file diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less new file mode 100644 index 000000000..9ba98c372 --- /dev/null +++ b/apps/common/main/resources/less/calendar.less @@ -0,0 +1,49 @@ +@calendar-bg-color: #446995; + +.calendar-window { + border-radius: 0; + box-shadow: none; + border: 1px solid @calendar-bg-color; +} +.calendar-popover { + width: 190px; + height: 214px; + .btn { + background-color: transparent; + border: none; + height: 24px; + width: 24px; + margin-top: 5px; + .icon { + width: 24px; + height: 24px; + display: block; + position: relative; + } + } + .calendar-header { + height: 50px; + background-color: @calendar-bg-color; + color: #FFFFFF; + .top-row { + display: flex; + justify-content: space-between; + } + .bottom-row { + display: flex; + justify-content: space-between; + padding: 0 10px; + } + .title { + padding-top: 6px; + font-size: 13px; + label { + font-weight: bold; + &:not(:last-of-type) { + margin-right: 6px; + } + } + + } + } +} \ No newline at end of file diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 4f7c8b1cc..167e28fa3 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -118,6 +118,7 @@ @import "../../../../common/main/resources/less/toolbar.less"; @import "../../../../common/main/resources/less/language-dialog.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; +@import "../../../../common/main/resources/less/calendar.less"; // App // -------------------------------------------------- From 2b16b4fef2dbeb4ea980e79f54c12c2285f5ee72 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 21 Oct 2019 17:04:57 +0300 Subject: [PATCH 12/86] [DE] Calendar (add button for test) --- .../app/template/ParagraphSettings.template | 1 + .../main/app/view/ParagraphSettings.js | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/template/ParagraphSettings.template b/apps/documenteditor/main/app/template/ParagraphSettings.template index 644f6e5bc..e3d618193 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettings.template +++ b/apps/documenteditor/main/app/template/ParagraphSettings.template @@ -54,4 +54,5 @@ +
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 60f1d58ac..0437a5d19 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -48,7 +48,8 @@ define([ 'common/main/lib/component/CheckBox', 'common/main/lib/component/ThemeColorPalette', 'common/main/lib/component/ColorButton', - 'documenteditor/main/app/view/ParagraphSettingsAdvanced' + 'documenteditor/main/app/view/ParagraphSettingsAdvanced', + 'common/main/lib/view/Calendar' ], function (menuTemplate, $, _, Backbone) { 'use strict'; @@ -182,6 +183,22 @@ define([ this.TextOnlySettings = $('.text-only', this.$el); + // begin calendar + + var me = this; + this.btnCalendar = new Common.UI.Button({ + caption: this.textCalendar, + style: "width:100px;" + }); + this.btnCalendar.render( $('#calendar')); + this.btnCalendar.on('click', _.bind(function (e) { + var popover = Common.Views.Calendar.prototype.getCalendarPopover({}); + popover.showCalendarPopover(); + popover.setLeftTop(300, 300); + }, this)); + + // end calendar + this.rendered = true; }, @@ -499,6 +516,7 @@ define([ textAt: 'At', txtAutoText: 'Auto', textBackColor: 'Background color', - textNewColor: 'Add New Custom Color' + textNewColor: 'Add New Custom Color', + textCalendar: 'Calendar' }, DE.Views.ParagraphSettings || {})); }); \ No newline at end of file From a7aa69f454185dba61008316f14c23a457ff9309 Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Fri, 25 Oct 2019 13:46:37 +0300 Subject: [PATCH 13/86] [de][comparison] Fix callback call --- apps/common/main/lib/controller/ReviewChanges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 2b0415dcf..fdfda5bd5 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -639,7 +639,7 @@ define([ primary: 'yes', callback: function(result) { _.defer(function() { - if (callback) callback.call(result=='yes'); + if (callback) callback(result=='yes'); }); Common.NotificationCenter.trigger('edit:complete', this.view); } From 6cbee37f9b25021e746826ea00903859d59454d2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 28 Oct 2019 14:40:17 +0300 Subject: [PATCH 14/86] [DE] Hide compare settings --- apps/common/main/lib/view/ReviewChanges.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 21dd2a1d1..af11cb47c 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -371,9 +371,9 @@ define([ items: [ {caption: me.mniFromFile, value: 'file'}, {caption: me.mniFromUrl, value: 'url'}, - {caption: me.mniFromStorage, value: 'storage'}, - {caption: '--'}, - {caption: me.mniSettings, value: 'settings'} + {caption: me.mniFromStorage, value: 'storage'} + // ,{caption: '--'}, + // {caption: me.mniSettings, value: 'settings'} ] })); me.btnCompare.menu.items[2].setVisible(me.appConfig.canRequestCompareFile || me.appConfig.fileChoiceUrl && me.appConfig.fileChoiceUrl.indexOf("{documentType}")>-1); From ca1e871ec5fcda2ce00c80a78ebdffc39b794813 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 28 Oct 2019 17:18:35 +0300 Subject: [PATCH 15/86] Calendar (component) --- apps/common/main/lib/component/Calendar.js | 374 ++++++++++++++++++ apps/common/main/lib/view/Calendar.js | 70 +--- apps/common/main/resources/less/calendar.less | 60 ++- 3 files changed, 435 insertions(+), 69 deletions(-) create mode 100644 apps/common/main/lib/component/Calendar.js diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js new file mode 100644 index 000000000..cc4f360e1 --- /dev/null +++ b/apps/common/main/lib/component/Calendar.js @@ -0,0 +1,374 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ +if (Common === undefined) + var Common = {}; + +define([ + 'common/main/lib/component/BaseView', + 'common/main/lib/util/utils' + +], function () { + 'use strict'; + + Common.UI.Calendar = Common.UI.BaseView.extend({ + + template : + _.template([ + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
' + ].join('')), + + options: { + date: undefined + }, + + initialize : function(options) { + Common.UI.BaseView.prototype.initialize.call(this, options); + + var me = this; + me.cmpEl = me.$el || $(this.el); + + this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember]; + this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday]; + this.monthShortNames = [this.textShortJanuary, this.textShortFebruary, this.textShortMarch, this.textShortApril, this.textShortMay, this.textShortJune, this.textShortJuly, this.textShortAugust, this.textShortSeptember, this.textShortOctober, this.textShortNovember, this.textShortDecember]; + + me.options.date = options.date; + + me._state = undefined; + + me.render(); + }, + + render: function () { + (this.$el || $(this.el)).html(this.template()); + + var me = this; + + me.currentDate = me.options.date || new Date(); + + me.btnPrev = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'mmerge-prev', + }); + me.btnPrev.render(me.cmpEl.find('#prev-arrow')); + me.btnPrev.on('click', _.bind(me.onClickPrev, me)); + + me.btnNext = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'mmerge-next', + }); + me.btnNext.render(me.cmpEl.find('#next-arrow')); + me.btnNext.on('click', _.bind(me.onClickNext, me)); + + me.renderMonth(me.currentDate); + + this.trigger('render:after', this); + return this; + }, + + onClickPrev: function () { + var me = this; + if (me._state === 'month') { + me.currentDate.setMonth(me.currentDate.getMonth() - 1); + me.renderMonth(me.currentDate); + } else if (me._state === 'months') { + me.currentDate.setFullYear(me.currentDate.getFullYear() - 1); + me.renderMonths(me.currentDate); + } else if (me._state === 'years') { + var year = me.currentDate.getFullYear(), + newYear; + if (year % 10 !== 0) { + newYear = String(year); + newYear = Number(newYear.slice(0, -1) + '0') - 1; + } else { + newYear = year - 1; + } + me.currentDate.setFullYear(newYear); + me.renderYears(newYear); + } + }, + + onClickNext: function () { + var me = this; + if (me._state === 'month') { + me.currentDate.setMonth(me.currentDate.getMonth() + 1); + me.renderMonth(me.currentDate); + } else if (me._state === 'months') { + me.currentDate.setFullYear(me.currentDate.getFullYear() + 1); + me.renderMonths(me.currentDate); + } else if (me._state === 'years') { + var year = me.currentDate.getFullYear(), + newYear; + if (year % 10 !== 9) { + newYear = String(year); + newYear = Number(newYear.slice(0, -1) + '9') + 1; + } else { + newYear = year + 1; + } + me.currentDate.setFullYear(newYear); + me.renderYears(newYear); + } + }, + + renderYears: function (year) { + var me = this, + year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : (new Date()).getFullYear()); + + me._state = 'years'; + + var firstYear = year, + lastYear = year; + if ((firstYear % 10) !== 0) { + var strYear = String(year); + firstYear = Number(strYear.slice(0, -1) + '0'); + } + if ((lastYear % 10) !== 9) { + var strYear = String(year); + lastYear = Number(strYear.slice(0, -1) + '9'); + } + + me.topTitle = _.template([ + '' + ].join('')); + me.cmpEl.find('.calendar-header .title').html(me.topTitle); + + me.bottomTitle = _.template([ + '' + ].join('')); + me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle); + + var arrYears = []; + var tmpYear = firstYear - 3; + + for (var i = 0; i < 16; i++) { + arrYears.push({ + year: tmpYear, + isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false + }); + tmpYear++; + } + + me.yearPicker = new Common.UI.DataView({ + el: $('.calendar-content'), + store: new Common.UI.DataViewStore(arrYears), + itemTemplate: _.template('
<%= year %>
') + }); + me.yearPicker.on('item:click', function (picker, item) { + var selectYear = item.$el.children(), + year = selectYear.data('year'); + var date = new Date(); + date.setFullYear(year); + me.renderMonths(date); + }); + }, + + renderMonths: function (date) { + var me = this, + curDate = (_.isDate(date)) ? date : (me.currentDate ? me.currentDate : new Date()), + year = curDate.getFullYear(); + + me._state = 'months'; + + // Number of year + me.topTitle = _.template([ + '' + ].join('')); + me.cmpEl.find('.calendar-header .title').html(me.topTitle); + me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderYears, me)); + + me.bottomTitle = _.template([ + '' + ].join('')); + me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle); + + var arrMonths = []; + + for (var ind = 0; ind < 12; ind++) { + arrMonths.push({ + indexMonth: ind, + nameMonth: me.monthShortNames[ind], + year: year, + curYear: true, + isCurrentMonth: (ind === curDate.getMonth()) + }); + } + for (var ind = 0; ind < 4; ind++) { + arrMonths.push({ + indexMonth: ind, + nameMonth: me.monthShortNames[ind], + year: year + 1, + curYear: false + }); + } + + me.monthPicker = new Common.UI.DataView({ + el: $('.calendar-content'), + store: new Common.UI.DataViewStore(arrMonths), + itemTemplate: _.template('
<%= nameMonth %>
') + }); + me.monthPicker.on('item:click', function (picker, item) { + var selectMonth = item.$el.children(), + month = selectMonth.data('month'), + year = selectMonth.data('year'); + var date = new Date(year, month); + me.renderMonth(date); + }); + }, + + renderMonth: function (date) { + var me = this; + me._state = 'month'; + // Current date + var curDate = date || new Date(), + curMonth = curDate.getMonth(), + curIndexDayInWeek = curDate.getDay(), + curNumberDayInMonth = curDate.getDate(), + curYear = curDate.getFullYear(); + + // Name month + me.topTitle = _.template([ + '', + '' + ].join('')); + me.cmpEl.find('.calendar-header .title').html(me.topTitle); + me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderMonths, me)); + + // Name days of week + var dayNamesTemplate = ''; + me.dayNamesShort.forEach(function (item) { + dayNamesTemplate += ''; + }); + me.cmpEl.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate)); + + // Month + var rows = 6, + cols = 7, + firstNumber = me.options.firstNumber; + + var arrDays = []; + + var d = new Date(curDate); + d.setDate(1); + var firstDayOfMonthIndex = d.getDay(); + + var daysInPrevMonth = me.daysInMonth(d.getTime() - (10 * 24 * 60 * 60 * 1000)), + numberDay = (firstDayOfMonthIndex > 0) ? (daysInPrevMonth - (firstDayOfMonthIndex - 1)) : 1, + month, + year; + if (firstDayOfMonthIndex > 0) { + if (curMonth - 1 >= 0) { + month = curMonth - 1 + year = curYear; + } else { + month = 11; + year = curYear - 1; + } + } else { + month = curMonth; + year = curYear; + } + + var tmp = new Date(year, month, numberDay); + + for(var r = 0; r < rows; r++) { + for(var c = 0; c < cols; c++) { + arrDays.push({ + indexInWeek: tmp.getDay(), + dayNumber: tmp.getDate(), + month: tmp.getMonth(), + year: tmp.getFullYear(), + isToday: (tmp.getDate() === curNumberDayInMonth) ? true : false, + isCurrentMonth: (tmp.getMonth() === curMonth) ? true : false + }); + tmp.setDate(tmp.getDate() + 1); + } + } + + me.monthPicker = new Common.UI.DataView({ + el: $('.calendar-content'), + store: new Common.UI.DataViewStore(arrDays), + itemTemplate: _.template('
<%= dayNumber %>
') + }); + }, + + daysInMonth: function (date) { + var d; + d = date ? new Date(date) : new Date(); + return (new Date(d.getFullYear(), d.getMonth() + 1, 0)).getDate(); + }, + + textJanuary: 'January', + textFebruary: 'February', + textMarch: 'March', + textApril: 'April', + textMay: 'May', + textJune: 'June', + textJuly: 'July', + textAugust: 'August', + textSeptember: 'September', + textOctober: 'October', + textNovember: 'November', + textDecember: 'December', + textShortJanuary: 'Jan', + textShortFebruary: 'Feb', + textShortMarch: 'Mar', + textShortApril: 'Apr', + textShortMay: 'May', + textShortJune: 'Jun', + textShortJuly: 'Jul', + textShortAugust: 'Aug', + textShortSeptember: 'Sep', + textShortOctober: 'Oct', + textShortNovember: 'Nov', + textShortDecember: 'Dec', + textShortSunday: 'Su', + textShortMonday: 'Mo', + textShortTuesday: 'Tu', + textShortWednesday: 'We', + textShortThursday: 'Th', + textShortFriday: 'Fr', + textShortSaturday: 'Sa', + textMonths: 'Months', + textYears: 'Years' + }); +}); \ No newline at end of file diff --git a/apps/common/main/lib/view/Calendar.js b/apps/common/main/lib/view/Calendar.js index 7e433f35b..5cd483371 100644 --- a/apps/common/main/lib/view/Calendar.js +++ b/apps/common/main/lib/view/Calendar.js @@ -44,8 +44,8 @@ if (Common === undefined) define([ 'common/main/lib/component/Window', - 'underscore' -], function (base, _) { + 'common/main/lib/component/Calendar', +], function () { 'use strict'; Common.Views.Calendar = Common.UI.Window.extend(_.extend({ @@ -57,8 +57,8 @@ define([ _.extend(_options, { closable: false, - width: 192, - height: 214, + width: 200, + height: 220, header: false, modal: false, alias: 'Common.Views.Calendar', @@ -69,27 +69,11 @@ define([ this.template = options.template || [ '
', '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', '
', '
' ].join(''); - this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember]; - this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday]; - - _options.tpl = _.template(this.template)(_options); @@ -105,7 +89,7 @@ define([ window.css({ height: '', - minHeight: '', + minHeight: 222, overflow: 'hidden', position: 'absolute', zIndex: '990' @@ -116,29 +100,9 @@ define([ body.css('position', 'relative'); } - me.btnPrev = new Common.UI.Button({ - cls: 'btn-toolbar', - iconCls: 'mmerge-prev', + me.calendar = new Common.UI.Calendar({ + el: $('#id-popover') }); - me.btnPrev.render(me.$window.find('#prev-arrow')); - - me.btnNext = new Common.UI.Button({ - cls: 'btn-toolbar', - iconCls: 'mmerge-next', - }); - me.btnNext.render(me.$window.find('#next-arrow')); - - me.topTitle = _.template([ - '', - '' - ].join('')); - me.$window.find('.calendar-header .title').html(me.topTitle); - - var dayNamesTemplate = ''; - me.dayNamesShort.forEach(function (item) { - dayNamesTemplate += ''; - }); - me.$window.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate)); }, @@ -268,25 +232,5 @@ define([ } }, - textJanuary: 'January', - textFebruary: 'February', - textMarch: 'March', - textApril: 'April', - textMay: 'May', - textJune: 'June', - textJuly: 'July', - textAugust: 'August', - textSeptember: 'September', - textOctober: 'October', - textNovember: 'November', - textDecember: 'December', - textShortSunday: 'Su', - textShortMonday: 'Mo', - textShortTuesday: 'Tu', - textShortWednesday: 'We', - textShortThursday: 'Th', - textShortFriday: 'Fr', - textShortSaturday: 'Sa' - }, Common.Views.Calendar || {})) }); \ No newline at end of file diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 9ba98c372..5bcd74011 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -3,11 +3,11 @@ .calendar-window { border-radius: 0; box-shadow: none; - border: 1px solid @calendar-bg-color; } -.calendar-popover { - width: 190px; - height: 214px; +.calendar-box { + width: 198px; + height: 220px; + border: 1px solid @calendar-bg-color; .btn { background-color: transparent; border: none; @@ -31,8 +31,8 @@ } .bottom-row { display: flex; - justify-content: space-between; - padding: 0 10px; + justify-content: space-around; + padding: 0; } .title { padding-top: 6px; @@ -44,6 +44,54 @@ } } + } + } + .calendar-content { + .item { + margin: 0; + padding: 0; + height: auto; + width: auto; + box-shadow: none; + border: 1px solid #fff; + .name-month, .name-year { + height: 40px; + width: 47px; + background-color: #F1F1F1; + display: flex; + justify-content: center; + align-items: center; + font-size: 13px; + } + .number-day { + height: 26px; + width: 26px; + background-color: #F1F1F1; + display: flex; + justify-content: center; + align-items: center; + } + &.selected { + .number-day, .name-month, .name-year { + color: #fff; + background-color: #7D858C; + } + } + .weekend { + color: #D25252; + } + .no-current-month, .no-cur-year, .no-current-decade { + color: #A5A5A5; + } + &:not(.disabled):not(.selected) { + .number-day, .name-month, .name-year { + &:hover { + background-color: #D9D9D9; + } + } + } + + } } } \ No newline at end of file From 86cdc7ae893915fa503914e4304587745bfe8e58 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Tue, 29 Oct 2019 13:33:24 +0300 Subject: [PATCH 16/86] Calendar (add options - firstday) --- apps/common/main/lib/component/Calendar.js | 58 ++++++++++++------- apps/common/main/lib/view/Calendar.js | 3 +- apps/common/main/resources/less/calendar.less | 11 +++- 3 files changed, 49 insertions(+), 23 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index cc4f360e1..ddcaf042e 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -59,7 +59,8 @@ define([ ].join('')), options: { - date: undefined + date: undefined, + firstday: 0 // 0 or 1 }, initialize : function(options) { @@ -73,6 +74,9 @@ define([ this.monthShortNames = [this.textShortJanuary, this.textShortFebruary, this.textShortMarch, this.textShortApril, this.textShortMay, this.textShortJune, this.textShortJuly, this.textShortAugust, this.textShortSeptember, this.textShortOctober, this.textShortNovember, this.textShortDecember]; me.options.date = options.date; + if (!_.isUndefined(options.firstday) && (options.firstday === 0 || options.firstday === 1)) { + me.options.firstday = options.firstday; + } me._state = undefined; @@ -152,7 +156,7 @@ define([ renderYears: function (year) { var me = this, - year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : (new Date()).getFullYear()); + year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear()); me._state = 'years'; @@ -182,8 +186,9 @@ define([ for (var i = 0; i < 16; i++) { arrYears.push({ - year: tmpYear, - isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false + year: (tmpYear > 0) ? tmpYear : '', + isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false, + disabled: (tmpYear > 0) ? false : true }); tmpYear++; } @@ -193,10 +198,9 @@ define([ store: new Common.UI.DataViewStore(arrYears), itemTemplate: _.template('
<%= year %>
') }); - me.yearPicker.on('item:click', function (picker, item) { - var selectYear = item.$el.children(), - year = selectYear.data('year'); - var date = new Date(); + me.yearPicker.on('item:click', function (picker, item, record, e) { + var year = record.get('year'), + date = new Date(); date.setFullYear(year); me.renderMonths(date); }); @@ -246,11 +250,10 @@ define([ store: new Common.UI.DataViewStore(arrMonths), itemTemplate: _.template('
<%= nameMonth %>
') }); - me.monthPicker.on('item:click', function (picker, item) { - var selectMonth = item.$el.children(), - month = selectMonth.data('month'), - year = selectMonth.data('year'); - var date = new Date(year, month); + me.monthPicker.on('item:click', function (picker, item, record, e) { + var month = record.get('indexMonth'), + year = record.get('year'), + date = new Date(year, month); me.renderMonth(date); }); }, @@ -258,6 +261,8 @@ define([ renderMonth: function (date) { var me = this; me._state = 'month'; + var firstDay = me.options.firstday; + // Current date var curDate = date || new Date(), curMonth = curDate.getMonth(), @@ -275,15 +280,17 @@ define([ // Name days of week var dayNamesTemplate = ''; - me.dayNamesShort.forEach(function (item) { - dayNamesTemplate += ''; - }); + for (var i = firstDay; i < 7; i++) { + dayNamesTemplate += ''; + } + if (firstDay > 0) { + dayNamesTemplate += ''; + } me.cmpEl.find('.calendar-header .bottom-row').html(_.template(dayNamesTemplate)); // Month var rows = 6, - cols = 7, - firstNumber = me.options.firstNumber; + cols = 7; var arrDays = []; @@ -292,12 +299,21 @@ define([ var firstDayOfMonthIndex = d.getDay(); var daysInPrevMonth = me.daysInMonth(d.getTime() - (10 * 24 * 60 * 60 * 1000)), - numberDay = (firstDayOfMonthIndex > 0) ? (daysInPrevMonth - (firstDayOfMonthIndex - 1)) : 1, + numberDay, month, year; - if (firstDayOfMonthIndex > 0) { + if (firstDay === 0) { + numberDay = (firstDayOfMonthIndex > 0) ? (daysInPrevMonth - (firstDayOfMonthIndex - 1)) : 1; + } else { + if (firstDayOfMonthIndex === 0) { + numberDay = daysInPrevMonth - 5; + } else { + numberDay = daysInPrevMonth - (firstDayOfMonthIndex - 2); + } + } + if ((firstDayOfMonthIndex > 0 && firstDay === 0) || firstDay === 1) { if (curMonth - 1 >= 0) { - month = curMonth - 1 + month = curMonth - 1; year = curYear; } else { month = 11; diff --git a/apps/common/main/lib/view/Calendar.js b/apps/common/main/lib/view/Calendar.js index 5cd483371..b337628bf 100644 --- a/apps/common/main/lib/view/Calendar.js +++ b/apps/common/main/lib/view/Calendar.js @@ -101,7 +101,8 @@ define([ } me.calendar = new Common.UI.Calendar({ - el: $('#id-popover') + el: $('#id-popover'), + firstday: 1 }); }, diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 5bcd74011..f39286248 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -35,7 +35,9 @@ padding: 0; } .title { - padding-top: 6px; + margin-top: 4px; + margin-bottom: 3px; + padding: 2px 10px 0; font-size: 13px; label { font-weight: bold; @@ -43,6 +45,13 @@ margin-right: 6px; } } + &:hover { + background-color: rgba(255,255,255,0.2); + cursor: pointer; + label { + cursor: pointer; + } + } } } From 6d14719bb63cff08733629630d5796cec7e8e08f Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 30 Oct 2019 11:17:15 +0300 Subject: [PATCH 17/86] Calendar --- apps/common/main/lib/component/Calendar.js | 77 ++++++++++++------- apps/common/main/resources/less/calendar.less | 15 ++-- 2 files changed, 59 insertions(+), 33 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index ddcaf042e..9cc9e9810 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -36,7 +36,6 @@ if (Common === undefined) define([ 'common/main/lib/component/BaseView', 'common/main/lib/util/utils' - ], function () { 'use strict'; @@ -60,7 +59,7 @@ define([ options: { date: undefined, - firstday: 0 // 0 or 1 + firstday: 0 // 0 - sunday, 1 - monday }, initialize : function(options) { @@ -78,7 +77,7 @@ define([ me.options.firstday = options.firstday; } - me._state = undefined; + me._state = undefined; // 0 - month, 1 - months, 2 - years me.render(); }, @@ -112,13 +111,19 @@ define([ onClickPrev: function () { var me = this; - if (me._state === 'month') { - me.currentDate.setMonth(me.currentDate.getMonth() - 1); - me.renderMonth(me.currentDate); - } else if (me._state === 'months') { - me.currentDate.setFullYear(me.currentDate.getFullYear() - 1); - me.renderMonths(me.currentDate); - } else if (me._state === 'years') { + if (me._state === 0) { + var d = new Date(me.currentDate); + d.setMonth(d.getMonth() - 1); + if (d.getFullYear() > 0) { + me.renderMonth(d); + } + } else if (me._state === 1) { + var d = new Date(me.currentDate); + d.setFullYear(d.getFullYear() - 1); + if (d.getFullYear() > 0) { + me.renderMonths(d); + } + } else if (me._state === 2) { var year = me.currentDate.getFullYear(), newYear; if (year % 10 !== 0) { @@ -127,20 +132,28 @@ define([ } else { newYear = year - 1; } - me.currentDate.setFullYear(newYear); - me.renderYears(newYear); + if (newYear > 0) { + me.currentDate.setFullYear(newYear); + me.renderYears(newYear); + } } }, onClickNext: function () { var me = this; - if (me._state === 'month') { - me.currentDate.setMonth(me.currentDate.getMonth() + 1); - me.renderMonth(me.currentDate); - } else if (me._state === 'months') { - me.currentDate.setFullYear(me.currentDate.getFullYear() + 1); - me.renderMonths(me.currentDate); - } else if (me._state === 'years') { + if (me._state === 0) { + var d = new Date(me.currentDate); + d.setMonth(d.getMonth() + 1); + if (d.getFullYear() > 0) { + me.renderMonth(d); + } + } else if (me._state === 1) { + var d = new Date(me.currentDate); + d.setFullYear(d.getFullYear() + 1); + if (d.getFullYear() > 0) { + me.renderMonths(d); + } + } else if (me._state === 2) { var year = me.currentDate.getFullYear(), newYear; if (year % 10 !== 9) { @@ -149,8 +162,10 @@ define([ } else { newYear = year + 1; } - me.currentDate.setFullYear(newYear); - me.renderYears(newYear); + if (newYear > 0) { + me.currentDate.setFullYear(newYear); + me.renderYears(newYear); + } } }, @@ -158,7 +173,7 @@ define([ var me = this, year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear()); - me._state = 'years'; + me._state = 2; var firstYear = year, lastYear = year; @@ -211,13 +226,15 @@ define([ curDate = (_.isDate(date)) ? date : (me.currentDate ? me.currentDate : new Date()), year = curDate.getFullYear(); - me._state = 'months'; + me._state = 1; + me.currentDate = curDate; // Number of year me.topTitle = _.template([ - '' + '
' ].join('')); me.cmpEl.find('.calendar-header .title').html(me.topTitle); + me.cmpEl.find('.calendar-header .title').off(); me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderYears, me)); me.bottomTitle = _.template([ @@ -260,7 +277,7 @@ define([ renderMonth: function (date) { var me = this; - me._state = 'month'; + me._state = 0; var firstDay = me.options.firstday; // Current date @@ -270,12 +287,16 @@ define([ curNumberDayInMonth = curDate.getDate(), curYear = curDate.getFullYear(); + me.currentDate = curDate; + // Name month me.topTitle = _.template([ - '', - '' + '
', + '', + '
' ].join('')); me.cmpEl.find('.calendar-header .title').html(me.topTitle); + me.cmpEl.find('.calendar-header .title').off(); me.cmpEl.find('.calendar-header .title').on('click', _.bind(me.renderMonths, me)); // Name days of week @@ -343,7 +364,7 @@ define([ me.monthPicker = new Common.UI.DataView({ el: $('.calendar-content'), store: new Common.UI.DataViewStore(arrDays), - itemTemplate: _.template('
<%= dayNumber %>
') + itemTemplate: _.template('
<%= dayNumber %>
') }); }, diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index f39286248..755fc61d9 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -37,19 +37,24 @@ .title { margin-top: 4px; margin-bottom: 3px; - padding: 2px 10px 0; font-size: 13px; label { + padding: 2px 10px 0; + display: block; font-weight: bold; &:not(:last-of-type) { margin-right: 6px; } } - &:hover { - background-color: rgba(255,255,255,0.2); - cursor: pointer; - label { + .button { + height: 100%; + width: 100%; + &:hover { + background-color: rgba(255,255,255,0.2); cursor: pointer; + label { + cursor: pointer; + } } } From 8e495dcafcb550d053d925e30feb42c8a04ebbc8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 30 Oct 2019 16:56:58 +0300 Subject: [PATCH 18/86] [Calendar] Fix translation --- apps/common/main/lib/component/Calendar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index 9cc9e9810..a717e9696 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -39,7 +39,7 @@ define([ ], function () { 'use strict'; - Common.UI.Calendar = Common.UI.BaseView.extend({ + Common.UI.Calendar = Common.UI.BaseView.extend(_.extend({ template : _.template([ @@ -91,14 +91,14 @@ define([ me.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-prev', + iconCls: 'mmerge-prev' }); me.btnPrev.render(me.cmpEl.find('#prev-arrow')); me.btnPrev.on('click', _.bind(me.onClickPrev, me)); me.btnNext = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'mmerge-next', + iconCls: 'mmerge-next' }); me.btnNext.render(me.cmpEl.find('#next-arrow')); me.btnNext.on('click', _.bind(me.onClickNext, me)); @@ -407,5 +407,5 @@ define([ textShortSaturday: 'Sa', textMonths: 'Months', textYears: 'Years' - }); + }, Common.UI.Calendar || {})); }); \ No newline at end of file From 29354cd1168ff73f5a30b7d794f0e206e3dc8396 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 30 Oct 2019 16:57:48 +0300 Subject: [PATCH 19/86] [Calendar] Add test for calendar --- .../main/app/controller/Links.js | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index f6d37fd4c..46b8d269b 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -93,8 +93,10 @@ define([ this.api.asc_registerCallback('asc_onCanAddHyperlink', _.bind(this.onApiCanAddHyperlink, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); - this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); + this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowControlsActions, this)); + this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideControlsActions, this)); + // this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); + // this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); } return this; @@ -391,6 +393,36 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + }, + + onShowControlsActions: function(action, x, y) { + var documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'), + me = this; + + if (controlsContainer.length < 1) { + controlsContainer = $('
'); + documentHolderView.cmpEl.append(controlsContainer); + } + + Common.UI.Menu.Manager.hideAll(); + + controlsContainer.css({left: x, top : y}); + controlsContainer.show(); + + if (!this.cmpCalendar) + this.cmpCalendar = new Common.UI.Calendar({ + el: documentHolderView.cmpEl.find('#id-document-calendar-control'), + firstday: 1 + }); + + documentHolderView._preventClick = true; + }, + + onHideControlsActions: function() { + var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); + if (controlsContainer.is(':visible')) + controlsContainer.hide(); } }, DE.Controllers.Links || {})); From 6d2ecb38fef8e8decab03468c3fc85357ad04b1b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 30 Oct 2019 17:10:24 +0300 Subject: [PATCH 20/86] Revert "[DE] Calendar (add button for test)" This reverts commit 2b16b4fef2dbeb4ea980e79f54c12c2285f5ee72. --- .../app/template/ParagraphSettings.template | 1 - .../main/app/view/ParagraphSettings.js | 22 ++----------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/apps/documenteditor/main/app/template/ParagraphSettings.template b/apps/documenteditor/main/app/template/ParagraphSettings.template index e3d618193..644f6e5bc 100644 --- a/apps/documenteditor/main/app/template/ParagraphSettings.template +++ b/apps/documenteditor/main/app/template/ParagraphSettings.template @@ -54,5 +54,4 @@ -
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 0437a5d19..60f1d58ac 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -48,8 +48,7 @@ define([ 'common/main/lib/component/CheckBox', 'common/main/lib/component/ThemeColorPalette', 'common/main/lib/component/ColorButton', - 'documenteditor/main/app/view/ParagraphSettingsAdvanced', - 'common/main/lib/view/Calendar' + 'documenteditor/main/app/view/ParagraphSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; @@ -183,22 +182,6 @@ define([ this.TextOnlySettings = $('.text-only', this.$el); - // begin calendar - - var me = this; - this.btnCalendar = new Common.UI.Button({ - caption: this.textCalendar, - style: "width:100px;" - }); - this.btnCalendar.render( $('#calendar')); - this.btnCalendar.on('click', _.bind(function (e) { - var popover = Common.Views.Calendar.prototype.getCalendarPopover({}); - popover.showCalendarPopover(); - popover.setLeftTop(300, 300); - }, this)); - - // end calendar - this.rendered = true; }, @@ -516,7 +499,6 @@ define([ textAt: 'At', txtAutoText: 'Auto', textBackColor: 'Background color', - textNewColor: 'Add New Custom Color', - textCalendar: 'Calendar' + textNewColor: 'Add New Custom Color' }, DE.Views.ParagraphSettings || {})); }); \ No newline at end of file From 98a05281b3c2a5c46610e73cfd71c581070a2435 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 31 Oct 2019 13:36:53 +0300 Subject: [PATCH 21/86] [Calendar] Deleted view for test --- apps/common/main/lib/view/Calendar.js | 237 -------------------------- 1 file changed, 237 deletions(-) delete mode 100644 apps/common/main/lib/view/Calendar.js diff --git a/apps/common/main/lib/view/Calendar.js b/apps/common/main/lib/view/Calendar.js deleted file mode 100644 index b337628bf..000000000 --- a/apps/common/main/lib/view/Calendar.js +++ /dev/null @@ -1,237 +0,0 @@ -/* - * - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * -*/ -/** - * Calendar.js - * - * Created by Julia Svinareva on 18/10/19 - * Copyright (c) 2019 Ascensio System SIA. All rights reserved. - * - */ - - -if (Common === undefined) - var Common = {}; - -define([ - 'common/main/lib/component/Window', - 'common/main/lib/component/Calendar', -], function () { - 'use strict'; - - Common.Views.Calendar = Common.UI.Window.extend(_.extend({ - - // Window - - initialize: function (options) { - var _options = {}; - - _.extend(_options, { - closable: false, - width: 200, - height: 220, - header: false, - modal: false, - alias: 'Common.Views.Calendar', - firstNumber: 0, // 0 or 6 - cls: 'calendar-window' - }, options); - - this.template = options.template || [ - '
', - '
', - - '
', - '
' - ].join(''); - - - _options.tpl = _.template(this.template)(_options); - - Common.UI.Window.prototype.initialize.call(this, _options); - - return this; - }, - render: function () { - Common.UI.Window.prototype.render.call(this); - - var me = this, - window = this.$window; - - window.css({ - height: '', - minHeight: 222, - overflow: 'hidden', - position: 'absolute', - zIndex: '990' - }); - - var body = window.find('.body'); - if (body) { - body.css('position', 'relative'); - } - - me.calendar = new Common.UI.Calendar({ - el: $('#id-popover'), - firstday: 1 - }); - - }, - - getCalendarPopover: function (options) { - if (!this.popover) - this.popover = new Common.Views.Calendar(options); - return this.popover; - }, - - showCalendarPopover: function (animate, loadText, focus, showText) { - this.options.animate = animate; - - Common.UI.Window.prototype.show.call(this); - if (this.scroller) { - this.scroller.update({minScrollbarLength: 40, alwaysVisibleY: true}); - } - }, - - setLeftTop: function (posX, posY) { - if (!this.$window) - this.render(); - - if (_.isUndefined(posX) && _.isUndefined(posY)) - return; - - var calendarView = $('#id-popover'), - editorView = $('#editor_sdk'), - editorBounds = null, - sdkBoundsHeight = 0, - sdkBoundsTop = 0, - sdkBoundsLeft = 0, - sdkPanelRight = '', - sdkPanelRightWidth = 0, - sdkPanelLeft = '', - sdkPanelLeftWidth = 0, - sdkPanelThumbs = '', // for PE - sdkPanelThumbsWidth = 0, // for PE - sdkPanelTop = '', - sdkPanelHeight = 0, - leftPos = 0, - windowWidth = 0, - outerHeight = 0, - topPos = 0, - sdkBoundsTopPos = 0; - - if (calendarView && editorView && editorView.get(0)) { - editorBounds = editorView.get(0).getBoundingClientRect(); - if (editorBounds) { - //sdkBoundsHeight = editorBounds.height - this.sdkBounds.padding * 2; - - this.$window.css({maxHeight: sdkBoundsHeight + 'px'}); - - //this.sdkBounds.width = editorBounds.width; - //this.sdkBounds.height = editorBounds.height; - - // LEFT CORNER - - if (!_.isUndefined(posX)) { - - sdkPanelRight = $('#id_vertical_scroll'); - if (sdkPanelRight.length) { - sdkPanelRightWidth = (sdkPanelRight.css('display') !== 'none') ? sdkPanelRight.width() : 0; - } else { - sdkPanelRight = $('#ws-v-scrollbar'); - if (sdkPanelRight.length) { - sdkPanelRightWidth = (sdkPanelRight.css('display') !== 'none') ? sdkPanelRight.width() : 0; - } - } - - //this.sdkBounds.width -= sdkPanelRightWidth; - - sdkPanelLeft = $('#id_panel_left'); - if (sdkPanelLeft.length) { - sdkPanelLeftWidth = (sdkPanelLeft.css('display') !== 'none') ? sdkPanelLeft.width() : 0; - } - sdkPanelThumbs = $('#id_panel_thumbnails'); - if (sdkPanelThumbs.length) { - sdkPanelThumbsWidth = (sdkPanelThumbs.css('display') !== 'none') ? sdkPanelThumbs.width() : 0; - //this.sdkBounds.width -= sdkPanelThumbsWidth; - } - - //leftPos = Math.min(sdkBoundsLeft + posX + this.arrow.width, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25); - leftPos = posX; - //leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + this.arrow.width, leftPos); - - /*if (!_.isUndefined(leftX)) { - windowWidth = this.$window.outerWidth(); - if (windowWidth) { - if ((posX + windowWidth > this.sdkBounds.width - this.arrow.width + 5) && (this.leftX > windowWidth)) { - leftPos = this.leftX - windowWidth + sdkBoundsLeft - this.arrow.width; - arrowView.removeClass('left').addClass('right'); - } else { - leftPos = sdkBoundsLeft + posX + this.arrow.width; - } - } - }*/ - - this.$window.css('left', leftPos + 'px'); - } - - // TOP CORNER - - if (!_.isUndefined(posY)) { - /*sdkPanelTop = $('#id_panel_top'); - sdkBoundsTopPos = sdkBoundsTop; - if (sdkPanelTop.length) { - sdkPanelHeight = (sdkPanelTop.css('display') !== 'none') ? sdkPanelTop.height() : 0; - sdkBoundsTopPos += this.sdkBounds.paddingTop; - } else { - sdkPanelTop = $('#ws-h-scrollbar'); - if (sdkPanelTop.length) { - sdkPanelHeight = (sdkPanelTop.css('display') !== 'none') ? sdkPanelTop.height() : 0; - } - }*/ - - //this.sdkBounds.height -= sdkPanelHeight; - - outerHeight = this.$window.outerHeight(); - - //topPos = Math.min(sdkBoundsTop + sdkBoundsHeight - outerHeight, this.arrowPosY + sdkBoundsTop - this.arrow.height); - topPos = posY; - //topPos = Math.max(topPos, sdkBoundsTopPos); - - this.$window.css('top', topPos + 'px'); - } - } - } - }, - - }, Common.Views.Calendar || {})) -}); \ No newline at end of file From 10957f7d12b4dbe19f7fe54578779bd465b9700d Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 31 Oct 2019 13:39:11 +0300 Subject: [PATCH 22/86] [Calendar] for test --- apps/documenteditor/main/app/controller/Links.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 46b8d269b..f528ec0ae 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -41,6 +41,7 @@ define([ 'core', + 'common/main/lib/component/Calendar', 'documenteditor/main/app/view/Links', 'documenteditor/main/app/view/NoteSettingsDialog', 'documenteditor/main/app/view/HyperlinkSettingsDialog', @@ -410,11 +411,17 @@ define([ controlsContainer.css({left: x, top : y}); controlsContainer.show(); - if (!this.cmpCalendar) + if (!this.cmpCalendar) { this.cmpCalendar = new Common.UI.Calendar({ el: documentHolderView.cmpEl.find('#id-document-calendar-control'), firstday: 1 }); + this.cmpCalendar.on('date:click', function (cmp, date) { + me.selectDate = new Date(date); + }); + } + this.cmpCalendar.setDate(this.selectDate ? this.selectDate : new Date()); + documentHolderView._preventClick = true; }, From 9cf1d3443e7bccd4f7bf6a618649e51f8036d349 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 31 Oct 2019 13:40:22 +0300 Subject: [PATCH 23/86] [Calendar] --- apps/common/main/lib/component/Calendar.js | 91 +++++++++++++------ apps/common/main/resources/less/calendar.less | 31 +++++-- 2 files changed, 89 insertions(+), 33 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index a717e9696..2c1a5048b 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -46,9 +46,9 @@ define([ '
', '
', '
', - '
', + '
', '
', - '
', + '
', '
', '
', '
', @@ -90,15 +90,15 @@ define([ me.currentDate = me.options.date || new Date(); me.btnPrev = new Common.UI.Button({ - cls: 'btn-toolbar', - iconCls: 'mmerge-prev' + cls: '', + iconCls: 'arrow-prev img-commonctrl' }); me.btnPrev.render(me.cmpEl.find('#prev-arrow')); me.btnPrev.on('click', _.bind(me.onClickPrev, me)); me.btnNext = new Common.UI.Button({ - cls: 'btn-toolbar', - iconCls: 'mmerge-next' + cls: '', + iconCls: 'arrow-next img-commonctrl' }); me.btnNext.render(me.cmpEl.find('#next-arrow')); me.btnNext.on('click', _.bind(me.onClickNext, me)); @@ -203,13 +203,16 @@ define([ arrYears.push({ year: (tmpYear > 0) ? tmpYear : '', isCurrentDecade: ((tmpYear >= firstYear) && (tmpYear <= lastYear)) ? true : false, - disabled: (tmpYear > 0) ? false : true + disabled: (tmpYear > 0) ? false : true, + selected: (_.isDate(me.selectedDate)) ? + (tmpYear === me.selectedDate.getFullYear()) : + (tmpYear === new Date().getFullYear()) }); tmpYear++; } me.yearPicker = new Common.UI.DataView({ - el: $('.calendar-content'), + el: me.cmpEl.find('.calendar-content'), store: new Common.UI.DataViewStore(arrYears), itemTemplate: _.template('
<%= year %>
') }); @@ -243,6 +246,7 @@ define([ me.cmpEl.find('.calendar-header .bottom-row').html(me.bottomTitle); var arrMonths = []; + var today = new Date(); for (var ind = 0; ind < 12; ind++) { arrMonths.push({ @@ -250,27 +254,35 @@ define([ nameMonth: me.monthShortNames[ind], year: year, curYear: true, - isCurrentMonth: (ind === curDate.getMonth()) + isCurrentMonth: (ind === curDate.getMonth()), + selected: (_.isDate(me.selectedDate)) ? + (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) : + (ind === today.getMonth() && year === today.getFullYear()) }); } + year = year + 1; for (var ind = 0; ind < 4; ind++) { arrMonths.push({ indexMonth: ind, nameMonth: me.monthShortNames[ind], - year: year + 1, - curYear: false + year: year, + curYear: false, + selected: (_.isDate(me.selectedDate)) ? + (ind === me.selectedDate.getMonth() && year === me.selectedDate.getFullYear()) : + (ind === today.getMonth() && year === today.getFullYear()) }); } - me.monthPicker = new Common.UI.DataView({ - el: $('.calendar-content'), + me.monthsPicker = new Common.UI.DataView({ + el: me.cmpEl.find('.calendar-content'), store: new Common.UI.DataViewStore(arrMonths), itemTemplate: _.template('
<%= nameMonth %>
') }); - me.monthPicker.on('item:click', function (picker, item, record, e) { + me.monthsPicker.on('item:click', function (picker, item, record, e) { var month = record.get('indexMonth'), year = record.get('year'), - date = new Date(year, month); + date = new Date(); + date.setFullYear(year, month); me.renderMonth(date); }); }, @@ -345,33 +357,60 @@ define([ year = curYear; } - var tmp = new Date(year, month, numberDay); + var tmp = new Date(); + tmp.setFullYear(year, month, numberDay); + var today = new Date(); for(var r = 0; r < rows; r++) { for(var c = 0; c < cols; c++) { + var tmpDay = tmp.getDay(), + tmpNumber = tmp.getDate(), + tmpMonth = tmp.getMonth(), + tmpYear = tmp.getFullYear(); arrDays.push({ - indexInWeek: tmp.getDay(), - dayNumber: tmp.getDate(), - month: tmp.getMonth(), - year: tmp.getFullYear(), - isToday: (tmp.getDate() === curNumberDayInMonth) ? true : false, - isCurrentMonth: (tmp.getMonth() === curMonth) ? true : false + indexInWeek: tmpDay, + dayNumber: tmpNumber, + month: tmpMonth, + year: tmpYear, + isCurrentMonth: tmpMonth === curMonth, + selected: (_.isDate(me.selectedDate)) ? + (tmpNumber === me.selectedDate.getDate() && tmpMonth === me.selectedDate.getMonth() && tmpYear === me.selectedDate.getFullYear()) : + (tmpNumber === today.getDate() && tmpMonth === today.getMonth() && tmpYear === today.getFullYear()) }); - tmp.setDate(tmp.getDate() + 1); + tmp.setDate(tmpNumber + 1); } } me.monthPicker = new Common.UI.DataView({ - el: $('.calendar-content'), + el: me.cmpEl.find('.calendar-content'), store: new Common.UI.DataViewStore(arrDays), - itemTemplate: _.template('
<%= dayNumber %>
') + itemTemplate: _.template('
<%= dayNumber %>
') + }); + me.monthPicker.on('item:click', function(picker, item, record, e) { + var day = record.get('dayNumber'), + month = record.get('month'), + year = record.get('year'); + if (_.isUndefined(me.selectedDate)) { + me.selectedDate = new Date(); + } + me.selectedDate.setFullYear(year, month, day); + me.trigger('date:click', me, me.selectedDate); }); }, daysInMonth: function (date) { var d; d = date ? new Date(date) : new Date(); - return (new Date(d.getFullYear(), d.getMonth() + 1, 0)).getDate(); + var result = new Date(); + result.setFullYear(d.getFullYear(), d.getMonth() + 1, 0); + return result.getDate(); + }, + + setDate: function (date) { + if (_.isDate(date)) { + this.selectedDate = new Date(date); + this.renderMonth(this.selectedDate); + } }, textJanuary: 'January', diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 755fc61d9..8e62b44d0 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -8,17 +8,33 @@ width: 198px; height: 220px; border: 1px solid @calendar-bg-color; + .top-row { + padding: 0 5px; + } .btn { background-color: transparent; border: none; - height: 24px; - width: 24px; - margin-top: 5px; + height: 20px; + width: 20px; + margin-top: 4px; + display: flex; + justify-content: center; + align-items: center; .icon { - width: 24px; - height: 24px; + width: 16px; + height: 16px; display: block; position: relative; + &.arrow-prev { + background-position: -55px -96px; + } + &.arrow-next { + background-position: -52px -112px; + } + } + &:hover { + background-color: rgba(255,255,255,0.2); + cursor: pointer; } } .calendar-header { @@ -35,8 +51,9 @@ padding: 0; } .title { - margin-top: 4px; - margin-bottom: 3px; + width: 100%; + margin: 4px 6px 3px 6px; + text-align: center; font-size: 13px; label { padding: 2px 10px 0; From e7a631459017515002e3d30db2b0efa3c052fbae Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 1 Nov 2019 09:53:13 +0300 Subject: [PATCH 24/86] [Calendar] Fix style --- apps/common/main/resources/less/calendar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index 8e62b44d0..5f0fd3c21 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -1,4 +1,4 @@ -@calendar-bg-color: #446995; +@calendar-bg-color: @tabs-bg-color; .calendar-window { border-radius: 0; From dd4f32a9257327a216fc26cc35d461eb1f721342 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 1 Nov 2019 13:36:36 +0300 Subject: [PATCH 25/86] [Calendar] Add key events support . Refactoring --- apps/common/main/lib/component/Calendar.js | 123 ++++++++++++------ .../main/app/controller/Links.js | 7 + 2 files changed, 89 insertions(+), 41 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index 2c1a5048b..71b282a13 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -66,7 +66,6 @@ define([ Common.UI.BaseView.prototype.initialize.call(this, options); var me = this; - me.cmpEl = me.$el || $(this.el); this.monthNames = [this.textJanuary, this.textFebruary, this.textMarch, this.textApril, this.textMay, this.textJune, this.textJuly, this.textAugust, this.textSeptember, this.textOctober, this.textNovember, this.textDecember]; this.dayNamesShort = [this.textShortSunday, this.textShortMonday, this.textShortTuesday, this.textShortWednesday, this.textShortThursday, this.textShortFriday, this.textShortSaturday]; @@ -77,15 +76,17 @@ define([ me.options.firstday = options.firstday; } + me.enableKeyEvents= me.options.enableKeyEvents; + me._state = undefined; // 0 - month, 1 - months, 2 - years me.render(); }, render: function () { - (this.$el || $(this.el)).html(this.template()); - var me = this; + me.cmpEl = me.$el || $(this.el); + me.cmpEl.html(this.template()); me.currentDate = me.options.date || new Date(); @@ -103,6 +104,10 @@ define([ me.btnNext.render(me.cmpEl.find('#next-arrow')); me.btnNext.on('click', _.bind(me.onClickNext, me)); + me.cmpEl.on('keydown', function(e) { + me.trigger('calendar:keydown', me, e); + }); + me.renderMonth(me.currentDate); this.trigger('render:after', this); @@ -211,17 +216,29 @@ define([ tmpYear++; } - me.yearPicker = new Common.UI.DataView({ - el: me.cmpEl.find('.calendar-content'), - store: new Common.UI.DataViewStore(arrYears), - itemTemplate: _.template('
<%= year %>
') - }); - me.yearPicker.on('item:click', function (picker, item, record, e) { - var year = record.get('year'), - date = new Date(); - date.setFullYear(year); - me.renderMonths(date); - }); + if (!me.yearPicker) { + me.yearPicker = new Common.UI.DataView({ + el: me.cmpEl.find('.calendar-content'), + store: new Common.UI.DataViewStore(arrYears), + itemTemplate: _.template('
<%= year %>
') + }); + me.yearPicker.on('item:click', function (picker, item, record, e) { + var year = record.get('year'), + date = new Date(); + date.setFullYear(year); + me.renderMonths(date); + }); + me.enableKeyEvents && this.yearPicker.on('item:keydown', function(view, record, e) { + if (e.keyCode==Common.UI.Keys.ESC) { + Common.NotificationCenter.trigger('dataview:blur'); + } + }); + } else + me.yearPicker.store.reset(arrYears); + + me.enableKeyEvents && _.delay(function() { + me.monthPicker.cmpEl.find('.dataview').focus(); + }, 10); }, renderMonths: function (date) { @@ -273,18 +290,30 @@ define([ }); } - me.monthsPicker = new Common.UI.DataView({ - el: me.cmpEl.find('.calendar-content'), - store: new Common.UI.DataViewStore(arrMonths), - itemTemplate: _.template('
<%= nameMonth %>
') - }); - me.monthsPicker.on('item:click', function (picker, item, record, e) { - var month = record.get('indexMonth'), - year = record.get('year'), - date = new Date(); - date.setFullYear(year, month); - me.renderMonth(date); - }); + if (!me.monthsPicker) { + me.monthsPicker = new Common.UI.DataView({ + el: me.cmpEl.find('.calendar-content'), + store: new Common.UI.DataViewStore(arrMonths), + itemTemplate: _.template('
<%= nameMonth %>
') + }); + me.monthsPicker.on('item:click', function (picker, item, record, e) { + var month = record.get('indexMonth'), + year = record.get('year'), + date = new Date(); + date.setFullYear(year, month); + me.renderMonth(date); + }); + me.enableKeyEvents && this.monthsPicker.on('item:keydown', function(view, record, e) { + if (e.keyCode==Common.UI.Keys.ESC) { + Common.NotificationCenter.trigger('dataview:blur'); + } + }); + } else + me.monthsPicker.store.reset(arrMonths); + + me.enableKeyEvents && _.delay(function() { + me.monthPicker.cmpEl.find('.dataview').focus(); + }, 10); }, renderMonth: function (date) { @@ -381,21 +410,33 @@ define([ } } - me.monthPicker = new Common.UI.DataView({ - el: me.cmpEl.find('.calendar-content'), - store: new Common.UI.DataViewStore(arrDays), - itemTemplate: _.template('
<%= dayNumber %>
') - }); - me.monthPicker.on('item:click', function(picker, item, record, e) { - var day = record.get('dayNumber'), - month = record.get('month'), - year = record.get('year'); - if (_.isUndefined(me.selectedDate)) { - me.selectedDate = new Date(); - } - me.selectedDate.setFullYear(year, month, day); - me.trigger('date:click', me, me.selectedDate); - }); + if (!me.monthPicker) { + me.monthPicker = new Common.UI.DataView({ + el: me.cmpEl.find('.calendar-content'), + store: new Common.UI.DataViewStore(arrDays), + itemTemplate: _.template('
<%= dayNumber %>
') + }); + me.monthPicker.on('item:click', function(picker, item, record, e) { + var day = record.get('dayNumber'), + month = record.get('month'), + year = record.get('year'); + if (_.isUndefined(me.selectedDate)) { + me.selectedDate = new Date(); + } + me.selectedDate.setFullYear(year, month, day); + me.trigger('date:click', me, me.selectedDate); + }); + me.enableKeyEvents && this.monthPicker.on('item:keydown', function(view, record, e) { + if (e.keyCode==Common.UI.Keys.ESC) { + Common.NotificationCenter.trigger('dataview:blur'); + } + }); + } else + me.monthPicker.store.reset(arrDays); + + me.enableKeyEvents && _.delay(function() { + me.monthPicker.cmpEl.find('.dataview').focus(); + }, 10); }, daysInMonth: function (date) { diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index f528ec0ae..fdd1a2a24 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -414,11 +414,18 @@ define([ if (!this.cmpCalendar) { this.cmpCalendar = new Common.UI.Calendar({ el: documentHolderView.cmpEl.find('#id-document-calendar-control'), + enableKeyEvents: true, firstday: 1 }); this.cmpCalendar.on('date:click', function (cmp, date) { me.selectDate = new Date(date); }); + this.cmpCalendar.on('calendar:keydown', function (cmp, e) { + if (e.keyCode==Common.UI.Keys.ESC) { + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); + } + }); } this.cmpCalendar.setDate(this.selectDate ? this.selectDate : new Date()); From 79819463b9c6553edd7cb7a588ea2802f3450625 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 1 Nov 2019 14:42:12 +0300 Subject: [PATCH 26/86] [DE] Add translations (Calendar) --- apps/documenteditor/main/locale/en.json | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 31b794527..a88e0b0e3 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -102,6 +102,39 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", + "Common.UI.Calendar.textJanuary": "January", + "Common.UI.Calendar.textFebruary": "February", + "Common.UI.Calendar.textMarch": "March", + "Common.UI.Calendar.textApril": "April", + "Common.UI.Calendar.textMay": "May", + "Common.UI.Calendar.textJune": "June", + "Common.UI.Calendar.textJuly": "July", + "Common.UI.Calendar.textAugust": "August", + "Common.UI.Calendar.textSeptember": "September", + "Common.UI.Calendar.textOctober": "October", + "Common.UI.Calendar.textNovember": "November", + "Common.UI.Calendar.textDecember": "December", + "Common.UI.Calendar.textShortJanuary": "Jan", + "Common.UI.Calendar.textShortFebruary": "Feb", + "Common.UI.Calendar.textShortMarch": "Mar", + "Common.UI.Calendar.textShortApril": "Apr", + "Common.UI.Calendar.textShortMay": "May", + "Common.UI.Calendar.textShortJune": "Jun", + "Common.UI.Calendar.textShortJuly": "Jul", + "Common.UI.Calendar.textShortAugust": "Aug", + "Common.UI.Calendar.textShortSeptember": "Sep", + "Common.UI.Calendar.textShortOctober": "Oct", + "Common.UI.Calendar.textShortNovember": "Nov", + "Common.UI.Calendar.textShortDecember": "Dec", + "Common.UI.Calendar.textShortSunday": "Su", + "Common.UI.Calendar.textShortMonday": "Mo", + "Common.UI.Calendar.textShortTuesday": "Tu", + "Common.UI.Calendar.textShortWednesday": "We", + "Common.UI.Calendar.textShortThursday": "Th", + "Common.UI.Calendar.textShortFriday": "Fr", + "Common.UI.Calendar.textShortSaturday": "Sa", + "Common.UI.Calendar.textMonths": "Months", + "Common.UI.Calendar.textYears": "Years", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", From ad70b9ab158f0c8930c3b3c7081109cb9ebba0e4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 5 Nov 2019 14:35:08 +0300 Subject: [PATCH 27/86] [DE] Change content control settings --- .../template/ControlSettingsDialog.template | 67 +++++++++++++ .../main/app/view/ControlSettingsDialog.js | 99 ++++--------------- 2 files changed, 85 insertions(+), 81 deletions(-) create mode 100644 apps/documenteditor/main/app/template/ControlSettingsDialog.template diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template new file mode 100644 index 000000000..1598c4200 --- /dev/null +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -0,0 +1,67 @@ +
+
+ + + + + + + + + + +
+ +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + +
+ +
+ + +
+
+ + +
+
+ +
+
+
+
+
+ + + + + + + +
+
+
+
+
+
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index d82b927ee..e8553800f 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -39,17 +39,19 @@ * */ -define([ +define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', 'common/main/lib/util/utils', 'common/main/lib/component/CheckBox', 'common/main/lib/component/InputField', 'common/main/lib/view/AdvancedSettingsWindow' -], function () { 'use strict'; +], function (contentTemplate) { 'use strict'; DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 412 + height: 412, + toggleGroup: 'control-adv-settings-group', + storageName: 'de-control-settings-adv-category' }, initialize : function(options) { @@ -57,83 +59,13 @@ define([ _.extend(this.options, { title: this.textTitle, - template: [ - '
', - '
', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '', - '
', - '
', - '', - '
', - '
', - '
', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '', - '
', - '', - '', - '
', - '
', - '', - '', - '
', - '
', - '', - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', - '
', - '
', - '', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
' - ].join('') + items: [ + {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral}, + {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock} + ], + contentTemplate: _.template(contentTemplate)({ + scope: this + }) }, options); this.handler = options.handler; @@ -252,6 +184,10 @@ define([ afterRender: function() { this.updateThemeColors(); this._setDefaults(this.props); + if (this.storageName) { + var value = Common.localStorage.getItem(this.storageName); + this.setActiveCategory((value!==null) ? parseInt(value) : 0); + } }, show: function() { @@ -352,7 +288,8 @@ define([ textNewColor: 'Add New Custom Color', textApplyAll: 'Apply to All', textAppearance: 'Appearance', - textSystemColor: 'System' + textSystemColor: 'System', + strGeneral: 'General' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file From d2abb4c455491bc6444a3a3b59952709560b59c2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 5 Nov 2019 15:46:04 +0300 Subject: [PATCH 28/86] [DE] Add content controls (picture, checkbox, combobox, dropdown list, date picker) --- .../main/app/controller/Toolbar.js | 21 ++++++++--- apps/documenteditor/main/app/view/Toolbar.js | 36 +++++++++++++++++-- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 71c5041ce..a1fe5f3cb 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -750,10 +750,11 @@ define([ (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); if (!paragraph_locked && !header_locked) { - toolbar.btnContentControls.menu.items[0].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked); - toolbar.btnContentControls.menu.items[1].setDisabled(control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked); - toolbar.btnContentControls.menu.items[3].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); - toolbar.btnContentControls.menu.items[5].setDisabled(!in_control); + var control_disable = control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; + for (var i=0; i<7; i++) + toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } var need_text_disable = paragraph_locked || header_locked || in_chart; @@ -1745,7 +1746,17 @@ define([ } } } else { - this.api.asc_AddContentControl(item.value); + if (item.value == 'plain' || item.value == 'rich') + this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block); + else if (item.value == 'picture') + this.api.asc_AddContentControlPicture(); + else if (item.value == 'checkbox') + this.api.asc_AddContentControlCheckBox(); + else if (item.value == 'date') + this.api.asc_AddContentControlDatePicker(); + else if (item.value == 'combobox' || item.value == 'dropdown') + this.api.asc_AddContentControlList(item.value == 'combobox'); + Common.component.Analytics.trackEvent('ToolBar', 'Add Content Control'); } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index acdb1b86a..a33080bd8 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -631,12 +631,37 @@ define([ { caption: this.textPlainControl, iconCls: 'mnu-control-plain', - value: Asc.c_oAscSdtLevelType.Inline + value: 'plain' }, { caption: this.textRichControl, iconCls: 'mnu-control-rich', - value: Asc.c_oAscSdtLevelType.Block + value: 'rich' + }, + { + caption: this.textPictureControl, + iconCls: 'mnu-control-rich', + value: 'picture' + }, + { + caption: this.textComboboxControl, + iconCls: 'mnu-control-rich', + value: 'combobox' + }, + { + caption: this.textDropdownControl, + iconCls: 'mnu-control-rich', + value: 'dropdown' + }, + { + caption: this.textDateControl, + iconCls: 'mnu-control-rich', + value: 'date' + }, + { + caption: this.textCheckboxControl, + iconCls: 'mnu-control-rich', + value: 'checkbox' }, {caption: '--'}, { @@ -2324,7 +2349,12 @@ define([ capBtnWatermark: 'Watermark', textEditWatermark: 'Custom Watermark', textRemWatermark: 'Remove Watermark', - tipWatermark: 'Edit watermark' + tipWatermark: 'Edit watermark', + textPictureControl: 'Insert picture content control', + textComboboxControl: 'Insert combo box content control', + textCheckboxControl: 'Insert check box content control', + textDropdownControl: 'Insert drop-down list content control', + textDateControl: 'Insert date content control' } })(), DE.Views.Toolbar || {})); }); From 8803f6e1d6adaef35b7da1a5590615a87b60f14a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2019 13:24:04 +0300 Subject: [PATCH 29/86] [DE] Add settings for combobox and dropdown list controls --- .../template/ControlSettingsDialog.template | 25 +++ .../main/app/view/ControlSettingsDialog.js | 165 +++++++++++++++++- .../main/app/view/EditListItemDialog.js | 162 +++++++++++++++++ 3 files changed, 349 insertions(+), 3 deletions(-) create mode 100644 apps/documenteditor/main/app/view/EditListItemDialog.js diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 1598c4200..f5d339807 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -64,4 +64,29 @@
+
+
+
+ + + + + + + + + +
+ + +
+
+ 		+ + + + + +
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index e8553800f..2b5aa2208 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -43,7 +43,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', 'common/main/lib/util/utils', 'common/main/lib/component/CheckBox', 'common/main/lib/component/InputField', - 'common/main/lib/view/AdvancedSettingsWindow' + 'common/main/lib/view/AdvancedSettingsWindow', + 'documenteditor/main/app/view/EditListItemDialog' ], function (contentTemplate) { 'use strict'; DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ @@ -61,7 +62,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', title: this.textTitle, items: [ {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral}, - {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock} + {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock}, + {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox} ], contentTemplate: _.template(contentTemplate)({ scope: this @@ -154,6 +156,46 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', labelText: this.txtLockEdit }); + // combobox & dropdown list + this.list = new Common.UI.ListView({ + el: $('#control-settings-list', this.$window), + store: new Common.UI.DataViewStore(), + emptyText: '', + template: _.template(['
'].join('')), + itemTemplate: _.template([ + '
', + '
<%= name %>
', + '
<%= value %>
', + '
' + ].join('')) + }); + this.list.on('item:select', _.bind(this.onSelectItem, this)); + + this.btnAdd = new Common.UI.Button({ + el: $('#control-settings-btn-add') + }); + this.btnAdd.on('click', _.bind(this.onAddItem, this)); + + this.btnChange = new Common.UI.Button({ + el: $('#control-settings-btn-change') + }); + this.btnChange.on('click', _.bind(this.onChangeItem, this)); + + this.btnDelete = new Common.UI.Button({ + el: $('#control-settings-btn-delete') + }); + this.btnDelete.on('click', _.bind(this.onDeleteItem, this)); + + this.btnUp = new Common.UI.Button({ + el: $('#control-settings-btn-up') + }); + this.btnUp.on('click', _.bind(this.onMoveItem, this, true)); + + this.btnDown = new Common.UI.Button({ + el: $('#control-settings-btn-down') + }); + this.btnDown.on('click', _.bind(this.onMoveItem, this, false)); + this.afterRender(); }, @@ -222,6 +264,25 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', (val===undefined) && (val = Asc.c_oAscSdtLockType.Unlocked); this.chLockDelete.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.SdtLocked); this.chLockEdit.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.ContentLocked); + + //for list controls + /* + // this.btnsCategory[2].setVisible(type == 'list'); + + var items = props.get_ListItems(); + if (items) { + var arr = []; + for (var i=0; istore.length-1) idx = store.length-1; + if (store.length>0) { + this.list.selectByIndex(idx); + this.list.scrollToRecord(store.at(idx)); + } + } + this.disableListButtons(); + this.list.cmpEl.find('.listview').focus(); + }, + + onMoveItem: function(up) { + var store = this.list.store, + length = store.length, + rec = this.list.getSelectedRec(); + if (rec) { + var index = store.indexOf(rec); + store.add(store.remove(rec), {at: up ? Math.max(0, index-1) : Math.min(length-1, index+1)}); + this.list.selectRecord(rec); + this.list.scrollToRecord(rec); + } + this.list.cmpEl.find('.listview').focus(); + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -289,7 +440,15 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textApplyAll: 'Apply to All', textAppearance: 'Appearance', textSystemColor: 'System', - strGeneral: 'General' + strGeneral: 'General', + textAdd: 'Add', + textChange: 'Edit', + textDelete: 'Delete', + textUp: 'Up', + textDown: 'Down', + textCombobox: 'Combo box', + textDisplayName: 'Display name', + textValue: 'Value' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/EditListItemDialog.js b/apps/documenteditor/main/app/view/EditListItemDialog.js new file mode 100644 index 000000000..ba854af97 --- /dev/null +++ b/apps/documenteditor/main/app/view/EditListItemDialog.js @@ -0,0 +1,162 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ + +/** + * EditListItemDialog.js + * + * Created by Julia Radzhabova on 05.11.2019 + * Copyright (c) 2019 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/InputField' +], function () { 'use strict'; + + DE.Views.EditListItemDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 330, + header: false, + cls: 'modal-dlg', + buttons: ['ok', 'cancel'] + }, + + initialize : function(options) { + _.extend(this.options, options || {}); + + this.template = [ + '
', + '
', + '', + '
', + '
', + '
', + '', + '
', + '
', + '
' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + var me = this; + me.inputName = new Common.UI.InputField({ + el : $('#id-dlg-label-name'), + allowBlank : false, + blankError : me.textNameError, + style : 'width: 100%;', + validateOnBlur: false, + validation : function(value) { + return value ? true : ''; + } + }); + me.inputName._input.on('input', function (e) { + if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) { + me.copyvalue = 1; + } + if (me.copyvalue==1) + me.inputValue.setValue($(e.target).val()); + else if (me.copyvalue==2) + me.copyvalue = 0; + }); + + me.inputValue = new Common.UI.InputField({ + el : $('#id-dlg-label-value'), + style : 'width: 100%;', + validateOnBlur: false + }); + me.inputValue._input.on('input', function (e) { + if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) { + me.copyvalue = 2; + } + if (me.copyvalue==2) + me.inputName.setValue($(e.target).val()); + else if (me.copyvalue==1) + me.copyvalue = 0; + }); + + var $window = this.getChild(); + $window.find('.btn').on('click', _.bind(this.onBtnClick, this)); + }, + + show: function() { + Common.UI.Window.prototype.show.apply(this, arguments); + + var me = this; + _.delay(function(){ + me.inputName.cmpEl.find('input').focus(); + },50); + }, + + onPrimary: function(event) { + this._handleInput('ok'); + return false; + }, + + onBtnClick: function(event) { + this._handleInput(event.currentTarget.attributes['result'].value); + }, + + _handleInput: function(state) { + if (this.options.handler) { + if (state == 'ok') { + if (this.inputName.checkValidate() !== true) { + this.inputName.cmpEl.find('input').focus(); + return; + } + } + + this.options.handler.call(this, state, this.inputName.getValue(), this.inputValue.getValue()); + } + + this.close(); + }, + + setSettings: function (props) { + if (props) { + this.inputName.setValue(props.name || ''); + this.inputValue.setValue(props.value || ''); + } + }, + + textDisplayName: 'Display name', + textValue: 'Value', + textNameError: 'Display name must not be empty.' + }, DE.Views.EditListItemDialog || {})); +}); \ No newline at end of file From f6ce4273a0056955681020395a090bd2c867f4f8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2019 14:15:23 +0300 Subject: [PATCH 30/86] [DE] Add settings for date content control --- .../main/app/controller/Toolbar.js | 6 ++ .../template/ControlSettingsDialog.template | 26 +++++++ .../main/app/view/ControlSettingsDialog.js | 74 ++++++++++++++++++- 3 files changed, 104 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index a1fe5f3cb..02c617407 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -378,6 +378,7 @@ define([ this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this)); this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this)); this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); + this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); @@ -1730,6 +1731,7 @@ define([ (new DE.Views.ControlSettingsDialog({ props: props, api: me.api, + lang: me._state.lang, handler: function(result, value) { if (result == 'ok') { me.api.asc_SetContentControlProperties(value, id); @@ -2932,6 +2934,10 @@ define([ } }, + onTextLanguage: function(langId) { + this._state.lang = langId; + }, + textEmptyImgUrl : 'You need to specify image URL.', textWarning : 'Warning', textFontSizeErr : 'The entered value is incorrect.
Please enter a numeric value between 1 and 100', diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index f5d339807..0f48db92a 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -89,4 +89,30 @@
+
+
+
+ + + + + + + + + + + + + +
+ +
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 2b5aa2208..99b65c0be 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -63,7 +63,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', items: [ {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral}, {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock}, - {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox} + {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox}, + {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate} ], contentTemplate: _.template(contentTemplate)({ scope: this @@ -196,6 +197,35 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }); this.btnDown.on('click', _.bind(this.onMoveItem, this, false)); + // date picker + var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 }, {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A }, + { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 }, + { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }]; + data.forEach(function(item) { + var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value); + item.displayValue = langinfo[1]; + item.langName = langinfo[0]; + }); + + this.cmbLang = new Common.UI.ComboBox({ + el : $('#control-settings-lang'), + menuStyle : 'min-width: 100%; max-height: 185px;', + cls : 'input-group-nr', + editable : false, + data : data + }); + this.cmbLang.setValue(0x0409); + this.cmbLang.on('selected',function(combo, record) { + me.updateFormats(record.value); + }); + + this.listFormats = new Common.UI.ListView({ + el: $('#control-settings-format'), + store: new Common.UI.DataViewStore(), + scrollAlwaysVisible: true + }); + // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + this.afterRender(); }, @@ -283,6 +313,15 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } */ this.disableListButtons(); + + //for date picker + // this.btnsCategory[3].setVisible(type == 'date'); + if (this.options.lang) { + var item = this.cmbLang.store.findWhere({value: this.options.lang}); + item = item ? item.get('value') : 0x0409; + this.cmbLang.setValue(item) + } + this.updateFormats(this.cmbLang.getValue()); } }, @@ -316,6 +355,12 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', // }, this); // props.set_ListItems(arr); + //for date picker + // var rec = this.listFormats.getSelectedRec(); + // if (rec) { + // props.set_DateFormat(rec.get('format')); + // } + return props; }, @@ -426,6 +471,28 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', this.list.cmpEl.find('.listview').focus(); }, + updateFormats: function(lang) { + // this.props.put_Lang(lang); + // var data = this.props.get_DateTimeExamples(), + // arr = []; + // var store = this.listFormats.store; + // for (var name in data) { + // if (data[name]) { + // var rec = new Common.UI.DataViewModel(); + // rec.set({ + // format: name, + // value: data[name] + // }); + // arr.push(rec); + // } + // } + // store.reset(arr); + // this.listFormats.selectByIndex(0); + // var rec = this.listFormats.getSelectedRec(); + // this.listFormats.scrollToRecord(rec); + // this.onSelectFormat(this.listFormats, null, rec); + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -448,7 +515,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textDown: 'Down', textCombobox: 'Combo box', textDisplayName: 'Display name', - textValue: 'Value' + textValue: 'Value', + textDate: 'Date Format', + textLang: 'Language', + textFormat: 'Formats' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file From 322ecad08246e1e3af84b69dff7a0ef39e1a6c28 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 7 Nov 2019 09:57:08 +0300 Subject: [PATCH 31/86] Update translation --- apps/documenteditor/main/app/view/Toolbar.js | 10 +++++----- apps/documenteditor/main/locale/en.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index a33080bd8..d74d27709 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2350,11 +2350,11 @@ define([ textEditWatermark: 'Custom Watermark', textRemWatermark: 'Remove Watermark', tipWatermark: 'Edit watermark', - textPictureControl: 'Insert picture content control', - textComboboxControl: 'Insert combo box content control', - textCheckboxControl: 'Insert check box content control', - textDropdownControl: 'Insert drop-down list content control', - textDateControl: 'Insert date content control' + textPictureControl: 'Picture', + textComboboxControl: 'Combo box', + textCheckboxControl: 'Check box', + textDropdownControl: 'Drop-down list', + textDateControl: 'Date' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 44fadf966..ed38c5828 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2125,12 +2125,12 @@ "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", "DE.Views.Toolbar.textPie": "Pie", - "DE.Views.Toolbar.textPlainControl": "Insert plain text content control", + "DE.Views.Toolbar.textPlainControl": "Plain text", "DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Remove content control", "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", - "DE.Views.Toolbar.textRichControl": "Insert rich text content control", + "DE.Views.Toolbar.textRichControl": "Rich text", "DE.Views.Toolbar.textRight": "Right: ", "DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikethrough", From 4d68323d3f8042c615a9c639df123a30e44da786 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 8 Nov 2019 12:20:31 +0300 Subject: [PATCH 32/86] [DE] Control settings: use sdk functions --- .../main/app/view/ControlSettingsDialog.js | 68 ++++++++++++------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 99b65c0be..32d2b7016 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -295,33 +295,47 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', this.chLockDelete.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.SdtLocked); this.chLockEdit.setValue(val==Asc.c_oAscSdtLockType.SdtContentLocked || val==Asc.c_oAscSdtLockType.ContentLocked); + var type = props.get_SpecificType(); + //for list controls - /* - // this.btnsCategory[2].setVisible(type == 'list'); - - var items = props.get_ListItems(); - if (items) { - var arr = []; - for (var i=0; i Date: Wed, 13 Nov 2019 17:21:23 +0300 Subject: [PATCH 33/86] [DE] Margins Dialog: change layout --- .../main/app/view/PageMarginsDialog.js | 113 +++++++++++++++--- 1 file changed, 94 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index b1c6f83cb..571b796bb 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -45,9 +45,9 @@ define([ DE.Views.PageMarginsDialog = Common.UI.Window.extend(_.extend({ options: { - width: 215, + width: 404, header: true, - style: 'min-width: 216px;', + style: 'min-width: 404px;', cls: 'modal-dlg', id: 'window-page-margins', buttons: ['ok', 'cancel'] @@ -59,31 +59,50 @@ define([ }, options || {}); this.template = [ - '
', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '
', + '
', + '
' + this.textMultiplePages + '', + '
', + '
', + '
', '', '
', - '
', + '', + '
', '', '
', - '
', + '', + '', + '
', + '
', '', '
', - '
', + '', + '
', '', '
', - '
', + '
', + '', + '
', + '
', + '', + '
', + '
', + '
', + '', + '
', + '
', + '
', + '
', + '', + '
', + '
', + '', + '
', + '', + '
', + '
', '', - '
' ].join(''); this.options.tpl = _.template(this.template)(this.options); @@ -98,6 +117,18 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); + this.cmbMultiplePages = new Common.UI.ComboBox({ + el : $('#page-margins-cmb-multiple-pages'), + menuStyle : 'min-width: 180px;', + style : 'width: 180px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textNormal }, + { value: 1, displayValue: this.textMirrorMargins } + ] + }); + this.spnTop = new Common.UI.MetricSpinner({ el: $('#page-margins-spin-top'), step: .1, @@ -142,6 +173,41 @@ define([ }); this.spinners.push(this.spnRight); + this.spnGutter = new Common.UI.MetricSpinner({ + el: $('#page-margins-spin-gutter'), + step: .1, + width: 86, + defaultUnit : "cm", + value: '1 cm', + maxValue: 55.88, + minValue: 0 + }); + this.spinners.push(this.spnLeft); + + this.cmbGutterPosition = new Common.UI.ComboBox({ + el : $('#page-margins-spin-gutter-position'), + menuStyle : 'min-width: 86px;', + style : 'width: 86px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textLeft }, + { value: 1, displayValue: this.textTop } + ] + }); + + this.cmbOrientation = new Common.UI.ComboBox({ + el : $('#page-margins-cmb-orientation'), + menuStyle : 'min-width: 180px;', + style : 'width: 180px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textPortrait }, + { value: 1, displayValue: this.textLandscape } + ] + }); + var $window = this.getChild(); $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); @@ -221,6 +287,15 @@ define([ textRight: 'Right', 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' + txtMarginsH: 'Top and bottom margins are too high for a given page height', + textMultiplePages: 'Multiple pages', + textGutter: 'Gutter', + textGutterPosition: 'Gutter position', + textOrientation: 'Orientation', + textPreview: 'Preview', + textPortrait: 'Portrait', + textLandscape: 'Landscape', + textMirrorMargins: 'Mirror margins', + textNormal: 'Normal' }, DE.Views.PageMarginsDialog || {})) }); \ No newline at end of file From 9d8675f041d658ab1a5438083ecffa4393a4e49b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 13:25:01 +0300 Subject: [PATCH 34/86] [DE] Disable comparing of documents in the co-editing mode --- apps/common/main/lib/controller/ReviewChanges.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index fdfda5bd5..289cdd0bd 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -124,6 +124,8 @@ define([ if (this.appConfig.canReview || this.appConfig.canViewReview) { this.api.asc_registerCallback('asc_onShowRevisionsChange', _.bind(this.onApiShowChange, this)); this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this)); + this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); + this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); } this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); @@ -856,6 +858,17 @@ define([ }); }, + onAuthParticipantsChanged: function(users) { + if (this.view && this.view.btnCompare) { + var length = 0; + _.each(users, function(item){ + if (!item.asc_getView()) + length++; + }); + this.view.btnCompare.setDisabled(length>1 || this.viewmode); + } + }, + textInserted: 'Inserted:', textDeleted: 'Deleted:', textParaInserted: 'Paragraph Inserted ', From 475e9c030646f2a81ca49207d75834efb303f53d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Nov 2019 16:28:28 +0300 Subject: [PATCH 35/86] [DE] Add settings for check box. Refactoring symbol table --- .../common/main/lib/view/SymbolTableDialog.js | 22 +++- .../main/app/controller/Toolbar.js | 5 +- .../template/ControlSettingsDialog.template | 28 +++++ .../main/app/view/ControlSettingsDialog.js | 107 +++++++++++++++++- .../main/app/controller/Toolbar.js | 2 +- .../main/app/controller/Toolbar.js | 2 +- 6 files changed, 156 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index ab23cb3b7..adba7b7ba 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -453,6 +453,15 @@ define([ var init = (aFontSelects.length<1); init && this.initFonts(); + if (options.font) { + for(var i = 0; i < aFontSelects.length; ++i){ + if(aFontSelects[i].displayValue === options.font){ + nCurrentFont = i; + break; + } + } + } + if (nCurrentFont < 0) nCurrentFont = 0; @@ -477,6 +486,10 @@ define([ nCurrentSymbol = aRanges[0].Start; } + if (options.code) { + nCurrentSymbol = options.code; + } + if (init && this.options.lang && this.options.lang != 'en') { var me = this; loadTranslation(this.options.lang, function(){ @@ -526,7 +539,6 @@ define([ for(var key in oFontsByName){ if(oFontsByName.hasOwnProperty(key)){ data.push(oFontsByName[key]); - data[data.length-1].value = i++; data[data.length-1].displayValue = oFontsByName[key].m_wsFontName; } } @@ -534,6 +546,10 @@ define([ //initialize params aFontSelects = data; aFontSelects.sort(function(a, b){return (a.displayValue.toLowerCase() > b.displayValue.toLowerCase()) ? 1 : -1;}); + for(i = 0; i < aFontSelects.length; ++i){ + aFontSelects[i].value = i; + } + if(!oFontsByName[sInitFont]){ if(oFontsByName['Cambria Math']){ sInitFont = 'Cambria Math'; @@ -679,7 +695,7 @@ define([ var nFontId = parseInt(cellId.split('_')[2]); sFont = aFontSelects[nFontId].displayValue; } - return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), updateRecents: bUpdateRecents}; + return {font: sFont, symbol: this.encodeSurrogateChar(nCurrentSymbol), code: nCurrentSymbol, updateRecents: bUpdateRecents}; }, onBtnClick: function(event) { @@ -927,7 +943,7 @@ define([ var settings = this.getPasteSymbol($(e.target).attr('id')); settings.updateRecents && this.checkRecent(nCurrentSymbol, settings.font); settings.updateRecents && this.updateView(false, undefined, undefined, true); - this.fireEvent('symbol:dblclick', this, settings); + this.fireEvent('symbol:dblclick', this, 'ok', settings); } }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index d13383bf7..0e54aee52 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1735,7 +1735,8 @@ define([ (new DE.Views.ControlSettingsDialog({ props: props, api: me.api, - lang: me._state.lang, + controlLang: me._state.lang, + interfaceLang: me.mode.lang, handler: function(result, value) { if (result == 'ok') { me.api.asc_SetContentControlProperties(value, id); @@ -2504,7 +2505,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 0f48db92a..9c5d28007 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -115,4 +115,32 @@
+ +
+
+ + + + + + + + + + + +
+ + +
+ 		+ +
+ + +
+ 		+ +
+
\ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 32d2b7016..8d54bf093 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -44,6 +44,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', 'common/main/lib/component/CheckBox', 'common/main/lib/component/InputField', 'common/main/lib/view/AdvancedSettingsWindow', + 'common/main/lib/view/SymbolTableDialog', 'documenteditor/main/app/view/EditListItemDialog' ], function (contentTemplate) { 'use strict'; @@ -64,7 +65,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', {panelId: 'id-adv-control-settings-general', panelCaption: this.strGeneral}, {panelId: 'id-adv-control-settings-lock', panelCaption: this.textLock}, {panelId: 'id-adv-control-settings-list', panelCaption: this.textCombobox}, - {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate} + {panelId: 'id-adv-control-settings-date', panelCaption: this.textDate}, + {panelId: 'id-adv-control-settings-checkbox',panelCaption: this.textCheckbox} ], contentTemplate: _.template(contentTemplate)({ scope: this @@ -226,6 +228,39 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }); // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + // Check Box + this.txtChecked = new Common.UI.InputField({ + el : $('#control-settings-input-checked'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 30px;', + value : '' + }); + this.txtChecked._input.attr('disabled', true); + this.txtChecked._input.css({'text-align': 'center', 'font-size': '16px'}); + + this.txtUnchecked = new Common.UI.InputField({ + el : $('#control-settings-input-unchecked'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 30px;', + value : '' + }); + this.txtUnchecked._input.attr('disabled', true); + this.txtUnchecked._input.css({'text-align': 'center', 'font-size': '16px'}); + + this.btnEditChecked = new Common.UI.Button({ + el: $('#control-settings-btn-checked-edit') + }); + this.btnEditChecked.on('click', _.bind(this.onEditCheckbox, this, true)); + + this.btnEditUnchecked = new Common.UI.Button({ + el: $('#control-settings-btn-unchecked-edit') + }); + this.btnEditUnchecked.on('click', _.bind(this.onEditCheckbox, this, false)); + this.afterRender(); }, @@ -320,7 +355,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (type == Asc.c_oAscContentControlSpecificType.DateTime) { var specProps = props.get_DateTimePr(); if (specProps) { - var lang = specProps.get_LangId() || this.options.lang; + var lang = specProps.get_LangId() || this.options.controlLang; if (lang) { var item = this.cmbLang.store.findWhere({value: lang}); item = item ? item.get('value') : 0x0409; @@ -335,6 +370,25 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } } + // for check box + this.btnsCategory[4].setVisible(type == Asc.c_oAscContentControlSpecificType.CheckBox); + if (type == Asc.c_oAscContentControlSpecificType.CheckBox) { + var specProps = props.get_CheckBoxPr(); + if (specProps) { + var code = specProps.get_CheckedSymbol(), + font = specProps.get_CheckedFont(); + font && this.txtChecked.cmpEl.css('font-family', font); + code && this.txtChecked.setValue(String.fromCharCode(code)); + this.checkedBox = {code: code, font: font}; + + code = specProps.get_UncheckedSymbol(); + font = specProps.get_UncheckedFont(); + font && this.txtUnchecked.cmpEl.css('font-family', font); + code && this.txtUnchecked.setValue(String.fromCharCode(code)); + this.uncheckedBox = {code: code, font: font}; + } + } + this.type = type; } }, @@ -377,6 +431,22 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', // props.set_DateFormat(rec.get('format')); // } + // for check box + if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) { + if (this.checkedBox && this.checkedBox.changed || this.uncheckedBox && this.uncheckedBox.changed) { + var specProps = new AscCommon.CSdtCheckBoxPr(); + if (this.checkedBox) { + specProps.put_CheckedSymbol(this.checkedBox.code); + specProps.put_CheckedFont(this.checkedBox.font); + } + if (this.uncheckedBox) { + specProps.put_UncheckedSymbol(this.uncheckedBox.code); + specProps.put_UncheckedFont(this.uncheckedBox.font); + } + props.put_CheckBoxPr(specProps); + } + } + return props; }, @@ -509,6 +579,34 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', // this.onSelectFormat(this.listFormats, null, rec); }, + onEditCheckbox: function(checked) { + if (this.api) { + var me = this, + props = (checked) ? me.checkedBox : me.uncheckedBox, + cmp = (checked) ? me.txtChecked : me.txtUnchecked, + handler = function(dlg, result, settings) { + if (result == 'ok') { + props.changed = true; + props.code = settings.code; + props.font = settings.font; + props.font && cmp.cmpEl.css('font-family', props.font); + settings.symbol && cmp.setValue(settings.symbol); + } + }, + win = new Common.Views.SymbolTableDialog({ + api: me.api, + lang: me.options.interfaceLang, + modal: true, + type: 0, + font: props.font, + code: props.code, + handler: handler + }); + win.show(); + win.on('symbol:dblclick', handler); + } + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -534,7 +632,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textValue: 'Value', textDate: 'Date Format', textLang: 'Language', - textFormat: 'Formats' + textFormat: 'Formats', + textCheckbox: 'Check box', + textChecked: 'Checked symbol', + textUnchecked: 'Unchecked symbol' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 4bff6451a..1d81d9480 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1843,7 +1843,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 1c6b65022..e472884d5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2781,7 +2781,7 @@ define([ } }); win.show(); - win.on('symbol:dblclick', function(cmp, settings) { + win.on('symbol:dblclick', function(cmp, result, settings) { me.api.pluginMethod_PasteHtml("" + settings.symbol + ""); }); } From c40c8d6a2d1c08e9b4f912eb662fc2e5a864721d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 11:11:34 +0300 Subject: [PATCH 36/86] [DE] Add settings for date content control --- .../template/ControlSettingsDialog.template | 27 ++++--- .../main/app/view/ControlSettingsDialog.js | 78 ++++++++++++------- 2 files changed, 64 insertions(+), 41 deletions(-) diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 9c5d28007..70df12159 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -95,7 +95,22 @@ + + + + + + + + + @@ -103,16 +118,6 @@
- - - - - -
- + +
+
+
+
+
+
- -
-
-
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 8d54bf093..0920897c2 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -226,7 +226,16 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', store: new Common.UI.DataViewStore(), scrollAlwaysVisible: true }); - // this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); + + this.txtDate = new Common.UI.InputField({ + el : $('#control-settings-txt-format'), + allowBlank : true, + validateOnChange: false, + validateOnBlur: false, + style : 'width: 100%;', + value : '' + }); // Check Box this.txtChecked = new Common.UI.InputField({ @@ -355,6 +364,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (type == Asc.c_oAscContentControlSpecificType.DateTime) { var specProps = props.get_DateTimePr(); if (specProps) { + this.datetime = specProps; var lang = specProps.get_LangId() || this.options.controlLang; if (lang) { var item = this.cmbLang.store.findWhere({value: lang}); @@ -362,11 +372,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', this.cmbLang.setValue(item); } this.updateFormats(this.cmbLang.getValue()); - // var rec = this.listFormats.store.find({format: specProps.get_DateFormat()}); - // if (rec) { - // this.listFormats.selectRecord(rec); - // this.listFormats.scrollToRecord(rec); - // } + var format = specProps.get_DateFormat(); + var rec = this.listFormats.store.findWhere({format: format}); + this.listFormats.selectRecord(rec); + this.listFormats.scrollToRecord(rec); + this.txtDate.setValue(format); } } @@ -426,10 +436,12 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } //for date picker - // var rec = this.listFormats.getSelectedRec(); - // if (rec) { - // props.set_DateFormat(rec.get('format')); - // } + if (this.type == Asc.c_oAscContentControlSpecificType.DateTime) { + var specProps = new AscCommon.CSdtDatePickerPr(); + specProps.put_DateFormat(this.txtDate.getValue()); + specProps.put_LangId(this.cmbLang.getValue()); + props.put_DateTimePr(specProps); + } // for check box if (this.type == Asc.c_oAscContentControlSpecificType.CheckBox) { @@ -558,25 +570,26 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }, updateFormats: function(lang) { - // this.props.put_Lang(lang); - // var data = this.props.get_DateTimeExamples(), - // arr = []; - // var store = this.listFormats.store; - // for (var name in data) { - // if (data[name]) { - // var rec = new Common.UI.DataViewModel(); - // rec.set({ - // format: name, - // value: data[name] - // }); - // arr.push(rec); - // } - // } - // store.reset(arr); - // this.listFormats.selectByIndex(0); - // var rec = this.listFormats.getSelectedRec(); - // this.listFormats.scrollToRecord(rec); - // this.onSelectFormat(this.listFormats, null, rec); + if (this.datetime) { + var props = this.datetime, + formats = props.get_FormatsExamples(), + arr = []; + for (var i = 0, len = formats.length; i < len; i++) + { + props.get_String(formats[i], undefined, lang); + var rec = new Common.UI.DataViewModel(); + rec.set({ + format: formats[i], + value: props.get_String(formats[i], undefined, lang) + }); + arr.push(rec); + } + this.listFormats.store.reset(arr); + this.listFormats.selectByIndex(0); + var rec = this.listFormats.getSelectedRec(); + this.listFormats.scrollToRecord(rec); + this.txtDate.setValue(rec.get('format')); + } }, onEditCheckbox: function(checked) { @@ -607,6 +620,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', } }, + onSelectFormat: function(lisvView, itemView, record) { + if (!record) return; + this.txtDate.setValue(record.get('format')); + }, + textTitle: 'Content Control Settings', textName: 'Title', textTag: 'Tag', @@ -632,7 +650,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textValue: 'Value', textDate: 'Date Format', textLang: 'Language', - textFormat: 'Formats', + textFormat: 'Display the date like this', textCheckbox: 'Check box', textChecked: 'Checked symbol', textUnchecked: 'Unchecked symbol' From 68433e3cca1588c612acde26a2cb0c44abccbf98 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 15 Nov 2019 17:37:34 +0300 Subject: [PATCH 37/86] [DE] Fix list content controls: verify unique values --- .../main/app/view/ControlSettingsDialog.js | 2 ++ .../main/app/view/EditListItemDialog.js | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 0920897c2..3d9e3a31e 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -502,6 +502,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', onAddItem: function() { var me = this, win = new DE.Views.EditListItemDialog({ + store: me.list.store, handler: function(result, name, value) { if (result == 'ok') { var rec = me.list.store.add({ @@ -524,6 +525,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', var me = this, rec = this.list.getSelectedRec(), win = new DE.Views.EditListItemDialog({ + store: me.list.store, handler: function(result, name, value) { if (result == 'ok') { if (rec) { diff --git a/apps/documenteditor/main/app/view/EditListItemDialog.js b/apps/documenteditor/main/app/view/EditListItemDialog.js index ba854af97..56b05eca2 100644 --- a/apps/documenteditor/main/app/view/EditListItemDialog.js +++ b/apps/documenteditor/main/app/view/EditListItemDialog.js @@ -60,7 +60,7 @@ define([ '
', '', '
', - '
', + '
', '
', '', '
', @@ -99,7 +99,15 @@ define([ me.inputValue = new Common.UI.InputField({ el : $('#id-dlg-label-value'), style : 'width: 100%;', - validateOnBlur: false + validateOnBlur: false, + validation : function(value) { + if (value!=='' && me.options.store) { + var rec = me.options.store.findWhere({value: value}); + if (rec) + return me.textValueError + } + return true; + } }); me.inputValue._input.on('input', function (e) { if (me.copyvalue==undefined && me.inputValue.getValue()==me.inputName.getValue()) { @@ -140,6 +148,10 @@ define([ this.inputName.cmpEl.find('input').focus(); return; } + if (this.inputValue.checkValidate() !== true) { + this.inputValue.cmpEl.find('input').focus(); + return; + } } this.options.handler.call(this, state, this.inputName.getValue(), this.inputValue.getValue()); @@ -157,6 +169,7 @@ define([ textDisplayName: 'Display name', textValue: 'Value', - textNameError: 'Display name must not be empty.' + textNameError: 'Display name must not be empty.', + textValueError: 'An item with the same value already exists.' }, DE.Views.EditListItemDialog || {})); }); \ No newline at end of file From 6f4fbd5f47b01c7e584fa1a0a1be1d98fcec68b2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 18 Nov 2019 11:12:35 +0300 Subject: [PATCH 38/86] [DE] Bug 43059 ( Margins Dialog) --- .../main/app/view/PageMarginsDialog.js | 83 +++++++++++-------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index 571b796bb..5ed6ab1e3 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -55,15 +55,14 @@ define([ initialize : function(options) { _.extend(this.options, { - title: this.textTitle + title: this.textMargins }, options || {}); this.template = [ - '
', - '
' + this.textMultiplePages + '', - '
', - '
', + '
', + '
', + '', + '
', '
', '', '
', @@ -73,34 +72,35 @@ define([ '
', '
', '
', - '
', + '
', '
', - '', + '', '
', '
', '
', - '', + '', '
', '
', '
', '
', - '
', - '', - '
', - '
', - '
', - '', - '
', + '', + '
', + '
', + '
', '
', '
', '
', - '', + '', '
', '
', + '
', + '', + '
', + '
', '
', '
', - '', - '
', + '', + '
', '
', '
', ].join(''); @@ -117,18 +117,6 @@ define([ render: function() { Common.UI.Window.prototype.render.call(this); - this.cmbMultiplePages = new Common.UI.ComboBox({ - el : $('#page-margins-cmb-multiple-pages'), - menuStyle : 'min-width: 180px;', - style : 'width: 180px;', - editable : false, - cls : 'input-group-nr', - data : [ - { value: 0, displayValue: this.textNormal }, - { value: 1, displayValue: this.textMirrorMargins } - ] - }); - this.spnTop = new Common.UI.MetricSpinner({ el: $('#page-margins-spin-top'), step: .1, @@ -208,8 +196,29 @@ define([ ] }); - var $window = this.getChild(); - $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + this.cmbMultiplePages = new Common.UI.ComboBox({ + el : $('#page-margins-cmb-multiple-pages'), + menuStyle : 'min-width: 180px;', + style : 'width: 180px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: 0, displayValue: this.textNormal }, + { value: 1, displayValue: this.textMirrorMargins } + ] + }); + this.cmbMultiplePages.on('selected', _.bind(function(combo, record) { + if (record.value === 0) { + this.window.find('#margin-left-label').html(this.textLeft); + this.window.find('#margin-right-label').html(this.textRight); + } else { + this.window.find('#margin-left-label').html(this.textInside); + this.window.find('#margin-right-label').html(this.textOutside); + } + }, this)); + + this.window = this.getChild(); + this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); this.updateMetricUnit(); }, @@ -258,6 +267,7 @@ define([ this.spnBottom.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_BottomMargin()), true); this.spnLeft.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_LeftMargin()), true); this.spnRight.setValue(Common.Utils.Metric.fnRecalcFromMM(props.get_RightMargin()), true); + this.cmbOrientation.setValue(props.get_Orientation()); } }, @@ -267,6 +277,7 @@ define([ props.put_BottomMargin(Common.Utils.Metric.fnRecalcToMM(this.spnBottom.getNumberValue())); props.put_LeftMargin(Common.Utils.Metric.fnRecalcToMM(this.spnLeft.getNumberValue())); props.put_RightMargin(Common.Utils.Metric.fnRecalcToMM(this.spnRight.getNumberValue())); + props.put_Orientation(this.cmbOrientation.getValue()); return props; }, @@ -280,7 +291,7 @@ define([ } }, - textTitle: 'Margins', + textMargins: 'Margins', textTop: 'Top', textLeft: 'Left', textBottom: 'Bottom', @@ -296,6 +307,8 @@ define([ textPortrait: 'Portrait', textLandscape: 'Landscape', textMirrorMargins: 'Mirror margins', - textNormal: 'Normal' + textNormal: 'Normal', + textInside: 'Inside', + textOutside: 'Outside' }, DE.Views.PageMarginsDialog || {})) }); \ No newline at end of file From 57f91cc6dda088cde3d63a7e88a3a9f380ab6647 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 Nov 2019 15:14:14 +0300 Subject: [PATCH 39/86] [PE] Support picture placeholders --- .../main/app/view/DocumentHolder.js | 54 ++++++++++++------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 48cac30b7..077826844 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1586,7 +1586,9 @@ define([ me.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(onShowSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(onHideSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_ChangeCropState', _.bind(onChangeCropState, me)); - + me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(onChangeCropState, me)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); } me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('api:disconnect', _.bind(onCoAuthoringDisconnect, me)); @@ -2781,29 +2783,12 @@ define([ caption : this.textFromFile }).on('click', function(item) { setTimeout(function(){ - if (me.api) me.api.ChangeImageFromFile(); - me.fireEvent('editcomplete', me); + me.onInsertImage(); }, 10); }), new Common.UI.MenuItem({ caption : this.textFromUrl - }).on('click', function(item) { - (new Common.Views.ImageFromUrlDialog({ - handler: function(result, value) { - if (result == 'ok') { - if (me.api) { - var checkUrl = value.replace(/ /g, ''); - if (!_.isEmpty(checkUrl)) { - var props = new Asc.asc_CImgProperty(); - props.put_ImageUrl(checkUrl); - me.api.ImgApply(props); - } - } - } - me.fireEvent('editcomplete', me); - } - })).show(); - }) + }).on('click', _.bind(me.onInsertImageUrl, me, false)) ] }) }); @@ -3432,6 +3417,35 @@ define([ this._isDisabled = state; }, + onInsertImage: function(placeholder, obj, x, y) { + if (this.api) + (placeholder) ? this.api.asc_addImage() : this.api.ChangeImageFromFile(); + this.fireEvent('editcomplete', this); + }, + + onInsertImageUrl: function(placeholder, obj, x, y) { + var me = this; + (new Common.Views.ImageFromUrlDialog({ + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + var checkUrl = value.replace(/ /g, ''); + if (!_.isEmpty(checkUrl)) { + if (placeholder) + me.api.AddImageUrl(checkUrl); + else { + var props = new Asc.asc_CImgProperty(); + props.put_ImageUrl(checkUrl); + me.api.ImgApply(props); + } + } + } + } + me.fireEvent('editcomplete', me); + } + })).show(); + }, + insertRowAboveText : 'Row Above', insertRowBelowText : 'Row Below', insertColumnLeftText : 'Column Left', From 29c564dd82ec133647ba36584f2871f28f8fa133 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 10:00:44 +0300 Subject: [PATCH 40/86] [PE] Click on chart placeholder --- .../main/app/view/DocumentHolder.js | 112 ++++++++++++++---- 1 file changed, 89 insertions(+), 23 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 077826844..8c56779bf 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -325,7 +325,10 @@ define([ }); meEl.on('click', function(e){ if (e.target.localName == 'canvas') { - meEl.focus(); + if (me._preventClick) + me._preventClick = false; + else + meEl.focus(); } }); meEl.on('mousedown', function(e){ @@ -675,18 +678,6 @@ define([ me.mode.isEdit = false; }; - var onDoubleClickOnChart = function(chart) { - if (me.mode.isEdit && !me._isDisabled) { - var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - - if (diagramEditor && chart) { - diagramEditor.setEditMode(true); - diagramEditor.show(); - diagramEditor.setChartData(new Asc.asc_CChartBinary(chart)); - } - } - }; - var onTextLanguage = function(langid) { me._currLang.id = langid; }; @@ -1581,14 +1572,18 @@ define([ if (me.mode.isEdit===true) { me.api.asc_registerCallback('asc_onDialogAddHyperlink', _.bind(onDialogAddHyperlink, me)); - me.api.asc_registerCallback('asc_doubleClickOnChart', onDoubleClickOnChart); + me.api.asc_registerCallback('asc_doubleClickOnChart', _.bind(me.editChartClick, me)); me.api.asc_registerCallback('asc_onSpellCheckVariantsFound', _.bind(onSpellCheckVariantsFound, me)); me.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(onShowSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(onHideSpecialPasteOptions, me)); me.api.asc_registerCallback('asc_ChangeCropState', _.bind(onChangeCropState, me)); - me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(onChangeCropState, me)); + me.api.asc_registerCallback('asc_onHidePlaceholderActions', _.bind(me.onHidePlaceholderActions, me)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Chart, _.bind(me.onClickPlaceholderChart, me)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Table)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio)); } me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(onCoAuthoringDisconnect, me)); Common.NotificationCenter.on('api:disconnect', _.bind(onCoAuthoringDisconnect, me)); @@ -1703,14 +1698,15 @@ define([ } }, /** coauthoring end **/ - editChartClick: function(){ - var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - if (diagramEditor) { - diagramEditor.setEditMode(true); - diagramEditor.show(); + editChartClick: function(chart){ + if (this.mode.isEdit && !this._isDisabled) { + var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); - var chart = this.api.asc_getChartObject(); - if (chart) { + if (diagramEditor) { + diagramEditor.setEditMode(chart===undefined || typeof chart == 'object'); //edit from doubleclick or context menu + diagramEditor.show(); + if (typeof chart !== 'object') + chart = this.api.asc_getChartObject(chart); diagramEditor.setChartData(new Asc.asc_CChartBinary(chart)); } } @@ -2664,7 +2660,7 @@ define([ var menuChartEdit = new Common.UI.MenuItem({ caption : me.editChartText - }).on('click', _.bind(me.editChartClick, me)); + }).on('click', _.bind(me.editChartClick, me, undefined)); var menuParagraphVAlign = new Common.UI.MenuItem({ caption : me.vertAlignText, @@ -3446,6 +3442,76 @@ define([ })).show(); }, + onClickPlaceholderChart: function(obj, x, y) { + if (!this.api) return; + var menu = this.placeholderMenuChart, + menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + this._fromShowPlaceholder = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.placeholderMenuChart = menu = new Common.UI.Menu({ + style: 'width: 435px;', + items: [ + {template: _.template('')} + ] + }); + // Prepare menu container + menuContainer = $(Common.Utils.String.format('', menu.id)); + this.cmpEl.append(menuContainer); + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + if (!me._fromShowPlaceholder) + me.api.asc_uncheckPlaceholders(); + }); + + var picker = new Common.UI.DataView({ + el: $('#id-placeholder-menu-chart'), + parentMenu: menu, + showLast: false, + // restoreHeight: 421, + groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()), + store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()), + itemTemplate: _.template('
') + }); + picker.on('item:click', function (picker, item, record, e) { + me.editChartClick(record.get('type')); + }); + } + menuContainer.css({left: x, top : y}); + menuContainer.attr('data-value', 'prevent-canvas-click'); + this._preventClick = true; + menu.show(); + + menu.alignPosition(); + _.delay(function() { + menu.cmpEl.focus(); + }, 10); + this._fromShowPlaceholder = false; + }, + + onHidePlaceholderActions: function() { + this.placeholderMenuChart && this.placeholderMenuChart.hide(); + }, + + onClickPlaceholder: function(type, obj, x, y) { + if (!this.api) return; + + switch (type) { + case AscCommon.PlaceholderButtonType.Table: + break; + case AscCommon.PlaceholderButtonType.Video: + // this.api.addVideo(); + break; + case AscCommon.PlaceholderButtonType.Audio: + // this.api.addAudio(); + break; + } + + }, + insertRowAboveText : 'Row Above', insertRowBelowText : 'Row Below', insertColumnLeftText : 'Column Left', From 6f0636a687f03721f2bd44ae2ba851a4eb112be5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 11:41:52 +0300 Subject: [PATCH 41/86] Update translation --- apps/documenteditor/main/locale/bg.json | 26 +++----- apps/documenteditor/main/locale/cs.json | 25 +++----- apps/documenteditor/main/locale/de.json | 9 --- apps/documenteditor/main/locale/en.json | 43 ++++--------- apps/documenteditor/main/locale/es.json | 25 +++----- apps/documenteditor/main/locale/fr.json | 25 +++----- apps/documenteditor/main/locale/hu.json | 25 +++----- apps/documenteditor/main/locale/it.json | 32 +++++----- apps/documenteditor/main/locale/ja.json | 21 +++---- apps/documenteditor/main/locale/ko.json | 17 ----- apps/documenteditor/main/locale/lv.json | 17 ----- apps/documenteditor/main/locale/nl.json | 25 +++----- apps/documenteditor/main/locale/pl.json | 25 +++----- apps/documenteditor/main/locale/pt.json | 25 +++----- apps/documenteditor/main/locale/ru.json | 34 +++++----- apps/documenteditor/main/locale/sk.json | 25 +++----- apps/documenteditor/main/locale/sl.json | 21 +++---- apps/documenteditor/main/locale/tr.json | 25 +++----- apps/documenteditor/main/locale/uk.json | 25 +++----- apps/documenteditor/main/locale/vi.json | 25 +++----- apps/documenteditor/main/locale/zh.json | 25 +++----- apps/presentationeditor/main/locale/bg.json | 26 +++----- apps/presentationeditor/main/locale/cs.json | 25 +++----- apps/presentationeditor/main/locale/de.json | 17 ----- apps/presentationeditor/main/locale/en.json | 50 ++++++--------- apps/presentationeditor/main/locale/es.json | 25 +++----- apps/presentationeditor/main/locale/fr.json | 25 +++----- apps/presentationeditor/main/locale/hu.json | 25 +++----- apps/presentationeditor/main/locale/it.json | 28 ++++----- apps/presentationeditor/main/locale/ja.json | 21 +++---- apps/presentationeditor/main/locale/ko.json | 17 ----- apps/presentationeditor/main/locale/lv.json | 17 ----- apps/presentationeditor/main/locale/nl.json | 25 +++----- apps/presentationeditor/main/locale/pl.json | 25 +++----- apps/presentationeditor/main/locale/pt.json | 25 +++----- apps/presentationeditor/main/locale/ru.json | 34 +++++----- apps/presentationeditor/main/locale/sk.json | 25 +++----- apps/presentationeditor/main/locale/sl.json | 21 +++---- apps/presentationeditor/main/locale/tr.json | 25 +++----- apps/presentationeditor/main/locale/uk.json | 25 +++----- apps/presentationeditor/main/locale/vi.json | 25 +++----- apps/presentationeditor/main/locale/zh.json | 25 +++----- apps/spreadsheeteditor/main/locale/bg.json | 48 ++++---------- apps/spreadsheeteditor/main/locale/cs.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/de.json | 39 ++---------- apps/spreadsheeteditor/main/locale/en.json | 69 +++++---------------- apps/spreadsheeteditor/main/locale/es.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/fr.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/hu.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/it.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/ja.json | 21 +++---- apps/spreadsheeteditor/main/locale/ko.json | 35 ----------- apps/spreadsheeteditor/main/locale/lv.json | 35 ----------- apps/spreadsheeteditor/main/locale/nl.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/pl.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/pt.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/ru.json | 58 ++++++----------- apps/spreadsheeteditor/main/locale/sk.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/sl.json | 21 +++---- apps/spreadsheeteditor/main/locale/tr.json | 43 +++---------- apps/spreadsheeteditor/main/locale/uk.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/vi.json | 47 ++++---------- apps/spreadsheeteditor/main/locale/zh.json | 47 ++++---------- 63 files changed, 550 insertions(+), 1434 deletions(-) diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json index 024657783..624e9888f 100644 --- a/apps/documenteditor/main/locale/bg.json +++ b/apps/documenteditor/main/locale/bg.json @@ -69,6 +69,15 @@ "Common.Controllers.ReviewChanges.textTabs": "Промяна на разделите", "Common.Controllers.ReviewChanges.textUnderline": "Подчертавам", "Common.Controllers.ReviewChanges.textWidow": "Управление на вдовицата", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1000,20 +1009,12 @@ "DE.Views.BookmarksDialog.textTitle": "Отбелязани", "DE.Views.BookmarksDialog.txtInvalidName": "Името на отметката може да съдържа само букви, цифри и долни черти и трябва да започва с буквата", "DE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "DE.Views.ChartSettings.textArea": "Площ", - "DE.Views.ChartSettings.textBar": "Бар", "DE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "DE.Views.ChartSettings.textColumn": "Колона", "DE.Views.ChartSettings.textEditData": "Редактиране на данни", "DE.Views.ChartSettings.textHeight": "Височина", - "DE.Views.ChartSettings.textLine": "Линия", "DE.Views.ChartSettings.textOriginalSize": "Размер по подразбиране", - "DE.Views.ChartSettings.textPie": "Кръгова", - "DE.Views.ChartSettings.textPoint": "XY (точкова)", "DE.Views.ChartSettings.textSize": "Размер", - "DE.Views.ChartSettings.textStock": "Борсова", "DE.Views.ChartSettings.textStyle": "Стил", - "DE.Views.ChartSettings.textSurface": "Повърхност", "DE.Views.ChartSettings.textUndock": "Откачете от панела", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стил на опаковане", @@ -1994,13 +1995,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Изображение от хранилището", "DE.Views.Toolbar.mniImageFromUrl": "Изображение от URL адрес", "DE.Views.Toolbar.strMenuNoFill": "Без попълване", - "DE.Views.Toolbar.textArea": "Площ", "DE.Views.Toolbar.textAutoColor": "Автоматичен", - "DE.Views.Toolbar.textBar": "Бар", "DE.Views.Toolbar.textBold": "Получер", "DE.Views.Toolbar.textBottom": "Долу:", - "DE.Views.Toolbar.textCharts": "Диаграми", - "DE.Views.Toolbar.textColumn": "Колона", "DE.Views.Toolbar.textColumnsCustom": "Персонализирани графи", "DE.Views.Toolbar.textColumnsLeft": "Наляво", "DE.Views.Toolbar.textColumnsOne": "Един", @@ -2019,7 +2016,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "Пейзаж", "DE.Views.Toolbar.textLeft": "Наляво: ", - "DE.Views.Toolbar.textLine": "Линия", "DE.Views.Toolbar.textMarginsLast": "Последно персонализирано", "DE.Views.Toolbar.textMarginsModerate": "Умерен", "DE.Views.Toolbar.textMarginsNarrow": "Тесен", @@ -2033,14 +2029,11 @@ "DE.Views.Toolbar.textOddPage": "Нечетна страница", "DE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета", "DE.Views.Toolbar.textPageSizeCustom": "Персонализиран размер на страницата", - "DE.Views.Toolbar.textPie": "Кръгова", "DE.Views.Toolbar.textPlainControl": "Вмъкване на контрол на съдържанието в обикновен текст", - "DE.Views.Toolbar.textPoint": "XY (точкова)", "DE.Views.Toolbar.textPortrait": "Портрет", "DE.Views.Toolbar.textRemoveControl": "Премахване на контрола на съдържанието", "DE.Views.Toolbar.textRichControl": "Вмъкване на контрол върху съдържанието на богатия текст", "DE.Views.Toolbar.textRight": "Дясно: ", - "DE.Views.Toolbar.textStock": "Борсова", "DE.Views.Toolbar.textStrikeout": "Зачеркнато", "DE.Views.Toolbar.textStyleMenuDelete": "Изтриване на стил", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Изтрийте всички персонализирани стилове", @@ -2050,7 +2043,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Актуализация от избора", "DE.Views.Toolbar.textSubscript": "Долен", "DE.Views.Toolbar.textSuperscript": "Горен индекс", - "DE.Views.Toolbar.textSurface": "Повърхност", "DE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "У дома", diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index 83acf0f4c..008709f10 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Podtržené", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -689,20 +697,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Ksí", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "DE.Views.ChartSettings.textArea": "Plošný graf", - "DE.Views.ChartSettings.textBar": "Pruhový graf", "DE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "DE.Views.ChartSettings.textColumn": "Sloupcový graf", "DE.Views.ChartSettings.textEditData": "Upravit data", "DE.Views.ChartSettings.textHeight": "Výška", - "DE.Views.ChartSettings.textLine": "Liniový graf", "DE.Views.ChartSettings.textOriginalSize": "Výchozí velikost", - "DE.Views.ChartSettings.textPie": "Kruhový diagram", - "DE.Views.ChartSettings.textPoint": "Bodový graf", "DE.Views.ChartSettings.textSize": "Velikost", - "DE.Views.ChartSettings.textStock": "Burzovní graf", "DE.Views.ChartSettings.textStyle": "Styl", - "DE.Views.ChartSettings.textSurface": "Povrch", "DE.Views.ChartSettings.textUndock": "Odepnout od panelu", "DE.Views.ChartSettings.textWidth": "Šířka", "DE.Views.ChartSettings.textWrap": "Obtékání textu", @@ -1495,13 +1495,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obrázek ze souboru", "DE.Views.Toolbar.mniImageFromUrl": "Obrázek z adresy URL", "DE.Views.Toolbar.strMenuNoFill": "Bez výplně", - "DE.Views.Toolbar.textArea": "Plošný graf", "DE.Views.Toolbar.textAutoColor": "Automaticky", - "DE.Views.Toolbar.textBar": "Pruhový graf", "DE.Views.Toolbar.textBold": "Tučné", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafy", - "DE.Views.Toolbar.textColumn": "Sloupcový graf", "DE.Views.Toolbar.textColumnsCustom": "Vlastní sloupce", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1520,7 +1516,6 @@ "DE.Views.Toolbar.textItalic": "Kurzíva", "DE.Views.Toolbar.textLandscape": "Na šířku", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Liniový graf", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1533,11 +1528,8 @@ "DE.Views.Toolbar.textOddPage": "Lichá stránka", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Kruhový diagram", - "DE.Views.Toolbar.textPoint": "Bodový graf", "DE.Views.Toolbar.textPortrait": "Na výšku", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Burzovní graf", "DE.Views.Toolbar.textStrikeout": "Přeškrtnout", "DE.Views.Toolbar.textStyleMenuDelete": "Odstranit styl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstranit všechny vlastní styly", @@ -1547,7 +1539,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovat z výběru", "DE.Views.Toolbar.textSubscript": "Dolní index", "DE.Views.Toolbar.textSuperscript": "Horní index", - "DE.Views.Toolbar.textSurface": "Povrch", "DE.Views.Toolbar.textTabFile": "Soubor", "DE.Views.Toolbar.textTabHome": "Domů", "DE.Views.Toolbar.textTabInsert": "Vložit", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index a09a79c9e..7736050f9 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -1995,13 +1995,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Bild aus dem Speicher", "DE.Views.Toolbar.mniImageFromUrl": "Bild aus URL", "DE.Views.Toolbar.strMenuNoFill": "Keine Füllung", - "DE.Views.Toolbar.textArea": "Fläche", "DE.Views.Toolbar.textAutoColor": "Automatisch", - "DE.Views.Toolbar.textBar": "Balken", "DE.Views.Toolbar.textBold": "Fett", "DE.Views.Toolbar.textBottom": "Unten: ", - "DE.Views.Toolbar.textCharts": "Diagramme", - "DE.Views.Toolbar.textColumn": "Spalte", "DE.Views.Toolbar.textColumnsCustom": "Benutzerdefinierte Spalten", "DE.Views.Toolbar.textColumnsLeft": "Links", "DE.Views.Toolbar.textColumnsOne": "Ein", @@ -2020,7 +2016,6 @@ "DE.Views.Toolbar.textItalic": "Kursiv", "DE.Views.Toolbar.textLandscape": "Querformat", "DE.Views.Toolbar.textLeft": "Links: ", - "DE.Views.Toolbar.textLine": "Linie", "DE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte", "DE.Views.Toolbar.textMarginsModerate": "Mittelmäßig", "DE.Views.Toolbar.textMarginsNarrow": "Schmal", @@ -2034,14 +2029,11 @@ "DE.Views.Toolbar.textOddPage": "Ungerade Seite", "DE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder ", "DE.Views.Toolbar.textPageSizeCustom": "Benutzerdefiniertes Seitenformat", - "DE.Views.Toolbar.textPie": "Kreis", "DE.Views.Toolbar.textPlainControl": "Nur-Text-Inhaltssteuerelement einfügen", - "DE.Views.Toolbar.textPoint": "Punkt (XY)", "DE.Views.Toolbar.textPortrait": "Hochformat", "DE.Views.Toolbar.textRemoveControl": "Inhaltssteuerelement entfernen", "DE.Views.Toolbar.textRichControl": "Rich-Text-Inhaltssteuerelement einfügen", "DE.Views.Toolbar.textRight": "Rechts: ", - "DE.Views.Toolbar.textStock": "Kurs", "DE.Views.Toolbar.textStrikeout": "Durchgestrichen", "DE.Views.Toolbar.textStyleMenuDelete": "Stil löschen", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle benutzerdefinierte Stile löschen ", @@ -2051,7 +2043,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren", "DE.Views.Toolbar.textSubscript": "Tiefgestellt", "DE.Views.Toolbar.textSuperscript": "Hochgestellt", - "DE.Views.Toolbar.textSurface": "Oberfläche", "DE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "DE.Views.Toolbar.textTabFile": "Datei", "DE.Views.Toolbar.textTabHome": "Startseite", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 908214cac..48b17da4b 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -230,6 +230,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -244,6 +246,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -262,13 +269,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.txtAccept": "Accept", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes", @@ -315,11 +315,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "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.", "DE.Controllers.LeftMenu.newDocumentTitle": "Unnamed document", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", @@ -369,6 +369,7 @@ "DE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", "DE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -671,7 +672,6 @@ "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.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "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", @@ -686,6 +686,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", "DE.Controllers.Toolbar.textFraction": "Fractions", "DE.Controllers.Toolbar.textFunction": "Functions", + "DE.Controllers.Toolbar.textInsert": "Insert", "DE.Controllers.Toolbar.textIntegral": "Integrals", "DE.Controllers.Toolbar.textLargeOperator": "Large Operators", "DE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -1013,7 +1014,6 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", - "DE.Controllers.Toolbar.textInsert": "Insert", "DE.Controllers.Viewport.textFitPage": "Fit to Page", "DE.Controllers.Viewport.textFitWidth": "Fit to Width", "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:", @@ -1065,20 +1065,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Delete entire row", "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_DE.Views.ChartSettings.textArea": "Area", - "del_DE.Views.ChartSettings.textBar": "Bar", "DE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_DE.Views.ChartSettings.textColumn": "Column", "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", - "del_DE.Views.ChartSettings.textLine": "Line", "DE.Views.ChartSettings.textOriginalSize": "Actual Size", - "del_DE.Views.ChartSettings.textPie": "Pie", - "del_DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "Size", - "del_DE.Views.ChartSettings.textStock": "Stock", "DE.Views.ChartSettings.textStyle": "Style", - "del_DE.Views.ChartSettings.textSurface": "Surface", "DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWrap": "Wrapping Style", @@ -2084,6 +2076,7 @@ "DE.Views.Toolbar.capBtnInsImage": "Image", "DE.Views.Toolbar.capBtnInsPagebreak": "Breaks", "DE.Views.Toolbar.capBtnInsShape": "Shape", + "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", "DE.Views.Toolbar.capBtnInsTable": "Table", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", "DE.Views.Toolbar.capBtnInsTextbox": "Text Box", @@ -2108,13 +2101,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image from Storage", "DE.Views.Toolbar.mniImageFromUrl": "Image from URL", "DE.Views.Toolbar.strMenuNoFill": "No Fill", - "del_DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "Automatic", - "del_DE.Views.Toolbar.textBar": "Bar", "DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBottom": "Bottom: ", - "del_DE.Views.Toolbar.textCharts": "Charts", - "del_DE.Views.Toolbar.textColumn": "Column", "DE.Views.Toolbar.textColumnsCustom": "Custom Columns", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -2134,7 +2123,6 @@ "DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLeft": "Left: ", - "del_DE.Views.Toolbar.textLine": "Line", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2148,15 +2136,12 @@ "DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "del_DE.Views.Toolbar.textPie": "Pie", "DE.Views.Toolbar.textPlainControl": "Insert plain text content control", - "del_DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Remove content control", "DE.Views.Toolbar.textRemWatermark": "Remove Watermark", "DE.Views.Toolbar.textRichControl": "Insert rich text content control", "DE.Views.Toolbar.textRight": "Right: ", - "del_DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikethrough", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -2166,7 +2151,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "del_DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Home", @@ -2211,6 +2195,7 @@ "DE.Views.Toolbar.tipInsertImage": "Insert image", "DE.Views.Toolbar.tipInsertNum": "Insert Page Number", "DE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "DE.Views.Toolbar.tipInsertTable": "Insert table", "DE.Views.Toolbar.tipInsertText": "Insert text box", "DE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", @@ -2262,8 +2247,6 @@ "DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme9": "Foundry", - "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "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 4a19a5ee5..4ec69ef9b 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Cambiar tabuladores", "Common.Controllers.ReviewChanges.textUnderline": "Subrayado", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -1001,20 +1009,12 @@ "DE.Views.BookmarksDialog.textTitle": "Marcadores", "DE.Views.BookmarksDialog.txtInvalidName": "Nombre de marcador sólo puede contener letras, dígitos y barras bajas y debe comenzar con la letra", "DE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "DE.Views.ChartSettings.textArea": "Área", - "DE.Views.ChartSettings.textBar": "Barra", "DE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "DE.Views.ChartSettings.textColumn": "Gráfico de columnas", "DE.Views.ChartSettings.textEditData": "Editar datos", "DE.Views.ChartSettings.textHeight": "Altura", - "DE.Views.ChartSettings.textLine": "Línea", "DE.Views.ChartSettings.textOriginalSize": "Tamaño Predeterminado", - "DE.Views.ChartSettings.textPie": "Gráfico circular", - "DE.Views.ChartSettings.textPoint": "XY (Dispersión)", "DE.Views.ChartSettings.textSize": "Tamaño", - "DE.Views.ChartSettings.textStock": "De cotizaciones", "DE.Views.ChartSettings.textStyle": "Estilo", - "DE.Views.ChartSettings.textSurface": "Superficie", "DE.Views.ChartSettings.textUndock": "Desacoplar de panel", "DE.Views.ChartSettings.textWidth": "Ancho", "DE.Views.ChartSettings.textWrap": "Ajuste de texto", @@ -2005,13 +2005,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Imagen de Almacenamiento", "DE.Views.Toolbar.mniImageFromUrl": "Imagen de URL", "DE.Views.Toolbar.strMenuNoFill": "Sin relleno", - "DE.Views.Toolbar.textArea": "Área", "DE.Views.Toolbar.textAutoColor": "Automático", - "DE.Views.Toolbar.textBar": "Gráfico de barras", "DE.Views.Toolbar.textBold": "Negrita", "DE.Views.Toolbar.textBottom": "Inferior: ", - "DE.Views.Toolbar.textCharts": "Gráficos", - "DE.Views.Toolbar.textColumn": "Gráfico de columnas", "DE.Views.Toolbar.textColumnsCustom": "Columnas personalizadas", "DE.Views.Toolbar.textColumnsLeft": "Izquierdo", "DE.Views.Toolbar.textColumnsOne": "Uno", @@ -2031,7 +2027,6 @@ "DE.Views.Toolbar.textItalic": "Cursiva", "DE.Views.Toolbar.textLandscape": "Horizontal", "DE.Views.Toolbar.textLeft": "Izquierdo: ", - "DE.Views.Toolbar.textLine": "Gráfico de líneas", "DE.Views.Toolbar.textMarginsLast": "último personalizado", "DE.Views.Toolbar.textMarginsModerate": "Moderar", "DE.Views.Toolbar.textMarginsNarrow": "Estrecho", @@ -2045,15 +2040,12 @@ "DE.Views.Toolbar.textOddPage": "Página impar", "DE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados", "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado", - "DE.Views.Toolbar.textPie": "Gráfico circular", "DE.Views.Toolbar.textPlainControl": "Introducir contenido de texto simple", - "DE.Views.Toolbar.textPoint": "XY (Dispersión)", "DE.Views.Toolbar.textPortrait": "Vertical", "DE.Views.Toolbar.textRemoveControl": "Elimine el control de contenido", "DE.Views.Toolbar.textRemWatermark": "Quitar marca de agua", "DE.Views.Toolbar.textRichControl": "Introducir contenido de texto rico", "DE.Views.Toolbar.textRight": "Derecho: ", - "DE.Views.Toolbar.textStock": "De cotizaciones", "DE.Views.Toolbar.textStrikeout": "Tachado", "DE.Views.Toolbar.textStyleMenuDelete": "Eliminar estilo", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Borrar todos los estilos personalizados", @@ -2063,7 +2055,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección", "DE.Views.Toolbar.textSubscript": "Subíndice", "DE.Views.Toolbar.textSuperscript": "Sobreíndice", - "DE.Views.Toolbar.textSurface": "Superficie", "DE.Views.Toolbar.textTabCollaboration": "Colaboración", "DE.Views.Toolbar.textTabFile": "Archivo", "DE.Views.Toolbar.textTabHome": "Inicio", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 99ecab9ed..776d0c97c 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Changer les tabulations", "Common.Controllers.ReviewChanges.textUnderline": "Souligné", "Common.Controllers.ReviewChanges.textWidow": "Contrôle des veuves", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1013,20 +1021,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Supprimer la ligne entière", "DE.Views.CellsRemoveDialog.textTitle": "Supprimer les cellules", "DE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "DE.Views.ChartSettings.textArea": "En aires", - "DE.Views.ChartSettings.textBar": "En barre", "DE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "DE.Views.ChartSettings.textColumn": "Colonne", "DE.Views.ChartSettings.textEditData": "Modifier les données", "DE.Views.ChartSettings.textHeight": "Hauteur", - "DE.Views.ChartSettings.textLine": "Graphique en ligne", "DE.Views.ChartSettings.textOriginalSize": "Taille par défaut", - "DE.Views.ChartSettings.textPie": "Graphiques à secteurs", - "DE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "DE.Views.ChartSettings.textSize": "Taille", - "DE.Views.ChartSettings.textStock": "Boursier", "DE.Views.ChartSettings.textStyle": "Style", - "DE.Views.ChartSettings.textSurface": "Surface", "DE.Views.ChartSettings.textUndock": "Détacher du panneau", "DE.Views.ChartSettings.textWidth": "Largeur", "DE.Views.ChartSettings.textWrap": "Style d'habillage", @@ -2051,13 +2051,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image de stockage", "DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL", "DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage", - "DE.Views.Toolbar.textArea": "En aires", "DE.Views.Toolbar.textAutoColor": "Automatique", - "DE.Views.Toolbar.textBar": "En barre", "DE.Views.Toolbar.textBold": "Gras", "DE.Views.Toolbar.textBottom": "En bas: ", - "DE.Views.Toolbar.textCharts": "Graphiques", - "DE.Views.Toolbar.textColumn": "Colonne", "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées", "DE.Views.Toolbar.textColumnsLeft": "A gauche", "DE.Views.Toolbar.textColumnsOne": "Un", @@ -2077,7 +2073,6 @@ "DE.Views.Toolbar.textItalic": "Italique", "DE.Views.Toolbar.textLandscape": "Paysage", "DE.Views.Toolbar.textLeft": "À gauche:", - "DE.Views.Toolbar.textLine": "Graphique en ligne", "DE.Views.Toolbar.textMarginsLast": "Dernière mesure", "DE.Views.Toolbar.textMarginsModerate": "Modérer", "DE.Views.Toolbar.textMarginsNarrow": "Étroit", @@ -2091,15 +2086,12 @@ "DE.Views.Toolbar.textOddPage": "Page impaire", "DE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées", "DE.Views.Toolbar.textPageSizeCustom": "Taille personnalisée", - "DE.Views.Toolbar.textPie": "Graphiques à secteurs", "DE.Views.Toolbar.textPlainControl": "Insérer un contrôle de contenu en texte brut", - "DE.Views.Toolbar.textPoint": "Nuages de points (XY)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "Supprimer le contrôle du contenu", "DE.Views.Toolbar.textRemWatermark": "Supprimer le filigrane", "DE.Views.Toolbar.textRichControl": "Insérer un contrôle de contenu en texte enrichi", "DE.Views.Toolbar.textRight": "A droite: ", - "DE.Views.Toolbar.textStock": "Boursier", "DE.Views.Toolbar.textStrikeout": "Barré", "DE.Views.Toolbar.textStyleMenuDelete": "Supprimer le style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Supprimer tous les styles personnalisés", @@ -2109,7 +2101,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Mettre à jour selon la sélection", "DE.Views.Toolbar.textSubscript": "Indice", "DE.Views.Toolbar.textSuperscript": "Exposant", - "DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "Collaboration", "DE.Views.Toolbar.textTabFile": "Fichier", "DE.Views.Toolbar.textTabHome": "Accueil", diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 85266bf9b..8943743f3 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Lapok módosítása", "Common.Controllers.ReviewChanges.textUnderline": "Aláhúzott", "Common.Controllers.ReviewChanges.textWidow": "Özvegy sor", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -923,20 +931,12 @@ "DE.Views.BookmarksDialog.textTitle": "Könyvjelzők", "DE.Views.BookmarksDialog.txtInvalidName": "A könyvjelző neve kizárólag betűket, számokat és alulvonást tartalmazhat, és betűvel kezdődhet.", "DE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "DE.Views.ChartSettings.textArea": "Terület", - "DE.Views.ChartSettings.textBar": "Sáv", "DE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "DE.Views.ChartSettings.textColumn": "Oszlop", "DE.Views.ChartSettings.textEditData": "Adat szerkesztése", "DE.Views.ChartSettings.textHeight": "Magasság", - "DE.Views.ChartSettings.textLine": "Vonal", "DE.Views.ChartSettings.textOriginalSize": "Alapértelmezett méret", - "DE.Views.ChartSettings.textPie": "Kör", - "DE.Views.ChartSettings.textPoint": "Pont", "DE.Views.ChartSettings.textSize": "Méret", - "DE.Views.ChartSettings.textStock": "Részvény", "DE.Views.ChartSettings.textStyle": "Stílus", - "DE.Views.ChartSettings.textSurface": "Felület", "DE.Views.ChartSettings.textUndock": "Eltávolít a panelről", "DE.Views.ChartSettings.textWidth": "Szélesség", "DE.Views.ChartSettings.textWrap": "Tördelés stílus", @@ -1912,13 +1912,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Kép a tárolóból", "DE.Views.Toolbar.mniImageFromUrl": "Kép hivatkozásból", "DE.Views.Toolbar.strMenuNoFill": "Nincs kitöltés", - "DE.Views.Toolbar.textArea": "Terület", "DE.Views.Toolbar.textAutoColor": "Automatikus", - "DE.Views.Toolbar.textBar": "Sáv", "DE.Views.Toolbar.textBold": "Félkövér", "DE.Views.Toolbar.textBottom": "Alsó:", - "DE.Views.Toolbar.textCharts": "Diagramok", - "DE.Views.Toolbar.textColumn": "Oszlop", "DE.Views.Toolbar.textColumnsCustom": "Egyéni hasábok", "DE.Views.Toolbar.textColumnsLeft": "Bal", "DE.Views.Toolbar.textColumnsOne": "Egy", @@ -1937,7 +1933,6 @@ "DE.Views.Toolbar.textItalic": "Dőlt", "DE.Views.Toolbar.textLandscape": "Tájkép", "DE.Views.Toolbar.textLeft": "Bal:", - "DE.Views.Toolbar.textLine": "Vonal", "DE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások", "DE.Views.Toolbar.textMarginsModerate": "Mérsékelt", "DE.Views.Toolbar.textMarginsNarrow": "Keskeny", @@ -1951,14 +1946,11 @@ "DE.Views.Toolbar.textOddPage": "Páratlan oldal", "DE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók", "DE.Views.Toolbar.textPageSizeCustom": "Egyéni lapméret", - "DE.Views.Toolbar.textPie": "Kör", "DE.Views.Toolbar.textPlainControl": "Egyszerű szöveg tartalomkezelő beillesztése", - "DE.Views.Toolbar.textPoint": "Pont", "DE.Views.Toolbar.textPortrait": "Portré", "DE.Views.Toolbar.textRemoveControl": "Tartalomkezelő eltávolítása", "DE.Views.Toolbar.textRichControl": "Rich text tartalomkezelő beillesztése", "DE.Views.Toolbar.textRight": "Jobb:", - "DE.Views.Toolbar.textStock": "Részvény", "DE.Views.Toolbar.textStrikeout": "Áthúzott", "DE.Views.Toolbar.textStyleMenuDelete": "Stílus törlése", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Minden egyéni stílus törlése", @@ -1968,7 +1960,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Frissítés a kiválasztásból", "DE.Views.Toolbar.textSubscript": "Alsó index", "DE.Views.Toolbar.textSuperscript": "Felső index", - "DE.Views.Toolbar.textSurface": "Felület", "DE.Views.Toolbar.textTabCollaboration": "Együttműködés", "DE.Views.Toolbar.textTabFile": "Fájl", "DE.Views.Toolbar.textTabHome": "Kezdőlap", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 0097548f9..5086a9172 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Modifica Schede", "Common.Controllers.ReviewChanges.textUnderline": "Sottolineato", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -1002,21 +1010,18 @@ "DE.Views.BookmarksDialog.textSort": "Ordina per", "DE.Views.BookmarksDialog.textTitle": "Segnalibri", "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera", + "DE.Views.CaptionDialog.textBefore": "Prima", + "DE.Views.CaptionDialog.textColon": "due punti", + "DE.Views.CaptionDialog.textSeparator": "Usa separatore", + "DE.Views.CellsAddDialog.textCol": "Colonne", + "DE.Views.CellsRemoveDialog.textTitle": "Elimina celle", "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "DE.Views.ChartSettings.textArea": "Aerogramma", - "DE.Views.ChartSettings.textBar": "A barre", "DE.Views.ChartSettings.textChartType": "Cambia tipo grafico", - "DE.Views.ChartSettings.textColumn": "Istogramma", "DE.Views.ChartSettings.textEditData": "Modifica dati", "DE.Views.ChartSettings.textHeight": "Altezza", - "DE.Views.ChartSettings.textLine": "A linee", "DE.Views.ChartSettings.textOriginalSize": "Predefinita", - "DE.Views.ChartSettings.textPie": "A torta", - "DE.Views.ChartSettings.textPoint": "XY (A dispersione)", "DE.Views.ChartSettings.textSize": "Dimensione", - "DE.Views.ChartSettings.textStock": "Azionario", "DE.Views.ChartSettings.textStyle": "Stile", - "DE.Views.ChartSettings.textSurface": "Superficie", "DE.Views.ChartSettings.textUndock": "Disancora dal pannello", "DE.Views.ChartSettings.textWidth": "Larghezza", "DE.Views.ChartSettings.textWrap": "Stile di disposizione testo", @@ -1119,6 +1124,7 @@ "DE.Views.DocumentHolder.textArrangeBackward": "Porta indietro", "DE.Views.DocumentHolder.textArrangeForward": "Porta avanti", "DE.Views.DocumentHolder.textArrangeFront": "Porta in primo piano", + "DE.Views.DocumentHolder.textCells": "Celle", "DE.Views.DocumentHolder.textContentControls": "Controllo Contenuto", "DE.Views.DocumentHolder.textContinueNumbering": "Continua la numerazione", "DE.Views.DocumentHolder.textCopy": "Copia", @@ -1321,6 +1327,7 @@ "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.", "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo", "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Applicazione", @@ -2032,13 +2039,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Immagine dallo spazio di archiviazione", "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL", "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento", - "DE.Views.Toolbar.textArea": "Aerogramma", "DE.Views.Toolbar.textAutoColor": "Automatico", - "DE.Views.Toolbar.textBar": "A barre", "DE.Views.Toolbar.textBold": "Grassetto", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafici", - "DE.Views.Toolbar.textColumn": "Istogramma", "DE.Views.Toolbar.textColumnsCustom": "Colonne personalizzate", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -2058,7 +2061,6 @@ "DE.Views.Toolbar.textItalic": "Corsivo", "DE.Views.Toolbar.textLandscape": "Orizzontale", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "A linee", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderare", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2072,15 +2074,12 @@ "DE.Views.Toolbar.textOddPage": "Pagina dispari", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "A torta", "DE.Views.Toolbar.textPlainControl": "Inserisci il controllo del contenuto in testo normale", - "DE.Views.Toolbar.textPoint": "XY (A dispersione)", "DE.Views.Toolbar.textPortrait": "Verticale", "DE.Views.Toolbar.textRemoveControl": "Rimuovi il controllo del contenuto", "DE.Views.Toolbar.textRemWatermark": "Rimuovi filigrana", "DE.Views.Toolbar.textRichControl": "Inserisci il controllo del contenuto RTF", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Azionario", "DE.Views.Toolbar.textStrikeout": "Barrato", "DE.Views.Toolbar.textStyleMenuDelete": "Elimina stile", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Elimina tutti gli stili personalizzati", @@ -2090,7 +2089,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aggiorna da selezione", "DE.Views.Toolbar.textSubscript": "Pedice", "DE.Views.Toolbar.textSuperscript": "Apice", - "DE.Views.Toolbar.textSurface": "Superficie", "DE.Views.Toolbar.textTabCollaboration": "Collaborazione", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 664e2cf97..d2b165951 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -63,6 +63,13 @@ "Common.Controllers.ReviewChanges.textTabs": "タブの変更", "Common.Controllers.ReviewChanges.textUnderline": "下線", "Common.Controllers.ReviewChanges.textWidow": "改ページ時1行残して段落を区切らないを制御する。", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "罫線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -589,18 +596,11 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "グザイ", "DE.Controllers.Toolbar.txtSymbol_zeta": "ゼータ", "DE.Views.ChartSettings.textAdvanced": "詳細設定の表示", - "DE.Views.ChartSettings.textArea": "面グラフ", - "DE.Views.ChartSettings.textBar": "横棒グラフ", "DE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "DE.Views.ChartSettings.textColumn": "縦棒グラフ", "DE.Views.ChartSettings.textEditData": "データの編集", "DE.Views.ChartSettings.textHeight": "高さ", - "DE.Views.ChartSettings.textLine": "折れ線グラフ", "DE.Views.ChartSettings.textOriginalSize": "既定のサイズ", - "DE.Views.ChartSettings.textPie": "円グラフ", - "DE.Views.ChartSettings.textPoint": "点グラフ", "DE.Views.ChartSettings.textSize": "サイズ", - "DE.Views.ChartSettings.textStock": "株価チャート", "DE.Views.ChartSettings.textStyle": "スタイル", "DE.Views.ChartSettings.textUndock": "パネルからのドッキング解除", "DE.Views.ChartSettings.textWidth": "幅", @@ -1327,12 +1327,9 @@ "DE.Views.Toolbar.mniImageFromFile": "ファイルからの画像", "DE.Views.Toolbar.mniImageFromUrl": "ファイルからのURL", "DE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし", - "DE.Views.Toolbar.textArea": "面グラフ", "DE.Views.Toolbar.textAutoColor": "自動", - "DE.Views.Toolbar.textBar": "横棒グラフ", "DE.Views.Toolbar.textBold": "太字", "DE.Views.Toolbar.textBottom": "下：", - "DE.Views.Toolbar.textColumn": "縦棒グラフ", "DE.Views.Toolbar.textColumnsLeft": "左", "DE.Views.Toolbar.textColumnsOne": "1", "DE.Views.Toolbar.textColumnsRight": "右に", @@ -1348,7 +1345,6 @@ "DE.Views.Toolbar.textInText": "テキスト", "DE.Views.Toolbar.textItalic": "斜体", "DE.Views.Toolbar.textLeft": "左：", - "DE.Views.Toolbar.textLine": "折れ線グラフ", "DE.Views.Toolbar.textMarginsLast": "最後に適用したユーザー", "DE.Views.Toolbar.textMarginsModerate": "標準", "DE.Views.Toolbar.textMarginsNarrow": "狭い", @@ -1361,10 +1357,7 @@ "DE.Views.Toolbar.textOddPage": "奇数ページから開始", "DE.Views.Toolbar.textPageMarginsCustom": "カスタム マージン", "DE.Views.Toolbar.textPageSizeCustom": "ユーザー設定のページ サイズ", - "DE.Views.Toolbar.textPie": "円グラフ", - "DE.Views.Toolbar.textPoint": "点グラフ", "DE.Views.Toolbar.textRight": "右：", - "DE.Views.Toolbar.textStock": "株価チャート", "DE.Views.Toolbar.textStrikeout": "取り消し線", "DE.Views.Toolbar.textStyleMenuDelete": "スタイルの削除", "DE.Views.Toolbar.textStyleMenuDeleteAll": "ユーザー設定のスタイルの削除", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index 78813432a..b44ca93c4 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -777,20 +777,12 @@ "DE.Views.BookmarksDialog.textSort": "정렬", "DE.Views.BookmarksDialog.textTitle": "책갈피", "DE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "DE.Views.ChartSettings.textArea": "영역", - "DE.Views.ChartSettings.textBar": "Bar", "DE.Views.ChartSettings.textChartType": "차트 유형 변경", - "DE.Views.ChartSettings.textColumn": "열", "DE.Views.ChartSettings.textEditData": "데이터 편집", "DE.Views.ChartSettings.textHeight": "높이", - "DE.Views.ChartSettings.textLine": "Line", "DE.Views.ChartSettings.textOriginalSize": "기본 크기", - "DE.Views.ChartSettings.textPie": "파이", - "DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "크기", - "DE.Views.ChartSettings.textStock": "Stock", "DE.Views.ChartSettings.textStyle": "스타일", - "DE.Views.ChartSettings.textSurface": "표면", "DE.Views.ChartSettings.textUndock": "패널에서 도킹 해제", "DE.Views.ChartSettings.textWidth": "너비", "DE.Views.ChartSettings.textWrap": "포장 스타일", @@ -1707,13 +1699,9 @@ "DE.Views.Toolbar.mniImageFromFile": "그림 파일에서", "DE.Views.Toolbar.mniImageFromUrl": "URL에서 그림", "DE.Views.Toolbar.strMenuNoFill": "채우기 없음", - "DE.Views.Toolbar.textArea": "Area", "DE.Views.Toolbar.textAutoColor": "자동", - "DE.Views.Toolbar.textBar": "Bar", "DE.Views.Toolbar.textBold": "Bold", "DE.Views.Toolbar.textBottom": "Bottom :", - "DE.Views.Toolbar.textCharts": "차트", - "DE.Views.Toolbar.textColumn": "Column", "DE.Views.Toolbar.textColumnsCustom": "사용자 정의 열", "DE.Views.Toolbar.textColumnsLeft": "왼쪽", "DE.Views.Toolbar.textColumnsOne": "하나", @@ -1732,7 +1720,6 @@ "DE.Views.Toolbar.textItalic": "Italic", "DE.Views.Toolbar.textLandscape": "Landscape", "DE.Views.Toolbar.textLeft": "왼쪽 :", - "DE.Views.Toolbar.textLine": "Line", "DE.Views.Toolbar.textMarginsLast": "마지막 사용자 정의", "DE.Views.Toolbar.textMarginsModerate": "보통", "DE.Views.Toolbar.textMarginsNarrow": "좁다", @@ -1745,14 +1732,11 @@ "DE.Views.Toolbar.textOddPage": "홀수 페이지", "DE.Views.Toolbar.textPageMarginsCustom": "사용자 정의 여백", "DE.Views.Toolbar.textPageSizeCustom": "사용자 정의 페이지 크기", - "DE.Views.Toolbar.textPie": "파이", "DE.Views.Toolbar.textPlainControl": "일반 텍스트 콘텐트 제어 삽입", - "DE.Views.Toolbar.textPoint": "XY (Scatter)", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRemoveControl": "콘텐트 제어 삭제", "DE.Views.Toolbar.textRichControl": "리치 텍스트 콘텐트 제어 삽입", "DE.Views.Toolbar.textRight": "오른쪽 :", - "DE.Views.Toolbar.textStock": "Stock", "DE.Views.Toolbar.textStrikeout": "Strikeout", "DE.Views.Toolbar.textStyleMenuDelete": "스타일 삭제", "DE.Views.Toolbar.textStyleMenuDeleteAll": "모든 사용자 정의 스타일 삭제", @@ -1762,7 +1746,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "선택 항목에서 업데이트", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "DE.Views.Toolbar.textSurface": "Surface", "DE.Views.Toolbar.textTabCollaboration": "합치기", "DE.Views.Toolbar.textTabFile": "파일", "DE.Views.Toolbar.textTabHome": "집", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index ae216079a..7f1b4ad5c 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -774,20 +774,12 @@ "DE.Views.BookmarksDialog.textSort": "Šķirot pēc", "DE.Views.BookmarksDialog.textTitle": "Grāmatzīmes", "DE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "DE.Views.ChartSettings.textArea": "Area Chart", - "DE.Views.ChartSettings.textBar": "Bar Chart", "DE.Views.ChartSettings.textChartType": "Change Chart Type", - "DE.Views.ChartSettings.textColumn": "Column Chart", "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", - "DE.Views.ChartSettings.textLine": "Line Chart", "DE.Views.ChartSettings.textOriginalSize": "Default Size", - "DE.Views.ChartSettings.textPie": "Pie Chart", - "DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart", "DE.Views.ChartSettings.textSize": "Size", - "DE.Views.ChartSettings.textStock": "Stock Chart", "DE.Views.ChartSettings.textStyle": "Style", - "DE.Views.ChartSettings.textSurface": "Virsma", "DE.Views.ChartSettings.textUndock": "Undock from panel", "DE.Views.ChartSettings.textWidth": "Width", "DE.Views.ChartSettings.textWrap": "Wrapping Style", @@ -1704,13 +1696,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Attēls no faila", "DE.Views.Toolbar.mniImageFromUrl": "Attēls no URL", "DE.Views.Toolbar.strMenuNoFill": "Bez aizpildījuma", - "DE.Views.Toolbar.textArea": "Area Chart", "DE.Views.Toolbar.textAutoColor": "Automatic", - "DE.Views.Toolbar.textBar": "Bar Chart", "DE.Views.Toolbar.textBold": "Treknraksts", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Diagrammas", - "DE.Views.Toolbar.textColumn": "Column Chart", "DE.Views.Toolbar.textColumnsCustom": "Pielāgotās kolonnas", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1729,7 +1717,6 @@ "DE.Views.Toolbar.textItalic": "Kursīvs", "DE.Views.Toolbar.textLandscape": "Ainava", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Line Chart", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1742,14 +1729,11 @@ "DE.Views.Toolbar.textOddPage": "Odd Page", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Pie Chart", "DE.Views.Toolbar.textPlainControl": "Ievietot parastā teksta satura kontroli", - "DE.Views.Toolbar.textPoint": "XY (Scatter) Chart", "DE.Views.Toolbar.textPortrait": "Portrets", "DE.Views.Toolbar.textRemoveControl": "Noņemt satura kontroles elementu", "DE.Views.Toolbar.textRichControl": "Ievietot formatētā teksta satura kontroli", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Stock Chart", "DE.Views.Toolbar.textStrikeout": "Pārsvītrots", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1759,7 +1743,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Apakšraksts", "DE.Views.Toolbar.textSuperscript": "Augšraksts", - "DE.Views.Toolbar.textSurface": "Virsma", "DE.Views.Toolbar.textTabCollaboration": "Sadarbība", "DE.Views.Toolbar.textTabFile": "Fails", "DE.Views.Toolbar.textTabHome": "Sākums", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 1c4a716b7..3711ccc66 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Tabs wijzigen", "Common.Controllers.ReviewChanges.textUnderline": "Onderstrepen", "Common.Controllers.ReviewChanges.textWidow": "Zwevende regels voorkomen", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -874,20 +882,12 @@ "DE.Views.BookmarksDialog.textSort": "Sorteren op", "DE.Views.BookmarksDialog.textTitle": "Bladwijzers", "DE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "DE.Views.ChartSettings.textArea": "Vlak", - "DE.Views.ChartSettings.textBar": "Staaf", "DE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "DE.Views.ChartSettings.textColumn": "Kolom", "DE.Views.ChartSettings.textEditData": "Gegevens bewerken", "DE.Views.ChartSettings.textHeight": "Hoogte", - "DE.Views.ChartSettings.textLine": "Lijn", "DE.Views.ChartSettings.textOriginalSize": "Standaardgrootte", - "DE.Views.ChartSettings.textPie": "Cirkel", - "DE.Views.ChartSettings.textPoint": "Spreiding", "DE.Views.ChartSettings.textSize": "Grootte", - "DE.Views.ChartSettings.textStock": "Voorraad", "DE.Views.ChartSettings.textStyle": "Stijl", - "DE.Views.ChartSettings.textSurface": "Oppervlak", "DE.Views.ChartSettings.textUndock": "Loskoppelen van deelvenster", "DE.Views.ChartSettings.textWidth": "Breedte", "DE.Views.ChartSettings.textWrap": "Terugloopstijl", @@ -1845,13 +1845,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Afbeelding uit bestand", "DE.Views.Toolbar.mniImageFromUrl": "Afbeelding van URL", "DE.Views.Toolbar.strMenuNoFill": "Geen vulling", - "DE.Views.Toolbar.textArea": "Vlak", "DE.Views.Toolbar.textAutoColor": "Automatisch", - "DE.Views.Toolbar.textBar": "Staaf", "DE.Views.Toolbar.textBold": "Vet", "DE.Views.Toolbar.textBottom": "Onder:", - "DE.Views.Toolbar.textCharts": "Grafieken", - "DE.Views.Toolbar.textColumn": "Kolom", "DE.Views.Toolbar.textColumnsCustom": "Aangepaste kolommen", "DE.Views.Toolbar.textColumnsLeft": "Links", "DE.Views.Toolbar.textColumnsOne": "Eén", @@ -1870,7 +1866,6 @@ "DE.Views.Toolbar.textItalic": "Cursief", "DE.Views.Toolbar.textLandscape": "Liggend", "DE.Views.Toolbar.textLeft": "Links:", - "DE.Views.Toolbar.textLine": "Lijn", "DE.Views.Toolbar.textMarginsLast": "Laatste aangepaste", "DE.Views.Toolbar.textMarginsModerate": "Gemiddeld", "DE.Views.Toolbar.textMarginsNarrow": "Smal", @@ -1883,14 +1878,11 @@ "DE.Views.Toolbar.textOddPage": "Oneven pagina", "DE.Views.Toolbar.textPageMarginsCustom": "Aangepaste marges", "DE.Views.Toolbar.textPageSizeCustom": "Aangepast paginaformaat", - "DE.Views.Toolbar.textPie": "Cirkel", "DE.Views.Toolbar.textPlainControl": "Platte tekst inhoud beheer toevoegen", - "DE.Views.Toolbar.textPoint": "Spreiding", "DE.Views.Toolbar.textPortrait": "Staand", "DE.Views.Toolbar.textRemoveControl": "Inhoud beheer verwijderen", "DE.Views.Toolbar.textRichControl": "Uitgebreide tekst inhoud beheer toevoegen", "DE.Views.Toolbar.textRight": "Rechts:", - "DE.Views.Toolbar.textStock": "Voorraad", "DE.Views.Toolbar.textStrikeout": "Doorhalen", "DE.Views.Toolbar.textStyleMenuDelete": "Stijl verwijderen", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Alle aangepaste stijlen verwijderen", @@ -1900,7 +1892,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Bijwerken op basis van selectie", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "DE.Views.Toolbar.textSurface": "Oppervlak", "DE.Views.Toolbar.textTabCollaboration": "Samenwerking", "DE.Views.Toolbar.textTabFile": "Bestand", "DE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index c144bb4a6..e17d7a20c 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -67,6 +67,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki", "Common.Controllers.ReviewChanges.textUnderline": "Podkreśl", "Common.Controllers.ReviewChanges.textWidow": "Kontrola okna", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -775,20 +783,12 @@ "DE.Views.BookmarksDialog.textTitle": "Zakładki", "DE.Views.BookmarksDialog.txtInvalidName": "Nazwa zakładki powinna zaczynać się literą i zawierać może ona tylko litery, liczby i znaki podkreślenia ", "DE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "DE.Views.ChartSettings.textArea": "Obszar", - "DE.Views.ChartSettings.textBar": "Pasek", "DE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "DE.Views.ChartSettings.textColumn": "Kolumna", "DE.Views.ChartSettings.textEditData": "Edytuj dane", "DE.Views.ChartSettings.textHeight": "Wysokość", - "DE.Views.ChartSettings.textLine": "Liniowy", "DE.Views.ChartSettings.textOriginalSize": "Domyślny rozmiar", - "DE.Views.ChartSettings.textPie": "Kołowe", - "DE.Views.ChartSettings.textPoint": "XY (Punktowy)", "DE.Views.ChartSettings.textSize": "Rozmiar", - "DE.Views.ChartSettings.textStock": "Zbiory", "DE.Views.ChartSettings.textStyle": "Styl", - "DE.Views.ChartSettings.textSurface": "Powierzchnia", "DE.Views.ChartSettings.textUndock": "Odepnij od panelu", "DE.Views.ChartSettings.textWidth": "Szerokość", "DE.Views.ChartSettings.textWrap": "Styl zawijania", @@ -1678,13 +1678,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku", "DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL", "DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia", - "DE.Views.Toolbar.textArea": "Obszar", "DE.Views.Toolbar.textAutoColor": "Automatyczny", - "DE.Views.Toolbar.textBar": "Pasek", "DE.Views.Toolbar.textBold": "Pogrubienie", "DE.Views.Toolbar.textBottom": "Dół:", - "DE.Views.Toolbar.textCharts": "Wykresy", - "DE.Views.Toolbar.textColumn": "Kolumna", "DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny", "DE.Views.Toolbar.textColumnsLeft": "Lewy", "DE.Views.Toolbar.textColumnsOne": "Jeden", @@ -1704,7 +1700,6 @@ "DE.Views.Toolbar.textItalic": "Kursywa", "DE.Views.Toolbar.textLandscape": "Krajobraz", "DE.Views.Toolbar.textLeft": "Lewo:", - "DE.Views.Toolbar.textLine": "Wiersz", "DE.Views.Toolbar.textMarginsLast": "Ostatni niestandardowy", "DE.Views.Toolbar.textMarginsModerate": "Umiarkowany", "DE.Views.Toolbar.textMarginsNarrow": "Wąski", @@ -1718,13 +1713,10 @@ "DE.Views.Toolbar.textOddPage": "Nieparzysta strona", "DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy", "DE.Views.Toolbar.textPageSizeCustom": "Własny rozmiar strony", - "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", "DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Usuń wszystkie niestandardowe style", @@ -1734,7 +1726,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru", "DE.Views.Toolbar.textSubscript": "Indeks", "DE.Views.Toolbar.textSuperscript": "Indeks górny", - "DE.Views.Toolbar.textSurface": "Powierzchnia", "DE.Views.Toolbar.textTabCollaboration": "Współpraca", "DE.Views.Toolbar.textTabFile": "Plik", "DE.Views.Toolbar.textTabHome": "Narzędzia główne", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index c73d897d5..e4817ad29 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -744,20 +752,12 @@ "DE.Views.BookmarksDialog.textHidden": "Favoritos ocultos", "DE.Views.BookmarksDialog.textTitle": "Favoritos", "DE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "DE.Views.ChartSettings.textArea": "Área", - "DE.Views.ChartSettings.textBar": "Barra", "DE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "DE.Views.ChartSettings.textColumn": "Coluna", "DE.Views.ChartSettings.textEditData": "Editar dados", "DE.Views.ChartSettings.textHeight": "Altura", - "DE.Views.ChartSettings.textLine": "Linha", "DE.Views.ChartSettings.textOriginalSize": "Tamanho padrão", - "DE.Views.ChartSettings.textPie": "Gráfico de pizza", - "DE.Views.ChartSettings.textPoint": "Gráfico de pontos", "DE.Views.ChartSettings.textSize": "Tamanho", - "DE.Views.ChartSettings.textStock": "Gráfico de ações", "DE.Views.ChartSettings.textStyle": "Estilo", - "DE.Views.ChartSettings.textSurface": "Superfície", "DE.Views.ChartSettings.textUndock": "Desencaixar do painel", "DE.Views.ChartSettings.textWidth": "Largura", "DE.Views.ChartSettings.textWrap": "Estilo da quebra automática", @@ -1633,13 +1633,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Imagem do arquivo", "DE.Views.Toolbar.mniImageFromUrl": "Imagem da URL", "DE.Views.Toolbar.strMenuNoFill": "Sem preenchimento", - "DE.Views.Toolbar.textArea": "Área", "DE.Views.Toolbar.textAutoColor": "Automático", - "DE.Views.Toolbar.textBar": "Barra", "DE.Views.Toolbar.textBold": "Negrito", "DE.Views.Toolbar.textBottom": "Inferior:", - "DE.Views.Toolbar.textCharts": "Gráficos", - "DE.Views.Toolbar.textColumn": "Coluna", "DE.Views.Toolbar.textColumnsCustom": "Personalizar colunas", "DE.Views.Toolbar.textColumnsLeft": "Esquerda", "DE.Views.Toolbar.textColumnsOne": "Uma", @@ -1658,7 +1654,6 @@ "DE.Views.Toolbar.textItalic": "Itálico", "DE.Views.Toolbar.textLandscape": "Paisagem", "DE.Views.Toolbar.textLeft": "Esquerda:", - "DE.Views.Toolbar.textLine": "Linha", "DE.Views.Toolbar.textMarginsLast": "Últimos personalizados", "DE.Views.Toolbar.textMarginsModerate": "Moderado", "DE.Views.Toolbar.textMarginsNarrow": "Estreito", @@ -1671,14 +1666,11 @@ "DE.Views.Toolbar.textOddPage": "Página ímpar", "DE.Views.Toolbar.textPageMarginsCustom": "Margens personalizadas", "DE.Views.Toolbar.textPageSizeCustom": "Tamanho de página personalizado", - "DE.Views.Toolbar.textPie": "Gráfico de pizza", "DE.Views.Toolbar.textPlainControl": "Adicionar Controle de Conteúdo de Texto sem formatação", - "DE.Views.Toolbar.textPoint": "Gráfico de pontos", "DE.Views.Toolbar.textPortrait": "Retrato ", "DE.Views.Toolbar.textRemoveControl": "Remover Controle de Conteúdo", "DE.Views.Toolbar.textRichControl": "Adicionar Controle de Conteúdo de Rich Text", "DE.Views.Toolbar.textRight": "Direita:", - "DE.Views.Toolbar.textStock": "Gráfico de ações", "DE.Views.Toolbar.textStrikeout": "Taxado", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1688,7 +1680,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscrito", "DE.Views.Toolbar.textSuperscript": "Sobrescrito", - "DE.Views.Toolbar.textSurface": "Superfície", "DE.Views.Toolbar.textTabCollaboration": "Colaboração", "DE.Views.Toolbar.textTabFile": "Arquivo", "DE.Views.Toolbar.textTabHome": "Página Inicial", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 1b9481d80..da81f10f4 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -230,6 +230,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -244,6 +246,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -308,6 +315,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "DE.Controllers.LeftMenu.leavePageText": "Все несохраненные изменения в этом документе будут потеряны.
Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.", "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", @@ -357,6 +369,7 @@ "DE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.
Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -673,6 +686,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 100", "DE.Controllers.Toolbar.textFraction": "Дроби", "DE.Controllers.Toolbar.textFunction": "Функции", + "DE.Controllers.Toolbar.textInsert": "Вставить", "DE.Controllers.Toolbar.textIntegral": "Интегралы", "DE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "DE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -1051,20 +1065,12 @@ "DE.Views.CellsRemoveDialog.textRow": "Удалить всю строку", "DE.Views.CellsRemoveDialog.textTitle": "Удалить ячейки", "DE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "DE.Views.ChartSettings.textArea": "С областями", - "DE.Views.ChartSettings.textBar": "Линейчатая", "DE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "DE.Views.ChartSettings.textColumn": "Гистограмма", "DE.Views.ChartSettings.textEditData": "Изменить данные", "DE.Views.ChartSettings.textHeight": "Высота", - "DE.Views.ChartSettings.textLine": "График", "DE.Views.ChartSettings.textOriginalSize": "Реальный размер", - "DE.Views.ChartSettings.textPie": "Круговая", - "DE.Views.ChartSettings.textPoint": "Точечная", "DE.Views.ChartSettings.textSize": "Размер", - "DE.Views.ChartSettings.textStock": "Биржевая", "DE.Views.ChartSettings.textStyle": "Стиль", - "DE.Views.ChartSettings.textSurface": "Поверхность", "DE.Views.ChartSettings.textUndock": "Открепить от панели", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стиль обтекания", @@ -2058,6 +2064,7 @@ "DE.Views.TextArtSettings.textTemplate": "Шаблон", "DE.Views.TextArtSettings.textTransform": "Трансформация", "DE.Views.TextArtSettings.txtNoBorders": "Без обводки", + "DE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "DE.Views.Toolbar.capBtnBlankPage": "Пустая страница", "DE.Views.Toolbar.capBtnColumns": "Колонки", "DE.Views.Toolbar.capBtnComment": "Комментарий", @@ -2069,6 +2076,7 @@ "DE.Views.Toolbar.capBtnInsImage": "Изображение", "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы", "DE.Views.Toolbar.capBtnInsShape": "Фигура", + "DE.Views.Toolbar.capBtnInsSymbol": "Символ", "DE.Views.Toolbar.capBtnInsTable": "Таблица", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", "DE.Views.Toolbar.capBtnInsTextbox": "Надпись", @@ -2093,13 +2101,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "Изображение из хранилища", "DE.Views.Toolbar.mniImageFromUrl": "Изображение по URL", "DE.Views.Toolbar.strMenuNoFill": "Без заливки", - "DE.Views.Toolbar.textArea": "С областями", "DE.Views.Toolbar.textAutoColor": "Автоматический", - "DE.Views.Toolbar.textBar": "Линейчатая", "DE.Views.Toolbar.textBold": "Полужирный", "DE.Views.Toolbar.textBottom": "Нижнее: ", - "DE.Views.Toolbar.textCharts": "Диаграммы", - "DE.Views.Toolbar.textColumn": "Гистограмма", "DE.Views.Toolbar.textColumnsCustom": "Настраиваемые колонки", "DE.Views.Toolbar.textColumnsLeft": "Слева", "DE.Views.Toolbar.textColumnsOne": "Одна", @@ -2119,7 +2123,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "Альбомная", "DE.Views.Toolbar.textLeft": "Левое: ", - "DE.Views.Toolbar.textLine": "График", "DE.Views.Toolbar.textMarginsLast": "Последние настраиваемые", "DE.Views.Toolbar.textMarginsModerate": "Средние", "DE.Views.Toolbar.textMarginsNarrow": "Узкие", @@ -2133,15 +2136,12 @@ "DE.Views.Toolbar.textOddPage": "С нечетной страницы", "DE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля", "DE.Views.Toolbar.textPageSizeCustom": "Особый размер страницы", - "DE.Views.Toolbar.textPie": "Круговая", "DE.Views.Toolbar.textPlainControl": "Вставить элемент управления \"Обычный текст\"", - "DE.Views.Toolbar.textPoint": "Точечная", "DE.Views.Toolbar.textPortrait": "Книжная", "DE.Views.Toolbar.textRemoveControl": "Удалить элемент управления содержимым", "DE.Views.Toolbar.textRemWatermark": "Удалить подложку", "DE.Views.Toolbar.textRichControl": "Вставить элемент управления \"Форматированный текст\"", "DE.Views.Toolbar.textRight": "Правое: ", - "DE.Views.Toolbar.textStock": "Биржевая", "DE.Views.Toolbar.textStrikeout": "Зачеркнутый", "DE.Views.Toolbar.textStyleMenuDelete": "Удалить стиль", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Удалить все пользовательские стили", @@ -2151,7 +2151,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента", "DE.Views.Toolbar.textSubscript": "Подстрочные знаки", "DE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "DE.Views.Toolbar.textSurface": "Поверхность", "DE.Views.Toolbar.textTabCollaboration": "Совместная работа", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "Главная", @@ -2196,6 +2195,7 @@ "DE.Views.Toolbar.tipInsertImage": "Вставить изображение", "DE.Views.Toolbar.tipInsertNum": "Вставить номер страницы", "DE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "DE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "DE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "DE.Views.Toolbar.tipInsertText": "Вставить надпись", "DE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index bd72be34a..eeea2a32f 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Zmeniť tabuľky", "Common.Controllers.ReviewChanges.textUnderline": "Podčiarknuť", "Common.Controllers.ReviewChanges.textWidow": "Ovládanie okien", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -747,20 +755,12 @@ "DE.Views.BookmarksDialog.textDelete": "Vymazať", "DE.Views.BookmarksDialog.textTitle": "Záložky", "DE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "DE.Views.ChartSettings.textArea": "Plošný graf", - "DE.Views.ChartSettings.textBar": "Pruhový graf", "DE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "DE.Views.ChartSettings.textColumn": "Stĺpec", "DE.Views.ChartSettings.textEditData": "Upravovať dáta", "DE.Views.ChartSettings.textHeight": "Výška", - "DE.Views.ChartSettings.textLine": "Čiara/líniový graf", "DE.Views.ChartSettings.textOriginalSize": "Predvolená veľkosť", - "DE.Views.ChartSettings.textPie": "Koláčový graf", - "DE.Views.ChartSettings.textPoint": "Bodový graf", "DE.Views.ChartSettings.textSize": "Veľkosť", - "DE.Views.ChartSettings.textStock": "Akcie/burzový graf", "DE.Views.ChartSettings.textStyle": "Štýl", - "DE.Views.ChartSettings.textSurface": "Povrch", "DE.Views.ChartSettings.textUndock": "Odpojiť z panelu", "DE.Views.ChartSettings.textWidth": "Šírka", "DE.Views.ChartSettings.textWrap": "Obtekanie textu", @@ -1580,13 +1580,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Obrázok zo súboru", "DE.Views.Toolbar.mniImageFromUrl": "Obrázok z URL adresy", "DE.Views.Toolbar.strMenuNoFill": "Bez výplne", - "DE.Views.Toolbar.textArea": "Plošný graf", "DE.Views.Toolbar.textAutoColor": "Automaticky", - "DE.Views.Toolbar.textBar": "Pruhový graf", "DE.Views.Toolbar.textBold": "Tučné", "DE.Views.Toolbar.textBottom": "Dole", - "DE.Views.Toolbar.textCharts": "Grafy", - "DE.Views.Toolbar.textColumn": "Stĺpec", "DE.Views.Toolbar.textColumnsCustom": "Vlastné stĺpce", "DE.Views.Toolbar.textColumnsLeft": "Vľavo", "DE.Views.Toolbar.textColumnsOne": "Jeden", @@ -1605,7 +1601,6 @@ "DE.Views.Toolbar.textItalic": "Kurzíva", "DE.Views.Toolbar.textLandscape": "Na šírku", "DE.Views.Toolbar.textLeft": "Vľavo:", - "DE.Views.Toolbar.textLine": "Čiara/líniový graf", "DE.Views.Toolbar.textMarginsLast": "Posledná úprava", "DE.Views.Toolbar.textMarginsModerate": "Primeraný/pomerne malý", "DE.Views.Toolbar.textMarginsNarrow": "Úzky", @@ -1618,11 +1613,8 @@ "DE.Views.Toolbar.textOddPage": "Nepárna strana", "DE.Views.Toolbar.textPageMarginsCustom": "Vlastné okraje", "DE.Views.Toolbar.textPageSizeCustom": "Vlastná veľkosť stránky", - "DE.Views.Toolbar.textPie": "Koláčový graf", - "DE.Views.Toolbar.textPoint": "Bodový graf", "DE.Views.Toolbar.textPortrait": "Na výšku", "DE.Views.Toolbar.textRight": "Vpravo:", - "DE.Views.Toolbar.textStock": "Akcie/burzový graf", "DE.Views.Toolbar.textStrikeout": "Prečiarknuť", "DE.Views.Toolbar.textStyleMenuDelete": "Odstrániť štýl", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Odstrániť všetky vlastné štýly", @@ -1632,7 +1624,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizovať z výberu", "DE.Views.Toolbar.textSubscript": "Dolný index", "DE.Views.Toolbar.textSuperscript": "Horný index", - "DE.Views.Toolbar.textSurface": "Povrch", "DE.Views.Toolbar.textTabFile": "Súbor", "DE.Views.Toolbar.textTabHome": "Hlavná stránka", "DE.Views.Toolbar.textTabInsert": "Vložiť", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 3c8cf64e8..4ae359026 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -63,6 +63,13 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -586,18 +593,11 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve", - "DE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "DE.Views.ChartSettings.textBar": "Stolpični grafikon", "DE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "DE.Views.ChartSettings.textColumn": "Stolpični grafikon", "DE.Views.ChartSettings.textEditData": "Uredi podatke", "DE.Views.ChartSettings.textHeight": "Višina", - "DE.Views.ChartSettings.textLine": "Vrstični grafikon", "DE.Views.ChartSettings.textOriginalSize": "Privzeta velikost", - "DE.Views.ChartSettings.textPie": "Tortni grafikon", - "DE.Views.ChartSettings.textPoint": "Točkovni grafikon", "DE.Views.ChartSettings.textSize": "Velikost", - "DE.Views.ChartSettings.textStock": "Založni grafikon", "DE.Views.ChartSettings.textStyle": "Slog", "DE.Views.ChartSettings.textUndock": "Odklopi s plošče", "DE.Views.ChartSettings.textWidth": "Širina", @@ -1304,12 +1304,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Slika z datoteke", "DE.Views.Toolbar.mniImageFromUrl": "Slika z URL", "DE.Views.Toolbar.strMenuNoFill": "Ni polnila", - "DE.Views.Toolbar.textArea": "Ploščinski grafikon", "DE.Views.Toolbar.textAutoColor": "Samodejen", - "DE.Views.Toolbar.textBar": "Stolpični grafikon", "DE.Views.Toolbar.textBold": "Krepko", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textColumn": "Stolpični grafikon", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", "DE.Views.Toolbar.textColumnsRight": "Right", @@ -1325,7 +1322,6 @@ "DE.Views.Toolbar.textInText": "v Besedilu", "DE.Views.Toolbar.textItalic": "Poševno", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Vrstični grafikon", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1337,10 +1333,7 @@ "DE.Views.Toolbar.textOddPage": "Čudna stran", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Tortni grafikon", - "DE.Views.Toolbar.textPoint": "Točkovni grafikon", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Založni grafikon", "DE.Views.Toolbar.textStrikeout": "Prečrtaj", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index ca868bb43..bcd3daabe 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -722,20 +730,12 @@ "DE.Views.BookmarksDialog.textDelete": "Sil", "DE.Views.BookmarksDialog.textName": "İsim", "DE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster", - "DE.Views.ChartSettings.textArea": "Bölge Grafiği", - "DE.Views.ChartSettings.textBar": "Çubuk grafik", "DE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "DE.Views.ChartSettings.textColumn": "Sütun grafik", "DE.Views.ChartSettings.textEditData": "Veri düzenle", "DE.Views.ChartSettings.textHeight": "Yükseklik", - "DE.Views.ChartSettings.textLine": "Çizgi grafiği", "DE.Views.ChartSettings.textOriginalSize": "Varsayılan Boyut", - "DE.Views.ChartSettings.textPie": "Dilim grafik", - "DE.Views.ChartSettings.textPoint": "Nokta grafiği", "DE.Views.ChartSettings.textSize": "Boyut", - "DE.Views.ChartSettings.textStock": "Stok Grafiği", "DE.Views.ChartSettings.textStyle": "Stil", - "DE.Views.ChartSettings.textSurface": "Yüzey", "DE.Views.ChartSettings.textUndock": "Panelden çıkar", "DE.Views.ChartSettings.textWidth": "Genişlik", "DE.Views.ChartSettings.textWrap": "Kaydırma Stili", @@ -1552,13 +1552,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Dosyadan resim", "DE.Views.Toolbar.mniImageFromUrl": "URL'den resim", "DE.Views.Toolbar.strMenuNoFill": "Dolgu Yok", - "DE.Views.Toolbar.textArea": "Bölge Grafiği", "DE.Views.Toolbar.textAutoColor": "Otomatik", - "DE.Views.Toolbar.textBar": "Çubuk grafik", "DE.Views.Toolbar.textBold": "Kalın", "DE.Views.Toolbar.textBottom": "Bottom: ", - "DE.Views.Toolbar.textCharts": "Grafikler", - "DE.Views.Toolbar.textColumn": "Sütun grafik", "DE.Views.Toolbar.textColumnsCustom": "Özel Sütunlar", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", @@ -1577,7 +1573,6 @@ "DE.Views.Toolbar.textItalic": "İtalik", "DE.Views.Toolbar.textLandscape": "Yatay", "DE.Views.Toolbar.textLeft": "Left: ", - "DE.Views.Toolbar.textLine": "Çizgi grafiği", "DE.Views.Toolbar.textMarginsLast": "Last Custom", "DE.Views.Toolbar.textMarginsModerate": "Moderate", "DE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -1590,11 +1585,8 @@ "DE.Views.Toolbar.textOddPage": "Tek Sayfa", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size", - "DE.Views.Toolbar.textPie": "Dilim grafik", - "DE.Views.Toolbar.textPoint": "Nokta grafiği", "DE.Views.Toolbar.textPortrait": "Dikey", "DE.Views.Toolbar.textRight": "Right: ", - "DE.Views.Toolbar.textStock": "Stok Grafiği", "DE.Views.Toolbar.textStrikeout": "Üstü çizili", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles", @@ -1604,7 +1596,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Altsimge", "DE.Views.Toolbar.textSuperscript": "Üstsimge", - "DE.Views.Toolbar.textSurface": "Yüzey", "DE.Views.Toolbar.textTabFile": "Dosya", "DE.Views.Toolbar.textTabHome": "Ana Sayfa", "DE.Views.Toolbar.textTabInsert": "Ekle", diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index 05443f36f..92ce612ed 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Змінити вкладки", "Common.Controllers.ReviewChanges.textUnderline": "Підкреслений", "Common.Controllers.ReviewChanges.textWidow": "Контроль над", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -689,20 +697,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "ксі", "DE.Controllers.Toolbar.txtSymbol_zeta": "Зета", "DE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "DE.Views.ChartSettings.textArea": "Площа", - "DE.Views.ChartSettings.textBar": "Вставити", "DE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "DE.Views.ChartSettings.textColumn": "Колона", "DE.Views.ChartSettings.textEditData": "Редагувати дату", "DE.Views.ChartSettings.textHeight": "Висота", - "DE.Views.ChartSettings.textLine": "Лінія", "DE.Views.ChartSettings.textOriginalSize": "За замовчуванням", - "DE.Views.ChartSettings.textPie": "Пиріг", - "DE.Views.ChartSettings.textPoint": "XY (розсіювання)", "DE.Views.ChartSettings.textSize": "Розмір", - "DE.Views.ChartSettings.textStock": "Запас", "DE.Views.ChartSettings.textStyle": "Стиль", - "DE.Views.ChartSettings.textSurface": "Поверхня", "DE.Views.ChartSettings.textUndock": "Скасувати з панелі", "DE.Views.ChartSettings.textWidth": "Ширина", "DE.Views.ChartSettings.textWrap": "Стиль упаковки", @@ -1508,13 +1508,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Картинка з файлу", "DE.Views.Toolbar.mniImageFromUrl": "Зображення з URL", "DE.Views.Toolbar.strMenuNoFill": "Немає заповнення", - "DE.Views.Toolbar.textArea": "Площа", "DE.Views.Toolbar.textAutoColor": "Автоматично", - "DE.Views.Toolbar.textBar": "Риска", "DE.Views.Toolbar.textBold": "Жирний", "DE.Views.Toolbar.textBottom": "Внизу:", - "DE.Views.Toolbar.textCharts": "Діаграми", - "DE.Views.Toolbar.textColumn": "Колона", "DE.Views.Toolbar.textColumnsCustom": "Спеціальні стовпці", "DE.Views.Toolbar.textColumnsLeft": "Лівий", "DE.Views.Toolbar.textColumnsOne": "Один", @@ -1533,7 +1529,6 @@ "DE.Views.Toolbar.textItalic": "Курсив", "DE.Views.Toolbar.textLandscape": "ландшафт", "DE.Views.Toolbar.textLeft": "Вліво:", - "DE.Views.Toolbar.textLine": "Лінія", "DE.Views.Toolbar.textMarginsLast": "Останній користувач", "DE.Views.Toolbar.textMarginsModerate": "Помірний", "DE.Views.Toolbar.textMarginsNarrow": "Вузький", @@ -1546,11 +1541,8 @@ "DE.Views.Toolbar.textOddPage": "Непарна сторінка", "DE.Views.Toolbar.textPageMarginsCustom": "Користувацькі поля", "DE.Views.Toolbar.textPageSizeCustom": "Спеціальний розмір сторінки", - "DE.Views.Toolbar.textPie": "Пиріг", - "DE.Views.Toolbar.textPoint": "XY (розсіювання)", "DE.Views.Toolbar.textPortrait": "Портрет", "DE.Views.Toolbar.textRight": "Право:", - "DE.Views.Toolbar.textStock": "Запас", "DE.Views.Toolbar.textStrikeout": "Викреслити", "DE.Views.Toolbar.textStyleMenuDelete": "Видалити стиль", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Видалити всі власні стилі", @@ -1560,7 +1552,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Оновлення від вибору", "DE.Views.Toolbar.textSubscript": "Підрядковий", "DE.Views.Toolbar.textSuperscript": "Надрядковий", - "DE.Views.Toolbar.textSurface": "Поверхня", "DE.Views.Toolbar.textTabCollaboration": "Співпраця", "DE.Views.Toolbar.textTabFile": "Файл", "DE.Views.Toolbar.textTabHome": "Головна", diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index 011501c93..9042b2260 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -63,6 +63,14 @@ "Common.Controllers.ReviewChanges.textTabs": "Thay đổi tab", "Common.Controllers.ReviewChanges.textUnderline": "Gạch chân", "Common.Controllers.ReviewChanges.textWidow": "Kiểm soát dòng lẻ cuối trang trước", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -686,20 +694,12 @@ "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "DE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "DE.Views.ChartSettings.textArea": "Vùng", - "DE.Views.ChartSettings.textBar": "Gạch", "DE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "DE.Views.ChartSettings.textColumn": "Cột", "DE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu", "DE.Views.ChartSettings.textHeight": "Chiều cao", - "DE.Views.ChartSettings.textLine": "Đường kẻ", "DE.Views.ChartSettings.textOriginalSize": "Kích thước mặc định", - "DE.Views.ChartSettings.textPie": "Hình bánh", - "DE.Views.ChartSettings.textPoint": "XY (Phân tán)", "DE.Views.ChartSettings.textSize": "Kích thước", - "DE.Views.ChartSettings.textStock": "Cổ phiếu", "DE.Views.ChartSettings.textStyle": "Kiểu", - "DE.Views.ChartSettings.textSurface": "Bề mặt", "DE.Views.ChartSettings.textUndock": "Tháo khỏi bảng điều khiển", "DE.Views.ChartSettings.textWidth": "Chiều rộng", "DE.Views.ChartSettings.textWrap": "Kiểu ngắt dòng", @@ -1492,13 +1492,9 @@ "DE.Views.Toolbar.mniImageFromFile": "Hình ảnh từ file", "DE.Views.Toolbar.mniImageFromUrl": "Hình ảnh từ URL", "DE.Views.Toolbar.strMenuNoFill": "Không đổ màu", - "DE.Views.Toolbar.textArea": "Vùng", "DE.Views.Toolbar.textAutoColor": "Tự động", - "DE.Views.Toolbar.textBar": "Gạch", "DE.Views.Toolbar.textBold": "Đậm", "DE.Views.Toolbar.textBottom": "Dưới cùng:", - "DE.Views.Toolbar.textCharts": "Biểu đồ", - "DE.Views.Toolbar.textColumn": "Cột", "DE.Views.Toolbar.textColumnsCustom": "Tùy chỉnh cột", "DE.Views.Toolbar.textColumnsLeft": "Trái", "DE.Views.Toolbar.textColumnsOne": "Một", @@ -1517,7 +1513,6 @@ "DE.Views.Toolbar.textItalic": "Nghiêng", "DE.Views.Toolbar.textLandscape": "Nằm ngang", "DE.Views.Toolbar.textLeft": "Trái:", - "DE.Views.Toolbar.textLine": "Đường kẻ", "DE.Views.Toolbar.textMarginsLast": "Tuỳ chỉnh cuối cùng", "DE.Views.Toolbar.textMarginsModerate": "Vừa phải", "DE.Views.Toolbar.textMarginsNarrow": "Thu hẹp", @@ -1530,11 +1525,8 @@ "DE.Views.Toolbar.textOddPage": "Trang lẻ", "DE.Views.Toolbar.textPageMarginsCustom": "Tùy chỉnh lề", "DE.Views.Toolbar.textPageSizeCustom": "Tùy chỉnh kích thước trang", - "DE.Views.Toolbar.textPie": "Hình bánh", - "DE.Views.Toolbar.textPoint": "XY (Phân tán)", "DE.Views.Toolbar.textPortrait": "Thẳng đứng", "DE.Views.Toolbar.textRight": "Bên phải:", - "DE.Views.Toolbar.textStock": "Cổ phiếu", "DE.Views.Toolbar.textStrikeout": "Gạch bỏ", "DE.Views.Toolbar.textStyleMenuDelete": "Xóa kiểu", "DE.Views.Toolbar.textStyleMenuDeleteAll": "Xóa tất cả kiểu tùy chỉnh", @@ -1544,7 +1536,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Cập nhật từ lựa chọn", "DE.Views.Toolbar.textSubscript": "Chỉ số dưới", "DE.Views.Toolbar.textSuperscript": "Chỉ số trên", - "DE.Views.Toolbar.textSurface": "Bề mặt", "DE.Views.Toolbar.textTabFile": "File", "DE.Views.Toolbar.textTabHome": "Trang chủ", "DE.Views.Toolbar.textTabInsert": "Chèn", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index 39a366b6c..601d4ccfc 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -69,6 +69,14 @@ "Common.Controllers.ReviewChanges.textTabs": "更改选项卡", "Common.Controllers.ReviewChanges.textUnderline": "下划线", "Common.Controllers.ReviewChanges.textWidow": "视窗控制", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1000,20 +1008,12 @@ "DE.Views.BookmarksDialog.textTitle": "书签", "DE.Views.BookmarksDialog.txtInvalidName": "书签名称只能包含字母、数字和下划线，并且应以字母开头", "DE.Views.ChartSettings.textAdvanced": "显示高级设置", - "DE.Views.ChartSettings.textArea": "区域", - "DE.Views.ChartSettings.textBar": "条", "DE.Views.ChartSettings.textChartType": "更改图表类型", - "DE.Views.ChartSettings.textColumn": "列", "DE.Views.ChartSettings.textEditData": "编辑数据", "DE.Views.ChartSettings.textHeight": "高度", - "DE.Views.ChartSettings.textLine": "线", "DE.Views.ChartSettings.textOriginalSize": "默认大小", - "DE.Views.ChartSettings.textPie": "派", - "DE.Views.ChartSettings.textPoint": "XY（散射）", "DE.Views.ChartSettings.textSize": "大小", - "DE.Views.ChartSettings.textStock": "股票", "DE.Views.ChartSettings.textStyle": "类型", - "DE.Views.ChartSettings.textSurface": "平面", "DE.Views.ChartSettings.textUndock": "离开面板", "DE.Views.ChartSettings.textWidth": "宽度", "DE.Views.ChartSettings.textWrap": "包裹风格", @@ -1994,13 +1994,9 @@ "DE.Views.Toolbar.mniImageFromStorage": "图片来自存储", "DE.Views.Toolbar.mniImageFromUrl": "图片来自网络", "DE.Views.Toolbar.strMenuNoFill": "没有填充", - "DE.Views.Toolbar.textArea": "区域", "DE.Views.Toolbar.textAutoColor": "自动化的", - "DE.Views.Toolbar.textBar": "条", "DE.Views.Toolbar.textBold": "加粗", "DE.Views.Toolbar.textBottom": "底部： ", - "DE.Views.Toolbar.textCharts": "图表", - "DE.Views.Toolbar.textColumn": "列", "DE.Views.Toolbar.textColumnsCustom": "自定义列", "DE.Views.Toolbar.textColumnsLeft": "左", "DE.Views.Toolbar.textColumnsOne": "一", @@ -2019,7 +2015,6 @@ "DE.Views.Toolbar.textItalic": "斜体", "DE.Views.Toolbar.textLandscape": "横向", "DE.Views.Toolbar.textLeft": "左： ", - "DE.Views.Toolbar.textLine": "线", "DE.Views.Toolbar.textMarginsLast": "最后自定义", "DE.Views.Toolbar.textMarginsModerate": "中等", "DE.Views.Toolbar.textMarginsNarrow": "缩小", @@ -2033,14 +2028,11 @@ "DE.Views.Toolbar.textOddPage": "奇数页", "DE.Views.Toolbar.textPageMarginsCustom": "自定义边距", "DE.Views.Toolbar.textPageSizeCustom": "自定义页面大小", - "DE.Views.Toolbar.textPie": "派", "DE.Views.Toolbar.textPlainControl": "插入纯文本内容控件", - "DE.Views.Toolbar.textPoint": "XY (散点图)", "DE.Views.Toolbar.textPortrait": "肖像", "DE.Views.Toolbar.textRemoveControl": "删除内容控件", "DE.Views.Toolbar.textRichControl": "插入多信息文本内容控件", "DE.Views.Toolbar.textRight": "右： ", - "DE.Views.Toolbar.textStock": "股票", "DE.Views.Toolbar.textStrikeout": "加删除线", "DE.Views.Toolbar.textStyleMenuDelete": "删除样式", "DE.Views.Toolbar.textStyleMenuDeleteAll": "删除所有自定义样式", @@ -2050,7 +2042,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "从选择更新", "DE.Views.Toolbar.textSubscript": "下标", "DE.Views.Toolbar.textSuperscript": "上标", - "DE.Views.Toolbar.textSurface": "平面", "DE.Views.Toolbar.textTabCollaboration": "协作", "DE.Views.Toolbar.textTabFile": "文件", "DE.Views.Toolbar.textTabHome": "主页", diff --git a/apps/presentationeditor/main/locale/bg.json b/apps/presentationeditor/main/locale/bg.json index 576178f73..5ef0fb04d 100644 --- a/apps/presentationeditor/main/locale/bg.json +++ b/apps/presentationeditor/main/locale/bg.json @@ -5,6 +5,15 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Затвори", "Common.Controllers.ExternalDiagramEditor.warningText": "Обектът е деактивиран, а кой е редактиран от друг потребител.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Внимание", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -901,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Плъзгайте се", "PE.Controllers.Viewport.textFitWidth": "Поставя се в ширина", "PE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "PE.Views.ChartSettings.textArea": "Площ", - "PE.Views.ChartSettings.textBar": "Бар", "PE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "PE.Views.ChartSettings.textColumn": "Колона", "PE.Views.ChartSettings.textEditData": "Редактиране на данни", "PE.Views.ChartSettings.textHeight": "Височина", "PE.Views.ChartSettings.textKeepRatio": "Постоянни пропорции", - "PE.Views.ChartSettings.textLine": "Линия", - "PE.Views.ChartSettings.textPie": "Кръгова", - "PE.Views.ChartSettings.textPoint": "XY (точкова)", "PE.Views.ChartSettings.textSize": "Размер", - "PE.Views.ChartSettings.textStock": "Борсова", "PE.Views.ChartSettings.textStyle": "Стил", - "PE.Views.ChartSettings.textSurface": "Повърхност", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Алтернативен текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание", @@ -1622,20 +1623,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Подравнете текста към средата", "PE.Views.Toolbar.textAlignRight": "Подравняване на текста вдясно", "PE.Views.Toolbar.textAlignTop": "Подравняване на текста до върха", - "PE.Views.Toolbar.textArea": "Площ", "PE.Views.Toolbar.textArrangeBack": "Изпращане до фона", "PE.Views.Toolbar.textArrangeBackward": "Изпращане назад", "PE.Views.Toolbar.textArrangeForward": "Изведи напред", "PE.Views.Toolbar.textArrangeFront": "Доведете до преден план", - "PE.Views.Toolbar.textBar": "Бар", "PE.Views.Toolbar.textBold": "Получер", - "PE.Views.Toolbar.textCharts": "Диаграми", - "PE.Views.Toolbar.textColumn": "Колона", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "Линия", "PE.Views.Toolbar.textNewColor": "Цвят по избор", - "PE.Views.Toolbar.textPie": "Кръгова", - "PE.Views.Toolbar.textPoint": "XY (точкова)", "PE.Views.Toolbar.textShapeAlignBottom": "Подравняване отдолу", "PE.Views.Toolbar.textShapeAlignCenter": "Подравняване на центъра", "PE.Views.Toolbar.textShapeAlignLeft": "Подравняване вляво", @@ -1646,11 +1640,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показване от текущата слайд", "PE.Views.Toolbar.textShowPresenterView": "Показване на изгледа на презентатора", "PE.Views.Toolbar.textShowSettings": "Покажи настройките", - "PE.Views.Toolbar.textStock": "Борсова", "PE.Views.Toolbar.textStrikeout": "Зачеркнато", "PE.Views.Toolbar.textSubscript": "Долен", "PE.Views.Toolbar.textSuperscript": "Горен индекс", - "PE.Views.Toolbar.textSurface": "Повърхност", "PE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "У дома", diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 25e24bc9b..7a5feba4b 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zavřít", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je vypnut, protože je upravován jiným uživatelem.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Varování", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -600,20 +608,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Ksí", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "PE.Views.ChartSettings.textArea": "Plošný graf", - "PE.Views.ChartSettings.textBar": "Vodorovná čárka", "PE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "PE.Views.ChartSettings.textColumn": "Sloupec", "PE.Views.ChartSettings.textEditData": "Upravit data", "PE.Views.ChartSettings.textHeight": "Výška", "PE.Views.ChartSettings.textKeepRatio": "Konstantní rozměry", - "PE.Views.ChartSettings.textLine": "Čára", - "PE.Views.ChartSettings.textPie": "Kruhový diagram", - "PE.Views.ChartSettings.textPoint": "Bodový graf", "PE.Views.ChartSettings.textSize": "Velikost", - "PE.Views.ChartSettings.textStock": "Akcie", "PE.Views.ChartSettings.textStyle": "Styl", - "PE.Views.ChartSettings.textSurface": "Povrch", "PE.Views.ChartSettings.textWidth": "Šířka", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternativní text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis", @@ -1238,20 +1238,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Zarovnat text doprostřed", "PE.Views.Toolbar.textAlignRight": "Zarovnat text doprava", "PE.Views.Toolbar.textAlignTop": "Zarovnat text nahoru", - "PE.Views.Toolbar.textArea": "Plošný graf", "PE.Views.Toolbar.textArrangeBack": "Přesunout do pozadí", "PE.Views.Toolbar.textArrangeBackward": "Odeslat zpět", "PE.Views.Toolbar.textArrangeForward": "Předložit", "PE.Views.Toolbar.textArrangeFront": "Přenést do popředí", - "PE.Views.Toolbar.textBar": "Vodorovná čárka", "PE.Views.Toolbar.textBold": "Tučně", - "PE.Views.Toolbar.textCharts": "Grafy", - "PE.Views.Toolbar.textColumn": "Sloupec", "PE.Views.Toolbar.textItalic": "Kurzíva", - "PE.Views.Toolbar.textLine": "Čára", "PE.Views.Toolbar.textNewColor": "Vlastní barva", - "PE.Views.Toolbar.textPie": "Kruhový diagram", - "PE.Views.Toolbar.textPoint": "Bodový graf", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnat dolů", "PE.Views.Toolbar.textShapeAlignCenter": "Zarovnat na střed", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnat vlevo", @@ -1262,11 +1255,9 @@ "PE.Views.Toolbar.textShowCurrent": "Zobrazit od aktuálního snímku", "PE.Views.Toolbar.textShowPresenterView": "Ukázat zobrazení přednášejícího", "PE.Views.Toolbar.textShowSettings": "Zobrazit nastavení", - "PE.Views.Toolbar.textStock": "Akcie", "PE.Views.Toolbar.textStrikeout": "Přeškrtnout", "PE.Views.Toolbar.textSubscript": "Dolní index", "PE.Views.Toolbar.textSuperscript": "Horní index", - "PE.Views.Toolbar.textSurface": "Povrch", "PE.Views.Toolbar.textTabFile": "Soubor", "PE.Views.Toolbar.textTabHome": "Domů", "PE.Views.Toolbar.textTabInsert": "Vložit", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index f7205b884..5171ee146 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -910,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Folie anpassen", "PE.Controllers.Viewport.textFitWidth": "Breite anpassen", "PE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", - "PE.Views.ChartSettings.textArea": "Flächen", - "PE.Views.ChartSettings.textBar": "Balken", "PE.Views.ChartSettings.textChartType": "Diagrammtyp ändern", - "PE.Views.ChartSettings.textColumn": "Spalte", "PE.Views.ChartSettings.textEditData": "Daten ändern", "PE.Views.ChartSettings.textHeight": "Höhe", "PE.Views.ChartSettings.textKeepRatio": "Seitenverhältnis beibehalten", - "PE.Views.ChartSettings.textLine": "Linie", - "PE.Views.ChartSettings.textPie": "Kreis", - "PE.Views.ChartSettings.textPoint": "Punkt (XY)", "PE.Views.ChartSettings.textSize": "Größe", - "PE.Views.ChartSettings.textStock": "Bestand", "PE.Views.ChartSettings.textStyle": "Stil", - "PE.Views.ChartSettings.textSurface": "Oberfläche", "PE.Views.ChartSettings.textWidth": "Breite", "PE.Views.ChartSettingsAdvanced.textAlt": "Der alternative Text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschreibung", @@ -1631,20 +1623,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Text mittig ausrichten", "PE.Views.Toolbar.textAlignRight": "Text rechtsbündig ausrichten", "PE.Views.Toolbar.textAlignTop": "Text am oberen Rand ausrichten", - "PE.Views.Toolbar.textArea": "Flächen", "PE.Views.Toolbar.textArrangeBack": "In den Hintergrund", "PE.Views.Toolbar.textArrangeBackward": "Eine Ebene nach hinten", "PE.Views.Toolbar.textArrangeForward": "Eine Ebene nach vorne", "PE.Views.Toolbar.textArrangeFront": "In den Vordergrund ", - "PE.Views.Toolbar.textBar": "Balken", "PE.Views.Toolbar.textBold": "Fett", - "PE.Views.Toolbar.textCharts": "Diagramme", - "PE.Views.Toolbar.textColumn": "Spalte", "PE.Views.Toolbar.textItalic": "Kursiv", - "PE.Views.Toolbar.textLine": "Linie", "PE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe", - "PE.Views.Toolbar.textPie": "Kreis", - "PE.Views.Toolbar.textPoint": "Punkt (XY)", "PE.Views.Toolbar.textShapeAlignBottom": "Unten ausrichten", "PE.Views.Toolbar.textShapeAlignCenter": "Zentriert ausrichten", "PE.Views.Toolbar.textShapeAlignLeft": "Links ausrichten", @@ -1655,11 +1640,9 @@ "PE.Views.Toolbar.textShowCurrent": "Von aktueller Folie abschauen", "PE.Views.Toolbar.textShowPresenterView": "Referentenansicht", "PE.Views.Toolbar.textShowSettings": "Einstellungen anzeigen", - "PE.Views.Toolbar.textStock": "Bestand", "PE.Views.Toolbar.textStrikeout": "Durchgestrichen", "PE.Views.Toolbar.textSubscript": "Tiefgestellt", "PE.Views.Toolbar.textSuperscript": "Hochgestellt", - "PE.Views.Toolbar.textSurface": "Oberfläche", "PE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "PE.Views.Toolbar.textTabFile": "Datei", "PE.Views.Toolbar.textTabHome": "Startseite", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a2332c607..9af942158 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -161,6 +161,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -175,6 +177,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -193,13 +200,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewPopover.textAdd": "Add", "Common.Views.ReviewPopover.textAddReply": "Add Reply", "Common.Views.ReviewPopover.textCancel": "Cancel", @@ -236,11 +236,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...", @@ -281,6 +281,7 @@ "PE.Controllers.Main.errorToken": "The document security token is not correctly formed.
Please contact your Document Server administrator.", "PE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -595,7 +596,6 @@ "PE.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.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", @@ -604,6 +604,7 @@ "PE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", "PE.Controllers.Toolbar.textFraction": "Fractions", "PE.Controllers.Toolbar.textFunction": "Functions", + "PE.Controllers.Toolbar.textInsert": "Insert", "PE.Controllers.Toolbar.textIntegral": "Integrals", "PE.Controllers.Toolbar.textLargeOperator": "Large Operators", "PE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -929,24 +930,15 @@ "PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", - "PE.Controllers.Toolbar.textInsert": "Insert", "PE.Controllers.Viewport.textFitPage": "Fit to Slide", "PE.Controllers.Viewport.textFitWidth": "Fit to Width", "PE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_PE.Views.ChartSettings.textArea": "Area", - "del_PE.Views.ChartSettings.textBar": "Bar", "PE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_PE.Views.ChartSettings.textColumn": "Column", "PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textKeepRatio": "Constant proportions", - "del_PE.Views.ChartSettings.textLine": "Line", - "del_PE.Views.ChartSettings.textPie": "Pie", - "del_PE.Views.ChartSettings.textPoint": "XY (Scatter)", "PE.Views.ChartSettings.textSize": "Size", - "del_PE.Views.ChartSettings.textStock": "Stock", "PE.Views.ChartSettings.textStyle": "Style", - "del_PE.Views.ChartSettings.textSurface": "Surface", "PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternative Text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", @@ -1315,6 +1307,11 @@ "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", "PE.Views.LeftMenu.txtTrial": "TRIAL MODE", + "del_PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "del_PE.Views.ListSettingsDialog.txtColor": "Color", + "del_PE.Views.ListSettingsDialog.txtOfText": "% of text", + "del_PE.Views.ListSettingsDialog.txtSize": "Size", + "del_PE.Views.ListSettingsDialog.txtTitle": "List Settings", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", @@ -1692,6 +1689,7 @@ "PE.Views.Toolbar.capBtnComment": "Comment", "PE.Views.Toolbar.capBtnDateTime": "Date & Time", "PE.Views.Toolbar.capBtnInsHeader": "Header/Footer", + "PE.Views.Toolbar.capBtnInsSymbol": "Symbol", "PE.Views.Toolbar.capBtnSlideNum": "Slide Number", "PE.Views.Toolbar.capInsertChart": "Chart", "PE.Views.Toolbar.capInsertEquation": "Equation", @@ -1717,21 +1715,14 @@ "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignTop": "Align text to the top", - "del_PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBackward": "Send Backward", "PE.Views.Toolbar.textArrangeForward": "Bring Forward", "PE.Views.Toolbar.textArrangeFront": "Bring to Foreground", - "del_PE.Views.Toolbar.textBar": "Bar", "PE.Views.Toolbar.textBold": "Bold", - "del_PE.Views.Toolbar.textCharts": "Charts", - "del_PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textItalic": "Italic", - "del_PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textListSettings": "List Settings", "PE.Views.Toolbar.textNewColor": "Custom Color", - "del_PE.Views.Toolbar.textPie": "Pie", - "del_PE.Views.Toolbar.textPoint": "XY (Scatter)", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1742,11 +1733,9 @@ "PE.Views.Toolbar.textShowCurrent": "Show from Current Slide", "PE.Views.Toolbar.textShowPresenterView": "Show Presenter View", "PE.Views.Toolbar.textShowSettings": "Show Settings", - "del_PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikethrough", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "del_PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Home", @@ -1775,6 +1764,7 @@ "PE.Views.Toolbar.tipInsertHyperlink": "Add hyperlink", "PE.Views.Toolbar.tipInsertImage": "Insert image", "PE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "PE.Views.Toolbar.tipInsertTable": "Insert table", "PE.Views.Toolbar.tipInsertText": "Insert text box", "PE.Views.Toolbar.tipInsertTextArt": "Insert Text Art", @@ -1821,7 +1811,5 @@ "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", - "PE.Views.Toolbar.txtUngroup": "Ungroup", - "PE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "PE.Views.Toolbar.tipInsertSymbol": "Insert symbol" + "PE.Views.Toolbar.txtUngroup": "Ungroup" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 626419319..f6bf6c3db 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Cerrar", "Common.Controllers.ExternalDiagramEditor.warningText": "El objeto está desactivado porque se está editando por otro usuario.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -902,20 +910,12 @@ "PE.Controllers.Viewport.textFitPage": "Ajustar a la diapositiva", "PE.Controllers.Viewport.textFitWidth": "Ajustar al ancho", "PE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "PE.Views.ChartSettings.textArea": "Gráfico de área", - "PE.Views.ChartSettings.textBar": "Gráfico de barras", "PE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "PE.Views.ChartSettings.textColumn": "Histograma", "PE.Views.ChartSettings.textEditData": "Editar datos", "PE.Views.ChartSettings.textHeight": "Altura", "PE.Views.ChartSettings.textKeepRatio": "Proporciones constantes", - "PE.Views.ChartSettings.textLine": "Línea", - "PE.Views.ChartSettings.textPie": "Gráfico circular", - "PE.Views.ChartSettings.textPoint": "XY (Dispersión)", "PE.Views.ChartSettings.textSize": "Tamaño", - "PE.Views.ChartSettings.textStock": "De cotizaciones", "PE.Views.ChartSettings.textStyle": "Estilo", - "PE.Views.ChartSettings.textSurface": "Superficie", "PE.Views.ChartSettings.textWidth": "Ancho", "PE.Views.ChartSettingsAdvanced.textAlt": "Texto alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descripción", @@ -1653,20 +1653,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Alinear texto al medio", "PE.Views.Toolbar.textAlignRight": "Alinear texto a la derecha", "PE.Views.Toolbar.textAlignTop": "Alinear texto en la parte superior", - "PE.Views.Toolbar.textArea": "Gráfico de área", "PE.Views.Toolbar.textArrangeBack": "Enviar al fondo", "PE.Views.Toolbar.textArrangeBackward": "Enviar atrás", "PE.Views.Toolbar.textArrangeForward": "Traer adelante", "PE.Views.Toolbar.textArrangeFront": "Traer al frente", - "PE.Views.Toolbar.textBar": "Gráfico de barras", "PE.Views.Toolbar.textBold": "Negrita", - "PE.Views.Toolbar.textCharts": "Gráficos", - "PE.Views.Toolbar.textColumn": "Histograma", "PE.Views.Toolbar.textItalic": "Cursiva", - "PE.Views.Toolbar.textLine": "Línea", "PE.Views.Toolbar.textNewColor": "Color personalizado", - "PE.Views.Toolbar.textPie": "Gráfico circular", - "PE.Views.Toolbar.textPoint": "XY (Dispersión)", "PE.Views.Toolbar.textShapeAlignBottom": "Alinear en la parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinear al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinear a la izquierda", @@ -1677,11 +1670,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostrar desde la diapositiva actual", "PE.Views.Toolbar.textShowPresenterView": "Observar vista del presentador", "PE.Views.Toolbar.textShowSettings": "Mostrar los ajustes", - "PE.Views.Toolbar.textStock": "De cotizaciones", "PE.Views.Toolbar.textStrikeout": "Tachado", "PE.Views.Toolbar.textSubscript": "Subíndice", "PE.Views.Toolbar.textSuperscript": "Sobreíndice", - "PE.Views.Toolbar.textSurface": "Superficie", "PE.Views.Toolbar.textTabCollaboration": "Colaboración", "PE.Views.Toolbar.textTabFile": "Archivo", "PE.Views.Toolbar.textTabHome": "Inicio", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 670e2b29b..751bec8e8 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Fermer", "Common.Controllers.ExternalDiagramEditor.warningText": "L'objet est désactivé car il est en cours d'être modifié par un autre utilisateur.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avertissement", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -903,20 +911,12 @@ "PE.Controllers.Viewport.textFitPage": "Ajuster à la diapositive", "PE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur", "PE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "PE.Views.ChartSettings.textArea": "En aires", - "PE.Views.ChartSettings.textBar": "À barres", "PE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "PE.Views.ChartSettings.textColumn": "Histogramme", "PE.Views.ChartSettings.textEditData": "Modifier les données", "PE.Views.ChartSettings.textHeight": "Hauteur", "PE.Views.ChartSettings.textKeepRatio": "Proportions constantes", - "PE.Views.ChartSettings.textLine": "En ligne", - "PE.Views.ChartSettings.textPie": "À secteurs", - "PE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "PE.Views.ChartSettings.textSize": "Taille", - "PE.Views.ChartSettings.textStock": "Boursier", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Surface", "PE.Views.ChartSettings.textWidth": "Largeur", "PE.Views.ChartSettingsAdvanced.textAlt": "Texte de remplacement", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Description", @@ -1681,20 +1681,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Aligner le texte au milieu", "PE.Views.Toolbar.textAlignRight": "Aligner le texte à droite", "PE.Views.Toolbar.textAlignTop": "Aligner le texte en haut", - "PE.Views.Toolbar.textArea": "En aires", "PE.Views.Toolbar.textArrangeBack": "Mettre en arrière-plan", "PE.Views.Toolbar.textArrangeBackward": "Envoyer vers l'arrière.", "PE.Views.Toolbar.textArrangeForward": "Déplacer vers l'avant", "PE.Views.Toolbar.textArrangeFront": "Mettre au premier plan", - "PE.Views.Toolbar.textBar": "À barres", "PE.Views.Toolbar.textBold": "Gras", - "PE.Views.Toolbar.textCharts": "Graphiques", - "PE.Views.Toolbar.textColumn": "Histogramme", "PE.Views.Toolbar.textItalic": "Italique", - "PE.Views.Toolbar.textLine": "En ligne", "PE.Views.Toolbar.textNewColor": "Couleur personnalisée", - "PE.Views.Toolbar.textPie": "À secteurs", - "PE.Views.Toolbar.textPoint": "Nuages de points (XY)", "PE.Views.Toolbar.textShapeAlignBottom": "Aligner en bas", "PE.Views.Toolbar.textShapeAlignCenter": "Aligner au centre", "PE.Views.Toolbar.textShapeAlignLeft": "Aligner à gauche", @@ -1705,11 +1698,9 @@ "PE.Views.Toolbar.textShowCurrent": "Afficher de la diapositive actuelle", "PE.Views.Toolbar.textShowPresenterView": "Afficher en mode présentateur", "PE.Views.Toolbar.textShowSettings": "Afficher les paramètres", - "PE.Views.Toolbar.textStock": "Boursier", "PE.Views.Toolbar.textStrikeout": "Barré", "PE.Views.Toolbar.textSubscript": "Indice", "PE.Views.Toolbar.textSuperscript": "Exposant", - "PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "Collaboration", "PE.Views.Toolbar.textTabFile": "Fichier", "PE.Views.Toolbar.textTabHome": "Accueil", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index 0170d625d..fc0fc68c5 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Bezár", "Common.Controllers.ExternalDiagramEditor.warningText": "Az objektum le van tiltva, mert azt egy másik felhasználó szerkeszti.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Figyelmeztetés", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -843,20 +851,12 @@ "PE.Controllers.Viewport.textFitPage": "A diához igazít", "PE.Controllers.Viewport.textFitWidth": "Szélességhez igazít", "PE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "PE.Views.ChartSettings.textArea": "Terület", - "PE.Views.ChartSettings.textBar": "Sáv", "PE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "PE.Views.ChartSettings.textColumn": "Oszlop", "PE.Views.ChartSettings.textEditData": "Adat szerkesztése", "PE.Views.ChartSettings.textHeight": "Magasság", "PE.Views.ChartSettings.textKeepRatio": "Állandó arányok", - "PE.Views.ChartSettings.textLine": "Vonal", - "PE.Views.ChartSettings.textPie": "Kördiagram", - "PE.Views.ChartSettings.textPoint": "Gráf", "PE.Views.ChartSettings.textSize": "Méret", - "PE.Views.ChartSettings.textStock": "Állomány", "PE.Views.ChartSettings.textStyle": "Stílus", - "PE.Views.ChartSettings.textSurface": "Felület", "PE.Views.ChartSettings.textWidth": "Szélesség", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatív szöveg", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Leírás", @@ -1559,20 +1559,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Szöveg középre rendezése", "PE.Views.Toolbar.textAlignRight": "Szöveg jobbra rendezése", "PE.Views.Toolbar.textAlignTop": "Szöveg felülre rendezése", - "PE.Views.Toolbar.textArea": "Terület", "PE.Views.Toolbar.textArrangeBack": "Háttérbe küld", "PE.Views.Toolbar.textArrangeBackward": "Visszafelé küld", "PE.Views.Toolbar.textArrangeForward": "Előre hoz", "PE.Views.Toolbar.textArrangeFront": "Előre hoz", - "PE.Views.Toolbar.textBar": "Sáv", "PE.Views.Toolbar.textBold": "Félkövér", - "PE.Views.Toolbar.textCharts": "Diagramok", - "PE.Views.Toolbar.textColumn": "Hasáb", "PE.Views.Toolbar.textItalic": "Dőlt", - "PE.Views.Toolbar.textLine": "Vonal", "PE.Views.Toolbar.textNewColor": "Egyéni szín", - "PE.Views.Toolbar.textPie": "Kördiagram", - "PE.Views.Toolbar.textPoint": "Gráf", "PE.Views.Toolbar.textShapeAlignBottom": "Alulra rendez", "PE.Views.Toolbar.textShapeAlignCenter": "Középre rendez", "PE.Views.Toolbar.textShapeAlignLeft": "Balra rendez", @@ -1583,11 +1576,9 @@ "PE.Views.Toolbar.textShowCurrent": "Indítás az aktuális diától", "PE.Views.Toolbar.textShowPresenterView": "Megjelenítő nézet", "PE.Views.Toolbar.textShowSettings": "Beállítások megjelenítése", - "PE.Views.Toolbar.textStock": "Állomány", "PE.Views.Toolbar.textStrikeout": "Áthúzott", "PE.Views.Toolbar.textSubscript": "Alsó index", "PE.Views.Toolbar.textSuperscript": "Felső index", - "PE.Views.Toolbar.textSurface": "Felület", "PE.Views.Toolbar.textTabCollaboration": "Együttműködés", "PE.Views.Toolbar.textTabFile": "Fájl", "PE.Views.Toolbar.textTabHome": "Kezdőlap", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index c73f1758c..5771cbe1d 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Chiudi", "Common.Controllers.ExternalDiagramEditor.warningText": "L'oggetto è disabilitato perché si sta modificando da un altro utente.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Avviso", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -108,6 +116,8 @@ "Common.Views.InsertTableDialog.txtTitle": "Dimensioni tabella", "Common.Views.InsertTableDialog.txtTitleSplit": "Dividi cella", "Common.Views.LanguageDialog.labelSelect": "Seleziona la lingua del documento", + "Common.Views.ListSettingsDialog.txtSize": "Dimensioni", + "Common.Views.ListSettingsDialog.txtStart": "Inizia da", "Common.Views.OpenDialog.closeButtonText": "Chiudi File", "Common.Views.OpenDialog.txtEncoding": "Codifica", "Common.Views.OpenDialog.txtIncorrectPwd": "Password errata", @@ -904,20 +914,12 @@ "PE.Controllers.Viewport.textFitPage": "Adatta alla diapositiva", "PE.Controllers.Viewport.textFitWidth": "Adatta alla larghezza", "PE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "PE.Views.ChartSettings.textArea": "Area", - "PE.Views.ChartSettings.textBar": "Barra", "PE.Views.ChartSettings.textChartType": "Cambia tipo grafico", - "PE.Views.ChartSettings.textColumn": "Colonna", "PE.Views.ChartSettings.textEditData": "Modifica dati", "PE.Views.ChartSettings.textHeight": "Altezza", "PE.Views.ChartSettings.textKeepRatio": "Proporzioni costanti", - "PE.Views.ChartSettings.textLine": "Linea", - "PE.Views.ChartSettings.textPie": "Torta", - "PE.Views.ChartSettings.textPoint": "XY (A dispersione)", "PE.Views.ChartSettings.textSize": "Dimensione", - "PE.Views.ChartSettings.textStock": "Azionario", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Superficie", "PE.Views.ChartSettings.textWidth": "Larghezza", "PE.Views.ChartSettingsAdvanced.textAlt": "Testo alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrizione", @@ -1283,6 +1285,7 @@ "PE.Views.LeftMenu.tipTitles": "Titoli", "PE.Views.LeftMenu.txtDeveloper": "MODALITÀ SVILUPPATORE", "PE.Views.LeftMenu.txtTrial": "Modalità di prova", + "PE.Views.ListSettingsDialog.txtSize": "Dimensioni", "PE.Views.ParagraphSettings.strLineHeight": "Interlinea", "PE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo", "PE.Views.ParagraphSettings.strSpacingAfter": "Dopo", @@ -1676,20 +1679,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Allinea testo in mezzo", "PE.Views.Toolbar.textAlignRight": "Allinea testo a destra", "PE.Views.Toolbar.textAlignTop": "Allinea testo in alto", - "PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "Porta in secondo piano", "PE.Views.Toolbar.textArrangeBackward": "Porta indietro", "PE.Views.Toolbar.textArrangeForward": "Porta avanti", "PE.Views.Toolbar.textArrangeFront": "Porta in primo piano", - "PE.Views.Toolbar.textBar": "Barra", "PE.Views.Toolbar.textBold": "Grassetto", - "PE.Views.Toolbar.textCharts": "Grafici", - "PE.Views.Toolbar.textColumn": "Colonna", "PE.Views.Toolbar.textItalic": "Corsivo", - "PE.Views.Toolbar.textLine": "Linea", "PE.Views.Toolbar.textNewColor": "Colore personalizzato", - "PE.Views.Toolbar.textPie": "Torta", - "PE.Views.Toolbar.textPoint": "XY (A dispersione)", "PE.Views.Toolbar.textShapeAlignBottom": "Allinea in basso", "PE.Views.Toolbar.textShapeAlignCenter": "Allinea al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Allinea a sinistra", @@ -1700,11 +1696,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostra dalla diapositiva corrente", "PE.Views.Toolbar.textShowPresenterView": "Mostra la visualizzazione del presenter", "PE.Views.Toolbar.textShowSettings": "Mostra Impostazioni", - "PE.Views.Toolbar.textStock": "Azionario", "PE.Views.Toolbar.textStrikeout": "Barrato", "PE.Views.Toolbar.textSubscript": "Pedice", "PE.Views.Toolbar.textSuperscript": "Apice", - "PE.Views.Toolbar.textSurface": "Superficie", "PE.Views.Toolbar.textTabCollaboration": "Collaborazione", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index fde3bdf53..abc82799f 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -5,6 +5,13 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "閉じる", "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。", "Common.Controllers.ExternalDiagramEditor.warningTitle": " 警告", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -207,18 +214,11 @@ "PE.Controllers.Toolbar.textEmptyImgUrl": "画像のURLを指定しなければなりません。", "PE.Controllers.Toolbar.textFontSizeErr": "入力された値が正しくありません。
1〜100の数値を入力してください。", "PE.Controllers.Toolbar.textWarning": " 警告", - "PE.Views.ChartSettings.textArea": "面グラフ", - "PE.Views.ChartSettings.textBar": "横棒グラフ", "PE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "PE.Views.ChartSettings.textColumn": "縦棒グラフ", "PE.Views.ChartSettings.textEditData": "データの編集", "PE.Views.ChartSettings.textHeight": "高さ", "PE.Views.ChartSettings.textKeepRatio": "比例の定数", - "PE.Views.ChartSettings.textLine": "折れ線グラフ", - "PE.Views.ChartSettings.textPie": "円グラフ", - "PE.Views.ChartSettings.textPoint": "点グラフ", "PE.Views.ChartSettings.textSize": "サイズ", - "PE.Views.ChartSettings.textStock": "株価チャート", "PE.Views.ChartSettings.textStyle": "スタイル", "PE.Views.ChartSettings.textWidth": "幅", "PE.Views.DocumentHolder.aboveText": "上", @@ -706,26 +706,19 @@ "PE.Views.Toolbar.textAlignMiddle": "テキストを中央に揃えます", "PE.Views.Toolbar.textAlignRight": "テキストの右揃え", "PE.Views.Toolbar.textAlignTop": "テキストの上揃え", - "PE.Views.Toolbar.textArea": "面グラフ", "PE.Views.Toolbar.textArrangeBack": "背景へ移動", "PE.Views.Toolbar.textArrangeBackward": "背面へ移動", "PE.Views.Toolbar.textArrangeForward": "前面へ移動", "PE.Views.Toolbar.textArrangeFront": "前景に移動", - "PE.Views.Toolbar.textBar": "横棒グラフ", "PE.Views.Toolbar.textBold": "太字", - "PE.Views.Toolbar.textColumn": "縦棒グラフ", "PE.Views.Toolbar.textItalic": "斜体", - "PE.Views.Toolbar.textLine": "折れ線グラフ", "PE.Views.Toolbar.textNewColor": "ユーザー設定の色", - "PE.Views.Toolbar.textPie": "円グラフ", - "PE.Views.Toolbar.textPoint": "点グラフ", "PE.Views.Toolbar.textShapeAlignBottom": "下揃え", "PE.Views.Toolbar.textShapeAlignCenter": "中央揃え\t", "PE.Views.Toolbar.textShapeAlignLeft": "左揃え", "PE.Views.Toolbar.textShapeAlignMiddle": "上下中央揃え", "PE.Views.Toolbar.textShapeAlignRight": "右揃え", "PE.Views.Toolbar.textShapeAlignTop": "上揃え", - "PE.Views.Toolbar.textStock": "株価チャート", "PE.Views.Toolbar.textStrikeout": "取り消し線", "PE.Views.Toolbar.textSubscript": "下付き", "PE.Views.Toolbar.textSuperscript": "上付き文字", diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index ad51867d6..b6e6097ae 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -696,20 +696,12 @@ "PE.Controllers.Viewport.textFitPage": "슬라이드에 맞추기", "PE.Controllers.Viewport.textFitWidth": "너비에 맞춤", "PE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "PE.Views.ChartSettings.textArea": "영역", - "PE.Views.ChartSettings.textBar": "Bar", "PE.Views.ChartSettings.textChartType": "차트 유형 변경", - "PE.Views.ChartSettings.textColumn": "열", "PE.Views.ChartSettings.textEditData": "데이터 편집", "PE.Views.ChartSettings.textHeight": "높이", "PE.Views.ChartSettings.textKeepRatio": "일정 비율", - "PE.Views.ChartSettings.textLine": "Line", - "PE.Views.ChartSettings.textPie": "파이", - "PE.Views.ChartSettings.textPoint": "XY (분산 형)", "PE.Views.ChartSettings.textSize": "크기", - "PE.Views.ChartSettings.textStock": "Stock", "PE.Views.ChartSettings.textStyle": "스타일", - "PE.Views.ChartSettings.textSurface": "표면", "PE.Views.ChartSettings.textWidth": "너비", "PE.Views.ChartSettingsAdvanced.textAlt": "대체 텍스트", "PE.Views.ChartSettingsAdvanced.textAltDescription": "설명", @@ -1372,20 +1364,13 @@ "PE.Views.Toolbar.textAlignMiddle": "중간에 텍스트 정렬", "PE.Views.Toolbar.textAlignRight": "텍스트 정렬", "PE.Views.Toolbar.textAlignTop": "텍스트를 상단에 정렬", - "PE.Views.Toolbar.textArea": "Area", "PE.Views.Toolbar.textArrangeBack": "배경에 보내기", "PE.Views.Toolbar.textArrangeBackward": "뒤로 이동", "PE.Views.Toolbar.textArrangeForward": "앞으로 이동", "PE.Views.Toolbar.textArrangeFront": "전경으로 가져 오기", - "PE.Views.Toolbar.textBar": "Bar", "PE.Views.Toolbar.textBold": "Bold", - "PE.Views.Toolbar.textCharts": "차트", - "PE.Views.Toolbar.textColumn": "Column", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textLine": "Line", "PE.Views.Toolbar.textNewColor": "사용자 정의 색상", - "PE.Views.Toolbar.textPie": "파이", - "PE.Views.Toolbar.textPoint": "XY (분산 형)", "PE.Views.Toolbar.textShapeAlignBottom": "아래쪽 정렬", "PE.Views.Toolbar.textShapeAlignCenter": "정렬 중심", "PE.Views.Toolbar.textShapeAlignLeft": "왼쪽 정렬", @@ -1396,11 +1381,9 @@ "PE.Views.Toolbar.textShowCurrent": "현재 슬라이드에서보기", "PE.Views.Toolbar.textShowPresenterView": "프리젠터뷰를 보기", "PE.Views.Toolbar.textShowSettings": "설정 표시", - "PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textSubscript": "아래 첨자", "PE.Views.Toolbar.textSuperscript": "위첨자", - "PE.Views.Toolbar.textSurface": "Surface", "PE.Views.Toolbar.textTabCollaboration": "합치기", "PE.Views.Toolbar.textTabFile": "파일", "PE.Views.Toolbar.textTabHome": "집", diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index 96a43824f..c22503300 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -693,20 +693,12 @@ "PE.Controllers.Viewport.textFitPage": "Saskaņot ar slaidu", "PE.Controllers.Viewport.textFitWidth": "Saskaņot ar platumu", "PE.Views.ChartSettings.textAdvanced": "Radīt papildu iestatījumus", - "PE.Views.ChartSettings.textArea": "Area Chart", - "PE.Views.ChartSettings.textBar": "Bar Chart", "PE.Views.ChartSettings.textChartType": "Change Chart Type", - "PE.Views.ChartSettings.textColumn": "Column Chart", "PE.Views.ChartSettings.textEditData": "Edit Data", "PE.Views.ChartSettings.textHeight": "Height", "PE.Views.ChartSettings.textKeepRatio": "Constant Proportions", - "PE.Views.ChartSettings.textLine": "Line Chart", - "PE.Views.ChartSettings.textPie": "Pie Chart", - "PE.Views.ChartSettings.textPoint": "XY (Scatter) Chart", "PE.Views.ChartSettings.textSize": "Size", - "PE.Views.ChartSettings.textStock": "Stock Chart", "PE.Views.ChartSettings.textStyle": "Style", - "PE.Views.ChartSettings.textSurface": "Virsma", "PE.Views.ChartSettings.textWidth": "Width", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatīvs teksts", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Apraksts", @@ -1369,20 +1361,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Align text to the middle", "PE.Views.Toolbar.textAlignRight": "Align text right", "PE.Views.Toolbar.textAlignTop": "Align text to the top", - "PE.Views.Toolbar.textArea": "Area Chart", "PE.Views.Toolbar.textArrangeBack": "Send to Background", "PE.Views.Toolbar.textArrangeBackward": "Sūtīt atpakaļ", "PE.Views.Toolbar.textArrangeForward": "Pārnest uz priekšu", "PE.Views.Toolbar.textArrangeFront": "Bring To Foreground", - "PE.Views.Toolbar.textBar": "Bar Chart", "PE.Views.Toolbar.textBold": "Bold", - "PE.Views.Toolbar.textCharts": "Diagrammas", - "PE.Views.Toolbar.textColumn": "Column Chart", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textLine": "Line Chart", "PE.Views.Toolbar.textNewColor": "Custom Color", - "PE.Views.Toolbar.textPie": "Pie Chart", - "PE.Views.Toolbar.textPoint": "XY (Scatter) Chart", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1393,11 +1378,9 @@ "PE.Views.Toolbar.textShowCurrent": "Rādīt no šī slaida", "PE.Views.Toolbar.textShowPresenterView": "Rādīt prezentētāja režīmā", "PE.Views.Toolbar.textShowSettings": "Rādīt uzstādījumus", - "PE.Views.Toolbar.textStock": "Stock Chart", "PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "PE.Views.Toolbar.textSurface": "Virsma", "PE.Views.Toolbar.textTabCollaboration": "Sadarbība", "PE.Views.Toolbar.textTabFile": "Fails", "PE.Views.Toolbar.textTabHome": "Sākums", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index 501d1076c..fbec7d1a8 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Sluiten", "Common.Controllers.ExternalDiagramEditor.warningText": "Het object is gedeactiveerd omdat het wordt bewerkt door een andere gebruiker.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Waarschuwing", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -702,20 +710,12 @@ "PE.Controllers.Viewport.textFitPage": "Aanpassen aan dia", "PE.Controllers.Viewport.textFitWidth": "Aan breedte aanpassen", "PE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "PE.Views.ChartSettings.textArea": "Vlak", - "PE.Views.ChartSettings.textBar": "Staaf", "PE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "PE.Views.ChartSettings.textColumn": "Kolom", "PE.Views.ChartSettings.textEditData": "Gegevens bewerken", "PE.Views.ChartSettings.textHeight": "Hoogte", "PE.Views.ChartSettings.textKeepRatio": "Constante verhoudingen", - "PE.Views.ChartSettings.textLine": "Lijn", - "PE.Views.ChartSettings.textPie": "Cirkel", - "PE.Views.ChartSettings.textPoint": "Spreiding", "PE.Views.ChartSettings.textSize": "Grootte", - "PE.Views.ChartSettings.textStock": "Voorraad", "PE.Views.ChartSettings.textStyle": "Stijl", - "PE.Views.ChartSettings.textSurface": "Oppervlak", "PE.Views.ChartSettings.textWidth": "Breedte", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatieve tekst", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beschrijving", @@ -1378,20 +1378,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Tekst centreren", "PE.Views.Toolbar.textAlignRight": "Tekst rechts uitlijnen", "PE.Views.Toolbar.textAlignTop": "Tekst bovenaan uitlijnen", - "PE.Views.Toolbar.textArea": "Vlak", "PE.Views.Toolbar.textArrangeBack": "Naar achtergrond sturen", "PE.Views.Toolbar.textArrangeBackward": "Naar achteren", "PE.Views.Toolbar.textArrangeForward": "Naar Voren Verplaatsen", "PE.Views.Toolbar.textArrangeFront": "Naar voorgrond brengen", - "PE.Views.Toolbar.textBar": "Staaf", "PE.Views.Toolbar.textBold": "Vet", - "PE.Views.Toolbar.textCharts": "Grafieken", - "PE.Views.Toolbar.textColumn": "Kolom", "PE.Views.Toolbar.textItalic": "Cursief", - "PE.Views.Toolbar.textLine": "Lijn", "PE.Views.Toolbar.textNewColor": "Aangepaste kleur", - "PE.Views.Toolbar.textPie": "Cirkel", - "PE.Views.Toolbar.textPoint": "Spreiding", "PE.Views.Toolbar.textShapeAlignBottom": "Onder uitlijnen", "PE.Views.Toolbar.textShapeAlignCenter": "Midden uitlijnen", "PE.Views.Toolbar.textShapeAlignLeft": "Links uitlijnen", @@ -1402,11 +1395,9 @@ "PE.Views.Toolbar.textShowCurrent": "Vanaf huidige dia tonen", "PE.Views.Toolbar.textShowPresenterView": "Presentatieweergave tonen", "PE.Views.Toolbar.textShowSettings": "Instellingen tonen", - "PE.Views.Toolbar.textStock": "Voorraad", "PE.Views.Toolbar.textStrikeout": "Doorhalen", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "PE.Views.Toolbar.textSurface": "Oppervlak", "PE.Views.Toolbar.textTabCollaboration": "Samenwerking", "PE.Views.Toolbar.textTabFile": "Bestand", "PE.Views.Toolbar.textTabHome": "Home", diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index 0ffa70439..6a052896a 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zamknąć", "Common.Controllers.ExternalDiagramEditor.warningText": "Obiekt jest wyłączony, ponieważ jest edytowany przez innego użytkownika.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Ostrzeżenie", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -598,20 +606,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "PE.Views.ChartSettings.textArea": "Obszar", - "PE.Views.ChartSettings.textBar": "Pasek", "PE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "PE.Views.ChartSettings.textColumn": "Kolumna", "PE.Views.ChartSettings.textEditData": "Edytuj dane", "PE.Views.ChartSettings.textHeight": "Wysokość", "PE.Views.ChartSettings.textKeepRatio": "Stałe proporcje", - "PE.Views.ChartSettings.textLine": "Wykres", - "PE.Views.ChartSettings.textPie": "Kołowe", - "PE.Views.ChartSettings.textPoint": "XY (Punktowy)", "PE.Views.ChartSettings.textSize": "Rozmiar", - "PE.Views.ChartSettings.textStock": "Zbiory", "PE.Views.ChartSettings.textStyle": "Styl", - "PE.Views.ChartSettings.textSurface": "Powierzchnia", "PE.Views.ChartSettings.textWidth": "Szerokość", "PE.Views.ChartSettingsAdvanced.textAlt": "Tekst alternatywny", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Opis", @@ -1236,20 +1236,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Wyrównaj tekst do środka", "PE.Views.Toolbar.textAlignRight": "Wyrównaj tekst do prawej", "PE.Views.Toolbar.textAlignTop": "Wyrównaj tekst do góry", - "PE.Views.Toolbar.textArea": "Obszar", "PE.Views.Toolbar.textArrangeBack": "Wyślij do tła", "PE.Views.Toolbar.textArrangeBackward": "Przenieś do tyłu", "PE.Views.Toolbar.textArrangeForward": "Przenieś do przodu", "PE.Views.Toolbar.textArrangeFront": "Przejdź na pierwszy plan", - "PE.Views.Toolbar.textBar": "Pasek", "PE.Views.Toolbar.textBold": "Pogrubione", - "PE.Views.Toolbar.textCharts": "Wykresy", - "PE.Views.Toolbar.textColumn": "Kolumna", "PE.Views.Toolbar.textItalic": "Kursywa", - "PE.Views.Toolbar.textLine": "Wykres", "PE.Views.Toolbar.textNewColor": "Własny kolor", - "PE.Views.Toolbar.textPie": "Kołowe", - "PE.Views.Toolbar.textPoint": "XY (Punktowy)", "PE.Views.Toolbar.textShapeAlignBottom": "Wyrównaj do dołu", "PE.Views.Toolbar.textShapeAlignCenter": "Wyrównaj do środka", "PE.Views.Toolbar.textShapeAlignLeft": "Wyrównaj do lewej", @@ -1260,11 +1253,9 @@ "PE.Views.Toolbar.textShowCurrent": "Pokaż z aktualnego slajdu", "PE.Views.Toolbar.textShowPresenterView": "Pokaz slajdów w trybie prezentera", "PE.Views.Toolbar.textShowSettings": "Pokaż ustawienia", - "PE.Views.Toolbar.textStock": "Zbiory", "PE.Views.Toolbar.textStrikeout": "Skreślenie", "PE.Views.Toolbar.textSubscript": "Indeks dolny", "PE.Views.Toolbar.textSuperscript": "Indeks górny", - "PE.Views.Toolbar.textSurface": "Powierzchnia", "PE.Views.Toolbar.textTabCollaboration": "Współpraca", "PE.Views.Toolbar.textTabFile": "Plik", "PE.Views.Toolbar.textTabHome": "Narzędzia główne", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index d6895ab0e..bb7dc4ca4 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Fechar", "Common.Controllers.ExternalDiagramEditor.warningText": "O objeto está desabilitado por que está sendo editado por outro usuário.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Aviso", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -597,20 +605,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "PE.Views.ChartSettings.textArea": "Gráfico de área", - "PE.Views.ChartSettings.textBar": "Gráfico de barras", "PE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "PE.Views.ChartSettings.textColumn": "Gráfico de coluna", "PE.Views.ChartSettings.textEditData": "Editar dados", "PE.Views.ChartSettings.textHeight": "Altura", "PE.Views.ChartSettings.textKeepRatio": "Proporções constantes", - "PE.Views.ChartSettings.textLine": "Gráfico de linha", - "PE.Views.ChartSettings.textPie": "Gráfico de pizza", - "PE.Views.ChartSettings.textPoint": "Gráfico de pontos", "PE.Views.ChartSettings.textSize": "Tamanho", - "PE.Views.ChartSettings.textStock": "Gráfico de ações", "PE.Views.ChartSettings.textStyle": "Estilo", - "PE.Views.ChartSettings.textSurface": "Superfície", "PE.Views.ChartSettings.textWidth": "Largura", "PE.Views.ChartSettingsAdvanced.textAlt": "Texto Alternativo", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Descrição", @@ -1235,20 +1235,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Alinhar texto ao meio", "PE.Views.Toolbar.textAlignRight": "Alinhar texto à direita", "PE.Views.Toolbar.textAlignTop": "Alinhar texto à parte superior", - "PE.Views.Toolbar.textArea": "Gráfico de área", "PE.Views.Toolbar.textArrangeBack": "Enviar para plano de fundo", "PE.Views.Toolbar.textArrangeBackward": "Enviar para trás", "PE.Views.Toolbar.textArrangeForward": "Trazer para frente", "PE.Views.Toolbar.textArrangeFront": "Trazer para primeiro plano", - "PE.Views.Toolbar.textBar": "Gráfico de barras", "PE.Views.Toolbar.textBold": "Negrito", - "PE.Views.Toolbar.textCharts": "Gráficos", - "PE.Views.Toolbar.textColumn": "Gráfico de coluna", "PE.Views.Toolbar.textItalic": "Itálico", - "PE.Views.Toolbar.textLine": "Gráfico de linha", "PE.Views.Toolbar.textNewColor": "Cor personalizada", - "PE.Views.Toolbar.textPie": "Gráfico de pizza", - "PE.Views.Toolbar.textPoint": "Gráfico de pontos", "PE.Views.Toolbar.textShapeAlignBottom": "Alinhar à parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinhar ao centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinhar à esquerda", @@ -1259,11 +1252,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mostrar a partir do slide atual", "PE.Views.Toolbar.textShowPresenterView": "Exibir vista de apresentador", "PE.Views.Toolbar.textShowSettings": "Exibir configurações", - "PE.Views.Toolbar.textStock": "Gráfico de ações", "PE.Views.Toolbar.textStrikeout": "Riscado", "PE.Views.Toolbar.textSubscript": "Subscrito", "PE.Views.Toolbar.textSuperscript": "Sobrescrito", - "PE.Views.Toolbar.textSurface": "Superfície", "PE.Views.Toolbar.textTabFile": "Arquivo", "PE.Views.Toolbar.textTabHome": "Página Inicial", "PE.Views.Toolbar.textTabInsert": "Inserir", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index f46f4cf5d..5eb21bc52 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -161,6 +161,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -175,6 +177,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -229,6 +236,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", @@ -269,6 +281,7 @@ "PE.Controllers.Main.errorToken": "Токен безопасности документа имеет неправильный формат.
Пожалуйста, обратитесь к администратору Сервера документов.", "PE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -591,6 +604,7 @@ "PE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 100", "PE.Controllers.Toolbar.textFraction": "Дроби", "PE.Controllers.Toolbar.textFunction": "Функции", + "PE.Controllers.Toolbar.textInsert": "Вставить", "PE.Controllers.Toolbar.textIntegral": "Интегралы", "PE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "PE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -919,20 +933,12 @@ "PE.Controllers.Viewport.textFitPage": "По размеру слайда", "PE.Controllers.Viewport.textFitWidth": "По ширине", "PE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "PE.Views.ChartSettings.textArea": "С областями", - "PE.Views.ChartSettings.textBar": "Линейчатая", "PE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "PE.Views.ChartSettings.textColumn": "Гистограмма", "PE.Views.ChartSettings.textEditData": "Изменить данные", "PE.Views.ChartSettings.textHeight": "Высота", "PE.Views.ChartSettings.textKeepRatio": "Сохранять пропорции", - "PE.Views.ChartSettings.textLine": "График", - "PE.Views.ChartSettings.textPie": "Круговая", - "PE.Views.ChartSettings.textPoint": "Точечная", "PE.Views.ChartSettings.textSize": "Размер", - "PE.Views.ChartSettings.textStock": "Биржевая", "PE.Views.ChartSettings.textStyle": "Стиль", - "PE.Views.ChartSettings.textSurface": "Поверхность", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативный текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Описание", @@ -1679,9 +1685,11 @@ "PE.Views.TextArtSettings.txtPapyrus": "Папирус", "PE.Views.TextArtSettings.txtWood": "Дерево", "PE.Views.Toolbar.capAddSlide": "Добавить слайд", + "PE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "PE.Views.Toolbar.capBtnComment": "Комментарий", "PE.Views.Toolbar.capBtnDateTime": "Дата и время", "PE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", + "PE.Views.Toolbar.capBtnInsSymbol": "Символ", "PE.Views.Toolbar.capBtnSlideNum": "Номер слайда", "PE.Views.Toolbar.capInsertChart": "Диаграмма", "PE.Views.Toolbar.capInsertEquation": "Уравнение", @@ -1707,21 +1715,14 @@ "PE.Views.Toolbar.textAlignMiddle": "Выравнивание текста по середине", "PE.Views.Toolbar.textAlignRight": "Выравнивание текста по правому краю", "PE.Views.Toolbar.textAlignTop": "Выравнивание текста по верхнему краю", - "PE.Views.Toolbar.textArea": "С областями", "PE.Views.Toolbar.textArrangeBack": "Перенести на задний план", "PE.Views.Toolbar.textArrangeBackward": "Перенести назад", "PE.Views.Toolbar.textArrangeForward": "Перенести вперед", "PE.Views.Toolbar.textArrangeFront": "Перенести на передний план", - "PE.Views.Toolbar.textBar": "Линейчатая", "PE.Views.Toolbar.textBold": "Полужирный", - "PE.Views.Toolbar.textCharts": "Диаграммы", - "PE.Views.Toolbar.textColumn": "Гистограмма", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "График", "PE.Views.Toolbar.textListSettings": "Параметры списка", "PE.Views.Toolbar.textNewColor": "Пользовательский цвет", - "PE.Views.Toolbar.textPie": "Круговая", - "PE.Views.Toolbar.textPoint": "Точечная", "PE.Views.Toolbar.textShapeAlignBottom": "Выровнять по нижнему краю", "PE.Views.Toolbar.textShapeAlignCenter": "Выровнять по центру", "PE.Views.Toolbar.textShapeAlignLeft": "Выровнять по левому краю", @@ -1732,11 +1733,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показ слайдов с текущего слайда", "PE.Views.Toolbar.textShowPresenterView": "Показ слайдов в режиме докладчика", "PE.Views.Toolbar.textShowSettings": "Параметры показа слайдов", - "PE.Views.Toolbar.textStock": "Биржевая", "PE.Views.Toolbar.textStrikeout": "Зачеркнутый", "PE.Views.Toolbar.textSubscript": "Подстрочные знаки", "PE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "PE.Views.Toolbar.textSurface": "Поверхность", "PE.Views.Toolbar.textTabCollaboration": "Совместная работа", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "Главная", @@ -1765,6 +1764,7 @@ "PE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку", "PE.Views.Toolbar.tipInsertImage": "Вставить изображение", "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "PE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "PE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "PE.Views.Toolbar.tipInsertText": "Вставить надпись", "PE.Views.Toolbar.tipInsertTextArt": "Вставить объект Text Art", diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 8c61ca126..70b93332a 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zatvoriť", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je blokovaný, pretože ho práve upravuje iný používateľ.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Upozornenie", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -656,20 +664,12 @@ "PE.Controllers.Viewport.textFitPage": "Prispôsobiť snímke", "PE.Controllers.Viewport.textFitWidth": "Prispôsobiť na šírku", "PE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "PE.Views.ChartSettings.textArea": "Plošný graf", - "PE.Views.ChartSettings.textBar": "Vodorovná čiarka", "PE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "PE.Views.ChartSettings.textColumn": "Stĺpec", "PE.Views.ChartSettings.textEditData": "Upravovať dáta", "PE.Views.ChartSettings.textHeight": "Výška", "PE.Views.ChartSettings.textKeepRatio": "Konštantné rozmery", - "PE.Views.ChartSettings.textLine": "Čiara/líniový graf", - "PE.Views.ChartSettings.textPie": "Koláčový graf", - "PE.Views.ChartSettings.textPoint": "Bodový graf", "PE.Views.ChartSettings.textSize": "Veľkosť", - "PE.Views.ChartSettings.textStock": "Akcie/burzový graf", "PE.Views.ChartSettings.textStyle": "Štýl", - "PE.Views.ChartSettings.textSurface": "Povrch", "PE.Views.ChartSettings.textWidth": "Šírka", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatívny text", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Popis", @@ -1311,20 +1311,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Zarovnať text na stred", "PE.Views.Toolbar.textAlignRight": "Zarovnať text doprava", "PE.Views.Toolbar.textAlignTop": "Zarovnať text nahor", - "PE.Views.Toolbar.textArea": "Plošný graf", "PE.Views.Toolbar.textArrangeBack": "Presunúť do pozadia", "PE.Views.Toolbar.textArrangeBackward": "Posunúť späť", "PE.Views.Toolbar.textArrangeForward": "Posunúť vpred", "PE.Views.Toolbar.textArrangeFront": "Premiestniť do popredia", - "PE.Views.Toolbar.textBar": "Pruhový graf", "PE.Views.Toolbar.textBold": "Tučné", - "PE.Views.Toolbar.textCharts": "Grafy", - "PE.Views.Toolbar.textColumn": "Stĺpec", "PE.Views.Toolbar.textItalic": "Kurzíva", - "PE.Views.Toolbar.textLine": "Čiara/líniový graf", "PE.Views.Toolbar.textNewColor": "Vlastná farba", - "PE.Views.Toolbar.textPie": "Koláčový graf", - "PE.Views.Toolbar.textPoint": "Bodový graf", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnať dole", "PE.Views.Toolbar.textShapeAlignCenter": "Centrovať", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnať doľava", @@ -1335,11 +1328,9 @@ "PE.Views.Toolbar.textShowCurrent": "Zobraziť od aktuálnej snímky", "PE.Views.Toolbar.textShowPresenterView": "Zobraziť režim prezentácie", "PE.Views.Toolbar.textShowSettings": "Ukázať Nastavenia", - "PE.Views.Toolbar.textStock": "Akcie/burzový graf", "PE.Views.Toolbar.textStrikeout": "Prečiarknuť", "PE.Views.Toolbar.textSubscript": "Dolný index", "PE.Views.Toolbar.textSuperscript": "Horný index", - "PE.Views.Toolbar.textSurface": "Povrch", "PE.Views.Toolbar.textTabCollaboration": "Spolupráca", "PE.Views.Toolbar.textTabFile": "Súbor", "PE.Views.Toolbar.textTabHome": "Hlavná stránka", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index b7e47dcdb..08bba243c 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -5,6 +5,13 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Zapri", "Common.Controllers.ExternalDiagramEditor.warningText": "Objekt je onemogočen, saj ga ureja drug uporabnik.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Opozorilo", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -203,18 +210,11 @@ "PE.Controllers.Toolbar.textEmptyImgUrl": "Določiti morate URL slike.", "PE.Controllers.Toolbar.textFontSizeErr": "Vnesena vrednost je nepravilna.
Prosim vnesite numerično vrednost med 1 in 100", "PE.Controllers.Toolbar.textWarning": "Opozorilo", - "PE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "PE.Views.ChartSettings.textBar": "Stolpični grafikon", "PE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "PE.Views.ChartSettings.textColumn": "Stolpični grafikon", "PE.Views.ChartSettings.textEditData": "Uredi podatke", "PE.Views.ChartSettings.textHeight": "Višina", "PE.Views.ChartSettings.textKeepRatio": "Nenehna razmerja", - "PE.Views.ChartSettings.textLine": "Vrstični grafikon", - "PE.Views.ChartSettings.textPie": "Tortni grafikon", - "PE.Views.ChartSettings.textPoint": "Točkovni grafikon", "PE.Views.ChartSettings.textSize": "Velikost", - "PE.Views.ChartSettings.textStock": "Založni grafikon", "PE.Views.ChartSettings.textStyle": "Slog", "PE.Views.ChartSettings.textWidth": "Širina", "PE.Views.DocumentHolder.aboveText": "Nad", @@ -698,26 +698,19 @@ "PE.Views.Toolbar.textAlignMiddle": "Besedilo poravnaj na sredino", "PE.Views.Toolbar.textAlignRight": "Uskladi Besedilo Desno", "PE.Views.Toolbar.textAlignTop": "Besedilo poravnaj na vrh", - "PE.Views.Toolbar.textArea": "Ploščinski grafikon", "PE.Views.Toolbar.textArrangeBack": "Pošlji k ozadju", "PE.Views.Toolbar.textArrangeBackward": "Premakni nazaj", "PE.Views.Toolbar.textArrangeForward": "Premakni naprej", "PE.Views.Toolbar.textArrangeFront": "Premakni v ospredje", - "PE.Views.Toolbar.textBar": "Stolpični grafikon", "PE.Views.Toolbar.textBold": "Krepko", - "PE.Views.Toolbar.textColumn": "Stolpični grafikon", "PE.Views.Toolbar.textItalic": "Poševno", - "PE.Views.Toolbar.textLine": "Vrstični grafikon", "PE.Views.Toolbar.textNewColor": "Barva po meri", - "PE.Views.Toolbar.textPie": "Tortni grafikon", - "PE.Views.Toolbar.textPoint": "Točkovni grafikon", "PE.Views.Toolbar.textShapeAlignBottom": "Poravnaj dno", "PE.Views.Toolbar.textShapeAlignCenter": "Poravnaj središče", "PE.Views.Toolbar.textShapeAlignLeft": "Poravnaj levo", "PE.Views.Toolbar.textShapeAlignMiddle": "Poravnaj sredino", "PE.Views.Toolbar.textShapeAlignRight": "Poravnaj desno", "PE.Views.Toolbar.textShapeAlignTop": "Poravnaj vrh", - "PE.Views.Toolbar.textStock": "Založni grafikon", "PE.Views.Toolbar.textStrikeout": "Prečrtaj", "PE.Views.Toolbar.textSubscript": "Pripis", "PE.Views.Toolbar.textSuperscript": "Nadpis", diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index a0d02a2db..7f3c44ef6 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Kapat", "Common.Controllers.ExternalDiagramEditor.warningText": "Obje devre dışı bırakıldı, çünkü başka kullanıcı tarafından düzenleniyor.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Dikkat", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -624,20 +632,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Gelişmiş Ayarları Göster", - "PE.Views.ChartSettings.textArea": "Bölge Grafiği", - "PE.Views.ChartSettings.textBar": "Çubuk grafik", "PE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "PE.Views.ChartSettings.textColumn": "Sütun grafik", "PE.Views.ChartSettings.textEditData": "Veri düzenle", "PE.Views.ChartSettings.textHeight": "Yükseklik", "PE.Views.ChartSettings.textKeepRatio": "Sabit Orantılar", - "PE.Views.ChartSettings.textLine": "Çizgi grafiği", - "PE.Views.ChartSettings.textPie": "Dilim grafik", - "PE.Views.ChartSettings.textPoint": "Nokta grafiği", "PE.Views.ChartSettings.textSize": "Boyut", - "PE.Views.ChartSettings.textStock": "Stok Grafiği", "PE.Views.ChartSettings.textStyle": "Stil", - "PE.Views.ChartSettings.textSurface": "Yüzey", "PE.Views.ChartSettings.textWidth": "Genişlik", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternatif Metin", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Açıklama", @@ -1267,20 +1267,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Metni ortaya hizala", "PE.Views.Toolbar.textAlignRight": "Metni Sağa Hizala", "PE.Views.Toolbar.textAlignTop": "Metni yukarı hizala", - "PE.Views.Toolbar.textArea": "Bölge Grafiği", "PE.Views.Toolbar.textArrangeBack": "Arkaplana gönder", "PE.Views.Toolbar.textArrangeBackward": "Geri Gönder", "PE.Views.Toolbar.textArrangeForward": "İleri Taşı", "PE.Views.Toolbar.textArrangeFront": "Önplana Getir", - "PE.Views.Toolbar.textBar": "Çubuk grafik", "PE.Views.Toolbar.textBold": "Kalın", - "PE.Views.Toolbar.textCharts": "Grafikler", - "PE.Views.Toolbar.textColumn": "Sütun grafik", "PE.Views.Toolbar.textItalic": "İtalik", - "PE.Views.Toolbar.textLine": "Çizgi grafiği", "PE.Views.Toolbar.textNewColor": "Özel Renk", - "PE.Views.Toolbar.textPie": "Dilim grafik", - "PE.Views.Toolbar.textPoint": "Nokta grafiği", "PE.Views.Toolbar.textShapeAlignBottom": "Alta Hizala", "PE.Views.Toolbar.textShapeAlignCenter": "Ortaya Hizala", "PE.Views.Toolbar.textShapeAlignLeft": "Sola Hizala", @@ -1291,11 +1284,9 @@ "PE.Views.Toolbar.textShowCurrent": "Mevcut slayttan itibaren göster", "PE.Views.Toolbar.textShowPresenterView": "Sunucu görünümüne geç", "PE.Views.Toolbar.textShowSettings": "Ayarları göster", - "PE.Views.Toolbar.textStock": "Stok Grafiği", "PE.Views.Toolbar.textStrikeout": "Üstü çizili", "PE.Views.Toolbar.textSubscript": "Altsimge", "PE.Views.Toolbar.textSuperscript": "Üstsimge", - "PE.Views.Toolbar.textSurface": "Yüzey", "PE.Views.Toolbar.textTabFile": "Dosya", "PE.Views.Toolbar.textTabHome": "Ana Sayfa", "PE.Views.Toolbar.textTabInsert": "Ekle", diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index 988def4f7..d6bdd1098 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Закрити", "Common.Controllers.ExternalDiagramEditor.warningText": "Об'єкт вимкнено, оскільки його редагує інший користувач.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Застереження", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -600,20 +608,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "ксі", "PE.Controllers.Toolbar.txtSymbol_zeta": "Зета", "PE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "PE.Views.ChartSettings.textArea": "Площа", - "PE.Views.ChartSettings.textBar": "Вставити", "PE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "PE.Views.ChartSettings.textColumn": "Колона", "PE.Views.ChartSettings.textEditData": "Редагувати дату", "PE.Views.ChartSettings.textHeight": "Висота", "PE.Views.ChartSettings.textKeepRatio": "Сталі пропорції", - "PE.Views.ChartSettings.textLine": "Лінія", - "PE.Views.ChartSettings.textPie": "Пиріг", - "PE.Views.ChartSettings.textPoint": "XY (розсіювання)", "PE.Views.ChartSettings.textSize": "Розмір", - "PE.Views.ChartSettings.textStock": "Запас", "PE.Views.ChartSettings.textStyle": "Стиль", - "PE.Views.ChartSettings.textSurface": "Поверхня", "PE.Views.ChartSettings.textWidth": "Ширина", "PE.Views.ChartSettingsAdvanced.textAlt": "Альтернативний текст", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Опис", @@ -1248,20 +1248,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Вирівняти текст по центру", "PE.Views.Toolbar.textAlignRight": "Вирівняти текст праворуч", "PE.Views.Toolbar.textAlignTop": "Вирівняти текст догори", - "PE.Views.Toolbar.textArea": "Площа", "PE.Views.Toolbar.textArrangeBack": "Надіслати до фону", "PE.Views.Toolbar.textArrangeBackward": "Відправити назад", "PE.Views.Toolbar.textArrangeForward": "Висувати", "PE.Views.Toolbar.textArrangeFront": "Перенести на передній план", - "PE.Views.Toolbar.textBar": "Вставити", "PE.Views.Toolbar.textBold": "Жирний", - "PE.Views.Toolbar.textCharts": "Діаграми", - "PE.Views.Toolbar.textColumn": "Колона", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textLine": "Лінія", "PE.Views.Toolbar.textNewColor": "Власний колір", - "PE.Views.Toolbar.textPie": "Пиріг", - "PE.Views.Toolbar.textPoint": "XY (розсіювання)", "PE.Views.Toolbar.textShapeAlignBottom": "Вирівняти знизу", "PE.Views.Toolbar.textShapeAlignCenter": "Вирівняти центр", "PE.Views.Toolbar.textShapeAlignLeft": "Вирівняти зліва", @@ -1272,11 +1265,9 @@ "PE.Views.Toolbar.textShowCurrent": "Показати з поточного слайда", "PE.Views.Toolbar.textShowPresenterView": "Показати представлення провідника", "PE.Views.Toolbar.textShowSettings": "Показати налаштування", - "PE.Views.Toolbar.textStock": "Запас", "PE.Views.Toolbar.textStrikeout": "Викреслити", "PE.Views.Toolbar.textSubscript": "Підрядковий", "PE.Views.Toolbar.textSuperscript": "Надрядковий", - "PE.Views.Toolbar.textSurface": "Поверхня", "PE.Views.Toolbar.textTabCollaboration": "Співпраця", "PE.Views.Toolbar.textTabFile": "Файл", "PE.Views.Toolbar.textTabHome": "Домашній", diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index eaf2505f7..2303cfeb3 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Đóng", "Common.Controllers.ExternalDiagramEditor.warningText": "Đối tượng bị vô hiệu vì nó đang được chỉnh sửa bởi một người dùng khác.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Cảnh báo", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -597,20 +605,12 @@ "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", "PE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "PE.Views.ChartSettings.textArea": "Vùng", - "PE.Views.ChartSettings.textBar": "Cột", "PE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "PE.Views.ChartSettings.textColumn": "Cột", "PE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu", "PE.Views.ChartSettings.textHeight": "Chiều cao", "PE.Views.ChartSettings.textKeepRatio": "Tỷ lệ không đổi", - "PE.Views.ChartSettings.textLine": "Đường kẻ", - "PE.Views.ChartSettings.textPie": "Hình bánh", - "PE.Views.ChartSettings.textPoint": "XY (Phân tán)", "PE.Views.ChartSettings.textSize": "Kích thước", - "PE.Views.ChartSettings.textStock": "Cổ phiếu", "PE.Views.ChartSettings.textStyle": "Kiểu", - "PE.Views.ChartSettings.textSurface": "Bề mặt", "PE.Views.ChartSettings.textWidth": "Chiều rộng", "PE.Views.ChartSettingsAdvanced.textAlt": "Văn bản thay thế", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Mô tả", @@ -1235,20 +1235,13 @@ "PE.Views.Toolbar.textAlignMiddle": "Căn chỉnh văn bản vào giữa", "PE.Views.Toolbar.textAlignRight": "Căn chỉnh văn bản sang phải", "PE.Views.Toolbar.textAlignTop": "Căn chỉnh văn bản lên trên cùng", - "PE.Views.Toolbar.textArea": "Vùng", "PE.Views.Toolbar.textArrangeBack": "Gửi tới Nền", "PE.Views.Toolbar.textArrangeBackward": "Gửi về phía sau", "PE.Views.Toolbar.textArrangeForward": "Di chuyển tiến lên", "PE.Views.Toolbar.textArrangeFront": "Đưa lên Cận cảnh", - "PE.Views.Toolbar.textBar": "Cột", "PE.Views.Toolbar.textBold": "Đậm", - "PE.Views.Toolbar.textCharts": "Biểu đồ", - "PE.Views.Toolbar.textColumn": "Cột", "PE.Views.Toolbar.textItalic": "Nghiêng", - "PE.Views.Toolbar.textLine": "Đường kẻ", "PE.Views.Toolbar.textNewColor": "Màu tùy chỉnh", - "PE.Views.Toolbar.textPie": "Hình bánh", - "PE.Views.Toolbar.textPoint": "XY (Phân tán)", "PE.Views.Toolbar.textShapeAlignBottom": "Căn dưới cùng", "PE.Views.Toolbar.textShapeAlignCenter": "Căn trung tâm", "PE.Views.Toolbar.textShapeAlignLeft": "Căn trái", @@ -1259,11 +1252,9 @@ "PE.Views.Toolbar.textShowCurrent": "Hiển thị từ slide Hiện tại", "PE.Views.Toolbar.textShowPresenterView": "Hiển thị presenter view", "PE.Views.Toolbar.textShowSettings": "Hiển thị cài đặt", - "PE.Views.Toolbar.textStock": "Cổ phiếu", "PE.Views.Toolbar.textStrikeout": "Gạch bỏ", "PE.Views.Toolbar.textSubscript": "Chỉ số dưới", "PE.Views.Toolbar.textSuperscript": "Chỉ số trên", - "PE.Views.Toolbar.textSurface": "Bề mặt", "PE.Views.Toolbar.textTabFile": "File", "PE.Views.Toolbar.textTabHome": "Trang chủ", "PE.Views.Toolbar.textTabInsert": "Chèn", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 59de74f48..d937626fe 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -5,6 +5,14 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "关闭", "Common.Controllers.ExternalDiagramEditor.warningText": "该对象被禁用，因为它被另一个用户编辑。", "Common.Controllers.ExternalDiagramEditor.warningTitle": "警告", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -901,20 +909,12 @@ "PE.Controllers.Viewport.textFitPage": "适合幻灯片", "PE.Controllers.Viewport.textFitWidth": "适合宽度", "PE.Views.ChartSettings.textAdvanced": "显示高级设置", - "PE.Views.ChartSettings.textArea": "区域", - "PE.Views.ChartSettings.textBar": "条", "PE.Views.ChartSettings.textChartType": "更改图表类型", - "PE.Views.ChartSettings.textColumn": "列", "PE.Views.ChartSettings.textEditData": "编辑数据", "PE.Views.ChartSettings.textHeight": "高度", "PE.Views.ChartSettings.textKeepRatio": "不变比例", - "PE.Views.ChartSettings.textLine": "线", - "PE.Views.ChartSettings.textPie": "派", - "PE.Views.ChartSettings.textPoint": "XY（散射）", "PE.Views.ChartSettings.textSize": "大小", - "PE.Views.ChartSettings.textStock": "股票", "PE.Views.ChartSettings.textStyle": "类型", - "PE.Views.ChartSettings.textSurface": "平面", "PE.Views.ChartSettings.textWidth": "宽度", "PE.Views.ChartSettingsAdvanced.textAlt": "可选文本", "PE.Views.ChartSettingsAdvanced.textAltDescription": "描述", @@ -1622,20 +1622,13 @@ "PE.Views.Toolbar.textAlignMiddle": "将文本对齐到底部", "PE.Views.Toolbar.textAlignRight": "对齐文本", "PE.Views.Toolbar.textAlignTop": "将文本对齐到顶部", - "PE.Views.Toolbar.textArea": "区域", "PE.Views.Toolbar.textArrangeBack": "发送到背景", "PE.Views.Toolbar.textArrangeBackward": "向后移动", "PE.Views.Toolbar.textArrangeForward": "向前移动", "PE.Views.Toolbar.textArrangeFront": "放到最上面", - "PE.Views.Toolbar.textBar": "条", "PE.Views.Toolbar.textBold": "加粗", - "PE.Views.Toolbar.textCharts": "图表", - "PE.Views.Toolbar.textColumn": "列", "PE.Views.Toolbar.textItalic": "斜体", - "PE.Views.Toolbar.textLine": "线", "PE.Views.Toolbar.textNewColor": "自定义颜色", - "PE.Views.Toolbar.textPie": "派", - "PE.Views.Toolbar.textPoint": "XY（散射）", "PE.Views.Toolbar.textShapeAlignBottom": "底部对齐", "PE.Views.Toolbar.textShapeAlignCenter": "居中对齐", "PE.Views.Toolbar.textShapeAlignLeft": "左对齐", @@ -1646,11 +1639,9 @@ "PE.Views.Toolbar.textShowCurrent": "从当前幻灯片展示", "PE.Views.Toolbar.textShowPresenterView": "显示演示者视图", "PE.Views.Toolbar.textShowSettings": "显示设置", - "PE.Views.Toolbar.textStock": "股票", "PE.Views.Toolbar.textStrikeout": "加删除线", "PE.Views.Toolbar.textSubscript": "下标", "PE.Views.Toolbar.textSuperscript": "上标", - "PE.Views.Toolbar.textSurface": "平面", "PE.Views.Toolbar.textTabCollaboration": "协作", "PE.Views.Toolbar.textTabFile": "文件", "PE.Views.Toolbar.textTabHome": "主页", diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index f5d0d07b4..1d0843128 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -2,6 +2,19 @@ "cancelButtonText": "Отказ", "Common.Controllers.Chat.notcriticalErrorTitle": "Внимание", "Common.Controllers.Chat.textEnterMessage": "Въведете съобщението си тук", + "Common.define.chartData.textArea": "Площ", + "Common.define.chartData.textBar": "Бар", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Линия", + "Common.define.chartData.textPie": "Кръгова", + "Common.define.chartData.textPoint": "XY (точкова)", + "Common.define.chartData.textStock": "Борсова", + "Common.define.chartData.textSurface": "Повърхност", + "Common.define.chartData.textCharts": "Диаграми", + "Common.define.chartData.textSparks": "Блещукащи", + "Common.define.chartData.textColumnSpark": "Колона", + "Common.define.chartData.textLineSpark": "Линия", + "Common.define.chartData.textWinLossSpark": "Печалба/Загуба", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1128,36 +1141,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Цвят", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Показване на разширените настройки", - "SSE.Views.ChartSettings.textArea": "Площ", - "SSE.Views.ChartSettings.textBar": "Бар", "SSE.Views.ChartSettings.textBorderSizeErr": "Въведената стойност е неправилна.
Въведете стойност между 0 pt и 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Промяна на типа на диаграмата", - "SSE.Views.ChartSettings.textColumn": "Колона", - "SSE.Views.ChartSettings.textColumnSpark": "Колона", "SSE.Views.ChartSettings.textEditData": "Редактиране на данни и местоположение", "SSE.Views.ChartSettings.textFirstPoint": "Първа точка", "SSE.Views.ChartSettings.textHeight": "Височина", "SSE.Views.ChartSettings.textHighPoint": "Висока точка", "SSE.Views.ChartSettings.textKeepRatio": "Постоянни пропорции", "SSE.Views.ChartSettings.textLastPoint": "Последна точка", - "SSE.Views.ChartSettings.textLine": "Линия", - "SSE.Views.ChartSettings.textLineSpark": "Линия", "SSE.Views.ChartSettings.textLowPoint": "Ниска точка", "SSE.Views.ChartSettings.textMarkers": "Маркери", "SSE.Views.ChartSettings.textNegativePoint": "Отрицателна точка", "SSE.Views.ChartSettings.textNewColor": "Нов потребителски цвят", - "SSE.Views.ChartSettings.textPie": "Кръгова", - "SSE.Views.ChartSettings.textPoint": "XY (точкова)", "SSE.Views.ChartSettings.textRanges": "Диапазон на данните", "SSE.Views.ChartSettings.textSelectData": "Изберете данни", "SSE.Views.ChartSettings.textShow": "Покажи", "SSE.Views.ChartSettings.textSize": "Размер", - "SSE.Views.ChartSettings.textStock": "Борсова", "SSE.Views.ChartSettings.textStyle": "Стил", - "SSE.Views.ChartSettings.textSurface": "Повърхност", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Печалба/Загуба", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ГРЕШКА! Максималният брой точки в серия на графиката е 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "Максимален брой поредици данни за диаграма е 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Неправилен ред на ред. За изграждане на борсова карта поставете данните на листа в следния ред:
цена на отваряне, максимална цена, мин. цена, цена на затваряне.", @@ -1165,14 +1167,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Описание", "SSE.Views.ChartSettingsDlg.textAltTip": "Алтернативното текстово представяне на визуалната информация за обекта, което ще бъде прочетено на хората с визуални или когнитивни увреждания, за да им помогне да разберат по-добре каква информация има в изображението, автосистемата, диаграмата или таблицата.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Заглавие", - "SSE.Views.ChartSettingsDlg.textArea": "Площ", "SSE.Views.ChartSettingsDlg.textAuto": "Автоматичен", "SSE.Views.ChartSettingsDlg.textAutoEach": "Авто за всеки", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Ос Кръстове", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Опции за ос", "SSE.Views.ChartSettingsDlg.textAxisPos": "Позиция на ос", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Настройки на ос", - "SSE.Views.ChartSettingsDlg.textBar": "Бар", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Между отметки с отметки", "SSE.Views.ChartSettingsDlg.textBillions": "Милиарди", "SSE.Views.ChartSettingsDlg.textBottom": "Отдоло", @@ -1180,8 +1180,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Център", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Елементи на диаграмата &
Легенда на диаграмата", "SSE.Views.ChartSettingsDlg.textChartTitle": "Заглавие на диаграмата", - "SSE.Views.ChartSettingsDlg.textColumn": "Колона", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Колона", "SSE.Views.ChartSettingsDlg.textCross": "Крос", "SSE.Views.ChartSettingsDlg.textCustom": "Персонализиран", "SSE.Views.ChartSettingsDlg.textDataColumns": "в колони", @@ -1222,9 +1220,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Легенда", "SSE.Views.ChartSettingsDlg.textLegendRight": "Прав", "SSE.Views.ChartSettingsDlg.textLegendTop": "Отгоре", - "SSE.Views.ChartSettingsDlg.textLine": "Графика на линията", "SSE.Views.ChartSettingsDlg.textLines": "Линии", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Линия", "SSE.Views.ChartSettingsDlg.textLocationRange": "Обхват на местоположението", "SSE.Views.ChartSettingsDlg.textLow": "Нисък", "SSE.Views.ChartSettingsDlg.textMajor": "Голям", @@ -1245,8 +1241,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "От", "SSE.Views.ChartSettingsDlg.textOuterTop": "Външен връх", "SSE.Views.ChartSettingsDlg.textOverlay": "Настилка", - "SSE.Views.ChartSettingsDlg.textPie": "Кръгова", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (точкова)", "SSE.Views.ChartSettingsDlg.textReverse": "Стойности в обратен ред", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Обратен ред", "SSE.Views.ChartSettingsDlg.textRight": "Прав", @@ -1267,10 +1261,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Единична Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Гладък", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Спарклайн диапазони", - "SSE.Views.ChartSettingsDlg.textStock": "Борсова", "SSE.Views.ChartSettingsDlg.textStraight": "Направо", "SSE.Views.ChartSettingsDlg.textStyle": "Стил", - "SSE.Views.ChartSettingsDlg.textSurface": "Повърхност", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Хиляди", @@ -1287,7 +1279,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикална ос", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикални решетки", "SSE.Views.ChartSettingsDlg.textVertTitle": "Заглавие на вертикалната ос", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Печалба/Загуба", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Заглавие на ос", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Заглавие на ос", "SSE.Views.ChartSettingsDlg.textZero": "Нула", @@ -2050,19 +2041,14 @@ "SSE.Views.Toolbar.textAlignRight": "Подравняване надясно", "SSE.Views.Toolbar.textAlignTop": "Подравняване отгоре", "SSE.Views.Toolbar.textAllBorders": "Всички граници", - "SSE.Views.Toolbar.textArea": "Площ", - "SSE.Views.Toolbar.textBar": "Бар", "SSE.Views.Toolbar.textBold": "Получер", "SSE.Views.Toolbar.textBordersColor": "Цвят на границата", "SSE.Views.Toolbar.textBordersStyle": "Стил на границата", "SSE.Views.Toolbar.textBottom": "Отдоло:", "SSE.Views.Toolbar.textBottomBorders": "Долни граници", "SSE.Views.Toolbar.textCenterBorders": "Вътрешни вертикални граници", - "SSE.Views.Toolbar.textCharts": "Диаграми", "SSE.Views.Toolbar.textClearPrintArea": "Изчистване на зоната за печат", "SSE.Views.Toolbar.textClockwise": "Ъгъл по часовниковата стрелка", - "SSE.Views.Toolbar.textColumn": "Колона", - "SSE.Views.Toolbar.textColumnSpark": "Колона", "SSE.Views.Toolbar.textCounterCw": "Ъгъл обратно на часовниковата стрелка", "SSE.Views.Toolbar.textDelLeft": "Преместване на клетките вляво", "SSE.Views.Toolbar.textDelUp": "Преместете клетки нагоре", @@ -2078,8 +2064,6 @@ "SSE.Views.Toolbar.textLandscape": "Пейзаж", "SSE.Views.Toolbar.textLeft": "Наляво:", "SSE.Views.Toolbar.textLeftBorders": "Ляви граници", - "SSE.Views.Toolbar.textLine": "Линия", - "SSE.Views.Toolbar.textLineSpark": "Линия", "SSE.Views.Toolbar.textMarginsLast": "Последно персонализирано", "SSE.Views.Toolbar.textMarginsNarrow": "Тесен", "SSE.Views.Toolbar.textMarginsNormal": "Нормален", @@ -2090,8 +2074,6 @@ "SSE.Views.Toolbar.textNoBorders": "Няма граници", "SSE.Views.Toolbar.textOutBorders": "Външни граници", "SSE.Views.Toolbar.textPageMarginsCustom": "Персонализирани полета", - "SSE.Views.Toolbar.textPie": "Кръгова", - "SSE.Views.Toolbar.textPoint": "XY (точкова)", "SSE.Views.Toolbar.textPortrait": "Портрет", "SSE.Views.Toolbar.textPrint": "Печат", "SSE.Views.Toolbar.textPrintOptions": "Настройки за печат", @@ -2100,13 +2082,10 @@ "SSE.Views.Toolbar.textRotateDown": "Завъртете текста надолу", "SSE.Views.Toolbar.textRotateUp": "Завъртете текста нагоре", "SSE.Views.Toolbar.textSetPrintArea": "Задайте област на печат", - "SSE.Views.Toolbar.textSparks": "Блещукащи", - "SSE.Views.Toolbar.textStock": "Борсова", "SSE.Views.Toolbar.textStrikeout": "Зачеркнат", "SSE.Views.Toolbar.textSubscript": "Долен", "SSE.Views.Toolbar.textSubSuperscript": "Долен / Горен индекс", "SSE.Views.Toolbar.textSuperscript": "Горен индекс", - "SSE.Views.Toolbar.textSurface": "Повърхност", "SSE.Views.Toolbar.textTabCollaboration": "Сътрудничество", "SSE.Views.Toolbar.textTabFile": "досие", "SSE.Views.Toolbar.textTabHome": "У дома", @@ -2116,7 +2095,6 @@ "SSE.Views.Toolbar.textTop": "Връх:", "SSE.Views.Toolbar.textTopBorders": "Топ граници", "SSE.Views.Toolbar.textUnderline": "Подчертавам", - "SSE.Views.Toolbar.textWinLossSpark": "Печалба/Загуба", "SSE.Views.Toolbar.textZoom": "Мащаб", "SSE.Views.Toolbar.tipAlignBottom": "Подравняване отдолу", "SSE.Views.Toolbar.tipAlignCenter": "Подравняване на центъра", diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 59d987622..bc1b55523 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -2,6 +2,18 @@ "cancelButtonText": "Zrušit", "Common.Controllers.Chat.notcriticalErrorTitle": "Varování", "Common.Controllers.Chat.textEnterMessage": "Zde napište svou zprávu", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Sloupcový graf", + "Common.define.chartData.textLine": "Liniový graf", + "Common.define.chartData.textPie": "Kruhový diagram", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Burzovní graf", + "Common.define.chartData.textSurface": "Povrch", + "Common.define.chartData.textColumnSpark": "Sloupec", + "Common.define.chartData.textLineSpark": "Čára", + "Common.define.chartData.textWinLossSpark": "Zisk/Ztráta ", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -780,50 +792,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Barva", "SSE.Views.ChartSettings.strTemplate": "Šablona", "SSE.Views.ChartSettings.textAdvanced": "Zobrazit pokročilé nastavení", - "SSE.Views.ChartSettings.textArea": "Plošný graf", - "SSE.Views.ChartSettings.textBar": "Vodorovná čárka", "SSE.Views.ChartSettings.textBorderSizeErr": "Zadaná hodnota není správná.
Zadejte prosím hodnotu mezi 0 a 1584.", "SSE.Views.ChartSettings.textChartType": "Změnit typ grafu", - "SSE.Views.ChartSettings.textColumn": "Sloupec", - "SSE.Views.ChartSettings.textColumnSpark": "Sloupec", "SSE.Views.ChartSettings.textEditData": "Upravit data a umístění", "SSE.Views.ChartSettings.textFirstPoint": "První bod", "SSE.Views.ChartSettings.textHeight": "Výška", "SSE.Views.ChartSettings.textHighPoint": "Vysoký bod", "SSE.Views.ChartSettings.textKeepRatio": "Konstantní rozměry", "SSE.Views.ChartSettings.textLastPoint": "Poslední bod", - "SSE.Views.ChartSettings.textLine": "Čára", - "SSE.Views.ChartSettings.textLineSpark": "Čára", "SSE.Views.ChartSettings.textLowPoint": "Nízký bod", "SSE.Views.ChartSettings.textMarkers": "Značky", "SSE.Views.ChartSettings.textNegativePoint": "Záporný bod", "SSE.Views.ChartSettings.textNewColor": "Přidat novou vlastní barvu", - "SSE.Views.ChartSettings.textPie": "Kruhový diagram", - "SSE.Views.ChartSettings.textPoint": "Bodový graf", "SSE.Views.ChartSettings.textRanges": "Rozsah dat", "SSE.Views.ChartSettings.textSelectData": "Vybrat data", "SSE.Views.ChartSettings.textShow": "Zobrazit", "SSE.Views.ChartSettings.textSize": "Velikost", - "SSE.Views.ChartSettings.textStock": "Akcie", "SSE.Views.ChartSettings.textStyle": "Styl", - "SSE.Views.ChartSettings.textSurface": "Povrch", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Šířka", - "SSE.Views.ChartSettings.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.ChartSettingsDlg.errorMaxRows": "CHYBA! Maximální počet datových řad na grafu je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nespravné pořadí řádků. Chcete-li vytvořit burzovní graf umístěte data na list v následujícím pořadí:
otevírací cena, maximální cena, minimální cena, uzavírací cena.", "SSE.Views.ChartSettingsDlg.textAlt": "Alternativní text", "SSE.Views.ChartSettingsDlg.textAltDescription": "Popis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternativní textová reprezentace informací vizuálního objektu, která bude čtena lidem se zrakovým nebo kognitivním postižením, aby jim pomohla lépe porozumět informacím, které se nacházejí v obrázku, automatickém tvarování, grafu nebo v tabulce.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Název", - "SSE.Views.ChartSettingsDlg.textArea": "Plošný graf", "SSE.Views.ChartSettingsDlg.textAuto": "Automaticky", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automaticky pro každý", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Křížení os", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti os", "SSE.Views.ChartSettingsDlg.textAxisPos": "Umístění osy", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Pruhový graf", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Mezi značkami", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dole", @@ -831,8 +830,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Střed", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Prvky grafu a
Legenda grafu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Nadpis grafu", - "SSE.Views.ChartSettingsDlg.textColumn": "Sloupcový graf", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Sloupec", "SSE.Views.ChartSettingsDlg.textCross": "Kříž", "SSE.Views.ChartSettingsDlg.textCustom": "Vlastní", "SSE.Views.ChartSettingsDlg.textDataColumns": "ve sloupcích", @@ -873,9 +870,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Vpravo", "SSE.Views.ChartSettingsDlg.textLegendTop": "Nahoře", - "SSE.Views.ChartSettingsDlg.textLine": "Liniový graf", "SSE.Views.ChartSettingsDlg.textLines": "Čáry", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Čára", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rozsah umístění", "SSE.Views.ChartSettingsDlg.textLow": "Nízko", "SSE.Views.ChartSettingsDlg.textMajor": "Hlavní", @@ -896,8 +891,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Vně", "SSE.Views.ChartSettingsDlg.textOuterTop": "Vně nahoře", "SSE.Views.ChartSettingsDlg.textOverlay": "Překrytí", - "SSE.Views.ChartSettingsDlg.textPie": "Kruhový diagram", - "SSE.Views.ChartSettingsDlg.textPoint": "Bodový graf", "SSE.Views.ChartSettingsDlg.textReverse": "Hodnoty v obráceném pořádí", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Obrácené pořadí", "SSE.Views.ChartSettingsDlg.textRight": "Vpravo", @@ -918,10 +911,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Jednoduchý Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Plynulé", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Rozsahy Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Burzovní graf", "SSE.Views.ChartSettingsDlg.textStraight": "Rovné", "SSE.Views.ChartSettingsDlg.textStyle": "Styl", - "SSE.Views.ChartSettingsDlg.textSurface": "Povrch", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tisíce", @@ -938,7 +929,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Svislá osa", "SSE.Views.ChartSettingsDlg.textVertGrid": "Svislá mřížka", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titulek svislé osy", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titulek osy x", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titulek osy y", "SSE.Views.ChartSettingsDlg.textZero": "Nula", @@ -1521,17 +1511,12 @@ "SSE.Views.Toolbar.textAlignRight": "Zarovnat vpravo", "SSE.Views.Toolbar.textAlignTop": "Zarovnat nahoru", "SSE.Views.Toolbar.textAllBorders": "Všechny ohraničení", - "SSE.Views.Toolbar.textArea": "Plošný graf", - "SSE.Views.Toolbar.textBar": "Vodorovná čárka", "SSE.Views.Toolbar.textBold": "Tučně", "SSE.Views.Toolbar.textBordersColor": "Barva ohraničení", "SSE.Views.Toolbar.textBordersStyle": "Styl ohraničení", "SSE.Views.Toolbar.textBottomBorders": "Spodní ohraničení", "SSE.Views.Toolbar.textCenterBorders": "Vnitřní svislé ohraničení", - "SSE.Views.Toolbar.textCharts": "Grafy", "SSE.Views.Toolbar.textClockwise": "Otočit ve směru hodinových ručiček", - "SSE.Views.Toolbar.textColumn": "Sloupec", - "SSE.Views.Toolbar.textColumnSpark": "Sloupec", "SSE.Views.Toolbar.textCounterCw": "Otočit proti směru hodinových ručiček", "SSE.Views.Toolbar.textDelLeft": "Posunout buňky vlevo", "SSE.Views.Toolbar.textDelUp": "Posunout buňky nahoru", @@ -1545,29 +1530,21 @@ "SSE.Views.Toolbar.textInsRight": "Posunout buňky vpravo", "SSE.Views.Toolbar.textItalic": "Kurzíva", "SSE.Views.Toolbar.textLeftBorders": "Levé ohraničení", - "SSE.Views.Toolbar.textLine": "Čára", - "SSE.Views.Toolbar.textLineSpark": "Čára", "SSE.Views.Toolbar.textMiddleBorders": "Vnitřní horizontální ohraničení", "SSE.Views.Toolbar.textMoreFormats": "Více formátů", "SSE.Views.Toolbar.textNewColor": "Přidat novou vlastní barvu", "SSE.Views.Toolbar.textNoBorders": "Bez ohraničení", "SSE.Views.Toolbar.textOutBorders": "Vnější ohraničení", - "SSE.Views.Toolbar.textPie": "Kruhový diagram", - "SSE.Views.Toolbar.textPoint": "Bodový graf", "SSE.Views.Toolbar.textPrint": "Tisk", "SSE.Views.Toolbar.textPrintOptions": "Nastavení tisku", "SSE.Views.Toolbar.textRightBorders": "Pravé ohraničení", "SSE.Views.Toolbar.textRotateDown": "Otočit text dolů", "SSE.Views.Toolbar.textRotateUp": "Otočit text nahoru", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Burzovní graf", - "SSE.Views.Toolbar.textSurface": "Povrch", "SSE.Views.Toolbar.textTabFile": "Soubor", "SSE.Views.Toolbar.textTabHome": "Domů", "SSE.Views.Toolbar.textTabInsert": "Vložit", "SSE.Views.Toolbar.textTopBorders": "Horní ohraničení", "SSE.Views.Toolbar.textUnderline": "Podtržení", - "SSE.Views.Toolbar.textWinLossSpark": "Zisk/Ztráta ", "SSE.Views.Toolbar.textZoom": "Přiblížit", "SSE.Views.Toolbar.tipAlignBottom": "Zarovnat dolů", "SSE.Views.Toolbar.tipAlignCenter": "Zarovnat na střed", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 5feab7090..8b1b79928 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -11,6 +11,10 @@ "Common.define.chartData.textPoint": "Punkt (XY)", "Common.define.chartData.textStock": "Kurs", "Common.define.chartData.textSurface": "Oberfläche", + "Common.define.chartData.textWinLossSpark": "Gewinn/Verlust", + "Common.define.chartData.textColumnSpark": "Spalte", + "Common.define.chartData.textLineSpark": "Linie", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1150,36 +1154,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Farbe", "SSE.Views.ChartSettings.strTemplate": "Vorlage", "SSE.Views.ChartSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", - "SSE.Views.ChartSettings.textArea": "Fläche", - "SSE.Views.ChartSettings.textBar": "Balken", "SSE.Views.ChartSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.
Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.", "SSE.Views.ChartSettings.textChartType": "Diagrammtyp ändern", - "SSE.Views.ChartSettings.textColumn": "Säule", - "SSE.Views.ChartSettings.textColumnSpark": "Spalte", "SSE.Views.ChartSettings.textEditData": "Daten und Standort ändern", "SSE.Views.ChartSettings.textFirstPoint": "Erster Punkt", "SSE.Views.ChartSettings.textHeight": "Höhe", "SSE.Views.ChartSettings.textHighPoint": "Höchstpunkt", "SSE.Views.ChartSettings.textKeepRatio": "Seitenverhältnis beibehalten", "SSE.Views.ChartSettings.textLastPoint": "Letzter Punkt", - "SSE.Views.ChartSettings.textLine": "Linie", - "SSE.Views.ChartSettings.textLineSpark": "Linie", "SSE.Views.ChartSettings.textLowPoint": "Tiefpunkt", "SSE.Views.ChartSettings.textMarkers": "Markierungen", "SSE.Views.ChartSettings.textNegativePoint": "Negativpunkt", "SSE.Views.ChartSettings.textNewColor": "Benutzerdefinierte Farbe", - "SSE.Views.ChartSettings.textPie": "Kreis", - "SSE.Views.ChartSettings.textPoint": "Punkt (XY)", "SSE.Views.ChartSettings.textRanges": "Datenbereich", "SSE.Views.ChartSettings.textSelectData": "Daten auswählen", "SSE.Views.ChartSettings.textShow": "Anzeigen", "SSE.Views.ChartSettings.textSize": "Größe", - "SSE.Views.ChartSettings.textStock": "Kurs", "SSE.Views.ChartSettings.textStyle": "Stil", - "SSE.Views.ChartSettings.textSurface": "Oberfläche", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Breite", - "SSE.Views.ChartSettings.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "FEHLER! Die maximale Punktzahl pro eine Tabelle beträgt 4096 Punkte.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "FEHLER! Die maximale Anzahl der Datenreihen per Diagramm ist 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Falsche Reihenfolge der Zeilen. Um ein Kursdiagramm zu erstellen, ordnen Sie die Daten auf dem Blatt folgendermaßen an:
Eröffnungspreis, Höchstpreis, Tiefstpreis, Schlusskurs.", @@ -1187,14 +1180,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Beschreibung", "SSE.Views.ChartSettingsDlg.textAltTip": "Die alternative textbasierte Darstellung der visuellen Objektinformation, die den Menschen mit geistigen Behinderungen oder Sehbehinderungen vorgelesen wird, um besser verstehen zu können, was genau auf dem Bild, AutoForm, Diagramm oder der Tabelle dargestellt wurde.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titel", - "SSE.Views.ChartSettingsDlg.textArea": "Flächen", "SSE.Views.ChartSettingsDlg.textAuto": "Automatisch", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatisch für jeden", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Schnittpunkt mit der Achse", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Parameter der Achse", "SSE.Views.ChartSettingsDlg.textAxisPos": "Position der Achse", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Achseneinstellungen", - "SSE.Views.ChartSettingsDlg.textBar": "Balken", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Zwischen den Teilstrichen", "SSE.Views.ChartSettingsDlg.textBillions": "Milliarden", "SSE.Views.ChartSettingsDlg.textBottom": "Unten", @@ -1202,8 +1193,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Zentriert", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Diagrammelemente und
Diagrammlegende", "SSE.Views.ChartSettingsDlg.textChartTitle": "Diagrammtitel", - "SSE.Views.ChartSettingsDlg.textColumn": "Säule", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Spalte", "SSE.Views.ChartSettingsDlg.textCross": "Schnittpunkt", "SSE.Views.ChartSettingsDlg.textCustom": "Benutzerdefiniert", "SSE.Views.ChartSettingsDlg.textDataColumns": "in Spalten", @@ -1244,9 +1233,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legende", "SSE.Views.ChartSettingsDlg.textLegendRight": "Rechts", "SSE.Views.ChartSettingsDlg.textLegendTop": "Oben", - "SSE.Views.ChartSettingsDlg.textLine": "Linie", "SSE.Views.ChartSettingsDlg.textLines": "Linien", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linie", "SSE.Views.ChartSettingsDlg.textLocationRange": "Positionsbereich", "SSE.Views.ChartSettingsDlg.textLow": "Niedrig", "SSE.Views.ChartSettingsDlg.textMajor": "Primäre", @@ -1267,8 +1254,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Außen", "SSE.Views.ChartSettingsDlg.textOuterTop": "Außen oben", "SSE.Views.ChartSettingsDlg.textOverlay": "Überlagerung", - "SSE.Views.ChartSettingsDlg.textPie": "Kreis", - "SSE.Views.ChartSettingsDlg.textPoint": "Punkt (XY)", "SSE.Views.ChartSettingsDlg.textReverse": "Werte in umgekehrter Reihenfolge", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reihenfolge umkehren", "SSE.Views.ChartSettingsDlg.textRight": "Rechts", @@ -1289,10 +1274,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Einzelne Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Glatt", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Bereiche", - "SSE.Views.ChartSettingsDlg.textStock": "Kurs", "SSE.Views.ChartSettingsDlg.textStraight": "Gerade", "SSE.Views.ChartSettingsDlg.textStyle": "Stil", - "SSE.Views.ChartSettingsDlg.textSurface": "Oberfläche", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tausende", @@ -1309,7 +1292,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertikale Achse", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertikale Gitternetzlinien ", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titel der vertikalen Achse", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X-Achsentitel", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y-Achsentitel", "SSE.Views.ChartSettingsDlg.textZero": "Null", @@ -2072,19 +2054,14 @@ "SSE.Views.Toolbar.textAlignRight": "Rechts ausrichten", "SSE.Views.Toolbar.textAlignTop": "Oben ausrichten", "SSE.Views.Toolbar.textAllBorders": "Alle Rahmenlinien", - "SSE.Views.Toolbar.textArea": "Flächen", - "SSE.Views.Toolbar.textBar": "Balken", "SSE.Views.Toolbar.textBold": "Fett", "SSE.Views.Toolbar.textBordersColor": "Rahmenfarbe", "SSE.Views.Toolbar.textBordersStyle": "Rahmenart", "SSE.Views.Toolbar.textBottom": "Unten: ", "SSE.Views.Toolbar.textBottomBorders": "Untere Ränder", "SSE.Views.Toolbar.textCenterBorders": "Innere vertikale Rahmenlinien", - "SSE.Views.Toolbar.textCharts": "Diagramme", "SSE.Views.Toolbar.textClearPrintArea": "Druckbereich aufheben", "SSE.Views.Toolbar.textClockwise": "Im Uhrzeigersinn drehen", - "SSE.Views.Toolbar.textColumn": "Spalte", - "SSE.Views.Toolbar.textColumnSpark": "Spalte", "SSE.Views.Toolbar.textCounterCw": "Gegen den Uhrzeigersinn drehen", "SSE.Views.Toolbar.textDelLeft": "Zellen nach links verschieben", "SSE.Views.Toolbar.textDelUp": "Zellen nach oben verschieben", @@ -2100,8 +2077,6 @@ "SSE.Views.Toolbar.textLandscape": "Querformat", "SSE.Views.Toolbar.textLeft": "Links: ", "SSE.Views.Toolbar.textLeftBorders": "Rahmenlinien links", - "SSE.Views.Toolbar.textLine": "Linie", - "SSE.Views.Toolbar.textLineSpark": "Linie", "SSE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte", "SSE.Views.Toolbar.textMarginsNarrow": "Schmal", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2112,8 +2087,6 @@ "SSE.Views.Toolbar.textNoBorders": "Keine Rahmen", "SSE.Views.Toolbar.textOutBorders": "Rahmenlinien außen", "SSE.Views.Toolbar.textPageMarginsCustom": "Benutzerdefinierte Seitenränder", - "SSE.Views.Toolbar.textPie": "Kreis", - "SSE.Views.Toolbar.textPoint": "Punkt (XY)", "SSE.Views.Toolbar.textPortrait": "Hochformat", "SSE.Views.Toolbar.textPrint": "Drucken", "SSE.Views.Toolbar.textPrintOptions": "Druck-Einstellungen", @@ -2122,13 +2095,10 @@ "SSE.Views.Toolbar.textRotateDown": "Text nach unten drehen", "SSE.Views.Toolbar.textRotateUp": "Text nach oben drehen", "SSE.Views.Toolbar.textSetPrintArea": "Druckbereich festlegen", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Bestand", "SSE.Views.Toolbar.textStrikeout": "Durchgestrichen", "SSE.Views.Toolbar.textSubscript": "Tiefgestellt", "SSE.Views.Toolbar.textSubSuperscript": "Tiefgestellt/hochgestellt", "SSE.Views.Toolbar.textSuperscript": "Hochgestellt", - "SSE.Views.Toolbar.textSurface": "Oberfläche", "SSE.Views.Toolbar.textTabCollaboration": "Zusammenarbeit", "SSE.Views.Toolbar.textTabFile": "Datei", "SSE.Views.Toolbar.textTabHome": "Startseite", @@ -2138,7 +2108,6 @@ "SSE.Views.Toolbar.textTop": "Oben: ", "SSE.Views.Toolbar.textTopBorders": "Rahmenlinien oben", "SSE.Views.Toolbar.textUnderline": "Unterstrichen", - "SSE.Views.Toolbar.textWinLossSpark": "Gewinn/Verlust", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Unten ausrichten", "SSE.Views.Toolbar.tipAlignCenter": "Zentriert ausrichten", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 8f39480be..487e071c4 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -6,14 +6,14 @@ "Common.define.chartData.textBar": "Bar", "Common.define.chartData.textCharts": "Charts", "Common.define.chartData.textColumn": "Column", + "Common.define.chartData.textColumnSpark": "Column", "Common.define.chartData.textLine": "Line", + "Common.define.chartData.textLineSpark": "Line", "Common.define.chartData.textPie": "Pie", "Common.define.chartData.textPoint": "XY (Scatter)", + "Common.define.chartData.textSparks": "Sparklines", "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", - "Common.define.chartData.textSparks": "Sparklines", - "Common.define.chartData.textColumnSpark": "Column", - "Common.define.chartData.textLineSpark": "Line", "Common.define.chartData.textWinLossSpark": "Win/Loss", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", @@ -159,6 +159,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Use the 'Save' button to sync the changes you and others make.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accept current change", "Common.Views.ReviewChanges.tipCoAuthMode": "Set co-editing mode", + "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", "Common.Views.ReviewChanges.tipHistory": "Show version history", "Common.Views.ReviewChanges.tipRejectCurrent": "Reject current change", "Common.Views.ReviewChanges.tipReview": "Track changes", @@ -173,6 +175,11 @@ "Common.Views.ReviewChanges.txtChat": "Chat", "Common.Views.ReviewChanges.txtClose": "Close", "Common.Views.ReviewChanges.txtCoAuthMode": "Co-editing Mode", + "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", + "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", + "Common.Views.ReviewChanges.txtCommentRemove": "Remove", "Common.Views.ReviewChanges.txtDocLang": "Language", "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -191,13 +198,6 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", - "Common.Views.ReviewChanges.txtCommentRemove": "Remove", - "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remove current comments", - "Common.Views.ReviewChanges.tipCommentRem": "Remove comments", - "Common.Views.ReviewChanges.txtCommentRemCurrent": "Remove Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remove My Current Comments", - "Common.Views.ReviewChanges.txtCommentRemMy": "Remove My Comments", - "Common.Views.ReviewChanges.txtCommentRemAll": "Remove All Comments", "Common.Views.ReviewPopover.textAdd": "Add", "Common.Views.ReviewPopover.textAddReply": "Add Reply", "Common.Views.ReviewPopover.textCancel": "Cancel", @@ -234,11 +234,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Show sign date in signature line", "Common.Views.SignSettingsDialog.textTitle": "Signature Setup", "Common.Views.SignSettingsDialog.txtEmpty": "This field is required", - "Common.Views.SymbolTableDialog.textTitle": "Symbol", + "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", "Common.Views.SymbolTableDialog.textFont": "Font", "Common.Views.SymbolTableDialog.textRange": "Range", "Common.Views.SymbolTableDialog.textRecent": "Recently used symbols", - "Common.Views.SymbolTableDialog.textCode": "Unicode HEX value", + "Common.Views.SymbolTableDialog.textTitle": "Symbol", "SSE.Controllers.DataTab.textWizard": "Text to Columns", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.centerText": "Center", @@ -482,6 +482,7 @@ "SSE.Controllers.Main.errorTokenExpire": "The document security token has expired.
Please contact your Document Server administrator.", "SSE.Controllers.Main.errorUnexpectedGuid": "External error.
Unexpected GUID. Please contact support in case the error persists.", "SSE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "SSE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download or print it until the connection is restored and page is reloaded.", @@ -768,7 +769,6 @@ "SSE.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.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", @@ -786,6 +786,7 @@ "SSE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 409", "SSE.Controllers.Toolbar.textFraction": "Fractions", "SSE.Controllers.Toolbar.textFunction": "Functions", + "SSE.Controllers.Toolbar.textInsert": "Insert", "SSE.Controllers.Toolbar.textIntegral": "Integrals", "SSE.Controllers.Toolbar.textLargeOperator": "Large Operators", "SSE.Controllers.Toolbar.textLimitAndLog": "Limits And Logarithms", @@ -1123,7 +1124,6 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", - "SSE.Controllers.Toolbar.textInsert": "Insert", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines", @@ -1205,36 +1205,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "del_SSE.Views.ChartSettings.textArea": "Area", - "del_SSE.Views.ChartSettings.textBar": "Bar", "SSE.Views.ChartSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Change Chart Type", - "del_SSE.Views.ChartSettings.textColumn": "Column", - "del_SSE.Views.ChartSettings.textColumnSpark": "Column", "SSE.Views.ChartSettings.textEditData": "Edit Data and Location", "SSE.Views.ChartSettings.textFirstPoint": "First Point", "SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHighPoint": "High Point", "SSE.Views.ChartSettings.textKeepRatio": "Constant proportions", "SSE.Views.ChartSettings.textLastPoint": "Last Point", - "del_SSE.Views.ChartSettings.textLine": "Line", - "del_SSE.Views.ChartSettings.textLineSpark": "Line", "SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textMarkers": "Markers", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNewColor": "Add New Custom Color", - "del_SSE.Views.ChartSettings.textPie": "Pie", - "del_SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "SSE.Views.ChartSettings.textRanges": "Data Range", "SSE.Views.ChartSettings.textSelectData": "Select Data", "SSE.Views.ChartSettings.textShow": "Show", "SSE.Views.ChartSettings.textSize": "Size", - "del_SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "Style", - "del_SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Width", - "del_SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", @@ -1243,14 +1232,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Title", - "del_SSE.Views.ChartSettingsDlg.textArea": "Area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto for Each", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "del_SSE.Views.ChartSettingsDlg.textBar": "Bar", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom", @@ -1258,8 +1245,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &
Chart Legend", "SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title", - "del_SSE.Views.ChartSettingsDlg.textColumn": "Column", - "del_SSE.Views.ChartSettingsDlg.textColumnSpark": "Column", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textDataColumns": "in columns", @@ -1300,9 +1285,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendRight": "Right", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top", - "del_SSE.Views.ChartSettingsDlg.textLine": "Line Chart", "SSE.Views.ChartSettingsDlg.textLines": "Lines ", - "del_SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "SSE.Views.ChartSettingsDlg.textLocationRange": "Location Range", "SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -1324,8 +1307,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "del_SSE.Views.ChartSettingsDlg.textPie": "Pie", - "del_SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Reverse order", "SSE.Views.ChartSettingsDlg.textRight": "Right", @@ -1347,10 +1328,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSnap": "Cell Snapping", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", - "del_SSE.Views.ChartSettingsDlg.textStock": "Stock", "SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "del_SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands", @@ -1368,7 +1347,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", - "del_SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1449,6 +1427,7 @@ "SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes", "SSE.Views.DocumentHolder.textFromFile": "From File", "SSE.Views.DocumentHolder.textFromUrl": "From URL", + "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.DocumentHolder.textMoreFormats": "More formats", "SSE.Views.DocumentHolder.textNone": "None", "SSE.Views.DocumentHolder.textReplace": "Replace image", @@ -1528,7 +1507,6 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", - "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.FileMenu.btnBackCaption": "Open file location", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", @@ -2229,6 +2207,7 @@ "SSE.Views.Toolbar.capBtnAddComment": "Add Comment", "SSE.Views.Toolbar.capBtnComment": "Comment", "SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer", + "SSE.Views.Toolbar.capBtnInsSymbol": "Symbol", "SSE.Views.Toolbar.capBtnMargins": "Margins", "SSE.Views.Toolbar.capBtnPageOrient": "Orientation", "SSE.Views.Toolbar.capBtnPageSize": "Size", @@ -2257,20 +2236,15 @@ "SSE.Views.Toolbar.textAlignRight": "Align Right", "SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAllBorders": "All Borders", - "del_SSE.Views.Toolbar.textArea": "Area", "SSE.Views.Toolbar.textAuto": "Auto", - "del_SSE.Views.Toolbar.textBar": "Bar", "SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBordersColor": "Border Color", "SSE.Views.Toolbar.textBordersStyle": "Border Style", "SSE.Views.Toolbar.textBottom": "Bottom: ", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders", - "del_SSE.Views.Toolbar.textCharts": "Charts", "SSE.Views.Toolbar.textClearPrintArea": "Clear Print Area", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise", - "del_SSE.Views.Toolbar.textColumn": "Column", - "del_SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up", @@ -2288,8 +2262,6 @@ "SSE.Views.Toolbar.textLandscape": "Landscape", "SSE.Views.Toolbar.textLeft": "Left: ", "SSE.Views.Toolbar.textLeftBorders": "Left Borders", - "del_SSE.Views.Toolbar.textLine": "Line", - "del_SSE.Views.Toolbar.textLineSpark": "Line", "SSE.Views.Toolbar.textManyPages": "pages", "SSE.Views.Toolbar.textMarginsLast": "Last Custom", "SSE.Views.Toolbar.textMarginsNarrow": "Narrow", @@ -2303,8 +2275,6 @@ "SSE.Views.Toolbar.textOnePage": "page", "SSE.Views.Toolbar.textOutBorders": "Outside Borders", "SSE.Views.Toolbar.textPageMarginsCustom": "Custom margins", - "del_SSE.Views.Toolbar.textPie": "Pie", - "del_SSE.Views.Toolbar.textPoint": "XY (Scatter)", "SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPrint": "Print", "SSE.Views.Toolbar.textPrintOptions": "Print Settings", @@ -2313,13 +2283,10 @@ "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", "SSE.Views.Toolbar.textSetPrintArea": "Set Print Area", - "del_SSE.Views.Toolbar.textSparks": "Sparklines", - "del_SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStrikeout": "Strikeout", "SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript", - "del_SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabData": "Data", "SSE.Views.Toolbar.textTabFile": "File", @@ -2332,7 +2299,6 @@ "SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textWidth": "Width", - "del_SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Align bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align center", @@ -2373,6 +2339,7 @@ "SSE.Views.Toolbar.tipInsertImage": "Insert image", "SSE.Views.Toolbar.tipInsertOpt": "Insert cells", "SSE.Views.Toolbar.tipInsertShape": "Insert autoshape", + "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Toolbar.tipInsertTable": "Insert table", "SSE.Views.Toolbar.tipInsertText": "Insert text box", "SSE.Views.Toolbar.tipInsertTextart": "Insert Text Art", @@ -2464,8 +2431,6 @@ "SSE.Views.Toolbar.txtTime": "Time", "SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells", "SSE.Views.Toolbar.txtYen": "¥ Yen", - "SSE.Views.Toolbar.capBtnInsSymbol": "Symbol", - "SSE.Views.Toolbar.tipInsertSymbol": "Insert symbol", "SSE.Views.Top10FilterDialog.textType": "Show", "SSE.Views.Top10FilterDialog.txtBottom": "Bottom", "SSE.Views.Top10FilterDialog.txtItems": "Item", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 5c64cc382..c8cdc5f2f 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -2,6 +2,18 @@ "cancelButtonText": "Cancelar", "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Gráfico de columnas", + "Common.define.chartData.textLine": "Línea", + "Common.define.chartData.textPie": "Gráfico circular", + "Common.define.chartData.textPoint": "XY (Dispersión)", + "Common.define.chartData.textStock": "De cotizaciones", + "Common.define.chartData.textSurface": "Superficie", + "Common.define.chartData.textColumnSpark": "Histograma", + "Common.define.chartData.textLineSpark": "Línea", + "Common.define.chartData.textWinLossSpark": "Ganancia/pérdida", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -1145,36 +1157,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "Plantilla", "SSE.Views.ChartSettings.textAdvanced": "Mostrar ajustes avanzados", - "SSE.Views.ChartSettings.textArea": "Gráfico de área", - "SSE.Views.ChartSettings.textBar": "Barra", "SSE.Views.ChartSettings.textBorderSizeErr": "El valor numérico es incorrecto.
Por favor, introduzca un valor de 0 a 1584 puntos.", "SSE.Views.ChartSettings.textChartType": "Cambiar tipo de gráfico", - "SSE.Views.ChartSettings.textColumn": "Columna", - "SSE.Views.ChartSettings.textColumnSpark": "Histograma", "SSE.Views.ChartSettings.textEditData": "Editar datos y ubicación", "SSE.Views.ChartSettings.textFirstPoint": "Primer punto", "SSE.Views.ChartSettings.textHeight": "Altura", "SSE.Views.ChartSettings.textHighPoint": "Punto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporciones constantes", "SSE.Views.ChartSettings.textLastPoint": "Último punto", - "SSE.Views.ChartSettings.textLine": "Línea", - "SSE.Views.ChartSettings.textLineSpark": "Línea", "SSE.Views.ChartSettings.textLowPoint": "Punto bajo", "SSE.Views.ChartSettings.textMarkers": "Marcadores", "SSE.Views.ChartSettings.textNegativePoint": "Punto negativo", "SSE.Views.ChartSettings.textNewColor": "Color personalizado", - "SSE.Views.ChartSettings.textPie": "Gráfico circular", - "SSE.Views.ChartSettings.textPoint": "XY (Dispersión)", "SSE.Views.ChartSettings.textRanges": "Rango de datos", "SSE.Views.ChartSettings.textSelectData": "Seleccionar datos", "SSE.Views.ChartSettings.textShow": "Mostrar", "SSE.Views.ChartSettings.textSize": "Tamaño", - "SSE.Views.ChartSettings.textStock": "De cotizaciones", "SSE.Views.ChartSettings.textStyle": "Estilo", - "SSE.Views.ChartSettings.textSurface": "Superficie", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Ancho", - "SSE.Views.ChartSettings.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "¡ERROR! El máximo", "SSE.Views.ChartSettingsDlg.errorMaxRows": "¡ERROR! El número máximo de series de datos por gráfico es 225", "SSE.Views.ChartSettingsDlg.errorStockChart": "Orden de las filas incorrecto. Para compilar un gráfico de cotizaciones introduzca los datos en la hoja de la forma siguiente:
precio de apertura, precio máximo, precio mínimo, precio de cierre.", @@ -1182,14 +1183,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Descripción", "SSE.Views.ChartSettingsDlg.textAltTip": "Representación de texto alternativa de la información sobre el objeto visual, que se leerá para las personas con deficiencia visual o deterioro cognitivo para ayudarles a entender mejor, que información contiene la imagen, autoforma, gráfico o tabla.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Título", - "SSE.Views.ChartSettingsDlg.textArea": "Gráfico de área", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automático para cada", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersección con eje", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Parámetros de eje", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posición de eje", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Ajustes de eje", - "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de barras", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de graduación", "SSE.Views.ChartSettingsDlg.textBillions": "Millardos", "SSE.Views.ChartSettingsDlg.textBottom": "Abajo ", @@ -1197,8 +1196,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Al centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos de gráfico y
leyenda de gráfico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Título de gráfico", - "SSE.Views.ChartSettingsDlg.textColumn": "Gráfico de columnas", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Histograma", "SSE.Views.ChartSettingsDlg.textCross": "Intersección", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizado", "SSE.Views.ChartSettingsDlg.textDataColumns": "en columnas", @@ -1239,9 +1236,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Leyenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Derecho", "SSE.Views.ChartSettingsDlg.textLegendTop": "Superior", - "SSE.Views.ChartSettingsDlg.textLine": "Gráfico de líneas", "SSE.Views.ChartSettingsDlg.textLines": "Líneas", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Línea", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rango de ubicación", "SSE.Views.ChartSettingsDlg.textLow": "Bajo", "SSE.Views.ChartSettingsDlg.textMajor": "Principal", @@ -1262,8 +1257,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Fuera", "SSE.Views.ChartSettingsDlg.textOuterTop": "Arriba en el exterior", "SSE.Views.ChartSettingsDlg.textOverlay": "Superposición", - "SSE.Views.ChartSettingsDlg.textPie": "Gráfico circular", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Dispersión)", "SSE.Views.ChartSettingsDlg.textReverse": "Valores en orden inverso", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Orden inverso", "SSE.Views.ChartSettingsDlg.textRight": "Derecho", @@ -1284,10 +1277,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline único", "SSE.Views.ChartSettingsDlg.textSmooth": "Suave", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Rangos de Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "De cotizaciones", "SSE.Views.ChartSettingsDlg.textStraight": "Recto", "SSE.Views.ChartSettingsDlg.textStyle": "Estilo", - "SSE.Views.ChartSettingsDlg.textSurface": "Superficie", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Miles", @@ -1304,7 +1295,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Eje vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Líneas de cuadrícula verticales", "SSE.Views.ChartSettingsDlg.textVertTitle": "Título de eje vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Título del eje X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Título del eje Y", "SSE.Views.ChartSettingsDlg.textZero": "Cero", @@ -2127,19 +2117,14 @@ "SSE.Views.Toolbar.textAlignRight": "Alinear a la derecha", "SSE.Views.Toolbar.textAlignTop": "Alinear arriba", "SSE.Views.Toolbar.textAllBorders": "Todos los bordes", - "SSE.Views.Toolbar.textArea": "Área", - "SSE.Views.Toolbar.textBar": "Gráfico de barras", "SSE.Views.Toolbar.textBold": "Negrita", "SSE.Views.Toolbar.textBordersColor": "Color de borde", "SSE.Views.Toolbar.textBordersStyle": "Estilo de borde", "SSE.Views.Toolbar.textBottom": "Inferior: ", "SSE.Views.Toolbar.textBottomBorders": "Bordes inferiores", "SSE.Views.Toolbar.textCenterBorders": "Bordes verticales internos", - "SSE.Views.Toolbar.textCharts": "Gráficos", "SSE.Views.Toolbar.textClearPrintArea": "Vaciar área de impresión", "SSE.Views.Toolbar.textClockwise": "En la dirección de manecillas de reloj", - "SSE.Views.Toolbar.textColumn": "Histograma", - "SSE.Views.Toolbar.textColumnSpark": "Histograma", "SSE.Views.Toolbar.textCounterCw": "En el sentido antihorario", "SSE.Views.Toolbar.textDelLeft": "Desplazar celdas a la izquierda", "SSE.Views.Toolbar.textDelUp": "Desplazar celdas hacia arriba", @@ -2155,8 +2140,6 @@ "SSE.Views.Toolbar.textLandscape": "Horizontal", "SSE.Views.Toolbar.textLeft": "Izquierdo: ", "SSE.Views.Toolbar.textLeftBorders": "Bordes izquierdos", - "SSE.Views.Toolbar.textLine": "Línea", - "SSE.Views.Toolbar.textLineSpark": "Línea", "SSE.Views.Toolbar.textMarginsLast": "Último personalizado", "SSE.Views.Toolbar.textMarginsNarrow": "Estrecho", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2167,8 +2150,6 @@ "SSE.Views.Toolbar.textNoBorders": "Sin bordes", "SSE.Views.Toolbar.textOutBorders": "Bordes externos", "SSE.Views.Toolbar.textPageMarginsCustom": "Márgenes personalizados", - "SSE.Views.Toolbar.textPie": "Gráfico circular", - "SSE.Views.Toolbar.textPoint": "XY (Dispersión)", "SSE.Views.Toolbar.textPortrait": "Vertical", "SSE.Views.Toolbar.textPrint": "Imprimir", "SSE.Views.Toolbar.textPrintOptions": "Opciones de impresión", @@ -2177,13 +2158,10 @@ "SSE.Views.Toolbar.textRotateDown": "Girar texto hacia abajo", "SSE.Views.Toolbar.textRotateUp": "Girar texto hacia arriba", "SSE.Views.Toolbar.textSetPrintArea": "Establecer área de impresión", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "De cotizaciones", "SSE.Views.Toolbar.textStrikeout": "Tachado", "SSE.Views.Toolbar.textSubscript": "Subíndice", "SSE.Views.Toolbar.textSubSuperscript": "Subíndice/superíndice", "SSE.Views.Toolbar.textSuperscript": "Sobreíndice", - "SSE.Views.Toolbar.textSurface": "Superficie", "SSE.Views.Toolbar.textTabCollaboration": "Colaboración", "SSE.Views.Toolbar.textTabData": "Datos", "SSE.Views.Toolbar.textTabFile": "Archivo", @@ -2195,7 +2173,6 @@ "SSE.Views.Toolbar.textTop": "Superior:", "SSE.Views.Toolbar.textTopBorders": "Bordes superiores", "SSE.Views.Toolbar.textUnderline": "Subrayar", - "SSE.Views.Toolbar.textWinLossSpark": "Ganancia/pérdida", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alinear en la parte inferior", "SSE.Views.Toolbar.tipAlignCenter": "Alinear al centro", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index ffd93bbd6..dafdc2782 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annuler", "Common.Controllers.Chat.notcriticalErrorTitle": "Avertissement", "Common.Controllers.Chat.textEnterMessage": "Entrez votre message ici", + "Common.define.chartData.textArea": "En aires", + "Common.define.chartData.textBar": "En barre", + "Common.define.chartData.textColumn": "Colonne", + "Common.define.chartData.textLine": "Graphique en ligne", + "Common.define.chartData.textPie": "Graphiques à secteurs", + "Common.define.chartData.textPoint": "Nuages de points (XY)", + "Common.define.chartData.textStock": "Boursier", + "Common.define.chartData.textSurface": "Surface", + "Common.define.chartData.textColumnSpark": "Histogramme", + "Common.define.chartData.textLineSpark": "Ligne", + "Common.define.chartData.textWinLossSpark": "Positif/Négatif", + "Common.define.chartData.textSparks": "Graphiques sparkline", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1171,36 +1183,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Couleur", "SSE.Views.ChartSettings.strTemplate": "Modèle", "SSE.Views.ChartSettings.textAdvanced": "Afficher les paramètres avancés", - "SSE.Views.ChartSettings.textArea": "En aires", - "SSE.Views.ChartSettings.textBar": "À barres", "SSE.Views.ChartSettings.textBorderSizeErr": "La valeur saisie est incorrecte.
Entrez une valeur de 0 à 1584 points.", "SSE.Views.ChartSettings.textChartType": "Modifier le type de graphique", - "SSE.Views.ChartSettings.textColumn": "Histogramme", - "SSE.Views.ChartSettings.textColumnSpark": "Histogramme", "SSE.Views.ChartSettings.textEditData": "Modifier les données et l'emplacement", "SSE.Views.ChartSettings.textFirstPoint": "Premier point", "SSE.Views.ChartSettings.textHeight": "Hauteur", "SSE.Views.ChartSettings.textHighPoint": "Point élevé", "SSE.Views.ChartSettings.textKeepRatio": "Proportions constantes", "SSE.Views.ChartSettings.textLastPoint": "Dernier point", - "SSE.Views.ChartSettings.textLine": "Ligne", - "SSE.Views.ChartSettings.textLineSpark": "Ligne", "SSE.Views.ChartSettings.textLowPoint": "Point bas", "SSE.Views.ChartSettings.textMarkers": "Marqueurs", "SSE.Views.ChartSettings.textNegativePoint": "Point négatif", "SSE.Views.ChartSettings.textNewColor": "Couleur personnalisée", - "SSE.Views.ChartSettings.textPie": "À secteurs", - "SSE.Views.ChartSettings.textPoint": "Nuages de points (XY)", "SSE.Views.ChartSettings.textRanges": "Plage de données", "SSE.Views.ChartSettings.textSelectData": "Sélectionner des données", "SSE.Views.ChartSettings.textShow": "Afficher", "SSE.Views.ChartSettings.textSize": "Taille", - "SSE.Views.ChartSettings.textStock": "Boursier", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Largeur", - "SSE.Views.ChartSettings.textWinLossSpark": "Positif/Négatif", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERREUR! Maximum de 4096 points en série par graphique.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERREUR! Maximum de 255 séries de données par graphique.", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:
cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.", @@ -1208,14 +1209,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "La représentation textuelle alternative des informations sur l’objet visuel, qui sera lue aux personnes avec des déficiences cognitives ou visuelles pour les aider à mieux comprendre l'information de l’image, de la forme automatique, du graphique ou du tableau.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titre", - "SSE.Views.ChartSettingsDlg.textArea": "En aires", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatique pour chaque", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersection de l'axe", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Options d'axe", "SSE.Views.ChartSettingsDlg.textAxisPos": "Position de l'axe", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Paramètres de l’axe", - "SSE.Views.ChartSettingsDlg.textBar": "Diagramme à barres", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre graduations", "SSE.Views.ChartSettingsDlg.textBillions": "Milliards", "SSE.Views.ChartSettingsDlg.textBottom": "En bas", @@ -1223,8 +1222,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Au centre", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Éléments de graphique,
légende de graphique", "SSE.Views.ChartSettingsDlg.textChartTitle": "Titre du graphique", - "SSE.Views.ChartSettingsDlg.textColumn": "Histogramme", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Histogramme", "SSE.Views.ChartSettingsDlg.textCross": "Sur l'axe", "SSE.Views.ChartSettingsDlg.textCustom": "Personnalisé", "SSE.Views.ChartSettingsDlg.textDataColumns": "en colonnes", @@ -1265,9 +1262,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Légende", "SSE.Views.ChartSettingsDlg.textLegendRight": "A droite", "SSE.Views.ChartSettingsDlg.textLegendTop": "En haut", - "SSE.Views.ChartSettingsDlg.textLine": "Graphique en ligne", "SSE.Views.ChartSettingsDlg.textLines": "Lignes", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Ligne", "SSE.Views.ChartSettingsDlg.textLocationRange": "Plage d’emplacements", "SSE.Views.ChartSettingsDlg.textLow": "En bas", "SSE.Views.ChartSettingsDlg.textMajor": "Principaux", @@ -1288,8 +1283,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "A l'extérieur", "SSE.Views.ChartSettingsDlg.textOuterTop": "En haut à l'extérieur", "SSE.Views.ChartSettingsDlg.textOverlay": "Superposition", - "SSE.Views.ChartSettingsDlg.textPie": "Graphiques à secteurs", - "SSE.Views.ChartSettingsDlg.textPoint": "Nuages de points (XY)", "SSE.Views.ChartSettingsDlg.textReverse": "Valeurs en ordre inverse", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Inverser l’ordre", "SSE.Views.ChartSettingsDlg.textRight": "A droite", @@ -1310,10 +1303,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline unique", "SSE.Views.ChartSettingsDlg.textSmooth": "Lisse", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Plage de graphiques sparklines", - "SSE.Views.ChartSettingsDlg.textStock": "Boursier", "SSE.Views.ChartSettingsDlg.textStraight": "Droit", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Milliers", @@ -1330,7 +1321,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Axe vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Quadrillage vertical", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titre de l'axe vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Positif/Négatif", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titre de l'axe X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titre de l'axe Y", "SSE.Views.ChartSettingsDlg.textZero": "Valeur nulle", @@ -2198,19 +2188,14 @@ "SSE.Views.Toolbar.textAlignRight": "Aligner à droite", "SSE.Views.Toolbar.textAlignTop": "Aligner en haut", "SSE.Views.Toolbar.textAllBorders": "Toutes les bordures", - "SSE.Views.Toolbar.textArea": "En aires", - "SSE.Views.Toolbar.textBar": "À barres", "SSE.Views.Toolbar.textBold": "Gras", "SSE.Views.Toolbar.textBordersColor": "Couleur de la bordure", "SSE.Views.Toolbar.textBordersStyle": "Style de la bordure", "SSE.Views.Toolbar.textBottom": "Bas: ", "SSE.Views.Toolbar.textBottomBorders": "Bordures inférieures", "SSE.Views.Toolbar.textCenterBorders": "Bordures intérieures verticales", - "SSE.Views.Toolbar.textCharts": "Graphiques", "SSE.Views.Toolbar.textClearPrintArea": "Vider la zone d'impression", "SSE.Views.Toolbar.textClockwise": "Rotation dans le sens des aiguilles d'une montre", - "SSE.Views.Toolbar.textColumn": "Histogramme", - "SSE.Views.Toolbar.textColumnSpark": "Histogramme", "SSE.Views.Toolbar.textCounterCw": "Rotation dans le sens inverse des aiguilles d'une montre", "SSE.Views.Toolbar.textDelLeft": "Décaler les cellules vers la gauche", "SSE.Views.Toolbar.textDelUp": "Décaler les cellules vers le haut", @@ -2226,8 +2211,6 @@ "SSE.Views.Toolbar.textLandscape": "Paysage", "SSE.Views.Toolbar.textLeft": "À gauche:", "SSE.Views.Toolbar.textLeftBorders": "Bordures gauches", - "SSE.Views.Toolbar.textLine": "Ligne", - "SSE.Views.Toolbar.textLineSpark": "Ligne", "SSE.Views.Toolbar.textMarginsLast": "Dernière mesure", "SSE.Views.Toolbar.textMarginsNarrow": "Étroit", "SSE.Views.Toolbar.textMarginsNormal": "Normal", @@ -2238,8 +2221,6 @@ "SSE.Views.Toolbar.textNoBorders": "Pas de bordures", "SSE.Views.Toolbar.textOutBorders": "Bordures extérieures", "SSE.Views.Toolbar.textPageMarginsCustom": "Marges personnalisées", - "SSE.Views.Toolbar.textPie": "À secteurs", - "SSE.Views.Toolbar.textPoint": "Nuages de points (XY)", "SSE.Views.Toolbar.textPortrait": "Portrait", "SSE.Views.Toolbar.textPrint": "Imprimer", "SSE.Views.Toolbar.textPrintOptions": "Paramètres d'impression", @@ -2248,13 +2229,10 @@ "SSE.Views.Toolbar.textRotateDown": "Rotation du texte vers le bas", "SSE.Views.Toolbar.textRotateUp": "Rotation du texte vers le haut", "SSE.Views.Toolbar.textSetPrintArea": "Selectionner la zone d'impression", - "SSE.Views.Toolbar.textSparks": "Graphiques sparkline", - "SSE.Views.Toolbar.textStock": "Boursier", "SSE.Views.Toolbar.textStrikeout": "Barré", "SSE.Views.Toolbar.textSubscript": "Indice", "SSE.Views.Toolbar.textSubSuperscript": "Indice/Exposant", "SSE.Views.Toolbar.textSuperscript": "Exposant", - "SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "Collaboration", "SSE.Views.Toolbar.textTabData": "Données", "SSE.Views.Toolbar.textTabFile": "Fichier", @@ -2266,7 +2244,6 @@ "SSE.Views.Toolbar.textTop": "En haut: ", "SSE.Views.Toolbar.textTopBorders": "Bordures supérieures", "SSE.Views.Toolbar.textUnderline": "Souligné", - "SSE.Views.Toolbar.textWinLossSpark": "Positif/Négatif", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Aligner en bas", "SSE.Views.Toolbar.tipAlignCenter": "Aligner au centre", diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index de88caf59..6948ec7e7 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -2,6 +2,18 @@ "cancelButtonText": "Mégse", "Common.Controllers.Chat.notcriticalErrorTitle": "Figyelmeztetés", "Common.Controllers.Chat.textEnterMessage": "Írja be ide az üzenetet", + "Common.define.chartData.textArea": "Terület", + "Common.define.chartData.textBar": "Sáv", + "Common.define.chartData.textColumn": "Oszlop", + "Common.define.chartData.textLine": "Vonal", + "Common.define.chartData.textPie": "Kör", + "Common.define.chartData.textPoint": "Pont", + "Common.define.chartData.textStock": "Részvény", + "Common.define.chartData.textSurface": "Felület", + "Common.define.chartData.textColumnSpark": "Oszlop", + "Common.define.chartData.textLineSpark": "Vonal", + "Common.define.chartData.textWinLossSpark": "Nyereség/veszteség", + "Common.define.chartData.textSparks": "Értékgörbék", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -1065,36 +1077,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Szín", "SSE.Views.ChartSettings.strTemplate": "Sablon", "SSE.Views.ChartSettings.textAdvanced": "Speciális beállítások megjelenítése", - "SSE.Views.ChartSettings.textArea": "Terület", - "SSE.Views.ChartSettings.textBar": "Sáv", "SSE.Views.ChartSettings.textBorderSizeErr": "A megadott érték helytelen.
Kérjük, adjon meg egy számértéket 0 és 1584 között", "SSE.Views.ChartSettings.textChartType": "Diagramtípus módosítása", - "SSE.Views.ChartSettings.textColumn": "Oszlop", - "SSE.Views.ChartSettings.textColumnSpark": "Oszlop", "SSE.Views.ChartSettings.textEditData": "Adatok és hely szerkesztése", "SSE.Views.ChartSettings.textFirstPoint": "Első pont", "SSE.Views.ChartSettings.textHeight": "Magasság", "SSE.Views.ChartSettings.textHighPoint": "Csúcspont", "SSE.Views.ChartSettings.textKeepRatio": "Állandó arányok", "SSE.Views.ChartSettings.textLastPoint": "Utolsó pont", - "SSE.Views.ChartSettings.textLine": "Vonal", - "SSE.Views.ChartSettings.textLineSpark": "Vonal", "SSE.Views.ChartSettings.textLowPoint": "Alacsony pont", "SSE.Views.ChartSettings.textMarkers": "Jelölők", "SSE.Views.ChartSettings.textNegativePoint": "Negatív pont", "SSE.Views.ChartSettings.textNewColor": "Új egyedi szín hozzáadása", - "SSE.Views.ChartSettings.textPie": "Kördiagram", - "SSE.Views.ChartSettings.textPoint": "Pont", "SSE.Views.ChartSettings.textRanges": "Adattartomány", "SSE.Views.ChartSettings.textSelectData": "Adatok kiválasztása", "SSE.Views.ChartSettings.textShow": "Mutat", "SSE.Views.ChartSettings.textSize": "Méret", - "SSE.Views.ChartSettings.textStock": "Részvény", "SSE.Views.ChartSettings.textStyle": "Stílus", - "SSE.Views.ChartSettings.textSurface": "Felület", "SSE.Views.ChartSettings.textType": "Típus", "SSE.Views.ChartSettings.textWidth": "Szélesség", - "SSE.Views.ChartSettings.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "HIBA! A soronkénti maximális pontszám a diagramon 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "HIBA! Az adatsorok maximális száma diagramonként 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Helytelen sor sorrend. Részvénydiagram létrehozásához az adatokat az alábbi sorrendben vigye fel:
nyitó ár, maximum ár, minimum ár, záró ár.", @@ -1102,14 +1103,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Leírás", "SSE.Views.ChartSettingsDlg.textAltTip": "A vizuális objektumok alternatív szövegalapú ábrázolása, amely a látás vagy kognitív károsodottak számára is olvasható, hogy segítsen nekik jobban megérteni, hogy milyen információ, alakzat, diagram vagy táblázat látható.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Cím", - "SSE.Views.ChartSettingsDlg.textArea": "Terület", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Mind automatikus", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Tengelykeresztek", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Tengely beállítások", "SSE.Views.ChartSettingsDlg.textAxisPos": "Tengely pozíció", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Tengely beállítások", - "SSE.Views.ChartSettingsDlg.textBar": "Sáv", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tengely osztások között", "SSE.Views.ChartSettingsDlg.textBillions": "Milliárdok", "SSE.Views.ChartSettingsDlg.textBottom": "Alsó", @@ -1117,8 +1116,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Közép", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Diagramelemek és
Diagrammagyarázat", "SSE.Views.ChartSettingsDlg.textChartTitle": "Diagram címe", - "SSE.Views.ChartSettingsDlg.textColumn": "Oszlop", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Oszlop", "SSE.Views.ChartSettingsDlg.textCross": "Kereszt", "SSE.Views.ChartSettingsDlg.textCustom": "Egyéni", "SSE.Views.ChartSettingsDlg.textDataColumns": "oszlopokban", @@ -1159,9 +1156,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Jelmagyarázat", "SSE.Views.ChartSettingsDlg.textLegendRight": "Jobb", "SSE.Views.ChartSettingsDlg.textLegendTop": "Felső", - "SSE.Views.ChartSettingsDlg.textLine": "Vonal", "SSE.Views.ChartSettingsDlg.textLines": "Vonalak", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Vonal", "SSE.Views.ChartSettingsDlg.textLocationRange": "Pozíció tartomány", "SSE.Views.ChartSettingsDlg.textLow": "Alacsony", "SSE.Views.ChartSettingsDlg.textMajor": "Jelentősebb", @@ -1182,8 +1177,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ki", "SSE.Views.ChartSettingsDlg.textOuterTop": "Kívül fent", "SSE.Views.ChartSettingsDlg.textOverlay": "Átfedés", - "SSE.Views.ChartSettingsDlg.textPie": "Kör", - "SSE.Views.ChartSettingsDlg.textPoint": "Pont", "SSE.Views.ChartSettingsDlg.textReverse": "Értékek fordított sorrendben", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Fordított sorrend", "SSE.Views.ChartSettingsDlg.textRight": "Jobb", @@ -1204,10 +1197,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Egyedi értékgörbe", "SSE.Views.ChartSettingsDlg.textSmooth": "Sima", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Értékgörbe tartományok", - "SSE.Views.ChartSettingsDlg.textStock": "Részvény", "SSE.Views.ChartSettingsDlg.textStraight": "Egyenes", "SSE.Views.ChartSettingsDlg.textStyle": "Stílus", - "SSE.Views.ChartSettingsDlg.textSurface": "Felület", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Ezrek", @@ -1224,7 +1215,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Függőleges tengely", "SSE.Views.ChartSettingsDlg.textVertGrid": "Függőleges rácsvonalak", "SSE.Views.ChartSettingsDlg.textVertTitle": "Függőleges tengely címe", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X tengely címe", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y tengely címe", "SSE.Views.ChartSettingsDlg.textZero": "Nulla", @@ -1978,19 +1968,14 @@ "SSE.Views.Toolbar.textAlignRight": "Jobbra rendez", "SSE.Views.Toolbar.textAlignTop": "Felfelé rendez", "SSE.Views.Toolbar.textAllBorders": "Jobb szegély", - "SSE.Views.Toolbar.textArea": "Terület", - "SSE.Views.Toolbar.textBar": "Sáv", "SSE.Views.Toolbar.textBold": "Félkövér", "SSE.Views.Toolbar.textBordersColor": "Szegély színe", "SSE.Views.Toolbar.textBordersStyle": "Szegély stílus", "SSE.Views.Toolbar.textBottom": "Alsó:", "SSE.Views.Toolbar.textBottomBorders": "Alsó szegélyek", "SSE.Views.Toolbar.textCenterBorders": "Belső függőleges szegélyek", - "SSE.Views.Toolbar.textCharts": "Diagramok", "SSE.Views.Toolbar.textClearPrintArea": "Nyomtatási terület törlése", "SSE.Views.Toolbar.textClockwise": "Lejtő szöveg", - "SSE.Views.Toolbar.textColumn": "Oszlop", - "SSE.Views.Toolbar.textColumnSpark": "Oszlop", "SSE.Views.Toolbar.textCounterCw": "Emelkedő szöveg", "SSE.Views.Toolbar.textDelLeft": "Cella helyettesítése jobbról", "SSE.Views.Toolbar.textDelUp": "Cella helyettesítése lentről", @@ -2006,8 +1991,6 @@ "SSE.Views.Toolbar.textLandscape": "Tájkép", "SSE.Views.Toolbar.textLeft": "Bal:", "SSE.Views.Toolbar.textLeftBorders": "Bal szegélyek", - "SSE.Views.Toolbar.textLine": "Vonal", - "SSE.Views.Toolbar.textLineSpark": "Vonal", "SSE.Views.Toolbar.textMarginsLast": "Előző egyéni beállítások", "SSE.Views.Toolbar.textMarginsNarrow": "Keskeny", "SSE.Views.Toolbar.textMarginsNormal": "Normál", @@ -2018,8 +2001,6 @@ "SSE.Views.Toolbar.textNoBorders": "Nincsenek szegélyek", "SSE.Views.Toolbar.textOutBorders": "Külső szegélyek", "SSE.Views.Toolbar.textPageMarginsCustom": "Egyéni margók", - "SSE.Views.Toolbar.textPie": "Kördiagram", - "SSE.Views.Toolbar.textPoint": "Pont", "SSE.Views.Toolbar.textPortrait": "Portré", "SSE.Views.Toolbar.textPrint": "Nyomtat", "SSE.Views.Toolbar.textPrintOptions": "Nyomtatási beállítások", @@ -2028,13 +2009,10 @@ "SSE.Views.Toolbar.textRotateDown": "Szöveg elforgatása lefelé", "SSE.Views.Toolbar.textRotateUp": "Szöveg elforgatása felfelé", "SSE.Views.Toolbar.textSetPrintArea": "Nyomtatási terület beállítása", - "SSE.Views.Toolbar.textSparks": "Értékgörbék", - "SSE.Views.Toolbar.textStock": "Részvény", "SSE.Views.Toolbar.textStrikeout": "áthúzás", "SSE.Views.Toolbar.textSubscript": "Alsó index", "SSE.Views.Toolbar.textSubSuperscript": "Alsó/felső index", "SSE.Views.Toolbar.textSuperscript": "Felső index", - "SSE.Views.Toolbar.textSurface": "Felület", "SSE.Views.Toolbar.textTabCollaboration": "Együttműködés", "SSE.Views.Toolbar.textTabFile": "Fájl", "SSE.Views.Toolbar.textTabHome": "Kezdőlap", @@ -2044,7 +2022,6 @@ "SSE.Views.Toolbar.textTop": "Felső:", "SSE.Views.Toolbar.textTopBorders": "Felső szegélyek", "SSE.Views.Toolbar.textUnderline": "Aláhúzott", - "SSE.Views.Toolbar.textWinLossSpark": "Nyereség/veszteség", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alulra rendez", "SSE.Views.Toolbar.tipAlignCenter": "Középre rendez", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index d6bc6736b..151757008 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annulla", "Common.Controllers.Chat.notcriticalErrorTitle": "Avviso", "Common.Controllers.Chat.textEnterMessage": "Scrivi il tuo messaggio qui", + "Common.define.chartData.textArea": "Aerogramma", + "Common.define.chartData.textBar": "A barre", + "Common.define.chartData.textColumn": "Istogramma", + "Common.define.chartData.textLine": "A linee", + "Common.define.chartData.textPie": "A torta", + "Common.define.chartData.textPoint": "XY (A dispersione)", + "Common.define.chartData.textStock": "Azionario", + "Common.define.chartData.textSurface": "Superficie", + "Common.define.chartData.textColumnSpark": "Colonna", + "Common.define.chartData.textLineSpark": "Linea", + "Common.define.chartData.textWinLossSpark": "Vinci/Perdi", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -1172,36 +1184,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Colore", "SSE.Views.ChartSettings.strTemplate": "Modello", "SSE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", - "SSE.Views.ChartSettings.textArea": "Area", - "SSE.Views.ChartSettings.textBar": "Barra", "SSE.Views.ChartSettings.textBorderSizeErr": "Il valore inserito non è corretto.
Inserisci un valore tra 0 pt e 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Cambia tipo di grafico", - "SSE.Views.ChartSettings.textColumn": "Colonna", - "SSE.Views.ChartSettings.textColumnSpark": "Colonna", "SSE.Views.ChartSettings.textEditData": "Modifica Dati e Posizione", "SSE.Views.ChartSettings.textFirstPoint": "Primo punto", "SSE.Views.ChartSettings.textHeight": "Altezza", "SSE.Views.ChartSettings.textHighPoint": "Punto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporzioni costanti", "SSE.Views.ChartSettings.textLastPoint": "Ultimo punto", - "SSE.Views.ChartSettings.textLine": "Linea", - "SSE.Views.ChartSettings.textLineSpark": "Linea", "SSE.Views.ChartSettings.textLowPoint": "Punto basso", "SSE.Views.ChartSettings.textMarkers": "Indicatori", "SSE.Views.ChartSettings.textNegativePoint": "Punto negativo", "SSE.Views.ChartSettings.textNewColor": "Colore personalizzato", - "SSE.Views.ChartSettings.textPie": "A torta", - "SSE.Views.ChartSettings.textPoint": "XY (A dispersione)", "SSE.Views.ChartSettings.textRanges": "Intervallo di dati", "SSE.Views.ChartSettings.textSelectData": "Seleziona dati", "SSE.Views.ChartSettings.textShow": "Mostra", "SSE.Views.ChartSettings.textSize": "Dimensione", - "SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "Stile", - "SSE.Views.ChartSettings.textSurface": "Superficie", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Larghezza", - "SSE.Views.ChartSettings.textWinLossSpark": "Vinci/Perdi", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERRORE! Il numero massimo di punti in serie per grafico è 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERRORE! Il numero massimo di serie di dati per grafico è 255.", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordine di righe scorretto. Per creare o grafico in pila posiziona i dati nel foglio nel seguente ordine:
prezzo di apertura, prezzo massimo, prezzo minimo, prezzo di chiusura.", @@ -1210,14 +1211,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Descrizione", "SSE.Views.ChartSettingsDlg.textAltTip": "La rappresentazione alternativa del testo delle informazioni riguardanti gli oggetti visivi, che verrà letta alle persone con deficit visivi o cognitivi per aiutarli a comprendere meglio quali informazioni sono contenute nell'immagine, nella forma, nel grafico o nella tabella.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titolo", - "SSE.Views.ChartSettingsDlg.textArea": "Ad area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Adatta per ognuno", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Intersezione asse", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opzioni assi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posizione asse", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "A barre", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tra segni di graduazione", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardi", "SSE.Views.ChartSettingsDlg.textBottom": "In basso", @@ -1225,8 +1224,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Al centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementi di grafico e
legenda di grafico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Titolo di grafico", - "SSE.Views.ChartSettingsDlg.textColumn": "Istogramma", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Colonna", "SSE.Views.ChartSettingsDlg.textCross": "Interseca", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizzato", "SSE.Views.ChartSettingsDlg.textDataColumns": "in colonne", @@ -1267,9 +1264,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "A destra", "SSE.Views.ChartSettingsDlg.textLegendTop": "In alto", - "SSE.Views.ChartSettingsDlg.textLine": "A linee", "SSE.Views.ChartSettingsDlg.textLines": "Linee", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linea", "SSE.Views.ChartSettingsDlg.textLocationRange": "Campo di ubicazione", "SSE.Views.ChartSettingsDlg.textLow": "In basso", "SSE.Views.ChartSettingsDlg.textMajor": "Principali", @@ -1291,8 +1286,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "All'esterno", "SSE.Views.ChartSettingsDlg.textOuterTop": "Alto esterno", "SSE.Views.ChartSettingsDlg.textOverlay": "Sovrapposizione", - "SSE.Views.ChartSettingsDlg.textPie": "A torta", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (A dispersione)", "SSE.Views.ChartSettingsDlg.textReverse": "Valori in ordine inverso", "SSE.Views.ChartSettingsDlg.textReverseOrder": "ordine inverso", "SSE.Views.ChartSettingsDlg.textRight": "A destra", @@ -1314,10 +1307,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Sfumate", "SSE.Views.ChartSettingsDlg.textSnap": "Aggancia celle", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Intervalli di Sparkline ", - "SSE.Views.ChartSettingsDlg.textStock": "Azionario", "SSE.Views.ChartSettingsDlg.textStraight": "Rette", "SSE.Views.ChartSettingsDlg.textStyle": "Stile", - "SSE.Views.ChartSettingsDlg.textSurface": "Superficie", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Migliaia", @@ -1335,7 +1326,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Asse verticale", "SSE.Views.ChartSettingsDlg.textVertGrid": "Linee verticali della griglia", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titolo asse verticale", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Vinci/Perdi", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titolo di asse X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titolo di asse Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -2220,19 +2210,14 @@ "SSE.Views.Toolbar.textAlignRight": "Allinea a destra", "SSE.Views.Toolbar.textAlignTop": "Allinea in alto", "SSE.Views.Toolbar.textAllBorders": "Tutti i bordi", - "SSE.Views.Toolbar.textArea": "Ad area", - "SSE.Views.Toolbar.textBar": "Barra", "SSE.Views.Toolbar.textBold": "Grassetto", "SSE.Views.Toolbar.textBordersColor": "Colore bordo", "SSE.Views.Toolbar.textBordersStyle": "Stile bordo", "SSE.Views.Toolbar.textBottom": "In basso: ", "SSE.Views.Toolbar.textBottomBorders": "Bordi inferiori", "SSE.Views.Toolbar.textCenterBorders": "Bordi verticali interni", - "SSE.Views.Toolbar.textCharts": "Grafici", "SSE.Views.Toolbar.textClearPrintArea": "Pulisci area di stampa", "SSE.Views.Toolbar.textClockwise": "Angolo in senso orario", - "SSE.Views.Toolbar.textColumn": "Colonna", - "SSE.Views.Toolbar.textColumnSpark": "Colonna", "SSE.Views.Toolbar.textCounterCw": "Angolo in senso antiorario", "SSE.Views.Toolbar.textDelLeft": "Sposta celle a sinistra", "SSE.Views.Toolbar.textDelUp": "Sposta celle in alto", @@ -2248,8 +2233,6 @@ "SSE.Views.Toolbar.textLandscape": "Orizzontale", "SSE.Views.Toolbar.textLeft": "Sinistra:", "SSE.Views.Toolbar.textLeftBorders": "Bordi sinistri", - "SSE.Views.Toolbar.textLine": "Linea", - "SSE.Views.Toolbar.textLineSpark": "Linea", "SSE.Views.Toolbar.textMarginsLast": "Ultima personalizzazione", "SSE.Views.Toolbar.textMarginsNarrow": "Stretto", "SSE.Views.Toolbar.textMarginsNormal": "Normale", @@ -2260,8 +2243,6 @@ "SSE.Views.Toolbar.textNoBorders": "Nessun bordo", "SSE.Views.Toolbar.textOutBorders": "Bordi esterni", "SSE.Views.Toolbar.textPageMarginsCustom": "Margini personalizzati", - "SSE.Views.Toolbar.textPie": "A torta", - "SSE.Views.Toolbar.textPoint": "XY (A dispersione)", "SSE.Views.Toolbar.textPortrait": "Verticale", "SSE.Views.Toolbar.textPrint": "Stampa", "SSE.Views.Toolbar.textPrintOptions": "Impostazioni stampa", @@ -2270,13 +2251,10 @@ "SSE.Views.Toolbar.textRotateDown": "Ruota testo verso il basso", "SSE.Views.Toolbar.textRotateUp": "Ruota testo verso l'alto", "SSE.Views.Toolbar.textSetPrintArea": "Imposta area di stampa", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Azionario", "SSE.Views.Toolbar.textStrikeout": "Barrato", "SSE.Views.Toolbar.textSubscript": "Pedice", "SSE.Views.Toolbar.textSubSuperscript": "Pedice/Apice", "SSE.Views.Toolbar.textSuperscript": "Apice", - "SSE.Views.Toolbar.textSurface": "Superficie", "SSE.Views.Toolbar.textTabCollaboration": "Collaborazione", "SSE.Views.Toolbar.textTabData": "Dati", "SSE.Views.Toolbar.textTabFile": "File", @@ -2288,7 +2266,6 @@ "SSE.Views.Toolbar.textTop": "in alto:", "SSE.Views.Toolbar.textTopBorders": "Bordi superiori", "SSE.Views.Toolbar.textUnderline": "Sottolineato", - "SSE.Views.Toolbar.textWinLossSpark": "Vinci/Perdi", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Allinea in basso", "SSE.Views.Toolbar.tipAlignCenter": "Allinea al centro", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 86850aacb..1e0ef300f 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -2,6 +2,13 @@ "cancelButtonText": "キャンセル", "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "ここでメッセージを挿入してください。", + "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textStock": "株価チャート", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -261,36 +268,26 @@ "SSE.Views.CellRangeDialog.txtInvalidRange": "エラー！セルの範囲が正しくありません。", "SSE.Views.CellRangeDialog.txtTitle": "データ範囲の選択", "SSE.Views.ChartSettings.textAdvanced": "詳細設定の表示", - "SSE.Views.ChartSettings.textArea": "面グラフ", - "SSE.Views.ChartSettings.textBar": "横棒グラフ", "SSE.Views.ChartSettings.textChartType": "グラフの種類の変更", - "SSE.Views.ChartSettings.textColumn": "縦棒グラフ", "SSE.Views.ChartSettings.textEditData": "データの編集", "SSE.Views.ChartSettings.textHeight": "高さ", "SSE.Views.ChartSettings.textKeepRatio": "比例の定数", - "SSE.Views.ChartSettings.textLine": "折れ線グラフ", - "SSE.Views.ChartSettings.textPie": "円グラフ", - "SSE.Views.ChartSettings.textPoint": "点グラフ", "SSE.Views.ChartSettings.textSize": "サイズ", - "SSE.Views.ChartSettings.textStock": "株価チャート", "SSE.Views.ChartSettings.textStyle": "スタイル", "SSE.Views.ChartSettings.textWidth": "幅", "SSE.Views.ChartSettingsDlg.errorMaxRows": "エラー！使用可能なデータ系列の数は、1グラフあたり最大255個です。", "SSE.Views.ChartSettingsDlg.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", - "SSE.Views.ChartSettingsDlg.textArea": "面グラフ", "SSE.Views.ChartSettingsDlg.textAuto": "自動", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "軸との交点", "SSE.Views.ChartSettingsDlg.textAxisOptions": "軸のオプション", "SSE.Views.ChartSettingsDlg.textAxisPos": "軸位置", "SSE.Views.ChartSettingsDlg.textAxisSettings": "軸の設定", - "SSE.Views.ChartSettingsDlg.textBar": "横棒グラフ", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "目盛りの間", "SSE.Views.ChartSettingsDlg.textBillions": "十億", "SSE.Views.ChartSettingsDlg.textCategoryName": "カテゴリ名", "SSE.Views.ChartSettingsDlg.textCenter": "中央揃え", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "グラフ要素&
グラフの凡例", "SSE.Views.ChartSettingsDlg.textChartTitle": "グラフのタイトル", - "SSE.Views.ChartSettingsDlg.textColumn": "縦棒グラフ", "SSE.Views.ChartSettingsDlg.textCross": "十字形", "SSE.Views.ChartSettingsDlg.textCustom": "カスタム", "SSE.Views.ChartSettingsDlg.textDataColumns": "列に", @@ -325,7 +322,6 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "凡例", "SSE.Views.ChartSettingsDlg.textLegendRight": "右に", "SSE.Views.ChartSettingsDlg.textLegendTop": "トップ", - "SSE.Views.ChartSettingsDlg.textLine": "折れ線グラフ", "SSE.Views.ChartSettingsDlg.textLines": "行", "SSE.Views.ChartSettingsDlg.textLow": "ロー", "SSE.Views.ChartSettingsDlg.textMajor": "メジャー", @@ -346,8 +342,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "外", "SSE.Views.ChartSettingsDlg.textOuterTop": "外トップ", "SSE.Views.ChartSettingsDlg.textOverlay": "オーバーレイ", - "SSE.Views.ChartSettingsDlg.textPie": "円グラフ", - "SSE.Views.ChartSettingsDlg.textPoint": "点グラフ", "SSE.Views.ChartSettingsDlg.textReverse": "軸を反転する", "SSE.Views.ChartSettingsDlg.textRightOverlay": "右オーバーレイ", "SSE.Views.ChartSettingsDlg.textRotated": "回転", @@ -360,7 +354,6 @@ "SSE.Views.ChartSettingsDlg.textShowGrid": "グリッド線", "SSE.Views.ChartSettingsDlg.textShowValues": "グラフ値の表示", "SSE.Views.ChartSettingsDlg.textSmooth": "スムーズ", - "SSE.Views.ChartSettingsDlg.textStock": "株価チャート", "SSE.Views.ChartSettingsDlg.textStraight": "直線", "SSE.Views.ChartSettingsDlg.textStyle": "スタイル", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index f6a213d7b..564eabeb6 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -879,36 +879,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Color", "SSE.Views.ChartSettings.strTemplate": "템플릿", "SSE.Views.ChartSettings.textAdvanced": "고급 설정 표시", - "SSE.Views.ChartSettings.textArea": "Area", - "SSE.Views.ChartSettings.textBar": "Bar", "SSE.Views.ChartSettings.textBorderSizeErr": "입력 한 값이 잘못되었습니다.
0pt ~ 1584pt 사이의 값을 입력하십시오.", "SSE.Views.ChartSettings.textChartType": "차트 유형 변경", - "SSE.Views.ChartSettings.textColumn": "Column", - "SSE.Views.ChartSettings.textColumnSpark": "열", "SSE.Views.ChartSettings.textEditData": "데이터 및 위치 편집", "SSE.Views.ChartSettings.textFirstPoint": "첫 번째 지점", "SSE.Views.ChartSettings.textHeight": "높이", "SSE.Views.ChartSettings.textHighPoint": "높은 점수", "SSE.Views.ChartSettings.textKeepRatio": "상수 비율", "SSE.Views.ChartSettings.textLastPoint": "마지막 지점", - "SSE.Views.ChartSettings.textLine": "Line", - "SSE.Views.ChartSettings.textLineSpark": "Line", "SSE.Views.ChartSettings.textLowPoint": "Low Point", "SSE.Views.ChartSettings.textMarkers": "마커", "SSE.Views.ChartSettings.textNegativePoint": "Negative Point", "SSE.Views.ChartSettings.textNewColor": "새 사용자 지정 색 추가", - "SSE.Views.ChartSettings.textPie": "파이", - "SSE.Views.ChartSettings.textPoint": "XY (Scatter)", "SSE.Views.ChartSettings.textRanges": "데이터 범위", "SSE.Views.ChartSettings.textSelectData": "데이터 선택", "SSE.Views.ChartSettings.textShow": "표시", "SSE.Views.ChartSettings.textSize": "크기", - "SSE.Views.ChartSettings.textStock": "Stock", "SSE.Views.ChartSettings.textStyle": "스타일", - "SSE.Views.ChartSettings.textSurface": "Surface", "SSE.Views.ChartSettings.textType": "유형", "SSE.Views.ChartSettings.textWidth": "너비", - "SSE.Views.ChartSettings.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "문제발생! 차트당 시리즈내 포인트의 최대값은 4096임", "SSE.Views.ChartSettingsDlg.errorMaxRows": "오류! 차트 당 최대 데이터 시리즈 수는 255입니다.", "SSE.Views.ChartSettingsDlg.errorStockChart": "잘못된 행 순서. 주식형 차트를 작성하려면 시트의 데이터를 다음 순서로 배치하십시오 :
개시 가격, 최대 가격, 최소 가격, 마감 가격.", @@ -916,14 +905,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "설명", "SSE.Views.ChartSettingsDlg.textAltTip": "시력이나인지 장애가있는 사람들에게 읽혀지는 시각적 객체 정보의 대체 텍스트 기반 표현으로 이미지에 어떤 정보가 있는지 더 잘 이해할 수 있도록 도와줍니다. 차트 또는 표. ", "SSE.Views.ChartSettingsDlg.textAltTitle": "제목", - "SSE.Views.ChartSettingsDlg.textArea": "Area", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "각자 자동", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "축 옵션", "SSE.Views.ChartSettingsDlg.textAxisPos": "축 위치", "SSE.Views.ChartSettingsDlg.textAxisSettings": "축 설정", - "SSE.Views.ChartSettingsDlg.textBar": "Bar", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "눈금 사이", "SSE.Views.ChartSettingsDlg.textBillions": "10 억", "SSE.Views.ChartSettingsDlg.textBottom": "Bottom", @@ -931,8 +918,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "차트 요소 & 차트 범례", "SSE.Views.ChartSettingsDlg.textChartTitle": "차트 제목", - "SSE.Views.ChartSettingsDlg.textColumn": "Column", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "열", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "사용자 지정", "SSE.Views.ChartSettingsDlg.textDataColumns": "열에 있음", @@ -973,9 +958,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "범례", "SSE.Views.ChartSettingsDlg.textLegendRight": "오른쪽", "SSE.Views.ChartSettingsDlg.textLegendTop": "Top", - "SSE.Views.ChartSettingsDlg.textLine": "꺾은 선형 차트", "SSE.Views.ChartSettingsDlg.textLines": "Lines", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Line", "SSE.Views.ChartSettingsDlg.textLocationRange": "위치 범위", "SSE.Views.ChartSettingsDlg.textLow": "낮음", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -996,8 +979,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "외부 상단", "SSE.Views.ChartSettingsDlg.textOverlay": "오버레이", - "SSE.Views.ChartSettingsDlg.textPie": "파이", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)", "SSE.Views.ChartSettingsDlg.textReverse": "역순으로 값", "SSE.Views.ChartSettingsDlg.textReverseOrder": "역순", "SSE.Views.ChartSettingsDlg.textRight": "오른쪽", @@ -1018,10 +999,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "단일 스파크 라인", "SSE.Views.ChartSettingsDlg.textSmooth": "부드럽게", "SSE.Views.ChartSettingsDlg.textSparkRanges": "스파크 라인 범위", - "SSE.Views.ChartSettingsDlg.textStock": "Stock", "SSE.Views.ChartSettingsDlg.textStraight": "직선", "SSE.Views.ChartSettingsDlg.textStyle": "스타일", - "SSE.Views.ChartSettingsDlg.textSurface": "Surface", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "수천", @@ -1038,7 +1017,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "세로 축", "SSE.Views.ChartSettingsDlg.textVertGrid": "수직 눈금 선", "SSE.Views.ChartSettingsDlg.textVertTitle": "세로 축 제목", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X 축 제목", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y 축 제목", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1724,17 +1702,12 @@ "SSE.Views.Toolbar.textAlignRight": "오른쪽 정렬", "SSE.Views.Toolbar.textAlignTop": "Align Top", "SSE.Views.Toolbar.textAllBorders": "모든 테두리", - "SSE.Views.Toolbar.textArea": "Area", - "SSE.Views.Toolbar.textBar": "Bar", "SSE.Views.Toolbar.textBold": "Bold", "SSE.Views.Toolbar.textBordersColor": "테두리 색상", "SSE.Views.Toolbar.textBordersStyle": "테두리 스타일", "SSE.Views.Toolbar.textBottomBorders": "Bottom Borders", "SSE.Views.Toolbar.textCenterBorders": "내부 세로 테두리", - "SSE.Views.Toolbar.textCharts": "차트", "SSE.Views.Toolbar.textClockwise": "시계 방향으로 각도", - "SSE.Views.Toolbar.textColumn": "Column", - "SSE.Views.Toolbar.textColumnSpark": "Column", "SSE.Views.Toolbar.textCounterCw": "시계 반대 방향 각도", "SSE.Views.Toolbar.textDelLeft": "셀 왼쪽으로 시프트", "SSE.Views.Toolbar.textDelUp": "셀 이동", @@ -1748,27 +1721,20 @@ "SSE.Views.Toolbar.textInsRight": "셀 오른쪽으로 이동", "SSE.Views.Toolbar.textItalic": "Italic", "SSE.Views.Toolbar.textLeftBorders": "왼쪽 테두리", - "SSE.Views.Toolbar.textLine": "Line", - "SSE.Views.Toolbar.textLineSpark": "Line", "SSE.Views.Toolbar.textMiddleBorders": "내부 수평 테두리", "SSE.Views.Toolbar.textMoreFormats": "기타 형식", "SSE.Views.Toolbar.textNewColor": "새 사용자 지정 색 추가", "SSE.Views.Toolbar.textNoBorders": "테두리 없음", "SSE.Views.Toolbar.textOutBorders": "테두리 밖", - "SSE.Views.Toolbar.textPie": "파이", - "SSE.Views.Toolbar.textPoint": "XY (Scatter)", "SSE.Views.Toolbar.textPrint": "인쇄", "SSE.Views.Toolbar.textPrintOptions": "인쇄 설정", "SSE.Views.Toolbar.textRightBorders": "오른쪽 테두리", "SSE.Views.Toolbar.textRotateDown": "텍스트 아래로 회전", "SSE.Views.Toolbar.textRotateUp": "텍스트 회전", - "SSE.Views.Toolbar.textSparks": "스파크 라인", - "SSE.Views.Toolbar.textStock": "Stock", "SSE.Views.Toolbar.textStrikeout": "줄긋기", "SSE.Views.Toolbar.textSubscript": "첨자", "SSE.Views.Toolbar.textSubSuperscript": "첨자/위에 쓴", "SSE.Views.Toolbar.textSuperscript": "위에 쓴", - "SSE.Views.Toolbar.textSurface": "Surface", "SSE.Views.Toolbar.textTabCollaboration": "합치기", "SSE.Views.Toolbar.textTabFile": "파일", "SSE.Views.Toolbar.textTabHome": "집", @@ -1776,7 +1742,6 @@ "SSE.Views.Toolbar.textTabProtect": "보호", "SSE.Views.Toolbar.textTopBorders": "위쪽 테두리", "SSE.Views.Toolbar.textUnderline": "밑줄", - "SSE.Views.Toolbar.textWinLossSpark": "Win / Loss", "SSE.Views.Toolbar.textZoom": "확대 / 축소", "SSE.Views.Toolbar.tipAlignBottom": "아래쪽 정렬", "SSE.Views.Toolbar.tipAlignCenter": "정렬 센터", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 058f2dde0..ff4cc38db 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -872,36 +872,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Krāsa", "SSE.Views.ChartSettings.strTemplate": "Veidne", "SSE.Views.ChartSettings.textAdvanced": "Show advanced settings", - "SSE.Views.ChartSettings.textArea": "Apgabals", - "SSE.Views.ChartSettings.textBar": "Josla", "SSE.Views.ChartSettings.textBorderSizeErr": "Ievadītā vērtība nav pareiza.
Lūdzu, ievadiet vērtību starp 0 pt un 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Izmainīt diagrammas veidu", - "SSE.Views.ChartSettings.textColumn": "Kolonna", - "SSE.Views.ChartSettings.textColumnSpark": "Kolonna", "SSE.Views.ChartSettings.textEditData": "Edit Data", "SSE.Views.ChartSettings.textFirstPoint": "Pirmais punkts", "SSE.Views.ChartSettings.textHeight": "Height", "SSE.Views.ChartSettings.textHighPoint": "Augstais punkts", "SSE.Views.ChartSettings.textKeepRatio": "Constant Proportions", "SSE.Views.ChartSettings.textLastPoint": "Pēdējais punkts", - "SSE.Views.ChartSettings.textLine": "Līnija", - "SSE.Views.ChartSettings.textLineSpark": "Līnija", "SSE.Views.ChartSettings.textLowPoint": "Minimālais punkts", "SSE.Views.ChartSettings.textMarkers": "Marķieri", "SSE.Views.ChartSettings.textNegativePoint": "Negatīvais punkts", "SSE.Views.ChartSettings.textNewColor": "Pievienot jaunu krāsu", - "SSE.Views.ChartSettings.textPie": "Sektoru diagramma", - "SSE.Views.ChartSettings.textPoint": "Punkts", "SSE.Views.ChartSettings.textRanges": "Datu diapazons", "SSE.Views.ChartSettings.textSelectData": "Izvēlēties datus", "SSE.Views.ChartSettings.textShow": "Rādīt", "SSE.Views.ChartSettings.textSize": "Size", - "SSE.Views.ChartSettings.textStock": "Akcijas", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textSurface": "Virsma", "SSE.Views.ChartSettings.textType": "Veids", "SSE.Views.ChartSettings.textWidth": "Width", - "SSE.Views.ChartSettings.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "KĻŪDA! Kopējais maksimālais sērijas punktu skaits diagrammā ir 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nederīga rindu kārtība. Lai izveidotu akciju diagrammu novietojiet datus lapā šādā secībā:
Sākumcena, maksimālā cena, minimālā cena, slēgšanas cena.", @@ -909,14 +898,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Apraksts", "SSE.Views.ChartSettingsDlg.textAltTip": "Vizuālās objekta informācijas attainojums alternatīvā teksta veidā, kuru lasīs cilvēki ar redze vai uztveres traucējumiem un kuriem tas labāk palīdzēs izprast, kāda informācija ir ietverta tekstā, automātiskajā figūrā, diagrammā vai tabulā.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Nosaukums", - "SSE.Views.ChartSettingsDlg.textArea": "Apgabals", "SSE.Views.ChartSettingsDlg.textAuto": "Auto", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automātiski katram", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options", "SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Josla", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks", "SSE.Views.ChartSettingsDlg.textBillions": "Billions", "SSE.Views.ChartSettingsDlg.textBottom": "Apakšā", @@ -924,8 +911,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Center", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &
Chart Legend", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafika nosaukums", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolonna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolonna", "SSE.Views.ChartSettingsDlg.textCross": "Cross", "SSE.Views.ChartSettingsDlg.textCustom": "Custom", "SSE.Views.ChartSettingsDlg.textDataColumns": "Datu sērijas kolonnās", @@ -966,9 +951,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legend", "SSE.Views.ChartSettingsDlg.textLegendRight": "Pa labi", "SSE.Views.ChartSettingsDlg.textLegendTop": "Augšā", - "SSE.Views.ChartSettingsDlg.textLine": "Līnija", "SSE.Views.ChartSettingsDlg.textLines": "Lines ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Rinda", "SSE.Views.ChartSettingsDlg.textLocationRange": "Atrašanās vietas diapazons", "SSE.Views.ChartSettingsDlg.textLow": "Low", "SSE.Views.ChartSettingsDlg.textMajor": "Major", @@ -989,8 +972,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Out", "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "SSE.Views.ChartSettingsDlg.textPie": "Sektoru diagramma", - "SSE.Views.ChartSettingsDlg.textPoint": "Punkts", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Apgrieztā secībā", "SSE.Views.ChartSettingsDlg.textRight": "Pa labi", @@ -1011,10 +992,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Atsevišķs spārklains", "SSE.Views.ChartSettingsDlg.textSmooth": "Smooth", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Spārklainu diapazoni", - "SSE.Views.ChartSettingsDlg.textStock": "Akcijas", "SSE.Views.ChartSettingsDlg.textStraight": "Straight", "SSE.Views.ChartSettingsDlg.textStyle": "Style", - "SSE.Views.ChartSettingsDlg.textSurface": "Virsma", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Thousands", @@ -1031,7 +1010,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertical Axis", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertical Gridlines", "SSE.Views.ChartSettingsDlg.textVertTitle": "Vertical Axis Title", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X ass virsraksts", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y ass virsraksts", "SSE.Views.ChartSettingsDlg.textZero": "Nulle", @@ -1720,17 +1698,12 @@ "SSE.Views.Toolbar.textAlignRight": "Līdzināt pa labi", "SSE.Views.Toolbar.textAlignTop": "Līdzināt uz augšu", "SSE.Views.Toolbar.textAllBorders": "Visas Apmales", - "SSE.Views.Toolbar.textArea": "Apgabals", - "SSE.Views.Toolbar.textBar": "Josla", "SSE.Views.Toolbar.textBold": "Treknraksts", "SSE.Views.Toolbar.textBordersColor": "Apmales krāsa", "SSE.Views.Toolbar.textBordersStyle": "Robežas stils", "SSE.Views.Toolbar.textBottomBorders": "Apakšējās Apmales", "SSE.Views.Toolbar.textCenterBorders": "Iekšējās Vertikālās Apmales", - "SSE.Views.Toolbar.textCharts": "Diagrammas", "SSE.Views.Toolbar.textClockwise": "Angle Clockwise", - "SSE.Views.Toolbar.textColumn": "Kolonna", - "SSE.Views.Toolbar.textColumnSpark": "Kolonna", "SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise", "SSE.Views.Toolbar.textDelLeft": "Shift Cells Left", "SSE.Views.Toolbar.textDelUp": "Shift Cells Up", @@ -1744,27 +1717,20 @@ "SSE.Views.Toolbar.textInsRight": "Shift Cells Right", "SSE.Views.Toolbar.textItalic": "Kursīvs", "SSE.Views.Toolbar.textLeftBorders": "Kreisās Apmales", - "SSE.Views.Toolbar.textLine": "Līnija", - "SSE.Views.Toolbar.textLineSpark": "Līnija", "SSE.Views.Toolbar.textMiddleBorders": "Iekšējās Horizontālās Apmales", "SSE.Views.Toolbar.textMoreFormats": "Vairāk formātu", "SSE.Views.Toolbar.textNewColor": "Pievienot jauno krāsu", "SSE.Views.Toolbar.textNoBorders": "Nav apmales", "SSE.Views.Toolbar.textOutBorders": "Ārējās Apmales", - "SSE.Views.Toolbar.textPie": "Sektoru diagramma", - "SSE.Views.Toolbar.textPoint": "Punkts (XY)", "SSE.Views.Toolbar.textPrint": "Drukāt", "SSE.Views.Toolbar.textPrintOptions": "Drukāšanas opcijas", "SSE.Views.Toolbar.textRightBorders": "Labās Apmales", "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", - "SSE.Views.Toolbar.textSparks": "Spārklaini", - "SSE.Views.Toolbar.textStock": "Akcijas", "SSE.Views.Toolbar.textStrikeout": "Izsvītrošana", "SSE.Views.Toolbar.textSubscript": "Apakšteksts", "SSE.Views.Toolbar.textSubSuperscript": "Apakšraksts/augšraksts", "SSE.Views.Toolbar.textSuperscript": "Augšraksts", - "SSE.Views.Toolbar.textSurface": "Virsma", "SSE.Views.Toolbar.textTabCollaboration": "Sadarbība", "SSE.Views.Toolbar.textTabFile": "Fails", "SSE.Views.Toolbar.textTabHome": "Sākums", @@ -1772,7 +1738,6 @@ "SSE.Views.Toolbar.textTabProtect": "Aizsardzība", "SSE.Views.Toolbar.textTopBorders": "Augšējās Apmales", "SSE.Views.Toolbar.textUnderline": "Pasvītrots", - "SSE.Views.Toolbar.textWinLossSpark": "Ieguvums/zaudējums", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Align Bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align Center", diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index 998fa9e6a..7b53b6968 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -2,6 +2,18 @@ "cancelButtonText": "Annuleren", "Common.Controllers.Chat.notcriticalErrorTitle": "Waarschuwing", "Common.Controllers.Chat.textEnterMessage": "Voer hier uw bericht in", + "Common.define.chartData.textArea": "Vlak", + "Common.define.chartData.textBar": "Staaf", + "Common.define.chartData.textColumn": "Kolom", + "Common.define.chartData.textLine": "Lijn", + "Common.define.chartData.textPie": "Cirkel", + "Common.define.chartData.textPoint": "Spreiding", + "Common.define.chartData.textStock": "Voorraad", + "Common.define.chartData.textSurface": "Oppervlak", + "Common.define.chartData.textColumnSpark": "Kolom", + "Common.define.chartData.textLineSpark": "Lijn", + "Common.define.chartData.textWinLossSpark": "Winst/verlies", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -879,36 +891,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Kleur", "SSE.Views.ChartSettings.strTemplate": "Sjabloon", "SSE.Views.ChartSettings.textAdvanced": "Geavanceerde instellingen tonen", - "SSE.Views.ChartSettings.textArea": "Vlak", - "SSE.Views.ChartSettings.textBar": "Staaf", "SSE.Views.ChartSettings.textBorderSizeErr": "De ingevoerde waarde is onjuist.
Voer een waarde tussen 0 pt en 1584 pt in.", "SSE.Views.ChartSettings.textChartType": "Grafiektype wijzigen", - "SSE.Views.ChartSettings.textColumn": "Kolom", - "SSE.Views.ChartSettings.textColumnSpark": "Kolom", "SSE.Views.ChartSettings.textEditData": "Gegevens en locatie bewerken", "SSE.Views.ChartSettings.textFirstPoint": "Eerste punt", "SSE.Views.ChartSettings.textHeight": "Hoogte", "SSE.Views.ChartSettings.textHighPoint": "Hoogste punt", "SSE.Views.ChartSettings.textKeepRatio": "Constante verhoudingen", "SSE.Views.ChartSettings.textLastPoint": "Laatste punt", - "SSE.Views.ChartSettings.textLine": "Lijn", - "SSE.Views.ChartSettings.textLineSpark": "Lijn", "SSE.Views.ChartSettings.textLowPoint": "Laagste punt", "SSE.Views.ChartSettings.textMarkers": "Markeringen", "SSE.Views.ChartSettings.textNegativePoint": "Negatief punt", "SSE.Views.ChartSettings.textNewColor": "Nieuwe aangepaste kleur toevoegen", - "SSE.Views.ChartSettings.textPie": "Cirkel", - "SSE.Views.ChartSettings.textPoint": "Spreiding", "SSE.Views.ChartSettings.textRanges": "Gegevensbereik", "SSE.Views.ChartSettings.textSelectData": "Gegevens selecteren", "SSE.Views.ChartSettings.textShow": "Tonen", "SSE.Views.ChartSettings.textSize": "Grootte", - "SSE.Views.ChartSettings.textStock": "Voorraad", "SSE.Views.ChartSettings.textStyle": "Stijl", - "SSE.Views.ChartSettings.textSurface": "Oppervlak", "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Breedte", - "SSE.Views.ChartSettings.textWinLossSpark": "Winst/verlies", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "Fout! Het maximaal aantal punten in een serie per grafiek is 4096", "SSE.Views.ChartSettingsDlg.errorMaxRows": "FOUT! Het maximumaantal gegevensreeksen per grafiek is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Onjuiste volgorde rijen. Als u een aandelengrafiek wilt maken, zet u de rijen in de volgende volgorde op het blad:
beginkoers, hoogste koers, laagste koers, slotkoers.", @@ -916,14 +917,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Beschrijving", "SSE.Views.ChartSettingsDlg.textAltTip": "De alternatieve, op tekst gebaseerde weergave van de visuele objectinformatie. Deze wordt voorgelezen voor mensen met visuele of cognitieve handicaps om hen te helpen begrijpen welke informatie aanwezig is in de afbeelding, AutoVorm, grafiek of tabel.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titel", - "SSE.Views.ChartSettingsDlg.textArea": "Vlak", "SSE.Views.ChartSettingsDlg.textAuto": "Automatisch", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatisch voor elk", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Snijpunten assen", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Asopties", "SSE.Views.ChartSettingsDlg.textAxisPos": "Aspositie", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Asinstellingen", - "SSE.Views.ChartSettingsDlg.textBar": "Staaf", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tussen maatstreepjes", "SSE.Views.ChartSettingsDlg.textBillions": "Miljarden", "SSE.Views.ChartSettingsDlg.textBottom": "Onder", @@ -931,8 +930,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Centreren", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Grafiekelementen en
grafieklegenda", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafiektitel", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolom", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolom", "SSE.Views.ChartSettingsDlg.textCross": "Snijpunt", "SSE.Views.ChartSettingsDlg.textCustom": "Aangepast", "SSE.Views.ChartSettingsDlg.textDataColumns": "in kolommen", @@ -973,9 +970,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Rechts", "SSE.Views.ChartSettingsDlg.textLegendTop": "Boven", - "SSE.Views.ChartSettingsDlg.textLine": "Lijngrafiek", "SSE.Views.ChartSettingsDlg.textLines": "Lijnen", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Lijn", "SSE.Views.ChartSettingsDlg.textLocationRange": "Locatiebereik", "SSE.Views.ChartSettingsDlg.textLow": "Laag", "SSE.Views.ChartSettingsDlg.textMajor": "Primair", @@ -996,8 +991,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Buiten", "SSE.Views.ChartSettingsDlg.textOuterTop": "Buiten boven", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", - "SSE.Views.ChartSettingsDlg.textPie": "Cirkel", - "SSE.Views.ChartSettingsDlg.textPoint": "Spreiding", "SSE.Views.ChartSettingsDlg.textReverse": "Waarden in omgekeerde volgorde", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Volgorde omkeren", "SSE.Views.ChartSettingsDlg.textRight": "Rechts", @@ -1018,10 +1011,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Enkele sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Glad", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Bereiken sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Voorraad", "SSE.Views.ChartSettingsDlg.textStraight": "Recht", "SSE.Views.ChartSettingsDlg.textStyle": "Stijl", - "SSE.Views.ChartSettingsDlg.textSurface": "Oppervlak", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Duizenden", @@ -1038,7 +1029,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Verticale as", "SSE.Views.ChartSettingsDlg.textVertGrid": "Verticale rasterlijnen", "SSE.Views.ChartSettingsDlg.textVertTitle": "Titel verticale as", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Winst/verlies", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Titel x-as", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Titel Y-as", "SSE.Views.ChartSettingsDlg.textZero": "Nul", @@ -1730,17 +1720,12 @@ "SSE.Views.Toolbar.textAlignRight": "Rechts uitlijnen", "SSE.Views.Toolbar.textAlignTop": "Boven uitlijnen", "SSE.Views.Toolbar.textAllBorders": "Alle randen", - "SSE.Views.Toolbar.textArea": "Vlak", - "SSE.Views.Toolbar.textBar": "Staaf", "SSE.Views.Toolbar.textBold": "Vet", "SSE.Views.Toolbar.textBordersColor": "Randkleur", "SSE.Views.Toolbar.textBordersStyle": "Stijl rand", "SSE.Views.Toolbar.textBottomBorders": "Onderranden", "SSE.Views.Toolbar.textCenterBorders": "Verticale binnenranden", - "SSE.Views.Toolbar.textCharts": "Grafieken", "SSE.Views.Toolbar.textClockwise": "Rechtsom draaien", - "SSE.Views.Toolbar.textColumn": "Kolom", - "SSE.Views.Toolbar.textColumnSpark": "Kolom", "SSE.Views.Toolbar.textCounterCw": "Linksom draaien", "SSE.Views.Toolbar.textDelLeft": "Cellen naar links verplaatsen", "SSE.Views.Toolbar.textDelUp": "Cellen naar boven verplaatsen", @@ -1754,27 +1739,20 @@ "SSE.Views.Toolbar.textInsRight": "Cellen naar rechts verplaatsen", "SSE.Views.Toolbar.textItalic": "Cursief", "SSE.Views.Toolbar.textLeftBorders": "Linkerranden", - "SSE.Views.Toolbar.textLine": "Lijn", - "SSE.Views.Toolbar.textLineSpark": "Lijn", "SSE.Views.Toolbar.textMiddleBorders": "Horizontale binnenranden", "SSE.Views.Toolbar.textMoreFormats": "Meer indelingen", "SSE.Views.Toolbar.textNewColor": "Nieuwe aangepaste kleur toevoegen", "SSE.Views.Toolbar.textNoBorders": "Geen randen", "SSE.Views.Toolbar.textOutBorders": "Buitenranden", - "SSE.Views.Toolbar.textPie": "Cirkel", - "SSE.Views.Toolbar.textPoint": "Spreiding", "SSE.Views.Toolbar.textPrint": "Afdrukken", "SSE.Views.Toolbar.textPrintOptions": "Afdrukinstellingen", "SSE.Views.Toolbar.textRightBorders": "Rechterranden", "SSE.Views.Toolbar.textRotateDown": "Tekst omlaag draaien", "SSE.Views.Toolbar.textRotateUp": "Tekst omhoog draaien", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Voorraad", "SSE.Views.Toolbar.textStrikeout": "Doorhalen", "SSE.Views.Toolbar.textSubscript": "Subscript", "SSE.Views.Toolbar.textSubSuperscript": "Subscript/Superscript", "SSE.Views.Toolbar.textSuperscript": "Superscript", - "SSE.Views.Toolbar.textSurface": "Oppervlak", "SSE.Views.Toolbar.textTabCollaboration": "Samenwerking", "SSE.Views.Toolbar.textTabFile": "Bestand", "SSE.Views.Toolbar.textTabHome": "Home", @@ -1782,7 +1760,6 @@ "SSE.Views.Toolbar.textTabProtect": "Beveiliging", "SSE.Views.Toolbar.textTopBorders": "Bovenranden", "SSE.Views.Toolbar.textUnderline": "Onderstrepen", - "SSE.Views.Toolbar.textWinLossSpark": "Winst/verlies", "SSE.Views.Toolbar.textZoom": "Zoomen", "SSE.Views.Toolbar.tipAlignBottom": "Onder uitlijnen", "SSE.Views.Toolbar.tipAlignCenter": "Midden uitlijnen", diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index f9d7522c8..9d81f4c32 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -2,6 +2,18 @@ "cancelButtonText": "Anuluj", "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie", "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj", + "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textStock": "Zbiory", + "Common.define.chartData.textSurface": "Powierzchnia", + "Common.define.chartData.textColumnSpark": "Kolumna", + "Common.define.chartData.textWinLossSpark": "Wygrana/przegrana", + "Common.define.chartData.textLineSpark": "Wiersz", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -793,50 +805,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Kolor", "SSE.Views.ChartSettings.strTemplate": "Szablon", "SSE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "SSE.Views.ChartSettings.textArea": "Obszar", - "SSE.Views.ChartSettings.textBar": "Paskowy", "SSE.Views.ChartSettings.textBorderSizeErr": "Wprowadzona wartość jest nieprawidłowa.
Wprowadź wartość w zakresie od 0 do 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Zmień typ wykresu", - "SSE.Views.ChartSettings.textColumn": "Kolumna", - "SSE.Views.ChartSettings.textColumnSpark": "Kolumna", "SSE.Views.ChartSettings.textEditData": "Edytuj datę i lokalizację", "SSE.Views.ChartSettings.textFirstPoint": "Pierwszy punkt", "SSE.Views.ChartSettings.textHeight": "Wysokość", "SSE.Views.ChartSettings.textHighPoint": "Punkt wysokości", "SSE.Views.ChartSettings.textKeepRatio": "Stałe proporcje", "SSE.Views.ChartSettings.textLastPoint": "Punkt końcowy", - "SSE.Views.ChartSettings.textLine": "Wiersz", - "SSE.Views.ChartSettings.textLineSpark": "Wiersz", "SSE.Views.ChartSettings.textLowPoint": "Najniższy punkt", "SSE.Views.ChartSettings.textMarkers": "Znaczniki", "SSE.Views.ChartSettings.textNegativePoint": "Punkt negatywny", "SSE.Views.ChartSettings.textNewColor": "Nowy niestandardowy kolor", - "SSE.Views.ChartSettings.textPie": "Kołowe", - "SSE.Views.ChartSettings.textPoint": "XY (Punktowy)", "SSE.Views.ChartSettings.textRanges": "Zakres danych", "SSE.Views.ChartSettings.textSelectData": "Wybierz dane", "SSE.Views.ChartSettings.textShow": "Pokaż", "SSE.Views.ChartSettings.textSize": "Rozmiar", - "SSE.Views.ChartSettings.textStock": "Zbiory", "SSE.Views.ChartSettings.textStyle": "Styl", - "SSE.Views.ChartSettings.textSurface": "Powierzchnia", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Szerokość", - "SSE.Views.ChartSettings.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.ChartSettingsDlg.errorMaxRows": "BŁĄD! Maksymalna liczba serii danych na wykresie wynosi 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", "SSE.Views.ChartSettingsDlg.textAlt": "Tekst alternatywny", "SSE.Views.ChartSettingsDlg.textAltDescription": "Opis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternatywna prezentacja wizualnych informacji o obiektach, które będą czytane osobom z wadami wzroku lub zmysłu poznawczego, aby lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształtach, wykresie lub tabeli.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Tytuł", - "SSE.Views.ChartSettingsDlg.textArea": "Obszar", "SSE.Views.ChartSettingsDlg.textAuto": "Automatyczny", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automatycznie dla każdego", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Krzywe osie", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opcje osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Pozycja osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Ustawienia osi", - "SSE.Views.ChartSettingsDlg.textBar": "Paskowy", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Pomiędzy znakami Tick", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dół", @@ -844,8 +843,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Środek", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementy wykresu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Tytuł wykresu", - "SSE.Views.ChartSettingsDlg.textColumn": "Kolumna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Kolumna", "SSE.Views.ChartSettingsDlg.textCross": "Na skrzyżowaniu", "SSE.Views.ChartSettingsDlg.textCustom": "Niestandardowy", "SSE.Views.ChartSettingsDlg.textDataColumns": "w kolumnach", @@ -886,9 +883,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Prawy", "SSE.Views.ChartSettingsDlg.textLegendTop": "Góra", - "SSE.Views.ChartSettingsDlg.textLine": "Wykres liniowy", "SSE.Views.ChartSettingsDlg.textLines": "Linie", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Wiersz", "SSE.Views.ChartSettingsDlg.textLocationRange": "Zakres lokalizacji", "SSE.Views.ChartSettingsDlg.textLow": "Niski", "SSE.Views.ChartSettingsDlg.textMajor": "Główny", @@ -909,8 +904,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Wyjście", "SSE.Views.ChartSettingsDlg.textOuterTop": "Wierzchołek zewnętrzny", "SSE.Views.ChartSettingsDlg.textOverlay": "Nałożenie", - "SSE.Views.ChartSettingsDlg.textPie": "Kołowe", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Punktowy)", "SSE.Views.ChartSettingsDlg.textReverse": "Wartości w odwrotnej kolejności", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Odwrotna kolejność", "SSE.Views.ChartSettingsDlg.textRight": "Prawy", @@ -931,10 +924,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Pojedynczy Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Gładki", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", - "SSE.Views.ChartSettingsDlg.textStock": "Zbiory", "SSE.Views.ChartSettingsDlg.textStraight": "Prosty", "SSE.Views.ChartSettingsDlg.textStyle": "Styl", - "SSE.Views.ChartSettingsDlg.textSurface": "Powierzchnia", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tysiące", @@ -951,7 +942,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Oś pionowa", "SSE.Views.ChartSettingsDlg.textVertGrid": "Pionowe linie siatki", "SSE.Views.ChartSettingsDlg.textVertTitle": "Tytuł osi pionowej", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Tytuł osi X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Tytuł osi Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1538,17 +1528,12 @@ "SSE.Views.Toolbar.textAlignRight": "Wyrównaj do prawej", "SSE.Views.Toolbar.textAlignTop": "Wyrównaj do góry", "SSE.Views.Toolbar.textAllBorders": "Wszystkie krawędzie", - "SSE.Views.Toolbar.textArea": "Obszar", - "SSE.Views.Toolbar.textBar": "Pasek", "SSE.Views.Toolbar.textBold": "Pogrubienie", "SSE.Views.Toolbar.textBordersColor": "Kolor obramowania", "SSE.Views.Toolbar.textBordersStyle": "Styl obramowania", "SSE.Views.Toolbar.textBottomBorders": "Dolne krawędzie", "SSE.Views.Toolbar.textCenterBorders": "Wewnątrz pionowych granic", - "SSE.Views.Toolbar.textCharts": "Wykresy", "SSE.Views.Toolbar.textClockwise": "Kąt w prawo", - "SSE.Views.Toolbar.textColumn": "Kolumna", - "SSE.Views.Toolbar.textColumnSpark": "Kolumna", "SSE.Views.Toolbar.textCounterCw": "Kąt w lewo", "SSE.Views.Toolbar.textDelLeft": "Przesuń komórki w lewo", "SSE.Views.Toolbar.textDelUp": "Przesuń komórki w górę", @@ -1562,23 +1547,16 @@ "SSE.Views.Toolbar.textInsRight": "Przesuń komórki w prawo", "SSE.Views.Toolbar.textItalic": "Kursywa", "SSE.Views.Toolbar.textLeftBorders": "Lewe krawędzie", - "SSE.Views.Toolbar.textLine": "Wiersz", - "SSE.Views.Toolbar.textLineSpark": "Wiersz", "SSE.Views.Toolbar.textMiddleBorders": "Wewnątrz poziomych granic", "SSE.Views.Toolbar.textMoreFormats": "Więcej formatów", "SSE.Views.Toolbar.textNewColor": "Nowy niestandardowy kolor", "SSE.Views.Toolbar.textNoBorders": "Bez krawędzi", "SSE.Views.Toolbar.textOutBorders": "Krawędzie zewnętrzne", - "SSE.Views.Toolbar.textPie": "Kołowe", - "SSE.Views.Toolbar.textPoint": "XY (Punktowy)", "SSE.Views.Toolbar.textPrint": "Drukuj", "SSE.Views.Toolbar.textPrintOptions": "Ustawienia drukowania", "SSE.Views.Toolbar.textRightBorders": "Prawe krawędzie", "SSE.Views.Toolbar.textRotateDown": "Obróć tekst w dół", "SSE.Views.Toolbar.textRotateUp": "Obróć tekst w górę", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Zbiory", - "SSE.Views.Toolbar.textSurface": "Powierzchnia", "SSE.Views.Toolbar.textTabCollaboration": "Współpraca", "SSE.Views.Toolbar.textTabFile": "Plik", "SSE.Views.Toolbar.textTabHome": "Narzędzia główne", @@ -1586,7 +1564,6 @@ "SSE.Views.Toolbar.textTabLayout": "Układ", "SSE.Views.Toolbar.textTopBorders": "Górne krawędzie", "SSE.Views.Toolbar.textUnderline": "Podkreśl", - "SSE.Views.Toolbar.textWinLossSpark": "Wygrana/przegrana", "SSE.Views.Toolbar.textZoom": "Powiększenie", "SSE.Views.Toolbar.tipAlignBottom": "Wyrównaj do dołu", "SSE.Views.Toolbar.tipAlignCenter": "Wyrównaj do środka", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 1083b085e..cb0105d67 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -2,6 +2,18 @@ "cancelButtonText": "Cancelar", "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Inserir sua mensagem aqui", + "Common.define.chartData.textArea": "Área", + "Common.define.chartData.textBar": "Barra", + "Common.define.chartData.textColumn": "Coluna", + "Common.define.chartData.textLine": "Linha", + "Common.define.chartData.textPie": "Gráfico de pizza", + "Common.define.chartData.textPoint": "Gráfico de pontos", + "Common.define.chartData.textStock": "Gráfico de ações", + "Common.define.chartData.textSurface": "Superfície", + "Common.define.chartData.textColumnSpark": "Coluna", + "Common.define.chartData.textLineSpark": "Linha", + "Common.define.chartData.textWinLossSpark": "Ganhos/Perdas", + "Common.define.chartData.textSparks": "Minigráficos", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -777,50 +789,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Cor", "SSE.Views.ChartSettings.strTemplate": "Modelo", "SSE.Views.ChartSettings.textAdvanced": "Exibir configurações avançadas", - "SSE.Views.ChartSettings.textArea": "Gráfico de área", - "SSE.Views.ChartSettings.textBar": "Gráfico de Barras", "SSE.Views.ChartSettings.textBorderSizeErr": "O valor inserido está incorreto.
Insira um valor entre 0 pt e 1.584 pt.", "SSE.Views.ChartSettings.textChartType": "Alterar tipo de gráfico", - "SSE.Views.ChartSettings.textColumn": "Gráfico de coluna", - "SSE.Views.ChartSettings.textColumnSpark": "Coluna", "SSE.Views.ChartSettings.textEditData": "Editar dados", "SSE.Views.ChartSettings.textFirstPoint": "Primeiro ponto", "SSE.Views.ChartSettings.textHeight": "Altura", "SSE.Views.ChartSettings.textHighPoint": "Ponto alto", "SSE.Views.ChartSettings.textKeepRatio": "Proporções constantes", "SSE.Views.ChartSettings.textLastPoint": "Último ponto", - "SSE.Views.ChartSettings.textLine": "Gráfico de linha", - "SSE.Views.ChartSettings.textLineSpark": "Linha", "SSE.Views.ChartSettings.textLowPoint": "Ponto baixo", "SSE.Views.ChartSettings.textMarkers": "Marcadores", "SSE.Views.ChartSettings.textNegativePoint": "Ponto negativo", "SSE.Views.ChartSettings.textNewColor": "Adicionar nova cor personalizada", - "SSE.Views.ChartSettings.textPie": "Gráfico de pizza", - "SSE.Views.ChartSettings.textPoint": "Gráfico de pontos", "SSE.Views.ChartSettings.textRanges": "Intervalo de dados", "SSE.Views.ChartSettings.textSelectData": "Selecionar dados", "SSE.Views.ChartSettings.textShow": "Exibir", "SSE.Views.ChartSettings.textSize": "Tamanho", - "SSE.Views.ChartSettings.textStock": "Gráfico de ações", "SSE.Views.ChartSettings.textStyle": "Estilo", - "SSE.Views.ChartSettings.textSurface": "Superfície", "SSE.Views.ChartSettings.textType": "Tipo", "SSE.Views.ChartSettings.textWidth": "Largura", - "SSE.Views.ChartSettings.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERRO! O número máximo de séries de dado por gráfico é 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Ordem da linha incorreta. Para criar um gráfico de ações coloque os dados na planilha na seguinte ordem:
preço de abertura, preço máx., preço mín., preço de fechamento.", "SSE.Views.ChartSettingsDlg.textAlt": "Texto Alternativo", "SSE.Views.ChartSettingsDlg.textAltDescription": "Descrição", "SSE.Views.ChartSettingsDlg.textAltTip": "A representação alternativa baseada em texto da informação visual do objeto, que será lida para as pessoas com deficiências visuais ou cognitivas para ajudá-las a entender melhor que informação, forma automática, gráfico ou tabela existe na imagem.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Título", - "SSE.Views.ChartSettingsDlg.textArea": "Gráfico de área", "SSE.Views.ChartSettingsDlg.textAuto": "Automático", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto para cada", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Eixos cruzam", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opções de eixo", "SSE.Views.ChartSettingsDlg.textAxisPos": "Posição de eixos", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de Barras", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de escala", "SSE.Views.ChartSettingsDlg.textBillions": "Bilhões", "SSE.Views.ChartSettingsDlg.textBottom": "Inferior", @@ -828,8 +827,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Centro", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos do gráfico e
Legenda do gráfico", "SSE.Views.ChartSettingsDlg.textChartTitle": "Título do gráfico", - "SSE.Views.ChartSettingsDlg.textColumn": "Gráfico de coluna", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Coluna", "SSE.Views.ChartSettingsDlg.textCross": "Cruz", "SSE.Views.ChartSettingsDlg.textCustom": "Personalizar", "SSE.Views.ChartSettingsDlg.textDataColumns": "em colunas", @@ -870,9 +867,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Direita", "SSE.Views.ChartSettingsDlg.textLegendTop": "Parte superior", - "SSE.Views.ChartSettingsDlg.textLine": "Gráfico de linha", "SSE.Views.ChartSettingsDlg.textLines": "Linhas", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Linha", "SSE.Views.ChartSettingsDlg.textLocationRange": "Intervalo de localização", "SSE.Views.ChartSettingsDlg.textLow": "Baixo", "SSE.Views.ChartSettingsDlg.textMajor": "Maior", @@ -893,8 +888,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Fora", "SSE.Views.ChartSettingsDlg.textOuterTop": "Fora do topo", "SSE.Views.ChartSettingsDlg.textOverlay": "Sobreposição", - "SSE.Views.ChartSettingsDlg.textPie": "Gráfico de pizza", - "SSE.Views.ChartSettingsDlg.textPoint": "Gráfico de pontos", "SSE.Views.ChartSettingsDlg.textReverse": "Valores na ordem reversa", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Ordem reversa", "SSE.Views.ChartSettingsDlg.textRight": "Direita", @@ -915,10 +908,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Minigráfico único", "SSE.Views.ChartSettingsDlg.textSmooth": "Suave", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Variedade de minigráficos", - "SSE.Views.ChartSettingsDlg.textStock": "Gráfico de ações", "SSE.Views.ChartSettingsDlg.textStraight": "Reto", "SSE.Views.ChartSettingsDlg.textStyle": "Estilo", - "SSE.Views.ChartSettingsDlg.textSurface": "Superfície", "SSE.Views.ChartSettingsDlg.textTenMillions": "10.000.000 ", "SSE.Views.ChartSettingsDlg.textTenThousands": "10.000 ", "SSE.Views.ChartSettingsDlg.textThousands": "Milhares", @@ -935,7 +926,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Eixo vertical", "SSE.Views.ChartSettingsDlg.textVertGrid": "Linhas de grade verticais", "SSE.Views.ChartSettingsDlg.textVertTitle": "Título do eixo vertical", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Título do eixo X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Título do eixo Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", @@ -1518,17 +1508,12 @@ "SSE.Views.Toolbar.textAlignRight": "Alinhar à direita", "SSE.Views.Toolbar.textAlignTop": "Alinhar à parte superior", "SSE.Views.Toolbar.textAllBorders": "Todas as bordas", - "SSE.Views.Toolbar.textArea": "Área", - "SSE.Views.Toolbar.textBar": "Barra", "SSE.Views.Toolbar.textBold": "Negrito", "SSE.Views.Toolbar.textBordersColor": "Cor da borda", "SSE.Views.Toolbar.textBordersStyle": "Estilo de borda", "SSE.Views.Toolbar.textBottomBorders": "Bordas inferiores", "SSE.Views.Toolbar.textCenterBorders": "Bordas verticais interiores", - "SSE.Views.Toolbar.textCharts": "Gráficos", "SSE.Views.Toolbar.textClockwise": "Ângulo no sentido horário", - "SSE.Views.Toolbar.textColumn": "Coluna", - "SSE.Views.Toolbar.textColumnSpark": "Coluna", "SSE.Views.Toolbar.textCounterCw": "Ângulo no sentido antihorário", "SSE.Views.Toolbar.textDelLeft": "Deslocar células para a esquerda", "SSE.Views.Toolbar.textDelUp": "Deslocar células para cima", @@ -1542,29 +1527,21 @@ "SSE.Views.Toolbar.textInsRight": "Deslocar células para a direita", "SSE.Views.Toolbar.textItalic": "Itálico", "SSE.Views.Toolbar.textLeftBorders": "Bordas esquerdas", - "SSE.Views.Toolbar.textLine": "Linha", - "SSE.Views.Toolbar.textLineSpark": "Linha", "SSE.Views.Toolbar.textMiddleBorders": "Bordas horizontais interiores", "SSE.Views.Toolbar.textMoreFormats": "Mais formatos", "SSE.Views.Toolbar.textNewColor": "Adicionar nova cor personalizada", "SSE.Views.Toolbar.textNoBorders": "Sem bordas", "SSE.Views.Toolbar.textOutBorders": "Bordas externas", - "SSE.Views.Toolbar.textPie": "Gráfico de pizza", - "SSE.Views.Toolbar.textPoint": "XY (Dispersão)", "SSE.Views.Toolbar.textPrint": "Imprimir", "SSE.Views.Toolbar.textPrintOptions": "Configurações de impressão", "SSE.Views.Toolbar.textRightBorders": "Bordas direitas", "SSE.Views.Toolbar.textRotateDown": "Girar Texto para Baixo", "SSE.Views.Toolbar.textRotateUp": "Girar Texto para Cima", - "SSE.Views.Toolbar.textSparks": "Minigráficos", - "SSE.Views.Toolbar.textStock": "Ações", - "SSE.Views.Toolbar.textSurface": "Superfície", "SSE.Views.Toolbar.textTabFile": "Arquivo", "SSE.Views.Toolbar.textTabHome": "Página Inicial", "SSE.Views.Toolbar.textTabInsert": "Inserir", "SSE.Views.Toolbar.textTopBorders": "Bordas superiores", "SSE.Views.Toolbar.textUnderline": "Sublinhado", - "SSE.Views.Toolbar.textWinLossSpark": "Ganhos/Perdas", "SSE.Views.Toolbar.textZoom": "Zoom", "SSE.Views.Toolbar.tipAlignBottom": "Alinhar à parte inferior", "SSE.Views.Toolbar.tipAlignCenter": "Alinhar ao centro", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 60fb87fc5..a9d76e45f 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -6,14 +6,14 @@ "Common.define.chartData.textBar": "Линейчатая", "Common.define.chartData.textCharts": "Диаграммы", "Common.define.chartData.textColumn": "Гистограмма", + "Common.define.chartData.textColumnSpark": "Гистограмма", "Common.define.chartData.textLine": "График", + "Common.define.chartData.textLineSpark": "График", "Common.define.chartData.textPie": "Круговая", "Common.define.chartData.textPoint": "Точечная", + "Common.define.chartData.textSparks": "Спарклайны", "Common.define.chartData.textStock": "Биржевая", "Common.define.chartData.textSurface": "Поверхность", - "Common.define.chartData.textSparks": "Спарклайны", - "Common.define.chartData.textColumnSpark": "Гистограмма", - "Common.define.chartData.textLineSpark": "График", "Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", @@ -159,6 +159,8 @@ "Common.Views.ReviewChanges.strStrictDesc": "Используйте кнопку 'Сохранить' для синхронизации изменений, вносимых вами и другими пользователями.", "Common.Views.ReviewChanges.tipAcceptCurrent": "Принять текущее изменение", "Common.Views.ReviewChanges.tipCoAuthMode": "Задать режим совместного редактирования", + "Common.Views.ReviewChanges.tipCommentRem": "Удалить комментарии", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Удалить текущие комментарии", "Common.Views.ReviewChanges.tipHistory": "Показать историю версий", "Common.Views.ReviewChanges.tipRejectCurrent": "Отклонить текущее изменение", "Common.Views.ReviewChanges.tipReview": "Отслеживать изменения", @@ -173,6 +175,11 @@ "Common.Views.ReviewChanges.txtChat": "Чат", "Common.Views.ReviewChanges.txtClose": "Закрыть", "Common.Views.ReviewChanges.txtCoAuthMode": "Режим совместного редактирования", + "Common.Views.ReviewChanges.txtCommentRemAll": "Удалить все комментарии", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Удалить текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemMy": "Удалить мои комментарии", + "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Удалить мои текущие комментарии", + "Common.Views.ReviewChanges.txtCommentRemove": "Удалить", "Common.Views.ReviewChanges.txtDocLang": "Язык", "Common.Views.ReviewChanges.txtFinal": "Все изменения приняты (просмотр)", "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", @@ -227,6 +234,11 @@ "Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи", "Common.Views.SignSettingsDialog.textTitle": "Настройка подписи", "Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить", + "Common.Views.SymbolTableDialog.textCode": "Код знака из Юникод (шестн.)", + "Common.Views.SymbolTableDialog.textFont": "Шрифт", + "Common.Views.SymbolTableDialog.textRange": "Набор", + "Common.Views.SymbolTableDialog.textRecent": "Ранее использовавшиеся символы", + "Common.Views.SymbolTableDialog.textTitle": "Символ", "SSE.Controllers.DataTab.textWizard": "Текст по столбцам", "SSE.Controllers.DocumentHolder.alignmentText": "Выравнивание", "SSE.Controllers.DocumentHolder.centerText": "По центру", @@ -470,6 +482,7 @@ "SSE.Controllers.Main.errorTokenExpire": "Истек срок действия токена безопасности документа.
Пожалуйста, обратитесь к администратору Сервера документов.", "SSE.Controllers.Main.errorUnexpectedGuid": "Внешняя ошибка.
Непредвиденный идентификатор GUID. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "SSE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", "SSE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "SSE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", @@ -773,6 +786,7 @@ "SSE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 409", "SSE.Controllers.Toolbar.textFraction": "Дроби", "SSE.Controllers.Toolbar.textFunction": "Функции", + "SSE.Controllers.Toolbar.textInsert": "Вставить", "SSE.Controllers.Toolbar.textIntegral": "Интегралы", "SSE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", "SSE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", @@ -1191,36 +1205,25 @@ "SSE.Views.ChartSettings.strSparkColor": "Цвет", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Дополнительные параметры", - "SSE.Views.ChartSettings.textArea": "С областями", - "SSE.Views.ChartSettings.textBar": "Линейчатая", "SSE.Views.ChartSettings.textBorderSizeErr": "Введено некорректное значение.
Пожалуйста, введите значение от 0 до 1584 пунктов.", "SSE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", - "SSE.Views.ChartSettings.textColumn": "Гистограмма", - "SSE.Views.ChartSettings.textColumnSpark": "Гистограмма", "SSE.Views.ChartSettings.textEditData": "Изменить данные и место", "SSE.Views.ChartSettings.textFirstPoint": "Первая точка", "SSE.Views.ChartSettings.textHeight": "Высота", "SSE.Views.ChartSettings.textHighPoint": "Максимальная точка", "SSE.Views.ChartSettings.textKeepRatio": "Сохранять пропорции", "SSE.Views.ChartSettings.textLastPoint": "Последняя точка", - "SSE.Views.ChartSettings.textLine": "График", - "SSE.Views.ChartSettings.textLineSpark": "График", "SSE.Views.ChartSettings.textLowPoint": "Минимальная точка", "SSE.Views.ChartSettings.textMarkers": "Маркеры", "SSE.Views.ChartSettings.textNegativePoint": "Отрицательная точка", "SSE.Views.ChartSettings.textNewColor": "Пользовательский цвет", - "SSE.Views.ChartSettings.textPie": "Круговая", - "SSE.Views.ChartSettings.textPoint": "Точечная", "SSE.Views.ChartSettings.textRanges": "Диапазон данных", "SSE.Views.ChartSettings.textSelectData": "Выбор данных", "SSE.Views.ChartSettings.textShow": "Показать", "SSE.Views.ChartSettings.textSize": "Размер", - "SSE.Views.ChartSettings.textStock": "Биржевая", "SSE.Views.ChartSettings.textStyle": "Стиль", - "SSE.Views.ChartSettings.textSurface": "Поверхность", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ОШИБКА! Максимальное число точек в серии для диаграммы составляет 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ОШИБКА! Максимальное число рядов данных для одной диаграммы - 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:
цена открытия, максимальная цена, минимальная цена, цена закрытия.", @@ -1229,14 +1232,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "Описание", "SSE.Views.ChartSettingsDlg.textAltTip": "Альтернативное текстовое представление информации о визуальном объекте, которое будет зачитываться для людей с нарушениями зрения или когнитивными нарушениями, чтобы помочь им лучше понять, какую информацию содержит изображение, автофигура, диаграмма или таблица.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Заголовок", - "SSE.Views.ChartSettingsDlg.textArea": "С областями", "SSE.Views.ChartSettingsDlg.textAuto": "Авто", "SSE.Views.ChartSettingsDlg.textAutoEach": "Автоматическое для каждого", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Пересечение с осью", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Параметры оси", "SSE.Views.ChartSettingsDlg.textAxisPos": "Положение оси", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Параметры оси", - "SSE.Views.ChartSettingsDlg.textBar": "Линейчатая", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Между делениями", "SSE.Views.ChartSettingsDlg.textBillions": "Миллиарды", "SSE.Views.ChartSettingsDlg.textBottom": "Снизу", @@ -1244,8 +1245,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "По центру", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Элементы диаграммы и
легенда диаграммы", "SSE.Views.ChartSettingsDlg.textChartTitle": "Заголовок диаграммы", - "SSE.Views.ChartSettingsDlg.textColumn": "Гистограмма", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Гистограмма", "SSE.Views.ChartSettingsDlg.textCross": "На пересечении", "SSE.Views.ChartSettingsDlg.textCustom": "Пользовательский", "SSE.Views.ChartSettingsDlg.textDataColumns": "в столбцах", @@ -1286,9 +1285,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Условные обозначения", "SSE.Views.ChartSettingsDlg.textLegendRight": "Справа", "SSE.Views.ChartSettingsDlg.textLegendTop": "Сверху", - "SSE.Views.ChartSettingsDlg.textLine": "График", "SSE.Views.ChartSettingsDlg.textLines": "Линии", - "SSE.Views.ChartSettingsDlg.textLineSpark": "График", "SSE.Views.ChartSettingsDlg.textLocationRange": "Диапазон расположения:", "SSE.Views.ChartSettingsDlg.textLow": "Ниже", "SSE.Views.ChartSettingsDlg.textMajor": "Основные", @@ -1310,8 +1307,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Снаружи", "SSE.Views.ChartSettingsDlg.textOuterTop": "Снаружи сверху", "SSE.Views.ChartSettingsDlg.textOverlay": "Наложение", - "SSE.Views.ChartSettingsDlg.textPie": "Круговая", - "SSE.Views.ChartSettingsDlg.textPoint": "Точечная", "SSE.Views.ChartSettingsDlg.textReverse": "Значения в обратном порядке", "SSE.Views.ChartSettingsDlg.textReverseOrder": "В обратном порядке", "SSE.Views.ChartSettingsDlg.textRight": "Справа", @@ -1333,10 +1328,8 @@ "SSE.Views.ChartSettingsDlg.textSmooth": "Сглаженные", "SSE.Views.ChartSettingsDlg.textSnap": "Привязка ячейки", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Диапазоны спарклайнов", - "SSE.Views.ChartSettingsDlg.textStock": "Биржевая", "SSE.Views.ChartSettingsDlg.textStraight": "Прямые", "SSE.Views.ChartSettingsDlg.textStyle": "Стиль", - "SSE.Views.ChartSettingsDlg.textSurface": "Поверхность", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Тысячи", @@ -1354,7 +1347,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикальная ось", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикальные линии", "SSE.Views.ChartSettingsDlg.textVertTitle": "Название вертикальной оси", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Название оси X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Название оси Y", "SSE.Views.ChartSettingsDlg.textZero": "Нулевые значения", @@ -2212,8 +2204,10 @@ "SSE.Views.TextArtSettings.txtNoBorders": "Без обводки", "SSE.Views.TextArtSettings.txtPapyrus": "Папирус", "SSE.Views.TextArtSettings.txtWood": "Дерево", + "SSE.Views.Toolbar.capBtnAddComment": "Добавить комментарий", "SSE.Views.Toolbar.capBtnComment": "Комментарий", "SSE.Views.Toolbar.capBtnInsHeader": "Колонтитулы", + "SSE.Views.Toolbar.capBtnInsSymbol": "Символ", "SSE.Views.Toolbar.capBtnMargins": "Поля", "SSE.Views.Toolbar.capBtnPageOrient": "Ориентация", "SSE.Views.Toolbar.capBtnPageSize": "Размер", @@ -2242,20 +2236,15 @@ "SSE.Views.Toolbar.textAlignRight": "По правому краю", "SSE.Views.Toolbar.textAlignTop": "По верхнему краю", "SSE.Views.Toolbar.textAllBorders": "Все границы", - "SSE.Views.Toolbar.textArea": "С областями", "SSE.Views.Toolbar.textAuto": "Авто", - "SSE.Views.Toolbar.textBar": "Линейчатая", "SSE.Views.Toolbar.textBold": "Полужирный", "SSE.Views.Toolbar.textBordersColor": "Цвет границ", "SSE.Views.Toolbar.textBordersStyle": "Стиль границ", "SSE.Views.Toolbar.textBottom": "Нижнее: ", "SSE.Views.Toolbar.textBottomBorders": "Нижние границы", "SSE.Views.Toolbar.textCenterBorders": "Внутренние вертикальные границы", - "SSE.Views.Toolbar.textCharts": "Диаграммы", "SSE.Views.Toolbar.textClearPrintArea": "Очистить область печати", "SSE.Views.Toolbar.textClockwise": "Текст по часовой стрелке", - "SSE.Views.Toolbar.textColumn": "Гистограмма", - "SSE.Views.Toolbar.textColumnSpark": "Гистограмма", "SSE.Views.Toolbar.textCounterCw": "Текст против часовой стрелки", "SSE.Views.Toolbar.textDelLeft": "Ячейки со сдвигом влево", "SSE.Views.Toolbar.textDelUp": "Ячейки со сдвигом вверх", @@ -2273,8 +2262,6 @@ "SSE.Views.Toolbar.textLandscape": "Альбомная", "SSE.Views.Toolbar.textLeft": "Левое: ", "SSE.Views.Toolbar.textLeftBorders": "Левые границы", - "SSE.Views.Toolbar.textLine": "График", - "SSE.Views.Toolbar.textLineSpark": "График", "SSE.Views.Toolbar.textManyPages": "страниц", "SSE.Views.Toolbar.textMarginsLast": "Последние настраиваемые", "SSE.Views.Toolbar.textMarginsNarrow": "Узкие", @@ -2288,8 +2275,6 @@ "SSE.Views.Toolbar.textOnePage": "страница", "SSE.Views.Toolbar.textOutBorders": "Внешние границы", "SSE.Views.Toolbar.textPageMarginsCustom": "Настраиваемые поля", - "SSE.Views.Toolbar.textPie": "Круговая", - "SSE.Views.Toolbar.textPoint": "Точечная", "SSE.Views.Toolbar.textPortrait": "Книжная", "SSE.Views.Toolbar.textPrint": "Печать", "SSE.Views.Toolbar.textPrintOptions": "Параметры печати", @@ -2298,13 +2283,10 @@ "SSE.Views.Toolbar.textRotateDown": "Повернуть текст вниз", "SSE.Views.Toolbar.textRotateUp": "Повернуть текст вверх", "SSE.Views.Toolbar.textSetPrintArea": "Задать область печати", - "SSE.Views.Toolbar.textSparks": "Спарклайны", - "SSE.Views.Toolbar.textStock": "Биржевая", "SSE.Views.Toolbar.textStrikeout": "Зачеркнутый", "SSE.Views.Toolbar.textSubscript": "Подстрочные знаки", "SSE.Views.Toolbar.textSubSuperscript": "Подстрочные/надстрочные знаки", "SSE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "SSE.Views.Toolbar.textSurface": "Поверхность", "SSE.Views.Toolbar.textTabCollaboration": "Совместная работа", "SSE.Views.Toolbar.textTabData": "Данные", "SSE.Views.Toolbar.textTabFile": "Файл", @@ -2317,7 +2299,6 @@ "SSE.Views.Toolbar.textTopBorders": "Верхние границы", "SSE.Views.Toolbar.textUnderline": "Подчеркнутый", "SSE.Views.Toolbar.textWidth": "Ширина", - "SSE.Views.Toolbar.textWinLossSpark": "Выигрыш/проигрыш", "SSE.Views.Toolbar.textZoom": "Масштаб", "SSE.Views.Toolbar.tipAlignBottom": "Выровнять по нижнему краю", "SSE.Views.Toolbar.tipAlignCenter": "Выровнять по центру", @@ -2358,6 +2339,7 @@ "SSE.Views.Toolbar.tipInsertImage": "Вставить изображение", "SSE.Views.Toolbar.tipInsertOpt": "Вставить ячейки", "SSE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", + "SSE.Views.Toolbar.tipInsertSymbol": "Вставить символ", "SSE.Views.Toolbar.tipInsertTable": "Вставить таблицу", "SSE.Views.Toolbar.tipInsertText": "Вставить надпись", "SSE.Views.Toolbar.tipInsertTextart": "Вставить объект Text Art", diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index cb41aba3c..196d33cd6 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -2,6 +2,18 @@ "cancelButtonText": "Zrušiť", "Common.Controllers.Chat.notcriticalErrorTitle": "Upozornenie", "Common.Controllers.Chat.textEnterMessage": "Zadať svoju správu tu", + "Common.define.chartData.textArea": "Plošný graf", + "Common.define.chartData.textBar": "Pruhový graf", + "Common.define.chartData.textColumn": "Stĺpec", + "Common.define.chartData.textLine": "Čiara/líniový graf", + "Common.define.chartData.textPie": "Koláčový graf", + "Common.define.chartData.textPoint": "Bodový graf", + "Common.define.chartData.textStock": "Akcie/burzový graf", + "Common.define.chartData.textSurface": "Povrch", + "Common.define.chartData.textColumnSpark": "Stĺpec", + "Common.define.chartData.textLineSpark": "Čiara", + "Common.define.chartData.textWinLossSpark": "Zisk/strata", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -797,50 +809,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Farba", "SSE.Views.ChartSettings.strTemplate": "Šablóna", "SSE.Views.ChartSettings.textAdvanced": "Zobraziť pokročilé nastavenia", - "SSE.Views.ChartSettings.textArea": "Plošný graf", - "SSE.Views.ChartSettings.textBar": "Pruhový graf", "SSE.Views.ChartSettings.textBorderSizeErr": "Zadaná hodnota je nesprávna.
Prosím, zadajte hodnotu medzi 0 pt a 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Zmeniť typ grafu", - "SSE.Views.ChartSettings.textColumn": "Stĺpec", - "SSE.Views.ChartSettings.textColumnSpark": "Stĺpec", "SSE.Views.ChartSettings.textEditData": "Upraviť údaje a umiestnenie", "SSE.Views.ChartSettings.textFirstPoint": "Prvý bod", "SSE.Views.ChartSettings.textHeight": "Výška", "SSE.Views.ChartSettings.textHighPoint": "Vysoký bod", "SSE.Views.ChartSettings.textKeepRatio": "Konštantné rozmery", "SSE.Views.ChartSettings.textLastPoint": "Posledný bod", - "SSE.Views.ChartSettings.textLine": "Čiara", - "SSE.Views.ChartSettings.textLineSpark": "Čiara", "SSE.Views.ChartSettings.textLowPoint": "Nízky bod", "SSE.Views.ChartSettings.textMarkers": "Značky", "SSE.Views.ChartSettings.textNegativePoint": "Záporný bod", "SSE.Views.ChartSettings.textNewColor": "Pridať novú vlastnú farbu", - "SSE.Views.ChartSettings.textPie": "Koláčový graf", - "SSE.Views.ChartSettings.textPoint": "Bodový graf", "SSE.Views.ChartSettings.textRanges": "Rozsah údajov", "SSE.Views.ChartSettings.textSelectData": "Vybrať údaje", "SSE.Views.ChartSettings.textShow": "Zobraziť", "SSE.Views.ChartSettings.textSize": "Veľkosť", - "SSE.Views.ChartSettings.textStock": "Akcie/burzový graf", "SSE.Views.ChartSettings.textStyle": "Štýl", - "SSE.Views.ChartSettings.textSurface": "Povrch", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Šírka", - "SSE.Views.ChartSettings.textWinLossSpark": "Zisk/strata", "SSE.Views.ChartSettingsDlg.errorMaxRows": "CHYBA! Maximálny počet dátových radov na graf je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nesprávne poradie riadkov. Ak chcete vytvoriť burzový graf, umiestnite údaje na hárok v nasledujúcom poradí:
začiatočná cena, max cena, min cena, konečná cena.", "SSE.Views.ChartSettingsDlg.textAlt": "Alternatívny text", "SSE.Views.ChartSettingsDlg.textAltDescription": "Popis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternatívne textové zobrazenie informácií o vizuálnych objektoch, ktoré sa prečítajú ľuďom s poruchou videnia alebo kognitívnymi poruchami, aby sa im pomohlo lepšie porozumieť, aké informácie sú na obrázku, automatickom tvarovaní, grafe alebo tabuľke. ", "SSE.Views.ChartSettingsDlg.textAltTitle": "Názov", - "SSE.Views.ChartSettingsDlg.textArea": "Plošný graf", "SSE.Views.ChartSettingsDlg.textAuto": "Automaticky", "SSE.Views.ChartSettingsDlg.textAutoEach": "Automaticky pre každé", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Kríženie os", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Umiestnenie osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Nastavenia osi", - "SSE.Views.ChartSettingsDlg.textBar": "Vodorovná čiarka", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Medzi značkami rozsahu", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dole", @@ -848,8 +847,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Stred", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementy grafu &
Legenda grafu", "SSE.Views.ChartSettingsDlg.textChartTitle": "Názov grafu", - "SSE.Views.ChartSettingsDlg.textColumn": "Stĺpec", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Stĺpec", "SSE.Views.ChartSettingsDlg.textCross": "Pretínať", "SSE.Views.ChartSettingsDlg.textCustom": "Vlastný", "SSE.Views.ChartSettingsDlg.textDataColumns": "V stĺpcoch", @@ -890,9 +887,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Vpravo", "SSE.Views.ChartSettingsDlg.textLegendTop": "Hore", - "SSE.Views.ChartSettingsDlg.textLine": "Čiarový graf", "SSE.Views.ChartSettingsDlg.textLines": "Čiary", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Čiara", "SSE.Views.ChartSettingsDlg.textLocationRange": "Rozsah umiestnenia", "SSE.Views.ChartSettingsDlg.textLow": "Nízko", "SSE.Views.ChartSettingsDlg.textMajor": "Hlavný", @@ -913,8 +908,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Von", "SSE.Views.ChartSettingsDlg.textOuterTop": "Mimo hore", "SSE.Views.ChartSettingsDlg.textOverlay": "Prekrytie", - "SSE.Views.ChartSettingsDlg.textPie": "Koláčový graf", - "SSE.Views.ChartSettingsDlg.textPoint": "Bodový graf", "SSE.Views.ChartSettingsDlg.textReverse": "Hodnoty v opačnom poradí", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Obrátené poradie", "SSE.Views.ChartSettingsDlg.textRight": "Vpravo", @@ -935,10 +928,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Jednoduchý Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Plynulý", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline - Rozsahy", - "SSE.Views.ChartSettingsDlg.textStock": "Akcie/burzový graf", "SSE.Views.ChartSettingsDlg.textStraight": "Priamy/rovný", "SSE.Views.ChartSettingsDlg.textStyle": "Štýl", - "SSE.Views.ChartSettingsDlg.textSurface": "Povrch", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Tisíce", @@ -955,7 +946,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Vertikálna os", "SSE.Views.ChartSettingsDlg.textVertGrid": "Vertikálne mriežky", "SSE.Views.ChartSettingsDlg.textVertTitle": "Názov vertikálnej osi", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Zisk/strata", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Názov osi X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Názov osi Y", "SSE.Views.ChartSettingsDlg.textZero": "Nula", @@ -1548,17 +1538,12 @@ "SSE.Views.Toolbar.textAlignRight": "Zarovnať doprava", "SSE.Views.Toolbar.textAlignTop": "Zarovnať nahor", "SSE.Views.Toolbar.textAllBorders": "Všetky orámovania", - "SSE.Views.Toolbar.textArea": "Plošný graf", - "SSE.Views.Toolbar.textBar": "Pruhový graf", "SSE.Views.Toolbar.textBold": "Tučné", "SSE.Views.Toolbar.textBordersColor": "Farba orámovania", "SSE.Views.Toolbar.textBordersStyle": "Štýl orámovania", "SSE.Views.Toolbar.textBottomBorders": "Spodné orámovanie", "SSE.Views.Toolbar.textCenterBorders": "Vnútorné vertikálne orámovanie", - "SSE.Views.Toolbar.textCharts": "Grafy", "SSE.Views.Toolbar.textClockwise": "Otočiť v smere hodinových ručičiek", - "SSE.Views.Toolbar.textColumn": "Stĺpec", - "SSE.Views.Toolbar.textColumnSpark": "Stĺpec", "SSE.Views.Toolbar.textCounterCw": "Otočiť proti smeru hodinových ručičiek", "SSE.Views.Toolbar.textDelLeft": "Posunúť bunky vľavo", "SSE.Views.Toolbar.textDelUp": "Posunúť bunky hore", @@ -1572,31 +1557,23 @@ "SSE.Views.Toolbar.textInsRight": "Posunúť bunky vpravo", "SSE.Views.Toolbar.textItalic": "Kurzíva", "SSE.Views.Toolbar.textLeftBorders": "Orámovanie vľavo", - "SSE.Views.Toolbar.textLine": "Čiara", - "SSE.Views.Toolbar.textLineSpark": "Čiara", "SSE.Views.Toolbar.textMiddleBorders": "Vnútorné horizontálne orámovanie", "SSE.Views.Toolbar.textMoreFormats": "Ďalšie formáty", "SSE.Views.Toolbar.textNewColor": "Pridať novú vlastnú farbu", "SSE.Views.Toolbar.textNoBorders": "Bez orámovania", "SSE.Views.Toolbar.textOutBorders": "Vonkajšie orámovanie", - "SSE.Views.Toolbar.textPie": "Koláčový graf", - "SSE.Views.Toolbar.textPoint": "Bodový graf", "SSE.Views.Toolbar.textPrint": "Tlačiť", "SSE.Views.Toolbar.textPrintOptions": "Nastavenia tlače", "SSE.Views.Toolbar.textRightBorders": "Orámovanie vpravo", "SSE.Views.Toolbar.textRotateDown": "Otočiť text nadol", "SSE.Views.Toolbar.textRotateUp": "Otočiť text nahor", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Akcie/burzový graf", "SSE.Views.Toolbar.textSubscript": "Dolný index", - "SSE.Views.Toolbar.textSurface": "Povrch", "SSE.Views.Toolbar.textTabCollaboration": "Spolupráca", "SSE.Views.Toolbar.textTabFile": "Súbor", "SSE.Views.Toolbar.textTabHome": "Hlavná stránka", "SSE.Views.Toolbar.textTabInsert": "Vložiť", "SSE.Views.Toolbar.textTopBorders": "Horné orámovanie", "SSE.Views.Toolbar.textUnderline": "Podčiarknuť", - "SSE.Views.Toolbar.textWinLossSpark": "Zisk/strata", "SSE.Views.Toolbar.textZoom": "Priblíženie", "SSE.Views.Toolbar.tipAlignBottom": "Zarovnať dole", "SSE.Views.Toolbar.tipAlignCenter": "Centrovať", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index 50ce402ec..6b623c38e 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -2,6 +2,13 @@ "cancelButtonText": "Prekliči", "Common.Controllers.Chat.notcriticalErrorTitle": "Opozorilo", "Common.Controllers.Chat.textEnterMessage": "Svoje sporočilo vnesite tu", + "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPoint": "Točkovni grafikon", + "Common.define.chartData.textStock": "Založni grafikon", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -227,36 +234,26 @@ "SSE.Views.CellRangeDialog.txtInvalidRange": "NAPAKA! Neveljaven razpon celic", "SSE.Views.CellRangeDialog.txtTitle": "Izberi območje podatkov", "SSE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve", - "SSE.Views.ChartSettings.textArea": "Ploščinski grafikon", - "SSE.Views.ChartSettings.textBar": "Stolpični grafikon", "SSE.Views.ChartSettings.textChartType": "Spremeni vrsto razpredelnice", - "SSE.Views.ChartSettings.textColumn": "Stolpični grafikon", "SSE.Views.ChartSettings.textEditData": "Uredi podatke", "SSE.Views.ChartSettings.textHeight": "Višina", "SSE.Views.ChartSettings.textKeepRatio": "Nenehna razmerja", - "SSE.Views.ChartSettings.textLine": "Vrstični grafikon", - "SSE.Views.ChartSettings.textPie": "Tortni grafikon", - "SSE.Views.ChartSettings.textPoint": "Točkovni grafikon", "SSE.Views.ChartSettings.textSize": "Velikost", - "SSE.Views.ChartSettings.textStock": "Založni grafikon", "SSE.Views.ChartSettings.textStyle": "Slog", "SSE.Views.ChartSettings.textWidth": "Širina", "SSE.Views.ChartSettingsDlg.errorMaxRows": "NAPAKA! Maksimalno število podatkovnih serij na grafikon je 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nepravilen vrstni red vrstic. Za izgradnjo razpredelnice delnic podatke na strani navedite v sledečem vrstnem redu:
otvoritvena cena, maksimalna cena, minimalna cena, zaključna cena.", - "SSE.Views.ChartSettingsDlg.textArea": "Ploščinski grafikon", "SSE.Views.ChartSettingsDlg.textAuto": "Samodejno", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Križi osi", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Možnosti osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Položaj osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Stolpični grafikon", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Med obkljukanimi oznakami", "SSE.Views.ChartSettingsDlg.textBillions": "Milijarde", "SSE.Views.ChartSettingsDlg.textCategoryName": "Ime kategorije", "SSE.Views.ChartSettingsDlg.textCenter": "Središče", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementi grafa &
Legenda grafa", "SSE.Views.ChartSettingsDlg.textChartTitle": "Naslov grafa", - "SSE.Views.ChartSettingsDlg.textColumn": "Stolpični grafikon", "SSE.Views.ChartSettingsDlg.textCross": "Križ", "SSE.Views.ChartSettingsDlg.textCustom": "Po meri", "SSE.Views.ChartSettingsDlg.textDataColumns": "v stolpcih", @@ -291,7 +288,6 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Legenda", "SSE.Views.ChartSettingsDlg.textLegendRight": "Desno", "SSE.Views.ChartSettingsDlg.textLegendTop": "Vrh", - "SSE.Views.ChartSettingsDlg.textLine": "Vrstični grafikon", "SSE.Views.ChartSettingsDlg.textLines": "Vrste", "SSE.Views.ChartSettingsDlg.textLow": "Nizko", "SSE.Views.ChartSettingsDlg.textMajor": "Velik", @@ -312,8 +308,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ven", "SSE.Views.ChartSettingsDlg.textOuterTop": "Zunanji vrh", "SSE.Views.ChartSettingsDlg.textOverlay": "Prekrij", - "SSE.Views.ChartSettingsDlg.textPie": "Tortni grafikon", - "SSE.Views.ChartSettingsDlg.textPoint": "Točkovni grafikon", "SSE.Views.ChartSettingsDlg.textReverse": "Vrednosti v obratnem vrstnem redu", "SSE.Views.ChartSettingsDlg.textRightOverlay": "Desno prekrivanje", "SSE.Views.ChartSettingsDlg.textRotated": "Zavrteno", @@ -326,7 +320,6 @@ "SSE.Views.ChartSettingsDlg.textShowGrid": "Mrežne črte", "SSE.Views.ChartSettingsDlg.textShowValues": "Prikaži vrednosti grafikona", "SSE.Views.ChartSettingsDlg.textSmooth": "Gladek", - "SSE.Views.ChartSettingsDlg.textStock": "Založni grafikon", "SSE.Views.ChartSettingsDlg.textStraight": "Raven", "SSE.Views.ChartSettingsDlg.textStyle": "Slog", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index c8a3c70c4..408ec24a7 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -2,6 +2,14 @@ "cancelButtonText": "İptal Et", "Common.Controllers.Chat.notcriticalErrorTitle": "Dikkat", "Common.Controllers.Chat.textEnterMessage": "Mesajınızı buraya giriniz", + "Common.define.chartData.textArea": "Bölge Grafiği", + "Common.define.chartData.textBar": "Çubuk grafik", + "Common.define.chartData.textColumn": "Sütun grafik", + "Common.define.chartData.textLine": "Çizgi grafiği", + "Common.define.chartData.textPie": "Dilim grafik", + "Common.define.chartData.textPoint": "Nokta grafiği", + "Common.define.chartData.textStock": "Stok Grafiği", + "Common.define.chartData.textSurface": "Yüzey", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -777,50 +785,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Renk", "SSE.Views.ChartSettings.strTemplate": "Şablon", "SSE.Views.ChartSettings.textAdvanced": "Gelişmiş ayarları göster", - "SSE.Views.ChartSettings.textArea": "Bölge Grafiği", - "SSE.Views.ChartSettings.textBar": "Çubuk grafik", "SSE.Views.ChartSettings.textBorderSizeErr": "Girilen değer yanlış.
Lütfen 0 ile 1584 pt arasında değer giriniz.", "SSE.Views.ChartSettings.textChartType": "Grafik Tipini Değiştir", - "SSE.Views.ChartSettings.textColumn": "Sütun grafik", - "SSE.Views.ChartSettings.textColumnSpark": "Sütun", "SSE.Views.ChartSettings.textEditData": "Veri düzenle", "SSE.Views.ChartSettings.textFirstPoint": "İlk Nokta", "SSE.Views.ChartSettings.textHeight": "Yükseklik", "SSE.Views.ChartSettings.textHighPoint": "Yüksek Nokta", "SSE.Views.ChartSettings.textKeepRatio": "Sabit Orantılar", "SSE.Views.ChartSettings.textLastPoint": "Son Nokta", - "SSE.Views.ChartSettings.textLine": "Çizgi grafiği", - "SSE.Views.ChartSettings.textLineSpark": "Çizgi Grafiği", "SSE.Views.ChartSettings.textLowPoint": "Düşük Nokta", "SSE.Views.ChartSettings.textMarkers": "İşaretler", "SSE.Views.ChartSettings.textNegativePoint": "Negatif Nokta", "SSE.Views.ChartSettings.textNewColor": "Yeni Özel Renk Ekle", - "SSE.Views.ChartSettings.textPie": "Dilim grafik", - "SSE.Views.ChartSettings.textPoint": "Nokta grafiği", "SSE.Views.ChartSettings.textRanges": "Veri Aralığı", "SSE.Views.ChartSettings.textSelectData": "Veriyi Seç", "SSE.Views.ChartSettings.textShow": "Göster", "SSE.Views.ChartSettings.textSize": "Boyut", - "SSE.Views.ChartSettings.textStock": "Stok Grafiği", "SSE.Views.ChartSettings.textStyle": "Stil", - "SSE.Views.ChartSettings.textSurface": "Yüzey", "SSE.Views.ChartSettings.textType": "Tip", "SSE.Views.ChartSettings.textWidth": "Genişlik", - "SSE.Views.ChartSettings.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.ChartSettingsDlg.errorMaxRows": "HATA! Her grafik için maksimum veri serileri sayısı 255'tir", "SSE.Views.ChartSettingsDlg.errorStockChart": "Yanlış dizi sırası. Stok grafiği oluşturma için tablodaki verileri şu sırada yerleştirin:
açılış fiyatı, maksimum fiyat, minimum fiyat, kapanış fiyatı. ", "SSE.Views.ChartSettingsDlg.textAlt": "Alternatif Metin", "SSE.Views.ChartSettingsDlg.textAltDescription": "Açıklama", "SSE.Views.ChartSettingsDlg.textAltTip": "Görsel obje bilgilerinin alternatif metin tabanlı sunumu görsel veya bilinçsel açıdan problem yaşan kişilere okunarak resimdeki, şekildeki, grafikteki veya tablodaki bilgileri daha kolay anlamalarını sağlamayı amaçlar.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Başlık", - "SSE.Views.ChartSettingsDlg.textArea": "Bölge Grafiği", "SSE.Views.ChartSettingsDlg.textAuto": "Otomatik", "SSE.Views.ChartSettingsDlg.textAutoEach": "Her Biri için Otomatik", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Eksen kesişmeleri", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Eksen Seçenekleri", "SSE.Views.ChartSettingsDlg.textAxisPos": "Eksen Pozisyonu", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings", - "SSE.Views.ChartSettingsDlg.textBar": "Çubuk grafik", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Tik İşaretleri Arasında", "SSE.Views.ChartSettingsDlg.textBillions": "Milyar", "SSE.Views.ChartSettingsDlg.textBottom": "Alt", @@ -828,8 +823,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Orta", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Grafik Elementleri &
Grafik Göstergesi", "SSE.Views.ChartSettingsDlg.textChartTitle": "Grafik başlığı", - "SSE.Views.ChartSettingsDlg.textColumn": "Sütun grafik", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Sütun", "SSE.Views.ChartSettingsDlg.textCross": "Kesişme", "SSE.Views.ChartSettingsDlg.textCustom": "Özel", "SSE.Views.ChartSettingsDlg.textDataColumns": "sütunlarda", @@ -870,9 +863,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Gösterge", "SSE.Views.ChartSettingsDlg.textLegendRight": "Sağ", "SSE.Views.ChartSettingsDlg.textLegendTop": "Üst", - "SSE.Views.ChartSettingsDlg.textLine": "Çizgi grafiği", "SSE.Views.ChartSettingsDlg.textLines": "Satırlar", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Çizgi Grafiği", "SSE.Views.ChartSettingsDlg.textLocationRange": "Konum Aralığı", "SSE.Views.ChartSettingsDlg.textLow": "Düşük", "SSE.Views.ChartSettingsDlg.textMajor": "Majör", @@ -893,8 +884,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Dışarı", "SSE.Views.ChartSettingsDlg.textOuterTop": "Dış Üst", "SSE.Views.ChartSettingsDlg.textOverlay": "Bindirme", - "SSE.Views.ChartSettingsDlg.textPie": "Dilim grafik", - "SSE.Views.ChartSettingsDlg.textPoint": "Nokta grafiği", "SSE.Views.ChartSettingsDlg.textReverse": "Ters sıralanmış değerler", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Sırayı tersine çevir", "SSE.Views.ChartSettingsDlg.textRight": "Sağ", @@ -915,10 +904,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Tek Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Düz", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Aralıkları", - "SSE.Views.ChartSettingsDlg.textStock": "Stok Grafiği", "SSE.Views.ChartSettingsDlg.textStraight": "Düz", "SSE.Views.ChartSettingsDlg.textStyle": "Stil", - "SSE.Views.ChartSettingsDlg.textSurface": "Yüzey", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Binlerce", @@ -935,7 +922,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Dikey Eksen", "SSE.Views.ChartSettingsDlg.textVertGrid": "Dikey Çizgi Kılavuzları", "SSE.Views.ChartSettingsDlg.textVertTitle": "Dikey Eksen Başlığı", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Eksen Başlığı", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y eksen başlığı", "SSE.Views.ChartSettingsDlg.textZero": "Sıfır", @@ -1518,17 +1504,12 @@ "SSE.Views.Toolbar.textAlignRight": "Sağa Hizala", "SSE.Views.Toolbar.textAlignTop": "Üste Hizala", "SSE.Views.Toolbar.textAllBorders": "Tüm Sınırlar", - "SSE.Views.Toolbar.textArea": "Bölge Grafiği", - "SSE.Views.Toolbar.textBar": "Çubuk grafik", "SSE.Views.Toolbar.textBold": "Kalın", "SSE.Views.Toolbar.textBordersColor": "Sınır Rengi", "SSE.Views.Toolbar.textBordersStyle": "Sınır Stili", "SSE.Views.Toolbar.textBottomBorders": "Alt Sınırlar", "SSE.Views.Toolbar.textCenterBorders": "Dikey İç Sınırlar", - "SSE.Views.Toolbar.textCharts": "Grafikler", "SSE.Views.Toolbar.textClockwise": "Saat yönünde açı", - "SSE.Views.Toolbar.textColumn": "Sütun", - "SSE.Views.Toolbar.textColumnSpark": "Sütun", "SSE.Views.Toolbar.textCounterCw": "Saat yönü tersi açı", "SSE.Views.Toolbar.textDelLeft": "Hücreleri sola kaydır", "SSE.Views.Toolbar.textDelUp": "Hücreleri yukarı kaydır", @@ -1542,29 +1523,21 @@ "SSE.Views.Toolbar.textInsRight": "Hücreleri sağa kaydır", "SSE.Views.Toolbar.textItalic": "İtalik", "SSE.Views.Toolbar.textLeftBorders": "Sol Sınırlar", - "SSE.Views.Toolbar.textLine": "Çizgi Grafiği", - "SSE.Views.Toolbar.textLineSpark": "Çizgi Grafiği", "SSE.Views.Toolbar.textMiddleBorders": "Yatay İç Sınırlar", "SSE.Views.Toolbar.textMoreFormats": "Daha fazla format", "SSE.Views.Toolbar.textNewColor": "Yeni Özel Renk Ekle", "SSE.Views.Toolbar.textNoBorders": "Sınır yok", "SSE.Views.Toolbar.textOutBorders": "Dış Sınırlar", - "SSE.Views.Toolbar.textPie": "Dilim", - "SSE.Views.Toolbar.textPoint": "XY (Noktalı)", "SSE.Views.Toolbar.textPrint": "Yazdır", "SSE.Views.Toolbar.textPrintOptions": "Yazdırma Ayarları", "SSE.Views.Toolbar.textRightBorders": "Sağ Sınırlar", "SSE.Views.Toolbar.textRotateDown": "Metini Aşağı Döndür", "SSE.Views.Toolbar.textRotateUp": "Metini Yukarı Döndür", - "SSE.Views.Toolbar.textSparks": "Sparklinelar", - "SSE.Views.Toolbar.textStock": "Stok Grafiği", - "SSE.Views.Toolbar.textSurface": "Yüzey", "SSE.Views.Toolbar.textTabFile": "Dosya", "SSE.Views.Toolbar.textTabHome": "Ana Sayfa", "SSE.Views.Toolbar.textTabInsert": "Ekle", "SSE.Views.Toolbar.textTopBorders": "Üst Sınırlar", "SSE.Views.Toolbar.textUnderline": "Altı çizili", - "SSE.Views.Toolbar.textWinLossSpark": "Kazanç/Kayıp", "SSE.Views.Toolbar.textZoom": "Zum", "SSE.Views.Toolbar.tipAlignBottom": "Alta Hizala", "SSE.Views.Toolbar.tipAlignCenter": "Ortaya Hizala", diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 1fd245c66..6e7c37b06 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -2,6 +2,18 @@ "cancelButtonText": "Скасувати", "Common.Controllers.Chat.notcriticalErrorTitle": "Застереження", "Common.Controllers.Chat.textEnterMessage": "ВВедіть своє повідомлення тут", + "Common.define.chartData.textArea": "Площа", + "Common.define.chartData.textBar": "Вставити", + "Common.define.chartData.textColumn": "Колона", + "Common.define.chartData.textLine": "Лінія", + "Common.define.chartData.textPie": "Пиріг", + "Common.define.chartData.textPoint": "XY (розсіювання)", + "Common.define.chartData.textStock": "Запас", + "Common.define.chartData.textSurface": "Поверхня", + "Common.define.chartData.textColumnSpark": "Колона", + "Common.define.chartData.textLineSpark": "Лінія", + "Common.define.chartData.textWinLossSpark": "Win / Loss", + "Common.define.chartData.textSparks": "Міні-діграми", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -782,50 +794,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Колір", "SSE.Views.ChartSettings.strTemplate": "Шаблон", "SSE.Views.ChartSettings.textAdvanced": "Показати додаткові налаштування", - "SSE.Views.ChartSettings.textArea": "Площа", - "SSE.Views.ChartSettings.textBar": "Вставити", "SSE.Views.ChartSettings.textBorderSizeErr": "Введене значення невірно.
Будь ласка, введіть значення від 0 pt до 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Змінити тип діаграми", - "SSE.Views.ChartSettings.textColumn": "Колона", - "SSE.Views.ChartSettings.textColumnSpark": "Колона", "SSE.Views.ChartSettings.textEditData": "Редагувати дату і місцезнаходження", "SSE.Views.ChartSettings.textFirstPoint": "Перша точка", "SSE.Views.ChartSettings.textHeight": "Висота", "SSE.Views.ChartSettings.textHighPoint": "Висока точка", "SSE.Views.ChartSettings.textKeepRatio": "Сталі пропорції", "SSE.Views.ChartSettings.textLastPoint": "останній пункт", - "SSE.Views.ChartSettings.textLine": "Лінія", - "SSE.Views.ChartSettings.textLineSpark": "Лінія", "SSE.Views.ChartSettings.textLowPoint": "Низька точка", "SSE.Views.ChartSettings.textMarkers": "Маркери", "SSE.Views.ChartSettings.textNegativePoint": "Негативний момент", "SSE.Views.ChartSettings.textNewColor": "Додати новий спеціальний колір", - "SSE.Views.ChartSettings.textPie": "Пиріг", - "SSE.Views.ChartSettings.textPoint": "XY (розсіювання)", "SSE.Views.ChartSettings.textRanges": "Діапазон даних", "SSE.Views.ChartSettings.textSelectData": "Вибрати дату", "SSE.Views.ChartSettings.textShow": "Відобразити", "SSE.Views.ChartSettings.textSize": "Розмір", - "SSE.Views.ChartSettings.textStock": "Запас", "SSE.Views.ChartSettings.textStyle": "Стиль", - "SSE.Views.ChartSettings.textSurface": "Поверхня", "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", - "SSE.Views.ChartSettings.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ПОМИЛКА! Максимальна кількість даних на кожну діаграму становить 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Невірний порядок рядків. Щоб побудувати фондову діаграму, помістіть дані на аркуші в наступному порядку: ціна відкриття, максимальна ціна, мінімальна ціна, ціна закриття.", "SSE.Views.ChartSettingsDlg.textAlt": "Альтернативний текст", "SSE.Views.ChartSettingsDlg.textAltDescription": "Опис угоди", "SSE.Views.ChartSettingsDlg.textAltTip": "Альтернативне текстове представлення інформації про візуальний об'єкт, яке може бути прочитано людям із порушеннями зору або когнітивними дисфункціями, щоб вони могли краще зрозуміти, яка інформація знаходиться в зображенні, автошопі, діаграмі або таблиці.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Назва", - "SSE.Views.ChartSettingsDlg.textArea": "Площа", "SSE.Views.ChartSettingsDlg.textAuto": "Авто", "SSE.Views.ChartSettingsDlg.textAutoEach": "Авто для кожного", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Осі Хрести", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Параметри осей", "SSE.Views.ChartSettingsDlg.textAxisPos": "Позиція осі", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Налаштування осі", - "SSE.Views.ChartSettingsDlg.textBar": "Риска", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Між відмітками", "SSE.Views.ChartSettingsDlg.textBillions": "Мільярди", "SSE.Views.ChartSettingsDlg.textBottom": "Внизу", @@ -833,8 +832,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Центр", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Графічні елементи та
Графічна легенда", "SSE.Views.ChartSettingsDlg.textChartTitle": "Назва діграми", - "SSE.Views.ChartSettingsDlg.textColumn": "Колона", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Колона", "SSE.Views.ChartSettingsDlg.textCross": "Перетинати", "SSE.Views.ChartSettingsDlg.textCustom": "Користувальницький", "SSE.Views.ChartSettingsDlg.textDataColumns": "в колонках", @@ -875,9 +872,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Підпис", "SSE.Views.ChartSettingsDlg.textLegendRight": "Право", "SSE.Views.ChartSettingsDlg.textLegendTop": "Верх", - "SSE.Views.ChartSettingsDlg.textLine": "Лінійна діаграма", "SSE.Views.ChartSettingsDlg.textLines": "Рядки", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Лінія", "SSE.Views.ChartSettingsDlg.textLocationRange": "Діапазон місць", "SSE.Views.ChartSettingsDlg.textLow": "Низький", "SSE.Views.ChartSettingsDlg.textMajor": "Мажор", @@ -898,8 +893,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "з", "SSE.Views.ChartSettingsDlg.textOuterTop": "Зовнішній зверху", "SSE.Views.ChartSettingsDlg.textOverlay": "Накладання", - "SSE.Views.ChartSettingsDlg.textPie": "Пиріг", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (розсіювання)", "SSE.Views.ChartSettingsDlg.textReverse": "Значення у зворотному порядку", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Зворотний порядок", "SSE.Views.ChartSettingsDlg.textRight": "Право", @@ -920,10 +913,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Єдина міні-діаграма", "SSE.Views.ChartSettingsDlg.textSmooth": "Гладкий", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Діапазони міні-діаграм", - "SSE.Views.ChartSettingsDlg.textStock": "Запас", "SSE.Views.ChartSettingsDlg.textStraight": "Строгий", "SSE.Views.ChartSettingsDlg.textStyle": "Стиль", - "SSE.Views.ChartSettingsDlg.textSurface": "Поверхня", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Тисячі", @@ -940,7 +931,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Вертикальні вісі", "SSE.Views.ChartSettingsDlg.textVertGrid": "Вертикальні сітки", "SSE.Views.ChartSettingsDlg.textVertTitle": "Назва вертикальної вісі", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win / Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Назва осі X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Назва осі Y", "SSE.Views.ChartSettingsDlg.textZero": "Нуль", @@ -1535,17 +1525,12 @@ "SSE.Views.Toolbar.textAlignRight": "Вирівняти справа", "SSE.Views.Toolbar.textAlignTop": "Вирівняти догори", "SSE.Views.Toolbar.textAllBorders": "Всі кордони", - "SSE.Views.Toolbar.textArea": "Площа", - "SSE.Views.Toolbar.textBar": "Риска", "SSE.Views.Toolbar.textBold": "Жирний", "SSE.Views.Toolbar.textBordersColor": "Колір кордону", "SSE.Views.Toolbar.textBordersStyle": "Стиль межі", "SSE.Views.Toolbar.textBottomBorders": "Нижні межі", "SSE.Views.Toolbar.textCenterBorders": "Всередині вертикальних кордонів", - "SSE.Views.Toolbar.textCharts": "Діаграми", "SSE.Views.Toolbar.textClockwise": "Кут за годинниковою стрілкою", - "SSE.Views.Toolbar.textColumn": "Колона", - "SSE.Views.Toolbar.textColumnSpark": "Колона", "SSE.Views.Toolbar.textCounterCw": "Кут за годинниковою стрілкою", "SSE.Views.Toolbar.textDelLeft": "Перемістити клітини вліво", "SSE.Views.Toolbar.textDelUp": "Перемістити клітини вгору", @@ -1559,24 +1544,17 @@ "SSE.Views.Toolbar.textInsRight": "Перемістити клітини вправо", "SSE.Views.Toolbar.textItalic": "Курсив", "SSE.Views.Toolbar.textLeftBorders": "Ліві кордони", - "SSE.Views.Toolbar.textLine": "Лінія", - "SSE.Views.Toolbar.textLineSpark": "Лінія", "SSE.Views.Toolbar.textMiddleBorders": "Внутрішні горизонтальні межі", "SSE.Views.Toolbar.textMoreFormats": "Більше форматів", "SSE.Views.Toolbar.textNewColor": "Додати новий спеціальний колір", "SSE.Views.Toolbar.textNoBorders": "Немає кордонів", "SSE.Views.Toolbar.textOutBorders": "За межами кордонів", "SSE.Views.Toolbar.textPageMarginsCustom": "Користувацькі поля", - "SSE.Views.Toolbar.textPie": "Пиріг", - "SSE.Views.Toolbar.textPoint": "XY (розсіювання)", "SSE.Views.Toolbar.textPrint": "Роздрукувати", "SSE.Views.Toolbar.textPrintOptions": "Налаштування друку", "SSE.Views.Toolbar.textRightBorders": "Праві кордони", "SSE.Views.Toolbar.textRotateDown": "Повернути текст вниз", "SSE.Views.Toolbar.textRotateUp": "Повернути текст вгору", - "SSE.Views.Toolbar.textSparks": "Міні-діграми", - "SSE.Views.Toolbar.textStock": "Запас", - "SSE.Views.Toolbar.textSurface": "Поверхня", "SSE.Views.Toolbar.textTabCollaboration": "Співпраця", "SSE.Views.Toolbar.textTabData": "Дані", "SSE.Views.Toolbar.textTabFile": "Файл", @@ -1586,7 +1564,6 @@ "SSE.Views.Toolbar.textTabLayout": "Розмітка", "SSE.Views.Toolbar.textTopBorders": "Межі угорі", "SSE.Views.Toolbar.textUnderline": "Підкреслений", - "SSE.Views.Toolbar.textWinLossSpark": "Win / Loss", "SSE.Views.Toolbar.textZoom": "Збільшити", "SSE.Views.Toolbar.tipAlignBottom": "Вирівняти знизу", "SSE.Views.Toolbar.tipAlignCenter": "Вирівняти центр", diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index a3af836cb..d164c2d01 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -2,6 +2,18 @@ "cancelButtonText": "Hủy", "Common.Controllers.Chat.notcriticalErrorTitle": "Cảnh báo", "Common.Controllers.Chat.textEnterMessage": "Nhập tin nhắn của bạn ở đây", + "Common.define.chartData.textArea": "Vùng", + "Common.define.chartData.textBar": "Gạch", + "Common.define.chartData.textColumn": "Cột", + "Common.define.chartData.textLine": "Đường kẻ", + "Common.define.chartData.textPie": "Hình bánh", + "Common.define.chartData.textPoint": "XY (Phân tán)", + "Common.define.chartData.textStock": "Cổ phiếu", + "Common.define.chartData.textSurface": "Bề mặt", + "Common.define.chartData.textColumnSpark": "Cột", + "Common.define.chartData.textLineSpark": "Đường kẻ", + "Common.define.chartData.textWinLossSpark": "Win/Loss", + "Common.define.chartData.textSparks": "Sparklines", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -776,50 +788,37 @@ "SSE.Views.ChartSettings.strSparkColor": "Màu sắc", "SSE.Views.ChartSettings.strTemplate": "Template", "SSE.Views.ChartSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "SSE.Views.ChartSettings.textArea": "Vùng", - "SSE.Views.ChartSettings.textBar": "Cột", "SSE.Views.ChartSettings.textBorderSizeErr": "Giá trị đã nhập không chính xác.
Nhập một giá trị từ thuộc từ 0 pt đến 1584 pt.", "SSE.Views.ChartSettings.textChartType": "Thay đổi Loại biểu đồ", - "SSE.Views.ChartSettings.textColumn": "Cột", - "SSE.Views.ChartSettings.textColumnSpark": "Cột", "SSE.Views.ChartSettings.textEditData": "Chỉnh sửa Dữ liệu và Vị trí", "SSE.Views.ChartSettings.textFirstPoint": "Điểm đầu tiên", "SSE.Views.ChartSettings.textHeight": "Chiều cao", "SSE.Views.ChartSettings.textHighPoint": "Điểm cao", "SSE.Views.ChartSettings.textKeepRatio": "Tỷ lệ không đổi", "SSE.Views.ChartSettings.textLastPoint": "Điểm cuối", - "SSE.Views.ChartSettings.textLine": "Đường kẻ", - "SSE.Views.ChartSettings.textLineSpark": "Đường kẻ", "SSE.Views.ChartSettings.textLowPoint": "Điểm thấp", "SSE.Views.ChartSettings.textMarkers": "Đánh dấu", "SSE.Views.ChartSettings.textNegativePoint": "Điểm âm", "SSE.Views.ChartSettings.textNewColor": "Thêm màu tùy chỉnh mới", - "SSE.Views.ChartSettings.textPie": "Hình bánh", - "SSE.Views.ChartSettings.textPoint": "XY (Phân tán)", "SSE.Views.ChartSettings.textRanges": "Phạm vi dữ liệu", "SSE.Views.ChartSettings.textSelectData": "Chọn dữ liệu", "SSE.Views.ChartSettings.textShow": "Hiển thị", "SSE.Views.ChartSettings.textSize": "Kích thước", - "SSE.Views.ChartSettings.textStock": "Cổ phiếu", "SSE.Views.ChartSettings.textStyle": "Kiểu", - "SSE.Views.ChartSettings.textSurface": "Bề mặt", "SSE.Views.ChartSettings.textType": "Loại", "SSE.Views.ChartSettings.textWidth": "Chiều rộng", - "SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.errorMaxRows": "LỖI! Số chuỗi dữ liệu tối đa cho mỗi biểu đồ là 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Thứ tự hàng không chính xác. Để xây dựng một biểu đồ chứng khoán đặt dữ liệu trên giấy theo thứ tự sau:
giá mở phiên, giá cao nhất, giá thấp nhất, giá đóng phiên.", "SSE.Views.ChartSettingsDlg.textAlt": "Văn bản thay thế", "SSE.Views.ChartSettingsDlg.textAltDescription": "Mô tả", "SSE.Views.ChartSettingsDlg.textAltTip": "Miêu tả thay thế dưới dạng văn bản thông tin đối tượng trực quan, sẽ được đọc cho những người bị suy giảm thị lực hoặc nhận thức để giúp họ hiểu rõ hơn về những thông tin có trong hình ảnh, autoshape, biểu đồ hoặc bảng.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Tiêu đề", - "SSE.Views.ChartSettingsDlg.textArea": "Vùng", "SSE.Views.ChartSettingsDlg.textAuto": "Tự động", "SSE.Views.ChartSettingsDlg.textAutoEach": "Tự động cho từng", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "Trục giao nhau", "SSE.Views.ChartSettingsDlg.textAxisOptions": "Tùy chọn trục", "SSE.Views.ChartSettingsDlg.textAxisPos": "Vị trí trục", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Thiết lập trục", - "SSE.Views.ChartSettingsDlg.textBar": "Cột", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Giữa các dấu kiểm", "SSE.Views.ChartSettingsDlg.textBillions": "Hàng tỷ", "SSE.Views.ChartSettingsDlg.textBottom": "Dưới cùng", @@ -827,8 +826,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "Trung tâm", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chi tiết Biểu đồ &
Chú thích", "SSE.Views.ChartSettingsDlg.textChartTitle": "Tiêu đề biểu đồ", - "SSE.Views.ChartSettingsDlg.textColumn": "Cột", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "Cột", "SSE.Views.ChartSettingsDlg.textCross": "Chéo", "SSE.Views.ChartSettingsDlg.textCustom": "Tuỳ chỉnh", "SSE.Views.ChartSettingsDlg.textDataColumns": "trong cột", @@ -869,9 +866,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "Chú thích", "SSE.Views.ChartSettingsDlg.textLegendRight": "Bên phải", "SSE.Views.ChartSettingsDlg.textLegendTop": "Trên cùng", - "SSE.Views.ChartSettingsDlg.textLine": "Biểu đồ đường kẻ", "SSE.Views.ChartSettingsDlg.textLines": "Đường kẻ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "Đường kẻ", "SSE.Views.ChartSettingsDlg.textLocationRange": "Phạm vi địa điểm", "SSE.Views.ChartSettingsDlg.textLow": "Thấp", "SSE.Views.ChartSettingsDlg.textMajor": "Chính", @@ -892,8 +887,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "Ngoài", "SSE.Views.ChartSettingsDlg.textOuterTop": "Trên cùng bên ngoài", "SSE.Views.ChartSettingsDlg.textOverlay": "Xếp chồng", - "SSE.Views.ChartSettingsDlg.textPie": "Hình bánh", - "SSE.Views.ChartSettingsDlg.textPoint": "XY (Phân tán)", "SSE.Views.ChartSettingsDlg.textReverse": "Giá trị theo thứ tự ngược", "SSE.Views.ChartSettingsDlg.textReverseOrder": "Trật tự đảo ngược", "SSE.Views.ChartSettingsDlg.textRight": "Bên phải", @@ -914,10 +907,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "Sparkline đơn", "SSE.Views.ChartSettingsDlg.textSmooth": "Trơn", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Phạm vi Sparkline", - "SSE.Views.ChartSettingsDlg.textStock": "Cổ phiếu", "SSE.Views.ChartSettingsDlg.textStraight": "Thẳng", "SSE.Views.ChartSettingsDlg.textStyle": "Kiểu", - "SSE.Views.ChartSettingsDlg.textSurface": "Bề mặt", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "Hàng nghìn", @@ -934,7 +925,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "Trục đứng", "SSE.Views.ChartSettingsDlg.textVertGrid": "Đường lưới dọc", "SSE.Views.ChartSettingsDlg.textVertTitle": "Tiêu đề trục đứng", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "Tiêu đề Trục X", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Tiêu đề Trục Y", "SSE.Views.ChartSettingsDlg.textZero": "0", @@ -1516,17 +1506,12 @@ "SSE.Views.Toolbar.textAlignRight": "Căn phải", "SSE.Views.Toolbar.textAlignTop": "Căn trên cùng", "SSE.Views.Toolbar.textAllBorders": "Tất cả viền", - "SSE.Views.Toolbar.textArea": "Vùng", - "SSE.Views.Toolbar.textBar": "Cột", "SSE.Views.Toolbar.textBold": "Đậm", "SSE.Views.Toolbar.textBordersColor": "Màu đường viền", "SSE.Views.Toolbar.textBordersStyle": "Kiểu đường viền", "SSE.Views.Toolbar.textBottomBorders": "Đường viền dưới cùng", "SSE.Views.Toolbar.textCenterBorders": "Đường viền dọc bên trong", - "SSE.Views.Toolbar.textCharts": "Biểu đồ", "SSE.Views.Toolbar.textClockwise": "Góc theo chiều kim đồng hồ", - "SSE.Views.Toolbar.textColumn": "Cột", - "SSE.Views.Toolbar.textColumnSpark": "Cột", "SSE.Views.Toolbar.textCounterCw": "Góc ngược chiều kim đồng hồ", "SSE.Views.Toolbar.textDelLeft": "Chuyển ô sang trái", "SSE.Views.Toolbar.textDelUp": "Chuyển ô lên trên", @@ -1540,29 +1525,21 @@ "SSE.Views.Toolbar.textInsRight": "Chuyển ô sang phải", "SSE.Views.Toolbar.textItalic": "Nghiêng", "SSE.Views.Toolbar.textLeftBorders": "Đường viền bên trái", - "SSE.Views.Toolbar.textLine": "Đường kẻ", - "SSE.Views.Toolbar.textLineSpark": "Đường kẻ", "SSE.Views.Toolbar.textMiddleBorders": "Đường viền ngang bên trong", "SSE.Views.Toolbar.textMoreFormats": "Thêm định dạng", "SSE.Views.Toolbar.textNewColor": "Thêm màu tùy chỉnh mới", "SSE.Views.Toolbar.textNoBorders": "Không viền", "SSE.Views.Toolbar.textOutBorders": "Đường viền ngoài", - "SSE.Views.Toolbar.textPie": "Hình bánh", - "SSE.Views.Toolbar.textPoint": "XY (Phân tán)", "SSE.Views.Toolbar.textPrint": "In", "SSE.Views.Toolbar.textPrintOptions": "Cài đặt In", "SSE.Views.Toolbar.textRightBorders": "Đường viền phải", "SSE.Views.Toolbar.textRotateDown": "Xoay văn bản xuống", "SSE.Views.Toolbar.textRotateUp": "Xoay văn bản lên", - "SSE.Views.Toolbar.textSparks": "Sparklines", - "SSE.Views.Toolbar.textStock": "Cổ phiếu", - "SSE.Views.Toolbar.textSurface": "Bề mặt", "SSE.Views.Toolbar.textTabFile": "File", "SSE.Views.Toolbar.textTabHome": "Trang chủ", "SSE.Views.Toolbar.textTabInsert": "Chèn", "SSE.Views.Toolbar.textTopBorders": "Đường viền trên cùng", "SSE.Views.Toolbar.textUnderline": "Gạch chân", - "SSE.Views.Toolbar.textWinLossSpark": "Win/Loss", "SSE.Views.Toolbar.textZoom": "Thu phóng", "SSE.Views.Toolbar.tipAlignBottom": "Căn dưới cùng", "SSE.Views.Toolbar.tipAlignCenter": "Căn trung tâm", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index 002cff8a5..6831637a4 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -2,6 +2,18 @@ "cancelButtonText": "取消", "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "在这里输入你的信息", + "Common.define.chartData.textArea": "区域", + "Common.define.chartData.textBar": "条", + "Common.define.chartData.textColumn": "列", + "Common.define.chartData.textLine": "线", + "Common.define.chartData.textPie": "派", + "Common.define.chartData.textPoint": "XY（散射）", + "Common.define.chartData.textStock": "股票", + "Common.define.chartData.textSurface": "平面", + "Common.define.chartData.textColumnSpark": "列", + "Common.define.chartData.textLineSpark": "线", + "Common.define.chartData.textWinLossSpark": "赢/输", + "Common.define.chartData.textSparks": "迷你", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1128,36 +1140,25 @@ "SSE.Views.ChartSettings.strSparkColor": "颜色", "SSE.Views.ChartSettings.strTemplate": "模板", "SSE.Views.ChartSettings.textAdvanced": "显示高级设置", - "SSE.Views.ChartSettings.textArea": "区域", - "SSE.Views.ChartSettings.textBar": "条", "SSE.Views.ChartSettings.textBorderSizeErr": "输入的值不正确。
请输入介于0 pt和1584 pt之间的值。", "SSE.Views.ChartSettings.textChartType": "更改图表类型", - "SSE.Views.ChartSettings.textColumn": "列", - "SSE.Views.ChartSettings.textColumnSpark": "列", "SSE.Views.ChartSettings.textEditData": "编辑数据和位置", "SSE.Views.ChartSettings.textFirstPoint": "第一点", "SSE.Views.ChartSettings.textHeight": "高低", "SSE.Views.ChartSettings.textHighPoint": "高点", "SSE.Views.ChartSettings.textKeepRatio": "不变比例", "SSE.Views.ChartSettings.textLastPoint": "最后一点", - "SSE.Views.ChartSettings.textLine": "线", - "SSE.Views.ChartSettings.textLineSpark": "线", "SSE.Views.ChartSettings.textLowPoint": "低点", "SSE.Views.ChartSettings.textMarkers": "标记", "SSE.Views.ChartSettings.textNegativePoint": "负点", "SSE.Views.ChartSettings.textNewColor": "添加新的自定义颜色", - "SSE.Views.ChartSettings.textPie": "派", - "SSE.Views.ChartSettings.textPoint": "XY（散射）", "SSE.Views.ChartSettings.textRanges": "数据范围", "SSE.Views.ChartSettings.textSelectData": "选择数据", "SSE.Views.ChartSettings.textShow": "显示", "SSE.Views.ChartSettings.textSize": "大小", - "SSE.Views.ChartSettings.textStock": "股票", "SSE.Views.ChartSettings.textStyle": "类型", - "SSE.Views.ChartSettings.textSurface": "平面", "SSE.Views.ChartSettings.textType": "类型", "SSE.Views.ChartSettings.textWidth": "宽度", - "SSE.Views.ChartSettings.textWinLossSpark": "赢/输", "SSE.Views.ChartSettingsDlg.errorMaxPoints": "错误！每个图表序列的最大点值为4096。", "SSE.Views.ChartSettingsDlg.errorMaxRows": "错误！每个图表的最大数据系列数为255", "SSE.Views.ChartSettingsDlg.errorStockChart": "行顺序不正确。建立股票图表将数据按照以下顺序放置在表格上：
开盘价，最高价格，最低价格，收盘价。", @@ -1165,14 +1166,12 @@ "SSE.Views.ChartSettingsDlg.textAltDescription": "描述", "SSE.Views.ChartSettingsDlg.textAltTip": "视觉对象信息的替代的基于文本的表示，将被视为具有视觉或认知障碍的人阅读，以帮助他们更好地了解图像，自动图像，图表或表中的哪些信息。", "SSE.Views.ChartSettingsDlg.textAltTitle": "标题", - "SSE.Views.ChartSettingsDlg.textArea": "区域", "SSE.Views.ChartSettingsDlg.textAuto": "自动", "SSE.Views.ChartSettingsDlg.textAutoEach": "自动调整", "SSE.Views.ChartSettingsDlg.textAxisCrosses": "轴十字架", "SSE.Views.ChartSettingsDlg.textAxisOptions": "轴的选择", "SSE.Views.ChartSettingsDlg.textAxisPos": "轴的位置", "SSE.Views.ChartSettingsDlg.textAxisSettings": "轴设置", - "SSE.Views.ChartSettingsDlg.textBar": "条", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "刻度线之间", "SSE.Views.ChartSettingsDlg.textBillions": "十亿", "SSE.Views.ChartSettingsDlg.textBottom": "底部", @@ -1180,8 +1179,6 @@ "SSE.Views.ChartSettingsDlg.textCenter": "中心", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "图表元素＆图表图例", "SSE.Views.ChartSettingsDlg.textChartTitle": "图表标题", - "SSE.Views.ChartSettingsDlg.textColumn": "列", - "SSE.Views.ChartSettingsDlg.textColumnSpark": "列", "SSE.Views.ChartSettingsDlg.textCross": "交叉", "SSE.Views.ChartSettingsDlg.textCustom": "自定义", "SSE.Views.ChartSettingsDlg.textDataColumns": "在列中", @@ -1222,9 +1219,7 @@ "SSE.Views.ChartSettingsDlg.textLegendPos": "传说", "SSE.Views.ChartSettingsDlg.textLegendRight": "右", "SSE.Views.ChartSettingsDlg.textLegendTop": "顶部", - "SSE.Views.ChartSettingsDlg.textLine": "折线图", "SSE.Views.ChartSettingsDlg.textLines": "行 ", - "SSE.Views.ChartSettingsDlg.textLineSpark": "线", "SSE.Views.ChartSettingsDlg.textLocationRange": "位置范围", "SSE.Views.ChartSettingsDlg.textLow": "低", "SSE.Views.ChartSettingsDlg.textMajor": "主要", @@ -1245,8 +1240,6 @@ "SSE.Views.ChartSettingsDlg.textOut": "向外", "SSE.Views.ChartSettingsDlg.textOuterTop": "外顶", "SSE.Views.ChartSettingsDlg.textOverlay": "覆盖", - "SSE.Views.ChartSettingsDlg.textPie": "派", - "SSE.Views.ChartSettingsDlg.textPoint": "XY（散射）", "SSE.Views.ChartSettingsDlg.textReverse": "值相反的顺序", "SSE.Views.ChartSettingsDlg.textReverseOrder": "相反的顺序", "SSE.Views.ChartSettingsDlg.textRight": "右", @@ -1267,10 +1260,8 @@ "SSE.Views.ChartSettingsDlg.textSingle": "单一的迷你图", "SSE.Views.ChartSettingsDlg.textSmooth": "光滑", "SSE.Views.ChartSettingsDlg.textSparkRanges": "迷你图范围", - "SSE.Views.ChartSettingsDlg.textStock": "股票", "SSE.Views.ChartSettingsDlg.textStraight": "直行", "SSE.Views.ChartSettingsDlg.textStyle": "类型", - "SSE.Views.ChartSettingsDlg.textSurface": "平面", "SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000", "SSE.Views.ChartSettingsDlg.textTenThousands": "10 000", "SSE.Views.ChartSettingsDlg.textThousands": "成千上万", @@ -1287,7 +1278,6 @@ "SSE.Views.ChartSettingsDlg.textVertAxis": "垂直轴", "SSE.Views.ChartSettingsDlg.textVertGrid": "垂直网格线", "SSE.Views.ChartSettingsDlg.textVertTitle": "垂直轴标题", - "SSE.Views.ChartSettingsDlg.textWinLossSpark": "赢/输", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X轴标题", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y轴标题", "SSE.Views.ChartSettingsDlg.textZero": "零", @@ -2050,19 +2040,14 @@ "SSE.Views.Toolbar.textAlignRight": "右对齐", "SSE.Views.Toolbar.textAlignTop": "顶端对齐", "SSE.Views.Toolbar.textAllBorders": "所有边框", - "SSE.Views.Toolbar.textArea": "区域", - "SSE.Views.Toolbar.textBar": "条", "SSE.Views.Toolbar.textBold": "加粗", "SSE.Views.Toolbar.textBordersColor": "边框颜色", "SSE.Views.Toolbar.textBordersStyle": "边框风格", "SSE.Views.Toolbar.textBottom": "底部： ", "SSE.Views.Toolbar.textBottomBorders": "底部边界", "SSE.Views.Toolbar.textCenterBorders": "内部垂直边界", - "SSE.Views.Toolbar.textCharts": "图表", "SSE.Views.Toolbar.textClearPrintArea": "清除打印区域", "SSE.Views.Toolbar.textClockwise": "顺时针方向角", - "SSE.Views.Toolbar.textColumn": "列", - "SSE.Views.Toolbar.textColumnSpark": "列", "SSE.Views.Toolbar.textCounterCw": "角逆时针", "SSE.Views.Toolbar.textDelLeft": "移动单元格", "SSE.Views.Toolbar.textDelUp": "向上移动单元格", @@ -2078,8 +2063,6 @@ "SSE.Views.Toolbar.textLandscape": "横向", "SSE.Views.Toolbar.textLeft": "左： ", "SSE.Views.Toolbar.textLeftBorders": "左边界", - "SSE.Views.Toolbar.textLine": "线", - "SSE.Views.Toolbar.textLineSpark": "线", "SSE.Views.Toolbar.textMarginsLast": "最后自定义", "SSE.Views.Toolbar.textMarginsNarrow": "缩小", "SSE.Views.Toolbar.textMarginsNormal": "正常", @@ -2090,8 +2073,6 @@ "SSE.Views.Toolbar.textNoBorders": "没有边框", "SSE.Views.Toolbar.textOutBorders": "境外", "SSE.Views.Toolbar.textPageMarginsCustom": "自定义边距", - "SSE.Views.Toolbar.textPie": "派", - "SSE.Views.Toolbar.textPoint": "XY（散射）", "SSE.Views.Toolbar.textPortrait": "肖像", "SSE.Views.Toolbar.textPrint": "打印", "SSE.Views.Toolbar.textPrintOptions": "打印设置", @@ -2100,13 +2081,10 @@ "SSE.Views.Toolbar.textRotateDown": "旋转90°", "SSE.Views.Toolbar.textRotateUp": "旋转270°", "SSE.Views.Toolbar.textSetPrintArea": "设置打印区域", - "SSE.Views.Toolbar.textSparks": "迷你", - "SSE.Views.Toolbar.textStock": "股票", "SSE.Views.Toolbar.textStrikeout": "删除线", "SSE.Views.Toolbar.textSubscript": "下标", "SSE.Views.Toolbar.textSubSuperscript": "下标/上标", "SSE.Views.Toolbar.textSuperscript": "上标", - "SSE.Views.Toolbar.textSurface": "平面", "SSE.Views.Toolbar.textTabCollaboration": "协作", "SSE.Views.Toolbar.textTabFile": "文件", "SSE.Views.Toolbar.textTabHome": "主页", @@ -2116,7 +2094,6 @@ "SSE.Views.Toolbar.textTop": "顶边： ", "SSE.Views.Toolbar.textTopBorders": "顶部边界", "SSE.Views.Toolbar.textUnderline": "下划线", - "SSE.Views.Toolbar.textWinLossSpark": "赢/输", "SSE.Views.Toolbar.textZoom": "放大", "SSE.Views.Toolbar.tipAlignBottom": "底部对齐", "SSE.Views.Toolbar.tipAlignCenter": "居中对齐", From ad1c4a2a0e934b25e1815e6ee2a4aae54e7fb6ab Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 12:02:00 +0300 Subject: [PATCH 42/86] [PE] Click on table placeholder --- .../main/app/view/DocumentHolder.js | 81 ++++++++++++++++--- apps/presentationeditor/main/locale/en.json | 1 + 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 8c56779bf..adf8cee6e 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1581,7 +1581,7 @@ define([ me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Image, _.bind(me.onInsertImage, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.ImageUrl, _.bind(me.onInsertImageUrl, me, true)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Chart, _.bind(me.onClickPlaceholderChart, me)); - me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Table)); + me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Table, _.bind(me.onClickPlaceholderTable, me)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video)); me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio)); } @@ -3492,24 +3492,78 @@ define([ this._fromShowPlaceholder = false; }, + onClickPlaceholderTable: function(obj, x, y) { + if (!this.api) return; + var menu = this.placeholderMenuTable, + menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + this._fromShowPlaceholder = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.placeholderMenuTable = menu = new Common.UI.Menu({ + items: [ + {template: _.template('
')}, + {caption: me.mniCustomTable, value: 'custom'} + ] + }); + // Prepare menu container + menuContainer = $(Common.Utils.String.format('', menu.id)); + this.cmpEl.append(menuContainer); + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + if (!me._fromShowPlaceholder) + me.api.asc_uncheckPlaceholders(); + }); + + var picker = new Common.UI.DimensionPicker({ + el: $('#id-placeholder-menu-tablepicker'), + minRows: 8, + minColumns: 10, + maxRows: 8, + maxColumns: 10 + }); + picker.on('select', function(picker, columns, rows){ + me.api.put_Table(columns, rows); + me.fireEvent('editcomplete', me); + }); + menu.on('item:click', function(menu, item, e){ + if (item.value === 'custom') { + (new Common.Views.InsertTableDialog({ + handler: function(result, value) { + if (result == 'ok') + me.api.put_Table(value.columns, value.rows); + me.fireEvent('editcomplete', me); + } + })).show(); + } + }); + } + menuContainer.css({left: x, top : y}); + menuContainer.attr('data-value', 'prevent-canvas-click'); + this._preventClick = true; + menu.show(); + + menu.alignPosition(); + _.delay(function() { + menu.cmpEl.focus(); + }, 10); + this._fromShowPlaceholder = false; + }, + onHidePlaceholderActions: function() { this.placeholderMenuChart && this.placeholderMenuChart.hide(); }, onClickPlaceholder: function(type, obj, x, y) { if (!this.api) return; - - switch (type) { - case AscCommon.PlaceholderButtonType.Table: - break; - case AscCommon.PlaceholderButtonType.Video: - // this.api.addVideo(); - break; - case AscCommon.PlaceholderButtonType.Audio: - // this.api.addAudio(); - break; + if (type == AscCommon.PlaceholderButtonType.Video) { + // this.api.addVideo(); + } else if (type == AscCommon.PlaceholderButtonType.Audio) { + // this.api.addAudio(); } - + this.fireEvent('editcomplete', this); }, insertRowAboveText : 'Row Above', @@ -3687,7 +3741,8 @@ define([ toDictionaryText: 'Add to Dictionary', txtPrintSelection: 'Print Selection', addToLayoutText: 'Add to Layout', - txtResetLayout: 'Reset Slide' + txtResetLayout: 'Reset Slide', + mniCustomTable: 'Insert custom table' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a2332c607..a3fabd528 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1133,6 +1133,7 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.mniCustomTable": "Insert custom table", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close slideshow", From db8a18486d65dd6892e905e3222d0867a3158910 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 13:12:38 +0300 Subject: [PATCH 43/86] [DE] Refactoring control settings, add translation --- .../main/app/view/ControlSettingsDialog.js | 6 ++++-- apps/documenteditor/main/app/view/Toolbar.js | 16 +++++++------- apps/documenteditor/main/locale/en.json | 21 +++++++++++++++++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 3d9e3a31e..99d10656c 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -51,7 +51,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', DE.Views.ControlSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 310, - height: 412, + height: 392, toggleGroup: 'control-adv-settings-group', storageName: 'de-control-settings-adv-category' }, @@ -344,6 +344,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', //for list controls this.btnsCategory[2].setVisible(type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList); if (type == Asc.c_oAscContentControlSpecificType.ComboBox || type == Asc.c_oAscContentControlSpecificType.DropDownList) { + this.btnsCategory[2].setCaption(type == Asc.c_oAscContentControlSpecificType.ComboBox ? this.textCombobox : this.textDropDown); var specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(); if (specProps) { var count = specProps.get_ItemsCount(); @@ -648,9 +649,10 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textUp: 'Up', textDown: 'Down', textCombobox: 'Combo box', + textDropDown: 'Drop-down list', textDisplayName: 'Display name', textValue: 'Value', - textDate: 'Date Format', + textDate: 'Date format', textLang: 'Language', textFormat: 'Display the date like this', textCheckbox: 'Check box', diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index cffc823cb..a60980b14 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -638,43 +638,43 @@ define([ items: [ { caption: this.textPlainControl, - iconCls: 'mnu-control-plain', + // iconCls: 'mnu-control-plain', value: 'plain' }, { caption: this.textRichControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'rich' }, { caption: this.textPictureControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'picture' }, { caption: this.textComboboxControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'combobox' }, { caption: this.textDropdownControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'dropdown' }, { caption: this.textDateControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'date' }, { caption: this.textCheckboxControl, - iconCls: 'mnu-control-rich', + // iconCls: 'mnu-control-rich', value: 'checkbox' }, {caption: '--'}, { caption: this.textRemoveControl, - iconCls: 'mnu-control-remove', + // iconCls: 'mnu-control-remove', value: 'remove' }, {caption: '--'}, diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index b9a16dd19..b749848be 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1088,6 +1088,22 @@ "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.ControlSettingsDialog.strGeneral": "General", + "DE.Views.ControlSettingsDialog.textAdd": "Add", + "DE.Views.ControlSettingsDialog.textChange": "Edit", + "DE.Views.ControlSettingsDialog.textDelete": "Delete", + "DE.Views.ControlSettingsDialog.textUp": "Up", + "DE.Views.ControlSettingsDialog.textDown": "Down", + "DE.Views.ControlSettingsDialog.textCombobox": "Combo box", + "DE.Views.ControlSettingsDialog.textDropDown": "Drop-down list", + "DE.Views.ControlSettingsDialog.textDisplayName": "Display name", + "DE.Views.ControlSettingsDialog.textValue": "Value", + "DE.Views.ControlSettingsDialog.textDate": "Date format", + "DE.Views.ControlSettingsDialog.textLang": "Language", + "DE.Views.ControlSettingsDialog.textFormat": "Display the date like this", + "DE.Views.ControlSettingsDialog.textCheckbox": "Check box", + "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol", + "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol", "DE.Views.CustomColumnsDialog.textColumns": "Number of columns", "DE.Views.CustomColumnsDialog.textSeparator": "Column divider", "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns", @@ -2247,6 +2263,11 @@ "DE.Views.Toolbar.txtScheme9": "Foundry", "DE.Views.Toolbar.capBtnInsSymbol": "Symbol", "DE.Views.Toolbar.tipInsertSymbol": "Insert symbol", + "DE.Views.Toolbar.textPictureControl": "Picture", + "DE.Views.Toolbar.textComboboxControl": "Combo box", + "DE.Views.Toolbar.textCheckboxControl": "Check box", + "DE.Views.Toolbar.textDropdownControl": "Drop-down list", + "DE.Views.Toolbar.textDateControl": "Date", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", From 949b83df4a769f54898c87570cbf711ba9983aee Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 13:28:29 +0300 Subject: [PATCH 44/86] [DE] Add translation --- apps/documenteditor/main/locale/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index ad5eb6581..bc9a61c79 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1370,6 +1370,10 @@ "DE.Views.DropcapSettingsAdvanced.textWidth": "Width", "DE.Views.DropcapSettingsAdvanced.tipFontName": "Font", "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "No borders", + "DE.Views.EditListItemDialog.textDisplayName": "Display name", + "DE.Views.EditListItemDialog.textValue": "Value", + "DE.Views.EditListItemDialog.textNameError": "Display name must not be empty.", + "DE.Views.EditListItemDialog.textValueError": "An item with the same value already exists.", "DE.Views.FileMenu.btnBackCaption": "Open file location", "DE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "DE.Views.FileMenu.btnCreateNewCaption": "Create New", From 6c55bd0f24fefee7fde4237cf535ad4ab1a83733 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 15:43:26 +0300 Subject: [PATCH 45/86] Image settings: fix buttons size --- .../main/app/template/ImageSettings.template | 6 +++--- .../main/app/view/ImageSettings.js | 9 ++++++-- .../main/app/template/ImageSettings.template | 6 +++--- .../main/app/view/ImageSettings.js | 21 ++++++++++++------- .../main/app/template/ImageSettings.template | 4 ++-- .../main/app/view/ImageSettings.js | 5 +++-- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/apps/documenteditor/main/app/template/ImageSettings.template b/apps/documenteditor/main/app/template/ImageSettings.template index 8abc9eaf0..9fae4b54e 100644 --- a/apps/documenteditor/main/app/template/ImageSettings.template +++ b/apps/documenteditor/main/app/template/ImageSettings.template @@ -14,17 +14,17 @@ - + - + -
+
diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 527037a2b..d0717940b 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -159,6 +159,10 @@ define([ }); this.lockedControls.push(this.btnFitMargins); + var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitMargins.cmpEl.width()); + this.btnOriginalSize.cmpEl.width(w); + this.btnFitMargins.cmpEl.width(w); + this.btnInsertFromFile = new Common.UI.Button({ el: $('#image-button-from-file') }); @@ -229,6 +233,7 @@ define([ this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.lockedControls.push(this.btnFlipH); + var w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -236,9 +241,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, diff --git a/apps/presentationeditor/main/app/template/ImageSettings.template b/apps/presentationeditor/main/app/template/ImageSettings.template index 75032587c..6b41d6507 100644 --- a/apps/presentationeditor/main/app/template/ImageSettings.template +++ b/apps/presentationeditor/main/app/template/ImageSettings.template @@ -14,17 +14,17 @@ - + - + -
+
diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 439bced4d..51a8dabca 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -143,6 +143,17 @@ define([ this.fireEvent('editcomplete', this); }, this)); + this.btnFitSlide = new Common.UI.Button({ + el: $('#image-button-fit-slide') + }); + this.lockedControls.push(this.btnFitSlide); + this.btnFitSlide.on('click', _.bind(this.setFitSlide, this)); + + var w = Math.max(this.btnOriginalSize.cmpEl.width(), this.btnFitSlide.cmpEl.width()); + this.btnOriginalSize.cmpEl.width(w); + this.btnFitSlide.cmpEl.width(w); + + w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -150,9 +161,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, @@ -176,12 +187,6 @@ define([ this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this)); this.lockedControls.push(this.btnCrop); - this.btnFitSlide = new Common.UI.Button({ - el: $('#image-button-fit-slide') - }); - this.lockedControls.push(this.btnFitSlide); - this.btnFitSlide.on('click', _.bind(this.setFitSlide, this)); - this.btnRotate270 = new Common.UI.Button({ cls: 'btn-toolbar', iconCls: 'rotate-270', diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettings.template b/apps/spreadsheeteditor/main/app/template/ImageSettings.template index 8e90e9ace..ace66d110 100644 --- a/apps/spreadsheeteditor/main/app/template/ImageSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ImageSettings.template @@ -21,12 +21,12 @@ diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 525ffa781..1f19a8851 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -199,6 +199,7 @@ define([ this.lblReplace = $('#image-lbl-replace'); + var w = this.btnOriginalSize.cmpEl.outerWidth(); this.btnCrop = new Common.UI.Button({ cls: 'btn-text-split-default', caption: this.textCrop, @@ -206,9 +207,9 @@ define([ enableToggle: true, allowDepress: true, pressed: this._state.cropMode, - width: 100, + width: w, menu : new Common.UI.Menu({ - style : 'min-width: 100px;', + style : 'min-width:' + w + 'px;', items: [ { caption: this.textCrop, From 90d65ddff54cd10b9e8d82a648a47859747dca03 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 17:05:02 +0300 Subject: [PATCH 46/86] [PE][SSE] Change bullet in the list settings dialog --- .../main/lib/view/ListSettingsDialog.js | 69 ++++++++++++++++--- .../common/main/lib/view/SymbolTableDialog.js | 2 + .../main/app/controller/Toolbar.js | 2 + apps/presentationeditor/main/locale/en.json | 2 + .../main/app/controller/DocumentHolder.js | 4 +- apps/spreadsheeteditor/main/locale/en.json | 2 + 6 files changed, 71 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index e0820cd4d..8f783c8d0 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -46,15 +46,16 @@ define([ 'common/main/lib/component/Window', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/ThemeColorPalette', - 'common/main/lib/component/ColorButton' + 'common/main/lib/component/ColorButton', + 'common/main/lib/view/SymbolTableDialog' ], function () { 'use strict'; Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers width: 230, - height: 156, - style: 'min-width: 230px;', + height: 200, + style: 'min-width: 240px;', cls: 'modal-dlg', split: false, buttons: ['ok', 'cancel'] @@ -64,20 +65,25 @@ define([ this.type = options.type || 0; _.extend(this.options, { - title: this.txtTitle, - height: this.type==1 ? 190 : 156 + title: this.txtTitle }, options || {}); this.template = [ '
', - '
', + '
', '
', '
', - '
', + '
', '
', '
', + '<% if (type == 0) { %>', + '
', + '', + '', + '
', + '<% } %>', '<% if (type == 1) { %>', - '
', + '
', '
', '
', '<% } %>', @@ -163,6 +169,13 @@ define([ } }); + this.btnEdit = new Common.UI.Button({ + el: $window.find('#id-dlg-list-edit'), + hint: this.tipChange + }); + this.btnEdit.on('click', _.bind(this.onEditBullet, this)); + this.btnEdit.cmpEl.css({'font-size': '12px'}); + this.afterRender(); }, @@ -186,6 +199,36 @@ define([ } }, + onEditBullet: function() { + var me = this, + props = me.bulletProps, + handler = function(dlg, result, settings) { + if (result == 'ok') { + props.changed = true; + props.code = settings.code; + props.font = settings.font; + props.symbol = settings.symbol; + props.font && me.btnEdit.cmpEl.css('font-family', props.font); + settings.symbol && me.btnEdit.setCaption(settings.symbol); + if (me._changedProps) { + me._changedProps.asc_putBulletFont(props.font); + me._changedProps.asc_putBulletSymbol(props.symbol); + } + } + }, + win = new Common.Views.SymbolTableDialog({ + api: me.options.api, + lang: me.options.interfaceLang, + modal: true, + type: 0, + font: props.font, + symbol: props.symbol, + handler: handler + }); + win.show(); + win.on('symbol:dblclick', handler); + }, + _handleInput: function(state) { if (this.options.handler) { this.options.handler.call(this, state, this._changedProps); @@ -228,6 +271,12 @@ define([ if (!isselected) this.colors.clearSelection(); } else this.colors.select(color,true); + + if (this.type==0) { + this.bulletProps = {symbol: props.asc_getBulletSymbol(), font: props.asc_getBulletFont()}; + this.bulletProps.font && this.btnEdit.cmpEl.css('font-family', this.bulletProps.font); + this.bulletProps.symbol && this.btnEdit.setCaption(this.bulletProps.symbol); + } } this._changedProps = new Asc.asc_CParagraphProperty(); }, @@ -237,6 +286,8 @@ define([ txtColor: 'Color', txtOfText: '% of text', textNewColor: 'Add New Custom Color', - txtStart: 'Start at' + txtStart: 'Start at', + txtBullet: 'Bullet', + tipChange: 'Change bullet' }, Common.Views.ListSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index d048cdc99..a0e808329 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -488,6 +488,8 @@ define([ if (options.code) { nCurrentSymbol = options.code; + } else if (options.symbol) { + nCurrentSymbol = this.fixedCharCodeAt(options.symbol, 0); } if (init && this.options.lang && this.options.lang != 'en') { diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index c40f6b3cb..da92ea020 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1126,8 +1126,10 @@ define([ } if (props) { (new Common.Views.ListSettingsDialog({ + api: me.api, props: props, type: type, + interfaceLang: me.toolbar.mode.lang, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 9af942158..730c9b098 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -123,6 +123,8 @@ "Common.Views.ListSettingsDialog.txtSize": "Size", "Common.Views.ListSettingsDialog.txtStart": "Start at", "Common.Views.ListSettingsDialog.txtTitle": "List Settings", + "Common.Views.ListSettingsDialog.txtBullet": "Bullet", + "Common.Views.ListSettingsDialog.tipChange": "Change bullet", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.", diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 6c332e45b..a1a5434ff 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -763,8 +763,10 @@ define([ } if (props) { (new Common.Views.ListSettingsDialog({ + api: me.api, props: props, - type: this.api.asc_getCurrentListType().get_ListType(), + type: me.api.asc_getCurrentListType().get_ListType(), + interfaceLang: me.permissions.lang, handler: function(result, value) { if (result == 'ok') { if (me.api) { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 487e071c4..ff5e1a54f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -113,6 +113,8 @@ "Common.Views.ListSettingsDialog.txtSize": "Size", "Common.Views.ListSettingsDialog.txtStart": "Start at", "Common.Views.ListSettingsDialog.txtTitle": "List Settings", + "Common.Views.ListSettingsDialog.txtBullet": "Bullet", + "Common.Views.ListSettingsDialog.tipChange": "Change bullet", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtColon": "Colon", "Common.Views.OpenDialog.txtComma": "Comma", From b56f407328cd0c2e70519a9cd417e781811424dc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Nov 2019 17:34:52 +0300 Subject: [PATCH 47/86] [PE] Change default state for slide settings(show color fill mode) --- .../main/app/template/SlideSettings.template | 2 +- .../main/app/view/SlideSettings.js | 31 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/apps/presentationeditor/main/app/template/SlideSettings.template b/apps/presentationeditor/main/app/template/SlideSettings.template index fbe24606d..ce824dadc 100644 --- a/apps/presentationeditor/main/app/template/SlideSettings.template +++ b/apps/presentationeditor/main/app/template/SlideSettings.template @@ -11,7 +11,7 @@
- +
-
+
-
+
diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 11ef1102a..a7708b734 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -129,9 +129,23 @@ define([ data: this._arrFillSrc, disabled: true }); - this.cmbFillSrc.setValue(''); + this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); + this.btnBackColor = new Common.UI.ColorButton({ + style: "width:45px;", + disabled: true, + menu : new Common.UI.Menu({ + items: [ + { template: _.template('
') }, + { template: _.template('' + this.textNewColor + '') } + ] + }) + }); + this.btnBackColor.render( $('#slide-back-color-btn')); + this.btnBackColor.setColor('ffffff'); + this.FillItems.push(this.btnBackColor); + this.FillColorContainer = $('#slide-panel-color-fill'); this.FillImageContainer = $('#slide-panel-image-fill'); this.FillPatternContainer = $('#slide-panel-pattern-fill'); @@ -1056,20 +1070,7 @@ define([ UpdateThemeColors: function() { if (this._initSettings) return; - if (!this.btnBackColor) { - this.btnBackColor = new Common.UI.ColorButton({ - style: "width:45px;", - disabled: true, - menu : new Common.UI.Menu({ - items: [ - { template: _.template('
') }, - { template: _.template('' + this.textNewColor + '') } - ] - }) - }); - this.btnBackColor.render( $('#slide-back-color-btn')); - this.btnBackColor.setColor('ffffff'); - this.FillItems.push(this.btnBackColor); + if (!this.colorsBack) { this.colorsBack = new Common.UI.ThemeColorPalette({ el: $('#slide-back-color-menu'), value: 'ffffff', From e3876d82e644c9b246ae89c7ef3ba8f64142f893 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 11:20:05 +0300 Subject: [PATCH 48/86] [SSE] Fix Bug 43587. Hide list settings for chart title --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a1a5434ff..7d94140a5 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1831,6 +1831,8 @@ define([ documentHolder.menuParagraphDirection.setVisible(false); // убрать после того, как заголовок можно будет растягивать по вертикали!! documentHolder.pmiTextAdvanced.setVisible(false); documentHolder.textInShapeMenu.items[9].setVisible(false); + documentHolder.menuParagraphBullets.setVisible(false); + documentHolder.textInShapeMenu.items[3].setVisible(false); documentHolder.pmiTextCopy.setDisabled(false); if (showMenu) this.showPopupMenu(documentHolder.textInShapeMenu, {}, event); } From bf9925d0dbdaf7df1ac370671ab3be72ee60cd81 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 11:36:05 +0300 Subject: [PATCH 49/86] [SSE] Bug 43587 --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 7d94140a5..e4b1b96e8 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1689,10 +1689,12 @@ define([ var hyperinfo = cellinfo.asc_getHyperlink(), can_add_hyperlink = this.api.asc_canAddShapeHyperlink(); + documentHolder.menuParagraphBullets.setVisible(istextchartmenu!==true); documentHolder.menuHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && hyperinfo); documentHolder.menuAddHyperlinkShape.setVisible(istextshapemenu && can_add_hyperlink!==false && !hyperinfo); documentHolder.menuParagraphVAlign.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!! documentHolder.menuParagraphDirection.setVisible(istextchartmenu!==true && !isEquation); // убрать после того, как заголовок можно будет растягивать по вертикали!! + documentHolder.textInShapeMenu.items[3].setVisible(istextchartmenu!==true || istextshapemenu && can_add_hyperlink!==false); documentHolder.pmiTextAdvanced.setVisible(documentHolder.pmiTextAdvanced.textInfo!==undefined); _.each(documentHolder.textInShapeMenu.items, function(item) { From 3d0c23450fb3e8629c9c40af656f1cae18dba589 Mon Sep 17 00:00:00 2001 From: GoshaZotov Date: Wed, 20 Nov 2019 14:26:00 +0300 Subject: [PATCH 50/86] [SSE] Add HeaderFooter.js --- apps/spreadsheeteditor/sdk_dev_scripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index efedf8018..8d31b6a46 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/cell/model/Serialize.js", "../../../../sdkjs/cell/model/ConditionalFormatting.js", "../../../../sdkjs/cell/model/DataValidation.js", + "../../../../sdkjs/cell/model/HeaderFooter.js", "../../../../sdkjs/cell/model/CellInfo.js", "../../../../sdkjs/cell/view/mobileTouch.js", "../../../../sdkjs/cell/view/StringRender.js", From 3a74ce23353af0e8a178596e83a6f98e39db9354 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 14:56:32 +0300 Subject: [PATCH 51/86] [DE] Show menu for table of contents and date content control --- .../main/app/controller/Links.js | 68 +++++++++++++++---- 1 file changed, 53 insertions(+), 15 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index fdd1a2a24..28193dd4b 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -94,10 +94,8 @@ define([ this.api.asc_registerCallback('asc_onCanAddHyperlink', _.bind(this.onApiCanAddHyperlink, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); - this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowControlsActions, this)); - this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideControlsActions, this)); - // this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); - // this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); + this.api.asc_registerCallback('asc_onShowContentControlsActions',_.bind(this.onShowContentControlsActions, this)); + this.api.asc_registerCallback('asc_onHideContentControlsActions',_.bind(this.onHideContentControlsActions, this)); } return this; @@ -354,8 +352,9 @@ define([ })).show(); }, - onShowContentControlsActions: function(action, x, y) { - var menu = (action==1) ? this.view.contentsUpdateMenu : this.view.contentsMenu, + onShowTOCActions: function(obj, x, y) { + var action = obj.button, + menu = (action==AscCommon.CCButtonType.Toc) ? this.view.contentsUpdateMenu : this.view.contentsMenu, documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)), me = this; @@ -394,15 +393,22 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); + if (controlsContainer.is(':visible')) + controlsContainer.hide(); }, - onShowControlsActions: function(action, x, y) { - var documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + onShowDateActions: function(obj, x, y) { + var action = obj.button, + props = obj.pr, + specProps = props.get_DateTimePr(), + id = props.get_InternalId(), + documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, controlsContainer = documentHolderView.cmpEl.find('#calendar-control-container'), me = this; if (controlsContainer.length < 1) { - controlsContainer = $('
'); + controlsContainer = $('
'); documentHolderView.cmpEl.append(controlsContainer); } @@ -418,7 +424,10 @@ define([ firstday: 1 }); this.cmpCalendar.on('date:click', function (cmp, date) { - me.selectDate = new Date(date); + specProps.put_FullDate(new Date(date)); + me.api.asc_SetContentControlProperties(props, id); + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); }); this.cmpCalendar.on('calendar:keydown', function (cmp, e) { if (e.keyCode==Common.UI.Keys.ESC) { @@ -427,16 +436,45 @@ define([ } }); } - this.cmpCalendar.setDate(this.selectDate ? this.selectDate : new Date()); + this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined)); + // align + var offset = controlsContainer.offset(), + docW = Common.Utils.innerWidth(), + docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number + menuW = this.cmpCalendar.cmpEl.outerWidth(), + menuH = this.cmpCalendar.cmpEl.outerHeight(), + buttonOffset = 22, + left = offset.left - menuW + buttonOffset, + top = offset.top; + if (top + menuH > docH) { + top = docH - menuH; + left -= buttonOffset; + } + if (top < 0) + top = 0; + if (left + menuW > docW) + left = docW - menuW; + this.cmpCalendar.cmpEl.css({left: left, top : top}); documentHolderView._preventClick = true; }, - onHideControlsActions: function() { - var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); - if (controlsContainer.is(':visible')) - controlsContainer.hide(); + onShowContentControlsActions: function(obj, x, y) { + var type = obj.type; + switch (type) { + case Asc.c_oAscContentControlSpecificType.TOC: + this.onShowTOCActions(obj, x, y); + break; + case Asc.c_oAscContentControlSpecificType.DateTime: + this.onShowDateActions(obj, x, y); + break; + case Asc.c_oAscContentControlSpecificType.Picture: + break; + case Asc.c_oAscContentControlSpecificType.DropDownList: + case Asc.c_oAscContentControlSpecificType.ComboBox: + break; + } } }, DE.Controllers.Links || {})); From cb238bf14ff4d169d10d95db8317ec3c367f832a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 16:04:32 +0300 Subject: [PATCH 52/86] [DE] Show menu for list content controls --- .../main/app/controller/Links.js | 66 ++++++++++++++++++- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 28193dd4b..28dcbf2f0 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -393,14 +393,14 @@ define([ onHideContentControlsActions: function() { this.view.contentsMenu && this.view.contentsMenu.hide(); this.view.contentsUpdateMenu && this.view.contentsUpdateMenu.hide(); + this.view.listControlMenu && this.view.listControlMenu.isVisible() && this.view.listControlMenu.hide(); var controlsContainer = this.getApplication().getController('DocumentHolder').documentHolder.cmpEl.find('#calendar-control-container'); if (controlsContainer.is(':visible')) controlsContainer.hide(); }, onShowDateActions: function(obj, x, y) { - var action = obj.button, - props = obj.pr, + var props = obj.pr, specProps = props.get_DateTimePr(), id = props.get_InternalId(), documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, @@ -460,6 +460,66 @@ define([ documentHolderView._preventClick = true; }, + onShowListActions: function(obj, x, y) { + var type = obj.type, + props = obj.pr, + id = props.get_InternalId(), + specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), + menu = this.view.listControlMenu, + documentHolderView = this.getApplication().getController('DocumentHolder').documentHolder, + menuContainer = menu ? documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, + me = this; + + this._fromShowContentControls = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.view.listControlMenu = menu = new Common.UI.Menu({ + menuAlign: 'tr-bl', + items: [] + }); + menu.on('item:click', function(menu, item) { + setTimeout(function(){ + me.api.asc_SelectContentControlListItem(item.value, id); + }, 1); + }); + + // Prepare menu container + if (!menuContainer || menuContainer.length < 1) { + menuContainer = $(Common.Utils.String.format('', menu.id)); + documentHolderView.cmpEl.append(menuContainer); + } + + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + me.view.listControlMenu.removeAll(); + if (!me._fromShowContentControls) + me.api.asc_UncheckContentControlButtons(); + }); + } + if (specProps) { + var count = specProps.get_ItemsCount(); + for (var i=0; i Date: Wed, 20 Nov 2019 16:15:34 +0300 Subject: [PATCH 53/86] [DE] Fix menu position for content controls --- apps/documenteditor/main/app/controller/Links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 28dcbf2f0..352cea19e 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -445,7 +445,7 @@ define([ menuW = this.cmpCalendar.cmpEl.outerWidth(), menuH = this.cmpCalendar.cmpEl.outerHeight(), buttonOffset = 22, - left = offset.left - menuW + buttonOffset, + left = offset.left - menuW, top = offset.top; if (top + menuH > docH) { top = docH - menuH; @@ -508,7 +508,7 @@ define([ } } - menuContainer.css({left: x + 22, top : y}); + menuContainer.css({left: x, top : y}); menuContainer.attr('data-value', 'prevent-canvas-click'); documentHolderView._preventClick = true; menu.show(); From 8c4d467b5257689593a0858795a0ae50b138f1b1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 20 Nov 2019 17:10:32 +0300 Subject: [PATCH 54/86] [DE] Draw/Erase table --- .../documenteditor/main/app/controller/Toolbar.js | 15 +++++++++++++++ apps/documenteditor/main/app/view/Toolbar.js | 8 ++++++-- apps/documenteditor/main/locale/en.json | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index fd627f077..5ca5abd66 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -382,6 +382,8 @@ define([ this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); + this.api.asc_registerCallback('asc_TableDrawModeCallback', _.bind(this.onTableDraw, this)); + this.api.asc_registerCallback('asc_TableEraseModeCallback', _.bind(this.onTableErase, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); @@ -856,6 +858,13 @@ define([ this.modeAlwaysSetStyle = false; }, + onTableDraw: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[2].setChecked(!!v, true); + }, + onTableErase: function(v) { + this.toolbar.mnuInsertTable && this.toolbar.mnuInsertTable.items[3].setChecked(!!v, true); + }, + onApiParagraphStyleChange: function(name) { if (this._state.prstyle != name) { var listStyle = this.toolbar.listStyles, @@ -1412,6 +1421,12 @@ define([ Common.NotificationCenter.trigger('edit:complete', me.toolbar); } })).show(); + } else if (item.value == 'draw') { + item.isChecked() && menu.items[3].setChecked(false, true); + this.api.SetTableDrawMode(item.isChecked()); + } else if (item.value == 'erase') { + item.isChecked() && menu.items[2].setChecked(false, true); + this.api.SetTableEraseMode(item.isChecked()); } }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 67bf09d39..5c286102b 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -480,7 +480,9 @@ define([ menu: new Common.UI.Menu({ items: [ {template: _.template('
')}, - {caption: this.mniCustomTable, value: 'custom'} + {caption: this.mniCustomTable, value: 'custom'}, + {caption: this.mniDrawTable, value: 'draw', checkable: true}, + {caption: this.mniEraseTable, value: 'erase', checkable: true} ] }) }); @@ -2318,7 +2320,9 @@ define([ textDateControl: 'Date', capBtnAddComment: 'Add Comment', capBtnInsSymbol: 'Symbol', - tipInsertSymbol: 'Insert symbol' + tipInsertSymbol: 'Insert symbol', + mniDrawTable: 'Draw table', + mniEraseTable: 'Erase table' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bcd5528bc..3b2bac95c 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2305,6 +2305,8 @@ "DE.Views.Toolbar.textCheckboxControl": "Check box", "DE.Views.Toolbar.textDropdownControl": "Drop-down list", "DE.Views.Toolbar.textDateControl": "Date", + "DE.Views.Toolbar.mniDrawTable": "Draw table", + "DE.Views.Toolbar.mniEraseTable": "Erase table", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", From 7a42e934e281cf4fe33fed1cfc6dd64e7a5022bd Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 21 Nov 2019 13:43:23 +0300 Subject: [PATCH 55/86] [SSE] Fix commit: fe4a450465c69f2c4b161bbe0017dca427e36a8e --- apps/common/main/resources/less/buttons.less | 6 ++++-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 3642c73af..8771a15a0 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -400,8 +400,10 @@ } } .dropdown-menu { - li.disabled { - opacity: 0.65; + &.scale-menu { + li.disabled { + opacity: 0.65; + } } } } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 36085e6f3..950599b6a 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1363,8 +1363,8 @@ define([ caption: me.capBtnScale, lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth], menu: new Common.UI.Menu({ - items: [ - ]}) + items: [], + cls: 'scale-menu'}) }); var menuWidthItem = new Common.UI.MenuItem({ caption: me.textWidth, From b82812abd64875a6834c1f1dc4937c0a40eacde3 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 21 Nov 2019 13:55:04 +0300 Subject: [PATCH 56/86] [SSE] Cell Settings: set no fill for default --- apps/spreadsheeteditor/main/app/view/CellSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 2c41c3736..bc7e5bf88 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -188,7 +188,7 @@ define([ editable: false, data: this._arrFillSrc }); - this.cmbFillSrc.setValue(this._arrFillSrc[0].value); + this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL); this.fillControls.push(this.cmbFillSrc); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); From d433d525bbb93d42628e022a4916f4204770ce35 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Nov 2019 17:29:39 +0300 Subject: [PATCH 57/86] [DE] Fix Bug 40362, Bug 43365, Bug 42936 --- .../main/app/controller/Links.js | 13 ++++++- .../main/app/controller/Toolbar.js | 37 +++++++++++-------- apps/documenteditor/main/app/view/Toolbar.js | 3 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 352cea19e..e4a30288b 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -130,7 +130,8 @@ define([ in_header = false, in_equation = false, in_image = false, - in_table = false; + in_table = false, + frame_pr = null; while (++i < selectedObjects.length) { type = selectedObjects[i].get_ObjectType(); @@ -138,6 +139,7 @@ define([ if (type === Asc.c_oAscTypeSelectElement.Paragraph) { paragraph_locked = pr.get_Locked(); + frame_pr = pr; } else if (type === Asc.c_oAscTypeSelectElement.Header) { header_locked = pr.get_Locked(); in_header = true; @@ -154,12 +156,19 @@ define([ var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, control_plain = (control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; - var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain; + var need_disable = paragraph_locked || in_equation || in_image || in_header || control_plain || rich_edit_lock || plain_edit_lock; this.view.btnsNotes.setDisabled(need_disable); need_disable = paragraph_locked || header_locked || in_header || control_plain; this.view.btnBookmarks.setDisabled(need_disable); + + need_disable = in_header || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; + this.view.btnsContents.setDisabled(need_disable); }, onApiCanAddHyperlink: function(value) { diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5ca5abd66..6cb0f668a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -739,7 +739,11 @@ define([ if (sh) this.onParagraphColor(sh); - var need_disable = paragraph_locked || header_locked; + var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, + rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, + plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, + plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; + var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock; if (this._state.prcontrolsdisable != need_disable) { if (this._state.activated) this._state.prcontrolsdisable = need_disable; @@ -753,16 +757,17 @@ define([ lock_type = (in_control&&control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, control_plain = (in_control&&control_props) ? (control_props.get_ContentControlType()==Asc.c_oAscSdtLevelType.Inline) : false; (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); + var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; - if (!paragraph_locked && !header_locked) { - var control_disable = control_plain || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; + if (!need_disable) { + var control_disable = control_plain || content_locked; for (var i=0; i<7; i++) toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); - toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || content_locked); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } - var need_text_disable = paragraph_locked || header_locked || in_chart; + var need_text_disable = paragraph_locked || header_locked || in_chart || rich_edit_lock || plain_edit_lock; if (this._state.textonlycontrolsdisable != need_text_disable) { if (this._state.activated) this._state.textonlycontrolsdisable = need_text_disable; if (!need_disable) { @@ -770,7 +775,7 @@ define([ item.setDisabled(need_text_disable); }, this); } - toolbar.btnCopyStyle.setDisabled(need_text_disable); + // toolbar.btnCopyStyle.setDisabled(need_text_disable); toolbar.btnClearStyle.setDisabled(need_text_disable); } @@ -796,22 +801,22 @@ define([ if ( !toolbar.btnDropCap.isDisabled() ) toolbar.mnuDropCapAdvanced.setDisabled(disable_dropcapadv); - need_disable = !can_add_table || header_locked || in_equation || control_plain; + need_disable = !can_add_table || header_locked || in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertTable.setDisabled(need_disable); need_disable = toolbar.mnuPageNumCurrentPos.isDisabled() && toolbar.mnuPageNumberPosPicker.isDisabled() || control_plain; toolbar.mnuInsertPageNum.setDisabled(need_disable); var in_footnote = this.api.asc_IsCursorInFootnote(); - need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control; + need_disable = paragraph_locked || header_locked || in_header || in_image || in_equation && !btn_eq_state || in_footnote || in_control || rich_edit_lock || plain_edit_lock || rich_del_lock; toolbar.btnsPageBreak.setDisabled(need_disable); toolbar.btnBlankPage.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_equation || control_plain || content_locked; toolbar.btnInsertShape.setDisabled(need_disable); toolbar.btnInsertText.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertImage.setDisabled(need_disable); toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote); @@ -820,28 +825,28 @@ define([ this._state.in_chart = in_chart; } - need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain; + need_disable = in_chart && image_locked || !in_chart && need_disable || control_plain || rich_del_lock || plain_del_lock || content_locked; toolbar.btnInsertChart.setDisabled(need_disable); - need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain; + need_disable = paragraph_locked || header_locked || in_chart || !can_add_image&&!in_equation || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; toolbar.btnInsertEquation.setDisabled(need_disable); - toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked); + toolbar.btnInsertSymbol.setDisabled(!in_para || paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock); - need_disable = paragraph_locked || header_locked || in_equation; + need_disable = paragraph_locked || header_locked || in_equation || rich_edit_lock || plain_edit_lock; toolbar.btnSuperscript.setDisabled(need_disable); toolbar.btnSubscript.setDisabled(need_disable); toolbar.btnEditHeader.setDisabled(in_equation); - need_disable = paragraph_locked || header_locked || in_image || control_plain; + need_disable = paragraph_locked || header_locked || in_image || control_plain || rich_edit_lock || plain_edit_lock; if (need_disable != toolbar.btnColumns.isDisabled()) toolbar.btnColumns.setDisabled(need_disable); if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); - need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked; + need_disable = !this.api.can_AddQuotedComment() || paragraph_locked || header_locked || image_locked || rich_del_lock || rich_edit_lock || plain_del_lock || plain_edit_lock; if (this.mode.compatibleFeatures) { need_disable = need_disable || in_image; } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 5c286102b..e9339bee6 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1955,8 +1955,7 @@ define([ this.btnMailRecepients.setVisible(mode.canCoAuthoring == true && mode.canUseMailMerge); this.listStylesAdditionalMenuItem.setVisible(mode.canEditStyles); - this.btnContentControls.menu.items[4].setVisible(mode.canEditContentControl); - this.btnContentControls.menu.items[5].setVisible(mode.canEditContentControl); + this.btnContentControls.menu.items[10].setVisible(mode.canEditContentControl); this.mnuInsertImage.items[2].setVisible(this.mode.canRequestInsertImage || this.mode.fileChoiceUrl && this.mode.fileChoiceUrl.indexOf("{documentType}")>-1); }, From 25a9ca56ed899cc3ed88d412701670204101b9a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 21 Nov 2019 17:44:29 +0300 Subject: [PATCH 58/86] [DE] Change events for table drawing --- apps/documenteditor/main/app/controller/Toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 6cb0f668a..19a846b5e 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -382,8 +382,8 @@ define([ this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this)); this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); - this.api.asc_registerCallback('asc_TableDrawModeCallback', _.bind(this.onTableDraw, this)); - this.api.asc_registerCallback('asc_TableEraseModeCallback', _.bind(this.onTableErase, this)); + this.api.asc_registerCallback('asc_onTableDrawModeChanged', _.bind(this.onTableDraw, this)); + this.api.asc_registerCallback('asc_onTableEraseModeChanged', _.bind(this.onTableErase, this)); } else if (this.mode.isRestrictedEdit) { this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObjectRestrictedEdit, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); From 35619396f5cf438824c670e7982dc3eb41a26cda Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 22 Nov 2019 10:43:56 +0300 Subject: [PATCH 59/86] [DE] Fix locking for content controls --- apps/documenteditor/main/app/controller/Toolbar.js | 5 +++-- apps/documenteditor/main/app/view/Toolbar.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 19a846b5e..1affbdbd8 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -759,11 +759,12 @@ define([ (lock_type===undefined) && (lock_type = Asc.c_oAscSdtLockType.Unlocked); var content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; - if (!need_disable) { + toolbar.btnContentControls.setDisabled(paragraph_locked || header_locked); + if (!(paragraph_locked || header_locked)) { var control_disable = control_plain || content_locked; for (var i=0; i<7; i++) toolbar.btnContentControls.menu.items[i].setDisabled(control_disable); - toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || content_locked); + toolbar.btnContentControls.menu.items[8].setDisabled(!in_control || lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); toolbar.btnContentControls.menu.items[10].setDisabled(!in_control); } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index e9339bee6..ee80a4da9 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -704,7 +704,7 @@ define([ ] }) }); - this.paragraphControls.push(this.btnContentControls); + // this.paragraphControls.push(this.btnContentControls); this.btnColumns = new Common.UI.Button({ id: 'tlbtn-columns', From 79eb7974318a1dc13b5d9ac68ce5ed863d24e8b3 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 22 Nov 2019 17:41:04 +0300 Subject: [PATCH 60/86] [DE] Skeletone loader bugfix --- apps/documenteditor/main/index.html | 6 +++--- apps/documenteditor/main/index.html.deploy | 6 +++--- apps/documenteditor/main/resources/less/app.less | 11 +++-------- apps/documenteditor/main/resources/less/layout.less | 4 ++++ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 48fe2d650..1c0ef16cf 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -18,7 +18,7 @@ width: 100%; overflow: hidden; border: none; - background: #f1f1f1; + background: #e2e2e2; z-index: 1001; } @@ -101,10 +101,10 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 796px; + width: 816px; margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; } diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index ee8e63733..332fa9c13 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -19,7 +19,7 @@ width: 100%; overflow: hidden; border: none; - background: #f1f1f1; + background: #e2e2e2; z-index: 1001; } @@ -102,10 +102,10 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 796px; + width: 816px; margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; } diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index ac0285aa6..33b313db0 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -152,10 +152,10 @@ .doc-placeholder { background: #fbfbfb; - width: 796px; - margin: 40px auto; + width: 816px; + margin: 46px auto; height: 100%; - border: 1px solid #dfdfdf; + border: 1px solid #bebebe; padding-top: 50px; position: absolute; left: 0; @@ -164,11 +164,6 @@ bottom: 0; z-index: 1; - -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; diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 430037262..2b5240838 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -77,6 +77,10 @@ label { display: none; } +#editor-container { + background: #e2e2e2; +} + #editor_sdk { width: 100%; height: 100%; From e12898afa3b1313b9df2e6b63c5f7fb9e6bf80c1 Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 22 Nov 2019 17:58:21 +0300 Subject: [PATCH 61/86] [DE] Skeletone loader bugfix --- apps/documenteditor/main/index.html | 2 +- apps/documenteditor/main/index.html.deploy | 2 +- apps/documenteditor/main/resources/less/app.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 1c0ef16cf..768376559 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -101,7 +101,7 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 332fa9c13..c1cc8886d 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -102,7 +102,7 @@ .loadmask > .placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 33b313db0..b53f686d0 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -152,7 +152,7 @@ .doc-placeholder { background: #fbfbfb; - width: 816px; + width: 794px; margin: 46px auto; height: 100%; border: 1px solid #bebebe; From d6584c6e4940318ce9b5ba4b467c657a3c0f7529 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 11:02:50 +0300 Subject: [PATCH 62/86] Change loader for modes with compact header --- apps/api/documents/api.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index ee1428a8b..0730607db 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -782,7 +782,11 @@ if (config.frameEditorId) params += "&frameEditorId=" + config.frameEditorId; - + + if (config.editorConfig && (config.editorConfig.mode == 'view' || config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) || + config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review )) + params += "&mode=view"; + return params; } From e0aecd9704f4904ef7c5c18c018eb86dfa17cb4c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 11:13:00 +0300 Subject: [PATCH 63/86] Fix loader for view mode --- apps/documenteditor/main/index.html | 1 + apps/documenteditor/main/index.html.deploy | 1 + apps/presentationeditor/main/index.html | 1 + apps/presentationeditor/main/index.html.deploy | 1 + apps/spreadsheeteditor/main/index.html | 1 + apps/spreadsheeteditor/main/index.html.deploy | 1 + 6 files changed, 6 insertions(+) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 768376559..412918523 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -227,6 +227,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index c1cc8886d..81e17b32c 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -212,6 +212,7 @@ view = params["mode"] == 'view'; if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } if (stopLoading) { diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 20afe4b5e..d69b5614d 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -256,6 +256,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index 94c177ec3..260031a36 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -262,6 +262,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index f7b30e527..eda5a47d2 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -233,6 +233,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 95e61a8ba..3688e43f4 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -238,6 +238,7 @@ if (view) { document.querySelector('.brendpanel > :nth-child(2)').remove(); + document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.sktoolbar').remove(); } From 9e246ec42456141314aa4161f2e956358b4b3492 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 25 Nov 2019 14:23:27 +0300 Subject: [PATCH 64/86] Fix loader for compact header mode --- apps/api/documents/api.js | 5 ++++- apps/documenteditor/main/index.html | 5 ++++- apps/documenteditor/main/index.html.deploy | 7 ++++++- apps/presentationeditor/main/index.html | 5 ++++- apps/presentationeditor/main/index.html.deploy | 5 ++++- apps/spreadsheeteditor/main/index.html | 5 ++++- apps/spreadsheeteditor/main/index.html.deploy | 5 ++++- 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 0730607db..aa509db4f 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -783,10 +783,13 @@ if (config.frameEditorId) params += "&frameEditorId=" + config.frameEditorId; - if (config.editorConfig && (config.editorConfig.mode == 'view' || config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) || + if (config.editorConfig && config.editorConfig.mode == 'view' || config.document && config.document.permissions && (config.document.permissions.edit === false && !config.document.permissions.review )) params += "&mode=view"; + if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) + params += "&compact=true"; + return params; } diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 412918523..b33401e7f 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -223,11 +223,14 @@