From 0a2c03c6b64eb4336fe4a53a04e728f0127d750d Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 5 Apr 2021 17:58:06 +0300 Subject: [PATCH 01/25] [SSE] Fix drag and drop in statusbar for ie11 --- apps/common/main/lib/component/TabBar.js | 28 ++++++++++++++----- .../main/app/view/Statusbar.js | 19 ++++++++++--- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 599ab11cf..bb087bdac 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -268,9 +268,11 @@ define([ }); tab.$el.children().on( {dragstart: $.proxy(function (e) { - var event = e.originalEvent, - img = document.createElement('div'); - event.dataTransfer.setDragImage(img, 0, 0); + var event = e.originalEvent; + if (!Common.Utils.isIE) { + var img = document.createElement('div'); + event.dataTransfer.setDragImage(img, 0, 0); + } event.dataTransfer.effectAllowed = 'move'; this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs); }, this), @@ -279,8 +281,14 @@ define([ if (!this.bar.isEditFormula) { this.bar.$el.find('.mousemove').removeClass('mousemove right'); $(e.currentTarget).parent().addClass('mousemove'); - var data = event.dataTransfer.getData("onlyoffice"); - event.dataTransfer.dropEffect = data ? 'move' : 'none'; + var data; + if (!Common.Utils.isIE) { + data = event.dataTransfer.getData('onlyoffice'); + event.dataTransfer.dropEffect = data ? 'move' : 'none'; + } else { + data = event.dataTransfer.getData('text'); + event.dataTransfer.dropEffect = data === 'sheet' ? 'move' : 'none'; + } } else { event.dataTransfer.dropEffect = 'none'; } @@ -356,8 +364,14 @@ define([ event.dataTransfer.effectAllowed = 'move'; }, this)); addEvent(this.$bar[0], 'dragenter', _.bind(function (event) { - var data = event.dataTransfer.getData("onlyoffice"); - event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none'; + var data; + if (!Common.Utils.isIE) { + data = event.dataTransfer.getData('onlyoffice'); + event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none'; + } else { + data = event.dataTransfer.getData('text'); + event.dataTransfer.dropEffect = (data === 'sheet' && !this.isEditFormula) ? 'move' : 'none'; + } }, this)); addEvent(this.$bar[0], 'dragover', _.bind(function (event) { if (event.preventDefault) { diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index fa373495d..3ee9d402e 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -203,6 +203,7 @@ define([ }, this), 'tab:dragstart': _.bind(function (dataTransfer, selectTabs) { + Common.Utils.isIE && (this.isDrop = false); Common.UI.Menu.Manager.hideAll(); this.api.asc_closeCellEditor(); var arrTabs = [], @@ -234,12 +235,18 @@ define([ arr.push({type: 'names', value: arrName}); arr.push({type: 'key', value: Common.Utils.InternalSettings.get("sse-doc-info-key")}); var json = JSON.stringify(arr); - dataTransfer.setData("onlyoffice", json); + if (!Common.Utils.isIE) { + dataTransfer.setData('onlyoffice', json); + } else { + dataTransfer.setData('text', 'sheet'); + this.dataTransfer = json; + } this.dropTabs = selectTabs; }, this), 'tab:drop': _.bind(function (dataTransfer, index) { - if (this.isEditFormula) return; - var data = dataTransfer.getData("onlyoffice"); + if (this.isEditFormula || (Common.Utils.isIE && this.dataTransfer === undefined)) return; + Common.Utils.isIE && (this.isDrop = true); + var data = !Common.Utils.isIE ? dataTransfer.getData('onlyoffice') : this.dataTransfer; if (data) { var arrData = JSON.parse(data); if (arrData) { @@ -277,7 +284,7 @@ define([ } }, this), 'tab:dragend': _.bind(function (cut) { - if (cut) { + if (cut && !(Common.Utils.isIE && this.isDrop === false)) { if (this.dropTabs.length > 0) { var arr = []; this.dropTabs.forEach(function (tab) { @@ -287,6 +294,10 @@ define([ } } this.dropTabs = undefined; + if (Common.Utils.isIE) { + this.isDrop = undefined; + this.dataTransfer = undefined; + } Common.NotificationCenter.trigger('tabs:dragend', this); }, this) }); From bd9ba3da62adddae2df8c0f6743ff20aaa1503dd Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 6 Apr 2021 12:28:26 +0300 Subject: [PATCH 02/25] [SSE] Fix drag image in statusbar for ie --- apps/common/main/lib/component/TabBar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index bb087bdac..5847e14ab 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -272,6 +272,10 @@ define([ if (!Common.Utils.isIE) { var img = document.createElement('div'); event.dataTransfer.setDragImage(img, 0, 0); + } else { + this.bar.selectTabs.forEach(function (tab) { + tab.$el.find('span').prop('title', ''); + }); } event.dataTransfer.effectAllowed = 'move'; this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs); From 96d1c92957faa9d6987c4a610e1d5874a132a39f Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 6 Apr 2021 12:40:01 +0300 Subject: [PATCH 03/25] [SSE] Fix drag and drop of pivot table fields --- apps/spreadsheeteditor/main/app/view/PivotSettings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js index fabddb861..aac363f90 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js @@ -214,7 +214,7 @@ define([ onFieldsDragStart: function (item, index, event) { this._state.field = {record: item.model}; event.originalEvent.dataTransfer.effectAllowed = 'move'; - event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); + !Common.Utils.isIE && event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); this.pivotIndex = index; this.fromListView = this.fieldsList.$el[0].id; }, @@ -222,7 +222,7 @@ define([ onItemsDragStart: function (type, listview, item, index, event) { this._state.field = {record: item.model, type: type}; event.originalEvent.dataTransfer.effectAllowed = 'move'; - event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); + !Common.Utils.isIE && event.originalEvent.dataTransfer.setDragImage(this.getDragElement(item.model.get('value')), 14, 14); this.itemIndex = index; this.pivotIndex = listview.store.at(index).attributes.pivotIndex; this.fromListView = listview.$el[0].id; From 68e41a2ffe4543e2149df91a8d5c75bdd8067936 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 6 Apr 2021 16:21:55 +0300 Subject: [PATCH 04/25] [common] fix bug 44009, added logo for dark theme --- .../main/resources/img/about/logo-white_s.svg | 6 ++++++ apps/common/main/resources/img/about/logo.png | Bin 3625 -> 0 bytes .../main/resources/img/about/logo@2x.png | Bin 7516 -> 0 bytes .../common/main/resources/img/about/logo_s.svg | 6 ++++++ apps/common/main/resources/less/about.less | 17 +++++++---------- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 apps/common/main/resources/img/about/logo-white_s.svg delete mode 100644 apps/common/main/resources/img/about/logo.png delete mode 100644 apps/common/main/resources/img/about/logo@2x.png create mode 100644 apps/common/main/resources/img/about/logo_s.svg diff --git a/apps/common/main/resources/img/about/logo-white_s.svg b/apps/common/main/resources/img/about/logo-white_s.svg new file mode 100644 index 000000000..95b51b5ca --- /dev/null +++ b/apps/common/main/resources/img/about/logo-white_s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/img/about/logo.png b/apps/common/main/resources/img/about/logo.png deleted file mode 100644 index 1de95f26bde7d48c8aedf24c5713bf86e972de72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3625 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 D>6ul> diff --git a/apps/common/main/resources/img/about/logo@2x.png b/apps/common/main/resources/img/about/logo@2x.png deleted file mode 100644 index d6761c806f64d03ed13fdf3ec2bd818852d183b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7516 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 K?Ilh`&i?@wl-{)f diff --git a/apps/common/main/resources/img/about/logo_s.svg b/apps/common/main/resources/img/about/logo_s.svg new file mode 100644 index 000000000..04df9911d --- /dev/null +++ b/apps/common/main/resources/img/about/logo_s.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index 84be73a77..781f05365 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -4,18 +4,15 @@ margin-bottom: 5px; &:before { - content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')"); + //content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')"); + content: ~"url('@{common-image-const-path}/about/logo_s.svg')"; - @media only screen { - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - content: ~"url('@{common-image-const-path}/about/logo@2x.png')"; - display: block; - transform: scale(.5); - } + .theme-dark & { + content: ~"url('@{common-image-const-path}/about/logo-white_s.svg')"; } + + height: 45px; + width: auto; } } From 762b3322b85127b96bb6ff361765865bb239a497 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 6 Apr 2021 19:52:13 +0300 Subject: [PATCH 05/25] Check plugins version --- apps/common/main/lib/controller/Plugins.js | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index f12351fa4..cdfc4fdbf 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -510,7 +510,8 @@ define([ var me = this; var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = me.appOptions.isEdit, - editor = me.editor; + editor = me.editor, + apiVersion = me.api.GetVersion(); if ( pluginsdata instanceof Array ) { var arr = [], arrUI = [], lang = me.appOptions.lang.split(/[\-_]/)[0]; @@ -564,6 +565,9 @@ define([ if (typeof item.nameLocale == 'object') name = item.nameLocale[lang] || item.nameLocale['en'] || name || ''; + if (pluginVisible) + pluginVisible = me.checkPluginVersion(apiVersion, item.minVersion); + arr.push(new Common.Models.Plugin({ name : name, guid: item.guid, @@ -609,6 +613,25 @@ define([ } }, + checkPluginVersion: function(apiVersion, pluginVersion) { + if (apiVersion && apiVersion!=='develop' && pluginVersion && typeof pluginVersion == 'string') { + var res = pluginVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/), + apires = apiVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/); + if (res && res.length>1 && apires && apires.length>1) { + for (var i=0; i<3; i++) { + var pluginVer = res[i+1] ? parseInt(res[i+1]) : 0, + apiVer = apires[i+1] ? parseInt(apires[i+1]) : 0; + if (pluginVer>apiVer) + return false; + if (pluginVer Date: Tue, 6 Apr 2021 20:06:14 +0300 Subject: [PATCH 06/25] Update Themes.js --- apps/common/main/lib/controller/Themes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 3b3f6a3f1..c8c2e2427 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -170,7 +170,7 @@ define([ var obj = get_current_theme_colors(name_colors); obj.type = themes_map[theme_name]; - obj.name = name; + obj.name = theme_name; api.asc_setSkin(obj); // app.eventbus.addListeners({ @@ -218,4 +218,4 @@ define([ } } })(); -}); \ No newline at end of file +}); From 49eba78cbcb88440ae4b008b802f0a055ff92769 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 6 Apr 2021 21:25:24 +0300 Subject: [PATCH 07/25] Set plugin version --- apps/common/main/lib/controller/Plugins.js | 4 +++- apps/common/mobile/lib/controller/Plugins.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index cdfc4fdbf..b32e5582a 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -205,6 +205,7 @@ define([ plugin.set_Name(item.get('name')); plugin.set_Guid(item.get('guid')); plugin.set_BaseUrl(item.get('baseUrl')); + plugin.set_MinVersion(item.get('minVersion')); var variations = item.get('variations'), variationsArr = []; @@ -576,7 +577,8 @@ define([ currentVariation: 0, visible: pluginVisible, groupName: (item.group) ? item.group.name : '', - groupRank: (item.group) ? item.group.rank : 0 + groupRank: (item.group) ? item.group.rank : 0, + minVersion: item.minVersion })); } }); diff --git a/apps/common/mobile/lib/controller/Plugins.js b/apps/common/mobile/lib/controller/Plugins.js index 0464ab4c8..4f0ae6cec 100644 --- a/apps/common/mobile/lib/controller/Plugins.js +++ b/apps/common/mobile/lib/controller/Plugins.js @@ -238,6 +238,7 @@ define([ plugin.set_Name(item['name']); plugin.set_Guid(item['guid']); plugin.set_BaseUrl(item['baseUrl']); + plugin.set_MinVersion(item['minVersion']); var variations = item['variations'], variationsArr = []; From cfa07c57999caa54f001e558475c457c42907254 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 7 Apr 2021 12:41:48 +0300 Subject: [PATCH 08/25] [SSE] Fix Bug 49500 --- apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8764f1e85..d697b4088 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1627,6 +1627,10 @@ define([ config.msg = this.errorPasteMultiSelect; break; + case Asc.c_oAscError.ID.PivotWithoutUnderlyingData: + config.msg = this.errorPivotWithoutUnderlying; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2842,7 +2846,8 @@ define([ txtQuarters: 'Quarters', txtYears: 'Years', errorPivotGroup: 'Cannot group that selection.', - errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.' + errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.', + errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 2f68ecc77..f7cdd8f1d 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -922,6 +922,7 @@ "SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.
Select a single range and try again.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "The Pivot Table report was saved without the underlying data.
Use the 'Refresh' button to update the report.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", From e11de36e9bbf274c27dc6ea06d0a735deca17ccc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 7 Apr 2021 22:09:13 +0300 Subject: [PATCH 09/25] Fix loader --- apps/common/main/lib/component/LoadMask.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/LoadMask.js b/apps/common/main/lib/component/LoadMask.js index c9634f2aa..1742b2064 100644 --- a/apps/common/main/lib/component/LoadMask.js +++ b/apps/common/main/lib/component/LoadMask.js @@ -131,6 +131,8 @@ define([ // if (ownerEl.height()<1 || ownerEl.width()<1) // loaderEl.css({visibility: 'hidden'}); + loaderEl.css('min-width', $('.asc-loadmask-title', loaderEl).width() + 105); + if (ownerEl && ownerEl.closest('.asc-window.modal').length==0) Common.util.Shortcuts.suspendEvents(); },500); @@ -158,7 +160,9 @@ define([ this.title = title; if (this.ownerEl && this.ownerEl.ismasked && this.loaderEl){ - $('.asc-loadmask-title', this.loaderEl).html(title); + var el = $('.asc-loadmask-title', this.loaderEl); + el.html(title); + this.loaderEl.css('min-width', el.width() + 105); } }, From 65e49ba91009dae9a6083b74287772c4d181150f Mon Sep 17 00:00:00 2001 From: evgenykatyshev Date: Thu, 8 Apr 2021 11:19:19 +0300 Subject: [PATCH 10/25] Fix icons --- ...borders-outside-and-outer-for-cells-only.png | Bin 325 -> 0 bytes .../img/toolbar/1.5x/big/submit-form.png | Bin 749 -> 524 bytes .../img/toolbar/1x/big/submit-form.png | Bin 516 -> 399 bytes .../2x/big/borders-all-for-cells-only.png | Bin 369 -> 0 bytes .../2x/big/borders-inner-for-cells-only.png | Bin 476 -> 0 bytes .../2x/big/borders-no-outer-or-inner.png | Bin 357 -> 0 bytes .../2x/big/borders-outer-for-cells-only.png | Bin 469 -> 0 bytes .../big/borders-outside-and-all-for-cells.png | Bin 352 -> 0 bytes ...borders-outside-and-inner-for-cells-only.png | Bin 473 -> 0 bytes ...borders-outside-and-outer-for-cells-only.png | Bin 473 -> 0 bytes .../img/toolbar/2x/big/borders-outside-only.png | Bin 368 -> 0 bytes ...raph-borders-all-outside-and-inner-lines.png | Bin 282 -> 0 bytes .../big/paragraph-borders-all-outside-only.png | Bin 317 -> 0 bytes .../paragraph-borders-bottom-outside-only.png | Bin 309 -> 0 bytes .../big/paragraph-borders-inner-lines-only.png | Bin 322 -> 0 bytes .../big/paragraph-borders-left-outside-only.png | Bin 300 -> 0 bytes .../img/toolbar/2x/big/paragraph-borders-no.png | Bin 285 -> 0 bytes .../2x/big/paragraph-borders-right-only.png | Bin 303 -> 0 bytes .../2x/big/paragraph-borders-top-only.png | Bin 307 -> 0 bytes .../img/toolbar/2x/big/submit-form.png | Bin 931 -> 708 bytes .../img/toolbar/1.5x/btn-pivot-sum.png | Bin 440 -> 440 bytes 21 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-all-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-no-outer-or-inner.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outer-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-outer-for-cells-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-and-inner-lines.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-all-outside-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-bottom-outside-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-inner-lines-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-left-outside-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-no.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-top-only.png diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/borders-outside-and-outer-for-cells-only.png deleted file mode 100644 index c7f8a04b2b5525777954254e6194f7c8fe590b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^AwaCf!3HFCoofn!6lZ})WHAE+w=f7ZGR&GI0Tg5` z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kble5#WAFU@$F4Vu4V&))`y-iBj3*avMDo$ zV{O3X<@p+0{%=2dD3POI$4HF{sGQ-$I*zTTpEQ13gv|B`nq_e6){3q9VG9=5zF#Pv z8Pl>$M454odfpa2p(}TPo!k<={@dgn#;;9T^Os-$nzjF|Zi4HAG?pwkD3Shd;p%%+ zJ=S_(+%2@SG|$J2`JA6uzu#G*zn3lD|1Bxmao&tUmw9<{S`e4o()o_aT3^kc^hrH# z<>q~wn)Q#STHTwn??U+8DMs;jxj@VabmyN&b-~pWrYSv~cpv0!Pgg&ebxsLQ0Dek* AZ2$lO diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/big/submit-form.png index 5def4781c39936f63403f600e761aa86c2107a41..7fabeedd9839d51c8465a3ff0ed43af5b32e3e58 100644 GIT binary patch delta 449 zcmV;y0Y3ii1&jocReu4YNklSbwzgH8X2t)zjdV{swT;sA_0@K)102V39Opp99H}EF3?QWxQy&usk+2{8uKghs z#F!E6qzH|pr1lC87$B7(G>nqkE7S-OOYId}UWZ6!2sHwPQhymj%X_(0mQW)=B$Xw! ze3nXO3N-=*Qkg=_HJMblP$PgWl`XVfmq_gq+H!`a&?z*ge*h6`GF5K&kKUX62@Vw( zO2&nfaiMpBwb{@3Ixb0IJ(O~q*^WyP!V+3LPbUZ<3ay=|6GSkD%6g<^q0%0yLTH_> z0VG61>ue1ml7AZSxobziMQG|{0tvNHiv^vtb%0P~Nrc%tLTKFr-m#NGLXDW?&pIFJ z9QuM|&|Rl5`EQo=;7k6R;{yc5La#X}b#8Tl!>!Cqj#rRq5!#yPhD#1wo!c1T@Kfd) zfFWvhZ({rIZ^1Wm^zie#()l5ZkEvA+};l*<3hAaJ8(ceq z&!Hk;B0N z?;_6WI0Ed8?O1BCBK8)ZgHGZAgJM~trzr=kVz(SGm`aru`+pUNV0l}PmourdVol{a z@`R~SlVVxk6J5ug*gdWbJr(Ow7?!rD`-oT%1IV_gh$vdPhHW21uyB2C5ht~%SQgb% zJfWo62Ju2Aq>vrZukO`gK@FuLg-kkvRr3@)(u5W%Ty)t!#nMrM!gbz0nG{Qx?UPxt z0rQ29(L(w9N`L*eaVagWaDCljxlr}O#Ugf;kDw_wwtXrpmg3td6Jlk{=9b!_?+CI% zY3)-i9mnCd&)y&n$MI=6p2qg%IF}=Ou|KhpVKu4dx!G*4=9wz=HO7QLVE&gma(v_X z1tqBOI~_9Q$zmsY#@r80ZiCj$6VHfWmGZX9>UY2eUS-b-t5V)JDUzo{e8F)j1j})eB3ml_ zknRD6D|ZYm=^;X7@jQilFFNdC1iJsCgPA;q^JhupsAvkhe3tZYRD>}+pf_{pf~M_K z_L(~;0liE)Iv9oiPe-A2!HMZZJ;!g@$8#_F79H}eR4SFq4gLbmzZYEd>{z`30000< KMNUMnLSTX^+)R@I diff --git a/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png b/apps/documenteditor/main/resources/img/toolbar/1x/big/submit-form.png index 0f342c266c682e0cdbda206bf436dda000a0fba0..aa20557e64e486ca6de64ef2298176266856089c 100644 GIT binary patch delta 322 zcmV-I0lof&1djudR(~W(L_t(|0qvH734<^YML(qjbcAfuQ943baD$G}Q943L&`qvU z3>4bP{eLPbJ~$Lfaz1k=0S*o}Nt?r*(IAMKwdSY63>eX_{}>Gd^l$BLH-3x;K^Vb= zpd=}n=8$9rdlCYYjNo_;OR|DJ38Ew`INpaOy@IvHh)d=dY=8f)IuMXLseRR#^z=Pp z=j>jv23s=E92bbNC7PQ*bIAFIF~Cta`~(3(ux$7VB8s4VbQ1+bM>m^z?uj>u*{lhg zpEo<3QNdEOH+Yi81xv~Pnp4LX-C!;#kvIB+2(ZkCE|E7HrGMT?hfB$5qAb(VGSNgU zEDMe~aGsz9OH^d$z)`Cw6fg^pQE5ax_=4fC9NmykoFVZksm#Iu9dD$M!If=^HX+$+?$Ma-D-IA zUbrk1jjz~5&}EruLd1juc48gUF7zEKE%frK-4c6-5_Eg3CSq#!1QEE_KvW9}WZrD6 z*IPO+$$Tsk0a`vT$$X4bPnaHfgF2%PG(YeLcSajpC^2oIZJ_UsGf{-UEba~W3eG#y iQScTkWxbV^zrYu6GG~4dFu~>k0000#*h#WAFU@$K!?xrYq|SOSbZ(t~t0wYGX} z)!g?Z<3qYu%;UYAIU^)`8lF07G6D@?sM$A1D);uc$zlcbp6Abcuxp*_JpJb}Uu)t! zFYF6m9?7e*^EGe4?S}H~TIP&|g1fvmx4!?)`uVp|rt-<1yK=o5zvlNpdp5Cnt%<>o zhirCJr9Q1H-241pSk{Tv$G*;6y|nQlr-20{oBDwVEE01VnuQYz@@F$wKi?YqY|o^7 zmANJ7v@afb&?bGO+WlvI`Ruh-?=`B=Z@qNjL5?z4j`ECCW{W1}vIKLW8L>@pDp2x} x*`fnxO)Gav?>JT7w0X^^xe1+YOh6wwOtmjfDS1`p;t>q;pr@;!%Q~loCIGmFlj#5e diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-inner-for-cells-only.png deleted file mode 100644 index 0caec51b7c65f1d0a39754e75bcbeeb9c9ba6b8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(P_EF^#WAFU@$K!vyu%6tu7NS7>EEJmneNQq zc-@WDC@9*JscpuGS=Dt)t`Cz<>IxHNo&ya5fd~I*$1JU!XMcy`TkZcM@elX-1Mi#o zx_;ej=}}$o7OtwW{JObACX?LSZ_*7cUB>DLn!YYO7G1yndRy+teYWzRRuo)#lSD2<*7JW8F$SA&ow^ zuEmXyG8R}!L7B6@H@<9nde2T@eeMa7ic_9F)_xK1-hM8sn{(nxfzanJph@S)sWy*Q0?ftC?;gYgfB69W_-qIQyAvnc(v96un4hALXQ4 z*5KC5zlu&KNqt1N5p4OpME|9c-?JCnluk>&yFT`BJhza>I?F~;f1m%q=3Fp26e53_ sL&Q)$;OV_o(^LOhiaiv-fyNNzopr0B|P8C19 zEJTZU(*0$NjPJdUf!#U7O`_J~Y4KBHNzZZ=@ZV4^Ne@n3a3v=ABnNSD!U|l#}=Mjt(!+_abKhy=^wx zF<Ue`w&T^#Kq(2ohKDRj#Jk+@2VT{_)%(6@-mBW&ue%mDK8(vt_$vLhzV`N< z(7$e#S7!l*)(Fa8yKKx56kZOA%_EoOb^bYMCvs%{{8yzpyH-Mr@!#_w{Xm16D}d*`i@eD2D0 zG*sPSqtK`Fx3}^x{QjJ^cImw(+mckD%-{NYUw^g4<5kbxnT`fJ6p94Mu!^`dLYQ|F ze;>GHd@632^t4NQuCL#*af*b`1&VmNn?Ihk&LODE?d6NKkhA?PUDj))C!RCY)vVl^ zeZNfI|9m$4-HtUsmp-w)wl7oO-TaZT>^JQzQJ3RX^%hGTw(_Nvh~~B8wA11E?d1Kx z7nK~kblUFxql#*sx4)Ow#$5h6(V=j9sq#9j+h10_aGPUfFQl=~qETz^m!Q3W{4Y2$ dF@nRZLB~GyTK%rAqESykd{0+Dmvv4FO#n7lzB&K^ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-all-for-cells.png deleted file mode 100644 index 3d7a626852e3ddde63ca4fda3cab2adf0bc5314e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kpI=w#WAFU@$K!vRfh~jST6ji@P55%xB1uQ z^CvyY%5p#V(@cRU*poe)8K{=wN9}gA%-h?lcQ@4DU%vl$$M4|X4Yx0!c>Yi7;=kyN ztJuEG`N|@ZdtmulJ4O?On4OL7H{E2;uAOInJ4do(DQTG zUY`)&yLz7V(#D4@5`GOxgk2f`ntRvR6`g;*^4|5Z_0m!j@7}V7-4CpLefQa#SJtOC zU*qBBN$-8J!EM77)1(QeO{!=HtPyNpBdC)IRuQtZQFDK6X!y_h3H@wLKwlh~z^zopr041oAUH||9 diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-and-inner-for-cells-only.png deleted file mode 100644 index 9faf9efc45491d6cd85bb74842f76bf9056ede92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(P%h8Y#WAFU@$K!vyk-Ld*TChk&L!x+o%JFr zA$O(p)gU3k$~2h+`a7Si+ee(rsPOpa0I~)IKK$}KnJII;_|*ZM^Y8xW6`l)X_nY~2 zS3gVUe9es2ELYxqW!a$i;N~8G1|bc-IR}y?+VoGC{%o7~ug<&3d(tP~@41otbx!+R zIsB_%_G^=Ot?JHjPot~Tr?Jy`Z&*Ro$83oN8G z`q;V_H$KXMGPCcoPZOTz{(Fzq@te;S)eT?%Z+UvrZvC;sZ6`g?SZDbqlxP)RF*&Sl zHT6dJEJvoJrs@~0=kK2HR&o99S?l@HGu?JvtDNXic$QP=v&~_Xq_2HzR981=9$9L4 zI3#iFzNk$z-1b<^9Y*lbG zV&8W`g}25jSyLOPY(B?ujpfQSTjmK4g*Q2S_H=ffJiFFY*_JijbLp9_G|A=C+>Ee8P#a1Atlc#5}s?Wv@UnqktdPs zYj01qv5&L9(QDAFuXeuh?dUI^%Ul2R9+BghlMC;ezc2MY?#^^{Z;tt+(Cpc9th)u5_w=)Lo%T!6 o_xIU;>GXe=U=Iawh%qF5Vr9PE@P5X0Np+Bbr>mdKI;Vst0H8#_{r~^~ diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/borders-outside-only.png deleted file mode 100644 index b9d240e20ec55131b9482656ec1494684bcc56f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(P>$8p#WAFU@$Kz{z0C#!tO4m;=Q`>}hh#P0 z+7wgNlf!TL(dGTzjV)ikPCTaU#RxQj;YZ!}OPR6P-De)ymV5X8y+?%_!aHQ6=Ka=O z@-4c_&2+)DRr(Iu%=gxQ=U&iwvQ_%W7M;`a=Rg16cmMpH-M0ce)_u3>s3`qlZm(0@@TO|tZ;^}pN-xHW7d%@j zzTi94zuYgZ1&t3`c+?Xt7!Pww_#G%jaR6;E)`pG zc3~rjH0u-jvmpmwW!6Rpg6w5D@PD?~^2&MfsSLNb?LEz!wbuEJxo`00ntrD(>6R~7 z@mdsJ=f1FuasRd7Og9b`FtrIA%xQSY!lRyG!FZTc!VgKP{FjvBsn`!%i|?@Z1C_pO zjNidt#Eq^BS>x+}_63pCqS!X9%l^K7`;GOC&S$pAJI{Kyxe?^D3s0C&u28vc5_=0eD!BuYsU9Y zmji`AoQ|w-xW)Nn`!)LpP9F6H3&z8o5`G5?nA(I5<}^HHK@vLq`#|QbYnK`;=gq#q z_t-Yx7msRgn=N@&qh=8E*{UbO<2(3BLmcObDSJr?Zdf?0%rJ`At)GOoB!A m1GZ{~?E-i-K$L*oU~`IJY^q|x;Z>JSL0nH)KbLh*2~7ZCWn*0c diff --git a/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png b/apps/documenteditor/main/resources/img/toolbar/2x/big/paragraph-borders-right-only.png deleted file mode 100644 index 5c11ea2ae62b9ee81ce5ee7dbb0ed0c5fe2636e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^1wd@U!3HE%U)Oj6Db50q$YKTtF;x&|^bAt@02E{_ z4sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kblI}#WAFU@$JonyiE=wt`{Yf(*wF~Gj#)` z``&prxEymocXP+r=V>?gfb3&nShs%K+_uDuDScUM&!2y9;=B9*Z?V&xO7^b*dGGqW zJ0sFlR=kCA>C62i=c$ibd??3@lo3O#0hKDRX>PSMb z@43~i*&uo&piGKo<7l|x^LV~eGmcZq; z3yDmDLV}@0roiRBxkR==A;Cx@Tj27UsYDHdLV|%r4S~z&W)igo3JJ;*wFEBTnMl+W zD5R5PUO+}u;PU;cM0$R6pXe*FWmo42G6aDwyE-@LcLzIOYkXXJ>;uNbU4Ff1psRj+ z&p@qyEoWfRfqxJyr8e1q=kPOR7qK^BABna1DBa zVDB?6-X~sE}NlQB8=Me0 zI3aLw?i-H%#CMTlaUJ{spE*B^>mdG+U&{<^`M+CFB1V7*aA_xMUK1n=1DL|o6C=?2XLZOf{d#(zZ zLPUG63dVQ`KU%ID`HE~=Vr@~R3-?@fQafZMlBM0#IlJ6Mu77bZP)e@I@5lg_wWdqt zip-+Fo(7i^vk}R%8X6`Wky{K4?CY893yi{&wsf6mF0=g!8(bIIm&rkgw8pgQ(Hm z2FnYKHt3LhtfoOtk@iQQSk0VB@{83>iu8@uwD!jx0)IgMv6==gc|>z7%tNNp&)vGh z>(w!~*5rVr$e&mUK9JG-Tdh`C`fwAt8E@#smug7_ko}PS_xvxCVJY$TxK3^WU5y z<|~%xH;yOD9gcfKNP_jp``jJZ0fCXLVyP>xMVJFP3N0UIN9}K^*GaOcJ|Z%--0LLS zQ=|7MXur@6Hd(qr`Y&{YPL?jz(32;Bt3pE1F@IFnqNW5tsc11@T!YB_+!&_zysEUNtbFwH^Qf002ovPDHLkV1oRDmvR6A diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png b/apps/spreadsheeteditor/main/resources/img/toolbar/1.5x/btn-pivot-sum.png index 861c6474cd04e8947d53df3260448f77914574b0..b0a791bf1e3ba2c9b887907de9d3720d4e1f360a 100644 GIT binary patch delta 388 zcmV-~0ek+q1GobriBL{Q4GJ0x0000DNk~Le0000y0000U2nGNE0C1RnPmv)%e+_~_ z3`MJP07q~HMsO2H(M=q|5nRCy80GBgT}0t%e>q8%zN8^nC_g_fa1c3;8e8-^cASM0 z1_GhsXwy+IIsjPTaJ2DAAXC1(f7xsx(DcObZZ;b%rmcp%oeczb+G@Dl*<={*wAJv1 zUgmO5lk&2t-S8!w%QeZgO80TSu(sSoE|@UV+L~|ewDue~ni=-Gx9Vy;TpHIi$AM5$ zWrs`S%DFQKtox`H){)W+>6G%gsKRjRg~aPq%##tx@Tb`=J;(T(@;kDKTFSqNZ)W+p zjbqGlP5B)ekqqbWY&W9WBR$RAL}kNm=o8Hzqj{PD+Tkjo9j>ZP^47At>4EO4pW(Ss iZz^hnZYmtd`5*2MwUe??L16{}0000q5zpp=AYa=K1Hna zJ(uQ~H$zqdNbGqunG+k#DV$68S}#}#pyrajGo%aVJ35O zl*c4gXrmeFWF9~OF0ar=J+fnne|ZcmP61Qo#(U3-QxcJ>0^Q0fU{*3!pj$a3kX^}C zfj!J(Y)obR;biFodn?Aq7?C|0OUzmM*$X$cC@1EKFPR$c1wR6{)zW<23WnORLwf=@ z8MA_+_CsHX#?JSNA?BLU3#2uEelmu@&* From 2c09b041f32f458d7001b822eee333a53b762288 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 8 Apr 2021 11:32:39 +0300 Subject: [PATCH 11/25] Fix plugins icons: support old versions --- apps/common/main/lib/controller/Plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index b32e5582a..2364269b4 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -551,7 +551,7 @@ define([ description: description, index: variationsArr.length, url: itemVar.url, - icons: itemVar.icons, + icons: itemVar.icons2 || itemVar.icons, buttons: itemVar.buttons, visible: visible, help: itemVar.help From f4953e8b992d8d1f939d23d2fe4a02d3e79c879f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 8 Apr 2021 12:59:44 +0300 Subject: [PATCH 12/25] Show alert for c_oAscError.ID.ForceSaveTimeout error --- apps/documenteditor/main/app/controller/Main.js | 11 +++-------- apps/presentationeditor/main/app/controller/Main.js | 11 +++-------- apps/spreadsheeteditor/main/app/controller/Main.js | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 535dfe7d4..1bb785d44 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1625,12 +1625,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1736,10 +1733,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2a40265c2..0b1a0ee4e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1301,12 +1301,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1399,10 +1396,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index d697b4088..c2376f897 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1514,12 +1514,9 @@ define([ break; case Asc.c_oAscError.ID.ForceSaveButton: - config.msg = this.errorForceSave; - break; - case Asc.c_oAscError.ID.ForceSaveTimeout: config.msg = this.errorForceSave; - console.warn(config.msg); + config.maxwidth = 600; break; case Asc.c_oAscError.ID.DataEncrypted: @@ -1677,10 +1674,8 @@ define([ }, this); } - if (id !== Asc.c_oAscError.ID.ForceSaveTimeout) { - if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); - } + if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) + Common.UI.alert(config).$window.attr('data-value', id); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, From d4a2b07d981a7af81104c48487ac0673841c02f4 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 8 Apr 2021 19:00:27 +0300 Subject: [PATCH 13/25] [common] changed styles for comments panel --- .../img/controls/common-controls.png | Bin 8465 -> 10950 bytes .../img/controls/common-controls@1.5x.png | Bin 8643 -> 12450 bytes .../img/controls/common-controls@2x.png | Bin 9115 -> 20059 bytes apps/common/main/resources/less/comments.less | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png index 03fb0999dfd62f6f810aa6ac54ecff012f55db82..06748aa9b5962ef65f7224f3a70488bc91396834 100755 GIT binary patch literal 10950 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 H&+q>L-p?E0 literal 8643 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

ISE<;@}Fc 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 diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index e662126f2..4720f2cbe 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -265,11 +265,11 @@ } .btn-edit { - background-position: -2px -233px; + background-position: -2px -232px; } .btn-delete { - background-position: -22px -233px; + background-position: -22px -232px; } .btn-accept { @@ -293,7 +293,7 @@ width: 7px; height: 12px; left: 6px; - top: -2px; + top: 0px; } &.comment-resolved { From a547dabab604289a97ffff04bbb7714066f00e3c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 8 Apr 2021 19:02:57 +0300 Subject: [PATCH 14/25] [common] fix bug 49480 --- apps/documenteditor/main/app/controller/Main.js | 6 ------ apps/presentationeditor/main/app/controller/Main.js | 6 ------ apps/spreadsheeteditor/main/app/controller/Main.js | 5 ----- 3 files changed, 17 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 535dfe7d4..cf5b60fb3 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1156,12 +1156,6 @@ define([ $('.doc-placeholder').remove(); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog(); - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - Common.UI.Themes.toggleTheme(); - - // getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); - }) }, onLicenseChanged: function(params) { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2a40265c2..f9f93cccd 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -877,12 +877,6 @@ define([ $('.doc-placeholder').remove(); this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog(); - - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - - Common.UI.Themes.toggleTheme(); - }) }, onLicenseChanged: function(params) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index d697b4088..80df0b8d9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -946,11 +946,6 @@ define([ Common.Gateway.documentReady(); if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && (Common.Utils.InternalSettings.get("guest-username")===null)) this.showRenameUserDialog(); - - $('#header-logo').children(0).click(function(e) { - e.stopImmediatePropagation(); - Common.UI.Themes.toggleTheme(); - }) }, onLicenseChanged: function(params) { From 2c0c3285b3bc7afb334ca50e52b9e78259549c64 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 9 Apr 2021 14:53:12 +0300 Subject: [PATCH 15/25] [PE] Fix slide num style --- apps/presentationeditor/main/resources/less/app.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 452f6b7ba..5f1c42b0c 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -150,7 +150,9 @@ } .slidenum-div { - background-color: @body-bg; + background-color: @background-normal-ie; + background-color: @background-normal; + color: @text-normal-ie; color: @text-normal; padding: 5px 12px; border: 1px solid rgba(0, 0, 0, 0.15); From 65b9d893d6022ebf376e72331e5cdc4df02b9c89 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 9 Apr 2021 15:20:55 +0300 Subject: [PATCH 16/25] [PE] Fix Bug 49569 --- apps/presentationeditor/main/resources/less/toolbar.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 94230e621..b3e4cede9 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -38,6 +38,7 @@ text-align: center; text-overflow: ellipsis; white-space: normal; + line-height: 14px; } & > div:first-child { From 9cf266ce278eaf0d533defbac5b27aafbc6e3ab9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 9 Apr 2021 16:27:45 +0300 Subject: [PATCH 17/25] [PE] Fix Bug 49216 --- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index c0d9da3de..8a0e5d884 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1628,7 +1628,7 @@ define([ store: PE.getCollection('SlideLayouts'), itemTemplate: _.template([ '

', - '
', + '
', '
<%= title %>
', '
' ].join('')) From 42a707dbeea28995ee429e3788926296793bb77f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 9 Apr 2021 16:33:36 +0300 Subject: [PATCH 18/25] Update translation --- apps/documenteditor/main/locale/da.json | 72 +++++------ apps/documenteditor/main/locale/de.json | 5 +- apps/documenteditor/main/locale/en.json | 2 +- apps/documenteditor/main/locale/ja.json | 60 +++++++++ apps/documenteditor/main/locale/ru.json | 2 +- apps/presentationeditor/main/locale/da.json | 68 +++++------ apps/presentationeditor/main/locale/de.json | 1 + apps/presentationeditor/main/locale/ja.json | 52 ++++++++ apps/spreadsheeteditor/main/locale/da.json | 62 +++++----- apps/spreadsheeteditor/main/locale/de.json | 1 + apps/spreadsheeteditor/main/locale/en.json | 4 +- apps/spreadsheeteditor/main/locale/ja.json | 129 +++++++++++++++++++- 12 files changed, 351 insertions(+), 107 deletions(-) diff --git a/apps/documenteditor/main/locale/da.json b/apps/documenteditor/main/locale/da.json index 28763fb28..b260f12ba 100644 --- a/apps/documenteditor/main/locale/da.json +++ b/apps/documenteditor/main/locale/da.json @@ -121,7 +121,7 @@ "Common.define.chartData.textScatterSmoothMarker": "Scatter med jævne linjer og markører", "Common.define.chartData.textStock": "Aktie", "Common.define.chartData.textSurface": "Overflade", - "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme som en kopi.", + "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme en kopi.", "Common.Translation.warnFileLockedBtnEdit": "Opret en kopi", "Common.Translation.warnFileLockedBtnView": "Åben for visning", "Common.UI.Calendar.textApril": "April", @@ -255,10 +255,10 @@ "Common.Views.ExternalMergeEditor.textClose": "Luk", "Common.Views.ExternalMergeEditor.textSave": "Gem og luk", "Common.Views.ExternalMergeEditor.textTitle": "Modtagere af mailfletning", - "Common.Views.Header.labelCoUsersDescr": "Dokumentet bliver redigeret af flere brugere", + "Common.Views.Header.labelCoUsersDescr": "Brugere som redigerer dokumentet:", "Common.Views.Header.textAddFavorite": "Markér som favorit", "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", - "Common.Views.Header.textBack": "Gå til dokument", + "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Skjul værktøjslinie", "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", @@ -438,8 +438,8 @@ "Common.Views.SymbolTableDialog.textCharacter": "Karakter", "Common.Views.SymbolTableDialog.textCode": "Unicode HEX-værdi", "Common.Views.SymbolTableDialog.textCopyright": "Ophavsret Symbol", - "Common.Views.SymbolTableDialog.textDCQuote": "Dobbeltlukket citat", - "Common.Views.SymbolTableDialog.textDOQuote": "Dobbeltåbent citat", + "Common.Views.SymbolTableDialog.textDCQuote": "Afsluttende citationstegn", + "Common.Views.SymbolTableDialog.textDOQuote": "Åbningscitationstegn", "Common.Views.SymbolTableDialog.textEllipsis": "Vandret ellipse", "Common.Views.SymbolTableDialog.textEmDash": "Em bindestreg", "Common.Views.SymbolTableDialog.textEmSpace": "Em mellemrum", @@ -453,15 +453,15 @@ "Common.Views.SymbolTableDialog.textRange": "Rækkevidde", "Common.Views.SymbolTableDialog.textRecent": "Senest anvendte symboler", "Common.Views.SymbolTableDialog.textRegistered": "Registreret tegn", - "Common.Views.SymbolTableDialog.textSCQuote": "Enkelt lukket citat", + "Common.Views.SymbolTableDialog.textSCQuote": "Afsluttende enkelt citationstegn", "Common.Views.SymbolTableDialog.textSection": "Sektion tegn", "Common.Views.SymbolTableDialog.textShortcut": "Genvejstast", "Common.Views.SymbolTableDialog.textSHyphen": "Blød bindestreg", - "Common.Views.SymbolTableDialog.textSOQuote": "Enkelt åben kvote", + "Common.Views.SymbolTableDialog.textSOQuote": "Åbningscitationstegn enkelt", "Common.Views.SymbolTableDialog.textSpecial": "Specielle tegn", "Common.Views.SymbolTableDialog.textSymbols": "Symboler", "Common.Views.SymbolTableDialog.textTitle": "Symbol", - "Common.Views.SymbolTableDialog.textTradeMark": "Varemærke tegn", + "Common.Views.SymbolTableDialog.textTradeMark": "Varemærketegn", "Common.Views.UserNameDialog.textDontShow": "Spørg ikke igen", "Common.Views.UserNameDialog.textLabel": "Mærkat:", "Common.Views.UserNameDialog.textLabelError": "Mærkat må ikke være blank.", @@ -469,7 +469,7 @@ "DE.Controllers.LeftMenu.newDocumentTitle": "Unavngivet dokument", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Advarsel", "DE.Controllers.LeftMenu.requestEditRightsText": "Anmoder om redigeringsrettigheder...", - "DE.Controllers.LeftMenu.textLoadHistory": "Indlæser versions historik...", + "DE.Controllers.LeftMenu.textLoadHistory": "Indlæser versionshistorik...", "DE.Controllers.LeftMenu.textNoTextFound": "Dataen du har søgt, kunne ikke findes. Venligst ændre dine søgerkriterier.", "DE.Controllers.LeftMenu.textReplaceSkipped": "Erstatningen er blevet oprettet. {0} gentagelser blev sprunget over.", "DE.Controllers.LeftMenu.textReplaceSuccess": "Søgningen er blevet gennemført. Forekomster erstattet: {0}", @@ -491,8 +491,8 @@ "DE.Controllers.Main.errorBadImageUrl": "Billede URL er forkert", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server forbindelse tabt. Dokumentet kan ikke redigeres lige nu.", "DE.Controllers.Main.errorComboSeries": "For at lave et kombinationsdiagram, vælg mindst to serier med data.", - "DE.Controllers.Main.errorCompare": "Sammenlign Dokumenter-funktionen er ikke tilgængelig i co-redigerings tilstand", - "DE.Controllers.Main.errorConnectToServer": "Dokumentet kunne ikke gemmes. Check venligst din netværksforbindelse eller kontakt din administrator.
Når du klikker på 'OK' knappen, vil du blive bedt om at downloade dokumentet.", + "DE.Controllers.Main.errorCompare": "Sammenlign Dokumenter-funktionen er ikke tilgængelig i co-redigeringstilstand.", + "DE.Controllers.Main.errorConnectToServer": "Dokumentet kunne ikke gemmes. Tjek venligst din netværksforbindelse eller kontakt din administrator.
Når du klikker på 'OK' knappen, vil du blive bedt om at hente dokumentet.", "DE.Controllers.Main.errorDatabaseConnection": "Ekstern fejl.
Database forbindelses fejl. Kontakt venligst support hvis fejlen bliver ved med at være der. ", "DE.Controllers.Main.errorDataEncrypted": "Krypterede ændringer er blevet modtaget, men de kan ikke dekrypteres. ", "DE.Controllers.Main.errorDataRange": "Forkert datainterval", @@ -506,7 +506,7 @@ "DE.Controllers.Main.errorForceSave": "Der skete en fejl under gemning af filen. Brug venligst 'Download som' for at gemme filen på din computers harddisk eller prøv igen senere.", "DE.Controllers.Main.errorKeyEncrypt": "Ukendte nøgle descriptor", "DE.Controllers.Main.errorKeyExpire": "Nøgle beskrivelse udløbet", - "DE.Controllers.Main.errorMailMergeLoadFile": "Indlæsning fejlet", + "DE.Controllers.Main.errorMailMergeLoadFile": "Indlæsning fejlede. Vælg en anden fil.", "DE.Controllers.Main.errorMailMergeSaveFile": "Fusionering fejlede", "DE.Controllers.Main.errorProcessSaveResult": "Kunne ikke gemme", "DE.Controllers.Main.errorServerVersion": "Redigeringsversionen er blevet opdatere. Siden vil blive genindlæst for at anvende ændringerne. ", @@ -522,7 +522,7 @@ "DE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet, og filversionen er blevet ændret.
Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.", "DE.Controllers.Main.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ", "DE.Controllers.Main.errorUsersExceed": "Det maksimale antal af brugere tilladt i din aftale er nået. ", - "DE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at downloade eller printe det indtil forbindelsen er genetableret. ", + "DE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at downloade eller udskrive det før forbindelsen er genetableret. ", "DE.Controllers.Main.leavePageText": "Du har ændringer i dette dokument der ikke er gemte. Tryk \"Blive på denne side\", og derefter \"Gem\" for at gemme dem. Tryk \"Forlad denne side\" for at slette alle ikke gemte ændringer.", "DE.Controllers.Main.loadFontsTextText": "Indlæser data...", "DE.Controllers.Main.loadFontsTitleText": "Indlæser data", @@ -545,7 +545,7 @@ "DE.Controllers.Main.reloadButtonText": "Genindlæs siden", "DE.Controllers.Main.requestEditFailedMessageText": "En anden redigerer dokumentet lige nu. Prøv igen senere.", "DE.Controllers.Main.requestEditFailedTitleText": "Adgang nægtet", - "DE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt", + "DE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt.", "DE.Controllers.Main.saveErrorTextDesktop": "Filen kan ikke gemmes eller oprettes.
Mulige årsager kan være:
1. Filen er read-only.
2. Filen redigeres and en anden bruger.
3. Disken er fuld eller beskadiget.", "DE.Controllers.Main.savePreparingText": "Forbereder at gemme", "DE.Controllers.Main.savePreparingTitle": "Forbereder at gemme. Vent venligst...", @@ -564,14 +564,14 @@ "DE.Controllers.Main.textClose": "Luk", "DE.Controllers.Main.textCloseTip": "Klik for at lukke tippet", "DE.Controllers.Main.textContactUs": "Kontakt salg", - "DE.Controllers.Main.textConvertEquation": "Denne ligning er skabt med en ældre version af programmet, som ikke længere understøttes. Omdannelse af denne ligning til Office Math ML format vil gøre den redigerbar.
Ønsker du at omdanne denne ligning?", + "DE.Controllers.Main.textConvertEquation": "Denne ligning er skabt med en ældre version af programmet, som ikke længere understøttes. Omdannelse af denne ligning til Office Math ML format vil gøre den redigérbar.
Ønsker du at omdanne?", "DE.Controllers.Main.textCustomLoader": "Bemærk, at du i henhold til licensbetingelserne ikke har ret til at skifte loaderen.
Kontakt venligt vores salgsafdeling for at få en kvote.", "DE.Controllers.Main.textGuest": "Gæst", "DE.Controllers.Main.textHasMacros": "Filen indeholder makroer.
Ønsker du at køre makroer?", "DE.Controllers.Main.textLearnMore": "Lær mere", "DE.Controllers.Main.textLoadingDocument": "Indlæser dokument", "DE.Controllers.Main.textLongName": "Indtast tekst mindre end 128 bogstaver.", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE forbindelsesbegrænsning", + "DE.Controllers.Main.textNoLicenseTitle": "Licensbegrænsning nået", "DE.Controllers.Main.textPaidFeature": "Betalt funktion", "DE.Controllers.Main.textRemember": "Husk mit valg til alle filer", "DE.Controllers.Main.textRenameError": "Brugernavn må ikke være tomt.", @@ -834,13 +834,13 @@ "DE.Controllers.Main.waitText": "Vent venligst...", "DE.Controllers.Main.warnBrowserIE9": "Programmet har dårlig kompatibilitet med Internet Explorer 9. Brug i stedet Internet Explorer 10 eller højere", "DE.Controllers.Main.warnBrowserZoom": "Din browsers nuværende zoom indstilling er ikke understøttet. Venligst genddan til normal forstørrelse ved at trykke Ctrl+0.", - "DE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til dokument serveren er oversteget det maksimale antal, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "DE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til serveren overstiger det tilladte antal, og dokumentet åbnes i visningstilstand.
Kontakt venligst din administrator for mere information.", "DE.Controllers.Main.warnLicenseExp": "Din licens er udløbet.
Opdater venligst din licens og genindlæs siden.", "DE.Controllers.Main.warnLicenseLimitedNoAccess": "Licens udløbet.
Du har ikke adgang til at redigere.
Kontakt venligst din administrator.", "DE.Controllers.Main.warnLicenseLimitedRenewed": "Licens skal fornyes.
Du har begrænset adgang til at redigere dokumenter.
Kontakt venligst din administrator for at få fuld adgang.", - "DE.Controllers.Main.warnLicenseUsersExceeded": "Det maksimale antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", - "DE.Controllers.Main.warnNoLicense": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige forbindelser til dokumentet serveren.
hvis du har brug for flere, overvej venligst at købe en kommerciel licens.", - "DE.Controllers.Main.warnNoLicenseUsers": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige brugere.
Overvej venligst at købe en kommerciel licens hvis du har brug for flere.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Det tilladte antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "DE.Controllers.Main.warnNoLicense": "Du har nået grænsen for antal samtidige forbindelser til %1 værktøjer. Dokumentet åbnes for læsning.
Kontakt %1 salgsteamet for betingelser for opgradering.", + "DE.Controllers.Main.warnNoLicenseUsers": "Du har nået grænsen for brugere af %1 redigeringsværktøj. Kontakt %1 salgsafdeling for at høre om dine opgraderingsmuligheder.", "DE.Controllers.Main.warnProcessRightsChange": "Du er blevet nægtet rettighederne til at redigere denne fil.", "DE.Controllers.Navigation.txtBeginning": "Starten af dokumentet", "DE.Controllers.Navigation.txtGotoBeginning": "Gå til starten af dokumentet", @@ -1602,7 +1602,7 @@ "DE.Views.EditListItemDialog.textNameError": "Visningsnavn må ikke være tom", "DE.Views.EditListItemDialog.textValue": "Værdi", "DE.Views.EditListItemDialog.textValueError": "En genstand med samme værdi findes allerede.", - "DE.Views.FileMenu.btnBackCaption": "Gå til dokumenter", + "DE.Views.FileMenu.btnBackCaption": "Gå til dokumentplacering", "DE.Views.FileMenu.btnCloseMenuCaption": "Luk menu", "DE.Views.FileMenu.btnCreateNewCaption": "Opret ny", "DE.Views.FileMenu.btnDownloadCaption": "Hent som...", @@ -1646,7 +1646,7 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistikker", "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Emne", "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symboler", - "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Dokument titel", + "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Dokumenttitel", "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Overført", "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Ord", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Skift adgangsrettigheder", @@ -1659,8 +1659,8 @@ "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Redigering vil slette signaturen fra dokumentet.
Er du sikker på at du vil fortsætte?", "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Dette dokument er beskyttet med et kodeord", "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Dette dokument skal underskrives", - "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Gyldige underskrifter er blevet tilføjet til dokumentet. Dokumentet er beskyttet for redigering. ", - "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Nogle af de digitale underskrifter i dokumentet er ugyldige eller kunne ikke blive verificeret. Dokumentet er beskyttet for redigering. ", + "DE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Gyldige underskrifter er blevet tilføjet til dokumentet. Dokumentet er beskyttet mod redigering. ", + "DE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Nogle af de digitale underskrifter i dokumentet er ugyldige eller kunne ikke verificeres. Dokumentet er beskyttet mod redigering. ", "DE.Views.FileMenuPanels.ProtectDoc.txtView": "Se underskrifter", "DE.Views.FileMenuPanels.Settings.okButtonText": "Anvend", "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Slå justeringsguide til", @@ -1844,7 +1844,7 @@ "DE.Views.ImageSettingsAdvanced.textAlignment": "Tilpasning", "DE.Views.ImageSettingsAdvanced.textAlt": "Alternativ tekst", "DE.Views.ImageSettingsAdvanced.textAltDescription": "Beskrivelse", - "DE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "DE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "DE.Views.ImageSettingsAdvanced.textAltTitle": "Titel", "DE.Views.ImageSettingsAdvanced.textAngle": "Vinkel", "DE.Views.ImageSettingsAdvanced.textArrows": "Pile", @@ -1951,7 +1951,7 @@ "DE.Views.Links.confirmDeleteFootnotes": "Vil du slette alle fodnoter", "DE.Views.Links.confirmReplaceTOF": "Vil du erstatte den valgte figur-tabel?", "DE.Views.Links.mniConvertNote": "Konvertér alle noter", - "DE.Views.Links.mniDelFootnote": "Slet alle fodnoter", + "DE.Views.Links.mniDelFootnote": "Slet alle noter", "DE.Views.Links.mniInsEndnote": "Indsæt slut-note", "DE.Views.Links.mniInsFootnote": "Indsæt fodnote", "DE.Views.Links.mniNoteSettings": "Noteindstillinger", @@ -2134,7 +2134,7 @@ "DE.Views.ParagraphSettingsAdvanced.strMargins": "Fyld", "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Horeunge kontrol", "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Skrifttype", - "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og placeringer", + "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og afstand", "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Linje & side mellemrum", "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Placering", "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", @@ -2220,7 +2220,7 @@ "DE.Views.ShapeSettings.textFromFile": "Fra fil", "DE.Views.ShapeSettings.textFromStorage": "Fra lager", "DE.Views.ShapeSettings.textFromUrl": "Fra URL", - "DE.Views.ShapeSettings.textGradient": "Gradient", + "DE.Views.ShapeSettings.textGradient": "Gradientpunkter", "DE.Views.ShapeSettings.textGradientFill": "Gradient udfyldning", "DE.Views.ShapeSettings.textHint270": "Roter 90° mod uret", "DE.Views.ShapeSettings.textHint90": "Roter 90° med uret", @@ -2273,11 +2273,11 @@ "DE.Views.SignatureSettings.strSigner": "Underskriver", "DE.Views.SignatureSettings.strValid": "Gyldige underskrifter", "DE.Views.SignatureSettings.txtContinueEditing": "Rediger alligevel", - "DE.Views.SignatureSettings.txtEditWarning": "Redigering vil slette signaturen fra dokumentet.
Er du sikker på at du vil fortsætte?", + "DE.Views.SignatureSettings.txtEditWarning": "Redigering vil slette signaturer fra dokumentet.
Er du sikker på at du vil fortsætte?", "DE.Views.SignatureSettings.txtRemoveWarning": "Ønsker du at fjerne denne signatur?
Din handling kan ikke omgøres.", "DE.Views.SignatureSettings.txtRequestedSignatures": "Dette dokument skal underskrives", - "DE.Views.SignatureSettings.txtSigned": "Gyldige underskrifter er blevet tilføjet til dokumentet. Dokumentet er beskyttet for redigering. ", - "DE.Views.SignatureSettings.txtSignedInvalid": "Nogle af de digitale underskrifter i dokumentet er ugyldige eller kunne ikke blive verificeret. Dokumentet er beskyttet for redigering. ", + "DE.Views.SignatureSettings.txtSigned": "Gyldige underskrifter er blevet tilføjet til dokumentet. Dokumentet er beskyttet mod redigering. ", + "DE.Views.SignatureSettings.txtSignedInvalid": "Nogle af de digitale underskrifter i dokumentet er ugyldige eller kunne ikke verificeres. Dokumentet er beskyttet mod redigering. ", "DE.Views.Statusbar.goToPageText": "Go Gå til side", "DE.Views.Statusbar.pageIndexText": "Side {0} af {1}", "DE.Views.Statusbar.tipFitPage": "Tilpas til side", @@ -2350,7 +2350,7 @@ "DE.Views.TableSettings.textBanded": "Sammensluttet", "DE.Views.TableSettings.textBorderColor": "Farve", "DE.Views.TableSettings.textBorders": "Rammestil", - "DE.Views.TableSettings.textCellSize": "Cellestørelse", + "DE.Views.TableSettings.textCellSize": "Række- og kolonnestørrelse", "DE.Views.TableSettings.textColumns": "Kolonner", "DE.Views.TableSettings.textDistributeCols": "Fordel kolonner", "DE.Views.TableSettings.textDistributeRows": "Fordel rækker", @@ -2389,7 +2389,7 @@ "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Afstand mellem celler", "DE.Views.TableSettingsAdvanced.textAlt": "Alternativ tekst", "DE.Views.TableSettingsAdvanced.textAltDescription": "Beskrivelse", - "DE.Views.TableSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "DE.Views.TableSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "DE.Views.TableSettingsAdvanced.textAltTitle": "Titel", "DE.Views.TableSettingsAdvanced.textAnchorText": "Tekst", "DE.Views.TableSettingsAdvanced.textAutofit": "Tilpas automatisk størrelse til at passe indholdet", @@ -2466,7 +2466,7 @@ "DE.Views.TextArtSettings.textBorderSizeErr": "Den indtastede værdi er ikke korrekt.
venligst indtast en værdi mellem 0 pt og 1584 pt.", "DE.Views.TextArtSettings.textColor": "Farvefyld", "DE.Views.TextArtSettings.textDirection": "Retning", - "DE.Views.TextArtSettings.textGradient": "Gradient", + "DE.Views.TextArtSettings.textGradient": "Gradientpunkter", "DE.Views.TextArtSettings.textGradientFill": "Gradient udfyldning", "DE.Views.TextArtSettings.textLinear": "Linær", "DE.Views.TextArtSettings.textNoFill": "Intet fyld", @@ -2569,13 +2569,13 @@ "DE.Views.Toolbar.textPageMarginsCustom": "Tilpassede margener", "DE.Views.Toolbar.textPageSizeCustom": "Tilpasset side størrelse", "DE.Views.Toolbar.textPictureControl": "Billede", - "DE.Views.Toolbar.textPlainControl": "Indsæt enkelt tekstindholdskontrol", + "DE.Views.Toolbar.textPlainControl": "Tekst uden formattering", "DE.Views.Toolbar.textPortrait": "Potræt", "DE.Views.Toolbar.textRemoveControl": "Fjern indholdskontrol", "DE.Views.Toolbar.textRemWatermark": "Fjern vandmærke", "DE.Views.Toolbar.textRestartEachPage": "Genstart hver side", "DE.Views.Toolbar.textRestartEachSection": "Genstart hver sektion", - "DE.Views.Toolbar.textRichControl": "Indsæt rigtekstindholdskontrol", + "DE.Views.Toolbar.textRichControl": "Indsæt indholdskontrol af formatteret tekst", "DE.Views.Toolbar.textRight": "Højre:", "DE.Views.Toolbar.textStrikeout": "Strikethrough", "DE.Views.Toolbar.textStyleMenuDelete": "Slet formattering", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 633fc343f..5cd18887a 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -591,6 +591,7 @@ "DE.Controllers.Main.txtCallouts": "Legenden", "DE.Controllers.Main.txtCharts": "Diagramme", "DE.Controllers.Main.txtChoose": "Wählen Sie ein Element aus", + "DE.Controllers.Main.txtClickToLoad": "Klicken Sie, um das Bild herunterzuladen", "DE.Controllers.Main.txtCurrentDocument": "Aktuelles Dokument", "DE.Controllers.Main.txtDiagramTitle": "Diagrammtitel", "DE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus festlegen...", @@ -856,6 +857,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "Der eingegebene Wert ist falsch.
Geben Sie bitte einen numerischen Wert zwischen 1 und 300 ein.", "DE.Controllers.Toolbar.textFraction": "Bruchteile", "DE.Controllers.Toolbar.textFunction": "Funktionen", + "DE.Controllers.Toolbar.textGroup": "Gruppe", "DE.Controllers.Toolbar.textInsert": "Einfügen", "DE.Controllers.Toolbar.textIntegral": "Integrale", "DE.Controllers.Toolbar.textLargeOperator": "Große Operatoren", @@ -1773,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Radiobutton einfügen", "DE.Views.FormsTab.tipSubmit": "Formular senden", "DE.Views.FormsTab.tipTextField": "Textfeld einfügen", - "DE.Views.FormsTab.tipViewForm": "Ausfüllen von Formularen", + "DE.Views.FormsTab.tipViewForm": "Formular anzeigen", "DE.Views.HeaderFooterSettings.textBottomCenter": "Unten zentriert", "DE.Views.HeaderFooterSettings.textBottomLeft": "Unten links", "DE.Views.HeaderFooterSettings.textBottomPage": "Seitenende", @@ -1806,6 +1808,7 @@ "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Dieses Feld ist erforderlich", "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Überschriften", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" sein", + "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Dieses Feld soll maximal 2083 Zeichen beinhalten", "DE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", "DE.Views.ImageSettings.textCrop": "Zuschneiden", "DE.Views.ImageSettings.textCropFill": "Ausfüllen", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bd5a8ab74..d8a7e29a6 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1775,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Insert radio button", "DE.Views.FormsTab.tipSubmit": "Submit form", "DE.Views.FormsTab.tipTextField": "Insert text field", - "DE.Views.FormsTab.tipViewForm": "Fill form mode", + "DE.Views.FormsTab.tipViewForm": "View form", "DE.Views.HeaderFooterSettings.textBottomCenter": "Bottom center", "DE.Views.HeaderFooterSettings.textBottomLeft": "Bottom left", "DE.Views.HeaderFooterSettings.textBottomPage": "Bottom of Page", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index ebde8515d..b2a374258 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -76,15 +76,46 @@ "Common.Controllers.ReviewChanges.textWidow": " 改ページ時 1 行残して段落を区切らない]", "Common.Controllers.ReviewChanges.textWord": "単語レベル", "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textAreaStacked": "積み上げ面", + "Common.define.chartData.textAreaStackedPer": "100% 積み上げ面", "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textBarNormal": "集合縦棒", + "Common.define.chartData.textBarNormal3d": "3-D 集合縦棒", + "Common.define.chartData.textBarNormal3dPerspective": "3-D 縦棒", + "Common.define.chartData.textBarStacked": "積み上げ縦棒", + "Common.define.chartData.textBarStacked3d": "3-D 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer": "100% 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer3d": "3-D 100% 積み上げ縦棒", "Common.define.chartData.textCharts": "グラフ", "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textComboAreaBar": "積み上げ面 - 集合縦棒", + "Common.define.chartData.textComboBarLine": "集合縦棒 - 線", + "Common.define.chartData.textDoughnut": "ドーナツ", + "Common.define.chartData.textHBarNormal": "集合横棒", + "Common.define.chartData.textHBarNormal3d": "3-D 集合横棒", + "Common.define.chartData.textHBarStacked": "積み上げ横棒", + "Common.define.chartData.textHBarStacked3d": "3-D 積み上げ横棒", + "Common.define.chartData.textHBarStackedPer": "100%積み上げ横棒", + "Common.define.chartData.textHBarStackedPer3d": "3-D 100% 積み上げ横棒", "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textLine3d": "3-D 折れ線", + "Common.define.chartData.textLineMarker": "マーカー付き折れ線", + "Common.define.chartData.textLineStacked": "積み上げ折れ線", + "Common.define.chartData.textLineStackedMarker": "マーク付き積み上げ折れ線", + "Common.define.chartData.textLineStackedPer": "100% 積み上げ折れ線", + "Common.define.chartData.textLineStackedPerMarker": "マーカー付き 100% 積み上げ折れ線", "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPie3d": "3-D 円", "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textScatter": "散布図", + "Common.define.chartData.textScatterLine": "直線付き散布図", + "Common.define.chartData.textScatterLineMarker": "マーカーと直線付き散布図", + "Common.define.chartData.textScatterSmooth": "平滑線付き散布図", + "Common.define.chartData.textScatterSmoothMarker": "マーカーと平滑線付き散布図", "Common.define.chartData.textStock": "株価チャート", "Common.define.chartData.textSurface": "表面", "Common.Translation.warnFileLocked": "文書が別のアプリで使用されています。編集を続けて、コピーとして保存できます。", + "Common.Translation.warnFileLockedBtnEdit": "コピーを作成する", "Common.UI.Calendar.textApril": "四月", "Common.UI.Calendar.textAugust": "八月", "Common.UI.Calendar.textDecember": "十二月", @@ -118,6 +149,7 @@ "Common.UI.Calendar.textShortTuesday": "火", "Common.UI.Calendar.textShortWednesday": "水", "Common.UI.Calendar.textYears": "年", + "Common.UI.ColorButton.textAutoColor": "自動", "Common.UI.ColorButton.textNewColor": "ユーザー設定の色の追加", "Common.UI.ComboBorderSize.txtNoBorders": "罫線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "罫線なし", @@ -216,11 +248,14 @@ "Common.Views.ExternalMergeEditor.textSave": "保存&終了", "Common.Views.ExternalMergeEditor.textTitle": "差し込み印刷の宛先", "Common.Views.Header.labelCoUsersDescr": "ファイルを編集しているユーザー:", + "Common.Views.Header.textAddFavorite": "お気に入りとしてマーク", "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "ファイルのURLを開く", "Common.Views.Header.textCompactView": "ツールバーを隠す", + "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラを隠す", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", + "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", "Common.Views.Header.textZoom": "拡大図", "Common.Views.Header.tipAccessRights": "文書のアクセス許可のの管理", "Common.Views.Header.tipDownload": "ファイルをダウンロード", @@ -294,6 +329,7 @@ "Common.Views.ReviewChanges.strFastDesc": "リアルタイムの共同編集です。すべての変更は自動的に保存されます。", "Common.Views.ReviewChanges.strStrict": "高レベル", "Common.Views.ReviewChanges.strStrictDesc": "あなたや他の人が行った変更を同期するために、[保存]ボタンを使用する", + "Common.Views.ReviewChanges.textEnable": "有効にする", "Common.Views.ReviewChanges.tipAcceptCurrent": "今の変更を反映する", "Common.Views.ReviewChanges.tipCoAuthMode": "共同編集モードを設定する", "Common.Views.ReviewChanges.tipCommentRem": "コメントを削除する", @@ -412,6 +448,9 @@ "Common.Views.SymbolTableDialog.textSymbols": "記号", "Common.Views.SymbolTableDialog.textTitle": "記号", "Common.Views.SymbolTableDialog.textTradeMark": "商標記号", + "Common.Views.UserNameDialog.textDontShow": "二度と表示しない", + "Common.Views.UserNameDialog.textLabel": "ラベル:", + "Common.Views.UserNameDialog.textLabelError": "ラベルは空白にできません", "DE.Controllers.LeftMenu.leavePageText": "変更を保存しないでドキュメントを閉じると変更が失われます。
保存するために「キャンセル 」、後に「保存」をクリックします。保存していないすべての変更を破棄するために、「OK」をクリックします。", "DE.Controllers.LeftMenu.newDocumentTitle": "名前が付けられていないドキュメント", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "警告", @@ -437,6 +476,7 @@ "DE.Controllers.Main.errorAccessDeny": "権限のない操作をしようとしています。
ドキュメント・サーバー管理者に連絡してください。", "DE.Controllers.Main.errorBadImageUrl": "画像のURLが正しくありません", "DE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。", + "DE.Controllers.Main.errorComboSeries": "組み合わせグラフを作成するには、最低2つのデータを選択します。", "DE.Controllers.Main.errorCompare": "共同編集中は、ドキュメントの比較機能は使用できません。", "DE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
OKボタンをクリックするとドキュメントをダウンロードするように求められます。", "DE.Controllers.Main.errorDatabaseConnection": "外部エラーです。
データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。", @@ -459,6 +499,7 @@ "DE.Controllers.Main.errorSessionAbsolute": "ドキュメント編集セッションが終了しました。 ページを再度お読み込みください。", "DE.Controllers.Main.errorSessionIdle": "このドキュメントはかなり長い間編集されていませんでした。このページを再度お読み込みください。", "DE.Controllers.Main.errorSessionToken": "サーバーとの接続が中断されました。このページを再度お読み込みください。", + "DE.Controllers.Main.errorSetPassword": "パスワードを設定できませんでした。", "DE.Controllers.Main.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", "DE.Controllers.Main.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。
ドキュメントサーバーの管理者にご連絡ください。", "DE.Controllers.Main.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。
ドキュメントサーバーの管理者にご連絡ください。", @@ -490,6 +531,7 @@ "DE.Controllers.Main.requestEditFailedMessageText": "この文書は他のユーザによって編集しています。後で編集してください。", "DE.Controllers.Main.requestEditFailedTitleText": "アクセスが拒否されました", "DE.Controllers.Main.saveErrorText": "ファイル保存中にエラーが発生しました", + "DE.Controllers.Main.saveErrorTextDesktop": "このファイルは作成または保存できません。
考えられる理由は次のとおりです:
1. ファイルが読み取り専用です。
2. ファイルが他のユーザーによって編集されています。
3. ディスクがいっぱいか破損しています。", "DE.Controllers.Main.savePreparingText": "保存の準備中", "DE.Controllers.Main.savePreparingTitle": "保存の準備中です。お待ちください。", "DE.Controllers.Main.saveTextText": "ドキュメントを保存しています...", @@ -509,12 +551,16 @@ "DE.Controllers.Main.textContactUs": "営業部を連絡する", "DE.Controllers.Main.textConvertEquation": "この数式は、サポートされなくなった古いバージョンの数式エディタで作成されました。 編集するには、方程式をOffice Math ML形式に変換します。
今すぐ変換しますか?", "DE.Controllers.Main.textCustomLoader": "ライセンスの条件によっては、ローダーを変更する権利がないことにご注意ください。
見積もりについては、営業部門にお問い合わせください。", + "DE.Controllers.Main.textGuest": "ゲスト", "DE.Controllers.Main.textHasMacros": "ファイルには自動マクロが含まれています。
マクロを実行しますか?", "DE.Controllers.Main.textLearnMore": "詳細はこちら", "DE.Controllers.Main.textLoadingDocument": "ドキュメントを読み込んでいます", + "DE.Controllers.Main.textLongName": "128文字未満の名前を入力してください。", "DE.Controllers.Main.textNoLicenseTitle": "%1 接続の制限", "DE.Controllers.Main.textPaidFeature": "有料機能", "DE.Controllers.Main.textRemember": "選択内容を保存", + "DE.Controllers.Main.textRenameError": "ユーザー名は空にできません。", + "DE.Controllers.Main.textRenameLabel": "コラボレーションに使用する名前を入力します", "DE.Controllers.Main.textShape": "図形", "DE.Controllers.Main.textStrict": "厳格モード", "DE.Controllers.Main.textTryUndoRedo": "ファスト共同編集モードに元に戻す/やり直しの機能は無効になります。
他のユーザーの干渉なし編集するために「厳密なモード」をクリックして、厳密な共同編集モードに切り替えてください。保存した後にのみ、変更を送信してください。編集の詳細設定を使用して共同編集モードを切り替えることができます。", @@ -794,6 +840,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "入力された値が正しくありません。
1〜300の数値を入力してください。", "DE.Controllers.Toolbar.textFraction": "分数", "DE.Controllers.Toolbar.textFunction": "関数", + "DE.Controllers.Toolbar.textGroup": "グループ", "DE.Controllers.Toolbar.textInsert": "挿入する", "DE.Controllers.Toolbar.textIntegral": "積分", "DE.Controllers.Toolbar.textLargeOperator": "大型演算子", @@ -1617,6 +1664,7 @@ "DE.Views.FileMenuPanels.Settings.strShowChanges": "リアルタイム共同編集の変更を表示します。", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "スペル チェックの機能をターンにします。", "DE.Views.FileMenuPanels.Settings.strStrict": "高レベル", + "DE.Views.FileMenuPanels.Settings.strTheme": "テーマ", "DE.Views.FileMenuPanels.Settings.strUnit": "測定単位", "DE.Views.FileMenuPanels.Settings.strZoom": "既定のズーム値", "DE.Views.FileMenuPanels.Settings.text10Minutes": "10 分ごと", @@ -1651,6 +1699,8 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "スペル チェック", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "全てを無効にする", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "マクロを無効にして、通知しない", + "DE.Views.FileMenuPanels.Settings.txtThemeDark": "ダーク", + "DE.Views.FileMenuPanels.Settings.txtThemeLight": "ライト", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "通知を表示する", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "マクロを無効にして、通知する", "DE.Views.FileMenuPanels.Settings.txtWin": "Windowsのような", @@ -1658,6 +1708,7 @@ "DE.Views.FormSettings.textColor": "罫線の色", "DE.Views.FormSettings.textCombobox": "コンボ・ボックス", "DE.Views.FormSettings.textDelete": "削除する", + "DE.Views.FormSettings.textDisconnect": "切断する", "DE.Views.FormSettings.textDropDown": "ドロップダウン", "DE.Views.FormSettings.textField": "テキストフィールド", "DE.Views.FormSettings.textFromFile": "ファイルから", @@ -1668,6 +1719,7 @@ "DE.Views.FormSettings.textKey": "キー", "DE.Views.FormSettings.textLock": "ロックする", "DE.Views.FormSettings.textMaxChars": "文字の制限", + "DE.Views.FormSettings.textNoBorder": "罫線なし", "DE.Views.FormSettings.textPlaceholder": "プレースホルダ", "DE.Views.FormSettings.textRadiobox": "ラジオボタン", "DE.Views.FormSettings.textSelectImage": "画像を選択する", @@ -1729,6 +1781,7 @@ "DE.Views.HyperlinkSettingsDialog.txtEmpty": "このフィールドは必須項目です", "DE.Views.HyperlinkSettingsDialog.txtHeadings": "見出し", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "このフィールドは「http://www.example.com」の形式のURLである必要があります。", + "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "このフィールドは2083文字に制限されています", "DE.Views.ImageSettings.textAdvanced": "詳細設定の表示", "DE.Views.ImageSettings.textCrop": "トリミング", "DE.Views.ImageSettings.textCropFill": "塗りつぶし", @@ -1859,6 +1912,7 @@ "DE.Views.LineNumbersDialog.textSection": "現在のセクション", "DE.Views.LineNumbersDialog.textStartAt": "から始まる", "DE.Views.LineNumbersDialog.textTitle": "行番号", + "DE.Views.LineNumbersDialog.txtAutoText": "自動", "DE.Views.Links.capBtnBookmarks": "ブックマーク", "DE.Views.Links.capBtnCaption": "図表番号", "DE.Views.Links.capBtnContentsUpdate": "更新", @@ -2016,6 +2070,9 @@ "DE.Views.PageSizeDialog.textTitle": "ページのサイズ", "DE.Views.PageSizeDialog.textWidth": "幅", "DE.Views.PageSizeDialog.txtCustom": "ユーザー設定", + "DE.Views.ParagraphSettings.strIndent": "インデント", + "DE.Views.ParagraphSettings.strIndentsLeftText": "左", + "DE.Views.ParagraphSettings.strIndentsRightText": "右", "DE.Views.ParagraphSettings.strLineHeight": "行間", "DE.Views.ParagraphSettings.strParagraphSpacing": "段落間隔", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "同じスタイルの場合は、段落間に間隔を追加しません。", @@ -2027,6 +2084,8 @@ "DE.Views.ParagraphSettings.textAuto": "複数", "DE.Views.ParagraphSettings.textBackColor": "背景色", "DE.Views.ParagraphSettings.textExact": "固定値", + "DE.Views.ParagraphSettings.textFirstLine": "最初の行", + "DE.Views.ParagraphSettings.textNoneSpecial": "(なし)", "DE.Views.ParagraphSettings.txtAutoText": "自動", "DE.Views.ParagraphSettingsAdvanced.noTabs": "指定されたタブは、このフィールドに表示されます。", "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "全ての英大文字", @@ -2186,6 +2245,7 @@ "DE.Views.SignatureSettings.strValid": "有効な署名", "DE.Views.SignatureSettings.txtContinueEditing": "無視して編集する", "DE.Views.SignatureSettings.txtEditWarning": "編集すると、文書から署名が削除されます。
続行しますか?", + "DE.Views.SignatureSettings.txtRemoveWarning": "この署名を削除しますか?
この操作は元に戻せません。", "DE.Views.SignatureSettings.txtRequestedSignatures": "この文書には署名が必要です。", "DE.Views.SignatureSettings.txtSigned": "有効な署名がドキュメントに追加されました。 ドキュメントは編集されないように保護されています。", "DE.Views.SignatureSettings.txtSignedInvalid": "文書のデジタル署名の一部が無効であるか、検証できませんでした。 文書は編集できないように保護されています。", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 649d4dd89..27543a1c5 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1775,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Вставить переключатель", "DE.Views.FormsTab.tipSubmit": "Отправить форму", "DE.Views.FormsTab.tipTextField": "Вставить текстовое поле", - "DE.Views.FormsTab.tipViewForm": "Режим заполнения форм", + "DE.Views.FormsTab.tipViewForm": "Просмотреть форму", "DE.Views.HeaderFooterSettings.textBottomCenter": "Снизу по центру", "DE.Views.HeaderFooterSettings.textBottomLeft": "Снизу слева", "DE.Views.HeaderFooterSettings.textBottomPage": "Внизу страницы", diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 36bc47e16..6609f5b40 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -47,7 +47,7 @@ "Common.define.chartData.textScatterSmoothMarker": "Scatter med jævne linjer og markører", "Common.define.chartData.textStock": "Aktie", "Common.define.chartData.textSurface": "Overflade", - "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme som en kopi.", + "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme en kopi.", "Common.UI.ColorButton.textAutoColor": "Automatisk", "Common.UI.ColorButton.textNewColor": "Brugerdefineret farve", "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer", @@ -63,8 +63,8 @@ "Common.UI.SearchDialog.textMatchCase": "Afhængigt af store og små bogstaver", "Common.UI.SearchDialog.textReplaceDef": "Skriv din erstatningstekst", "Common.UI.SearchDialog.textSearchStart": "Skriv din tekst her", - "Common.UI.SearchDialog.textTitle": "Søg", - "Common.UI.SearchDialog.textTitle2": "Søg", + "Common.UI.SearchDialog.textTitle": "Find og erstat", + "Common.UI.SearchDialog.textTitle2": "Find", "Common.UI.SearchDialog.textWholeWords": "Kun hele ord", "Common.UI.SearchDialog.txtBtnHideReplace": "Skjul erstat", "Common.UI.SearchDialog.txtBtnReplace": "Erstat", @@ -143,10 +143,10 @@ "Common.Views.ExternalDiagramEditor.textClose": "Luk", "Common.Views.ExternalDiagramEditor.textSave": "Gem og luk", "Common.Views.ExternalDiagramEditor.textTitle": "Diagram redigering", - "Common.Views.Header.labelCoUsersDescr": "Dokumentet bliver redigeret af flere brugere", + "Common.Views.Header.labelCoUsersDescr": "Brugere som redigerer dokumentet:", "Common.Views.Header.textAddFavorite": "Markér som favorit", "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", - "Common.Views.Header.textBack": "Gå til dokumenter", + "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Vis kompakt værktøjslinie ", "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", @@ -313,8 +313,8 @@ "Common.Views.SymbolTableDialog.textCharacter": "Karakter", "Common.Views.SymbolTableDialog.textCode": "Unicode HEX-værdi", "Common.Views.SymbolTableDialog.textCopyright": "Ophavsret Symbol", - "Common.Views.SymbolTableDialog.textDCQuote": "Dobbeltlukket citat", - "Common.Views.SymbolTableDialog.textDOQuote": "Dobbeltåbent citat", + "Common.Views.SymbolTableDialog.textDCQuote": "Afsluttende citationstegn", + "Common.Views.SymbolTableDialog.textDOQuote": "Åbningscitationstegn", "Common.Views.SymbolTableDialog.textEllipsis": "Vandret ellipse", "Common.Views.SymbolTableDialog.textEmDash": "Em bindestreg", "Common.Views.SymbolTableDialog.textEmSpace": "Em mellemrum", @@ -328,15 +328,15 @@ "Common.Views.SymbolTableDialog.textRange": "Rækkevidde", "Common.Views.SymbolTableDialog.textRecent": "Senest anvendte symboler", "Common.Views.SymbolTableDialog.textRegistered": "Registreret tegn", - "Common.Views.SymbolTableDialog.textSCQuote": "Enkelt lukket citat", + "Common.Views.SymbolTableDialog.textSCQuote": "Afsluttende enkelt citationstegn", "Common.Views.SymbolTableDialog.textSection": "Sektion tegn", "Common.Views.SymbolTableDialog.textShortcut": "Genvejstast", "Common.Views.SymbolTableDialog.textSHyphen": "Blød bindestreg", - "Common.Views.SymbolTableDialog.textSOQuote": "Enkelt åben kvote", + "Common.Views.SymbolTableDialog.textSOQuote": "Åbningscitationstegn enkelt", "Common.Views.SymbolTableDialog.textSpecial": "Specielle tegn", "Common.Views.SymbolTableDialog.textSymbols": "Symboler", "Common.Views.SymbolTableDialog.textTitle": "Symbol", - "Common.Views.SymbolTableDialog.textTradeMark": "Varemærke tegn", + "Common.Views.SymbolTableDialog.textTradeMark": "Varemærketegn", "Common.Views.UserNameDialog.textDontShow": "Spørg mig ikke igen", "Common.Views.UserNameDialog.textLabel": "Mærkat:", "Common.Views.UserNameDialog.textLabelError": "Mærkat kan ikke være blank.", @@ -385,7 +385,7 @@ "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet, og filversionen er blevet ændret.
Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.", "PE.Controllers.Main.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ", "PE.Controllers.Main.errorUsersExceed": "Det maksimale antal af brugere tilladt i din aftale er nået. ", - "PE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at downloade eller printe det indtil forbindelsen er genetableret. ", + "PE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at downloade eller udskrive det før forbindelsen er genetableret. ", "PE.Controllers.Main.leavePageText": "Du har ikke-gemte ændringer i denne præsentation. Klik på \"Bliv på denne side\", og derefter \"Gem\" for at gemme dem. Klik på \"Forlad denne side\" for at afvise alle de ikke gemte ændringer.", "PE.Controllers.Main.loadFontsTextText": "Indlæser data...", "PE.Controllers.Main.loadFontsTitleText": "Indlæser data", @@ -400,7 +400,7 @@ "PE.Controllers.Main.loadThemeTextText": "Indlæser tema...", "PE.Controllers.Main.loadThemeTitleText": "Indlæser tema", "PE.Controllers.Main.notcriticalErrorTitle": "Advarsel", - "PE.Controllers.Main.openErrorText": "Der skete en fejl under åbningen af filen", + "PE.Controllers.Main.openErrorText": "Der skete en fejl under åbningen af filen.", "PE.Controllers.Main.openTextText": "Åbning Præsentation...", "PE.Controllers.Main.openTitleText": "Åbning Præsentation", "PE.Controllers.Main.printTextText": "Udskrivning Præsentation...", @@ -408,7 +408,7 @@ "PE.Controllers.Main.reloadButtonText": "Genindlæs siden", "PE.Controllers.Main.requestEditFailedMessageText": "Nogen redigerer denne præsentation lige nu. Prøv igen senere.", "PE.Controllers.Main.requestEditFailedTitleText": "Adgang nægtet", - "PE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt", + "PE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt.", "PE.Controllers.Main.saveErrorTextDesktop": "Filen kan ikke gemmes eller oprettes.
Mulige årsager kan være:
1. Filen er read-only.
2. Filen redigeres and en anden bruger.
3. Disken er fuld eller beskadiget.", "PE.Controllers.Main.savePreparingText": "Forbereder at gemme", "PE.Controllers.Main.savePreparingTitle": "Forbereder at gemme. Vent venligst...", @@ -429,7 +429,7 @@ "PE.Controllers.Main.textHasMacros": "Filen indeholder makroer.
Ønsker du at køre makroer?", "PE.Controllers.Main.textLoadingDocument": "Indlæser præsentation", "PE.Controllers.Main.textLongName": "Indtast et navn på mindre end 128 bogstaver.", - "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE forbindelsesbegrænsning", + "PE.Controllers.Main.textNoLicenseTitle": "Licensbegrænsning nået", "PE.Controllers.Main.textPaidFeature": "Betalt funktion", "PE.Controllers.Main.textRemember": "Husk mit valg til alle filer", "PE.Controllers.Main.textRenameError": "Brugernavn må ikke være blankt.", @@ -701,13 +701,13 @@ "PE.Controllers.Main.waitText": "Vent venligst...", "PE.Controllers.Main.warnBrowserIE9": "Programmet har dårlig kompatibilitet med Internet Explorer 9. Brug i stedet Internet Explorer 10 eller højere", "PE.Controllers.Main.warnBrowserZoom": "Din browsers nuværende zoom indstilling er ikke understøttet. Venligst genddan til normal forstørrelse ved at trykke Ctrl+0.", - "PE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til dokument serveren er oversteget det maksimale antal, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "PE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til serveren overstiger det tilladte antal, og dokumentet åbnes i visningstilstand.
Kontakt venligst din administrator for mere information.", "PE.Controllers.Main.warnLicenseExp": "Din licens er udløbet.
Opdater venligst din licens og genindlæs siden.", "PE.Controllers.Main.warnLicenseLimitedNoAccess": "Licens udløbet.
Du har ikke adgang til at redigere.
Kontakt venligst din administrator.", "PE.Controllers.Main.warnLicenseLimitedRenewed": "Licens skal fornyes.
Du har begrænset adgang til at redigere dokumenter.
Kontakt venligst din administrator for at få fuld adgang.", - "PE.Controllers.Main.warnLicenseUsersExceeded": "Det maksimale antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", - "PE.Controllers.Main.warnNoLicense": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige forbindelser til dokumentet serveren.
hvis du har brug for flere, overvej venligst at købe en kommerciel licens.", - "PE.Controllers.Main.warnNoLicenseUsers": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige brugere.
Overvej venligst at købe en kommerciel licens hvis du har brug for flere.", + "PE.Controllers.Main.warnLicenseUsersExceeded": "Det tilladte antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "PE.Controllers.Main.warnNoLicense": "Du har nået grænsen for antal samtidige forbindelser til %1 værktøjer. Dokumentet åbnes for læsning.
Kontakt %1 salgsteamet for betingelser for opgradering.", + "PE.Controllers.Main.warnNoLicenseUsers": "Du har nået grænsen for brugere af %1 redigeringsværktøj. Kontakt %1 salgsafdeling for at høre om dine opgraderingsmuligheder.", "PE.Controllers.Main.warnProcessRightsChange": "Du er blevet nægtet rettighederne til at redigere denne fil.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Skrifttypen du gemmer er ikke tilgængeligt på din nuværende enhed.
Skrifttypen vil blive vist som en af dem dit system understøtter, den gemte skrifttype vil bruge brugt når den er tilgængelig.
Vil du fortsætte?", @@ -1055,7 +1055,7 @@ "PE.Views.ChartSettings.textWidth": "Bredde", "PE.Views.ChartSettingsAdvanced.textAlt": "Alternativ tekst", "PE.Views.ChartSettingsAdvanced.textAltDescription": "Beskrivelse", - "PE.Views.ChartSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "PE.Views.ChartSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "PE.Views.ChartSettingsAdvanced.textAltTitle": "Titel", "PE.Views.ChartSettingsAdvanced.textTitle": "Diagram - avancerede indstillinger", "PE.Views.DateTimeDialog.confirmDefault": "Indstil standardformat for {0}: \"{1}\"", @@ -1104,7 +1104,7 @@ "PE.Views.DocumentHolder.mniCustomTable": "Indsæt brugerdefineret tabel", "PE.Views.DocumentHolder.moreText": "Flere varianter...", "PE.Views.DocumentHolder.noSpellVariantsText": "Ingen varianter", - "PE.Views.DocumentHolder.originalSizeText": "Standard størrelse", + "PE.Views.DocumentHolder.originalSizeText": "Faktisk størrelse", "PE.Views.DocumentHolder.removeHyperlinkText": "Slet Hyperlink", "PE.Views.DocumentHolder.rightText": "Højre", "PE.Views.DocumentHolder.rowText": "Række", @@ -1254,7 +1254,7 @@ "PE.Views.DocumentPreview.txtPrev": "Forrige Dias", "PE.Views.DocumentPreview.txtReset": "Nulstil", "PE.Views.FileMenu.btnAboutCaption": "Om", - "PE.Views.FileMenu.btnBackCaption": "Gå til dokumenter", + "PE.Views.FileMenu.btnBackCaption": "Gå til dokumentplacering", "PE.Views.FileMenu.btnCloseMenuCaption": "Luk menu", "PE.Views.FileMenu.btnCreateNewCaption": "Opret ny", "PE.Views.FileMenu.btnDownloadCaption": "Hent som...", @@ -1290,7 +1290,7 @@ "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokation", "PE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personer der har rettigheder", "PE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Emne", - "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Præsentation Titel", + "PE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titel", "PE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Overført", "PE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Skift adgangsrettigheder", "PE.Views.FileMenuPanels.DocumentRights.txtRights": "Personer der har rettigheder", @@ -1299,7 +1299,7 @@ "PE.Views.FileMenuPanels.ProtectDoc.strProtect": "Beskyt præsentation", "PE.Views.FileMenuPanels.ProtectDoc.strSignature": "Med underskrift", "PE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Rediger præsentation", - "PE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Redigering fjerner signaturerne fra præsentationen.
Er du sikker på, at du vil fortsætte?", + "PE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Redigering fjerner signaturerne fra præsentationen.
Fortsæt?", "PE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Denne præsentation er beskyttet af adgangskode", "PE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Gyldige signaturer er blevet tilføjet til præsentationen. Præsentationen er beskyttet mod redigering.", "PE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Nogle af de digitale signaturer i præsentationen er ugyldige eller kunne ikke verificeres. Præsentationen er beskyttet mod redigering", @@ -1407,21 +1407,21 @@ "PE.Views.ImageSettings.textHintFlipH": "Vend vandret", "PE.Views.ImageSettings.textHintFlipV": "Vend lodret", "PE.Views.ImageSettings.textInsert": "Erstat billede", - "PE.Views.ImageSettings.textOriginalSize": "Standard størrelse", + "PE.Views.ImageSettings.textOriginalSize": "Faktisk størrelse", "PE.Views.ImageSettings.textRotate90": "Roter 90°", "PE.Views.ImageSettings.textRotation": "Rotation", "PE.Views.ImageSettings.textSize": "Størrelse", "PE.Views.ImageSettings.textWidth": "Bredde", "PE.Views.ImageSettingsAdvanced.textAlt": "Alternativ tekst", "PE.Views.ImageSettingsAdvanced.textAltDescription": "Beskrivelse", - "PE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "PE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "PE.Views.ImageSettingsAdvanced.textAltTitle": "Titel", "PE.Views.ImageSettingsAdvanced.textAngle": "Vinkel", "PE.Views.ImageSettingsAdvanced.textFlipped": "Vendt", "PE.Views.ImageSettingsAdvanced.textHeight": "Højde", "PE.Views.ImageSettingsAdvanced.textHorizontally": "Vandret", "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Konstante proportioner", - "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Standard størrelse", + "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Faktisk størrelse", "PE.Views.ImageSettingsAdvanced.textPlacement": "Placering", "PE.Views.ImageSettingsAdvanced.textPosition": "Stilling", "PE.Views.ImageSettingsAdvanced.textRotation": "Rotation", @@ -1462,7 +1462,7 @@ "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Før", "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Speciel", "PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Skrifttype", - "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og placeringer", + "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og afstand", "PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Små caps", "PE.Views.ParagraphSettingsAdvanced.strSpacing": "Afstand", "PE.Views.ParagraphSettingsAdvanced.strStrike": "Strikethrough", @@ -1517,7 +1517,7 @@ "PE.Views.ShapeSettings.textFromFile": "Fra fil", "PE.Views.ShapeSettings.textFromStorage": "Fra lager", "PE.Views.ShapeSettings.textFromUrl": "Fra URL", - "PE.Views.ShapeSettings.textGradient": "Gradient", + "PE.Views.ShapeSettings.textGradient": "Gradientpunkter", "PE.Views.ShapeSettings.textGradientFill": "Gradient udfyldning", "PE.Views.ShapeSettings.textHint270": "Roter 90° mod uret", "PE.Views.ShapeSettings.textHint90": "Roter 90° med uret", @@ -1555,7 +1555,7 @@ "PE.Views.ShapeSettingsAdvanced.strMargins": "Tekst fyld", "PE.Views.ShapeSettingsAdvanced.textAlt": "Alternativ tekst", "PE.Views.ShapeSettingsAdvanced.textAltDescription": "Beskrivelse", - "PE.Views.ShapeSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "PE.Views.ShapeSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "PE.Views.ShapeSettingsAdvanced.textAltTitle": "Titel", "PE.Views.ShapeSettingsAdvanced.textAngle": "Vinkel", "PE.Views.ShapeSettingsAdvanced.textArrows": "Pile", @@ -1601,7 +1601,7 @@ "PE.Views.SignatureSettings.strSignature": "Underskrift", "PE.Views.SignatureSettings.strValid": "Gyldige underskrifter", "PE.Views.SignatureSettings.txtContinueEditing": "Rediger alligevel", - "PE.Views.SignatureSettings.txtEditWarning": "Redigering fjerner signaturerne fra præsentationen.
Er du sikker på, at du vil fortsætte?", + "PE.Views.SignatureSettings.txtEditWarning": "Redigering fjerner signaturerne fra præsentationen.
Fortsæt?", "PE.Views.SignatureSettings.txtRemoveWarning": "Ønsker du at fjerne denne signatur?
Din handling kan ikke omgøres.", "PE.Views.SignatureSettings.txtSigned": "Gyldige signaturer er blevet tilføjet til præsentationen. Præsentationen er beskyttet mod redigering.", "PE.Views.SignatureSettings.txtSignedInvalid": "Nogle af de digitale signaturer i præsentationen er ugyldige eller kunne ikke verificeres. Præsentationen er beskyttet mod redigering", @@ -1635,7 +1635,7 @@ "PE.Views.SlideSettings.textFromFile": "Fra fil", "PE.Views.SlideSettings.textFromStorage": "Fra lager", "PE.Views.SlideSettings.textFromUrl": "Fra URL", - "PE.Views.SlideSettings.textGradient": "Gradient", + "PE.Views.SlideSettings.textGradient": "Gradientpunkter", "PE.Views.SlideSettings.textGradientFill": "Gradient udfyldning", "PE.Views.SlideSettings.textHorizontalIn": "Vandret i", "PE.Views.SlideSettings.textHorizontalOut": "Vandret ud", @@ -1775,7 +1775,7 @@ "PE.Views.TableSettings.txtTable_ThemedStyle": "Tematiseret stil", "PE.Views.TableSettingsAdvanced.textAlt": "Alternativ tekst", "PE.Views.TableSettingsAdvanced.textAltDescription": "Beskrivelse", - "PE.Views.TableSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "PE.Views.TableSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "PE.Views.TableSettingsAdvanced.textAltTitle": "Titel", "PE.Views.TableSettingsAdvanced.textBottom": "Bund", "PE.Views.TableSettingsAdvanced.textCheckMargins": "Brug standard margener", @@ -1802,7 +1802,7 @@ "PE.Views.TextArtSettings.textEmptyPattern": "Intet mønster", "PE.Views.TextArtSettings.textFromFile": "Fra fil", "PE.Views.TextArtSettings.textFromUrl": "Fra URL", - "PE.Views.TextArtSettings.textGradient": "Gradient", + "PE.Views.TextArtSettings.textGradient": "Gradientpunkter", "PE.Views.TextArtSettings.textGradientFill": "Gradient udfyldning", "PE.Views.TextArtSettings.textImageTexture": "Billede eller struktur", "PE.Views.TextArtSettings.textLinear": "Linær", @@ -1881,7 +1881,7 @@ "PE.Views.Toolbar.textColumnsTwo": "To kolonner", "PE.Views.Toolbar.textItalic": "Kursiv", "PE.Views.Toolbar.textListSettings": "Liste-indstillinger", - "PE.Views.Toolbar.textNewColor": "Brugerdefineret farve", + "PE.Views.Toolbar.textNewColor": "Tilføj ny brugerdefineret farve", "PE.Views.Toolbar.textShapeAlignBottom": "Tilpas knap", "PE.Views.Toolbar.textShapeAlignCenter": "Tilpas til midten", "PE.Views.Toolbar.textShapeAlignLeft": "Tilpas til venstre", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index c5d89afc2..a90e64319 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -1388,6 +1388,7 @@ "PE.Views.HyperlinkSettingsDialog.txtNext": "Nächste Folie", "PE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" enthalten", "PE.Views.HyperlinkSettingsDialog.txtPrev": "Vorherige Folie", + "PE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Dieses Feld soll maximal 2083 Zeichen beinhalten", "PE.Views.HyperlinkSettingsDialog.txtSlide": "Folie", "PE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", "PE.Views.ImageSettings.textCrop": "Zuschneiden", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 313f2a67e..3a98d4a41 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -6,15 +6,46 @@ "Common.Controllers.ExternalDiagramEditor.warningText": "他のユーザは編集しているのためオブジェクトが無効になります。", "Common.Controllers.ExternalDiagramEditor.warningTitle": " 警告", "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textAreaStacked": "積み上げ面", + "Common.define.chartData.textAreaStackedPer": "100% 積み上げ面", "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textBarNormal": "集合縦棒", + "Common.define.chartData.textBarNormal3d": "3-D 集合縦棒", + "Common.define.chartData.textBarNormal3dPerspective": "3-D 縦棒", + "Common.define.chartData.textBarStacked": "積み上げ縦棒", + "Common.define.chartData.textBarStacked3d": "3-D 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer": "100% 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer3d": "3-D 100% 積み上げ縦棒", "Common.define.chartData.textCharts": "グラフ", "Common.define.chartData.textColumn": "縦棒グラフ", + "Common.define.chartData.textCombo": "複合", + "Common.define.chartData.textComboAreaBar": "積み上げ面 - 集合縦棒", + "Common.define.chartData.textComboBarLine": "集合縦棒 - 線", + "Common.define.chartData.textDoughnut": "ドーナツ", + "Common.define.chartData.textHBarNormal3d": "3-D 集合横棒", + "Common.define.chartData.textHBarStacked": "積み上げ横棒", + "Common.define.chartData.textHBarStacked3d": "3-D 積み上げ横棒", + "Common.define.chartData.textHBarStackedPer": "100%積み上げ横棒", + "Common.define.chartData.textHBarStackedPer3d": "3-D 100% 積み上げ横棒", "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textLine3d": "3-D 折れ線", + "Common.define.chartData.textLineMarker": "マーカー付き折れ線", + "Common.define.chartData.textLineStacked": "積み上げ折れ線", + "Common.define.chartData.textLineStackedMarker": "マーク付き積み上げ折れ線", + "Common.define.chartData.textLineStackedPer": "100% 積み上げ折れ線", + "Common.define.chartData.textLineStackedPerMarker": "マーカー付き 100% 積み上げ折れ線", "Common.define.chartData.textPie": "円グラフ", + "Common.define.chartData.textPie3d": "3-D 円", "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textScatter": "散布図", + "Common.define.chartData.textScatterLine": "直線付き散布図", + "Common.define.chartData.textScatterLineMarker": "マーカーと直線付き散布図", + "Common.define.chartData.textScatterSmooth": "平滑線付き散布図", + "Common.define.chartData.textScatterSmoothMarker": "マーカーと平滑線付き散布図", "Common.define.chartData.textStock": "株価チャート", "Common.define.chartData.textSurface": "表面", "Common.Translation.warnFileLocked": "文書が別のアプリで使用されています。編集を続けて、コピーとして保存できます。", + "Common.UI.ColorButton.textAutoColor": "自動", "Common.UI.ColorButton.textNewColor": "ユーザー設定の色の追加", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", @@ -110,11 +141,14 @@ "Common.Views.ExternalDiagramEditor.textSave": "保存と終了", "Common.Views.ExternalDiagramEditor.textTitle": "グラフの編集", "Common.Views.Header.labelCoUsersDescr": "ファイルを編集しているユーザー:", + "Common.Views.Header.textAddFavorite": "お気に入りとしてマーク", "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "ドキュメントに移動", "Common.Views.Header.textCompactView": "ツールバーを表示しない", + "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", + "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", "Common.Views.Header.textSaveBegin": "保存中...", "Common.Views.Header.textSaveChanged": "更新された", "Common.Views.Header.textSaveEnd": "すべての変更が保存されました", @@ -300,6 +334,9 @@ "Common.Views.SymbolTableDialog.textSymbols": "記号と特殊文字", "Common.Views.SymbolTableDialog.textTitle": "記号", "Common.Views.SymbolTableDialog.textTradeMark": "商標マーク", + "Common.Views.UserNameDialog.textDontShow": "二度と表示しない", + "Common.Views.UserNameDialog.textLabel": "ラベル:", + "Common.Views.UserNameDialog.textLabelError": "ラベルは空白にできません。", "PE.Controllers.LeftMenu.newDocumentTitle": "名前が付けられていないプレゼンテーション", "PE.Controllers.LeftMenu.notcriticalErrorTitle": " 警告", "PE.Controllers.LeftMenu.requestEditRightsText": "アクセス権の編集の要求中...", @@ -318,6 +355,7 @@ "PE.Controllers.Main.errorAccessDeny": "権限のない操作を実行しようとしています。
ドキュメントサーバーの管理者にご連絡ください。", "PE.Controllers.Main.errorBadImageUrl": "画像のURLが正しくありません", "PE.Controllers.Main.errorCoAuthoringDisconnect": "サーバーとの接続が失われました。今、文書を編集することができません。", + "PE.Controllers.Main.errorComboSeries": "組み合わせグラフを作成するには、最低2つのデータを選択します。", "PE.Controllers.Main.errorConnectToServer": "文書を保存できませんでした。接続設定を確認するか、管理者にお問い合わせください。
OKボタンをクリックするとドキュメントをダウンロードするように求められます。", "PE.Controllers.Main.errorDatabaseConnection": "外部エラーです。
データベース接続エラーです。この問題は解決しない場合は、サポートにお問い合わせください。 ", "PE.Controllers.Main.errorDataEncrypted": "暗号化された変更を受け取りましたが、解読できません。", @@ -336,6 +374,7 @@ "PE.Controllers.Main.errorSessionAbsolute": "ドキュメント編集セッションが終了しました。 ページを再度お読み込みください。", "PE.Controllers.Main.errorSessionIdle": "このドキュメントはかなり長い間編集されていませんでした。このページを再度お読み込みください。", "PE.Controllers.Main.errorSessionToken": "サーバーとの接続が中断されました。このページを再度お読み込みください。", + "PE.Controllers.Main.errorSetPassword": "パスワードを設定できませんでした。", "PE.Controllers.Main.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", "PE.Controllers.Main.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。
ドキュメントサーバーの管理者にご連絡ください。", "PE.Controllers.Main.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。
ドキュメントサーバーの管理者にご連絡ください。", @@ -367,6 +406,7 @@ "PE.Controllers.Main.requestEditFailedMessageText": "今このプレゼンテーションが誰かによって編集されています。", "PE.Controllers.Main.requestEditFailedTitleText": "アクセスが拒否されました", "PE.Controllers.Main.saveErrorText": "ファイルを保存中にエラーが発生しました。", + "PE.Controllers.Main.saveErrorTextDesktop": "このファイルは作成または保存できません。
考えられる理由は次のとおりです:
1. ファイルが読み取り専用です。
2. ファイルが他のユーザーによって編集されています。
3. ディスクがいっぱいか破損しています。", "PE.Controllers.Main.savePreparingText": "保存の準備中", "PE.Controllers.Main.savePreparingTitle": "保存の準備中です。お待ちください。", "PE.Controllers.Main.saveTextText": "プレゼンテーションの保存中...", @@ -382,11 +422,15 @@ "PE.Controllers.Main.textCloseTip": "ヒントを閉じるためにクリックください", "PE.Controllers.Main.textContactUs": "営業部に連絡する", "PE.Controllers.Main.textCustomLoader": "ライセンスの条件によっては、ローダーを変更する権利がないことにご注意ください。
見積もりについては、営業部門にお問い合わせください。", + "PE.Controllers.Main.textGuest": "ゲスト", "PE.Controllers.Main.textHasMacros": "ファイルには自動マクロが含まれています。
マクロを実行しますか?", "PE.Controllers.Main.textLoadingDocument": "プレゼンテーションを読み込み中...", + "PE.Controllers.Main.textLongName": "128文字未満の名前を入力してください。", "PE.Controllers.Main.textNoLicenseTitle": "ライセンス制限に達しました", "PE.Controllers.Main.textPaidFeature": "有料機能", "PE.Controllers.Main.textRemember": "選択内容を保存する", + "PE.Controllers.Main.textRenameError": "ユーザー名は空にできません。", + "PE.Controllers.Main.textRenameLabel": "コラボレーションに使用する名前を入力します", "PE.Controllers.Main.textShape": "図形", "PE.Controllers.Main.textStrict": "厳格モード", "PE.Controllers.Main.textTryUndoRedo": "ファスト共同編集モードに元に戻す/やり直しの機能は無効になります。
他のユーザーの干渉なし編集するために「厳密なモード」をクリックして、厳密な共同編集モードに切り替えてください。保存した後にのみ、変更を送信してください。編集の詳細設定を使用して共同編集モードを切り替えることができます。", @@ -1274,6 +1318,7 @@ "PE.Views.FileMenuPanels.Settings.strShowChanges": "リアルタイム共同編集の変更を表示します。", "PE.Views.FileMenuPanels.Settings.strSpellCheckMode": "スペル・チェックの機能を有効にする", "PE.Views.FileMenuPanels.Settings.strStrict": "高レベル", + "PE.Views.FileMenuPanels.Settings.strTheme": "テーマ", "PE.Views.FileMenuPanels.Settings.strUnit": "測定単位", "PE.Views.FileMenuPanels.Settings.strZoom": "既定のズーム値", "PE.Views.FileMenuPanels.Settings.text10Minutes": "10 分ごと", @@ -1304,6 +1349,8 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "スペル・チェック", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "全てを無効にする", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "マクロを無効にして、通知しない", + "PE.Views.FileMenuPanels.Settings.txtThemeDark": "ダーク", + "PE.Views.FileMenuPanels.Settings.txtThemeLight": "ライト", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "通知を表示する", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "マクロを無効にして、通知する", "PE.Views.FileMenuPanels.Settings.txtWin": "Windowsのように", @@ -1338,6 +1385,7 @@ "PE.Views.HyperlinkSettingsDialog.txtNext": "次のスライド", "PE.Views.HyperlinkSettingsDialog.txtNotUrl": "このフィールドは「http://www.example.com」の形式のURLである必要があります。", "PE.Views.HyperlinkSettingsDialog.txtPrev": "前のスライド", + "PE.Views.HyperlinkSettingsDialog.txtSizeLimit": "このフィールドは2083文字に制限されています", "PE.Views.HyperlinkSettingsDialog.txtSlide": "スライド", "PE.Views.ImageSettings.textAdvanced": "詳細設定の表示", "PE.Views.ImageSettings.textCrop": "切る", @@ -1803,6 +1851,7 @@ "PE.Views.Toolbar.mniSlideAdvanced": "詳細設定", "PE.Views.Toolbar.mniSlideStandard": "標準(4:3)", "PE.Views.Toolbar.mniSlideWide": "ワイド画面(16:9)", + "PE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし", "PE.Views.Toolbar.textAlignBottom": "テキストの下揃え", "PE.Views.Toolbar.textAlignCenter": "テキストを中央に揃える", "PE.Views.Toolbar.textAlignJust": "両端揃え", @@ -1815,6 +1864,7 @@ "PE.Views.Toolbar.textArrangeForward": "前面へ移動", "PE.Views.Toolbar.textArrangeFront": "前景に移動", "PE.Views.Toolbar.textBold": "太字", + "PE.Views.Toolbar.textColumnsCustom": "ユーザー設定の列", "PE.Views.Toolbar.textItalic": "斜体", "PE.Views.Toolbar.textListSettings": "リストの設定", "PE.Views.Toolbar.textNewColor": "ユーザー設定の色", @@ -1844,6 +1894,7 @@ "PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更", "PE.Views.Toolbar.tipClearStyle": "スタイルのクリア", "PE.Views.Toolbar.tipColorSchemas": "配色の変更", + "PE.Views.Toolbar.tipColumns": "列の挿入", "PE.Views.Toolbar.tipCopy": "コピー", "PE.Views.Toolbar.tipCopyStyle": "スタイルのコピー", "PE.Views.Toolbar.tipDateTime": " 現在の日付と時刻を挿入", @@ -1853,6 +1904,7 @@ "PE.Views.Toolbar.tipFontName": "フォント名", "PE.Views.Toolbar.tipFontSize": "フォントのサイズ", "PE.Views.Toolbar.tipHAligh": "左右の整列", + "PE.Views.Toolbar.tipHighlightColor": "強調表示の色", "PE.Views.Toolbar.tipIncPrLeft": "インデントを増やす", "PE.Views.Toolbar.tipInsertAudio": "オーディオの挿入", "PE.Views.Toolbar.tipInsertChart": "グラフの挿入", diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index 8030fe9ae..ac1b080ae 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -48,7 +48,7 @@ "Common.define.chartData.textStock": "Aktie", "Common.define.chartData.textSurface": "Overflade", "Common.define.chartData.textWinLossSpark": "Vind/tab", - "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme som en kopi.", + "Common.Translation.warnFileLocked": "Dokumentet er i brug af en anden applikation. Du kan fortsætte med at redigere og gemme en kopi.", "Common.UI.ColorButton.textAutoColor": "Automatisk", "Common.UI.ColorButton.textNewColor": "Tilføj ny brugerdefineret farve", "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer", @@ -139,10 +139,10 @@ "Common.Views.DocumentAccessDialog.textTitle": "Delingsindstillinger", "Common.Views.EditNameDialog.textLabel": "Mærkat:", "Common.Views.EditNameDialog.textLabelError": "Mærkat kan ikke være blank.", - "Common.Views.Header.labelCoUsersDescr": "Dokumentet bliver redigeret af flere brugere", + "Common.Views.Header.labelCoUsersDescr": "Brugere som redigerer dokumentet:", "Common.Views.Header.textAddFavorite": "Markér som favorit", "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", - "Common.Views.Header.textBack": "Gå til dokumenter", + "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Skjul værktøjslinie", "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", @@ -310,8 +310,8 @@ "Common.Views.SymbolTableDialog.textCharacter": "Karakter", "Common.Views.SymbolTableDialog.textCode": "Unicode HEX-værdi", "Common.Views.SymbolTableDialog.textCopyright": "Ophavsret Symbol", - "Common.Views.SymbolTableDialog.textDCQuote": "Dobbeltlukket citat", - "Common.Views.SymbolTableDialog.textDOQuote": "Dobbeltåbent citat", + "Common.Views.SymbolTableDialog.textDCQuote": "Afsluttende citationstegn", + "Common.Views.SymbolTableDialog.textDOQuote": "Åbningscitationstegn", "Common.Views.SymbolTableDialog.textEllipsis": "Vandret ellipse", "Common.Views.SymbolTableDialog.textEmDash": "Em bindestreg", "Common.Views.SymbolTableDialog.textEmSpace": "Em mellemrum", @@ -365,7 +365,7 @@ "SSE.Controllers.DocumentHolder.textAutoCorrectSettings": "Autokorrektur optioner", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Kolonnebredde {0} symboler ({1} pixel)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Række højde {0} punkter ({1} pixels)", - "SSE.Controllers.DocumentHolder.textCtrlClick": "Tryk CTRL og klik på linket", + "SSE.Controllers.DocumentHolder.textCtrlClick": "Klik på linket for at åbne eller klik og hold museknap nede, for at vælge celle.", "SSE.Controllers.DocumentHolder.textInsertLeft": "Indsæt venstre", "SSE.Controllers.DocumentHolder.textInsertTop": "Indsæt top", "SSE.Controllers.DocumentHolder.textPasteSpecial": "Indsæt speciel", @@ -608,7 +608,7 @@ "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "Internetforbindelsen er blevet genoprettet, og filversionen er blevet ændret.
Før du kan fortsætte arbejdet, skal du hente filen eller kopiere indholdet for at sikre, at intet vil blive tabt - og derefter genindlæse denne side.", "SSE.Controllers.Main.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ", "SSE.Controllers.Main.errorUsersExceed": "Det maksimale antal af brugere tilladt i din aftale er nået. ", - "SSE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at downloade eller printe det indtil forbindelsen er genetableret. ", + "SSE.Controllers.Main.errorViewerDisconnect": "Forbindesen er tabt. Du kan stadig se dokumentet,
men du vil ikke være i stand til at hente eller udskrive det, før forbindelsen er genetableret. ", "SSE.Controllers.Main.errorWrongBracketsCount": "En fejl i den indtastede formel.
Forkert antal parenteser bruges.", "SSE.Controllers.Main.errorWrongOperator": "En fejl i den indtastede formel. Forkert bruger er brugt.
Ret fejlen.", "SSE.Controllers.Main.errRemDuplicates": "Duplikate værdier fundet og slettet: {0}, unikke værdier tilbage: {1}", @@ -623,7 +623,7 @@ "SSE.Controllers.Main.loadImageTitleText": "Indlæser billede", "SSE.Controllers.Main.loadingDocumentTitleText": "Indlæser regneark", "SSE.Controllers.Main.notcriticalErrorTitle": "Advarsel", - "SSE.Controllers.Main.openErrorText": "Der skete en fejl under åbningen af filen", + "SSE.Controllers.Main.openErrorText": "Der skete en fejl under åbningen af filen.", "SSE.Controllers.Main.openTextText": "Åbner regneark...", "SSE.Controllers.Main.openTitleText": "Åbner regneark", "SSE.Controllers.Main.pastInMergeAreaError": "Kan ikke ændre en del af en fusioneret celle", @@ -632,7 +632,7 @@ "SSE.Controllers.Main.reloadButtonText": "Genindlæs siden", "SSE.Controllers.Main.requestEditFailedMessageText": "En anden redigerer dokumentet lige nu. Prøv igen senere.", "SSE.Controllers.Main.requestEditFailedTitleText": "Adgang nægtet", - "SSE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt", + "SSE.Controllers.Main.saveErrorText": "Der skete en fejl da filen blev forsøgt gemt.", "SSE.Controllers.Main.saveErrorTextDesktop": "Filen kan ikke gemmes eller oprettes.
Mulige årsager kan være:
1. Filen er read-only.
2. Filen redigeres and en anden bruger.
3. Disken er fuld eller beskadiget.", "SSE.Controllers.Main.savePreparingText": "Forbereder at gemme", "SSE.Controllers.Main.savePreparingTitle": "Forbereder at gemme. Vent venligst...", @@ -651,7 +651,7 @@ "SSE.Controllers.Main.textLoadingDocument": "Indlæser regneark", "SSE.Controllers.Main.textLongName": "Indtast et navn på mindre end 128 bogstaver.", "SSE.Controllers.Main.textNo": "Nej", - "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE forbindelsesbegrænsning", + "SSE.Controllers.Main.textNoLicenseTitle": "Licensbegrænsning nået", "SSE.Controllers.Main.textPaidFeature": "Betalt funktion", "SSE.Controllers.Main.textPleaseWait": "Handlingen tager måske længere en forventet. Vent venligst...", "SSE.Controllers.Main.textRecalcFormulas": "Beregning af formler ...", @@ -913,13 +913,13 @@ "SSE.Controllers.Main.waitText": "Vent venligst...", "SSE.Controllers.Main.warnBrowserIE9": "Programmet har dårlig kompatibilitet med Internet Explorer 9. Brug i stedet Internet Explorer 10 eller højere", "SSE.Controllers.Main.warnBrowserZoom": "Din browsers nuværende zoom indstilling er ikke understøttet. Venligst genddan til normal forstørrelse ved at trykke Ctrl+0.", - "SSE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til dokument serveren er oversteget det maksimale antal, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "SSE.Controllers.Main.warnLicenseExceeded": "Antallet af samtidige forbindelser til serveren overstiger det tilladte antal, og dokumentet åbnes i visningstilstand.
Kontakt venligst din administrator for mere information.", "SSE.Controllers.Main.warnLicenseExp": "Din licens er udløbet.
Opdater venligst din licens og genindlæs siden.", "SSE.Controllers.Main.warnLicenseLimitedNoAccess": "Licens udløbet.
Du har ikke adgang til at redigere.
Kontakt venligst din administrator.", "SSE.Controllers.Main.warnLicenseLimitedRenewed": "Licens skal fornyes.
Du har begrænset adgang til at redigere dokumenter.
Kontakt venligst din administrator for at få fuld adgang.", - "SSE.Controllers.Main.warnLicenseUsersExceeded": "Det maksimale antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", - "SSE.Controllers.Main.warnNoLicense": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige forbindelser til dokumentet serveren.
hvis du har brug for flere, overvej venligst at købe en kommerciel licens.", - "SSE.Controllers.Main.warnNoLicenseUsers": "Denne version af %1 redigeringsværktøj har bestemte begrænsninger for samtidige brugere.
Overvej venligst at købe en kommerciel licens hvis du har brug for flere.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Det tilladte antal af samtidige brugere er oversteget, og dokumentet vil blive åbnet i visningstilstand.
Kontakt venligst din administrator for mere information. ", + "SSE.Controllers.Main.warnNoLicense": "Du har nået grænsen for antal samtidige forbindelser til %1 værktøjer. Dokumentet åbnes for læsning.
Kontakt %1 salgsteamet for betingelser for opgradering.", + "SSE.Controllers.Main.warnNoLicenseUsers": "Du har nået grænsen for brugere af %1 redigeringsværktøj. Kontakt %1 salgsafdeling for at høre om dine opgraderingsmuligheder.", "SSE.Controllers.Main.warnProcessRightsChange": "Du er blevet nægtet rettighederne til at redigere denne fil.", "SSE.Controllers.Print.strAllSheets": "Alle ark", "SSE.Controllers.Print.textFirstCol": "Første kolonne", @@ -1357,7 +1357,7 @@ "SSE.Views.CellSettings.textDirection": "Retning", "SSE.Views.CellSettings.textFill": "Fyld", "SSE.Views.CellSettings.textForeground": "Forgrundsfarve", - "SSE.Views.CellSettings.textGradient": "Gradient", + "SSE.Views.CellSettings.textGradient": "Gradientpunkter", "SSE.Views.CellSettings.textGradientColor": "Farve", "SSE.Views.CellSettings.textGradientFill": "Gradient udfyldning", "SSE.Views.CellSettings.textIndent": "Indryk", @@ -1448,7 +1448,7 @@ "SSE.Views.ChartSettingsDlg.textAbsolute": "Flyt- og tilpas ikke med felter", "SSE.Views.ChartSettingsDlg.textAlt": "Alternativ tekst", "SSE.Views.ChartSettingsDlg.textAltDescription": "Beskrivelse", - "SSE.Views.ChartSettingsDlg.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "SSE.Views.ChartSettingsDlg.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "SSE.Views.ChartSettingsDlg.textAltTitle": "Titel", "SSE.Views.ChartSettingsDlg.textAuto": "Automatisk", "SSE.Views.ChartSettingsDlg.textAutoEach": "Auto til hver", @@ -1700,7 +1700,7 @@ "SSE.Views.DocumentHolder.insertColumnRightText": "Højre kolonne", "SSE.Views.DocumentHolder.insertRowAboveText": "Rækker over", "SSE.Views.DocumentHolder.insertRowBelowText": "Række under", - "SSE.Views.DocumentHolder.originalSizeText": "Standard størrelse", + "SSE.Views.DocumentHolder.originalSizeText": "Faktisk størrelse", "SSE.Views.DocumentHolder.removeHyperlinkText": "Slet Hyperlink", "SSE.Views.DocumentHolder.selectColumnText": "Hele kolonnen", "SSE.Views.DocumentHolder.selectDataText": "Kolonne data", @@ -1842,7 +1842,7 @@ "SSE.Views.FieldSettingsDialog.txtTop": "Vis øverst i gruppen", "SSE.Views.FieldSettingsDialog.txtVar": "Was", "SSE.Views.FieldSettingsDialog.txtVarp": "Varp", - "SSE.Views.FileMenu.btnBackCaption": "Gå til dokumenter", + "SSE.Views.FileMenu.btnBackCaption": "Gå til dokumentplacering", "SSE.Views.FileMenu.btnCloseMenuCaption": "Luk menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Opret ny", "SSE.Views.FileMenu.btnDownloadCaption": "Hent som...", @@ -1877,7 +1877,7 @@ "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokation", "SSE.Views.FileMenuPanels.DocumentInfo.txtRights": "Personer der har rettigheder", "SSE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Emne", - "SSE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Regneark titel", + "SSE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Titel", "SSE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Overført", "SSE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Skift adgangsrettigheder", "SSE.Views.FileMenuPanels.DocumentRights.txtRights": "Personer der har rettigheder", @@ -1952,7 +1952,7 @@ "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Beskyt regneark", "SSE.Views.FileMenuPanels.ProtectDoc.strSignature": "Med underskrift", "SSE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Rediger regneark", - "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Redigering vil fjerne underskrifterne fra regnearket.
Er du sikker på at du vil fortsætte?", + "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Redigering vil fjerne underskrifterne fra regnearket.
Fortsæt?", "SSE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Arket er beskyttet af en kodeord", "SSE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Arket skal underskrives.", "SSE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Gyldige underskrifter er blevet tilføjet til arket. Arket er beskytter for redigering.", @@ -2094,7 +2094,7 @@ "SSE.Views.ImageSettings.textHintFlipV": "Vend lodret", "SSE.Views.ImageSettings.textInsert": "Erstat billede", "SSE.Views.ImageSettings.textKeepRatio": "Konstante proportioner", - "SSE.Views.ImageSettings.textOriginalSize": "Standard størrelse", + "SSE.Views.ImageSettings.textOriginalSize": "Faktisk størrelse", "SSE.Views.ImageSettings.textRotate90": "Roter 90°", "SSE.Views.ImageSettings.textRotation": "Rotation", "SSE.Views.ImageSettings.textSize": "Størrelse", @@ -2102,7 +2102,7 @@ "SSE.Views.ImageSettingsAdvanced.textAbsolute": "Flyt- og tilpas ikke med felter", "SSE.Views.ImageSettingsAdvanced.textAlt": "Alternativ tekst", "SSE.Views.ImageSettingsAdvanced.textAltDescription": "Beskrivelse", - "SSE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "SSE.Views.ImageSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "SSE.Views.ImageSettingsAdvanced.textAltTitle": "Titel", "SSE.Views.ImageSettingsAdvanced.textAngle": "Vinkel", "SSE.Views.ImageSettingsAdvanced.textFlipped": "Vendt", @@ -2215,7 +2215,7 @@ "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Speciel", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "Af", "SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Skrifttype", - "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og placeringer", + "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indrykninger og afstand", "SSE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", "SSE.Views.ParagraphSettingsAdvanced.strSpacing": "Afstand", "SSE.Views.ParagraphSettingsAdvanced.strStrike": "Gennemstregning", @@ -2451,7 +2451,7 @@ "SSE.Views.ShapeSettings.textFromFile": "Fra fil", "SSE.Views.ShapeSettings.textFromStorage": "Fra lager", "SSE.Views.ShapeSettings.textFromUrl": "Fra URL", - "SSE.Views.ShapeSettings.textGradient": "Gradient", + "SSE.Views.ShapeSettings.textGradient": "Gradientpunkter", "SSE.Views.ShapeSettings.textGradientFill": "Gradient udfyldning", "SSE.Views.ShapeSettings.textHint270": "Roter 90° mod uret", "SSE.Views.ShapeSettings.textHint90": "Roter 90° med uret", @@ -2491,7 +2491,7 @@ "SSE.Views.ShapeSettingsAdvanced.textAbsolute": "Flyt- og tilpas ikke med felter", "SSE.Views.ShapeSettingsAdvanced.textAlt": "Alternativ tekst", "SSE.Views.ShapeSettingsAdvanced.textAltDescription": "Beskrivelse", - "SSE.Views.ShapeSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive læst til folk med syns- eller læringsudfordringer for at hjælpe dem til at forstå den information der kan findes i et billede, autoshape, diagram eller tabel", + "SSE.Views.ShapeSettingsAdvanced.textAltTip": "Den alternative tekstbaserede repræsentation af det visuelle objekt, som vil blive oplæst til folk med syns- eller læringsudfordringer, for at hjælpe dem til at forstå den information der kan findes i et billede, autofigur, diagram eller tabel.", "SSE.Views.ShapeSettingsAdvanced.textAltTitle": "Titel", "SSE.Views.ShapeSettingsAdvanced.textAngle": "Vinkel", "SSE.Views.ShapeSettingsAdvanced.textArrows": "Pile", @@ -2541,7 +2541,7 @@ "SSE.Views.SignatureSettings.strSigner": "Underskriver", "SSE.Views.SignatureSettings.strValid": "Gyldige underskrifter", "SSE.Views.SignatureSettings.txtContinueEditing": "Rediger alligevel", - "SSE.Views.SignatureSettings.txtEditWarning": "Redigering vil fjerne underskrifterne fra regnearket.
Er du sikker på at du vil fortsætte?", + "SSE.Views.SignatureSettings.txtEditWarning": "Redigering vil fjerne underskrifterne fra regnearket.
Fortsæt?", "SSE.Views.SignatureSettings.txtRemoveWarning": "Ønsker du at fjerne denne signatur?
Din handling kan ikke omgøres.", "SSE.Views.SignatureSettings.txtRequestedSignatures": "Arket skal underskrives.", "SSE.Views.SignatureSettings.txtSigned": "Gyldige underskrifter er blevet tilføjet til arket. Arket er beskytter for redigering.", @@ -2690,7 +2690,7 @@ "SSE.Views.Spellcheck.txtSpelling": "Stavning", "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Kopier til slut)", "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Flyt til slutning)", - "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Kopier før ark", + "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Indsæt før ark", "SSE.Views.Statusbar.CopyDialog.textMoveBefore": "Flyt før ark", "SSE.Views.Statusbar.filteredRecordsText": "{0} af {1} poster filtreret", "SSE.Views.Statusbar.filteredText": "Filtreringstilstand", @@ -2711,8 +2711,8 @@ "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Et arknavn kan ikke indeholde følgende tegn: \\ / *? []:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Ark navn", "SSE.Views.Statusbar.selectAllSheets": "Vælg alle ark", - "SSE.Views.Statusbar.textAverage": "GENNEMSNIT", - "SSE.Views.Statusbar.textCount": "TÆL", + "SSE.Views.Statusbar.textAverage": "Gennemsnit", + "SSE.Views.Statusbar.textCount": "Tæl", "SSE.Views.Statusbar.textMax": "Max", "SSE.Views.Statusbar.textMin": "Min", "SSE.Views.Statusbar.textNewColor": "Tilføj ny brugerdefineret farve", @@ -2796,7 +2796,7 @@ "SSE.Views.TextArtSettings.textEmptyPattern": "Intet mønster", "SSE.Views.TextArtSettings.textFromFile": "Fra fil", "SSE.Views.TextArtSettings.textFromUrl": "Fra URL", - "SSE.Views.TextArtSettings.textGradient": "Gradient", + "SSE.Views.TextArtSettings.textGradient": "Gradientpunkter", "SSE.Views.TextArtSettings.textGradientFill": "Gradient udfyldning", "SSE.Views.TextArtSettings.textImageTexture": "Billede eller struktur", "SSE.Views.TextArtSettings.textLinear": "Linær", @@ -2973,7 +2973,7 @@ "SSE.Views.Toolbar.tipInsertTable": "Indsæt tabel", "SSE.Views.Toolbar.tipInsertText": "Indsæt tekstboks", "SSE.Views.Toolbar.tipInsertTextart": "Indsæt Text art", - "SSE.Views.Toolbar.tipMerge": "Fusioner", + "SSE.Views.Toolbar.tipMerge": "Sammenlæg og centrér", "SSE.Views.Toolbar.tipNumFormat": "Tal format", "SSE.Views.Toolbar.tipPageMargins": "Side margener", "SSE.Views.Toolbar.tipPageOrient": "Sideorientering", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index af60e58f2..9d8f8a84b 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -2076,6 +2076,7 @@ "SSE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink-Einstellungen", "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Dieses Feld ist erforderlich", "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" enthalten", + "SSE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Dieses Feld soll maximal 2083 Zeichen beinhalten", "SSE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", "SSE.Views.ImageSettings.textCrop": "Zuschneiden", "SSE.Views.ImageSettings.textCropFill": "Ausfüllen", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index f7cdd8f1d..c8483be4b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -590,9 +590,11 @@ "SSE.Controllers.Main.errorOpenWarning": "One of the file formulas exceeds the limit of 8192 characters.
The formula was removed.", "SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", "SSE.Controllers.Main.errorPasteMaxRange": "The copy and paste area do not match.
Please select an area with the same size or click the first cell in a row to paste the copied cells.", + "SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.
Select a single range and try again.", "SSE.Controllers.Main.errorPasteSlicerError": "Table slicers cannot be copied from one workbook to another.", "SSE.Controllers.Main.errorPivotGroup": "Cannot group that selection.", "SSE.Controllers.Main.errorPivotOverlap": "A pivot table report cannot overlap a table.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "The Pivot Table report was saved without the underlying data.
Use the 'Refresh' button to update the report.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "Unfortunately, it is not possible to print more than 1500 pages at once in the current program version.
This restriction will be removed in the upcoming releases.", "SSE.Controllers.Main.errorProcessSaveResult": "Saving failed", "SSE.Controllers.Main.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", @@ -921,8 +923,6 @@ "SSE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "SSE.Controllers.Main.errorPasteMultiSelect": "This action cannot be done on a multiple range selection.
Select a single range and try again.", - "SSE.Controllers.Main.errorPivotWithoutUnderlying": "The Pivot Table report was saved without the underlying data.
Use the 'Refresh' button to update the report.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 17100c1aa..2bf306619 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -3,19 +3,51 @@ "Common.Controllers.Chat.notcriticalErrorTitle": "警告", "Common.Controllers.Chat.textEnterMessage": "ここでメッセージを挿入してください。", "Common.define.chartData.textArea": "面グラフ", + "Common.define.chartData.textAreaStacked": "積み上げ面", + "Common.define.chartData.textAreaStackedPer": "100% 積み上げ面", "Common.define.chartData.textBar": "横棒グラフ", + "Common.define.chartData.textBarNormal": "集合縦棒", + "Common.define.chartData.textBarNormal3d": "3-D 集合縦棒", + "Common.define.chartData.textBarNormal3dPerspective": "3-D 縦棒", + "Common.define.chartData.textBarStacked": "積み上げ縦棒", + "Common.define.chartData.textBarStacked3d": "3-D 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer": "100% 積み上げ縦棒", + "Common.define.chartData.textBarStackedPer3d": "3-D 100% 積み上げ縦棒", "Common.define.chartData.textCharts": "グラフ", "Common.define.chartData.textColumn": "縦棒グラフ", "Common.define.chartData.textColumnSpark": "縦棒グラフ", + "Common.define.chartData.textCombo": "複合", + "Common.define.chartData.textComboAreaBar": "積み上げ面 - 集合縦棒", + "Common.define.chartData.textComboBarLine": "集合縦棒 - 線", + "Common.define.chartData.textDoughnut": "ドーナツ", + "Common.define.chartData.textHBarNormal": "集合横棒", + "Common.define.chartData.textHBarNormal3d": "3-D 集合横棒", + "Common.define.chartData.textHBarStacked": "積み上げ横棒", + "Common.define.chartData.textHBarStacked3d": "3-D 積み上げ横棒", + "Common.define.chartData.textHBarStackedPer": "100%積み上げ横棒", + "Common.define.chartData.textHBarStackedPer3d": "3-D 100% 積み上げ横棒", "Common.define.chartData.textLine": "折れ線グラフ", + "Common.define.chartData.textLine3d": "3-D 折れ線", + "Common.define.chartData.textLineMarker": "マーカー付き折れ線", "Common.define.chartData.textLineSpark": "グラプ", + "Common.define.chartData.textLineStacked": "積み上げ折れ線", + "Common.define.chartData.textLineStackedMarker": "マーク付き積み上げ折れ線", + "Common.define.chartData.textLineStackedPer": "100% 積み上げ折れ線", + "Common.define.chartData.textLineStackedPerMarker": "マーカー付き 100% 積み上げ折れ線", "Common.define.chartData.textPie": "円グラフ", - "Common.define.chartData.textPoint": "点グラフ", + "Common.define.chartData.textPie3d": "3-D 円", + "Common.define.chartData.textPoint": "XY (散布図)", + "Common.define.chartData.textScatter": "散布図", + "Common.define.chartData.textScatterLine": "直線付き散布図", + "Common.define.chartData.textScatterLineMarker": "マーカーと直線付き散布図", + "Common.define.chartData.textScatterSmooth": "平滑線付き散布図", + "Common.define.chartData.textScatterSmoothMarker": "マーカーと平滑線付き散布図", "Common.define.chartData.textSparks": "スパークライン", "Common.define.chartData.textStock": "株価チャート", "Common.define.chartData.textSurface": "表面", "Common.define.chartData.textWinLossSpark": "勝ち/負け", "Common.Translation.warnFileLocked": "文書が別のアプリで使用されています。編集を続けて、コピーとして保存できます。", + "Common.UI.ColorButton.textAutoColor": "自動", "Common.UI.ColorButton.textNewColor": "ユーザー設定の色の追加", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", @@ -106,9 +138,11 @@ "Common.Views.EditNameDialog.textLabel": "ラベル:", "Common.Views.EditNameDialog.textLabelError": "ラベルは空白にできません。", "Common.Views.Header.labelCoUsersDescr": "ファイルを編集しているユーザー:", + "Common.Views.Header.textAddFavorite": "お気に入りとしてマーク", "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "文書URLを開く", "Common.Views.Header.textCompactView": "ツールバーを表示しない", + "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", "Common.Views.Header.textSaveBegin": "保存中...", @@ -297,9 +331,13 @@ "Common.Views.SymbolTableDialog.textSymbols": "記号と特殊文字", "Common.Views.SymbolTableDialog.textTitle": "記号", "Common.Views.SymbolTableDialog.textTradeMark": "商標マーク", + "Common.Views.UserNameDialog.textDontShow": "二度と表示しない", + "Common.Views.UserNameDialog.textLabel": "ラベル:", + "Common.Views.UserNameDialog.textLabelError": "ラベルは空白にできません。", "SSE.Controllers.DataTab.textColumns": "列", "SSE.Controllers.DataTab.textRows": "行", "SSE.Controllers.DataTab.textWizard": "テキスト区切り", + "SSE.Controllers.DataTab.txtDataValidation": "データ検証", "SSE.Controllers.DataTab.txtExpand": "拡張する", "SSE.Controllers.DataTab.txtExpandRemDuplicates": "選択範囲の横のデータは削除されません。選択範囲を拡大して隣接するデータを含めるか、現在選択されているセルのみを続行しますか?", "SSE.Controllers.DataTab.txtRemDuplicates": "重複データを削除", @@ -548,6 +586,7 @@ "SSE.Controllers.Main.errorOperandExpected": "入力した関数の構文が正しくありません。かっこ「(」または「)」のいずれかが欠落していないかどうかをご確認ください。", "SSE.Controllers.Main.errorPasteMaxRange": "コピーと貼り付けエリアが一致していません。
同じサイズの領域を選択するか、またはコピーしたセルを貼り付けるために行の最初のセルをクリックしてください。", "SSE.Controllers.Main.errorPasteSlicerError": "テーブルスライサーは、あるブックから別のブックにコピーすることはできません。", + "SSE.Controllers.Main.errorPivotGroup": "その選択をグループ化できません。", "SSE.Controllers.Main.errorPivotOverlap": "ピボットテーブルレポートはテーブルを重ねることができません。", "SSE.Controllers.Main.errorPrintMaxPagesCount": "残念ながら、現在のプログラムバージョンでは一度に1500ページを超える印刷はできません。
この制限は今後のリリースで削除される予定です。", "SSE.Controllers.Main.errorProcessSaveResult": "保存に失敗しました。", @@ -555,6 +594,7 @@ "SSE.Controllers.Main.errorSessionAbsolute": "ドキュメント編集セッションが終了しました。 ページを再度お読み込みください。", "SSE.Controllers.Main.errorSessionIdle": "このドキュメントはかなり長い間編集されていませんでした。このページを再度お読み込みください。", "SSE.Controllers.Main.errorSessionToken": "サーバーとの接続が中断されました。このページを再度お読み込みください。", + "SSE.Controllers.Main.errorSetPassword": "パスワードを設定できませんでした。", "SSE.Controllers.Main.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", "SSE.Controllers.Main.errorToken": "ドキュメント・セキュリティ・トークンが正しく形成されていません。
ドキュメントサーバーの管理者にご連絡ください。", "SSE.Controllers.Main.errorTokenExpire": "ドキュメント・セキュリティ・トークンの有効期限が切れています。
ドキュメントサーバーの管理者にご連絡ください。", @@ -588,6 +628,7 @@ "SSE.Controllers.Main.requestEditFailedMessageText": "この文書は他のユーザによって編集しています。後で編集してください。", "SSE.Controllers.Main.requestEditFailedTitleText": "アクセスが拒否されました", "SSE.Controllers.Main.saveErrorText": "ファイルを保存中にエラーが発生しました。", + "SSE.Controllers.Main.saveErrorTextDesktop": "このファイルは作成または保存できません。
考えられる理由は次のとおりです:
1. ファイルが読み取り専用です。
2. ファイルが他のユーザーによって編集されています。
3. ディスクがいっぱいか破損しています。", "SSE.Controllers.Main.savePreparingText": "保存の準備中", "SSE.Controllers.Main.savePreparingTitle": "保存の準備中です。お待ちください。", "SSE.Controllers.Main.saveTextText": "スプレッドシートの保存...", @@ -600,14 +641,18 @@ "SSE.Controllers.Main.textConfirm": "確認", "SSE.Controllers.Main.textContactUs": "営業部に連絡する", "SSE.Controllers.Main.textCustomLoader": "ライセンスの条件によっては、ローダーを変更する権利がないことにご注意ください。
見積もりについては、営業部門にお問い合わせください。", + "SSE.Controllers.Main.textGuest": "ゲスト", "SSE.Controllers.Main.textHasMacros": "ファイルには自動マクロが含まれています。
マクロを実行しますか?", "SSE.Controllers.Main.textLoadingDocument": "スプレッドシートの読み込み中", + "SSE.Controllers.Main.textLongName": "128文字未満の名前を入力してください。", "SSE.Controllers.Main.textNo": "いいえ", "SSE.Controllers.Main.textNoLicenseTitle": "ライセンス制限に達しました", "SSE.Controllers.Main.textPaidFeature": "有料機能", "SSE.Controllers.Main.textPleaseWait": "操作が予想以上に時間がかかります。しばらくお待ちください...", "SSE.Controllers.Main.textRecalcFormulas": "数式を計算中...", "SSE.Controllers.Main.textRemember": "選択内容を保存する", + "SSE.Controllers.Main.textRenameError": "ユーザー名は空にできません。", + "SSE.Controllers.Main.textRenameLabel": "コラボレーションに使用する名前を入力します", "SSE.Controllers.Main.textShape": "図形", "SSE.Controllers.Main.textStrict": "厳格モード", "SSE.Controllers.Main.textTryUndoRedo": "ファスト共同編集モードに元に戻す/やり直しの機能は無効になります。
他のユーザーの干渉なし編集するために「厳密なモード」をクリックして、厳密な共同編集モードに切り替えてください。保存した後にのみ、変更を送信してください。編集の詳細設定を使用して共同編集モードを切り替えることができます。", @@ -629,13 +674,18 @@ "SSE.Controllers.Main.txtColumn": "列", "SSE.Controllers.Main.txtConfidential": "機密", "SSE.Controllers.Main.txtDate": "日付", + "SSE.Controllers.Main.txtDays": "日", "SSE.Controllers.Main.txtDiagramTitle": "グラフのタイトル", "SSE.Controllers.Main.txtEditingMode": "編集モードを設定します...", "SSE.Controllers.Main.txtFiguredArrows": "形の矢印", "SSE.Controllers.Main.txtFile": "ファイル", "SSE.Controllers.Main.txtGrandTotal": "総計", + "SSE.Controllers.Main.txtGroup": "グループ", + "SSE.Controllers.Main.txtHours": "時間", "SSE.Controllers.Main.txtLines": "行", "SSE.Controllers.Main.txtMath": "数学", + "SSE.Controllers.Main.txtMinutes": "分", + "SSE.Controllers.Main.txtMonths": "月", "SSE.Controllers.Main.txtMultiSelect": "複数選択(Alt+S)", "SSE.Controllers.Main.txtPage": "ページ", "SSE.Controllers.Main.txtPageOf": "%2のページ%1", @@ -645,6 +695,7 @@ "SSE.Controllers.Main.txtRectangles": "四角形", "SSE.Controllers.Main.txtRow": "行", "SSE.Controllers.Main.txtRowLbls": "行ラベル", + "SSE.Controllers.Main.txtSeconds": "秒", "SSE.Controllers.Main.txtSeries": "系列", "SSE.Controllers.Main.txtShape_accentBorderCallout1": "引き出し 1(枠付きと強調線)", "SSE.Controllers.Main.txtShape_accentBorderCallout2": "引き出し 2 (枠付きと強調線)", @@ -845,6 +896,7 @@ "SSE.Controllers.Main.txtValues": "値", "SSE.Controllers.Main.txtXAxis": "X 軸", "SSE.Controllers.Main.txtYAxis": "Y軸", + "SSE.Controllers.Main.txtYears": "年", "SSE.Controllers.Main.unknownErrorText": "不明なエラー", "SSE.Controllers.Main.unsupportedBrowserErrorText": "お使いのブラウザがサポートされていません。", "SSE.Controllers.Main.uploadImageExtMessage": "不明なイメージの形式", @@ -883,6 +935,7 @@ "SSE.Controllers.Statusbar.warnDeleteSheet": "ワークシートにはデータが含まれている可能性があります。続行してもよろしいですか?", "SSE.Controllers.Statusbar.zoomText": "ズーム{0}%", "SSE.Controllers.Toolbar.confirmAddFontName": "保存しようとしているフォントを現在のデバイスで使用することができません。
システムフォントを使って、テキストのスタイルが表示されます。利用できます時、保存されたフォントが使用されます。
続行しますか。", + "SSE.Controllers.Toolbar.errorComboSeries": "組み合わせグラフを作成するには、最低2つのデータを選択します。", "SSE.Controllers.Toolbar.errorMaxRows": "エラー!使用可能なデータ系列の数は、1グラフあたり最大255個です。", "SSE.Controllers.Toolbar.errorStockChart": "行の順序が正しくありません。この株価チャートを作成するには、
始値、高値、安値、終値の順でシートのデータを配置してください。", "SSE.Controllers.Toolbar.textAccent": "ダイアクリティカル・マーク", @@ -1301,6 +1354,7 @@ "SSE.Views.CellSettings.textGradient": "グラデーション", "SSE.Views.CellSettings.textGradientColor": "色", "SSE.Views.CellSettings.textGradientFill": "グラデーション塗りつぶし", + "SSE.Views.CellSettings.textIndent": "インデント", "SSE.Views.CellSettings.textLinear": "線形", "SSE.Views.CellSettings.textNoFill": "塗りつぶしなし", "SSE.Views.CellSettings.textOrientation": "テキストの方向", @@ -1364,6 +1418,7 @@ "SSE.Views.ChartSettings.strTemplate": "テンプレート", "SSE.Views.ChartSettings.textAdvanced": "詳細設定の表示", "SSE.Views.ChartSettings.textBorderSizeErr": "入力された値が正しくありません。
0〜1584の数値をご入力ください。", + "SSE.Views.ChartSettings.textChangeType": "タイプを変更する", "SSE.Views.ChartSettings.textChartType": "グラフの種類の変更", "SSE.Views.ChartSettings.textEditData": "データの編集", "SSE.Views.ChartSettings.textFirstPoint": "最初のポイント", @@ -1395,6 +1450,7 @@ "SSE.Views.ChartSettingsDlg.textAxisOptions": "軸のオプション", "SSE.Views.ChartSettingsDlg.textAxisPos": "軸位置", "SSE.Views.ChartSettingsDlg.textAxisSettings": "軸の設定", + "SSE.Views.ChartSettingsDlg.textAxisTitle": "タイトル", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "目盛りの間", "SSE.Views.ChartSettingsDlg.textBillions": "十億", "SSE.Views.ChartSettingsDlg.textBottom": "下", @@ -1412,12 +1468,15 @@ "SSE.Views.ChartSettingsDlg.textEmptyLine": "データポイントを線で接続する", "SSE.Views.ChartSettingsDlg.textFit": "幅に合わせる", "SSE.Views.ChartSettingsDlg.textFixed": "固定", + "SSE.Views.ChartSettingsDlg.textFormat": "ラベルの書式", "SSE.Views.ChartSettingsDlg.textGaps": "空隙", "SSE.Views.ChartSettingsDlg.textGridLines": "枠線表示", "SSE.Views.ChartSettingsDlg.textGroup": "スパークラインをグループ化する", "SSE.Views.ChartSettingsDlg.textHide": "表示しない", + "SSE.Views.ChartSettingsDlg.textHideAxis": "軸を非表示", "SSE.Views.ChartSettingsDlg.textHigh": "高", "SSE.Views.ChartSettingsDlg.textHorAxis": "横軸", + "SSE.Views.ChartSettingsDlg.textHorAxisSec": "二次横軸", "SSE.Views.ChartSettingsDlg.textHorizontal": "水平", "SSE.Views.ChartSettingsDlg.textHundredMil": "100 000 000", "SSE.Views.ChartSettingsDlg.textHundreds": "百", @@ -1495,10 +1554,17 @@ "SSE.Views.ChartSettingsDlg.textUnits": "表示単位", "SSE.Views.ChartSettingsDlg.textValue": "値", "SSE.Views.ChartSettingsDlg.textVertAxis": "縦軸", + "SSE.Views.ChartSettingsDlg.textVertAxisSec": "二次縦軸", "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X軸のタイトル", "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y軸のタイトル", "SSE.Views.ChartSettingsDlg.textZero": "ゼロ", "SSE.Views.ChartSettingsDlg.txtEmpty": "このフィールドは必須項目です", + "SSE.Views.ChartTypeDialog.errorComboSeries": "組み合わせグラフを作成するには、最低2つのデータを選択します。", + "SSE.Views.ChartTypeDialog.textSecondary": "二次軸", + "SSE.Views.ChartTypeDialog.textSeries": "系列", + "SSE.Views.ChartTypeDialog.textStyle": "スタイル", + "SSE.Views.ChartTypeDialog.textTitle": "グラフの種類", + "SSE.Views.ChartTypeDialog.textType": "タイプ", "SSE.Views.CreatePivotDialog.textDataRange": "ソースデータ範囲", "SSE.Views.CreatePivotDialog.textDestination": "テーブルを配置する場所をご選択ください", "SSE.Views.CreatePivotDialog.textExist": "既存のワークシート", @@ -1509,6 +1575,7 @@ "SSE.Views.CreatePivotDialog.txtEmpty": "この項目は必須です", "SSE.Views.DataTab.capBtnGroup": "グループ化", "SSE.Views.DataTab.capBtnTextCustomSort": "ユーザー設定の並べ替え", + "SSE.Views.DataTab.capBtnTextDataValidation": "データ検証", "SSE.Views.DataTab.capBtnTextRemDuplicates": "重複データを削除", "SSE.Views.DataTab.capBtnTextToCol": "テキスト区切り", "SSE.Views.DataTab.capBtnUngroup": "グループ解除", @@ -1520,10 +1587,52 @@ "SSE.Views.DataTab.textRightOf": "詳細の右側にある要約列", "SSE.Views.DataTab.textRows": "行のグループを解除", "SSE.Views.DataTab.tipCustomSort": "ユーザー設定の並べ替え", + "SSE.Views.DataTab.tipDataValidation": "データ検証", "SSE.Views.DataTab.tipGroup": "セルの範囲をグループ化する", "SSE.Views.DataTab.tipRemDuplicates": "シート内の重複を削除", "SSE.Views.DataTab.tipToColumns": "セルテキストを列に分割する", "SSE.Views.DataTab.tipUngroup": "セルの範囲をグループ解除する", + "SSE.Views.DataValidationDialog.errorFormula": "現在、値がエラーと評価されています。続けますか?", + "SSE.Views.DataValidationDialog.errorNegativeTextLength": "条件 \"{0}\"では負の値を使用できません。", + "SSE.Views.DataValidationDialog.strError": "エラー警告", + "SSE.Views.DataValidationDialog.strInput": "メッセージ入力", + "SSE.Views.DataValidationDialog.strSettings": "設定", + "SSE.Views.DataValidationDialog.textAlert": "警告", + "SSE.Views.DataValidationDialog.textApply": "これらの変更を同じ設定の他のすべてのセルに適用します", + "SSE.Views.DataValidationDialog.textCellSelected": "セルを選択すると、この入力メッセージを表示します", + "SSE.Views.DataValidationDialog.textData": "データ", + "SSE.Views.DataValidationDialog.textEndDate": "終了日", + "SSE.Views.DataValidationDialog.textEndTime": "終了時間", + "SSE.Views.DataValidationDialog.textError": "エラーメッセージ", + "SSE.Views.DataValidationDialog.textFormula": "数式", + "SSE.Views.DataValidationDialog.textIgnore": "空白を無視", + "SSE.Views.DataValidationDialog.textInput": "メッセージ入力", + "SSE.Views.DataValidationDialog.textMax": "最大", + "SSE.Views.DataValidationDialog.textMessage": "メッセージ", + "SSE.Views.DataValidationDialog.textMin": "最小", + "SSE.Views.DataValidationDialog.textSelectData": "データの選択", + "SSE.Views.DataValidationDialog.textShowDropDown": "セルにドロップダウンリストを表示する", + "SSE.Views.DataValidationDialog.textShowError": "無効なデータが入力された後にエラー警告を表示する", + "SSE.Views.DataValidationDialog.textShowInput": "セルが選択されたときに入力メッセージを表示する", + "SSE.Views.DataValidationDialog.textSource": "ソース", + "SSE.Views.DataValidationDialog.textStartDate": "開始日", + "SSE.Views.DataValidationDialog.textStartTime": "開始時間", + "SSE.Views.DataValidationDialog.textStop": "停止", + "SSE.Views.DataValidationDialog.textStyle": "スタイル", + "SSE.Views.DataValidationDialog.textTitle": "タイトル", + "SSE.Views.DataValidationDialog.textUserEnters": "ユーザーが無効なデータを入力した場合、このエラーアラートを表示します", + "SSE.Views.DataValidationDialog.txtDate": "日付", + "SSE.Views.DataValidationDialog.txtElTime": "経過時間", + "SSE.Views.DataValidationDialog.txtEndDate": "終了日", + "SSE.Views.DataValidationDialog.txtEndTime": "終了時間", + "SSE.Views.DataValidationDialog.txtLength": "長さ", + "SSE.Views.DataValidationDialog.txtList": "リスト", + "SSE.Views.DataValidationDialog.txtOther": "その他", + "SSE.Views.DataValidationDialog.txtStartDate": "開始日", + "SSE.Views.DataValidationDialog.txtStartTime": "開始時間", + "SSE.Views.DataValidationDialog.txtTextLength": "テキストの長さ", + "SSE.Views.DataValidationDialog.txtTime": "時間", + "SSE.Views.DataValidationDialog.txtWhole": "整数", "SSE.Views.DigitalFilterDialog.capAnd": "と", "SSE.Views.DigitalFilterDialog.capCondition1": "次の値と等しい", "SSE.Views.DigitalFilterDialog.capCondition10": "次の文字列で終わらない", @@ -1634,6 +1743,7 @@ "SSE.Views.DocumentHolder.txtCurrency": "通貨", "SSE.Views.DocumentHolder.txtCustomColumnWidth": "ユーザー設定の列幅", "SSE.Views.DocumentHolder.txtCustomRowHeight": "ユーザー設定の行の高さ", + "SSE.Views.DocumentHolder.txtCustomSort": "ユーザー設定ソート", "SSE.Views.DocumentHolder.txtCut": "切り取り", "SSE.Views.DocumentHolder.txtDate": "日付", "SSE.Views.DocumentHolder.txtDelete": "削除", @@ -1765,6 +1875,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strResolvedComment": "解決されたコメントの表示をオンにする", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strSeparator": "区切り", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strStrict": "高レベル", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strTheme": "テーマ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strThousandsSeparator": "桁区切り", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strUnit": "販売単位", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strUseSeparatorsBasedOnRegionalSettings": "地域の設定に基づいて桁区切りを使用する", @@ -1797,6 +1908,8 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "マクロを有効にして、通知しない", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "全てを無効にする", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "マクロを無効にして、通知しない", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "ダーク", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "ライト", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "通知を表示する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "マクロを無効にして、通知する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windowsのような", @@ -1933,6 +2046,7 @@ "SSE.Views.HyperlinkSettingsDialog.textTitle": "ハイパーリンクの設定", "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "このフィールドは必須項目です", "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "このフィールドは「http://www.example.com」の形式のURLである必要があります。", + "SSE.Views.HyperlinkSettingsDialog.txtSizeLimit": "このフィールドは2083文字に制限されています", "SSE.Views.ImageSettings.textAdvanced": "詳細設定の表示", "SSE.Views.ImageSettings.textCrop": "トリミング", "SSE.Views.ImageSettings.textCropFill": "塗りつぶし", @@ -2117,6 +2231,16 @@ "SSE.Views.PivotDigitalFilterDialog.txtAnd": "と", "SSE.Views.PivotDigitalFilterDialog.txtTitleLabel": "ラベル・フィルター", "SSE.Views.PivotDigitalFilterDialog.txtTitleValue": "値フィルター", + "SSE.Views.PivotGroupDialog.textAuto": "自動", + "SSE.Views.PivotGroupDialog.textDays": "日", + "SSE.Views.PivotGroupDialog.textError": "このフィールドは数値である必要があります", + "SSE.Views.PivotGroupDialog.textHour": "時間", + "SSE.Views.PivotGroupDialog.textMin": "分", + "SSE.Views.PivotGroupDialog.textMonth": "月", + "SSE.Views.PivotGroupDialog.textNumDays": "日数", + "SSE.Views.PivotGroupDialog.textSec": "秒", + "SSE.Views.PivotGroupDialog.textYear": "年", + "SSE.Views.PivotGroupDialog.txtTitle": "グループ化", "SSE.Views.PivotSettings.textAdvanced": "詳細設定の表示", "SSE.Views.PivotSettings.textColumns": "列", "SSE.Views.PivotSettings.textFields": "フィールドを選択する", @@ -2382,6 +2506,7 @@ "SSE.Views.SignatureSettings.strValid": "有効な署名", "SSE.Views.SignatureSettings.txtContinueEditing": "無視して編集する", "SSE.Views.SignatureSettings.txtEditWarning": "編集すると、スプレッドシートから署名が削除されます。
続けますか?", + "SSE.Views.SignatureSettings.txtRemoveWarning": "この署名を削除しますか?
この操作は元に戻せません。", "SSE.Views.SignatureSettings.txtRequestedSignatures": "このスプレッドシートはサインする必要があります。", "SSE.Views.SignatureSettings.txtSigned": "有効な署名がスプレッドシートに追加されました。 スプレッドシートは編集から保護されています。", "SSE.Views.SignatureSettings.txtSignedInvalid": "スプレッドシートの一部のデジタル署名が無効であるか、検証できませんでした。 スプレッドシートは編集から保護されています。", @@ -2699,6 +2824,7 @@ "SSE.Views.Toolbar.textAlignTop": "上揃え", "SSE.Views.Toolbar.textAllBorders": "全てのボーダー", "SSE.Views.Toolbar.textAuto": "自動", + "SSE.Views.Toolbar.textAutoColor": "自動", "SSE.Views.Toolbar.textBold": "太字", "SSE.Views.Toolbar.textBordersColor": "罫線の色", "SSE.Views.Toolbar.textBordersStyle": "罫線スタイル", @@ -2790,6 +2916,7 @@ "SSE.Views.Toolbar.tipDigStylePercent": "パーセント スタイル", "SSE.Views.Toolbar.tipEditChart": "グラフの編集", "SSE.Views.Toolbar.tipEditChartData": "データの選択", + "SSE.Views.Toolbar.tipEditChartType": "グラフの種類の変更", "SSE.Views.Toolbar.tipEditHeader": "ヘッダーやフッターの編集", "SSE.Views.Toolbar.tipFontColor": "フォントの色", "SSE.Views.Toolbar.tipFontName": "フォント名", From 93d8321e27e8988b298bc209eb7d520f1dba51a5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 10 Apr 2021 20:06:17 +0300 Subject: [PATCH 19/25] [common] fix bug 49245 --- .../img/toolbar/1.5x/btn-paracolor.png | Bin 504 -> 575 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png b/apps/common/main/resources/img/toolbar/1.5x/btn-paracolor.png index dcec675fb316016e64588370c2041d1781c1146e..c41c5dafd243b42abf4e879420f7f1ed93ea29c0 100644 GIT binary patch delta 550 zcmV+>0@?le1HS~2B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FZT01FZU(%pXi0000P zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@JIn>s&WB>pGyh%hsR9Hvtmw|D@FbqW* zfe{#?Bd`fcS zQg;X4p|2r&!1x03`QpIr4!T35x{RRcEW~=HFE( z)*!cqt`OnUp8YK?CYyc|TF|(dT;-F{!rhNY)~ZEelDjXDtX1p&fAAN3E4j&@Px#1ZP1_ zK>z@;j|==^1poj6jY&j7RCodHmyMBwAP`2s+*|=Eff6hsooELs!4fPbC8U&;!m%UV z83uG07c!UlW|)jXT%RmI0tW{l%NZ}gTKkf?#+8RFT~trklYehl$H^L397)9p(m`rK zeom`PFQkT*Ijt_8o5NM5SLSe4=`A_K>@R{LXE^<(Y(0E#pQP1$LLplZpWC1P>RlYS zbfj`4&!Tjsa(^Sw#bBRoQCj5=8;t+$PG?GsQTCVpbJw4sL~&cq-L3w{l{oW=qd6e2xjT=6X2 zqX6k4!(Cq^;i9+!?n#TFJ@SUXls=;n%RFiMwzDg@kXO=H;aj@NCt-|j{7D#NFmG8+ zgZkBXYAyTkIc4fC+QfMd>VP6A2e+?gVD`N(1%!iVv_(x#o(EVR@5;NZ>q0S<#J U0%Mn5Hvj+t07*qoM6N<$f}_jYJ^%m! From 6d7ef4c60529d94747525d3bb0f1d58a34290d9c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 12 Apr 2021 19:13:31 +0300 Subject: [PATCH 20/25] Fix compactHeader mode --- apps/common/main/lib/view/Header.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 12a20e1bb..cf2ef9395 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -221,13 +221,15 @@ define([ ''); } - var $parent = this.labelDocName.parent(); - var _left_width = $parent.position().left, - _right_width = $parent.next().outerWidth(); + if (!config.isEdit || !config.customization || !config.customization.compactHeader) { + var $parent = this.labelDocName.parent(); + var _left_width = $parent.position().left, + _right_width = $parent.next().outerWidth(); - if ( _left_width < _right_width ) - this.labelDocName.parent().css('padding-left', _right_width - _left_width); - else this.labelDocName.parent().css('padding-right', _left_width - _right_width); + if ( _left_width < _right_width ) + this.labelDocName.parent().css('padding-left', _right_width - _left_width); + else this.labelDocName.parent().css('padding-right', _left_width - _right_width); + } } } From 0a8659a341909ea062a84a7df902c287ad0b57c3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 12 Apr 2021 21:46:28 +0300 Subject: [PATCH 21/25] [common] fix bug 49591 --- apps/common/main/lib/component/Slider.js | 8 +--- apps/common/main/resources/less/slider.less | 46 ++++++++++++++------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/apps/common/main/lib/component/Slider.js b/apps/common/main/lib/component/Slider.js index f6f110811..bbbb1bbb8 100644 --- a/apps/common/main/lib/component/Slider.js +++ b/apps/common/main/lib/component/Slider.js @@ -89,12 +89,8 @@ define([ template : _.template([ '
', - '
', - '
', - '
', - '
', - '
', - '
', + '
', + '
', '<% if (this.options.enableKeyEvents) { %>', '', '<% } %>', diff --git a/apps/common/main/resources/less/slider.less b/apps/common/main/resources/less/slider.less index ed156501b..fc134d2bf 100644 --- a/apps/common/main/resources/less/slider.less +++ b/apps/common/main/resources/less/slider.less @@ -2,33 +2,51 @@ position: relative; height: 18px; + &.single-slider { + padding-top: 7px; + + .track { + @track-height: 4px; + height: @track-height; + border: @track-height / 2 solid @border-regular-control-ie; + border: @track-height / 2 solid @border-regular-control; + border-radius: @track-height / 2; + width: calc(100% + @track-height); + margin-left: -@track-height / 2; + } + + .thumb { + @thumb-width: 12px; + width: @thumb-width; + height: @thumb-width; + + border: @scaled-one-px-value-ie solid @icon-normal-ie; + border: @scaled-one-px-value solid @icon-normal; + background-color: @background-normal-ie; + background-color: @background-normal; + border-radius: @thumb-width / 2; + + top: 3px; + margin-left: @thumb-width / -2; + + &.active { + } + } + } + .thumb { position: absolute; left: 0; - top: 0; - width: 13px; - height: 15px; margin-left: -7px; cursor: default; - background-position: @slide-thumb-offset-x @slide-thumb-offset-y; &.active { - background-position: @slide-thumb-offset-x @slide-thumb-offset-y - 30px; } } .track { height: 18px; background-color: transparent; - .track-left { - background-position: @slide-track-offset-x @slide-track-offset-y; - } - .track-right { - background-position: @slide-track-offset-x - 7px @slide-track-offset-y; - } - .track-center { - background-position: @slide-track-offset-x @slide-track-offset-y - 18px; - } div { width: 7px; From 1799fb270c801a713529f5d949a886812b3ba77b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 13 Apr 2021 12:14:15 +0300 Subject: [PATCH 22/25] [DE] Preview for TOC menu --- .../main/app/controller/Links.js | 6 ++++ apps/documenteditor/main/app/view/Links.js | 14 +++++++--- .../main/resources/less/toolbar.less | 28 +++++++++---------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index 9c5e43e65..e68fd3772 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -67,6 +67,7 @@ define([ this.addListeners({ 'Links': { 'links:contents': this.onTableContents, + 'links:contents-open': this.onTableContentsOpen, 'links:update': this.onTableContentsUpdate, 'links:notes': this.onNotesClick, 'links:hyperlink': this.onHyperlinkClick, @@ -79,6 +80,7 @@ define([ 'DocumentHolder': { 'links:contents': this.onTableContents, 'links:update': this.onTableContentsUpdate, + 'links:contents-open': this.onTableContentsOpen, 'links:caption': this.onCaptionClick } }); @@ -309,6 +311,10 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, + onTableContentsOpen: function(menu) { + this.api.asc_getButtonsTOC(menu.items[0].id, menu.items[1].id); + }, + onNotesClick: function(type) { var me = this; switch (type) { diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index 28939bc82..c02f2178c 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -56,12 +56,18 @@ define([ button.on('click', function (b, e) { me.fireEvent('links:contents', [0]); }); + button.menu.on('show:after', function (menu, e) { + me.fireEvent('links:contents-open', [menu]); + }); }); this.contentsMenu.on('item:click', function (menu, item, e) { setTimeout(function(){ me.fireEvent('links:contents', [item.value, true]); }, 10); }); + this.contentsMenu.on('show:after', function (menu, e) { + me.fireEvent('links:contents-open', [menu]); + }); this.btnContentsUpdate.menu.on('item:click', function (menu, item, e) { me.fireEvent('links:update', [item.value]); @@ -236,8 +242,8 @@ define([ var _menu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0}, - {template: contentsTemplate, offsety: 72, value: 1}, + {template: contentsTemplate, offsety: 0, value: 0, id: 'id-toolbar-toc-0'}, + {template: contentsTemplate, offsety: 72, value: 1, id: 'id-toolbar-toc-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] @@ -249,8 +255,8 @@ define([ me.contentsMenu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0}, - {template: contentsTemplate, offsety: 72, value: 1}, + {template: contentsTemplate, offsety: 0, value: 0, id: 'id-toolbar-toc-menu-0'}, + {template: contentsTemplate, offsety: 72, value: 1, id: 'id-toolbar-toc-menu-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 2e9523dc0..4e4009863 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -44,10 +44,10 @@ > li > a.item-contents { div { - .background-ximage-v2('toolbar/contents.png', 246px, @commonimage: false); + //.background-ximage-v2('toolbar/contents.png', 246px, @commonimage: false); background-color: #fff; - width: 246px; - height: @contents-menu-item-height; + width: 248px; + //height: @contents-menu-item-height; .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); @@ -68,18 +68,18 @@ } } } + // + //.loop(@counter) when (@counter > 0) { + // .loop((@counter - 1)); + // li:nth-child(@{counter}) > a.item-contents { + // div { + // @incr-height: (@counter - 1)*@contents-menu-item-height; + // background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})"; + // } + // } + //} - .loop(@counter) when (@counter > 0) { - .loop((@counter - 1)); - li:nth-child(@{counter}) > a.item-contents { - div { - @incr-height: (@counter - 1)*@contents-menu-item-height; - background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})"; - } - } - } - - .loop(2); + //.loop(2); } // page number position From e0ceb8a8415a5d90349b6b7fce26fce3383d4cb9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 13 Apr 2021 12:52:19 +0300 Subject: [PATCH 23/25] [DE] Fix preview toc --- apps/documenteditor/main/app/controller/Links.js | 2 +- apps/documenteditor/main/app/view/Links.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Links.js b/apps/documenteditor/main/app/controller/Links.js index e68fd3772..4a76a9bbf 100644 --- a/apps/documenteditor/main/app/controller/Links.js +++ b/apps/documenteditor/main/app/controller/Links.js @@ -312,7 +312,7 @@ define([ }, onTableContentsOpen: function(menu) { - this.api.asc_getButtonsTOC(menu.items[0].id, menu.items[1].id); + this.api.asc_getButtonsTOC(menu.items[0].options.previewId, menu.items[1].options.previewId); }, onNotesClick: function(type) { diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index c02f2178c..04b925479 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -235,15 +235,15 @@ define([ (new Promise(function (accept, reject) { accept(); })).then(function(){ - var contentsTemplate = _.template('
'); + var contentsTemplate = _.template('
'); me.btnsContents.forEach( function(btn) { btn.updateHint( me.tipContents ); var _menu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0, id: 'id-toolbar-toc-0'}, - {template: contentsTemplate, offsety: 72, value: 1, id: 'id-toolbar-toc-1'}, + {template: contentsTemplate, offsety: 0, value: 0, previewId: 'id-toolbar-toc-0'}, + {template: contentsTemplate, offsety: 72, value: 1, previewId: 'id-toolbar-toc-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] @@ -255,8 +255,8 @@ define([ me.contentsMenu = new Common.UI.Menu({ cls: 'toc-menu shifted-left', items: [ - {template: contentsTemplate, offsety: 0, value: 0, id: 'id-toolbar-toc-menu-0'}, - {template: contentsTemplate, offsety: 72, value: 1, id: 'id-toolbar-toc-menu-1'}, + {template: contentsTemplate, offsety: 0, value: 0, previewId: 'id-toolbar-toc-menu-0'}, + {template: contentsTemplate, offsety: 72, value: 1, previewId: 'id-toolbar-toc-menu-1'}, {caption: me.textContentsSettings, value: 'settings'}, {caption: me.textContentsRemove, value: 'remove'} ] From 02b7d14b039a4e316eafd1c9ec38bcc13d204988 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 13 Apr 2021 14:18:59 +0300 Subject: [PATCH 24/25] FIx toc preview --- .../main/resources/less/toolbar.less | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 4e4009863..6500e36ce 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -44,10 +44,8 @@ > li > a.item-contents { div { - //.background-ximage-v2('toolbar/contents.png', 246px, @commonimage: false); background-color: #fff; width: 248px; - //height: @contents-menu-item-height; .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); @@ -57,6 +55,10 @@ .box-shadow(0 0 0 2px @border-control-focus-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); } + + canvas { + vertical-align: middle; + } } &:hover, &:focus { @@ -68,18 +70,6 @@ } } } - // - //.loop(@counter) when (@counter > 0) { - // .loop((@counter - 1)); - // li:nth-child(@{counter}) > a.item-contents { - // div { - // @incr-height: (@counter - 1)*@contents-menu-item-height; - // background-position: 0 ~"calc(var(--bckgHOffset) - @{incr-height})"; - // } - // } - //} - - //.loop(2); } // page number position From f1ca6aafccb9db239d72bdeb43399ae17f5f2405 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Wed, 14 Apr 2021 16:47:11 +0300 Subject: [PATCH 25/25] Update spinner.less --- apps/common/main/resources/less/spinner.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/spinner.less b/apps/common/main/resources/less/spinner.less index 73cb0cf4a..9e56c1e8d 100644 --- a/apps/common/main/resources/less/spinner.less +++ b/apps/common/main/resources/less/spinner.less @@ -61,7 +61,7 @@ opacity: @component-disabled-opacity; } - &:hover { + &:hover:not(:disabled):not(.disabled) { background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } @@ -79,4 +79,4 @@ transform: rotate(-135deg) translate(2px,2px); } } -} \ No newline at end of file +}