From c1af5347833d9b7dee1688712788795071e386c8 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 29 Jul 2021 04:25:33 +0300 Subject: [PATCH 001/129] First change --- apps/common/main/lib/component/Window.js | 2 +- apps/common/main/lib/view/OpenDialog.js | 2 +- .../main/resources/img/controls/attention.svg | 4 ++++ .../main/resources/img/controls/done.svg | 4 ++++ .../main/resources/img/controls/info.svg | 4 ++++ .../main/resources/img/controls/warning.svg | 4 ++++ .../main/resources/less/opendialog.less | 6 +++--- apps/common/main/resources/less/window.less | 19 ++++++++++++------- .../template/DataValidationDialog.template | 2 +- 9 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 apps/common/main/resources/img/controls/attention.svg create mode 100644 apps/common/main/resources/img/controls/done.svg create mode 100644 apps/common/main/resources/img/controls/info.svg create mode 100644 apps/common/main/resources/img/controls/warning.svg diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index cb6ac13b4..2a5d65545 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -455,7 +455,7 @@ define([ if (!options.width) options.width = 'auto'; var template = '
' + - '<% if (typeof iconCls !== "undefined") { %>
<% } %>' + + '<% if (typeof iconCls !== "undefined") { %>
<% } %>' + '
style="padding-left:10px;" <% } %>><%= msg %>' + '<% if (dontshow) { %>
<% } %>' + '
' + diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js index fce9a2ee1..0c9750364 100644 --- a/apps/common/main/lib/view/OpenDialog.js +++ b/apps/common/main/lib/view/OpenDialog.js @@ -97,7 +97,7 @@ define([ '<% if (type == Common.Utils.importTextType.DRM) { %>', '<% if (warning) { %>', '
', - '
', + '
', '
' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '
', '', '
', diff --git a/apps/common/main/resources/img/controls/attention.svg b/apps/common/main/resources/img/controls/attention.svg new file mode 100644 index 000000000..67e0988f5 --- /dev/null +++ b/apps/common/main/resources/img/controls/attention.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/controls/done.svg b/apps/common/main/resources/img/controls/done.svg new file mode 100644 index 000000000..1957986fb --- /dev/null +++ b/apps/common/main/resources/img/controls/done.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/controls/info.svg b/apps/common/main/resources/img/controls/info.svg new file mode 100644 index 000000000..91b23c137 --- /dev/null +++ b/apps/common/main/resources/img/controls/info.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/controls/warning.svg b/apps/common/main/resources/img/controls/warning.svg new file mode 100644 index 000000000..87caf23a4 --- /dev/null +++ b/apps/common/main/resources/img/controls/warning.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index a58a97b26..5abbc9ca9 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -77,14 +77,14 @@ } } - .icon.img-commonctrl { + .icon { float: left; width: 35px; height: 35px; &.warn { - height: 32px; - background-position: @alerts-offset-x @alerts-offset-y - 105px; + background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; + //background-position: @alerts-offset-x @alerts-offset-y - 105px; } } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 65294ef4d..e32929347 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -172,26 +172,31 @@ .icon { &.warn { - width: 35px; - height: 32px; - background-position: @alerts-offset-x @alerts-offset-y - 105px; + + background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; + + //background-position: @alerts-offset-x @alerts-offset-y - 105px; } - &.error, &.info, &.confirm { + &.error, &.info, &.confirm, &.warn { width: 35px; height: 35px; } &.error { - background-position: @alerts-offset-x @alerts-offset-y - 0; + background: url('../../../../common/main/resources/img/controls/warning.svg') no-repeat center; + //background-position: @alerts-offset-x @alerts-offset-y - 0; } &.info { - background-position: @alerts-offset-x @alerts-offset-y - 35px; + background: url('../../../../common/main/resources/img/controls/info.svg') no-repeat center; + //background-position: @alerts-offset-x @alerts-offset-y - 35px; } &.confirm { - background-position: @alerts-offset-x @alerts-offset-y - 70px; + background: url('../../../../common/main/resources/img/controls/done.svg') no-repeat center; + + //background-position: @alerts-offset-x @alerts-offset-y - 70px; } } diff --git a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template index ef85cbaf5..51c6e44eb 100644 --- a/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template +++ b/apps/spreadsheeteditor/main/app/template/DataValidationDialog.template @@ -89,7 +89,7 @@
-
+
From 3808c46c15de223261fd0ce50c609e690bc9dea2 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 29 Jul 2021 11:58:20 +0300 Subject: [PATCH 002/129] Resize on 40 --- apps/common/main/resources/less/opendialog.less | 4 ++-- apps/common/main/resources/less/window.less | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 5abbc9ca9..83b2afaed 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -79,8 +79,8 @@ .icon { float: left; - width: 35px; - height: 35px; + width: 40px; + height: 40px; &.warn { background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index e32929347..85c6fc89e 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -179,8 +179,8 @@ } &.error, &.info, &.confirm, &.warn { - width: 35px; - height: 35px; + width: 40px; + height: 40px; } &.error { From 32a76a6c9250e40d2c9f5f806434b3e43129445c Mon Sep 17 00:00:00 2001 From: OVSharova Date: Tue, 3 Aug 2021 03:00:29 +0300 Subject: [PATCH 003/129] create svg sprite var1 --- .../main/resources/img/controls/warnings.svg | 26 +++++++++++++++++++ .../main/resources/less/opendialog.less | 3 ++- apps/common/main/resources/less/window.less | 15 ++++++----- 3 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 apps/common/main/resources/img/controls/warnings.svg diff --git a/apps/common/main/resources/img/controls/warnings.svg b/apps/common/main/resources/img/controls/warnings.svg new file mode 100644 index 000000000..8f451e71e --- /dev/null +++ b/apps/common/main/resources/img/controls/warnings.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 83b2afaed..242e55b04 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -83,7 +83,8 @@ height: 40px; &.warn { - background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; + background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; + //background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 105px; } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 85c6fc89e..0b8b3d667 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -172,9 +172,8 @@ .icon { &.warn { - - background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; - + background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; + //background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 105px; } @@ -184,18 +183,20 @@ } &.error { - background: url('../../../../common/main/resources/img/controls/warning.svg') no-repeat center; + background: url('../../../../common/main/resources/img/controls/warnings.svg#warning') no-repeat center; + //background: url('../../../../common/main/resources/img/controls/warning.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 0; } &.info { - background: url('../../../../common/main/resources/img/controls/info.svg') no-repeat center; + background: url('../../../../common/main/resources/img/controls/warnings.svg#info') no-repeat center; + //background: url('../../../../common/main/resources/img/controls/info.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 35px; } &.confirm { - background: url('../../../../common/main/resources/img/controls/done.svg') no-repeat center; - + //background: url('../../../../common/main/resources/img/controls/done.svg') no-repeat center; + background: url('../../../../common/main/resources/img/controls/warnings.svg#done') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 70px; } } From 63658df710d12423a56c9eee636f9ea2e2f60a2a Mon Sep 17 00:00:00 2001 From: OVSharova Date: Tue, 3 Aug 2021 11:39:08 +0300 Subject: [PATCH 004/129] plus var2 --- .../main/resources/img/controls/attention.svg | 4 --- .../main/resources/img/controls/done.svg | 4 --- .../main/resources/img/controls/info.svg | 4 --- .../main/resources/img/controls/warning.svg | 4 --- .../main/resources/img/controls/warnings2.svg | 28 +++++++++++++++++++ .../main/resources/less/opendialog.less | 1 - apps/common/main/resources/less/window.less | 4 --- 7 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 apps/common/main/resources/img/controls/attention.svg delete mode 100644 apps/common/main/resources/img/controls/done.svg delete mode 100644 apps/common/main/resources/img/controls/info.svg delete mode 100644 apps/common/main/resources/img/controls/warning.svg create mode 100644 apps/common/main/resources/img/controls/warnings2.svg diff --git a/apps/common/main/resources/img/controls/attention.svg b/apps/common/main/resources/img/controls/attention.svg deleted file mode 100644 index 67e0988f5..000000000 --- a/apps/common/main/resources/img/controls/attention.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/common/main/resources/img/controls/done.svg b/apps/common/main/resources/img/controls/done.svg deleted file mode 100644 index 1957986fb..000000000 --- a/apps/common/main/resources/img/controls/done.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/common/main/resources/img/controls/info.svg b/apps/common/main/resources/img/controls/info.svg deleted file mode 100644 index 91b23c137..000000000 --- a/apps/common/main/resources/img/controls/info.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/common/main/resources/img/controls/warning.svg b/apps/common/main/resources/img/controls/warning.svg deleted file mode 100644 index 87caf23a4..000000000 --- a/apps/common/main/resources/img/controls/warning.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/common/main/resources/img/controls/warnings2.svg b/apps/common/main/resources/img/controls/warnings2.svg new file mode 100644 index 000000000..0451e7eea --- /dev/null +++ b/apps/common/main/resources/img/controls/warnings2.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 242e55b04..12e9ec683 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -84,7 +84,6 @@ &.warn { background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; - //background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 105px; } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 0b8b3d667..df3ee3075 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -173,7 +173,6 @@ .icon { &.warn { background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; - //background: url('../../../../common/main/resources/img/controls/attention.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 105px; } @@ -184,18 +183,15 @@ &.error { background: url('../../../../common/main/resources/img/controls/warnings.svg#warning') no-repeat center; - //background: url('../../../../common/main/resources/img/controls/warning.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 0; } &.info { background: url('../../../../common/main/resources/img/controls/warnings.svg#info') no-repeat center; - //background: url('../../../../common/main/resources/img/controls/info.svg') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 35px; } &.confirm { - //background: url('../../../../common/main/resources/img/controls/done.svg') no-repeat center; background: url('../../../../common/main/resources/img/controls/warnings.svg#done') no-repeat center; //background-position: @alerts-offset-x @alerts-offset-y - 70px; } From 9b6f9afe222b6762da1d51cefe950b65b1b0b8d8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 6 Aug 2021 13:55:26 +0300 Subject: [PATCH 005/129] [DE] Add application for filling forms --- apps/api/documents/api.js | 7 +- .../forms/resources/img/icon-menu-sprite.svg | 152 +++ .../resources/img/icon-social-sprite.svg | 1 + apps/common/forms/resources/img/logo.svg | 1 + .../common/forms/resources/img/next-field.png | Bin 0 -> 323 bytes .../forms/resources/img/previous-field.png | Bin 0 -> 323 bytes apps/common/forms/resources/less/common.less | 781 +++++++++++++ .../common/forms/resources/less/loadmask.less | 74 ++ apps/common/main/lib/core/keymaster.js | 2 +- .../app/controller/ApplicationController.js | 1029 +++++++++++++++++ .../forms/app/view/ApplicationView.js | 50 + apps/documenteditor/forms/app_dev.js | 155 +++ apps/documenteditor/forms/index.html | 265 +++++ apps/documenteditor/forms/locale/be.json | 31 + apps/documenteditor/forms/locale/bg.json | 30 + apps/documenteditor/forms/locale/ca.json | 44 + apps/documenteditor/forms/locale/cs.json | 29 + apps/documenteditor/forms/locale/da.json | 31 + apps/documenteditor/forms/locale/de.json | 44 + apps/documenteditor/forms/locale/el.json | 44 + apps/documenteditor/forms/locale/en.json | 45 + apps/documenteditor/forms/locale/es.json | 44 + apps/documenteditor/forms/locale/fr.json | 44 + apps/documenteditor/forms/locale/hu.json | 31 + apps/documenteditor/forms/locale/it.json | 40 + apps/documenteditor/forms/locale/ja.json | 31 + apps/documenteditor/forms/locale/ko.json | 30 + apps/documenteditor/forms/locale/lo.json | 40 + apps/documenteditor/forms/locale/lv.json | 22 + apps/documenteditor/forms/locale/nb.json | 19 + apps/documenteditor/forms/locale/nl.json | 44 + apps/documenteditor/forms/locale/pl.json | 31 + apps/documenteditor/forms/locale/pt.json | 44 + apps/documenteditor/forms/locale/ro.json | 44 + apps/documenteditor/forms/locale/ru.json | 44 + apps/documenteditor/forms/locale/sk.json | 31 + apps/documenteditor/forms/locale/sl.json | 40 + apps/documenteditor/forms/locale/sv.json | 31 + apps/documenteditor/forms/locale/tr.json | 38 + apps/documenteditor/forms/locale/uk.json | 30 + apps/documenteditor/forms/locale/vi.json | 22 + apps/documenteditor/forms/locale/zh.json | 44 + .../forms/resources/less/application.less | 2 + 43 files changed, 3556 insertions(+), 5 deletions(-) create mode 100644 apps/common/forms/resources/img/icon-menu-sprite.svg create mode 100644 apps/common/forms/resources/img/icon-social-sprite.svg create mode 100644 apps/common/forms/resources/img/logo.svg create mode 100644 apps/common/forms/resources/img/next-field.png create mode 100644 apps/common/forms/resources/img/previous-field.png create mode 100644 apps/common/forms/resources/less/common.less create mode 100644 apps/common/forms/resources/less/loadmask.less create mode 100644 apps/documenteditor/forms/app/controller/ApplicationController.js create mode 100644 apps/documenteditor/forms/app/view/ApplicationView.js create mode 100644 apps/documenteditor/forms/app_dev.js create mode 100644 apps/documenteditor/forms/index.html create mode 100644 apps/documenteditor/forms/locale/be.json create mode 100644 apps/documenteditor/forms/locale/bg.json create mode 100644 apps/documenteditor/forms/locale/ca.json create mode 100644 apps/documenteditor/forms/locale/cs.json create mode 100644 apps/documenteditor/forms/locale/da.json create mode 100644 apps/documenteditor/forms/locale/de.json create mode 100644 apps/documenteditor/forms/locale/el.json create mode 100644 apps/documenteditor/forms/locale/en.json create mode 100644 apps/documenteditor/forms/locale/es.json create mode 100644 apps/documenteditor/forms/locale/fr.json create mode 100644 apps/documenteditor/forms/locale/hu.json create mode 100644 apps/documenteditor/forms/locale/it.json create mode 100644 apps/documenteditor/forms/locale/ja.json create mode 100644 apps/documenteditor/forms/locale/ko.json create mode 100644 apps/documenteditor/forms/locale/lo.json create mode 100644 apps/documenteditor/forms/locale/lv.json create mode 100644 apps/documenteditor/forms/locale/nb.json create mode 100644 apps/documenteditor/forms/locale/nl.json create mode 100644 apps/documenteditor/forms/locale/pl.json create mode 100644 apps/documenteditor/forms/locale/pt.json create mode 100644 apps/documenteditor/forms/locale/ro.json create mode 100644 apps/documenteditor/forms/locale/ru.json create mode 100644 apps/documenteditor/forms/locale/sk.json create mode 100644 apps/documenteditor/forms/locale/sl.json create mode 100644 apps/documenteditor/forms/locale/sv.json create mode 100644 apps/documenteditor/forms/locale/tr.json create mode 100644 apps/documenteditor/forms/locale/uk.json create mode 100644 apps/documenteditor/forms/locale/vi.json create mode 100644 apps/documenteditor/forms/locale/zh.json create mode 100644 apps/documenteditor/forms/resources/less/application.less diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 6154a0c5e..fb6853fd5 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -872,10 +872,9 @@ path += app + "/"; path += (config.type === "mobile" || isSafari_mobile) ? "mobile" - : (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && - (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view')) - ? "embed" - : "main"; + : (config.type === "embedded") ? "embed" + : (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && + (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view') ? "forms" : "main"; var index = "/index.html"; if (config.editorConfig) { diff --git a/apps/common/forms/resources/img/icon-menu-sprite.svg b/apps/common/forms/resources/img/icon-menu-sprite.svg new file mode 100644 index 000000000..97b51fd3e --- /dev/null +++ b/apps/common/forms/resources/img/icon-menu-sprite.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/common/forms/resources/img/icon-social-sprite.svg b/apps/common/forms/resources/img/icon-social-sprite.svg new file mode 100644 index 000000000..500662ae7 --- /dev/null +++ b/apps/common/forms/resources/img/icon-social-sprite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/forms/resources/img/logo.svg b/apps/common/forms/resources/img/logo.svg new file mode 100644 index 000000000..0d3cb18e7 --- /dev/null +++ b/apps/common/forms/resources/img/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/common/forms/resources/img/next-field.png b/apps/common/forms/resources/img/next-field.png new file mode 100644 index 0000000000000000000000000000000000000000..ee043c87821f62d56be8c8fee0602c00486bb31b GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^7C z9OUlAu=X{Nfl8?MbtTeT}odeyI7+ly_hYCqXKGuyo_ zKJcLB!G7T;dPCAAC=nVgB=#KJOJMR|t5 zpFHD1os;txG)yR&vtYxddDa>RURLiFRCi8yeP12EZvCWPlU?W61V-6 SKfN31M+Q$ z9OUlAu6F7R)Lt=yzi2M$G+dd>JZ1*)DB#_Hb`Pt7)d=)C3Jmz07J*>k1+ z^tj|=MfNnYzqztI`5wpF%4v6JY&f$?&}`L#KQ$p~k2sif9S@~H@Gn0-Ta-QQ>5e;B zD`z#eyf0#re!1ZOG-U}7ZlRh}XJ?+3x0tG(ZTgvGSMiJLT#0jwW*7OE3cif|!Y9vc zC1v!+;lpp2**5lpyoXr5-%0-Pl}kR-p9X>T#)66)&zx Sxoigdk-^i|&t;ucLK6Uyr+q8{ literal 0 HcmV?d00001 diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less new file mode 100644 index 000000000..a1f29bb12 --- /dev/null +++ b/apps/common/forms/resources/less/common.less @@ -0,0 +1,781 @@ +// Core variables and mixins +@import "../../../../../vendor/bootstrap/less/variables.less"; + +@icon-font-path: "../../../../../vendor/bootstrap/dist/fonts/"; + +@import "../../../../../vendor/bootstrap/less/mixins.less"; + +// Reset +@import "../../../../../vendor/bootstrap/less/normalize.less"; +@import "../../../../../vendor/bootstrap/less/print.less"; + +// Core CSS +@import "../../../../../vendor/bootstrap/less/scaffolding.less"; +@import "../../../../../vendor/bootstrap/less/type.less"; +//@import "code.less"; +//@import "grid.less"; +//@import "tables.less"; +@import "../../../../../vendor/bootstrap/less/forms.less"; +@import "../../../../../vendor/bootstrap/less/buttons.less"; + +// Components +@import "../../../../../vendor/bootstrap/less/component-animations.less"; +//@import "../../../../../vendor/bootstrap/less/glyphicons.less"; +//@import "dropdowns.less"; +//@import "button-groups.less"; +//@import "input-groups.less"; +//@import "navs.less"; +//@import "navbar.less"; +//@import "breadcrumbs.less"; +//@import "pagination.less"; +//@import "pager.less"; +@import "../../../../../vendor/bootstrap/less/labels.less"; +//@import "badges.less"; +//@import "jumbotron.less"; +//@import "thumbnails.less"; +@import "../../../../../vendor/bootstrap/less/alerts.less"; +//@import "progress-bars.less"; +//@import "media.less"; +//@import "list-group.less"; +//@import "panels.less"; +//@import "wells.less"; +@import "../../../../../vendor/bootstrap/less/close.less"; + +// Components w/ JavaScript +@import "../../../../../vendor/bootstrap/less/modals.less"; +@import "../../../../../vendor/bootstrap/less/tooltip.less"; +//@import "../../../../../vendor/bootstrap/less/popovers.less"; +@import "../../../../../vendor/bootstrap/less/dropdowns.less"; +//@import "carousel.less"; + +// Utility classes +@import "../../../../../vendor/bootstrap/less/utilities.less"; +@import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; + + +@import "loadmask.less"; + +@toolbarBorderColor: #dbdbdb; +@toolbarBorderShadowColor: #FAFAFA; +@toolbarTopColor: #F7F7F7; +@toolbarBottomColor: #CCCCCC; +@toolbarHoverColor: #7698DE; +@toolbarFontSize: 12px; +@buttonFontSize: 11px; +@controlBtnHoverTopColor: #6180C4; +@controlBtnHoverBottomColor: #8AACF1; +@btnColor: #d8dadc; +@btnActiveColor: #7d858c; +@btnColored: #446995; +@btnActiveColored: #293F59; +@btnHoverColored: #375478; +@notificationColor: #fcfed7; + +@iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; +@icon-socnet-size: 40px; + +.input-xs { + .input-size(@input-height-small - 8px; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); +} + +.embed-body { + -moz-user-select: -moz-none; + -khtml-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; + user-select: none; + + font-size: @toolbarFontSize; + overflow: hidden; +} + +// Document Viewer +// ------------------------- +.viewer { + position: absolute; + margin: 0; + padding: 0; + left: 0; + right: 0; + + &.top { + top: 48px; + bottom: 0; + } + + &.bottom { + top: 0; + bottom: 46px; + } +} + +// Toolbar +// ------------------------- +.toolbar { + position: fixed; + font-size: @toolbarFontSize; + min-width: 340px; + z-index: 100; + background-color: @toolbarTopColor; + + display: flex; + align-items: center; + white-space: nowrap; + + &.top { + top: 0; + left: 0; + width: 100%; + height: 48px; + + -webkit-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor; + //-moz-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor; + box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor; + } + + &.bottom { + bottom: 0; + left: 0; + width: 100%; + height: 46px; + + -webkit-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor; + //-moz-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor; + box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor; + } + + .group { + margin: 0; + padding: 0; + + .item { + input { + display: inline-block; + width: 35px; + padding: 0; + text-align: right; + } + + .text { + cursor: default; + } + } + + &.left { + left: 0; + padding-left: 10px; + + .item { + float: left; + } + + & > div { + display: inline-block; + vertical-align: middle; + } + } + + &.right { + right: 0; + padding-right: 10px; + + .item { + display: inline-block; + } + } + + &.center { + display: flex; + justify-content: center; + flex-grow: 1; + overflow: hidden; + padding: 0 20px; + + #title-doc-name { + overflow: hidden; + text-overflow: ellipsis; + } + } + + .separator { + height: 22px; + margin: 0 9px; + border-right: 1px solid @toolbarBorderShadowColor; + border-left: 1px solid @toolbarBorderColor; + } + } + + .close { + font-size: 28px; + font-family: Arial, sans-serif; + color: #666666; + opacity: 0.8; + display: block; + line-height: 22px; + + &:hover { + opacity: 1; + color: #666666; + } + } + + .margin-right-small { + margin-right: 8px; + } + .margin-right-large { + margin-right: 12px; + } +} + +// Logo +// ------------------------- +.brand-logo { + display: block; + width: 100px; + height: 24px; + background: data-uri('../../../../common/forms/resources/img/logo.svg') no-repeat; +} + +// Control buttons +// ------------------------- +.control-btn { + display: inline-block; + vertical-align: middle; + cursor: pointer; + background-color: transparent; + border: 1px solid transparent; + border-radius: 2px; + + width: 22px; + height: 22px; + background-origin: content-box; + padding: 0 1px; + font-size: @buttonFontSize; + + &.has-caption { + width: auto; + padding-right: 5px; + } + + &.colored { + padding: 0 16px; + height: 28px; + background-color: @btnColored; + border-radius: 3px; + color: #ffffff; + font-weight: 700; + } + + // Hover state + &:hover:not(:disabled) { + text-decoration: none; + background-color: @btnColor; + + &.colored { + background-color: @btnHoverColored; + } + } + + &:active:not(:disabled) { + &, .btn-icon { + background-position-y: -@icon-height !important; + } + + &.has-caption { + color: #ffffff + } + + &.colored { + background-color: @btnActiveColored; + } + } + +// Focus state for keyboard and accessibility + &:focus { + .tab-focus(); + outline: none; + } + +// Active state + &.active:not(:disabled), + &:active:not(:disabled) { + outline: none; + border: 1px solid @btnActiveColor; + background-color: @btnActiveColor; + } + + &[disabled] { + opacity: 0.4; + } +} + +// Overlay control +// ------------------------- +.overlay-controls { + position: absolute; + bottom: 55px; + z-index: 10; + left: 50%; + + ul { + padding: 0; + list-style-type: none; + margin: 0 auto; + + li { + display: inline-block; + + &:first-child { + margin-right: 5px; + } + + &:last-child { + margin-left: 5px; + } + } + } + + .overlay { + width: 32px; + height: 32px; + + display: inline-block; + cursor: pointer; + background-color: black; + border: 5px solid black; + border-radius: 50%; + outline: none; + opacity: 0.3; + + background-origin: content-box; + padding: 1px 0 0 1px; + + -webkit-box-shadow: 0 0 0 2px rgba(255,255,255,0.3); + -moz-box-shadow: 0 0 0 2px rgba(255,255,255,0.3); + box-shadow: 0 0 0 2px rgba(255,255,255,0.3); + + &:hover { + opacity: .6; + } + + &.active, &:active { + opacity: .8; + } + } +} + +// Error mask +// ------------------------- +.errormask { + position: absolute; + left: 0; + top: 0; + height: 100%; + width: 100%; + overflow: hidden; + border: none; + background-color: #f4f4f4; + z-index: 30002; + + .error-body { + position: relative; + top: 40%; + width: 400px; + margin: 0 auto; + padding: 20px; + background-color: #FFFFFF; + border: 1px solid #C0C0C0; + + .title { + font-weight: bold; + font-size: 1.6em; + padding-bottom: 10px; + } + } +} + +// Modals +// ------------------------- +.modal { + .modal-header { + //padding: 5px 15px; + } + + .modal-footer { + //border-top: none; + } + + //&.in .modal-dialog { .translate(0, 100%)} +} + +.share-buttons { + ul { + width: 244px; + //height: 25px; + list-style-type: none; + margin: 5px 0 0; + overflow: hidden; + + li { + display: inline-block; + float: left; + margin: 1px 5px 0 0; + vertical-align: middle; + + &.share-mail { + float: right; + padding-right: 1px; + margin: 0; + + a { + min-width: 64px; + } + + .glyphicon { + margin-right: 4px; + } + } + + &.share-twitter { + max-width: 93px; + } + } + } +} + +.size-manual { + margin-bottom: 10px; + + .right { + float: right; + } + + .caption { + margin-top: 2px; + margin-right: 8px; + } + + input { + display: inline-block; + font-size: 1em; + padding: 0 4px; + //border-radius: 0; + margin: 0; + margin-top: -1px; + + &.input-xs { + width: 50px; + } + } +} + +.socnet-btn(@index) { + background-position: -@icon-socnet-size*@index 0; + + &:hover { + background-position: -@icon-socnet-size*@index -@icon-socnet-size; + } +} + +.svg { + background: data-uri('../../../../common/forms/resources/img/icon-social-sprite.svg'); + + width: 40px; + height: 40px; + background-size: @icon-socnet-size*4 @icon-socnet-size*2; + + &.big-facebook:hover { + background-position: 0 -@icon-socnet-size; + } + + &.big-twitter { .socnet-btn(1); } + &.big-gplus { .socnet-btn(2); } + &.big-email { .socnet-btn(3); } +} + +@icon-width: 20px; +@icon-height: 20px; +.svg-icon { + background: data-uri('../../../../common/forms/resources/img/icon-menu-sprite.svg') no-repeat; + background-size: @icon-width*19 @icon-height*2; + + &.download { + background-position: -@icon-width 0; + } + &.share { + background-position: -@icon-width*2 0; + } + &.embed { + background-position: -@icon-width*3 0; + } + &.fullscr { + background-position: -@icon-width*4 0; + } + &.zoom-up { + background-position: -@icon-width*5 -@icon-height; + } + &.zoom-down { + background-position: -@icon-width*6 -@icon-height; + } + &.slide-prev { + background-position: -@icon-width*7 -@icon-height; + } + &.slide-next { + background-position: -@icon-width*8 -@icon-height; + } + + &.play { + background-position: -@icon-width*9 -@icon-height; + } + + &.pause { + background-position: -@icon-width*10 -@icon-height; + } + + &.print { + background-position: -@icon-width*11 0; + } + + &.arrow-up { + background-position: -@icon-width*17 0; + } + &.arrow-down { + background-position: -@icon-width*16 0; + } + &.clear-style { + background-position: -@icon-width*12 0; + } + &.go-to-location { + background-position: -@icon-width*15 0; + } + &.more-vertical { + background-position: -@icon-width*14 0; + } +} + +.mi-icon { + width: @icon-width; + height: @icon-height; + float: left; + margin: -3px 4px 0 -24px; +} +.btn-icon { + width: 22px; + height: 22px; + display: inline-block; + vertical-align: middle; +} + +.btn, button { + &:focus, &:active:focus { + outline: 0 none; + } + + background-color: @btnColor; +} + +.modal-dialog { + margin-top: 100px; + .share-buttons { + height: 40px; + text-align: center; + + span { + display: inline-block; + margin: 0 7px; + cursor: pointer; + } + } + + .share-link { + margin: 0 0 15px 0; + } +} + +.modal-header { + padding-bottom: 10px; + text-align: center; + + .close { + margin-top: 0; + opacity: 0.5; + + &:hover { + opacity: 0.7; + } + } +} + +.modal-body { + padding: 20px; +} + +.modal-footer { + text-align: center; +} + +#dlg-share, #dlg-embed { + .modal-dialog { + width: 330px; + } + + textarea { + width: 288px; + resize: none; + cursor: auto; + font-size: 1em; + border-radius: 0; + } +} + +.dropdown-menu { + > li > a { + padding: 8px 20px 8px 28px; + &:hover, &:focus { + background-color: @btnColor; + outline: 0 none; + } + font-size: @buttonFontSize; + } + + .divider { + margin: 4px 0; + } +} + +.dropdown { + &.open { + > button { + background-color: @btnActiveColor !important; + background-position: -@icon-width*14 -@icon-height; + } + } +} + +#box-tools { + display: inline-block; + a { + cursor: pointer; + } +} + +.masked { + background-color: transparent; + border-color: transparent; + -webkit-box-shadow: none; + box-shadow: none; +} + +#pages { + cursor: pointer; + display: inline-block; + line-height: 22px; + padding: 0 0 0 3px; +} + +#page-number { + &.masked { + cursor: pointer; + } +} + +.tooltip { + .tooltip-inner { + background-color: #fff; + border: 1px solid rgba(0,0,0,0.15); + color: #333; + font-weight: bold; + font-size: 11px; + box-shadow: 0 6px 12px rgba(0,0,0,0.175); + + padding: 5px 12px; + white-space: pre-wrap; + text-align: left; + word-wrap: break-word; + } + + .tooltip-arrow { + display: none; + } +} + +.form-control { + &:focus { + -webkit-box-shadow: none; + box-shadow: none; + } +} + +.submit-tooltip { + position: absolute; + z-index: 1000; + top: 58px; + right: 15px; + + padding: 7px 15px; + border-radius: 5px; + background-color: @notificationColor; + -webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); + box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); + font-size: 11px; +} + +.required-tooltip { + position: absolute; + z-index: 1000; + + padding: 15px; + border-radius: 5px; + background-color: @btnColored; + color: #fff; + -webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); + box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); + font-size: 11px; + + &.bottom-left { + border-top-right-radius: 0; + margin: 15px 0 0 0; + + .tip-arrow { + position: absolute; + overflow: hidden; + right: 0; + top: -15px; + width: 15px; + height: 15px; + .box-shadow(8px 5px 8px -5px rgba(0, 0, 0, 0.2)); + + &:after { + content: ''; + position: absolute; + top: 8px; + left: 8px; + background-color: @btnColored; + width: 15px; + height: 15px; + + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -webkit-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2)); + } + } + } + .close-div { + display: inline-block; + border: 1px solid #fff; + border-radius: 2px; + padding: 3px 12px; + margin-top: 10px; + } +} + +.tooltip { + .tooltip-inner { + .toolbar & { + font-weight: normal; + } + } +} \ No newline at end of file diff --git a/apps/common/forms/resources/less/loadmask.less b/apps/common/forms/resources/less/loadmask.less new file mode 100644 index 000000000..26d068654 --- /dev/null +++ b/apps/common/forms/resources/less/loadmask.less @@ -0,0 +1,74 @@ +@loadmask-zindex: 10000; +@loadmask-image-height: 28px; +@loadmask-image-width: 28px; +@loadmask-small-image-height: 20px; +@loadmask-small-image-width: 20px; +@background-loader-ie: fade(#000, 65%); +@background-loader: fade(#181818, 90%); +@text-contrast-background-ie: #fff; +@text-contrast-background: #fff; + +.asc-loadmask { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + zoom: 1; + background-color: transparent; + z-index: @loadmask-zindex; +} + +.asc-loadmask-body { + position: absolute; + z-index: @loadmask-zindex + 1; + padding: 24px; + line-height: @loadmask-image-height; + border: none; + background-image: none; + background-color: @background-loader-ie; + background-color: @background-loader; + color: @text-contrast-background-ie; + color: @text-contrast-background; + border-radius: 6px; + + left: 50%; + top: 50%; + transform: translate(-50%); + + & > div { + display: inline-block; + vertical-align: middle; + } + + .asc-loadmask-image { + background-image: ~"url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOCAyOCI+PGNpcmNsZSBjeD0iMTQiIGN5PSIxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iMTAuMjUiIHN0cm9rZS1kYXNoYXJyYXk9IjE2MCUsIDQwJSIgLz48L3N2Zz4=)"; + height: 28px; + width: 28px; + float: left; + margin-left: 8px; + } + + .asc-loadmask-title { + font-size: 13px; + margin: 0 8px 0 12px; + white-space: pre-wrap; + } +} + +@keyframes rotation { + from { + transform: rotate(0); + } + + to { + transform: rotate(360deg); + } +} + +#loadmask-spinner { + animation-duration: .8s; + animation-name: rotation; + animation-iteration-count: infinite; + animation-timing-function: linear; +} diff --git a/apps/common/main/lib/core/keymaster.js b/apps/common/main/lib/core/keymaster.js index eeac761eb..29a5b1502 100644 --- a/apps/common/main/lib/core/keymaster.js +++ b/apps/common/main/lib/core/keymaster.js @@ -71,7 +71,7 @@ var key, handler, k, i, modifiersMatch, scope; key = event.keyCode; - if (Common.UI.HintManager.isHintVisible()) { + if (Common.UI.HintManager && Common.UI.HintManager.isHintVisible()) { if (key === 112) { Common.UI.HintManager.clearHints(); } else if (key !== 27) { diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js new file mode 100644 index 000000000..262c8c9fd --- /dev/null +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -0,0 +1,1029 @@ +define([ + 'core', + 'irregularstack', + 'gateway', + 'common/main/lib/component/Window', + 'common/main/lib/component/LoadMask', + 'common/main/lib/component/Tooltip', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/Shortcuts', + 'documenteditor/forms/app/view/ApplicationView' +], function (Viewport) { + 'use strict'; + + var LoadingDocument = -256, + maxPages = 0, + labelDocName, + btnSubmit, + _submitFail, $submitedTooltip, $requiredTooltip, + $ttEl, $tooltip; + + DE.Controllers.ApplicationController = Backbone.Controller.extend(_.assign({ + views: [ + 'ApplicationView' + ], + + initialize: function() { + var me = this, + styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', + 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text', + 'Caption', 'endnote text'], + translate = { + 'Series': this.txtSeries, + 'Diagram Title': this.txtDiagramTitle, + 'X Axis': this.txtXAxis, + 'Y Axis': this.txtYAxis, + 'Your text here': this.txtArt, + "Error! Bookmark not defined.": this.txtBookmarkError, + "above": this.txtAbove, + "below": this.txtBelow, + "on page ": this.txtOnPage + " ", + "Header": this.txtHeader, + "Footer": this.txtFooter, + " -Section ": " " + this.txtSection + " ", + "First Page ": this.txtFirstPage + " ", + "Even Page ": this.txtEvenPage + " ", + "Odd Page ": this.txtOddPage + " ", + "Same as Previous": this.txtSameAsPrev, + "Current Document": this.txtCurrentDocument, + "No table of contents entries found.": this.txtNoTableOfContents, + "Table of Contents": this.txtTableOfContents, + "Syntax Error": this.txtSyntaxError, + "Missing Operator": this.txtMissOperator, + "Missing Argument": this.txtMissArg, + "Number Too Large To Format": this.txtTooLarge, + "Zero Divide": this.txtZeroDivide, + "Is Not In Table": this.txtNotInTable, + "Index Too Large": this.txtIndTooLarge, + "The Formula Not In Table": this.txtFormulaNotInTable, + "Table Index Cannot be Zero": this.txtTableInd, + "Undefined Bookmark": this.txtUndefBookmark, + "Unexpected End of Formula": this.txtEndOfFormula, + "Hyperlink": this.txtHyperlink, + "Error! Main Document Only.": this.txtMainDocOnly, + "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark, + "Error! No text of specified style in document.": this.txtNoText, + "Choose an item": this.txtChoose, + "Enter a date": this.txtEnterDate, + "Type equation here": this.txtTypeEquation, + "Click to load image": this.txtClickToLoad, + "None": this.txtNone, + "No table of figures entries found.": this.txtNoTableOfFigures, + "table of figures": this.txtTableOfFigures, + "TOC Heading": this.txtTOCHeading + }; + styleNames.forEach(function(item){ + translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; + }); + me.translationTable = translate; + }, + + onLaunch: function() { + if (!Common.Utils.isBrowserSupported()){ + Common.Utils.showBrowserRestriction(); + Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText); + return; + } + + this.stackLongActions = new Common.IrregularStack({ + strongCompare : function(obj1, obj2){return obj1.id === obj2.id && obj1.type === obj2.type;}, + weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} + }); + + this._state = {isDisconnected: false, licenseType: false}; + + this.view = this.createView('ApplicationView').render(); + + window["flat_desine"] = true; + this.api = new Asc.asc_docs_api({ + 'id-view' : 'editor_sdk', + 'embedded' : true + // , + // 'translate': this.translationTable + }); + + $(window).on('resize', this.onDocumentResize.bind(this)); + + this.boxSdk = $('#editor_sdk'); + // this.boxSdk.css('border-left', 'none'); + this.boxSdk.on('click', function(e) { + if ( e.target.localName == 'canvas' ) { + e.currentTarget.focus(); + } + }); + + this.editorConfig = {}; + this.embedConfig = {}; + this.appOptions = {}; + + if (this.api){ + this.api.asc_registerCallback('asc_onError', this.onError.bind(this)); + this.api.asc_registerCallback('asc_onDocumentContentReady', this.onDocumentContentReady.bind(this)); + this.api.asc_registerCallback('asc_onOpenDocumentProgress', this.onOpenDocument.bind(this)); + this.api.asc_registerCallback('asc_onDocumentUpdateVersion', this.onUpdateVersion.bind(this)); + this.api.asc_registerCallback('asc_onServerVersion', this.onServerVersion.bind(this)); + + this.api.asc_registerCallback('asc_onCountPages', this.onCountPages.bind(this)); + this.api.asc_registerCallback('asc_onCurrentPage', this.onCurrentPage.bind(this)); + + // Initialize api gateway + Common.Gateway.on('init', this.loadConfig.bind(this)); + Common.Gateway.on('opendocument', this.loadDocument.bind(this)); + Common.Gateway.on('showmessage', this.onExternalMessage.bind(this)); + Common.Gateway.appReady(); + } + + var me = this; + Common.NotificationCenter.on({ + 'modal:show': function(){ + Common.Utils.ModalWindow.show(); + me.api.asc_enableKeyEvents(false); + }, + 'modal:close': function(dlg) { + Common.Utils.ModalWindow.close(); + if (!Common.Utils.ModalWindow.isVisible()) + me.api.asc_enableKeyEvents(true); + }, + 'modal:hide': function(dlg) { + Common.Utils.ModalWindow.close(); + if (!Common.Utils.ModalWindow.isVisible()) + me.api.asc_enableKeyEvents(true); + }, + 'dataview:blur': function(e){ + if (!Common.Utils.ModalWindow.isVisible()) { + me.api.asc_enableKeyEvents(true); + } + }, + 'menu:hide': function(e, isFromInputControl){ + if (!Common.Utils.ModalWindow.isVisible() && !isFromInputControl) + me.api.asc_enableKeyEvents(true); + } + }); + + $(document.body).on('blur', 'input, textarea', function(e) { + if (!Common.Utils.ModalWindow.isVisible()) { + if (!/area_id/.test(e.target.id) ) { + me.api.asc_enableKeyEvents(true); + } + } + }); + + window.onbeforeunload = _.bind(this.onBeforeUnload, this); + }, + + onDocumentResize: function() { + this.api && this.api.Resize(); + }, + + onBeforeUnload: function() { + Common.localStorage.save(); + }, + + onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + this.showTips([this.scriptLoadError]); + this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); + return; + } + + this.hidePreloader(); + this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + + var config = { + closable: true + }; + + switch (id) + { + case Asc.c_oAscError.ID.Unknown: + config.msg = this.unknownErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationTimeout: + config.msg = this.convertationTimeoutText; + break; + + case Asc.c_oAscError.ID.ConvertationError: + config.msg = this.convertationErrorText; + break; + + case Asc.c_oAscError.ID.DownloadError: + config.msg = this.downloadErrorText; + break; + + case Asc.c_oAscError.ID.ConvertationPassword: + config.msg = this.errorFilePassProtect; + break; + + case Asc.c_oAscError.ID.UserDrop: + config.msg = this.errorUserDrop; + break; + + case Asc.c_oAscError.ID.ConvertationOpenLimitError: + config.msg = this.errorFileSizeExceed; + break; + + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + + case Asc.c_oAscError.ID.AccessDeny: + config.msg = this.errorAccessDeny; + break; + + case Asc.c_oAscError.ID.Submit: + config.msg = this.errorSubmit; + // _submitFail = true; + // $submitedTooltip && $submitedTooltip.hide(); + break; + + case Asc.c_oAscError.ID.EditingError: + config.msg = this.errorEditingDownloadas; + break; + + case Asc.c_oAscError.ID.ForceSaveButton: + case Asc.c_oAscError.ID.ForceSaveTimeout: + config.msg = this.errorForceSave; + break; + + default: + config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); + break; + } + + if (level == Asc.c_oAscError.Level.Critical) { + + // report only critical errors + Common.Gateway.reportError(id, config.msg); + + config.title = this.criticalErrorTitle; + config.iconCls = 'error'; + config.closable = false; + config.callback = _.bind(function(btn){ + window.location.reload(); + }, this); + + if (id == Asc.c_oAscError.ID.DataEncrypted) { + this.api.asc_coAuthoringDisconnect(); + Common.NotificationCenter.trigger('api:disconnect'); + } + } + else { + Common.Gateway.reportWarning(id, config.msg); + + config.title = this.notcriticalErrorTitle; + config.iconCls = 'warn'; + config.buttons = ['ok']; + config.callback = _.bind(function(btn){ + if (id == Asc.c_oAscError.ID.EditingError) { + this.disableEditing(true); + Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print + } + this.onEditComplete(); + }, this); + } + + 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()); + }, + + hidePreloader: function() { + (new Promise(function(resolve, reject) { + resolve(); + })).then(function() { + $('#loading-mask').hide().remove(); + }); + }, + + onOpenDocument: function(progress) { + var elem = document.getElementById('loadmask-text'); + var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); + proc = this.textLoadingDocument + ': ' + Common.Utils.String.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + "%"; + elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); + }, + + onCountPages: function(count) { + maxPages = count; + $('#pages').text(this.textOf + " " + count); + }, + + onCurrentPage: function(number) { + $('#page-number').val(number + 1); + }, + + loadConfig: function(data) { + this.editorConfig = $.extend(this.editorConfig, data.config); + this.embedConfig = $.extend(this.embedConfig, data.config.embedded); + + // common.controller.modals.init(this.embedConfig); + + // Docked toolbar + if (this.embedConfig.toolbarDocked === 'bottom') { + $('#toolbar').addClass('bottom'); + this.boxSdk.addClass('bottom'); + $('#box-tools').removeClass('dropdown').addClass('dropup'); + // ttOffset[1] = -40; + } else { + $('#toolbar').addClass('top'); + this.boxSdk.addClass('top'); + } + + this.appOptions.customization = this.editorConfig.customization; + this.appOptions.canRenameAnonymous = !((typeof (this.appOptions.customization) == 'object') && (typeof (this.appOptions.customization.anonymous) == 'object') && (this.appOptions.customization.anonymous.request===false)); + this.appOptions.guestName = (typeof (this.appOptions.customization) == 'object') && (typeof (this.appOptions.customization.anonymous) == 'object') && + (typeof (this.appOptions.customization.anonymous.label) == 'string') && this.appOptions.customization.anonymous.label.trim()!=='' ? + Common.Utils.String.htmlEncode(this.appOptions.customization.anonymous.label) : this.textGuest; + var value; + if (this.appOptions.canRenameAnonymous) { + value = Common.localStorage.getItem("guest-username"); + Common.Utils.InternalSettings.set("guest-username", value); + Common.Utils.InternalSettings.set("save-guest-username", !!value); + } + this.editorConfig.user = + this.appOptions.user = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.appOptions.guestName + ')' ) : this.textAnonymous, + Common.localStorage.getItem("guest-id") || ('uid-' + Date.now())); + this.appOptions.user.anonymous && Common.localStorage.setItem("guest-id", this.appOptions.user.id); + + this.appOptions.canRequestClose = this.editorConfig.canRequestClose; + this.appOptions.canBackToFolder = (this.editorConfig.canBackToFolder!==false) && (typeof (this.editorConfig.customization) == 'object') && (typeof (this.editorConfig.customization.goback) == 'object') + && (!_.isEmpty(this.editorConfig.customization.goback.url) || this.editorConfig.customization.goback.requestClose && this.appOptions.canRequestClose); + }, + + onExternalMessage: function(msg) { + if (msg && msg.msg) { + msg.msg = (msg.msg).toString(); + this.showTips([msg.msg.charAt(0).toUpperCase() + msg.msg.substring(1)]); + + Common.component.Analytics.trackEvent('External Error'); + } + }, + + showTips: function(strings) { + var me = this; + if (!strings.length) return; + if (typeof(strings)!='object') strings = [strings]; + + function showNextTip() { + var str_tip = strings.shift(); + if (str_tip) { + str_tip += '\n' + me.textCloseTip; + tooltip.setTitle(str_tip); + tooltip.show(); + } + } + + if (!this.tooltip) { + this.tooltip = new Common.UI.Tooltip({ + owner: $('#toolbar'), + hideonclick: true, + placement: 'bottom', + cls: 'main-info', + offset: 30 + }); + } + + var tooltip = this.tooltip; + tooltip.on('tooltip:hide', function(){ + setTimeout(showNextTip, 300); + }); + + showNextTip(); + }, + + loadDocument: function(data) { + this.permissions = {}; + this.document = data.doc; + + var docInfo = {}; + + if (data.doc) { + this.permissions = $.extend(this.permissions, data.doc.permissions); + + var _permissions = $.extend({}, data.doc.permissions), + _options = $.extend({}, data.doc.options, this.editorConfig.actionLink || {}); + + var _user = new Asc.asc_CUserInfo(); + _user.put_Id(this.appOptions.user.id); + _user.put_FullName(this.appOptions.user.fullname); + _user.put_IsAnonymousUser(!!this.appOptions.user.anonymous); + + docInfo = new Asc.asc_CDocInfo(); + docInfo.put_Id(data.doc.key); + docInfo.put_Url(data.doc.url); + docInfo.put_Title(data.doc.title); + docInfo.put_Format(data.doc.fileType); + docInfo.put_VKey(data.doc.vkey); + docInfo.put_Options(_options); + docInfo.put_UserInfo(_user); + docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); + docInfo.put_Token(data.doc.token); + docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); + + var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); + docInfo.asc_putIsEnabledMacroses(!!enable); + enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false); + docInfo.asc_putIsEnabledPlugins(!!enable); + + var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType); + if (type && typeof type[1] === 'string') { + this.permissions.edit = this.permissions.review = false; + } + } + + this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); + // this.api.asc_registerCallback('asc_onLicenseChanged', _.bind(this.onLicenseChanged, this)); + this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this)); + this.api.asc_setDocInfo(docInfo); + this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId); + this.api.asc_enableKeyEvents(true); + + Common.Analytics.trackEvent('Load', 'Start'); + + labelDocName = $('#title-doc-name'); + if (data.doc) { + labelDocName.text(data.doc.title || '') + } + }, + + onRunAutostartMacroses: function() { + if (!this.editorConfig.customization || (this.editorConfig.customization.macros!==false)) { + this.api.asc_runAutostartMacroses(); + } + }, + + onEditorPermissions: function(params) { + var licType = params.asc_getLicenseType(); + if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType || Asc.c_oLicenseResult.ExpiredTrial === licType) { + Common.UI.warning({ + title: this.titleLicenseExp, + msg: this.warnLicenseExp, + buttons: [], + closable: false + }); + return; + } + if (Asc.c_oLicenseResult.ExpiredLimited === licType) + this._state.licenseType = licType; + + if ( this.onServerVersion(params.asc_getBuildVersion())) return; + + if ( (licType === Asc.c_oLicenseResult.Success) && (typeof this.appOptions.customization == 'object') && + this.appOptions.customization && this.appOptions.customization.logo ) { + + var logo = $('#header-logo'); + if (this.appOptions.customization.logo.imageEmbedded) { + logo.html(''); + logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); + } + + if (this.appOptions.customization.logo.url) { + logo.attr('href', this.appOptions.customization.logo.url); + } + } + + this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review; + if (params.asc_getRights() !== Asc.c_oRights.Edit) + this.permissions.edit = this.permissions.review = false; + + this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); + this.appOptions.canSubmitForms = this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm; + this.appOptions.canFillForms = this.appOptions.canLicense && (this.permissions.fillForms===true) && (this.editorConfig.mode !== 'view'); + this.api.asc_setViewMode(!this.appOptions.canFillForms); + + var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType); + this.appOptions.canDownloadOrigin = this.permissions.download !== false && (type && typeof type[1] === 'string'); + this.appOptions.canDownload = this.permissions.download !== false && (!type || typeof type[1] !== 'string'); + this.appOptions.canPrint = (this.permissions.print !== false); + + this.appOptions.fileKey = this.document.key; + + AscCommon.UserInfoParser.setParser(true); + AscCommon.UserInfoParser.setCurrentName(this.appOptions.user.fullname); + + btnSubmit = $('#id-btn-submit'); + + if (!this.appOptions.canFillForms) { + $('#id-btn-prev-field').hide(); + $('#id-btn-next-field').hide(); + $('#id-btn-clear-fields').hide(); + btnSubmit.hide(); + } else { + $('#id-pages').hide(); + $('#id-btn-next-field .caption').text(this.textNext); + $('#id-btn-clear-fields .caption').text(this.textClear); + + var me = this; + $('#id-btn-prev-field').on('click', function(){ + me.api.asc_MoveToFillingForm(false); + }); + $('#id-btn-next-field').on('click', function(){ + me.api.asc_MoveToFillingForm(true); + }); + $('#id-btn-clear-fields').on('click', function(){ + me.api.asc_ClearAllSpecialForms(); + }); + + if (this.appOptions.canSubmitForms) { + btnSubmit.find('.caption').text(this.textSubmit); + btnSubmit.on('click', function(){ + me.api.asc_SendForm(); + }); + } else + btnSubmit.hide(); + + this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); + this.api.asc_SetFastCollaborative(true); + this.api.asc_setAutoSaveGap(1); + } + + var $parent = labelDocName.parent(); + var _left_width = $parent.position().left, + _right_width = $parent.next().outerWidth(); + + if ( _left_width < _right_width ) + $parent.css('padding-left', _right_width - _left_width); + else + $parent.css('padding-right', _left_width - _right_width); + + this.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + + this.api.asc_LoadDocument(); + this.api.Resize(); + }, + + onServerVersion: function(buildVersion) { + if (this.changeServerVersion) return true; + + if (DocsAPI.DocEditor.version() !== buildVersion && !window.compareVersions) { + this.changeServerVersion = true; + Common.UI.warning({ + title: this.titleServerVersion, + msg: this.errorServerVersion, + callback: function() { + _.defer(function() { + Common.Gateway.updateVersion(); + }) + } + }); + return true; + } + return false; + }, + + onUpdateVersion: function(callback) { + var me = this; + me.needToUpdateVersion = true; + me.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + Common.UI.warning({ + title: this.titleUpdateVersion, + msg: this.errorUpdateVersion, + callback: function() { + _.defer(function() { + Common.Gateway.updateVersion(); + if (callback) callback.call(me); + me.onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + }) + } + }); + }, + + onLongActionBegin: function(type, id) { + var action = {id: id, type: type}; + this.stackLongActions.push(action); + this.setLongActionView(action); + }, + + setLongActionView: function(action) { + var title = '', text = '', force = false; + + var text = ''; + switch (action.id) + { + case Asc.c_oAscAsyncAction['Print']: + text = this.downloadTextText; + break; + case Asc.c_oAscAsyncAction['Submit']: + _submitFail = false; + $submitedTooltip && $submitedTooltip.hide(); + btnSubmit.attr({disabled: true}); + btnSubmit.css("pointer-events", "none"); + break; + case LoadingDocument: + text = this.textLoadingDocument + ' '; + break; + default: + text = this.waitText; + break; + } + + if (action.type == Asc.c_oAscAsyncActionType['BlockInteraction']) { + if (!this.loadMask) + this.loadMask = new Common.UI.LoadMask({owner: $(document.body)}); + + this.loadMask.setTitle(text); + this.loadMask.show(); + } + }, + + onLongActionEnd: function(type, id){ + var action = {id: id, type: type}; + this.stackLongActions.pop(action); + + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information}); + action && this.setLongActionView(action); + action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.BlockInteraction}); + action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide(); + + if (id==Asc.c_oAscAsyncAction['Submit']) { + btnSubmit.removeAttr('disabled'); + btnSubmit.css("pointer-events", "auto"); + if (!_submitFail) { + if (!$submitedTooltip) { + $submitedTooltip = $(''); + $(document.body).append($submitedTooltip); + $submitedTooltip.on('click', function() {$submitedTooltip.hide();}); + } + $submitedTooltip.show(); + } + } + }, + + onDocMouseMoveStart: function() { + this.isHideBodyTip = true; + }, + + onDocMouseMoveEnd: function() { + if (this.isHideBodyTip) { + if ( $tooltip ) { + $tooltip.tooltip('hide'); + $tooltip = false; + } + } + }, + + onDocMouseMove: function(data) { + if (data) { + if (data.get_Type() == 1) { // hyperlink + this.isHideBodyTip = false; + + if ( !$ttEl ) { + $ttEl = $('.hyperlink-tooltip'); + $ttEl.tooltip({'container':'body', 'trigger':'manual'}); + $ttEl.on('shown.bs.tooltip', function(e) { + $tooltip = $ttEl.data('bs.tooltip').tip(); + + $tooltip.css({ + left: $ttEl.ttpos[0] + ttOffset[0], + top: $ttEl.ttpos[1] + ttOffset[1] + }); + + $tooltip.find('.tooltip-arrow').css({left: 10}); + }); + } + + if ( !$tooltip ) { + $ttEl.ttpos = [data.get_X(), data.get_Y()]; + $ttEl.tooltip('show'); + } else { + $tooltip.css({ + left:data.get_X() + ttOffset[0], + top:data.get_Y() + ttOffset[1] + }); + } + } + } + }, + + onDownloadUrl: function(url) { + Common.Gateway.downloadAs(url); + }, + + onPrint: function() { + if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; + + if (this.api) + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + Common.component.Analytics.trackEvent('Print'); + }, + + onPrintUrl: function(url) { + if (this.iframePrint) { + this.iframePrint.parentNode.removeChild(this.iframePrint); + this.iframePrint = null; + } + if (!this.iframePrint) { + var me = this; + this.iframePrint = document.createElement("iframe"); + this.iframePrint.id = "id-print-frame"; + this.iframePrint.style.display = 'none'; + this.iframePrint.style.visibility = "hidden"; + this.iframePrint.style.position = "fixed"; + this.iframePrint.style.right = "0"; + this.iframePrint.style.bottom = "0"; + document.body.appendChild(this.iframePrint); + this.iframePrint.onload = function() { + try { + me.iframePrint.contentWindow.focus(); + me.iframePrint.contentWindow.print(); + me.iframePrint.contentWindow.blur(); + window.focus(); + } catch (e) { + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + } + }; + } + if (url) this.iframePrint.src = url; + }, + + onFillRequiredFields: function(isFilled) { + if (isFilled) { + btnSubmit.removeAttr('disabled'); + btnSubmit.css("pointer-events", "auto"); + // $requiredTooltip && $requiredTooltip.hide(); + } else { + btnSubmit.attr({disabled: true}); + btnSubmit.css("pointer-events", "none"); + } + }, + + onProcessMouse: function(data) { + if (data.type == 'mouseup') { + var e = document.getElementById('editor_sdk'); + if (e) { + var r = e.getBoundingClientRect(); + this.api.OnMouseUp( + data.x - r.left, + data.y - r.top + ); + } + } + }, + + onRequestClose: function() { + Common.Gateway.requestClose(); + }, + + onDownloadAs: function() { + if ( !this.appOptions.canDownload && !this.appOptions.canDownloadOrigin ) { + Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny); + return; + } + var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType); + if (type && typeof type[1] === 'string') + this.api.asc_DownloadOrigin(true); + else + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX, true)); + }, + + onHyperlinkClick: function(url) { + if (url /*&& me.api.asc_getUrlType(url)>0*/) { + window.open(url); + } + }, + + onDocumentContentReady: function() { + var me = this; + + this.hidePreloader(); + this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + + var zf = (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -2); + (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); + + var dividers = $('#box-tools .divider'); + var itemsCount = $('#box-tools a').length; + + if (!this.appOptions.canPrint) { + $('#idt-print').hide(); + $(dividers[0]).hide(); + itemsCount--; + } + + if ( !this.embedConfig.saveUrl && !this.appOptions.canPrint || this.appOptions.canFillForms) { + $('#idt-download').hide(); + itemsCount--; + } + + if ( !this.appOptions.canFillForms || !this.appOptions.canDownload) { + $('#idt-download-docx').hide(); + $('#idt-download-pdf').hide(); + $(dividers[0]).hide(); + $(dividers[1]).hide(); + itemsCount -= 2; + } + + if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) { + $('#idt-share').hide(); + itemsCount--; + } + + if (!this.appOptions.canBackToFolder) { + $('#idt-close').hide(); + itemsCount--; + } + + if (itemsCount<3) + $(dividers[2]).hide(); + + if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) { + $('#idt-embed').hide(); + itemsCount--; + } + + if ( !this.embedConfig.fullscreenUrl ) { + $('#idt-fullscreen').hide(); + itemsCount--; + } + + // if ( !embedConfig.saveUrl && permissions.print === false && (!embedConfig.shareUrl || appOptions.canFillForms) && (!embedConfig.embedUrl || appOptions.canFillForms) && !embedConfig.fullscreenUrl && !config.canBackToFolder) + if (itemsCount<1) + $('#box-tools').addClass('hidden'); + else if ((!this.embedConfig.embedUrl || this.appOptions.canFillForms) && !this.embedConfig.fullscreenUrl) + $(dividers[2]).hide(); + + // common.controller.modals.attach({ + // share: '#idt-share', + // embed: '#idt-embed' + // }); + + this.api.asc_registerCallback('asc_onStartAction', _.bind(this.onLongActionBegin, this)); + this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this)); + this.api.asc_registerCallback('asc_onMouseMoveStart', _.bind(this.onDocMouseMoveStart, this)); + this.api.asc_registerCallback('asc_onMouseMoveEnd', _.bind(this.onDocMouseMoveEnd, this)); + this.api.asc_registerCallback('asc_onMouseMove', _.bind(this.onDocMouseMove, this)); + this.api.asc_registerCallback('asc_onHyperlinkClick', _.bind(this.onHyperlinkClick, this)); + this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); + this.api.asc_registerCallback('asc_onPrint', _.bind(this.onPrint, this)); + this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this)); + this.api.asc_registerCallback('sync_onAllRequiredFormsFilled', _.bind(this.onFillRequiredFields, this)); + + Common.Gateway.on('processmouse', _.bind(this.onProcessMouse, this)); + Common.Gateway.on('downloadas', _.bind(this.onDownloadAs, this)); + Common.Gateway.on('requestclose', _.bind(this.onRequestClose, this)); + + this.view.getTools('#idt-fullscreen') + .on('click', function(){ + me.onHyperlinkClick(me.embedConfig.fullscreenUrl); + }); + + this.view.getTools('#idt-download') + .on('click', function(){ + if ( !!me.embedConfig.saveUrl ){ + me.onHyperlinkClick(embedConfig.saveUrl); + } else + if (me.api && me.appOptions.canPrint){ + me.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + } + + Common.Analytics.trackEvent('Save'); + }); + + this.view.getTools('#idt-print') + .on('click', function(){ + me.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + Common.Analytics.trackEvent('Print'); + }); + + this.view.getTools('#idt-close') + .on('click', function(){ + if (me.appOptions.customization && me.appOptions.customization.goback) { + if (me.appOptions.customization.goback.requestClose && me.appOptions.canRequestClose) + Common.Gateway.requestClose(); + else if (me.appOptions.customization.goback.url) + window.parent.location.href = me.appOptions.customization.goback.url; + } + }); + + var downloadAs = function(format){ + me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + Common.Analytics.trackEvent('Save'); + }; + + this.view.getTools('#idt-download-docx') + .on('click', function(){ + downloadAs(Asc.c_oAscFileType.DOCX); + }); + this.view.getTools('#idt-download-pdf') + .on('click', function(){ + downloadAs(Asc.c_oAscFileType.PDF); + }); + + $('#id-btn-zoom-in').on('click', me.api.zoomIn.bind(me.api)); + $('#id-btn-zoom-out').on('click', me.api.zoomOut.bind(me.api)); + + var $pagenum = $('#page-number'); + $pagenum.on({ + 'keyup': function(e){ + if ( e.keyCode == 13 ){ + var newPage = parseInt($('#page-number').val()); + + if ( newPage > maxPages ) newPage = maxPages; + if (newPage < 2 || isNaN(newPage)) newPage = 1; + + me.api.goToPage(newPage-1); + $pagenum.blur(); + } + } + , 'focusin' : function(e) { + $pagenum.removeClass('masked'); + } + , 'focusout': function(e){ + !$pagenum.hasClass('masked') && $pagenum.addClass('masked'); + } + }); + + $('#pages').on('click', function(e) { + $pagenum.focus(); + }); + + // TODO: add asc_hasRequiredFields to sdk + + if (this.appOptions.canSubmitForms && !this.api.asc_IsAllRequiredFormsFilled()) { + var sgroup = $('#id-submit-group'); + btnSubmit.attr({disabled: true}); + btnSubmit.css("pointer-events", "none"); + if (!Common.localStorage.getItem("de-embed-hide-submittip")) { + var offset = btnSubmit.offset(); + $requiredTooltip = $(''); + $(document.body).append($requiredTooltip); + $requiredTooltip.css({top : offset.top + btnSubmit.height() + 'px', left: offset.left + btnSubmit.outerWidth()/2 - $requiredTooltip.outerWidth() + 'px'}); + $requiredTooltip.find('.close-div').on('click', function() { + $requiredTooltip.hide(); + me.api.asc_MoveToFillingForm(true, true, true); + Common.localStorage.setItem("de-embed-hide-submittip", 1); + sgroup.attr('data-toggle', 'tooltip'); + sgroup.tooltip({ + title : me.textRequired, + placement : 'bottom' + }); + }); + $requiredTooltip.show(); + } else { + sgroup.attr('data-toggle', 'tooltip'); + sgroup.tooltip({ + title : me.textRequired, + placement : 'bottom' + }); + } + } + + var documentMoveTimer; + var ismoved = false; + $(document).mousemove(function(event){ + $('#id-btn-zoom-in').fadeIn(); + $('#id-btn-zoom-out').fadeIn(); + + ismoved = true; + if ( !documentMoveTimer ) { + documentMoveTimer = setInterval(function(){ + if ( !ismoved ) { + $('#id-btn-zoom-in').fadeOut(); + $('#id-btn-zoom-out').fadeOut(); + clearInterval(documentMoveTimer); + documentMoveTimer = undefined; + } + + ismoved = false; + }, 2000); + } + }); + Common.Gateway.documentReady(); + Common.Analytics.trackEvent('Load', 'Complete'); + }, + + errorDefaultMessage : 'Error code: %1', + unknownErrorText : 'Unknown error.', + convertationTimeoutText : 'Conversion timeout exceeded.', + convertationErrorText : 'Conversion failed.', + downloadErrorText : 'Download failed.', + criticalErrorTitle : 'Error', + notcriticalErrorTitle : 'Warning', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', + errorFilePassProtect: 'The file is password protected and cannot be opened.', + errorAccessDeny: 'You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.', + errorUserDrop: 'The file cannot be accessed right now.', + unsupportedBrowserErrorText: 'Your browser is not supported.', + textOf: 'of', + downloadTextText: 'Downloading document...', + waitText: 'Please, wait...', + textLoadingDocument: 'Loading document', + txtClose: 'Close', + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', + textNext: 'Next Field', + textClear: 'Clear All Fields', + textSubmit: 'Submit', + textSubmited: 'Form submitted successfully
Click to close the tip.', + errorSubmit: 'Submit failed.', + errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.', + textGuest: 'Guest', + textAnonymous: 'Anonymous', + textRequired: 'Fill all required fields to send form.', + textGotIt: 'Got it', + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", + textCloseTip: "Click to close the tip." + }, DE.Controllers.ApplicationController)); +}); diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js new file mode 100644 index 000000000..b6efe5e24 --- /dev/null +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -0,0 +1,50 @@ +define([ + 'jquery', + 'underscore', + 'backbone', + 'common/main/lib/util/utils', + 'common/main/lib/component/Button', + 'common/main/lib/component/Menu', + 'common/main/lib/component/Calendar' +], function ($, _, Backbone) { + 'use strict'; + + var $btnTools; + + DE.Views.ApplicationView = Backbone.View.extend({ + // Render layout + render: function() { + $btnTools = $('#box-tools button'); + + $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true'); + $btnTools.parent().append( + ''); + return this; + }, + + getTools: function(name) { + return $btnTools.parent().find(name); + }, + + txtDownload: 'Download', + txtPrint: 'Print', + txtShare: 'Share', + txtEmbed: 'Embed', + txtFullScreen: 'Full Screen', + txtFileLocation: 'Open file location', + txtDownloadDocx: 'Download as docx', + txtDownloadPdf: 'Download as pdf' + }); +}); \ No newline at end of file diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js new file mode 100644 index 000000000..d83c567fa --- /dev/null +++ b/apps/documenteditor/forms/app_dev.js @@ -0,0 +1,155 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ + +'use strict'; +var reqerr; +require.config({ + // The shim config allows us to configure dependencies for + // scripts that do not call define() to register a module + baseUrl: '../../', + paths: { + jquery : '../vendor/jquery/jquery', + underscore : '../vendor/underscore/underscore', + backbone : '../vendor/backbone/backbone', + bootstrap : '../vendor/bootstrap/dist/js/bootstrap', + text : '../vendor/requirejs-text/text', + perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', + jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', + xregexp : '../vendor/xregexp/xregexp-all-min', + sockjs : '../vendor/sockjs/sockjs.min', + jszip : '../vendor/jszip/jszip.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', + api : 'api/documents/api', + core : 'common/main/lib/core/application', + notification : 'common/main/lib/core/NotificationCenter', + keymaster : 'common/main/lib/core/keymaster', + tip : 'common/main/lib/util/Tip', + localstorage : 'common/main/lib/util/LocalStorage', + analytics : 'common/Analytics', + gateway : 'common/Gateway', + locale : 'common/locale', + irregularstack : 'common/IrregularStack' + }, + + shim: { + underscore: { + exports: '_' + }, + backbone: { + deps: [ + 'underscore', + 'jquery' + ], + exports: 'Backbone' + }, + bootstrap: { + deps: [ + 'jquery' + ] + }, + perfectscrollbar: { + deps: [ + 'jmousewheel' + ] + }, + notification: { + deps: [ + 'backbone' + ] + }, + core: { + deps: [ + 'backbone', + 'notification', + 'irregularstack' + ] + }, + gateway: { + deps: [ + 'jquery' + ] + }, + analytics: { + deps: [ + 'jquery' + ] + } + } +}); + +require([ + 'backbone', + 'bootstrap', + 'core', + 'api', + 'analytics', + 'gateway', + 'locale', + 'jszip', + 'jsziputils', + 'sockjs', + 'underscore' +], function (Backbone, Bootstrap, Core) { + Backbone.history.start(); + + /** + * Application instance with DE namespace defined + */ + var app = new Backbone.Application({ + nameSpace: 'DE', + autoCreate: false, + controllers : [ + 'ApplicationController' + ] + }); + + Common.Locale.apply( + function() { + require([ + 'documenteditor/forms/app/controller/ApplicationController', + 'documenteditor/forms/app/view/ApplicationView', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + ], function() { + window.compareVersions = true; + app.start(); + }); + } + ); +}, function(err) { + if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { + reqerr = window.requireTimeourError(); + window.alert(reqerr); + window.location.reload(); + } +}); \ No newline at end of file diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html new file mode 100644 index 000000000..4ecc26fd5 --- /dev/null +++ b/apps/documenteditor/forms/index.html @@ -0,0 +1,265 @@ + + + + + Documents + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ +
+
    +
    • +
    • +
+
+ +
+
+
+ +
+
+ +
+
+
+
of 0
+ +
+
+ + + + + + + + + + + + + + + + + + + + + diff --git a/apps/documenteditor/forms/locale/be.json b/apps/documenteditor/forms/locale/be.json new file mode 100644 index 000000000..41d6ead30 --- /dev/null +++ b/apps/documenteditor/forms/locale/be.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Скапіяваць у буфер абмену", + "common.view.modals.txtEmbed": "Убудаваць", + "common.view.modals.txtHeight": "Вышыня", + "common.view.modals.txtShare": "Падзяліцца спасылкай", + "common.view.modals.txtWidth": "Шырыня", + "DE.ApplicationController.convertationErrorText": "Пераўтварыць не атрымалася.", + "DE.ApplicationController.convertationTimeoutText": "Час чакання пераўтварэння сышоў.", + "DE.ApplicationController.criticalErrorTitle": "Памылка", + "DE.ApplicationController.downloadErrorText": "Не атрымалася спампаваць.", + "DE.ApplicationController.downloadTextText": "Спампоўванне дакумента...", + "DE.ApplicationController.errorAccessDeny": "Вы спрабуеце выканаць дзеянне, на якое не маеце правоў.
Калі ласка, звярніцеся да адміністратара сервера дакументаў.", + "DE.ApplicationController.errorDefaultMessage": "Код памылкі: %1", + "DE.ApplicationController.errorFilePassProtect": "Файл абаронены паролем, яго немагчыма адкрыць.", + "DE.ApplicationController.errorFileSizeExceed": "Памер файла перавышае ліміт, вызначаны для вашага сервера.
Звярніцеся да адміністратара сервера дакументаў за дадатковымі звесткамі.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Злучэнне з інтэрнэтам было адноўлена, і версія файла змянілася.
Перш чым працягнуць працу, неабходна спампаваць файл альбо скапіяваць яго змесціва, каб захаваць даныя, а пасля перазагрузіць старонку.", + "DE.ApplicationController.errorUserDrop": "На дадзены момант файл недаступны.", + "DE.ApplicationController.notcriticalErrorTitle": "Увага", + "DE.ApplicationController.scriptLoadError": "Занадта павольнае злучэнне, не ўсе кампаненты атрымалася загрузіць. Калі ласка, абнавіце старонку.", + "DE.ApplicationController.textLoadingDocument": "Загрузка дакумента", + "DE.ApplicationController.textOf": "з", + "DE.ApplicationController.txtClose": "Закрыць", + "DE.ApplicationController.unknownErrorText": "Невядомая памылка.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браўзер не падтрымліваецца.", + "DE.ApplicationController.waitText": "Калі ласка, пачакайце...", + "DE.ApplicationView.txtDownload": "Спампаваць", + "DE.ApplicationView.txtEmbed": "Убудаваць", + "DE.ApplicationView.txtFullScreen": "Поўнаэкранны рэжым", + "DE.ApplicationView.txtPrint": "Друк", + "DE.ApplicationView.txtShare": "Падзяліцца" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/bg.json b/apps/documenteditor/forms/locale/bg.json new file mode 100644 index 000000000..72651eb8d --- /dev/null +++ b/apps/documenteditor/forms/locale/bg.json @@ -0,0 +1,30 @@ +{ + "common.view.modals.txtCopy": "Копиране в клипборда", + "common.view.modals.txtEmbed": "Вграждане", + "common.view.modals.txtHeight": "Височина", + "common.view.modals.txtShare": "Споделяне на връзка", + "common.view.modals.txtWidth": "Широчина", + "DE.ApplicationController.convertationErrorText": "Конвертирането е неуспешно.", + "DE.ApplicationController.convertationTimeoutText": "Превишава се времето на изтичане на реализациите.", + "DE.ApplicationController.criticalErrorTitle": "Грешка", + "DE.ApplicationController.downloadErrorText": "Изтеглянето се провали.", + "DE.ApplicationController.downloadTextText": "Документът се изтегли ...", + "DE.ApplicationController.errorAccessDeny": "Опитвате се да извършите действие, за което нямате права.
Моля, свържете се с администратора на сървъра за документи.", + "DE.ApplicationController.errorDefaultMessage": "Код на грешка: %1", + "DE.ApplicationController.errorFilePassProtect": "Файлът е защитен с парола и не може да бъде отворен.", + "DE.ApplicationController.errorFileSizeExceed": "Размерът на файла надвишава ограничението, зададено за вашия сървър.
Моля, свържете се с вашия администратор на Document Server за подробности.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Интернет връзката е възстановена и версията на файла е променена.
Преди да продължите да работите, трябва да изтеглите файла или да копирате съдържанието му, за да сте сигурни, че нищо не е загубено, и след това да презаредите тази страница.", + "DE.ApplicationController.errorUserDrop": "Файлът не може да бъде достъпен в момента.", + "DE.ApplicationController.notcriticalErrorTitle": "Внимание", + "DE.ApplicationController.scriptLoadError": "Връзката е твърде бавна, някои от компонентите не могат да бъдат заредени. Моля, презаредете страницата.", + "DE.ApplicationController.textLoadingDocument": "Зареждане на документ", + "DE.ApplicationController.textOf": "на", + "DE.ApplicationController.txtClose": "Затвори", + "DE.ApplicationController.unknownErrorText": "Неизвестна грешка.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Вашият браузър не се поддържа.", + "DE.ApplicationController.waitText": "Моля изчакай...", + "DE.ApplicationView.txtDownload": "Изтегли", + "DE.ApplicationView.txtEmbed": "Вграждане", + "DE.ApplicationView.txtFullScreen": "Цял екран", + "DE.ApplicationView.txtShare": "Дял" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/ca.json b/apps/documenteditor/forms/locale/ca.json new file mode 100644 index 000000000..319f01d6f --- /dev/null +++ b/apps/documenteditor/forms/locale/ca.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Copiat al porta-retalls", + "common.view.modals.txtEmbed": "Incrustar", + "common.view.modals.txtHeight": "Alçada", + "common.view.modals.txtShare": "Compartir Enllaç", + "common.view.modals.txtWidth": "Amplada", + "DE.ApplicationController.convertationErrorText": "Conversió Fallida", + "DE.ApplicationController.convertationTimeoutText": "Conversió fora de temps", + "DE.ApplicationController.criticalErrorTitle": "Error", + "DE.ApplicationController.downloadErrorText": "Descàrrega fallida.", + "DE.ApplicationController.downloadTextText": "Descarregant document...", + "DE.ApplicationController.errorAccessDeny": "Intenteu realitzar una acció per la qual no teniu drets.
Poseu-vos en contacte amb l'administrador del servidor de documents.", + "DE.ApplicationController.errorDefaultMessage": "Codi d'error:%1", + "DE.ApplicationController.errorEditingDownloadas": "S'ha produït un error durant el treball amb el document.
Utilitzeu l'opció \"Desar com a ...\" per desar la còpia de seguretat del fitxer al disc dur del vostre ordinador.", + "DE.ApplicationController.errorFilePassProtect": "El fitxer està protegit amb contrasenya i no es pot obrir.", + "DE.ApplicationController.errorFileSizeExceed": "La mida del fitxer excedeix la limitació establerta per al vostre servidor. Podeu contactar amb l'administrador del Document Server per obtenir més detalls.", + "DE.ApplicationController.errorSubmit": "Error en enviar", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexió a Internet s'ha restaurat i la versió del fitxer s'ha canviat.
Abans de continuar treballant, heu de descarregar el fitxer o copiar-ne el contingut per assegurar-vos que no es perdi res i, després, tornar a carregar aquesta pàgina.", + "DE.ApplicationController.errorUserDrop": "Ara no es pot accedir al fitxer.", + "DE.ApplicationController.notcriticalErrorTitle": "Avis", + "DE.ApplicationController.scriptLoadError": "La connexió és massa lenta, alguns dels components no s’han pogut carregar. Torneu a carregar la pàgina.", + "DE.ApplicationController.textAnonymous": "Anònim", + "DE.ApplicationController.textClear": "Esborrar tots els camps", + "DE.ApplicationController.textGotIt": "Ho tinc", + "DE.ApplicationController.textGuest": "Convidat", + "DE.ApplicationController.textLoadingDocument": "Carregant document", + "DE.ApplicationController.textNext": "Següent camp", + "DE.ApplicationController.textOf": "de", + "DE.ApplicationController.textRequired": "Ompli tots els camps requerits per enviar el formulari.", + "DE.ApplicationController.textSubmit": "Enviar", + "DE.ApplicationController.textSubmited": "Formulari enviat amb èxit
Faci clic per a tancar el consell", + "DE.ApplicationController.txtClose": "Tancar", + "DE.ApplicationController.unknownErrorText": "Error Desconegut.", + "DE.ApplicationController.unsupportedBrowserErrorText": "El vostre navegador no és compatible.", + "DE.ApplicationController.waitText": "Si us plau, esperi...", + "DE.ApplicationView.txtDownload": "\nDescarregar", + "DE.ApplicationView.txtDownloadDocx": "Desar com a .docx", + "DE.ApplicationView.txtDownloadPdf": "Desar com a pdf", + "DE.ApplicationView.txtEmbed": "Incrustar", + "DE.ApplicationView.txtFileLocation": "Obrir ubicació del fitxer", + "DE.ApplicationView.txtFullScreen": "Pantalla Completa", + "DE.ApplicationView.txtPrint": "Imprimir", + "DE.ApplicationView.txtShare": "Compartir" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/cs.json b/apps/documenteditor/forms/locale/cs.json new file mode 100644 index 000000000..09c23bf7a --- /dev/null +++ b/apps/documenteditor/forms/locale/cs.json @@ -0,0 +1,29 @@ +{ + "common.view.modals.txtCopy": "Zkopírovat do schránky", + "common.view.modals.txtHeight": "Výška", + "common.view.modals.txtShare": "Odkaz pro sdílení", + "common.view.modals.txtWidth": "Šířka", + "DE.ApplicationController.convertationErrorText": "Převod se nezdařil.", + "DE.ApplicationController.convertationTimeoutText": "Překročen časový limit pro provedení převodu.", + "DE.ApplicationController.criticalErrorTitle": "Chyba", + "DE.ApplicationController.downloadErrorText": "Stahování se nezdařilo.", + "DE.ApplicationController.downloadTextText": "Stahování dokumentu…", + "DE.ApplicationController.errorAccessDeny": "Pokoušíte se provést akci, na kterou nemáte oprávnění.
Obraťte se na správce vámi využívaného dokumentového serveru.", + "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1", + "DE.ApplicationController.errorFilePassProtect": "Soubor je chráněn heslem a bez něj ho nelze otevřít.", + "DE.ApplicationController.errorFileSizeExceed": "Velikost souboru překračuje omezení nastavená na serveru, který využíváte.
Ohledně podrobností se obraťte na správce dokumentového serveru.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Připojení k Internetu bylo obnoveno a verze souboru byla změněna.
Než budete moci pokračovat v práci, bude třeba si soubor stáhnout nebo si zkopírovat jeho obsah, abyste si zajistili, že se nic neztratí a až poté tuto stránku znovu načtěte.", + "DE.ApplicationController.errorUserDrop": "Tento soubor nyní není přístupný.", + "DE.ApplicationController.notcriticalErrorTitle": "Varování", + "DE.ApplicationController.scriptLoadError": "Připojení je příliš pomalé, některé součásti se nepodařilo načíst. Načtěte stránku znovu.", + "DE.ApplicationController.textLoadingDocument": "Načítání dokumentu", + "DE.ApplicationController.textOf": "z", + "DE.ApplicationController.txtClose": "Zavřít", + "DE.ApplicationController.unknownErrorText": "Neznámá chyba.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Vámi používaný webový prohlížeč není podporován.", + "DE.ApplicationController.waitText": "Čekejte prosím…", + "DE.ApplicationView.txtDownload": "Stáhnout", + "DE.ApplicationView.txtFullScreen": "Na celou obrazovku", + "DE.ApplicationView.txtPrint": "Tisk", + "DE.ApplicationView.txtShare": "Sdílet" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/da.json b/apps/documenteditor/forms/locale/da.json new file mode 100644 index 000000000..037b749f5 --- /dev/null +++ b/apps/documenteditor/forms/locale/da.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Kopier til udklipsholder", + "common.view.modals.txtEmbed": "Indlejre", + "common.view.modals.txtHeight": "Højde", + "common.view.modals.txtShare": "Del link", + "common.view.modals.txtWidth": "Bredde", + "DE.ApplicationController.convertationErrorText": "Konvertering fejlede.", + "DE.ApplicationController.convertationTimeoutText": "Konverteringstidsfrist er overskredet", + "DE.ApplicationController.criticalErrorTitle": "Fejl", + "DE.ApplicationController.downloadErrorText": "Download fejlet.", + "DE.ApplicationController.downloadTextText": "Hent dokument...", + "DE.ApplicationController.errorAccessDeny": "Du prøver at foretage en handling, som du ikke har rettighederne til.
venligst kontakt din administrator for hjælp.", + "DE.ApplicationController.errorDefaultMessage": "Fejlkode: %1", + "DE.ApplicationController.errorFilePassProtect": "Dokumentet er beskyttet af et kodeord og kunne ikke åbnes.", + "DE.ApplicationController.errorFileSizeExceed": "Filens størrelse overstiger grænsen, som er sat for din server.
Kontakt venligst din administrator for hjælp.", + "DE.ApplicationController.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.ApplicationController.errorUserDrop": "Der kan ikke opnås adgang til filen lige nu. ", + "DE.ApplicationController.notcriticalErrorTitle": "Advarsel", + "DE.ApplicationController.scriptLoadError": "Forbindelsen er for langsom, og nogle komponenter kunne ikke indlæses. Indlæs siden igen.", + "DE.ApplicationController.textLoadingDocument": "Indlæser dokument", + "DE.ApplicationController.textOf": "af", + "DE.ApplicationController.txtClose": "Luk", + "DE.ApplicationController.unknownErrorText": "Ukendt fejl.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Din browser understøttes ikke.", + "DE.ApplicationController.waitText": "Vent venligst...", + "DE.ApplicationView.txtDownload": "Hent", + "DE.ApplicationView.txtEmbed": "Indlejre", + "DE.ApplicationView.txtFullScreen": "Fuld skærm", + "DE.ApplicationView.txtPrint": "Udskriv", + "DE.ApplicationView.txtShare": "Del" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/de.json b/apps/documenteditor/forms/locale/de.json new file mode 100644 index 000000000..09023d4de --- /dev/null +++ b/apps/documenteditor/forms/locale/de.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "In die Zwischenablage kopieren", + "common.view.modals.txtEmbed": "Einbetten", + "common.view.modals.txtHeight": "Höhe", + "common.view.modals.txtShare": "Link teilen", + "common.view.modals.txtWidth": "Breite", + "DE.ApplicationController.convertationErrorText": "Konvertierung ist fehlgeschlagen.", + "DE.ApplicationController.convertationTimeoutText": "Zeitüberschreitung bei der Konvertierung.", + "DE.ApplicationController.criticalErrorTitle": "Fehler", + "DE.ApplicationController.downloadErrorText": "Herunterladen ist fehlgeschlagen.", + "DE.ApplicationController.downloadTextText": "Dokument wird heruntergeladen...", + "DE.ApplicationController.errorAccessDeny": "Sie versuchen, eine Aktion durchzuführen, für die Sie keine Rechte haben.
Bitte wenden Sie sich an Ihren Document Serveradministrator.", + "DE.ApplicationController.errorDefaultMessage": "Fehlercode: %1", + "DE.ApplicationController.errorEditingDownloadas": "Fehler bei der Bearbeitung.
Speichern Sie eine Kopie dieser Datei auf Ihrem Computer, indem Sie auf \"Herunterladen als...\" klicken.", + "DE.ApplicationController.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", + "DE.ApplicationController.errorFileSizeExceed": "Die Dateigröße überschreitet die für Ihren Server festgelegte Einschränkung.
Weitere Informationen können Sie von Ihrem Document Server-Administrator erhalten.", + "DE.ApplicationController.errorSubmit": "Fehler beim Senden.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Die Internetverbindung wurde wiederhergestellt und die Dateiversion wurde geändert.
Bevor Sie weiterarbeiten können, müssen Sie die Datei herunterladen oder den Inhalt kopieren, um sicherzustellen, dass nichts verloren geht, und diese Seite anschließend neu laden.", + "DE.ApplicationController.errorUserDrop": "Der Zugriff auf diese Datei ist nicht möglich.", + "DE.ApplicationController.notcriticalErrorTitle": "Warnung", + "DE.ApplicationController.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", + "DE.ApplicationController.textAnonymous": "Anonym", + "DE.ApplicationController.textClear": "Alle Felder löschen", + "DE.ApplicationController.textGotIt": "OK", + "DE.ApplicationController.textGuest": "Gast", + "DE.ApplicationController.textLoadingDocument": "Dokument wird geladen...", + "DE.ApplicationController.textNext": "Nächstes Feld", + "DE.ApplicationController.textOf": "von", + "DE.ApplicationController.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular zu senden.", + "DE.ApplicationController.textSubmit": "Senden", + "DE.ApplicationController.textSubmited": "Das Formular wurde erfolgreich abgesendet
Klicken Sie hier, um den Tipp auszublenden", + "DE.ApplicationController.txtClose": "Schließen", + "DE.ApplicationController.unknownErrorText": "Unbekannter Fehler.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Ihr Webbrowser wird nicht unterstützt.", + "DE.ApplicationController.waitText": "Bitte warten...", + "DE.ApplicationView.txtDownload": "Herunterladen", + "DE.ApplicationView.txtDownloadDocx": "Als DOCX herunterladen", + "DE.ApplicationView.txtDownloadPdf": "Als PDF herunterladen", + "DE.ApplicationView.txtEmbed": "Einbetten", + "DE.ApplicationView.txtFileLocation": "Dateispeicherort öffnen", + "DE.ApplicationView.txtFullScreen": "Vollbild-Modus", + "DE.ApplicationView.txtPrint": "Drucken", + "DE.ApplicationView.txtShare": "Freigeben" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/el.json b/apps/documenteditor/forms/locale/el.json new file mode 100644 index 000000000..2a30fac8d --- /dev/null +++ b/apps/documenteditor/forms/locale/el.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Αντιγραφή στο πρόχειρο", + "common.view.modals.txtEmbed": "Ενσωμάτωση", + "common.view.modals.txtHeight": "Ύψος", + "common.view.modals.txtShare": "Διαμοιρασμός συνδέσμου", + "common.view.modals.txtWidth": "Πλάτος", + "DE.ApplicationController.convertationErrorText": "Αποτυχία μετατροπής.", + "DE.ApplicationController.convertationTimeoutText": "Υπέρβαση χρονικού ορίου μετατροπής.", + "DE.ApplicationController.criticalErrorTitle": "Σφάλμα", + "DE.ApplicationController.downloadErrorText": "Αποτυχία λήψης.", + "DE.ApplicationController.downloadTextText": "Γίνεται λήψη εγγράφου...", + "DE.ApplicationController.errorAccessDeny": "Προσπαθείτε να εκτελέσετε μια ενέργεια για την οποία δεν έχετε δικαιώματα.
Παρακαλούμε να επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων.", + "DE.ApplicationController.errorDefaultMessage": "Κωδικός σφάλματος: %1", + "DE.ApplicationController.errorEditingDownloadas": "Παρουσιάστηκε σφάλμα κατά την εργασία με το έγγραφο.
Χρησιμοποιήστε την επιλογή «Λήψη ως...» για να αποθηκεύσετε το αντίγραφο ασφαλείας στον σκληρό δίσκο του υπολογιστή σας.", + "DE.ApplicationController.errorFilePassProtect": "Το αρχείο προστατεύεται με συνθηματικό και δεν μπορεί να ανοίξει.", + "DE.ApplicationController.errorFileSizeExceed": "Το μέγεθος του αρχείου υπερβαίνει το όριο που έχει οριστεί για τον διακομιστή σας.
Παρακαλούμε επικοινωνήστε με τον διαχειριστή του διακομιστή εγγράφων για λεπτομέρειες.", + "DE.ApplicationController.errorSubmit": "Η υποβολή απέτυχε.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Η σύνδεση στο Διαδίκτυο έχει αποκατασταθεί και η έκδοση του αρχείου έχει αλλάξει.
Προτού συνεχίσετε να εργάζεστε, πρέπει να κατεβάσετε το αρχείο ή να αντιγράψετε το περιεχόμενό του για να βεβαιωθείτε ότι δεν έχει χαθεί τίποτα και, στη συνέχεια, φορτώστε ξανά αυτήν τη σελίδα.", + "DE.ApplicationController.errorUserDrop": "Δεν είναι δυνατή η πρόσβαση στο αρχείο αυτήν τη στιγμή.", + "DE.ApplicationController.notcriticalErrorTitle": "Προειδοποίηση", + "DE.ApplicationController.scriptLoadError": "Η σύνδεση είναι πολύ αργή, δεν ήταν δυνατή η φόρτωση ορισμένων στοιχείων. Φορτώστε ξανά τη σελίδα.", + "DE.ApplicationController.textAnonymous": "Ανώνυμος", + "DE.ApplicationController.textClear": "Εκκαθάριση Όλων των Πεδίων", + "DE.ApplicationController.textGotIt": "Ελήφθη", + "DE.ApplicationController.textGuest": "Επισκέπτης", + "DE.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου", + "DE.ApplicationController.textNext": "Επόμενο Πεδίο", + "DE.ApplicationController.textOf": "του", + "DE.ApplicationController.textRequired": "Συμπληρώστε όλα τα απαιτούμενα πεδία για την αποστολή της φόρμας.", + "DE.ApplicationController.textSubmit": "Υποβολή", + "DE.ApplicationController.textSubmited": "Η φόρμα υποβλήθηκε με επιτυχία
Κάντε κλικ για να κλείσετε τη συμβουλή ", + "DE.ApplicationController.txtClose": "Κλείσιμο", + "DE.ApplicationController.unknownErrorText": "Άγνωστο σφάλμα.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Ο περιηγητής σας δεν υποστηρίζεται.", + "DE.ApplicationController.waitText": "Παρακαλούμε, περιμένετε...", + "DE.ApplicationView.txtDownload": "Λήψη", + "DE.ApplicationView.txtDownloadDocx": "Λήψη ως docx", + "DE.ApplicationView.txtDownloadPdf": "Λήψη ως pdf", + "DE.ApplicationView.txtEmbed": "Ενσωμάτωση", + "DE.ApplicationView.txtFileLocation": "Άνοιγμα τοποθεσίας αρχείου", + "DE.ApplicationView.txtFullScreen": "Πλήρης οθόνη", + "DE.ApplicationView.txtPrint": "Εκτύπωση", + "DE.ApplicationView.txtShare": "Διαμοιρασμός" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json new file mode 100644 index 000000000..de0c0c291 --- /dev/null +++ b/apps/documenteditor/forms/locale/en.json @@ -0,0 +1,45 @@ +{ + "common.view.modals.txtCopy": "Copy to clipboard", + "common.view.modals.txtEmbed": "Embed", + "common.view.modals.txtHeight": "Height", + "common.view.modals.txtShare": "Share Link", + "common.view.modals.txtWidth": "Width", + "DE.ApplicationController.convertationErrorText": "Conversion failed.", + "DE.ApplicationController.convertationTimeoutText": "Conversion timeout exceeded.", + "DE.ApplicationController.criticalErrorTitle": "Error", + "DE.ApplicationController.downloadErrorText": "Download failed.", + "DE.ApplicationController.downloadTextText": "Downloading document...", + "DE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.", + "DE.ApplicationController.errorDefaultMessage": "Error code: %1", + "DE.ApplicationController.errorEditingDownloadas": "An error occurred during the work with the document.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", + "DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.", + "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.", + "DE.ApplicationController.errorSubmit": "Submit failed.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", + "DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.", + "DE.ApplicationController.errorForceSave": "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", + "DE.ApplicationController.notcriticalErrorTitle": "Warning", + "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", + "DE.ApplicationController.textAnonymous": "Anonymous", + "DE.ApplicationController.textClear": "Clear All Fields", + "DE.ApplicationController.textGotIt": "Got it", + "DE.ApplicationController.textGuest": "Guest", + "DE.ApplicationController.textLoadingDocument": "Loading document", + "DE.ApplicationController.textNext": "Next Field", + "DE.ApplicationController.textOf": "of", + "DE.ApplicationController.textRequired": "Fill all required fields to send form.", + "DE.ApplicationController.textSubmit": "Submit", + "DE.ApplicationController.textSubmited": "Form submitted successfully
Click to close the tip", + "DE.ApplicationController.txtClose": "Close", + "DE.ApplicationController.unknownErrorText": "Unknown error.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", + "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationView.txtDownload": "Download", + "DE.ApplicationView.txtDownloadDocx": "Download as docx", + "DE.ApplicationView.txtDownloadPdf": "Download as pdf", + "DE.ApplicationView.txtEmbed": "Embed", + "DE.ApplicationView.txtFileLocation": "Open file location", + "DE.ApplicationView.txtFullScreen": "Full Screen", + "DE.ApplicationView.txtPrint": "Print", + "DE.ApplicationView.txtShare": "Share" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/es.json b/apps/documenteditor/forms/locale/es.json new file mode 100644 index 000000000..de92ca281 --- /dev/null +++ b/apps/documenteditor/forms/locale/es.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Copiar al portapapeles", + "common.view.modals.txtEmbed": "Incorporar", + "common.view.modals.txtHeight": "Altura", + "common.view.modals.txtShare": "Compartir enlace", + "common.view.modals.txtWidth": "Ancho", + "DE.ApplicationController.convertationErrorText": "Fallo de conversión.", + "DE.ApplicationController.convertationTimeoutText": "Se superó el tiempo de espera de conversión.", + "DE.ApplicationController.criticalErrorTitle": "Error", + "DE.ApplicationController.downloadErrorText": "Error en la descarga", + "DE.ApplicationController.downloadTextText": "Descargando documento...", + "DE.ApplicationController.errorAccessDeny": "Está tratando de realizar una acción para la cual no tiene permiso.
Por favor, contacte con su Administrador del Servidor de Documentos.", + "DE.ApplicationController.errorDefaultMessage": "Código de error: %1", + "DE.ApplicationController.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.
Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.", + "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.", + "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede el límite establecido para su servidor. Por favor póngase en contacto con el administrador del Servidor de Documentos para obtener más información.", + "DE.ApplicationController.errorSubmit": "Error al enviar.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.", + "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.", + "DE.ApplicationController.notcriticalErrorTitle": "Aviso", + "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Por favor, recargue la página.", + "DE.ApplicationController.textAnonymous": "Anónimo", + "DE.ApplicationController.textClear": "Borrar todos los campos", + "DE.ApplicationController.textGotIt": "Entiendo", + "DE.ApplicationController.textGuest": "Invitado", + "DE.ApplicationController.textLoadingDocument": "Cargando documento", + "DE.ApplicationController.textNext": "Campo siguiente", + "DE.ApplicationController.textOf": "de", + "DE.ApplicationController.textRequired": "Rellene todos los campos obligatorios para enviar el formulario.", + "DE.ApplicationController.textSubmit": "Enviar", + "DE.ApplicationController.textSubmited": "Formulario enviado con éxito
Haga clic para cerrar el consejo", + "DE.ApplicationController.txtClose": "Cerrar", + "DE.ApplicationController.unknownErrorText": "Error desconocido.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.", + "DE.ApplicationController.waitText": "Por favor, espere...", + "DE.ApplicationView.txtDownload": "Descargar", + "DE.ApplicationView.txtDownloadDocx": "Descargar como docx", + "DE.ApplicationView.txtDownloadPdf": "Descargar como pdf", + "DE.ApplicationView.txtEmbed": "Incorporar", + "DE.ApplicationView.txtFileLocation": "Abrir ubicación del archivo", + "DE.ApplicationView.txtFullScreen": "Pantalla Completa", + "DE.ApplicationView.txtPrint": "Imprimir", + "DE.ApplicationView.txtShare": "Compartir" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/fr.json b/apps/documenteditor/forms/locale/fr.json new file mode 100644 index 000000000..c56b67a2f --- /dev/null +++ b/apps/documenteditor/forms/locale/fr.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Copier dans le Presse-papiers", + "common.view.modals.txtEmbed": "Incorporer", + "common.view.modals.txtHeight": "Hauteur", + "common.view.modals.txtShare": "Partager un lien", + "common.view.modals.txtWidth": "Largeur", + "DE.ApplicationController.convertationErrorText": "Échec de la conversion.", + "DE.ApplicationController.convertationTimeoutText": "Délai d'attente de la conversion dépassé ", + "DE.ApplicationController.criticalErrorTitle": "Erreur", + "DE.ApplicationController.downloadErrorText": "Échec du téléchargement.", + "DE.ApplicationController.downloadTextText": "Téléchargement du document...", + "DE.ApplicationController.errorAccessDeny": "Vous tentez d'exéсuter une action pour laquelle vous ne disposez pas des droits.
Veuillez contacter l'administrateur de Document Server.", + "DE.ApplicationController.errorDefaultMessage": "Code d'erreur: %1", + "DE.ApplicationController.errorEditingDownloadas": "Une erreur s'est produite lors du travail avec le document.
Utilisez l'option 'Télécharger comme...' pour enregistrer une copie de sauvegarde du fichier sur le disque dur de votre ordinateur.", + "DE.ApplicationController.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.", + "DE.ApplicationController.errorFileSizeExceed": "La taille du fichier dépasse les limites établies sur votre serveur.
Veuillez contacter votre administrateur de Document Server pour obtenir plus d'informations. ", + "DE.ApplicationController.errorSubmit": "Échec de soumission", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connexion internet a été rétablie, la version du fichier est modifiée.
Avant de continuer, téléchargez le fichier ou copiez le contenu pour vous assurer que tous les changements ont été enregistrés, et rechargez la page.", + "DE.ApplicationController.errorUserDrop": "Impossible d'accéder au fichier.", + "DE.ApplicationController.notcriticalErrorTitle": "Avertissement", + "DE.ApplicationController.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", + "DE.ApplicationController.textAnonymous": "Anonyme", + "DE.ApplicationController.textClear": "Effacer tous les champs", + "DE.ApplicationController.textGotIt": "C'est compris", + "DE.ApplicationController.textGuest": "Invité", + "DE.ApplicationController.textLoadingDocument": "Chargement du document", + "DE.ApplicationController.textNext": "Champ suivant", + "DE.ApplicationController.textOf": "de", + "DE.ApplicationController.textRequired": "Veuillez remplir tous les champs obligatoires avant d'envoyer le formulaire.", + "DE.ApplicationController.textSubmit": "Soumettre ", + "DE.ApplicationController.textSubmited": "Le formulaire a été soumis avec succès
Cliquez ici pour fermer l'astuce", + "DE.ApplicationController.txtClose": "Fermer", + "DE.ApplicationController.unknownErrorText": "Erreur inconnue.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Votre navigateur n'est pas pris en charge.", + "DE.ApplicationController.waitText": "Veuillez patienter...", + "DE.ApplicationView.txtDownload": "Télécharger", + "DE.ApplicationView.txtDownloadDocx": "Télécharger en tant que docx", + "DE.ApplicationView.txtDownloadPdf": "Télécharger en tant que pdf", + "DE.ApplicationView.txtEmbed": "Incorporer", + "DE.ApplicationView.txtFileLocation": "Ouvrir l'emplacement du fichier", + "DE.ApplicationView.txtFullScreen": "Plein écran", + "DE.ApplicationView.txtPrint": "Imprimer", + "DE.ApplicationView.txtShare": "Partager" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/hu.json b/apps/documenteditor/forms/locale/hu.json new file mode 100644 index 000000000..b11971151 --- /dev/null +++ b/apps/documenteditor/forms/locale/hu.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Másolás vágólapra", + "common.view.modals.txtEmbed": "Beágyazás", + "common.view.modals.txtHeight": "Magasság", + "common.view.modals.txtShare": "Hivatkozás megosztása", + "common.view.modals.txtWidth": "Szélesség", + "DE.ApplicationController.convertationErrorText": "Az átalakítás nem sikerült.", + "DE.ApplicationController.convertationTimeoutText": "Időtúllépés az átalakítás során.", + "DE.ApplicationController.criticalErrorTitle": "Hiba", + "DE.ApplicationController.downloadErrorText": "Sikertelen letöltés.", + "DE.ApplicationController.downloadTextText": "Dokumentum letöltése...", + "DE.ApplicationController.errorAccessDeny": "Olyan műveletet próbál végrehajtani, melyre nincs jogosultsága.
Vegye fel a kapcsolatot a Document Server adminisztrátorával.", + "DE.ApplicationController.errorDefaultMessage": "Hibakód: %1", + "DE.ApplicationController.errorFilePassProtect": "A dokumentum jelszóval védett, és nem nyitható meg.", + "DE.ApplicationController.errorFileSizeExceed": "A fájlméret meghaladja a szerverre beállított korlátozást.
Kérjük, forduljon a Document Server rendszergazdájához a részletekért.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Az internet kapcsolat helyreállt, és a fájl verziója megváltozott.
Mielőtt folytatná a munkát, töltse le a fájlt, vagy másolja vágólapra annak tartalmát, hogy megbizonyosodjon arról, hogy semmi nem veszik el, majd töltse újra az oldalt.", + "DE.ApplicationController.errorUserDrop": "A dokumentum jelenleg nem elérhető.", + "DE.ApplicationController.notcriticalErrorTitle": "Figyelmeztetés", + "DE.ApplicationController.scriptLoadError": "A kapcsolat túl lassú, néhány komponens nem töltődött be. Frissítse az oldalt.", + "DE.ApplicationController.textLoadingDocument": "Dokumentum betöltése", + "DE.ApplicationController.textOf": "of", + "DE.ApplicationController.txtClose": "Bezárás", + "DE.ApplicationController.unknownErrorText": "Ismeretlen hiba.", + "DE.ApplicationController.unsupportedBrowserErrorText": "A böngészője nem támogatott.", + "DE.ApplicationController.waitText": "Kérjük, várjon...", + "DE.ApplicationView.txtDownload": "Letöltés", + "DE.ApplicationView.txtEmbed": "Beágyazás", + "DE.ApplicationView.txtFullScreen": "Teljes képernyő", + "DE.ApplicationView.txtPrint": "Nyomtatás", + "DE.ApplicationView.txtShare": "Megosztás" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/it.json b/apps/documenteditor/forms/locale/it.json new file mode 100644 index 000000000..b18e037e0 --- /dev/null +++ b/apps/documenteditor/forms/locale/it.json @@ -0,0 +1,40 @@ +{ + "common.view.modals.txtCopy": "Copia negli appunti", + "common.view.modals.txtEmbed": "Incorpora", + "common.view.modals.txtHeight": "Altezza", + "common.view.modals.txtShare": "Condividi collegamento", + "common.view.modals.txtWidth": "Larghezza", + "DE.ApplicationController.convertationErrorText": "Conversione fallita.", + "DE.ApplicationController.convertationTimeoutText": "È stato superato il tempo limite della conversione.", + "DE.ApplicationController.criticalErrorTitle": "Errore", + "DE.ApplicationController.downloadErrorText": "Scaricamento fallito", + "DE.ApplicationController.downloadTextText": "Scaricamento del documento in corso...", + "DE.ApplicationController.errorAccessDeny": "Stai tentando di eseguire un'azione per la quale non disponi di permessi sufficienti.
Si prega di contattare l'amministratore del Server dei Documenti.", + "DE.ApplicationController.errorDefaultMessage": "Codice errore: %1", + "DE.ApplicationController.errorEditingDownloadas": "Si è verificato un errore durante il lavoro con il documento.
Utilizzare l'opzione 'Scarica come ...' per salvare la copia di backup del file sul disco rigido del computer.", + "DE.ApplicationController.errorFilePassProtect": "Il file è protetto da una password. Impossibile aprirlo.", + "DE.ApplicationController.errorFileSizeExceed": "La dimensione del file supera la limitazione impostata per il tuo server.
Per i dettagli, contatta l'amministratore del Document server.", + "DE.ApplicationController.errorSubmit": "Invio fallito.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La connessione Internet è stata ripristinata e la versione del file è stata modificata.
Prima di poter continuare a lavorare, è necessario scaricare il file o copiarne il contenuto per assicurarsi che non vada perso nulla, successivamente ricaricare questa pagina.", + "DE.ApplicationController.errorUserDrop": "Impossibile accedere al file subito.", + "DE.ApplicationController.notcriticalErrorTitle": "Avviso", + "DE.ApplicationController.scriptLoadError": "La connessione è troppo lenta, alcuni componenti non possono essere caricati. Si prega di ricaricare la pagina.", + "DE.ApplicationController.textClear": "‎Cancella tutti i campi‎", + "DE.ApplicationController.textLoadingDocument": "Caricamento del documento", + "DE.ApplicationController.textNext": "Campo successivo", + "DE.ApplicationController.textOf": "di", + "DE.ApplicationController.textSubmit": "‎Invia‎", + "DE.ApplicationController.textSubmited": "Modulo inviato con successo
Fare click per chiudere la notifica
", + "DE.ApplicationController.txtClose": "Chiudi", + "DE.ApplicationController.unknownErrorText": "Errore sconosciuto.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Il tuo browser non è supportato.", + "DE.ApplicationController.waitText": "Per favore, attendi...", + "DE.ApplicationView.txtDownload": "Scarica", + "DE.ApplicationView.txtDownloadDocx": "Scarica come .docx", + "DE.ApplicationView.txtDownloadPdf": "Scarica come .pdf", + "DE.ApplicationView.txtEmbed": "Incorpora", + "DE.ApplicationView.txtFileLocation": "Apri percorso file", + "DE.ApplicationView.txtFullScreen": "Schermo intero", + "DE.ApplicationView.txtPrint": "Stampa", + "DE.ApplicationView.txtShare": "Condividi" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/ja.json b/apps/documenteditor/forms/locale/ja.json new file mode 100644 index 000000000..17e852b32 --- /dev/null +++ b/apps/documenteditor/forms/locale/ja.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "クリップボードにコピー", + "common.view.modals.txtEmbed": "埋め込み", + "common.view.modals.txtHeight": "高さ", + "common.view.modals.txtShare": "共有リンク", + "common.view.modals.txtWidth": "幅", + "DE.ApplicationController.convertationErrorText": "変換に失敗しました", + "DE.ApplicationController.convertationTimeoutText": "変換のタイムアウトを超過しました。", + "DE.ApplicationController.criticalErrorTitle": "エラー", + "DE.ApplicationController.downloadErrorText": "ダウンロードに失敗しました", + "DE.ApplicationController.downloadTextText": "ドキュメントのダウンロード中...", + "DE.ApplicationController.errorAccessDeny": "利用権限がない操作をしようとしました。
Documentサーバー管理者に連絡してください。", + "DE.ApplicationController.errorDefaultMessage": "エラー コード: %1", + "DE.ApplicationController.errorFilePassProtect": "ドキュメントがパスワードで保護されているため開くことができません", + "DE.ApplicationController.errorFileSizeExceed": "ファイルサイズがサーバーで設定された制限を超過しています。
Documentサーバー管理者に詳細をお問い合わせください。", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "インターネット接続が復旧し、ファイルのバージョンが更新されています。
作業を継続する前に、ファイルをダウンロードするか内容をコピーして、変更が消えてしまわないようにしてからページを再読み込みしてください。", + "DE.ApplicationController.errorUserDrop": "今、ファイルにアクセスすることはできません。", + "DE.ApplicationController.notcriticalErrorTitle": "警告", + "DE.ApplicationController.scriptLoadError": "接続が非常に遅いため、いくつかのコンポーネントはロードされませんでした。ページを再読み込みしてください。", + "DE.ApplicationController.textLoadingDocument": "ドキュメントを読み込んでいます", + "DE.ApplicationController.textOf": "から", + "DE.ApplicationController.txtClose": "閉じる", + "DE.ApplicationController.unknownErrorText": "不明なエラー", + "DE.ApplicationController.unsupportedBrowserErrorText": "お使いのブラウザがサポートされていません。", + "DE.ApplicationController.waitText": "少々お待ちください...", + "DE.ApplicationView.txtDownload": "ダウンロード", + "DE.ApplicationView.txtEmbed": "埋め込み", + "DE.ApplicationView.txtFullScreen": "全画面表示", + "DE.ApplicationView.txtPrint": "印刷する", + "DE.ApplicationView.txtShare": "シェア" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/ko.json b/apps/documenteditor/forms/locale/ko.json new file mode 100644 index 000000000..4ba731456 --- /dev/null +++ b/apps/documenteditor/forms/locale/ko.json @@ -0,0 +1,30 @@ +{ + "common.view.modals.txtCopy": "클립보드로 복사", + "common.view.modals.txtEmbed": "개체 삽입", + "common.view.modals.txtHeight": "높이", + "common.view.modals.txtShare": "링크 공유", + "common.view.modals.txtWidth": "너비", + "DE.ApplicationController.convertationErrorText": "변환 실패 ", + "DE.ApplicationController.convertationTimeoutText": "변환 시간을 초과했습니다.", + "DE.ApplicationController.criticalErrorTitle": "오류", + "DE.ApplicationController.downloadErrorText": "다운로드 실패", + "DE.ApplicationController.downloadTextText": "문서 다운로드 중...", + "DE.ApplicationController.errorAccessDeny": "권한이없는 작업을 수행하려고합니다.
Document Server 관리자에게 문의하십시오.", + "DE.ApplicationController.errorDefaultMessage": "오류 코드: %1", + "DE.ApplicationController.errorFilePassProtect": "이 문서는 암호로 보호되어있어 열 수 없습니다.", + "DE.ApplicationController.errorFileSizeExceed": "파일의 크기가 서버에서 정해진 범위를 초과 했습니다. 문서 서버 관리자에게 해당 내용에 대한 자세한 안내를 받아 보시기 바랍니다.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "인터넷 연결이 복구 되었으며 파일에 수정 사항이 발생되었습니다. 작업을 계속 하시기 전에 반드시 기존의 파일을 다운로드하거나 내용을 복사해서 작업 내용을 잃어 버리는 일이 없도록 한 후에 이 페이지를 새로 고침(reload) 해 주시기 바랍니다.", + "DE.ApplicationController.errorUserDrop": "파일에 지금 액세스 할 수 없습니다.", + "DE.ApplicationController.notcriticalErrorTitle": "경고", + "DE.ApplicationController.scriptLoadError": "연결 속도가 느려, 일부 요소들이 로드되지 않았습니다. 페이지를 다시 새로 고침해주세요.", + "DE.ApplicationController.textLoadingDocument": "문서 로드 중", + "DE.ApplicationController.textOf": "의", + "DE.ApplicationController.txtClose": "닫기", + "DE.ApplicationController.unknownErrorText": "알 수없는 오류.", + "DE.ApplicationController.unsupportedBrowserErrorText": "사용중인 브라우저가 지원되지 않습니다.", + "DE.ApplicationController.waitText": "잠시만 기달려주세요...", + "DE.ApplicationView.txtDownload": "다운로드 ", + "DE.ApplicationView.txtEmbed": "개체 삽입", + "DE.ApplicationView.txtFullScreen": "전체 화면", + "DE.ApplicationView.txtShare": "공유" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/lo.json b/apps/documenteditor/forms/locale/lo.json new file mode 100644 index 000000000..d7975ae97 --- /dev/null +++ b/apps/documenteditor/forms/locale/lo.json @@ -0,0 +1,40 @@ +{ + "common.view.modals.txtCopy": "ເກັບໄວ້ໃນຄຣິບບອດ", + "common.view.modals.txtEmbed": "ຝັງໄວ້", + "common.view.modals.txtHeight": "ລວງສູງ", + "common.view.modals.txtShare": "ແບ່ງປັນລິ້ງ", + "common.view.modals.txtWidth": "ລວງກວ້າງ", + "DE.ApplicationController.convertationErrorText": " ການປ່ຽນແປງບໍ່ສຳເລັດ.", + "DE.ApplicationController.convertationTimeoutText": "ໝົດເວລາການປ່ຽນແປງ.", + "DE.ApplicationController.criticalErrorTitle": "ຂໍ້ຜິດພາດ", + "DE.ApplicationController.downloadErrorText": "ດາວໂຫຼດບໍ່ສຳເລັດ.", + "DE.ApplicationController.downloadTextText": "ກຳລັງດາວໂຫຼດເອກະສານ", + "DE.ApplicationController.errorAccessDeny": "ທ່ານບໍ່ມີສິດຈະດຳເນີນການອັນນີ້.
ກະລຸນະຕິດຕໍ່ຜູ້ຄຸ້ມຄອງລົບຂອງທ່ານ", + "DE.ApplicationController.errorDefaultMessage": "ລະຫັດຂໍ້ຜິດພາດ: %1", + "DE.ApplicationController.errorEditingDownloadas": "ເກີດຂໍ້ຜິດພາດໃນລະຫວ່າງການເຮັດວຽກກັບເອກກະສານ.
ໃຊ້ຕົວເລືອກ 'ດາວໂຫລດເປັນ ... ' ເພື່ອບັນທຶກເອກະສານເກັບໄວ້ໃນຮາດໄດຄອມພິວເຕີຂອງທ່ານ.", + "DE.ApplicationController.errorFilePassProtect": "ມີລະຫັດປົກປ້ອງຟາຍນີ້ຈຶ່ງບໍ່ສາມາດເປີດໄດ້", + "DE.ApplicationController.errorFileSizeExceed": "ຂະໜາດຂອງຟາຍໃຫຍ່ກວ່າທີ່ກຳນົດໄວ້ໃນລະບົບ.
ກະລຸນະຕິດຕໍ່ຜູ້ຄຸ້ມຄອງລົບຂອງທ່ານ", + "DE.ApplicationController.errorSubmit": "ສົ່ງອອກຜິດພາດ", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "ການເຊື່ອຕໍ່ອິນເຕີເນັດຫາກໍ່ກັບມາ, ແລະຟາຍເອກະສານໄດ້ມີການປ່ຽນແປງແລ້ວ. ກ່ອນທີ່ທ່ານຈະດຳເນີການຕໍ່ໄປ, ທ່ານຕ້ອງໄດ້ດາວໂຫຼດຟາຍ ຫຼືສຳເນົາເນື້ອຫາ ເພື່ອປ້ອງການການສູນເສຍ, ແລະກໍ່ທຳການໂຫຼດໜ້າຄືນອີກຄັ້ງ.", + "DE.ApplicationController.errorUserDrop": "ບໍ່ສາມາດເຂົ້າເຖິງຟາຍໄດ້", + "DE.ApplicationController.notcriticalErrorTitle": "ເຕືອນ", + "DE.ApplicationController.scriptLoadError": "ການເຊື່ອມຕໍ່ອິນເຕີເນັດຊ້າເກີນໄປ, ບາງອົງປະກອບບໍ່ສາມາດໂຫຼດໄດ້. ກະລຸນາໂຫຼດໜ້ານີ້ຄືນໃໝ່", + "DE.ApplicationController.textClear": "ລຶບລ້າງຟີລທັງໝົດ", + "DE.ApplicationController.textLoadingDocument": "ກຳລັງໂຫຼດເອກະສານ", + "DE.ApplicationController.textNext": "ຟີລທັດໄປ", + "DE.ApplicationController.textOf": "ຂອງ", + "DE.ApplicationController.textSubmit": "ສົ່ງອອກ", + "DE.ApplicationController.textSubmited": " ແບບຟອມທີ່ສົ່ງມາແລ້ວ", + "DE.ApplicationController.txtClose": " ປິດ", + "DE.ApplicationController.unknownErrorText": "ມີຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ", + "DE.ApplicationController.unsupportedBrowserErrorText": "ບຣາວເຊີຂອງທ່ານບໍ່ສາມານຳໃຊ້ໄດ້", + "DE.ApplicationController.waitText": "ກະລຸນາລໍຖ້າ...", + "DE.ApplicationView.txtDownload": "ດາວໂຫຼດ", + "DE.ApplicationView.txtDownloadDocx": "ດາວໂຫລດເປັນເອກະສານ", + "DE.ApplicationView.txtDownloadPdf": "ດາວໂຫລດເປັນPDF", + "DE.ApplicationView.txtEmbed": "ຝັງໄວ້", + "DE.ApplicationView.txtFileLocation": "ເປີດບ່ອນຕຳແໜ່ງເອກະສານ", + "DE.ApplicationView.txtFullScreen": "ເຕັມຈໍ", + "DE.ApplicationView.txtPrint": "ພິມ", + "DE.ApplicationView.txtShare": "ແບ່ງປັນ" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/lv.json b/apps/documenteditor/forms/locale/lv.json new file mode 100644 index 000000000..eab88f7f9 --- /dev/null +++ b/apps/documenteditor/forms/locale/lv.json @@ -0,0 +1,22 @@ +{ + "common.view.modals.txtCopy": "Nokopēts starpliktuvē", + "common.view.modals.txtHeight": "Augstums", + "common.view.modals.txtWidth": "Platums", + "DE.ApplicationController.convertationErrorText": "Konversija neizdevās.", + "DE.ApplicationController.convertationTimeoutText": "Konversijas taimauts pārsniegts.", + "DE.ApplicationController.criticalErrorTitle": "Kļūda", + "DE.ApplicationController.downloadErrorText": "Lejuplāde neizdevās.", + "DE.ApplicationController.downloadTextText": "Lejuplādē dokumentu...", + "DE.ApplicationController.errorAccessDeny": "Jūs mēģināt veikt darbību, kuru nedrīkstat veikt.
Lūdzu, sazinieties ar savu dokumentu servera administratoru.", + "DE.ApplicationController.errorDefaultMessage": "Kļūdas kods: %1", + "DE.ApplicationController.errorFilePassProtect": "Fails ir aizsargāts ar paroli un to nevar atvērt.", + "DE.ApplicationController.errorUserDrop": "Failam šobrīd nevar piekļūt.", + "DE.ApplicationController.notcriticalErrorTitle": "Brīdinājums", + "DE.ApplicationController.textLoadingDocument": "Ielādē dokumentu", + "DE.ApplicationController.textOf": "no", + "DE.ApplicationController.txtClose": "Aizvērt", + "DE.ApplicationController.unknownErrorText": "Nezināma kļūda.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Jūsu pārlūkprogramma nav atbalstīta.", + "DE.ApplicationView.txtDownload": "Lejupielādēt", + "DE.ApplicationView.txtShare": "Dalīties" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/nb.json b/apps/documenteditor/forms/locale/nb.json new file mode 100644 index 000000000..cffee6416 --- /dev/null +++ b/apps/documenteditor/forms/locale/nb.json @@ -0,0 +1,19 @@ +{ + "common.view.modals.txtCopy": "Kopier til utklippstavle", + "common.view.modals.txtHeight": "Høyde", + "common.view.modals.txtShare": "Del link", + "common.view.modals.txtWidth": "Bredde", + "DE.ApplicationController.criticalErrorTitle": "Feil", + "DE.ApplicationController.downloadErrorText": "Nedlasting feilet.", + "DE.ApplicationController.errorDefaultMessage": "Feilkode: %1", + "DE.ApplicationController.notcriticalErrorTitle": "Advarsel", + "DE.ApplicationController.textLoadingDocument": "Laster dokument", + "DE.ApplicationController.textOf": "av", + "DE.ApplicationController.txtClose": "Lukk", + "DE.ApplicationController.unknownErrorText": "Ukjent feil.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Nettleseren din er ikke støttet.", + "DE.ApplicationController.waitText": "Vennligst vent...", + "DE.ApplicationView.txtDownload": "Last ned", + "DE.ApplicationView.txtFullScreen": "Fullskjerm", + "DE.ApplicationView.txtShare": "Del" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/nl.json b/apps/documenteditor/forms/locale/nl.json new file mode 100644 index 000000000..424c279f0 --- /dev/null +++ b/apps/documenteditor/forms/locale/nl.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Kopieer naar klembord", + "common.view.modals.txtEmbed": "Invoegen", + "common.view.modals.txtHeight": "Hoogte", + "common.view.modals.txtShare": "Link delen", + "common.view.modals.txtWidth": "Breedte", + "DE.ApplicationController.convertationErrorText": "Conversie is mislukt", + "DE.ApplicationController.convertationTimeoutText": "Time-out voor conversie overschreden.", + "DE.ApplicationController.criticalErrorTitle": "Fout", + "DE.ApplicationController.downloadErrorText": "Download mislukt.", + "DE.ApplicationController.downloadTextText": "Document wordt gedownload...", + "DE.ApplicationController.errorAccessDeny": "U probeert een actie uit te voeren waarvoor u geen rechten hebt.
Neem contact op met de beheerder van de documentserver.", + "DE.ApplicationController.errorDefaultMessage": "Foutcode: %1", + "DE.ApplicationController.errorEditingDownloadas": "Er is een fout ontstaan tijdens het werken met het document.
Gebruik de 'Opslaan als...' optie om het bestand als back-upkopie op te slaan op uw computer.", + "DE.ApplicationController.errorFilePassProtect": "Het bestand is beschermd met een wachtwoord en kan niet worden geopend.", + "DE.ApplicationController.errorFileSizeExceed": "De bestandsgrootte overschrijdt de limiet die is ingesteld voor uw server.
Neem contact op met uw Document Server-beheerder voor details.", + "DE.ApplicationController.errorSubmit": "Verzenden mislukt. ", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "De internetverbinding is hersteld en de bestandsversie is gewijzigd.
Voordat u verder kunt werken, moet u het bestand downloaden of de inhoud kopiëren om er zeker van te zijn dat er niets verloren gaat, en deze pagina vervolgens opnieuw laden.", + "DE.ApplicationController.errorUserDrop": "Toegang tot het bestand is op dit moment niet mogelijk.", + "DE.ApplicationController.notcriticalErrorTitle": "Waarschuwing", + "DE.ApplicationController.scriptLoadError": "De verbinding is te langzaam, sommige componenten konden niet geladen worden. Laad de pagina opnieuw.", + "DE.ApplicationController.textAnonymous": "Anoniem", + "DE.ApplicationController.textClear": "Wis Alle Velden", + "DE.ApplicationController.textGotIt": "OK", + "DE.ApplicationController.textGuest": "Gast", + "DE.ApplicationController.textLoadingDocument": "Document wordt geladen", + "DE.ApplicationController.textNext": "Volgend veld ", + "DE.ApplicationController.textOf": "van", + "DE.ApplicationController.textRequired": "Vul alle verplichte velden in om het formulier te verzenden.", + "DE.ApplicationController.textSubmit": "Verzenden ", + "DE.ApplicationController.textSubmited": "Formulier succesvol ingediend
Klik om de tip te sluiten", + "DE.ApplicationController.txtClose": "Sluiten", + "DE.ApplicationController.unknownErrorText": "Onbekende fout.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Uw browser wordt niet ondersteund.", + "DE.ApplicationController.waitText": "Een moment geduld", + "DE.ApplicationView.txtDownload": "Downloaden", + "DE.ApplicationView.txtDownloadDocx": "Downloaden als docx", + "DE.ApplicationView.txtDownloadPdf": "Downloaden als PDF", + "DE.ApplicationView.txtEmbed": "Invoegen", + "DE.ApplicationView.txtFileLocation": "Open bestandslocatie", + "DE.ApplicationView.txtFullScreen": "Volledig scherm", + "DE.ApplicationView.txtPrint": "Afdrukken", + "DE.ApplicationView.txtShare": "Delen" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/pl.json b/apps/documenteditor/forms/locale/pl.json new file mode 100644 index 000000000..b7b983c42 --- /dev/null +++ b/apps/documenteditor/forms/locale/pl.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Skopiuj do schowka", + "common.view.modals.txtEmbed": "Osadź", + "common.view.modals.txtHeight": "Wysokość", + "common.view.modals.txtShare": "Udostępnij link", + "common.view.modals.txtWidth": "Szerokość", + "DE.ApplicationController.convertationErrorText": "Konwertowanie nieudane.", + "DE.ApplicationController.convertationTimeoutText": "Przekroczono limit czasu konwersji.", + "DE.ApplicationController.criticalErrorTitle": "Błąd", + "DE.ApplicationController.downloadErrorText": "Pobieranie nieudane.", + "DE.ApplicationController.downloadTextText": "Pobieranie dokumentu...", + "DE.ApplicationController.errorAccessDeny": "Próbujesz wykonać działanie, na które nie masz uprawnień.
Proszę skontaktować się z administratorem serwera dokumentów.", + "DE.ApplicationController.errorDefaultMessage": "Kod błędu: %1", + "DE.ApplicationController.errorFilePassProtect": "Dokument jest chroniony hasłem i nie może być otwarty.", + "DE.ApplicationController.errorFileSizeExceed": "Rozmiar pliku przekracza dopuszczone limit dla twojego serwera.
Prosimy o kontakt z administratorem twojego serwera w celu uzyskania szczegółowych informacji.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Połączenie z internetem zostało odzyskane, a wersja pliku uległa zmianie.
Zanim będzie mógł kontynuować pracę, musisz pobrać plik albo skopiować jego zawartość, aby mieć pewność, że nic nie zostało utracone, a następnie odświeżyć stronę.", + "DE.ApplicationController.errorUserDrop": "Nie można uzyskać dostępu do tego pliku.", + "DE.ApplicationController.notcriticalErrorTitle": "Ostrzeżenie", + "DE.ApplicationController.scriptLoadError": "Połączenie jest zbyt wolne, niektóre komponenty mogą być niezaładowane. Prosimy odświeżyć stronę.", + "DE.ApplicationController.textLoadingDocument": "Ładowanie dokumentu", + "DE.ApplicationController.textOf": "z", + "DE.ApplicationController.txtClose": "Zamknij", + "DE.ApplicationController.unknownErrorText": "Nieznany błąd.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Twoja przeglądarka nie jest wspierana.", + "DE.ApplicationController.waitText": "Proszę czekać...", + "DE.ApplicationView.txtDownload": "Pobierz", + "DE.ApplicationView.txtEmbed": "Osadź", + "DE.ApplicationView.txtFullScreen": "Pełny ekran", + "DE.ApplicationView.txtPrint": "Drukuj", + "DE.ApplicationView.txtShare": "Udostępnij" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/pt.json b/apps/documenteditor/forms/locale/pt.json new file mode 100644 index 000000000..ec784e55d --- /dev/null +++ b/apps/documenteditor/forms/locale/pt.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Copiar para a área de transferência", + "common.view.modals.txtEmbed": "Incorporar", + "common.view.modals.txtHeight": "Altura", + "common.view.modals.txtShare": "Compartilhar link", + "common.view.modals.txtWidth": "Largura", + "DE.ApplicationController.convertationErrorText": "Conversão falhou.", + "DE.ApplicationController.convertationTimeoutText": "Tempo limite de conversão excedido.", + "DE.ApplicationController.criticalErrorTitle": "Erro", + "DE.ApplicationController.downloadErrorText": "Transferência falhou.", + "DE.ApplicationController.downloadTextText": "Transferindo documento...", + "DE.ApplicationController.errorAccessDeny": "Você está tentando executar uma ação para a qual não tem direitos.
Entre em contato com o administrador do Document Server.", + "DE.ApplicationController.errorDefaultMessage": "Código do erro: %1", + "DE.ApplicationController.errorEditingDownloadas": "Ocorreu um erro durante o trabalho com o documento.
Utilizar a opção 'Download as...' para salvar a cópia de backup do arquivo no disco rígido do seu computador.", + "DE.ApplicationController.errorFilePassProtect": "O documento é protegido por senha e não pode ser aberto.", + "DE.ApplicationController.errorFileSizeExceed": "O tamanho do arquivo excede o limite de seu servidor.
Por favor, contate seu administrador de Servidor de Documentos para detalhes.", + "DE.ApplicationController.errorSubmit": "Falha no envio.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "A conexão à internet foi restabelecida, e a versão do arquivo foi alterada.
Antes de continuar seu trabalho, transfira o arquivo ou copie seu conteúdo para assegurar que nada seja perdido, e então, recarregue esta página.", + "DE.ApplicationController.errorUserDrop": "O arquivo não pode ser acessado agora.", + "DE.ApplicationController.notcriticalErrorTitle": "Aviso", + "DE.ApplicationController.scriptLoadError": "A conexão está muito lenta, e alguns dos componentes não puderam ser carregados. Por favor, recarregue a página.", + "DE.ApplicationController.textAnonymous": "Anônimo", + "DE.ApplicationController.textClear": "Limpar todos os campos", + "DE.ApplicationController.textGotIt": "Entendi", + "DE.ApplicationController.textGuest": "Convidado(a)", + "DE.ApplicationController.textLoadingDocument": "Carregando documento", + "DE.ApplicationController.textNext": "Próximo campo", + "DE.ApplicationController.textOf": "de", + "DE.ApplicationController.textRequired": "Preencha todos os campos obrigatórios para enviar o formulário.", + "DE.ApplicationController.textSubmit": "Enviar", + "DE.ApplicationController.textSubmited": "Formulário apresentado com sucesso>br>Click para fechar a ponta", + "DE.ApplicationController.txtClose": "Fechar", + "DE.ApplicationController.unknownErrorText": "Erro desconhecido.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Seu navegador não é suportado.", + "DE.ApplicationController.waitText": "Aguarde...", + "DE.ApplicationView.txtDownload": "Transferir", + "DE.ApplicationView.txtDownloadDocx": "Baixar como docx", + "DE.ApplicationView.txtDownloadPdf": "Baixar como pdf", + "DE.ApplicationView.txtEmbed": "Incorporar", + "DE.ApplicationView.txtFileLocation": "Local do arquivo aberto", + "DE.ApplicationView.txtFullScreen": "Tela cheia", + "DE.ApplicationView.txtPrint": "Imprimir", + "DE.ApplicationView.txtShare": "Compartilhar" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/ro.json b/apps/documenteditor/forms/locale/ro.json new file mode 100644 index 000000000..2916153cc --- /dev/null +++ b/apps/documenteditor/forms/locale/ro.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Copiere cu clipbiard", + "common.view.modals.txtEmbed": "Încorporare", + "common.view.modals.txtHeight": "Înălțime", + "common.view.modals.txtShare": "Partajare link", + "common.view.modals.txtWidth": "Lățime", + "DE.ApplicationController.convertationErrorText": "Conversia nu a reușit.", + "DE.ApplicationController.convertationTimeoutText": "Timpul de așteptare pentru conversie a expirat.", + "DE.ApplicationController.criticalErrorTitle": "Eroare", + "DE.ApplicationController.downloadErrorText": "Descărcare eșuată.", + "DE.ApplicationController.downloadTextText": "Descărcarea documentului...", + "DE.ApplicationController.errorAccessDeny": "Nu aveți dreptul să efectuați acțiunea pe care doriți.
Contactați administratorul dumneavoastră de Server Documente.", + "DE.ApplicationController.errorDefaultMessage": "Codul de eroare: %1", + "DE.ApplicationController.errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.
Pentru copierea de rezervă pe PC utilizați opțiunea Descărcare ca...", + "DE.ApplicationController.errorFilePassProtect": "Fișierul este protejat cu parolă și deaceea nu poate fi deschis.", + "DE.ApplicationController.errorFileSizeExceed": "Dimensiunea fișierului depășește limita permisă de serverul Dvs.
Pentru detalii, contactați administratorul dumneavoastră de Server Documente.", + "DE.ApplicationController.errorSubmit": "Remiterea eșuată.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Conexiunea la Internet s-a restabilit și versiunea fișierului s-a schimbat.
Înainte de a continua, fișierul trebuie descărcat sau conținutul fișierului copiat ca să vă asigurați că nimic nu e pierdut, apoi reîmprospătați această pagină.", + "DE.ApplicationController.errorUserDrop": "Fișierul nu poate fi accesat deocamdată.", + "DE.ApplicationController.notcriticalErrorTitle": "Avertisment", + "DE.ApplicationController.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.", + "DE.ApplicationController.textAnonymous": "Anonim", + "DE.ApplicationController.textClear": "Goleşte toate câmpurile", + "DE.ApplicationController.textGotIt": "Am înțeles", + "DE.ApplicationController.textGuest": "Invitat", + "DE.ApplicationController.textLoadingDocument": "Încărcare document", + "DE.ApplicationController.textNext": "Câmpul următor", + "DE.ApplicationController.textOf": "din", + "DE.ApplicationController.textRequired": "Toate câmpurile din formular trebuie completate înainte de a-l trimite.", + "DE.ApplicationController.textSubmit": "Remitere", + "DE.ApplicationController.textSubmited": "Formularul a fost remis cu succes
Faceţi clic pentru a închide sfatul", + "DE.ApplicationController.txtClose": "Închidere", + "DE.ApplicationController.unknownErrorText": "Eroare necunoscută.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Browserul nu este compatibil.", + "DE.ApplicationController.waitText": "Vă rugăm să așteptați...", + "DE.ApplicationView.txtDownload": "Descărcare", + "DE.ApplicationView.txtDownloadDocx": "Descărcare ca docx", + "DE.ApplicationView.txtDownloadPdf": "Descărcare ca pdf", + "DE.ApplicationView.txtEmbed": "Încorporare", + "DE.ApplicationView.txtFileLocation": "Deschidere locația fișierului", + "DE.ApplicationView.txtFullScreen": "Ecran complet", + "DE.ApplicationView.txtPrint": "Imprimare", + "DE.ApplicationView.txtShare": "Partajează" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/ru.json b/apps/documenteditor/forms/locale/ru.json new file mode 100644 index 000000000..29a785721 --- /dev/null +++ b/apps/documenteditor/forms/locale/ru.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "Скопировать в буфер", + "common.view.modals.txtEmbed": "Встроить", + "common.view.modals.txtHeight": "Высота", + "common.view.modals.txtShare": "Поделиться ссылкой", + "common.view.modals.txtWidth": "Ширина", + "DE.ApplicationController.convertationErrorText": "Конвертация не удалась.", + "DE.ApplicationController.convertationTimeoutText": "Превышено время ожидания конвертации.", + "DE.ApplicationController.criticalErrorTitle": "Ошибка", + "DE.ApplicationController.downloadErrorText": "Загрузка не удалась.", + "DE.ApplicationController.downloadTextText": "Загрузка документа...", + "DE.ApplicationController.errorAccessDeny": "Вы пытаетесь выполнить действие, на которое у вас нет прав.
Пожалуйста, обратитесь к администратору Сервера документов.", + "DE.ApplicationController.errorDefaultMessage": "Код ошибки: %1", + "DE.ApplicationController.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.
Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.", + "DE.ApplicationController.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", + "DE.ApplicationController.errorFileSizeExceed": "Размер файла превышает ограничение, установленное для вашего сервера.
Обратитесь к администратору Сервера документов для получения дополнительной информации.", + "DE.ApplicationController.errorSubmit": "Не удалось отправить.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Подключение к Интернету было восстановлено, и версия файла изменилась.
Прежде чем продолжить работу, надо скачать файл или скопировать его содержимое, чтобы обеспечить сохранность данных, а затем перезагрузить страницу.", + "DE.ApplicationController.errorUserDrop": "В настоящий момент файл недоступен.", + "DE.ApplicationController.notcriticalErrorTitle": "Внимание", + "DE.ApplicationController.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", + "DE.ApplicationController.textAnonymous": "Анонимный пользователь", + "DE.ApplicationController.textClear": "Очистить все поля", + "DE.ApplicationController.textGotIt": "ОК", + "DE.ApplicationController.textGuest": "Гость", + "DE.ApplicationController.textLoadingDocument": "Загрузка документа", + "DE.ApplicationController.textNext": "Следующее поле", + "DE.ApplicationController.textOf": "из", + "DE.ApplicationController.textRequired": "Заполните все обязательные поля для отправки формы.", + "DE.ApplicationController.textSubmit": "Отправить", + "DE.ApplicationController.textSubmited": "Форма успешно отправлена
Нажмите, чтобы закрыть подсказку", + "DE.ApplicationController.txtClose": "Закрыть", + "DE.ApplicationController.unknownErrorText": "Неизвестная ошибка.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не поддерживается.", + "DE.ApplicationController.waitText": "Пожалуйста, подождите...", + "DE.ApplicationView.txtDownload": "Скачать файл", + "DE.ApplicationView.txtDownloadDocx": "Скачать как docx", + "DE.ApplicationView.txtDownloadPdf": "Скачать как pdf", + "DE.ApplicationView.txtEmbed": "Встроить", + "DE.ApplicationView.txtFileLocation": "Открыть расположение файла", + "DE.ApplicationView.txtFullScreen": "Во весь экран", + "DE.ApplicationView.txtPrint": "Печать", + "DE.ApplicationView.txtShare": "Поделиться" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/sk.json b/apps/documenteditor/forms/locale/sk.json new file mode 100644 index 000000000..7a3eebfc1 --- /dev/null +++ b/apps/documenteditor/forms/locale/sk.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Skopírovať do schránky", + "common.view.modals.txtEmbed": "Vložiť", + "common.view.modals.txtHeight": "Výška", + "common.view.modals.txtShare": "Zdieľať odkaz", + "common.view.modals.txtWidth": "Šírka", + "DE.ApplicationController.convertationErrorText": "Konverzia zlyhala.", + "DE.ApplicationController.convertationTimeoutText": "Prekročený čas konverzie.", + "DE.ApplicationController.criticalErrorTitle": "Chyba", + "DE.ApplicationController.downloadErrorText": "Sťahovanie zlyhalo.", + "DE.ApplicationController.downloadTextText": "Sťahovanie dokumentu...", + "DE.ApplicationController.errorAccessDeny": "Pokúšate sa vykonať akciu, na ktorú nemáte práva.
Prosím, kontaktujte svojho správcu dokumentového servera.", + "DE.ApplicationController.errorDefaultMessage": "Kód chyby: %1", + "DE.ApplicationController.errorFilePassProtect": "Dokument je chránený heslom a nie je možné ho otvoriť.", + "DE.ApplicationController.errorFileSizeExceed": "Veľkosť súboru prekračuje limity vášho servera.
Kontaktujte prosím vášho správcu dokumentového servera o ďalšie podrobnosti.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetové spojenie bolo obnovené a verzia súboru bola zmenená.
Predtým, než budete pokračovať v práci, potrebujete si stiahnuť súbor alebo kópiu jeho obsahu, aby sa nič nestratilo. Potom znovu načítajte stránku.", + "DE.ApplicationController.errorUserDrop": "K súboru nie je možné práve teraz získať prístup.", + "DE.ApplicationController.notcriticalErrorTitle": "Upozornenie", + "DE.ApplicationController.scriptLoadError": "Spojenie je príliš pomalé, niektoré komponenty nemožno nahrať. Obnovte prosím stránku.", + "DE.ApplicationController.textLoadingDocument": "Načítavanie dokumentu", + "DE.ApplicationController.textOf": "z", + "DE.ApplicationController.txtClose": "Zatvoriť", + "DE.ApplicationController.unknownErrorText": "Neznáma chyba.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Váš prehliadač nie je podporovaný.", + "DE.ApplicationController.waitText": "Prosím čakajte...", + "DE.ApplicationView.txtDownload": "Stiahnuť", + "DE.ApplicationView.txtEmbed": "Vložiť", + "DE.ApplicationView.txtFullScreen": "Celá obrazovka", + "DE.ApplicationView.txtPrint": "Tlačiť", + "DE.ApplicationView.txtShare": "Zdieľať" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/sl.json b/apps/documenteditor/forms/locale/sl.json new file mode 100644 index 000000000..018e14331 --- /dev/null +++ b/apps/documenteditor/forms/locale/sl.json @@ -0,0 +1,40 @@ +{ + "common.view.modals.txtCopy": "Kopiraj v odložišče", + "common.view.modals.txtEmbed": "Vdelano", + "common.view.modals.txtHeight": "Višina", + "common.view.modals.txtShare": "Deli povezavo", + "common.view.modals.txtWidth": "Širina", + "DE.ApplicationController.convertationErrorText": "Pogovor ni uspel.", + "DE.ApplicationController.convertationTimeoutText": "Pretvorbena prekinitev presežena.", + "DE.ApplicationController.criticalErrorTitle": "Napaka", + "DE.ApplicationController.downloadErrorText": "Prenos ni uspel.", + "DE.ApplicationController.downloadTextText": "Prenašanje dokumenta ...", + "DE.ApplicationController.errorAccessDeny": "Poskušate izvesti dejanje, za katerega nimate pravic.
Obrnite se na skrbnika strežnika dokumentov.", + "DE.ApplicationController.errorDefaultMessage": "Koda napake: %1", + "DE.ApplicationController.errorEditingDownloadas": "Med delom z dokumentom je prišlo do napake.
S funkcijo »Prenesi kot ...« shranite varnostno kopijo datoteke na trdi disk računalnika.", + "DE.ApplicationController.errorFilePassProtect": "Dokument je zaščiten z geslom in ga ni mogoče odpreti.", + "DE.ApplicationController.errorFileSizeExceed": "Velikost datoteke presega omejitev, nastavljeno za vaš strežnik.
Za podrobnosti se obrnite na skrbnika strežnika dokumentov.", + "DE.ApplicationController.errorSubmit": "Pošiljanje je spodletelo", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Povezava s spletom je bila obnovljena in spremenjena je različica datoteke.
Preden nadaljujete z delom, morate datoteko prenesti ali kopirati njeno vsebino, da se prepričate, da se nič ne izgubi, in nato znova naložite to stran.", + "DE.ApplicationController.errorUserDrop": "Do datoteke v tem trenutku ni možno dostopati.", + "DE.ApplicationController.notcriticalErrorTitle": "Opozorilo", + "DE.ApplicationController.scriptLoadError": "Povezava je počasna, nekatere komponente niso pravilno naložene.Prosimo osvežite stran.", + "DE.ApplicationController.textClear": "Počisti vsa polja", + "DE.ApplicationController.textLoadingDocument": "Nalaganje dokumenta", + "DE.ApplicationController.textNext": "Naslednje polje", + "DE.ApplicationController.textOf": "od", + "DE.ApplicationController.textSubmit": "Pošlji", + "DE.ApplicationController.textSubmited": "Obrazec poslan uspešno
Pritisnite tukaj za zaprtje obvestila", + "DE.ApplicationController.txtClose": "Zapri", + "DE.ApplicationController.unknownErrorText": "Neznana napaka.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Vaš brskalnik ni podprt.", + "DE.ApplicationController.waitText": "Prosimo počakajte ...", + "DE.ApplicationView.txtDownload": "Prenesi", + "DE.ApplicationView.txtDownloadDocx": "Prenesi kot DOCX", + "DE.ApplicationView.txtDownloadPdf": "Prenesi kot PDF", + "DE.ApplicationView.txtEmbed": "Vdelano", + "DE.ApplicationView.txtFileLocation": "Odpri lokacijo dokumenta", + "DE.ApplicationView.txtFullScreen": "Celozaslonski", + "DE.ApplicationView.txtPrint": "Natisni", + "DE.ApplicationView.txtShare": "Deli" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/sv.json b/apps/documenteditor/forms/locale/sv.json new file mode 100644 index 000000000..6516afa10 --- /dev/null +++ b/apps/documenteditor/forms/locale/sv.json @@ -0,0 +1,31 @@ +{ + "common.view.modals.txtCopy": "Kopiera till klippbord", + "common.view.modals.txtEmbed": "Inbädda", + "common.view.modals.txtHeight": "Höjd", + "common.view.modals.txtShare": "Delningslänk", + "common.view.modals.txtWidth": "Bredd", + "DE.ApplicationController.convertationErrorText": "Fel vid konvertering", + "DE.ApplicationController.convertationTimeoutText": "Konverteringstiden har överskridits.", + "DE.ApplicationController.criticalErrorTitle": "Fel", + "DE.ApplicationController.downloadErrorText": "Nedladdning misslyckades", + "DE.ApplicationController.downloadTextText": "Laddar ner dokumentet...", + "DE.ApplicationController.errorAccessDeny": "Du försöker utföra en åtgärd som du inte har rättighet till.
Vänligen kontakta din systemadministratör.", + "DE.ApplicationController.errorDefaultMessage": "Felkod: %1", + "DE.ApplicationController.errorFilePassProtect": "Dokumentet är lösenordsskyddat och kunde inte öppnas. ", + "DE.ApplicationController.errorFileSizeExceed": "Filstorleken överskrider gränsen för din server.
Var snäll och kontakta administratören för dokumentservern för mer information.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Internetanslutningen har återställts och filversionen har ändrats.
Innan du fortsätter arbeta, ladda ner filen eller kopiera innehållet för att försäkra dig om att inte förlora något, ladda sedan om denna sida.", + "DE.ApplicationController.errorUserDrop": "Filen kan inte nås för tillfället. ", + "DE.ApplicationController.notcriticalErrorTitle": "Varning", + "DE.ApplicationController.scriptLoadError": "Anslutningen är för långsam, vissa av komponenterna kunde inte laddas. Vänligen ladda om sidan.", + "DE.ApplicationController.textLoadingDocument": "Laddar dokument", + "DE.ApplicationController.textOf": "av", + "DE.ApplicationController.txtClose": "Stäng", + "DE.ApplicationController.unknownErrorText": "Okänt fel.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Din webbläsare stöds ej.", + "DE.ApplicationController.waitText": "Var snäll och vänta...", + "DE.ApplicationView.txtDownload": "Ladda ner", + "DE.ApplicationView.txtEmbed": "Inbädda", + "DE.ApplicationView.txtFullScreen": "Fullskärm", + "DE.ApplicationView.txtPrint": "Skriva ut", + "DE.ApplicationView.txtShare": "Dela" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/tr.json b/apps/documenteditor/forms/locale/tr.json new file mode 100644 index 000000000..6cc48ad89 --- /dev/null +++ b/apps/documenteditor/forms/locale/tr.json @@ -0,0 +1,38 @@ +{ + "common.view.modals.txtCopy": "Panoya kopyala", + "common.view.modals.txtEmbed": "Gömülü", + "common.view.modals.txtHeight": "Yükseklik", + "common.view.modals.txtShare": "Bağlantıyı Paylaş", + "common.view.modals.txtWidth": "Genişlik", + "DE.ApplicationController.convertationErrorText": "Değişim başarısız oldu.", + "DE.ApplicationController.convertationTimeoutText": "Değişim süresi aşıldı.", + "DE.ApplicationController.criticalErrorTitle": "Hata", + "DE.ApplicationController.downloadErrorText": "Yükleme başarısız oldu.", + "DE.ApplicationController.downloadTextText": "Döküman yükleniyor...", + "DE.ApplicationController.errorAccessDeny": "Hakkınız olmayan bir eylem gerçekleştirmeye çalışıyorsunuz.
Lütfen Belge Sunucu yöneticinize başvurun.", + "DE.ApplicationController.errorDefaultMessage": "Hata kodu: %1", + "DE.ApplicationController.errorFilePassProtect": "Döküman şifre korumalı ve açılamadı", + "DE.ApplicationController.errorSubmit": "Kaydetme başarısız oldu.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "İnternet bağlantısı tekrar sağlandı, ve dosya versiyon değişti.
Çalışmanıza devam etmeden önce, veri kaybını önlemeniz için dosyasının bir kopyasını indirmeniz ya da dosya içeriğini kopyalamanız ve sonrasında sayfayı yenilemeniz gerekmektedir.", + "DE.ApplicationController.errorUserDrop": "Belgeye şu an erişilemiyor.", + "DE.ApplicationController.notcriticalErrorTitle": "Uyarı", + "DE.ApplicationController.scriptLoadError": "Bağlantı çok yavaş, bileşenlerin bazıları yüklenemedi. Lütfen sayfayı yenileyin.", + "DE.ApplicationController.textClear": "Tüm alanları temizle", + "DE.ApplicationController.textLoadingDocument": "Döküman yükleniyor", + "DE.ApplicationController.textNext": "Sonraki alan", + "DE.ApplicationController.textOf": "'in", + "DE.ApplicationController.textSubmit": "Kaydet", + "DE.ApplicationController.textSubmited": "Form başarılı bir şekilde kaydedildi
İpucunu kapatmak için tıklayın", + "DE.ApplicationController.txtClose": "Kapat", + "DE.ApplicationController.unknownErrorText": "Bilinmeyen hata.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Tarayıcınız desteklenmiyor.", + "DE.ApplicationController.waitText": "Lütfen bekleyin...", + "DE.ApplicationView.txtDownload": "İndir", + "DE.ApplicationView.txtDownloadDocx": "docx olarak indir", + "DE.ApplicationView.txtDownloadPdf": "Pdf olarak indir", + "DE.ApplicationView.txtEmbed": "Gömülü", + "DE.ApplicationView.txtFileLocation": "Dosya konumunu aç", + "DE.ApplicationView.txtFullScreen": "Tam Ekran", + "DE.ApplicationView.txtPrint": "Yazdır", + "DE.ApplicationView.txtShare": "Paylaş" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/uk.json b/apps/documenteditor/forms/locale/uk.json new file mode 100644 index 000000000..9970b4f0c --- /dev/null +++ b/apps/documenteditor/forms/locale/uk.json @@ -0,0 +1,30 @@ +{ + "common.view.modals.txtCopy": "Копіювати в буфер обміну", + "common.view.modals.txtEmbed": "Вставити", + "common.view.modals.txtHeight": "Висота", + "common.view.modals.txtShare": "Поділитися посиланням", + "common.view.modals.txtWidth": "Ширина", + "DE.ApplicationController.convertationErrorText": "Не вдалося поспілкуватися.", + "DE.ApplicationController.convertationTimeoutText": "Термін переходу перевищено.", + "DE.ApplicationController.criticalErrorTitle": "Помилка", + "DE.ApplicationController.downloadErrorText": "Завантаження не вдалося", + "DE.ApplicationController.downloadTextText": "Завантаження документу...", + "DE.ApplicationController.errorAccessDeny": "Ви намагаєтеся виконати дію, на яку у вас немає прав.
Будь ласка, зв'яжіться з адміністратором вашого Сервера документів.", + "DE.ApplicationController.errorDefaultMessage": "Код помилки: %1", + "DE.ApplicationController.errorFilePassProtect": "Документ захищений паролем і його неможливо відкрити.", + "DE.ApplicationController.errorFileSizeExceed": "Розмір файлу перевищує обмеження, встановлені для вашого сервера.
Для детальної інформації зверніться до адміністратора сервера документів.", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Підключення до Інтернету було відновлено, а версія файлу змінена.
Перш ніж продовжувати роботу, потрібно завантажити файл або скопіювати його вміст, щоб переконатися, що нічого не втрачено, а потім перезавантажити цю сторінку.", + "DE.ApplicationController.errorUserDrop": "На даний момент файл не доступний.", + "DE.ApplicationController.notcriticalErrorTitle": "Застереження", + "DE.ApplicationController.scriptLoadError": "З'єднання занадто повільне, деякі компоненти не вдалося завантажити. Перезавантажте сторінку.", + "DE.ApplicationController.textLoadingDocument": "Завантаження документа", + "DE.ApplicationController.textOf": "з", + "DE.ApplicationController.txtClose": "Закрити", + "DE.ApplicationController.unknownErrorText": "Невідома помилка.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Ваш браузер не підтримується", + "DE.ApplicationController.waitText": "Будь ласка, зачекайте...", + "DE.ApplicationView.txtDownload": "Завантажити", + "DE.ApplicationView.txtEmbed": "Вставити", + "DE.ApplicationView.txtFullScreen": "Повноекранний режим", + "DE.ApplicationView.txtShare": "Доступ" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/vi.json b/apps/documenteditor/forms/locale/vi.json new file mode 100644 index 000000000..ad3225af9 --- /dev/null +++ b/apps/documenteditor/forms/locale/vi.json @@ -0,0 +1,22 @@ +{ + "common.view.modals.txtCopy": "Sao chép vào khay nhớ tạm", + "common.view.modals.txtHeight": "Chiều cao", + "common.view.modals.txtWidth": "Chiều rộng", + "DE.ApplicationController.convertationTimeoutText": "Đã quá thời gian chờ chuyển đổi.", + "DE.ApplicationController.criticalErrorTitle": "Lỗi", + "DE.ApplicationController.downloadErrorText": "Tải về không thành công.", + "DE.ApplicationController.downloadTextText": "Đang tải tài liệu...", + "DE.ApplicationController.errorAccessDeny": "Bạn đang cố gắng thực hiện hành động mà bạn không có quyền.
Vui lòng liên hệ với quản trị viên Server Tài liệu của bạn.", + "DE.ApplicationController.errorDefaultMessage": "Mã lỗi: %1", + "DE.ApplicationController.errorFilePassProtect": "Tài liệu được bảo vệ bằng mật khẩu và không thể mở được.", + "DE.ApplicationController.errorUserDrop": "Không thể truy cập file ngay lúc này.", + "DE.ApplicationController.notcriticalErrorTitle": "Cảnh báo", + "DE.ApplicationController.textLoadingDocument": "Đang tải tài liệu", + "DE.ApplicationController.textOf": "trên", + "DE.ApplicationController.txtClose": "Đóng", + "DE.ApplicationController.unknownErrorText": "Lỗi không xác định.", + "DE.ApplicationController.unsupportedBrowserErrorText": "Trình duyệt của bạn không được hỗ trợ.", + "DE.ApplicationView.txtDownload": "Tải về", + "DE.ApplicationView.txtFullScreen": "Toàn màn hình", + "DE.ApplicationView.txtShare": "Chia sẻ" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/locale/zh.json b/apps/documenteditor/forms/locale/zh.json new file mode 100644 index 000000000..24883a822 --- /dev/null +++ b/apps/documenteditor/forms/locale/zh.json @@ -0,0 +1,44 @@ +{ + "common.view.modals.txtCopy": "复制到剪贴板", + "common.view.modals.txtEmbed": "嵌入", + "common.view.modals.txtHeight": "高度", + "common.view.modals.txtShare": "分享链接", + "common.view.modals.txtWidth": "宽度", + "DE.ApplicationController.convertationErrorText": "转换失败", + "DE.ApplicationController.convertationTimeoutText": "转换超时", + "DE.ApplicationController.criticalErrorTitle": "错误", + "DE.ApplicationController.downloadErrorText": "下载失败", + "DE.ApplicationController.downloadTextText": "正在下载文件...", + "DE.ApplicationController.errorAccessDeny": "您正在尝试执行您没有权限的操作。
请联系您的文档服务器管理员.", + "DE.ApplicationController.errorDefaultMessage": "错误代码：%1", + "DE.ApplicationController.errorEditingDownloadas": "在处理文档期间发生错误。
使用“下载为…”选项将文件备份复制到您的计算机硬盘中。", + "DE.ApplicationController.errorFilePassProtect": "该文档受密码保护，无法被打开。", + "DE.ApplicationController.errorFileSizeExceed": "文件大小超出了为服务器设置的限制.
有关详细信息，请与文档服务器管理员联系。", + "DE.ApplicationController.errorSubmit": "提交失败", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "网络连接已恢复，文件版本已变更。
在继续工作之前，需要下载文件或复制其内容以避免丢失数据，然后刷新此页。", + "DE.ApplicationController.errorUserDrop": "该文件现在无法访问。", + "DE.ApplicationController.notcriticalErrorTitle": "警告", + "DE.ApplicationController.scriptLoadError": "连接速度过慢，部分组件无法被加载。请重新加载页面。", + "DE.ApplicationController.textAnonymous": "匿名", + "DE.ApplicationController.textClear": "清除所有字段", + "DE.ApplicationController.textGotIt": "知道了", + "DE.ApplicationController.textGuest": "访客", + "DE.ApplicationController.textLoadingDocument": "文件加载中…", + "DE.ApplicationController.textNext": "下一域", + "DE.ApplicationController.textOf": "的", + "DE.ApplicationController.textRequired": "要发送表单，请填写所有必填项目。", + "DE.ApplicationController.textSubmit": "提交", + "DE.ApplicationController.textSubmited": "表单成功地被提交了
点击以关闭贴士", + "DE.ApplicationController.txtClose": "关闭", + "DE.ApplicationController.unknownErrorText": "未知错误。", + "DE.ApplicationController.unsupportedBrowserErrorText": "您的浏览器不受支持", + "DE.ApplicationController.waitText": "请稍候...", + "DE.ApplicationView.txtDownload": "下载", + "DE.ApplicationView.txtDownloadDocx": "导出成docx格式", + "DE.ApplicationView.txtDownloadPdf": "导出成PDF格式", + "DE.ApplicationView.txtEmbed": "嵌入", + "DE.ApplicationView.txtFileLocation": "打开文件所在位置", + "DE.ApplicationView.txtFullScreen": "全屏", + "DE.ApplicationView.txtPrint": "打印", + "DE.ApplicationView.txtShare": "共享" +} \ No newline at end of file diff --git a/apps/documenteditor/forms/resources/less/application.less b/apps/documenteditor/forms/resources/less/application.less new file mode 100644 index 000000000..dd10de901 --- /dev/null +++ b/apps/documenteditor/forms/resources/less/application.less @@ -0,0 +1,2 @@ +// Common styles +@import "../../../../common/forms/resources/less/common.less"; \ No newline at end of file From d93a3740e5fc2712211b81960a3ec420948501bb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 6 Aug 2021 20:07:03 +0300 Subject: [PATCH 006/129] [DE] Support for form tips --- apps/common/forms/resources/less/common.less | 1 + .../app/controller/ApplicationController.js | 165 +++++++++++++++--- .../forms/app/view/ApplicationView.js | 14 +- apps/documenteditor/forms/index.html | 2 +- apps/documenteditor/forms/locale/en.json | 2 + 5 files changed, 160 insertions(+), 24 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index a1f29bb12..9246cb8ca 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -687,6 +687,7 @@ font-weight: bold; font-size: 11px; box-shadow: 0 6px 12px rgba(0,0,0,0.175); + max-width: 350px; padding: 5px 12px; white-space: pre-wrap; diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 262c8c9fd..4a0a63a24 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -16,7 +16,10 @@ define([ labelDocName, btnSubmit, _submitFail, $submitedTooltip, $requiredTooltip, - $ttEl, $tooltip; + $ttEl, $tooltip, + $listControlMenu, listControlItems = [], listObj, + bodyWidth = 0, + ttOffset = [0, -10]; DE.Controllers.ApplicationController = Backbone.Controller.extend(_.assign({ views: [ @@ -173,6 +176,7 @@ define([ onDocumentResize: function() { this.api && this.api.Resize(); + bodyWidth = $('body').width(); }, onBeforeUnload: function() { @@ -324,10 +328,11 @@ define([ $('#toolbar').addClass('bottom'); this.boxSdk.addClass('bottom'); $('#box-tools').removeClass('dropdown').addClass('dropup'); - // ttOffset[1] = -40; + ttOffset[1] = -40; } else { $('#toolbar').addClass('top'); this.boxSdk.addClass('top'); + ttOffset[1] = 40; } this.appOptions.customization = this.editorConfig.customization; @@ -665,34 +670,50 @@ define([ }, onDocMouseMove: function(data) { + var me = this; if (data) { - if (data.get_Type() == 1) { // hyperlink + var type = data.get_Type(); + if (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Form) { // hyperlink this.isHideBodyTip = false; + var str = (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? me.txtPressLink : data.get_FormHelpText(); + if (str.length>500) + str = str.substr(0, 500) + '...'; + str = Common.Utils.String.htmlEncode(str); + if ( !$ttEl ) { $ttEl = $('.hyperlink-tooltip'); $ttEl.tooltip({'container':'body', 'trigger':'manual'}); - $ttEl.on('shown.bs.tooltip', function(e) { - $tooltip = $ttEl.data('bs.tooltip').tip(); - - $tooltip.css({ - left: $ttEl.ttpos[0] + ttOffset[0], - top: $ttEl.ttpos[1] + ttOffset[1] - }); - - $tooltip.find('.tooltip-arrow').css({left: 10}); - }); } - if ( !$tooltip ) { - $ttEl.ttpos = [data.get_X(), data.get_Y()]; - $ttEl.tooltip('show'); - } else { - $tooltip.css({ - left:data.get_X() + ttOffset[0], - top:data.get_Y() + ttOffset[1] - }); + $ttEl.ttpos = [data.get_X(), data.get_Y()]; + if ( !$tooltip) + $tooltip = $ttEl.data('bs.tooltip').tip(); + + if (!$tooltip.is(':visible')) { + var tip = $ttEl.data('bs.tooltip'); + tip.options.title = str; + tip.show([-1000, -1000]); + } else + $tooltip.find('.tooltip-inner')['text'](str); + + var ttHeight = $tooltip.height(), + ttWidth = $tooltip.width(); + !bodyWidth && (bodyWidth = $('body').width()); + + $ttEl.ttpos[1] -= (ttHeight - ttOffset[1] + 20); + if ($ttEl.ttpos[0] + ttWidth + 10 >bodyWidth) { + $ttEl.ttpos[0] = bodyWidth - ttWidth - 5; + if ($ttEl.ttpos[1] < 0) + $ttEl.ttpos[1] += ttHeight + ttOffset[1] + 20; + } else if ($ttEl.ttpos[1] < 0) { + $ttEl.ttpos[1] = 0; + $ttEl.ttpos[0] += 20; } + $tooltip.css({ + left: $ttEl.ttpos[0], + top: $ttEl.ttpos[1] + }); } } }, @@ -784,6 +805,99 @@ define([ } }, + onShowContentControlsActions: function(obj, x, y) { + var me = this; + switch (obj.type) { + case Asc.c_oAscContentControlSpecificType.Picture: + if (obj.pr && obj.pr.get_Lock) { + var lock = obj.pr.get_Lock(); + if (lock == Asc.c_oAscSdtLockType.SdtContentLocked || lock==Asc.c_oAscSdtLockType.ContentLocked) + return; + } + this.api.asc_addImage(obj); + setTimeout(function(){ + me.api.asc_UncheckContentControlButtons(); + }, 500); + break; + case Asc.c_oAscContentControlSpecificType.DropDownList: + case Asc.c_oAscContentControlSpecificType.ComboBox: + this.onShowListActions(obj, x, y); + break; + } + }, + + onHideContentControlsActions: function() { + $listControlMenu && $listControlMenu.hide(); + this.api.asc_UncheckContentControlButtons(); + }, + + onShowListActions: function(obj, x, y) { + var type = obj.type, + props = obj.pr, + specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), + isForm = !!props.get_FormPr(), + me = this; + + var menuContainer = this.view.getMenuForm(); + + if (!$listControlMenu) { + $listControlMenu = menuContainer.find('ul'); + $listControlMenu.on('click', 'li', function(e) { + var value = $(e.target).attr('value'); + if (value) { + value = parseInt(value); + setTimeout(function(){ + (value!==-1) && me.api.asc_SelectContentControlListItem(listControlItems[value], listObj.get_InternalId()); + }, 1); + } + }); + $('#editor_sdk').on('click', function(e){ + if (e.target.localName == 'canvas') { + if (me._preventClick) + me._preventClick = false; + else { + $listControlMenu && $listControlMenu.hide(); + me.api.asc_UncheckContentControlButtons(); + } + } + }); + } + $listControlMenu.find('li').remove(); + listControlItems = []; + listObj = props; + + if (specProps) { + var k = 0; + if (isForm){ // for dropdown and combobox form control always add placeholder item + var text = props.get_PlaceholderText(); + $listControlMenu.append('
  • ' + + ((text.trim()!=='') ? text : me.txtEmpty) + + '
    • '); + listControlItems.push(''); + } + var count = specProps.get_ItemsCount(); + k = listControlItems.length; + for (var i=0; i' + + Common.Utils.String.htmlEncode(specProps.get_ItemDisplayText(i)) + + ''); + listControlItems.push(specProps.get_ItemValue(i)); + } + } + if (!isForm && listControlItems.length<1) { + $listControlMenu.append('
  • ' + + me.txtEmpty + + '
    • '); + listControlItems.push(-1); + } + } + + menuContainer.css({left: x, top : y}); + me._preventClick = true; + $listControlMenu.show(); + }, + onDocumentContentReady: function() { var me = this; @@ -859,6 +973,11 @@ define([ this.api.asc_registerCallback('asc_onPrint', _.bind(this.onPrint, this)); this.api.asc_registerCallback('asc_onPrintUrl', _.bind(this.onPrintUrl, this)); this.api.asc_registerCallback('sync_onAllRequiredFormsFilled', _.bind(this.onFillRequiredFields, this)); + if (this.appOptions.canFillForms) { + this.api.asc_registerCallback('asc_onShowContentControlsActions', _.bind(this.onShowContentControlsActions, this)); + this.api.asc_registerCallback('asc_onHideContentControlsActions', _.bind(this.onHideContentControlsActions, this)); + // this.api.asc_SetHighlightRequiredFields(true); + } Common.Gateway.on('processmouse', _.bind(this.onProcessMouse, this)); Common.Gateway.on('downloadas', _.bind(this.onDownloadAs, this)); @@ -1024,6 +1143,8 @@ define([ textRequired: 'Fill all required fields to send form.', textGotIt: 'Got it', errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", - textCloseTip: "Click to close the tip." + textCloseTip: "Click to close the tip.", + txtPressLink: 'Press Ctrl and click link', + txtEmpty: '(Empty)' }, DE.Controllers.ApplicationController)); }); diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index b6efe5e24..cfb2509b4 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -10,7 +10,8 @@ define([ 'use strict'; var $btnTools; - + var $menuForm; + DE.Views.ApplicationView = Backbone.View.extend({ // Render layout render: function() { @@ -38,6 +39,17 @@ define([ return $btnTools.parent().find(name); }, + getMenuForm: function() { + if (!$menuForm) { + $menuForm = $(''); + $('#editor_sdk').append($menuForm); + } + return $menuForm; + }, + txtDownload: 'Download', txtPrint: 'Print', txtShare: 'Share', diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index 4ecc26fd5..cae67bd44 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -222,7 +222,7 @@
    - + diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json index de0c0c291..2db8c2ef8 100644 --- a/apps/documenteditor/forms/locale/en.json +++ b/apps/documenteditor/forms/locale/en.json @@ -34,6 +34,8 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationController.txtEmpty": "(Empty)", + "DE.ApplicationController.txtPressLink": "Press Ctrl and click link", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtDownloadDocx": "Download as docx", "DE.ApplicationView.txtDownloadPdf": "Download as pdf", From 833530756ac5a88bd853e6a26127b949c58a9c77 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 7 Aug 2021 11:44:58 +0300 Subject: [PATCH 007/129] [DE forms] Use button component --- apps/common/forms/resources/less/common.less | 125 +++++++++++------ apps/common/main/resources/less/buttons.less | 8 +- .../app/controller/ApplicationController.js | 131 +++++++++--------- .../forms/app/view/ApplicationView.js | 52 ++++--- apps/documenteditor/forms/index.html | 7 +- .../forms/resources/less/application.less | 6 +- 6 files changed, 196 insertions(+), 133 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 9246cb8ca..18aaf35da 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -1,5 +1,13 @@ +@import "../../../../common/main/resources/less/asc-mixins.less"; + +// Bootstrap overwrite +@import "../../../../common/main/resources/less/variables.less"; +@import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; +@import "../../../../common/main/resources/less/colors-table-dark.less"; + // Core variables and mixins -@import "../../../../../vendor/bootstrap/less/variables.less"; +//@import "../../../../../vendor/bootstrap/less/variables.less"; @icon-font-path: "../../../../../vendor/bootstrap/dist/fonts/"; @@ -7,7 +15,7 @@ // Reset @import "../../../../../vendor/bootstrap/less/normalize.less"; -@import "../../../../../vendor/bootstrap/less/print.less"; +//@import "../../../../../vendor/bootstrap/less/print.less"; // Core CSS @import "../../../../../vendor/bootstrap/less/scaffolding.less"; @@ -29,31 +37,48 @@ //@import "breadcrumbs.less"; //@import "pagination.less"; //@import "pager.less"; -@import "../../../../../vendor/bootstrap/less/labels.less"; +//@import "../../../../../vendor/bootstrap/less/labels.less"; //@import "badges.less"; //@import "jumbotron.less"; //@import "thumbnails.less"; -@import "../../../../../vendor/bootstrap/less/alerts.less"; +//@import "../../../../../vendor/bootstrap/less/alerts.less"; //@import "progress-bars.less"; //@import "media.less"; //@import "list-group.less"; //@import "panels.less"; //@import "wells.less"; -@import "../../../../../vendor/bootstrap/less/close.less"; +//@import "../../../../../vendor/bootstrap/less/close.less"; // Components w/ JavaScript -@import "../../../../../vendor/bootstrap/less/modals.less"; +//@import "../../../../../vendor/bootstrap/less/modals.less"; @import "../../../../../vendor/bootstrap/less/tooltip.less"; //@import "../../../../../vendor/bootstrap/less/popovers.less"; @import "../../../../../vendor/bootstrap/less/dropdowns.less"; +@import "../../../../../vendor/bootstrap/less/button-groups.less"; +@import "../../../../../vendor/bootstrap/less/input-groups.less"; //@import "carousel.less"; // Utility classes @import "../../../../../vendor/bootstrap/less/utilities.less"; @import "../../../../../vendor/bootstrap/less/responsive-utilities.less"; +@import "../../../../common/main/resources/less/buttons.less"; +@import "../../../../common/main/resources/less/dropdown-menu.less"; +@import "../../../../common/main/resources/less/dropdown-submenu.less"; +@import "../../../../common/main/resources/less/separator.less"; +@import "../../../../common/main/resources/less/input.less"; +@import "../../../../common/main/resources/less/window.less"; +@import "../../../../common/main/resources/less/loadmask.less"; +@import "../../../../common/main/resources/less/dataview.less"; +@import "../../../../common/main/resources/less/tooltip.less"; +@import "../../../../common/main/resources/less/scroller.less"; +@import "../../../../common/main/resources/less/synchronize-tip.less"; +@import "../../../../common/main/resources/less/common.less"; +@import "../../../../common/main/resources/less/winxp_fix.less"; +@import "../../../../common/main/resources/less/calendar.less"; -@import "loadmask.less"; + +//@import "loadmask.less"; @toolbarBorderColor: #dbdbdb; @toolbarBorderShadowColor: #FAFAFA; @@ -566,13 +591,13 @@ vertical-align: middle; } -.btn, button { - &:focus, &:active:focus { - outline: 0 none; - } - - background-color: @btnColor; -} +//.btn, button { +// &:focus, &:active:focus { +// outline: 0 none; +// } +// +// background-color: @btnColor; +//} .modal-dialog { margin-top: 100px; @@ -628,36 +653,36 @@ } } -.dropdown-menu { - > li > a { - padding: 8px 20px 8px 28px; - &:hover, &:focus { - background-color: @btnColor; - outline: 0 none; - } - font-size: @buttonFontSize; - } - - .divider { - margin: 4px 0; - } -} - -.dropdown { - &.open { - > button { - background-color: @btnActiveColor !important; - background-position: -@icon-width*14 -@icon-height; - } - } -} - -#box-tools { - display: inline-block; - a { - cursor: pointer; - } -} +//.dropdown-menu { +// > li > a { +// padding: 8px 20px 8px 28px; +// &:hover, &:focus { +// background-color: @btnColor; +// outline: 0 none; +// } +// font-size: @buttonFontSize; +// } +// +// .divider { +// margin: 4px 0; +// } +//} +// +//.dropdown { +// &.open { +// > button { +// background-color: @btnActiveColor !important; +// background-position: -@icon-width*14 -@icon-height; +// } +// } +//} +// +//#box-tools { +// display: inline-block; +// a { +// cursor: pointer; +// } +//} .masked { background-color: transparent; @@ -779,4 +804,16 @@ font-weight: normal; } } +} + +.font-size-small { + .fontsize(@font-size-small); +} + +.font-size-normal { + .fontsize(@font-size-base); +} + +.font-size-large { + .fontsize(@font-size-large); } \ No newline at end of file diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 366d020b7..a4acc1163 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -442,6 +442,12 @@ height: 4px; } } + + &.no-caret { + .inner-box-caret { + display: none; + } + } } .btn-category { @@ -535,7 +541,7 @@ &:not(.split) { .btn-toolbar { - &.dropdown-toggle:not(.x-huge) { + &.dropdown-toggle:not(.x-huge):not(.no-caret) { width: 100%; min-width: 28px; } diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 4a0a63a24..c8165345f 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -280,7 +280,6 @@ define([ config.buttons = ['ok']; config.callback = _.bind(function(btn){ if (id == Asc.c_oAscError.ID.EditingError) { - this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print } this.onEditComplete(); @@ -327,7 +326,7 @@ define([ if (this.embedConfig.toolbarDocked === 'bottom') { $('#toolbar').addClass('bottom'); this.boxSdk.addClass('bottom'); - $('#box-tools').removeClass('dropdown').addClass('dropup'); + // $('#box-tools').removeClass('dropdown').addClass('dropup'); ttOffset[1] = -40; } else { $('#toolbar').addClass('top'); @@ -907,56 +906,58 @@ define([ var zf = (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -2); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); - var dividers = $('#box-tools .divider'); - var itemsCount = $('#box-tools a').length; + // var dividers = $('#box-tools .divider'); + // var itemsCount = $('#box-tools a').length; + // + var menuItems = this.view.btnOptions.menu.items; + var itemsCount = menuItems.length-3; if (!this.appOptions.canPrint) { - $('#idt-print').hide(); - $(dividers[0]).hide(); + menuItems[0].setVisible(false); + menuItems[1].setVisible(false); itemsCount--; } if ( !this.embedConfig.saveUrl && !this.appOptions.canPrint || this.appOptions.canFillForms) { - $('#idt-download').hide(); + menuItems[2].setVisible(false); itemsCount--; } if ( !this.appOptions.canFillForms || !this.appOptions.canDownload) { - $('#idt-download-docx').hide(); - $('#idt-download-pdf').hide(); - $(dividers[0]).hide(); - $(dividers[1]).hide(); + menuItems[3].setVisible(false); + menuItems[4].setVisible(false); + menuItems[1].setVisible(false); + menuItems[5].setVisible(false); itemsCount -= 2; } if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) { - $('#idt-share').hide(); + menuItems[6].setVisible(false); itemsCount--; } if (!this.appOptions.canBackToFolder) { - $('#idt-close').hide(); + menuItems[7].setVisible(false); itemsCount--; } if (itemsCount<3) - $(dividers[2]).hide(); + menuItems[8].setVisible(false); if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) { - $('#idt-embed').hide(); + menuItems[9].setVisible(false); itemsCount--; } if ( !this.embedConfig.fullscreenUrl ) { - $('#idt-fullscreen').hide(); + menuItems[10].setVisible(false); itemsCount--; } - // if ( !embedConfig.saveUrl && permissions.print === false && (!embedConfig.shareUrl || appOptions.canFillForms) && (!embedConfig.embedUrl || appOptions.canFillForms) && !embedConfig.fullscreenUrl && !config.canBackToFolder) if (itemsCount<1) - $('#box-tools').addClass('hidden'); + this.view.btnOptions.setVisible(false); else if ((!this.embedConfig.embedUrl || this.appOptions.canFillForms) && !this.embedConfig.fullscreenUrl) - $(dividers[2]).hide(); + menuItems[8].setVisible(false); // common.controller.modals.attach({ // share: '#idt-share', @@ -983,55 +984,9 @@ define([ Common.Gateway.on('downloadas', _.bind(this.onDownloadAs, this)); Common.Gateway.on('requestclose', _.bind(this.onRequestClose, this)); - this.view.getTools('#idt-fullscreen') - .on('click', function(){ - me.onHyperlinkClick(me.embedConfig.fullscreenUrl); - }); - - this.view.getTools('#idt-download') - .on('click', function(){ - if ( !!me.embedConfig.saveUrl ){ - me.onHyperlinkClick(embedConfig.saveUrl); - } else - if (me.api && me.appOptions.canPrint){ - me.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - } - - Common.Analytics.trackEvent('Save'); - }); - - this.view.getTools('#idt-print') - .on('click', function(){ - me.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - Common.Analytics.trackEvent('Print'); - }); - - this.view.getTools('#idt-close') - .on('click', function(){ - if (me.appOptions.customization && me.appOptions.customization.goback) { - if (me.appOptions.customization.goback.requestClose && me.appOptions.canRequestClose) - Common.Gateway.requestClose(); - else if (me.appOptions.customization.goback.url) - window.parent.location.href = me.appOptions.customization.goback.url; - } - }); - - var downloadAs = function(format){ - me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); - Common.Analytics.trackEvent('Save'); - }; - - this.view.getTools('#idt-download-docx') - .on('click', function(){ - downloadAs(Asc.c_oAscFileType.DOCX); - }); - this.view.getTools('#idt-download-pdf') - .on('click', function(){ - downloadAs(Asc.c_oAscFileType.PDF); - }); - - $('#id-btn-zoom-in').on('click', me.api.zoomIn.bind(me.api)); - $('#id-btn-zoom-out').on('click', me.api.zoomOut.bind(me.api)); + $('#id-btn-zoom-in').on('click', this.api.zoomIn.bind(this.api)); + $('#id-btn-zoom-out').on('click', this.api.zoomOut.bind(this.api)); + this.view.btnOptions.menu.on('item:click', _.bind(this.onOptionsClick, this)); var $pagenum = $('#page-number'); $pagenum.on({ @@ -1113,6 +1068,46 @@ define([ Common.Analytics.trackEvent('Load', 'Complete'); }, + onOptionsClick: function(menu, item, e) { + switch (item.value) { + case 'fullscr': + this.onHyperlinkClick(this.embedConfig.fullscreenUrl); + break; + case 'download': + if ( !!this.embedConfig.saveUrl ){ + this.onHyperlinkClick(this.embedConfig.saveUrl); + } else if (this.api && this.appOptions.canPrint){ + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + } + Common.Analytics.trackEvent('Save'); + break; + case 'print': + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + Common.Analytics.trackEvent('Print'); + break; + case 'close': + if (this.appOptions.customization && this.appOptions.customization.goback) { + if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) + Common.Gateway.requestClose(); + else if (this.appOptions.customization.goback.url) + window.parent.location.href = this.appOptions.customization.goback.url; + } + break; + case 'download-docx': + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX)); + Common.Analytics.trackEvent('Save'); + break; + case 'download-pdf': + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + Common.Analytics.trackEvent('Save'); + break; + case 'share': + break; + case 'embed': + break; + } + }, + errorDefaultMessage : 'Error code: %1', unknownErrorText : 'Unknown error.', convertationTimeoutText : 'Conversion timeout exceeded.', diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index cfb2509b4..7375cd5fe 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -15,23 +15,43 @@ define([ DE.Views.ApplicationView = Backbone.View.extend({ // Render layout render: function() { - $btnTools = $('#box-tools button'); + this.btnOptions = new Common.UI.Button({ + cls: 'btn-toolbar no-caret', + iconCls: 'svg-icon more-vertical', + menu: new Common.UI.Menu({ + items: [ + {caption: this.txtPrint, value: 'print', iconCls: 'mi-icon svg-icon print'}, + {caption: '--'}, + {caption: this.txtDownload, value: 'download', iconCls: 'mi-icon svg-icon download'}, + {caption: this.txtDownloadDocx, value: 'download-docx', iconCls: 'mi-icon svg-icon download'}, + {caption: this.txtDownloadPdf, value: 'download-pdf', iconCls: 'mi-icon'}, + {caption: '--'}, + {caption: this.txtShare, value: 'share', iconCls: 'mi-icon svg-icon share'}, + {caption: this.txtFileLocation, value: 'close', iconCls: 'mi-icon svg-icon go-to-location'}, + {caption: '--'}, + {caption: this.txtEmbed, value: 'embed', iconCls: 'mi-icon svg-icon embed'}, + {caption: this.txtFullScreen, value: 'fullscr', iconCls: 'mi-icon svg-icon fullscr'} + ] + }) + }); + this.btnOptions.render($('#box-tools')); - $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true'); - $btnTools.parent().append( - ''); + // $btnTools = $('#box-tools button'); + // $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true'); + // $btnTools.parent().append( + // ''); return this; }, diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index cae67bd44..f48095ca7 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -200,9 +200,10 @@
    of 0
    - + + + +
    diff --git a/apps/documenteditor/forms/resources/less/application.less b/apps/documenteditor/forms/resources/less/application.less index dd10de901..99de32a94 100644 --- a/apps/documenteditor/forms/resources/less/application.less +++ b/apps/documenteditor/forms/resources/less/application.less @@ -1,2 +1,6 @@ // Common styles -@import "../../../../common/forms/resources/less/common.less"; \ No newline at end of file +@import "../../../../common/forms/resources/less/common.less"; + +@header-background-color-ie: @toolbar-header-document-ie; +@header-background-color: var(--toolbar-header-document); + From 8fdb2109fe3d595b7dc5665299767bdf23b8ff8c Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 10 Aug 2021 18:00:50 +0300 Subject: [PATCH 008/129] [DE mobile] Fix Bug 47900 --- .../mobile/resources/less/common-ios.less | 8 ++ .../resources/less/common-material.less | 8 ++ apps/common/mobile/resources/less/common.less | 11 +++ .../mobile/src/controller/edit/EditText.jsx | 90 +++++++++++++++---- .../mobile/src/view/edit/EditText.jsx | 41 +++++++-- 5 files changed, 130 insertions(+), 28 deletions(-) diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 8e5fbb4ed..324c03a27 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -580,6 +580,14 @@ -ms-appearance: none; appearance: none; } + + // Fonts List + + .font-item { + .item-content { + padding-left: 0; + } + } } diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index f07fbf483..3062318fb 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -545,4 +545,12 @@ } } } + + // Fonts List + + .font-item { + .item-radio:not(.item-radio-icon-end) > .icon-radio { + margin-right: 0; + } + } } diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index d5415fd06..394561dfc 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -842,6 +842,17 @@ input[type="number"]::-webkit-inner-spin-button { box-shadow: inset 0 2px red; } +// Fonts List + +.font-item { + .item-inner { + overflow: hidden; + &:after { + left: 16px; + } + } +} + diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index bdd96e229..5ff8c8acc 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -4,6 +4,49 @@ import { EditText } from '../../view/edit/EditText' class EditTextController extends Component { constructor(props) { super(props); + + this.iconWidth = 302, + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, + this.thumbCanvas = document.createElement('canvas'), + this.thumbContext = this.thumbCanvas.getContext('2d'), + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ], + this.thumbIdx = 0, + this.listItemHeight = 26, + this.spriteCols = 1, + this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); + } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } componentDidMount() { @@ -198,25 +241,34 @@ class EditTextController extends Component { render() { return ( - ) } diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 66596233a..e3c663503 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -14,11 +14,21 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' ? t('Edit.textAuto') : size + ' ' + t('Edit.textPt'); const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; + const iconWidth = props.iconWidth; + const iconHeight = props.iconHeight; + const thumbs = props.thumbs; + const thumbIdx = props.thumbIdx; + const thumbCanvas = props.thumbCanvas; + const thumbContext = props.thumbContext; + const spriteCols = props.spriteCols; + const spriteThumbs = props.spriteThumbs; + const [vlFonts, setVlFonts] = useState({ vlData: { items: [], } }); + const renderExternal = (vl, vlData) => { setVlFonts((prevState) => { let fonts = [...prevState.vlData.items]; @@ -29,6 +39,13 @@ const PageFonts = props => { }); }; + const getImageUri = (font) => { + thumbContext.clearRect(0, 0, thumbs[thumbIdx].width, thumbs[thumbIdx].height); + thumbContext.drawImage(spriteThumbs, 0, -thumbs[thumbIdx].height * Math.floor(font.imgidx / spriteCols)); + + return thumbCanvas.toDataURL(); + } + return ( @@ -63,14 +80,12 @@ const PageFonts = props => { }}>
      {vlFonts.vlData.items.map((item, index) => ( - {storeTextSettings.changeFontFamily(item.name); props.changeFontFamily(item.name)}} - > + { + storeTextSettings.changeFontFamily(item.name); + props.changeFontFamily(item.name) + }}> + + ))}
    @@ -500,7 +515,15 @@ const EditText = props => { From a7fa0baba8a601e66f217126a4157c3d3e0e7ba7 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 11 Aug 2021 17:47:57 +0300 Subject: [PATCH 009/129] [PE SSE mobile] Fix Bug 47900 --- .../mobile/src/controller/edit/EditText.jsx | 51 +++++++++++++++++++ .../mobile/src/view/edit/EditText.jsx | 38 ++++++++++---- .../mobile/src/controller/edit/EditText.jsx | 51 +++++++++++++++++++ .../mobile/src/view/edit/EditText.jsx | 38 ++++++++++---- 4 files changed, 160 insertions(+), 18 deletions(-) diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 46dae3c2a..a0ba92bea 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -8,6 +8,49 @@ import { EditText } from '../../view/edit/EditText'; class EditTextController extends Component { constructor (props) { super(props); + + this.iconWidth = 302, + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, + this.thumbCanvas = document.createElement('canvas'), + this.thumbContext = this.thumbCanvas.getContext('2d'), + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ], + this.thumbIdx = 0, + this.listItemHeight = 26, + this.spriteCols = 1, + this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); + } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } toggleBold(value) { @@ -250,6 +293,14 @@ class EditTextController extends Component { onBullet={this.onBullet} onNumber={this.onNumber} onLineSpacing={this.onLineSpacing} + spriteThumbs={this.spriteThumbs} + thumbs={this.thumbs} + thumbIdx={this.thumbIdx} + iconWidth={this.iconWidth} + iconHeight={this.iconHeight} + thumbCanvas={this.thumbCanvas} + thumbContext={this.thumbContext} + spriteCols={this.spriteCols} /> ) } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index a19b5a4ea..df2e8b543 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -57,7 +57,15 @@ const EditText = props => { @@ -185,6 +193,14 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' || size == '' ? _t.textAuto : size + ' ' + _t.textPt; const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; + const iconWidth = props.iconWidth; + const iconHeight = props.iconHeight; + const thumbs = props.thumbs; + const thumbIdx = props.thumbIdx; + const thumbCanvas = props.thumbCanvas; + const thumbContext = props.thumbContext; + const spriteCols = props.spriteCols; + const spriteThumbs = props.spriteThumbs; const [vlFonts, setVlFonts] = useState({ vlData: { @@ -202,6 +218,13 @@ const PageFonts = props => { }); }; + const getImageUri = (font) => { + thumbContext.clearRect(0, 0, thumbs[thumbIdx].width, thumbs[thumbIdx].height); + thumbContext.drawImage(spriteThumbs, 0, -thumbs[thumbIdx].height * Math.floor(font.imgidx / spriteCols)); + + return thumbCanvas.toDataURL(); + } + const paragraph = props.storeFocusObjects.paragraphObject; if (!paragraph && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); @@ -242,14 +265,11 @@ const PageFonts = props => { }}>
      {vlFonts.vlData.items.map((item, index) => ( - {props.changeFontFamily(item.name)}} - > + { + props.changeFontFamily(item.name); + }}> + + ))}
    diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx index 3aac994dd..af37c08c7 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx @@ -7,6 +7,49 @@ import { EditText } from '../../view/edit/EditText'; class EditTextController extends Component { constructor (props) { super(props); + + this.iconWidth = 302, + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, + this.thumbCanvas = document.createElement('canvas'), + this.thumbContext = this.thumbCanvas.getContext('2d'), + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ], + this.thumbIdx = 0, + this.listItemHeight = 26, + this.spriteCols = 1, + this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); + } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } toggleBold(value) { @@ -100,6 +143,14 @@ class EditTextController extends Component { changeFontSize={this.changeFontSize} changeFontFamily={this.changeFontFamily} onTextColor={this.onTextColor} + spriteThumbs={this.spriteThumbs} + thumbs={this.thumbs} + thumbIdx={this.thumbIdx} + iconWidth={this.iconWidth} + iconHeight={this.iconHeight} + thumbCanvas={this.thumbCanvas} + thumbContext={this.thumbContext} + spriteCols={this.spriteCols} /> ) } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx index edd1f410f..860c1d92d 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx @@ -32,7 +32,15 @@ const EditText = props => { @@ -98,6 +106,14 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' ? _t.textAuto : size + ' ' + _t.textPt; const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; + const iconWidth = props.iconWidth; + const iconHeight = props.iconHeight; + const thumbs = props.thumbs; + const thumbIdx = props.thumbIdx; + const thumbCanvas = props.thumbCanvas; + const thumbContext = props.thumbContext; + const spriteCols = props.spriteCols; + const spriteThumbs = props.spriteThumbs; const [vlFonts, setVlFonts] = useState({ vlData: { @@ -115,6 +131,13 @@ const PageFonts = props => { }); }; + const getImageUri = (font) => { + thumbContext.clearRect(0, 0, thumbs[thumbIdx].width, thumbs[thumbIdx].height); + thumbContext.drawImage(spriteThumbs, 0, -thumbs[thumbIdx].height * Math.floor(font.imgidx / spriteCols)); + + return thumbCanvas.toDataURL(); + } + return ( @@ -147,14 +170,11 @@ const PageFonts = props => { }}>
      {vlFonts.vlData.items.map((item, index) => ( - {props.changeFontFamily(item.name)}} - > + { + props.changeFontFamily(item.name) + }}> + + ))}
    From 53add1d1d9f83920d1ec587b7682d6fbade901a1 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 12 Aug 2021 13:04:40 +0300 Subject: [PATCH 010/129] [DE] Fix form settings template --- .../main/app/template/FormSettings.template | 70 +++++++++---------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/apps/documenteditor/main/app/template/FormSettings.template b/apps/documenteditor/main/app/template/FormSettings.template index e43b4b60e..341658df1 100644 --- a/apps/documenteditor/main/app/template/FormSettings.template +++ b/apps/documenteditor/main/app/template/FormSettings.template @@ -34,11 +34,44 @@
    + + + + + + + +
    + + +
    + + + + +
    + + +
    +
    +
    + +
    + + +
    + + + + +
    + +
    @@ -58,20 +91,10 @@ - +
    - - -
    - - - - -
    - - @@ -89,31 +112,6 @@ - - - - - - - - - - - - -
    - -
    -
    -     		-
    -
    -
    -     		-
    -
    -
    -
    - - - - @@ -112,6 +106,14 @@
    From d429cc027a605fcaba217f6e41aeadaad7393b92 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 12 Aug 2021 13:23:47 +0300 Subject: [PATCH 011/129] [DE] Make border color visible in all forms --- .../main/app/template/FormSettings.template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/template/FormSettings.template b/apps/documenteditor/main/app/template/FormSettings.template index 341658df1..a2762b47e 100644 --- a/apps/documenteditor/main/app/template/FormSettings.template +++ b/apps/documenteditor/main/app/template/FormSettings.template @@ -89,14 +89,8 @@
    - -
    -
    +
    + + + + +
    + +
    +
    + + +
    From 20cfb07621668b73c869b703a2186e909f2a910c Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 12 Aug 2021 20:06:16 +0300 Subject: [PATCH 012/129] [DE] Add background color in form settings --- .../main/app/controller/RightMenu.js | 1 + .../main/app/template/FormSettings.template | 6 ++ .../main/app/view/FormSettings.js | 74 ++++++++++++++++++- apps/documenteditor/main/locale/en.json | 1 + 4 files changed, 81 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index baac421e7..01f508e3e 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -321,6 +321,7 @@ define([ this.rightmenu.tableSettings.UpdateThemeColors(); this.rightmenu.shapeSettings.UpdateThemeColors(); this.rightmenu.textartSettings.UpdateThemeColors(); + this.rightmenu.formSettings.UpdateThemeColors(); }, updateMetricUnit: function() { diff --git a/apps/documenteditor/main/app/template/FormSettings.template b/apps/documenteditor/main/app/template/FormSettings.template index a2762b47e..b87b2e27e 100644 --- a/apps/documenteditor/main/app/template/FormSettings.template +++ b/apps/documenteditor/main/app/template/FormSettings.template @@ -113,6 +113,12 @@
    + +
    +
    diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index a997eaace..1c6afaef2 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -659,6 +659,26 @@ define([ } }, + onColorBGSelect: function(btn, color) { + this.BackgroundColor = color; + this._state.BackgroundColor = undefined; + + var props = this._originalProps || new AscCommon.CContentControlPr(); + var formPr = this._originalFormProps || new AscCommon.CSdtFormPr(); + + if (this.api) { + if (color === 'transparent') { + formPr.put_Shd(false); + } else { + formPr.put_Shd(true, Common.Utils.ThemeColor.getRgbColor(color)); + } + props.put_FormPr(formPr); + this.api.asc_SetContentControlProperties(props, this.internalId); + } + + this.fireEvent('editcomplete', this); + }, + onColorPickerSelect: function(btn, color) { this.BorderColor = color; this._state.BorderColor = undefined; @@ -863,6 +883,45 @@ define([ (this.BorderColor != 'transparent') && this.mnuColorPicker.selectByRGB(typeof(this.BorderColor) == 'object' ? this.BorderColor.color : this.BorderColor,true); this._state.BorderColor = this.BorderColor; } + + var shd = formPr.get_Shd(); + if (shd) { + var bgColor = shd.get_Color(); + if (bgColor) { + if (bgColor.get_type() === Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + this.BackgroundColor = {color: Common.Utils.ThemeColor.getHexColor(bgColor.get_r(), bgColor.get_g(), bgColor.get_b()), effectValue: bgColor.get_value() }; + } else { + this.BackgroundColor = Common.Utils.ThemeColor.getHexColor(bgColor.get_r(), bgColor.get_g(), bgColor.get_b()); + } + } else + this.BackgroundColor = 'transparent'; + } else { + this.BackgroundColor = 'transparent'; + } + + type1 = typeof(this.BackgroundColor); + type2 = typeof(this._state.BackgroundColor); + if ( (type1 !== type2) || (type1 === 'object' && + (this.BackgroundColor.effectValue!==this._state.BackgroundColor.effectValue || this._state.BackgroundColor.color.indexOf(this.BackgroundColor.color)<0)) || + (type1 !== 'object' && this._state.BackgroundColor.indexOf(this.BackgroundColor)<0 )) { + + this.btnBGColor.setColor(this.BackgroundColor); + if ( typeof(this.BackgroundColor) == 'object' ) { + var isselected = false; + for (i=0; i<10; i++) { + if ( Common.Utils.ThemeColor.ThemeValues[i] === this.BackgroundColor.effectValue ) { + this.mnuBGColorPicker.select(this.BackgroundColor, true); + isselected = true; + break; + } + } + if (!isselected) this.mnuBGColorPicker.clearSelection(); + } else + this.mnuBGColorPicker.select(this.BackgroundColor,true); + + this._state.BackgroundColor = this.BackgroundColor; + } + } var pictPr = props.get_PictureFormPr(); @@ -980,6 +1039,18 @@ define([ this.btnColor.setMenu(); this.mnuColorPicker = this.btnColor.getPicker(); } + if (!this.btnBGColor) { + this.btnBGColor = new Common.UI.ColorButton({ + parentEl: $('#form-background-color-btn'), + transparent: true, + menu: true + }); + this.lockedControls.push(this.btnBGColor); + this.btnBGColor.on('color:select', _.bind(this.onColorBGSelect, this)); + this.btnBGColor.setMenu(); + this.mnuBGColorPicker = this.btnBGColor.getPicker(); + } + this.mnuBGColorPicker.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); }, onHideMenus: function(menu, e, isFromInputControl){ @@ -1090,7 +1161,8 @@ define([ textNever: 'Never', textTooBig: 'Image is Too Big', textTooSmall: 'Image is Too Small', - textScale: 'When to scale' + textScale: 'When to scale', + textBackgroundColor: 'Background Color' }, DE.Views.FormSettings || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 9c33f4a6b..280ac3b03 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1776,6 +1776,7 @@ "DE.Views.FormSettings.textUnlock": "Unlock", "DE.Views.FormSettings.textValue": "Value Options", "DE.Views.FormSettings.textWidth": "Cell width", + "DE.Views.FormSettings.textBackgroundColor": "Background Color", "DE.Views.FormsTab.capBtnCheckBox": "Checkbox", "DE.Views.FormsTab.capBtnComboBox": "Combo Box", "DE.Views.FormsTab.capBtnDropDown": "Dropdown", From c149e6da48c0720c59dc615207511c00ff5de8b4 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 13 Aug 2021 17:59:31 +0300 Subject: [PATCH 013/129] [DE PE SSE mobile] Correct text settings --- .../mobile/src/controller/edit/EditText.jsx | 51 --------------- .../mobile/src/store/textSettings.js | 64 ++++++++++++++++++- .../mobile/src/view/edit/EditText.jsx | 26 +++----- .../mobile/src/controller/edit/EditText.jsx | 51 --------------- .../mobile/src/store/textSettings.js | 63 +++++++++++++++++- .../mobile/src/view/edit/EditText.jsx | 26 +++----- .../mobile/src/controller/edit/EditText.jsx | 51 --------------- .../mobile/src/store/textSettings.js | 63 +++++++++++++++++- .../mobile/src/view/edit/EditText.jsx | 26 +++----- 9 files changed, 214 insertions(+), 207 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index 5ff8c8acc..3f22efa08 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -4,49 +4,6 @@ import { EditText } from '../../view/edit/EditText' class EditTextController extends Component { constructor(props) { super(props); - - this.iconWidth = 302, - this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, - this.thumbCanvas = document.createElement('canvas'), - this.thumbContext = this.thumbCanvas.getContext('2d'), - this.thumbs = [ - {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, - {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, - {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} - ], - this.thumbIdx = 0, - this.listItemHeight = 26, - this.spriteCols = 1, - this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); - - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - - let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); - let currentDistance = 0; - - for (let i = 1; i < this.thumbs.length; i++) { - currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); - if (currentDistance < (bestDistance - 0.0001)) - { - bestDistance = currentDistance; - this.thumbIdx = i; - } - } - - this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; - this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; - - this.loadSprite(); - } - - loadSprite() { - this.spriteThumbs = new Image(); - this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; - this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } componentDidMount() { @@ -261,14 +218,6 @@ class EditTextController extends Component { onNumber={this.onNumber} onMultiLevelList={this.onMultiLevelList} onLineSpacing={this.onLineSpacing} - spriteThumbs={this.spriteThumbs} - thumbs={this.thumbs} - thumbIdx={this.thumbIdx} - iconWidth={this.iconWidth} - iconHeight={this.iconHeight} - thumbCanvas={this.thumbCanvas} - thumbContext={this.thumbContext} - spriteCols={this.spriteCols} /> ) } diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js index a132bdac9..38402cfdc 100644 --- a/apps/documenteditor/mobile/src/store/textSettings.js +++ b/apps/documenteditor/mobile/src/store/textSettings.js @@ -39,10 +39,27 @@ export class storeTextSettings { changeCustomTextColors: action, resetLineSpacing: action, resetBackgroundColor: action, - changeFontFamily: action + changeFontFamily: action, + iconWidth: observable, + iconHeight: observable, + thumbCanvas: observable, + thumbContext: observable, + thumbs: observable, + thumbIdx: observable, + listItemHeight: observable, + spriteCols: observable, + loadSprite: action }); } + iconWidth; + iconHeight; + thumbCanvas; + thumbContext; + thumbs; + thumbIdx = 0; + listItemHeight = 28; + spriteCols = 1; fontsArray = []; fontName = ''; fontSize = undefined; @@ -80,7 +97,52 @@ export class storeTextSettings { }); this.fontsArray = array; + this.iconWidth = 300; + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 28; + this.thumbCanvas = document.createElement('canvas'); + this.thumbContext = this.thumbCanvas.getContext('2d'); + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ]; + + const applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); + this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; + } + resetFontName (font) { let name = (typeof font.get_Name) === "function" ? font.get_Name() : font.asc_getName(); this.fontName = name; diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index e3c663503..c86b00387 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -14,14 +14,14 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' ? t('Edit.textAuto') : size + ' ' + t('Edit.textPt'); const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; - const iconWidth = props.iconWidth; - const iconHeight = props.iconHeight; - const thumbs = props.thumbs; - const thumbIdx = props.thumbIdx; - const thumbCanvas = props.thumbCanvas; - const thumbContext = props.thumbContext; - const spriteCols = props.spriteCols; - const spriteThumbs = props.spriteThumbs; + const iconWidth = storeTextSettings.iconWidth; + const iconHeight = storeTextSettings.iconHeight; + const thumbs = storeTextSettings.thumbs; + const thumbIdx = storeTextSettings.thumbIdx; + const thumbCanvas = storeTextSettings.thumbCanvas; + const thumbContext = storeTextSettings.thumbContext; + const spriteCols = storeTextSettings.spriteCols; + const spriteThumbs = storeTextSettings.spriteThumbs; const [vlFonts, setVlFonts] = useState({ vlData: { @@ -515,15 +515,7 @@ const EditText = props => { diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index a0ba92bea..46dae3c2a 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -8,49 +8,6 @@ import { EditText } from '../../view/edit/EditText'; class EditTextController extends Component { constructor (props) { super(props); - - this.iconWidth = 302, - this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, - this.thumbCanvas = document.createElement('canvas'), - this.thumbContext = this.thumbCanvas.getContext('2d'), - this.thumbs = [ - {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, - {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, - {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} - ], - this.thumbIdx = 0, - this.listItemHeight = 26, - this.spriteCols = 1, - this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); - - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - - let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); - let currentDistance = 0; - - for (let i = 1; i < this.thumbs.length; i++) { - currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); - if (currentDistance < (bestDistance - 0.0001)) - { - bestDistance = currentDistance; - this.thumbIdx = i; - } - } - - this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; - this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; - - this.loadSprite(); - } - - loadSprite() { - this.spriteThumbs = new Image(); - this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; - this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } toggleBold(value) { @@ -293,14 +250,6 @@ class EditTextController extends Component { onBullet={this.onBullet} onNumber={this.onNumber} onLineSpacing={this.onLineSpacing} - spriteThumbs={this.spriteThumbs} - thumbs={this.thumbs} - thumbIdx={this.thumbIdx} - iconWidth={this.iconWidth} - iconHeight={this.iconHeight} - thumbCanvas={this.thumbCanvas} - thumbContext={this.thumbContext} - spriteCols={this.spriteCols} /> ) } diff --git a/apps/presentationeditor/mobile/src/store/textSettings.js b/apps/presentationeditor/mobile/src/store/textSettings.js index 524a26b15..3fc005ec9 100644 --- a/apps/presentationeditor/mobile/src/store/textSettings.js +++ b/apps/presentationeditor/mobile/src/store/textSettings.js @@ -40,10 +40,27 @@ export class storeTextSettings { resetParagraphValign: action, resetTextColor: action, changeCustomTextColors: action, - resetLineSpacing: action + resetLineSpacing: action, + iconWidth: observable, + iconHeight: observable, + thumbCanvas: observable, + thumbContext: observable, + thumbs: observable, + thumbIdx: observable, + listItemHeight: observable, + spriteCols: observable, + loadSprite: action }); } + iconWidth; + iconHeight; + thumbCanvas; + thumbContext; + thumbs; + thumbIdx = 0; + listItemHeight = 28; + spriteCols = 1; fontsArray = []; fontName = ''; fontSize = undefined; @@ -81,6 +98,50 @@ export class storeTextSettings { }); this.fontsArray = array; + this.iconWidth = 300; + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 28; + this.thumbCanvas = document.createElement('canvas'); + this.thumbContext = this.thumbCanvas.getContext('2d'); + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ]; + + const applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); + this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); + } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } resetFontName (font) { diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index df2e8b543..2ec85cd6b 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -57,15 +57,7 @@ const EditText = props => { @@ -193,14 +185,14 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' || size == '' ? _t.textAuto : size + ' ' + _t.textPt; const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; - const iconWidth = props.iconWidth; - const iconHeight = props.iconHeight; - const thumbs = props.thumbs; - const thumbIdx = props.thumbIdx; - const thumbCanvas = props.thumbCanvas; - const thumbContext = props.thumbContext; - const spriteCols = props.spriteCols; - const spriteThumbs = props.spriteThumbs; + const iconWidth = storeTextSettings.iconWidth; + const iconHeight = storeTextSettings.iconHeight; + const thumbs = storeTextSettings.thumbs; + const thumbIdx = storeTextSettings.thumbIdx; + const thumbCanvas = storeTextSettings.thumbCanvas; + const thumbContext = storeTextSettings.thumbContext; + const spriteCols = storeTextSettings.spriteCols; + const spriteThumbs = storeTextSettings.spriteThumbs; const [vlFonts, setVlFonts] = useState({ vlData: { diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx index af37c08c7..3aac994dd 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditText.jsx @@ -7,49 +7,6 @@ import { EditText } from '../../view/edit/EditText'; class EditTextController extends Component { constructor (props) { super(props); - - this.iconWidth = 302, - this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 26, - this.thumbCanvas = document.createElement('canvas'), - this.thumbContext = this.thumbCanvas.getContext('2d'), - this.thumbs = [ - {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, - {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, - {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} - ], - this.thumbIdx = 0, - this.listItemHeight = 26, - this.spriteCols = 1, - this.applicationPixelRatio = Common.Utils.applicationPixelRatio(); - - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - - let bestDistance = Math.abs(this.applicationPixelRatio - this.thumbs[0].ratio); - let currentDistance = 0; - - for (let i = 1; i < this.thumbs.length; i++) { - currentDistance = Math.abs(this.applicationPixelRatio - this.thumbs[i].ratio); - if (currentDistance < (bestDistance - 0.0001)) - { - bestDistance = currentDistance; - this.thumbIdx = i; - } - } - - this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; - this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; - - this.loadSprite(); - } - - loadSprite() { - this.spriteThumbs = new Image(); - this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; - this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } toggleBold(value) { @@ -143,14 +100,6 @@ class EditTextController extends Component { changeFontSize={this.changeFontSize} changeFontFamily={this.changeFontFamily} onTextColor={this.onTextColor} - spriteThumbs={this.spriteThumbs} - thumbs={this.thumbs} - thumbIdx={this.thumbIdx} - iconWidth={this.iconWidth} - iconHeight={this.iconHeight} - thumbCanvas={this.thumbCanvas} - thumbContext={this.thumbContext} - spriteCols={this.spriteCols} /> ) } diff --git a/apps/spreadsheeteditor/mobile/src/store/textSettings.js b/apps/spreadsheeteditor/mobile/src/store/textSettings.js index b17cb0ca7..30ec7d1f3 100644 --- a/apps/spreadsheeteditor/mobile/src/store/textSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/textSettings.js @@ -20,10 +20,27 @@ export class storeTextSettings { initEditorFonts: action, initFontInfo: action, changeTextColor: action, - changeCustomTextColors: action + changeCustomTextColors: action, + iconWidth: observable, + iconHeight: observable, + thumbCanvas: observable, + thumbContext: observable, + thumbs: observable, + thumbIdx: observable, + listItemHeight: observable, + spriteCols: observable, + loadSprite: action }); } + iconWidth; + iconHeight; + thumbCanvas; + thumbContext; + thumbs; + thumbIdx = 0; + listItemHeight = 28; + spriteCols = 1; fontsArray = []; fontInfo = {}; fontName = ''; @@ -84,6 +101,50 @@ export class storeTextSettings { }); this.fontsArray = array; + this.iconWidth = 300; + this.iconHeight = Asc.FONT_THUMBNAIL_HEIGHT || 28; + this.thumbCanvas = document.createElement('canvas'); + this.thumbContext = this.thumbCanvas.getContext('2d'); + this.thumbs = [ + {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, + {ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, + {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, + {ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, + {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} + ]; + + const applicationPixelRatio = Common.Utils.applicationPixelRatio(); + + if (typeof window['AscDesktopEditor'] === 'object') { + this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); + this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); + this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); + this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); + this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); + } + + let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); + let currentDistance = 0; + + for (let i = 1; i < this.thumbs.length; i++) { + currentDistance = Math.abs(applicationPixelRatio - this.thumbs[i].ratio); + if (currentDistance < (bestDistance - 0.0001)) + { + bestDistance = currentDistance; + this.thumbIdx = i; + } + } + + this.thumbCanvas.height = this.thumbs[this.thumbIdx].height; + this.thumbCanvas.width = this.thumbs[this.thumbIdx].width; + + this.loadSprite(); + } + + loadSprite() { + this.spriteThumbs = new Image(); + this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; + this.spriteThumbs.src = this.thumbs[this.thumbIdx].path; } initFontInfo(fontObj) { diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx index 860c1d92d..3711cf342 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditText.jsx @@ -32,15 +32,7 @@ const EditText = props => { @@ -106,14 +98,14 @@ const PageFonts = props => { const displaySize = typeof size === 'undefined' ? _t.textAuto : size + ' ' + _t.textPt; const curFontName = storeTextSettings.fontName; const fonts = storeTextSettings.fontsArray; - const iconWidth = props.iconWidth; - const iconHeight = props.iconHeight; - const thumbs = props.thumbs; - const thumbIdx = props.thumbIdx; - const thumbCanvas = props.thumbCanvas; - const thumbContext = props.thumbContext; - const spriteCols = props.spriteCols; - const spriteThumbs = props.spriteThumbs; + const iconWidth = storeTextSettings.iconWidth; + const iconHeight = storeTextSettings.iconHeight; + const thumbs = storeTextSettings.thumbs; + const thumbIdx = storeTextSettings.thumbIdx; + const thumbCanvas = storeTextSettings.thumbCanvas; + const thumbContext = storeTextSettings.thumbContext; + const spriteCols = storeTextSettings.spriteCols; + const spriteThumbs = storeTextSettings.spriteThumbs; const [vlFonts, setVlFonts] = useState({ vlData: { From cfa70568bbb5a34682f1938074058974ed4fbbe5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Aug 2021 14:36:38 +0300 Subject: [PATCH 014/129] [DE] Draw arrows when move review balloons top or bottom --- apps/common/main/lib/view/ReviewPopover.js | 56 ++++++++++----- apps/common/main/resources/less/comments.less | 69 ++++++++++++++----- 2 files changed, 88 insertions(+), 37 deletions(-) diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index a4ffc454e..36c6f6ac3 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -738,7 +738,8 @@ define([ leftPos = Math.min(sdkBoundsLeft + posX + this.arrow.width, sdkBoundsLeft + this.sdkBounds.width - this.$window.outerWidth() - 25); leftPos = Math.max(sdkBoundsLeft + sdkPanelLeftWidth + this.arrow.width, leftPos); - arrowView.removeClass('right').addClass('left'); + arrowView.removeClass('right top bottom').addClass('left'); + arrowView.css({left: ''}); if (!_.isUndefined(leftX)) { windowWidth = this.$window.outerWidth(); @@ -805,6 +806,7 @@ define([ sdkPanelTop = '', sdkPanelHeight = 0, arrowPosY = 0, + arrowPosX = 0, windowHeight = 0, outerHeight = 0, topPos = 0, @@ -842,8 +844,10 @@ define([ var movePos = this.isOverCursor(); if (movePos) { - var newTopDown = movePos[1] + sdkPanelHeight,// try move down - newTopUp = movePos[0] + sdkPanelHeight; // try move up + var leftPos = parseInt(this.$window.css('left')) - this.arrow.width, + newTopDown = movePos[1][1] + sdkPanelHeight + this.arrow.width,// try move down + newTopUp = movePos[0][1] + sdkPanelHeight - this.arrow.width, // try move up + isMoveDown = false; if (newTopDown + outerHeight>sdkBoundsTop + sdkBoundsHeight) { var diffDown = sdkBoundsTop + sdkBoundsHeight - newTopDown; if (newTopUp - outerHeightleftPos && x0leftPos && x1y1) ? [x0, y0] : [x1, y1],// try move down + newUp = (y0 Date: Wed, 18 Aug 2021 11:58:45 +0300 Subject: [PATCH 015/129] [DE embedded] Fix Bug 51995 --- apps/common/embed/resources/less/common.less | 6 ++++++ apps/documenteditor/embed/index.html | 4 ++-- apps/documenteditor/embed/index.html.deploy | 4 ++-- apps/documenteditor/embed/index_loader.html | 4 ++-- apps/documenteditor/embed/index_loader.html.deploy | 4 ++-- apps/documenteditor/embed/js/ApplicationController.js | 1 - 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less index 006c2f810..c4a5669f5 100644 --- a/apps/common/embed/resources/less/common.less +++ b/apps/common/embed/resources/less/common.less @@ -225,6 +225,12 @@ .margin-right-large { margin-right: 12px; } + .margin-left-small { + margin-left: 8px; + } + .margin-left-large { + margin-left: 12px; + } } // Logo diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index 78f2bd0c6..01454fadf 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -197,8 +197,8 @@
    -
    -
    of 0
    +
    of 0
    +
    diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index 75f228d98..3062a4056 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -189,8 +189,8 @@
    -
    -
    of 0
    +
    of 0
    +
    diff --git a/apps/documenteditor/embed/index_loader.html b/apps/documenteditor/embed/index_loader.html index 0d25bab6b..30ce047a7 100644 --- a/apps/documenteditor/embed/index_loader.html +++ b/apps/documenteditor/embed/index_loader.html @@ -298,8 +298,8 @@
    -
    -
    of 0
    +
    of 0
    +
    diff --git a/apps/documenteditor/embed/index_loader.html.deploy b/apps/documenteditor/embed/index_loader.html.deploy index ec68112af..6000f0d50 100644 --- a/apps/documenteditor/embed/index_loader.html.deploy +++ b/apps/documenteditor/embed/index_loader.html.deploy @@ -290,8 +290,8 @@
    -
    -
    of 0
    +
    of 0
    +
    diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 5a306ed6a..670d4da31 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -514,7 +514,6 @@ DE.ApplicationController = new(function(){ $('#id-btn-clear-fields').hide(); btnSubmit.hide(); } else { - $('#id-pages').hide(); $('#id-btn-next-field .caption').text(me.textNext); $('#id-btn-clear-fields .caption').text(me.textClear); From 3eb07133953bf8e6e4433f36818f3e0d453b70a7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Aug 2021 21:29:47 +0300 Subject: [PATCH 016/129] [DE forms] Use button component --- apps/common/forms/resources/less/common.less | 54 ++++++------------- .../app/controller/ApplicationController.js | 22 +++----- .../forms/app/view/ApplicationView.js | 39 ++++++++------ apps/documenteditor/forms/index.html | 15 +++--- 4 files changed, 50 insertions(+), 80 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 18aaf35da..983d6ed69 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -112,6 +112,9 @@ font-size: @toolbarFontSize; overflow: hidden; + + color: @text-normal-ie; + color: @text-normal; } // Document Viewer @@ -578,6 +581,18 @@ } } +.btn { + &.active, &:active { + &:not(:disabled):not(.disabled) { + .icon { + @btn-active-icon-offset: -20px; + background-position-y: @btn-active-icon-offset; + background-position-y: var(--button-small-active-icon-offset-x, 0); + } + } + } +} + .mi-icon { width: @icon-width; height: @icon-height; @@ -591,14 +606,6 @@ vertical-align: middle; } -//.btn, button { -// &:focus, &:active:focus { -// outline: 0 none; -// } -// -// background-color: @btnColor; -//} - .modal-dialog { margin-top: 100px; .share-buttons { @@ -653,37 +660,6 @@ } } -//.dropdown-menu { -// > li > a { -// padding: 8px 20px 8px 28px; -// &:hover, &:focus { -// background-color: @btnColor; -// outline: 0 none; -// } -// font-size: @buttonFontSize; -// } -// -// .divider { -// margin: 4px 0; -// } -//} -// -//.dropdown { -// &.open { -// > button { -// background-color: @btnActiveColor !important; -// background-position: -@icon-width*14 -@icon-height; -// } -// } -//} -// -//#box-tools { -// display: inline-block; -// a { -// cursor: pointer; -// } -//} - .masked { background-color: transparent; border-color: transparent; diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index c8165345f..b1eb11ff9 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -326,7 +326,6 @@ define([ if (this.embedConfig.toolbarDocked === 'bottom') { $('#toolbar').addClass('bottom'); this.boxSdk.addClass('bottom'); - // $('#box-tools').removeClass('dropdown').addClass('dropup'); ttOffset[1] = -40; } else { $('#toolbar').addClass('top'); @@ -509,24 +508,20 @@ define([ btnSubmit = $('#id-btn-submit'); + var me = this; if (!this.appOptions.canFillForms) { - $('#id-btn-prev-field').hide(); - $('#id-btn-next-field').hide(); - $('#id-btn-clear-fields').hide(); + me.view.btnPrev.setVisible(false); + me.view.btnNext.setVisible(false); + me.view.btnClear.setVisible(false); btnSubmit.hide(); } else { - $('#id-pages').hide(); - $('#id-btn-next-field .caption').text(this.textNext); - $('#id-btn-clear-fields .caption').text(this.textClear); - - var me = this; - $('#id-btn-prev-field').on('click', function(){ + me.view.btnPrev.on('click', function(){ me.api.asc_MoveToFillingForm(false); }); - $('#id-btn-next-field').on('click', function(){ + me.view.btnNext.on('click', function(){ me.api.asc_MoveToFillingForm(true); }); - $('#id-btn-clear-fields').on('click', function(){ + me.view.btnClear.on('click', function(){ me.api.asc_ClearAllSpecialForms(); }); @@ -906,9 +901,6 @@ define([ var zf = (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -2); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); - // var dividers = $('#box-tools .divider'); - // var itemsCount = $('#box-tools a').length; - // var menuItems = this.view.btnOptions.menu.items; var itemsCount = menuItems.length-3; diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index 7375cd5fe..cc0d8d5ce 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -36,22 +36,25 @@ define([ }); this.btnOptions.render($('#box-tools')); - // $btnTools = $('#box-tools button'); - // $btnTools.addClass('dropdown-toggle').attr('data-toggle', 'dropdown').attr('aria-expanded', 'true'); - // $btnTools.parent().append( - // ''); + this.btnClear = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'svg-icon clear-style', + caption: this.textClear + }); + this.btnClear.render($('#id-btn-clear-fields')); + + this.btnNext = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'svg-icon arrow-down', + caption: this.textNext + }); + this.btnNext.render($('#id-btn-next-field')); + + this.btnPrev = new Common.UI.Button({ + cls: 'btn-toolbar', + iconCls: 'svg-icon arrow-up' + }); + this.btnPrev.render($('#id-btn-prev-field')); return this; }, @@ -77,6 +80,8 @@ define([ txtFullScreen: 'Full Screen', txtFileLocation: 'Open file location', txtDownloadDocx: 'Download as docx', - txtDownloadPdf: 'Download as pdf' + txtDownloadPdf: 'Download as pdf', + textNext: 'Next Field', + textClear: 'Clear All Fields' }); }); \ No newline at end of file diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index f48095ca7..aa4d60cdd 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -115,7 +115,7 @@ - +
    @@ -190,20 +190,17 @@
    - + + +
    -
    -
    of 0
    +
    of 0
    +
    - - -
    From 3a85fbafc80e6afa0d3cb82c27f1ec144bdf3232 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Aug 2021 23:15:52 +0300 Subject: [PATCH 017/129] [DE forms] Change list forms --- .../app/controller/ApplicationController.js | 177 ++++++++---------- .../forms/app/view/ApplicationView.js | 19 +- 2 files changed, 75 insertions(+), 121 deletions(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index b1eb11ff9..f0cb2ea71 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -17,7 +17,6 @@ define([ btnSubmit, _submitFail, $submitedTooltip, $requiredTooltip, $ttEl, $tooltip, - $listControlMenu, listControlItems = [], listObj, bodyWidth = 0, ttOffset = [0, -10]; @@ -27,61 +26,10 @@ define([ ], initialize: function() { - var me = this, - styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', - 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text', - 'Caption', 'endnote text'], - translate = { - 'Series': this.txtSeries, - 'Diagram Title': this.txtDiagramTitle, - 'X Axis': this.txtXAxis, - 'Y Axis': this.txtYAxis, - 'Your text here': this.txtArt, - "Error! Bookmark not defined.": this.txtBookmarkError, - "above": this.txtAbove, - "below": this.txtBelow, - "on page ": this.txtOnPage + " ", - "Header": this.txtHeader, - "Footer": this.txtFooter, - " -Section ": " " + this.txtSection + " ", - "First Page ": this.txtFirstPage + " ", - "Even Page ": this.txtEvenPage + " ", - "Odd Page ": this.txtOddPage + " ", - "Same as Previous": this.txtSameAsPrev, - "Current Document": this.txtCurrentDocument, - "No table of contents entries found.": this.txtNoTableOfContents, - "Table of Contents": this.txtTableOfContents, - "Syntax Error": this.txtSyntaxError, - "Missing Operator": this.txtMissOperator, - "Missing Argument": this.txtMissArg, - "Number Too Large To Format": this.txtTooLarge, - "Zero Divide": this.txtZeroDivide, - "Is Not In Table": this.txtNotInTable, - "Index Too Large": this.txtIndTooLarge, - "The Formula Not In Table": this.txtFormulaNotInTable, - "Table Index Cannot be Zero": this.txtTableInd, - "Undefined Bookmark": this.txtUndefBookmark, - "Unexpected End of Formula": this.txtEndOfFormula, - "Hyperlink": this.txtHyperlink, - "Error! Main Document Only.": this.txtMainDocOnly, - "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark, - "Error! No text of specified style in document.": this.txtNoText, - "Choose an item": this.txtChoose, - "Enter a date": this.txtEnterDate, - "Type equation here": this.txtTypeEquation, - "Click to load image": this.txtClickToLoad, - "None": this.txtNone, - "No table of figures entries found.": this.txtNoTableOfFigures, - "table of figures": this.txtTableOfFigures, - "TOC Heading": this.txtTOCHeading - }; - styleNames.forEach(function(item){ - translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; - }); - me.translationTable = translate; }, onLaunch: function() { + var me = this; if (!Common.Utils.isBrowserSupported()){ Common.Utils.showBrowserRestriction(); Common.Gateway.reportError(undefined, this.unsupportedBrowserErrorText); @@ -101,8 +49,6 @@ define([ this.api = new Asc.asc_docs_api({ 'id-view' : 'editor_sdk', 'embedded' : true - // , - // 'translate': this.translationTable }); $(window).on('resize', this.onDocumentResize.bind(this)); @@ -110,10 +56,17 @@ define([ this.boxSdk = $('#editor_sdk'); // this.boxSdk.css('border-left', 'none'); this.boxSdk.on('click', function(e) { - if ( e.target.localName == 'canvas' ) { - e.currentTarget.focus(); + if (e.target.localName == 'canvas') { + if (me._preventClick) + me._preventClick = false; + else + me.boxSdk.focus(); } }); + this.boxSdk.on('mousedown', function(e){ + if (e.target.localName == 'canvas') + Common.UI.Menu.Manager.hideAll(); + }); this.editorConfig = {}; this.embedConfig = {}; @@ -136,7 +89,6 @@ define([ Common.Gateway.appReady(); } - var me = this; Common.NotificationCenter.on({ 'modal:show': function(){ Common.Utils.ModalWindow.show(); @@ -821,8 +773,10 @@ define([ }, onHideContentControlsActions: function() { - $listControlMenu && $listControlMenu.hide(); - this.api.asc_UncheckContentControlButtons(); + this.listControlMenu && this.listControlMenu.isVisible() && this.listControlMenu.hide(); + var controlsContainer = this.boxSdk.find('#calendar-control-container'); + if (controlsContainer.is(':visible')) + controlsContainer.hide(); }, onShowListActions: function(obj, x, y) { @@ -830,66 +784,83 @@ define([ props = obj.pr, specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), isForm = !!props.get_FormPr(), + menu = this.listControlMenu, + menuContainer = menu ? this.boxSdk.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, me = this; - var menuContainer = this.view.getMenuForm(); + this._listObj = props; - if (!$listControlMenu) { - $listControlMenu = menuContainer.find('ul'); - $listControlMenu.on('click', 'li', function(e) { - var value = $(e.target).attr('value'); - if (value) { - value = parseInt(value); - setTimeout(function(){ - (value!==-1) && me.api.asc_SelectContentControlListItem(listControlItems[value], listObj.get_InternalId()); - }, 1); - } + this._fromShowContentControls = true; + Common.UI.Menu.Manager.hideAll(); + + if (!menu) { + this.listControlMenu = menu = new Common.UI.Menu({ + maxHeight: 207, + menuAlign: 'tr-bl', + items: [] }); - $('#editor_sdk').on('click', function(e){ - if (e.target.localName == 'canvas') { - if (me._preventClick) - me._preventClick = false; - else { - $listControlMenu && $listControlMenu.hide(); - me.api.asc_UncheckContentControlButtons(); - } - } + menu.on('item:click', function(menu, item) { + setTimeout(function(){ + (item.value!==-1) && me.api.asc_SelectContentControlListItem(item.value, me._listObj.get_InternalId()); + }, 1); + }); + + // Prepare menu container + if (!menuContainer || menuContainer.length < 1) { + menuContainer = $(Common.Utils.String.format('', menu.id)); + this.boxSdk.append(menuContainer); + } + + menu.render(menuContainer); + menu.cmpEl.attr({tabindex: "-1"}); + menu.on('hide:after', function(){ + me.listControlMenu.removeAll(); + if (!me._fromShowContentControls) + me.api.asc_UncheckContentControlButtons(); }); } - $listControlMenu.find('li').remove(); - listControlItems = []; - listObj = props; - if (specProps) { - var k = 0; if (isForm){ // for dropdown and combobox form control always add placeholder item var text = props.get_PlaceholderText(); - $listControlMenu.append('
  • ' + - ((text.trim()!=='') ? text : me.txtEmpty) + - '
    • '); - listControlItems.push(''); + menu.addItem(new Common.UI.MenuItem({ + caption : (text.trim()!=='') ? text : this.txtEmpty, + value : '', + template : _.template([ + ' opacity: 0.6 <% } %>">', + '<%= caption %>', + '' + ].join('')) + })); } var count = specProps.get_ItemsCount(); - k = listControlItems.length; for (var i=0; i' + - Common.Utils.String.htmlEncode(specProps.get_ItemDisplayText(i)) + - ''); - listControlItems.push(specProps.get_ItemValue(i)); - } + (specProps.get_ItemValue(i)!=='' || !isForm) && menu.addItem(new Common.UI.MenuItem({ + caption : specProps.get_ItemDisplayText(i), + value : specProps.get_ItemValue(i), + template : _.template([ + '', + '<%= Common.Utils.String.htmlEncode(caption) %>', + '' + ].join('')) + })); } - if (!isForm && listControlItems.length<1) { - $listControlMenu.append('
  • ' + - me.txtEmpty + - '
    • '); - listControlItems.push(-1); + if (!isForm && menu.items.length<1) { + menu.addItem(new Common.UI.MenuItem({ + caption : this.txtEmpty, + value : -1 + })); } } menuContainer.css({left: x, top : y}); - me._preventClick = true; - $listControlMenu.show(); + menuContainer.attr('data-value', 'prevent-canvas-click'); + this._preventClick = true; + menu.show(); + + _.delay(function() { + menu.cmpEl.focus(); + }, 10); + this._fromShowContentControls = false; }, onDocumentContentReady: function() { diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index cc0d8d5ce..e461f2f17 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -9,9 +9,6 @@ define([ ], function ($, _, Backbone) { 'use strict'; - var $btnTools; - var $menuForm; - DE.Views.ApplicationView = Backbone.View.extend({ // Render layout render: function() { @@ -55,24 +52,10 @@ define([ iconCls: 'svg-icon arrow-up' }); this.btnPrev.render($('#id-btn-prev-field')); + return this; }, - getTools: function(name) { - return $btnTools.parent().find(name); - }, - - getMenuForm: function() { - if (!$menuForm) { - $menuForm = $(''); - $('#editor_sdk').append($menuForm); - } - return $menuForm; - }, - txtDownload: 'Download', txtPrint: 'Print', txtShare: 'Share', From 8fca89be95331ebbbd4f1116e8102a5636f88831 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Aug 2021 00:52:04 +0300 Subject: [PATCH 018/129] [DE forms] Refactoring --- apps/common/forms/resources/less/common.less | 36 +---- .../app/controller/ApplicationController.js | 138 +++++++++--------- .../forms/app/view/ApplicationView.js | 10 ++ apps/documenteditor/forms/index.html | 4 +- 4 files changed, 86 insertions(+), 102 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 983d6ed69..53ff04b18 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -99,10 +99,6 @@ @iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; @icon-socnet-size: 40px; -.input-xs { - .input-size(@input-height-small - 8px; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); -} - .embed-body { -moz-user-select: -moz-none; -khtml-user-select: none; @@ -178,8 +174,7 @@ .item { input { - display: inline-block; - width: 35px; + font-size: inherit; padding: 0; text-align: right; } @@ -305,7 +300,7 @@ } &:active:not(:disabled) { - &, .btn-icon { + & { background-position-y: -@icon-height !important; } @@ -424,18 +419,6 @@ // Modals // ------------------------- -.modal { - .modal-header { - //padding: 5px 15px; - } - - .modal-footer { - //border-top: none; - } - - //&.in .modal-dialog { .translate(0, 100%)} -} - .share-buttons { ul { width: 244px; @@ -599,12 +582,6 @@ float: left; margin: -3px 4px 0 -24px; } -.btn-icon { - width: 22px; - height: 22px; - display: inline-block; - vertical-align: middle; -} .modal-dialog { margin-top: 100px; @@ -675,7 +652,7 @@ } #page-number { - &.masked { + .masked { cursor: pointer; } } @@ -701,13 +678,6 @@ } } -.form-control { - &:focus { - -webkit-box-shadow: none; - box-shadow: none; - } -} - .submit-tooltip { position: absolute; z-index: 1000; diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index f0cb2ea71..ba667aeba 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -234,7 +234,6 @@ define([ if (id == Asc.c_oAscError.ID.EditingError) { Common.NotificationCenter.trigger('api:disconnect', true); // enable download and print } - this.onEditComplete(); }, this); } @@ -245,11 +244,7 @@ define([ }, hidePreloader: function() { - (new Promise(function(resolve, reject) { - resolve(); - })).then(function() { - $('#loading-mask').hide().remove(); - }); + $('#loading-mask').fadeOut('slow'); }, onOpenDocument: function(progress) { @@ -265,7 +260,7 @@ define([ }, onCurrentPage: function(number) { - $('#page-number').val(number + 1); + this.view.txtGoToPage.setValue(number + 1); }, loadConfig: function(data) { @@ -549,8 +544,6 @@ define([ setLongActionView: function(action) { var title = '', text = '', force = false; - - var text = ''; switch (action.id) { case Asc.c_oAscAsyncAction['Print']: @@ -947,33 +940,84 @@ define([ Common.Gateway.on('downloadas', _.bind(this.onDownloadAs, this)); Common.Gateway.on('requestclose', _.bind(this.onRequestClose, this)); + this.attachUIEvents(); + + Common.Gateway.documentReady(); + Common.Analytics.trackEvent('Load', 'Complete'); + }, + + onOptionsClick: function(menu, item, e) { + switch (item.value) { + case 'fullscr': + this.onHyperlinkClick(this.embedConfig.fullscreenUrl); + break; + case 'download': + if ( !!this.embedConfig.saveUrl ){ + this.onHyperlinkClick(this.embedConfig.saveUrl); + } else if (this.api && this.appOptions.canPrint){ + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + } + Common.Analytics.trackEvent('Save'); + break; + case 'print': + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + Common.Analytics.trackEvent('Print'); + break; + case 'close': + if (this.appOptions.customization && this.appOptions.customization.goback) { + if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) + Common.Gateway.requestClose(); + else if (this.appOptions.customization.goback.url) + window.parent.location.href = this.appOptions.customization.goback.url; + } + break; + case 'download-docx': + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX)); + Common.Analytics.trackEvent('Save'); + break; + case 'download-pdf': + this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); + Common.Analytics.trackEvent('Save'); + break; + case 'share': + break; + case 'embed': + break; + } + }, + + attachUIEvents: function() { + var me = this; + + // zoom $('#id-btn-zoom-in').on('click', this.api.zoomIn.bind(this.api)); $('#id-btn-zoom-out').on('click', this.api.zoomOut.bind(this.api)); this.view.btnOptions.menu.on('item:click', _.bind(this.onOptionsClick, this)); - var $pagenum = $('#page-number'); + // pages + var $pagenum = this.view.txtGoToPage._input; + this.view.txtGoToPage.on({ + 'changed:after': function(input, newValue, oldValue){ + var newPage = parseInt(newValue); + + if ( newPage > maxPages ) newPage = maxPages; + if (newPage < 2 || isNaN(newPage)) newPage = 1; + + me.api.goToPage(newPage-1); + }, + 'inputleave': function(){ $pagenum.blur();} + }); $pagenum.on({ - 'keyup': function(e){ - if ( e.keyCode == 13 ){ - var newPage = parseInt($('#page-number').val()); - - if ( newPage > maxPages ) newPage = maxPages; - if (newPage < 2 || isNaN(newPage)) newPage = 1; - - me.api.goToPage(newPage-1); - $pagenum.blur(); - } - } - , 'focusin' : function(e) { + 'focusin' : function(e) { $pagenum.removeClass('masked'); - } - , 'focusout': function(e){ + $pagenum.select(); + }, + 'focusout': function(e){ !$pagenum.hasClass('masked') && $pagenum.addClass('masked'); } }); - $('#pages').on('click', function(e) { - $pagenum.focus(); + setTimeout(function() {$pagenum.focus().select();}, 10); }); // TODO: add asc_hasRequiredFields to sdk @@ -1027,48 +1071,6 @@ define([ }, 2000); } }); - Common.Gateway.documentReady(); - Common.Analytics.trackEvent('Load', 'Complete'); - }, - - onOptionsClick: function(menu, item, e) { - switch (item.value) { - case 'fullscr': - this.onHyperlinkClick(this.embedConfig.fullscreenUrl); - break; - case 'download': - if ( !!this.embedConfig.saveUrl ){ - this.onHyperlinkClick(this.embedConfig.saveUrl); - } else if (this.api && this.appOptions.canPrint){ - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - } - Common.Analytics.trackEvent('Save'); - break; - case 'print': - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - Common.Analytics.trackEvent('Print'); - break; - case 'close': - if (this.appOptions.customization && this.appOptions.customization.goback) { - if (this.appOptions.customization.goback.requestClose && this.appOptions.canRequestClose) - Common.Gateway.requestClose(); - else if (this.appOptions.customization.goback.url) - window.parent.location.href = this.appOptions.customization.goback.url; - } - break; - case 'download-docx': - this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.DOCX)); - Common.Analytics.trackEvent('Save'); - break; - case 'download-pdf': - this.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(Asc.c_oAscFileType.PDF)); - Common.Analytics.trackEvent('Save'); - break; - case 'share': - break; - case 'embed': - break; - } }, errorDefaultMessage : 'Error code: %1', diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index e461f2f17..e3f9ea6b6 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -3,6 +3,7 @@ define([ 'underscore', 'backbone', 'common/main/lib/util/utils', + 'common/main/lib/component/InputField', 'common/main/lib/component/Button', 'common/main/lib/component/Menu', 'common/main/lib/component/Calendar' @@ -53,6 +54,15 @@ define([ }); this.btnPrev.render($('#id-btn-prev-field')); + this.txtGoToPage = new Common.UI.InputField({ + el: $('#page-number'), + cls: 'masked', + allowBlank : true, + style : 'width: 35px;', + value: '1', + maskExp: /[0-9]/ + }); + return this; }, diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index aa4d60cdd..b66851e89 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -198,7 +198,9 @@
    -
    of 0
    +
    +
    of 1 +
    From dc07380894e3445a47a74e20fe14ff91569fb6a2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Aug 2021 02:04:30 +0300 Subject: [PATCH 019/129] [DE forms] Refactoring link and form tooltips --- .../app/controller/ApplicationController.js | 208 ++++++++++-------- apps/documenteditor/forms/index.html | 2 - 2 files changed, 120 insertions(+), 90 deletions(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index ba667aeba..dcadaeb6e 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -16,7 +16,9 @@ define([ labelDocName, btnSubmit, _submitFail, $submitedTooltip, $requiredTooltip, - $ttEl, $tooltip, + screenTip, + mouseMoveData = null, + isTooltipHiding = false, bodyWidth = 0, ttOffset = [0, -10]; @@ -91,6 +93,10 @@ define([ Common.NotificationCenter.on({ 'modal:show': function(){ + if (screenTip) { + screenTip.toolTip.hide(); + screenTip.isVisible = false; + } Common.Utils.ModalWindow.show(); me.api.asc_enableKeyEvents(false); }, @@ -596,15 +602,19 @@ define([ }, onDocMouseMoveStart: function() { - this.isHideBodyTip = true; + screenTip.isHidden = true; }, onDocMouseMoveEnd: function() { - if (this.isHideBodyTip) { - if ( $tooltip ) { - $tooltip.tooltip('hide'); - $tooltip = false; - } + var me = this; + if (screenTip.isHidden && screenTip.isVisible) { + screenTip.isVisible = false; + isTooltipHiding = true; + screenTip.toolTip.hide(function(){ + isTooltipHiding = false; + if (mouseMoveData) me.onDocMouseMove(mouseMoveData); + mouseMoveData = null; + }); } }, @@ -613,46 +623,52 @@ define([ if (data) { var type = data.get_Type(); if (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink || type==Asc.c_oAscMouseMoveDataTypes.Form) { // hyperlink - this.isHideBodyTip = false; + if (isTooltipHiding) { + mouseMoveData = data; + return; + } var str = (type == Asc.c_oAscMouseMoveDataTypes.Hyperlink) ? me.txtPressLink : data.get_FormHelpText(); if (str.length>500) str = str.substr(0, 500) + '...'; str = Common.Utils.String.htmlEncode(str); - if ( !$ttEl ) { - $ttEl = $('.hyperlink-tooltip'); - $ttEl.tooltip({'container':'body', 'trigger':'manual'}); + var recalc = false; + screenTip.isHidden = false; + + if (screenTip.tipType !== type || screenTip.tipLength !== str.length || screenTip.strTip.indexOf(str)<0 ) { + screenTip.toolTip.setTitle(str); + screenTip.tipLength = str.length; + screenTip.strTip = str; + screenTip.tipType = type; + recalc = true; } - $ttEl.ttpos = [data.get_X(), data.get_Y()]; - if ( !$tooltip) - $tooltip = $ttEl.data('bs.tooltip').tip(); + var showPoint = [data.get_X()+5, data.get_Y() + ttOffset[1]-15]; - if (!$tooltip.is(':visible')) { - var tip = $ttEl.data('bs.tooltip'); - tip.options.title = str; - tip.show([-1000, -1000]); - } else - $tooltip.find('.tooltip-inner')['text'](str); + if (!screenTip.isVisible || recalc) { + screenTip.isVisible = true; + screenTip.toolTip.show([-10000, -10000]); + } + + if ( recalc ) { + screenTip.tipHeight = screenTip.toolTip.getBSTip().$tip.height(); + screenTip.tipWidth = screenTip.toolTip.getBSTip().$tip.width(); + } - var ttHeight = $tooltip.height(), - ttWidth = $tooltip.width(); !bodyWidth && (bodyWidth = $('body').width()); - $ttEl.ttpos[1] -= (ttHeight - ttOffset[1] + 20); - if ($ttEl.ttpos[0] + ttWidth + 10 >bodyWidth) { - $ttEl.ttpos[0] = bodyWidth - ttWidth - 5; - if ($ttEl.ttpos[1] < 0) - $ttEl.ttpos[1] += ttHeight + ttOffset[1] + 20; - } else if ($ttEl.ttpos[1] < 0) { - $ttEl.ttpos[1] = 0; - $ttEl.ttpos[0] += 20; + recalc = false; + if (showPoint[0] + screenTip.tipWidth > bodyWidth ) { + showPoint[0] = bodyWidth - screenTip.tipWidth; + recalc = true; } - $tooltip.css({ - left: $ttEl.ttpos[0], - top: $ttEl.ttpos[1] - }); + if (showPoint[1] - screenTip.tipHeight < 0) { + showPoint[1] = (recalc) ? showPoint[1]+30 : 0; + } else + showPoint[1] -= screenTip.tipHeight; + + screenTip.toolTip.getBSTip().$tip.css({top: showPoint[1] + 'px', left: showPoint[0] + 'px'}); } } }, @@ -865,60 +881,7 @@ define([ var zf = (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -2); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); - var menuItems = this.view.btnOptions.menu.items; - var itemsCount = menuItems.length-3; - - if (!this.appOptions.canPrint) { - menuItems[0].setVisible(false); - menuItems[1].setVisible(false); - itemsCount--; - } - - if ( !this.embedConfig.saveUrl && !this.appOptions.canPrint || this.appOptions.canFillForms) { - menuItems[2].setVisible(false); - itemsCount--; - } - - if ( !this.appOptions.canFillForms || !this.appOptions.canDownload) { - menuItems[3].setVisible(false); - menuItems[4].setVisible(false); - menuItems[1].setVisible(false); - menuItems[5].setVisible(false); - itemsCount -= 2; - } - - if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) { - menuItems[6].setVisible(false); - itemsCount--; - } - - if (!this.appOptions.canBackToFolder) { - menuItems[7].setVisible(false); - itemsCount--; - } - - if (itemsCount<3) - menuItems[8].setVisible(false); - - if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) { - menuItems[9].setVisible(false); - itemsCount--; - } - - if ( !this.embedConfig.fullscreenUrl ) { - menuItems[10].setVisible(false); - itemsCount--; - } - - if (itemsCount<1) - this.view.btnOptions.setVisible(false); - else if ((!this.embedConfig.embedUrl || this.appOptions.canFillForms) && !this.embedConfig.fullscreenUrl) - menuItems[8].setVisible(false); - - // common.controller.modals.attach({ - // share: '#idt-share', - // embed: '#idt-embed' - // }); + this.createDelayedElements(); this.api.asc_registerCallback('asc_onStartAction', _.bind(this.onLongActionBegin, this)); this.api.asc_registerCallback('asc_onEndAction', _.bind(this.onLongActionEnd, this)); @@ -986,6 +949,75 @@ define([ } }, + createDelayedElements: function() { + var menuItems = this.view.btnOptions.menu.items; + var itemsCount = menuItems.length-3; + + if (!this.appOptions.canPrint) { + menuItems[0].setVisible(false); + menuItems[1].setVisible(false); + itemsCount--; + } + + if ( !this.embedConfig.saveUrl && !this.appOptions.canPrint || this.appOptions.canFillForms) { + menuItems[2].setVisible(false); + itemsCount--; + } + + if ( !this.appOptions.canFillForms || !this.appOptions.canDownload) { + menuItems[3].setVisible(false); + menuItems[4].setVisible(false); + menuItems[1].setVisible(false); + menuItems[5].setVisible(false); + itemsCount -= 2; + } + + if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) { + menuItems[6].setVisible(false); + itemsCount--; + } + + if (!this.appOptions.canBackToFolder) { + menuItems[7].setVisible(false); + itemsCount--; + } + + if (itemsCount<3) + menuItems[8].setVisible(false); + + if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) { + menuItems[9].setVisible(false); + itemsCount--; + } + + if ( !this.embedConfig.fullscreenUrl ) { + menuItems[10].setVisible(false); + itemsCount--; + } + + if (itemsCount<1) + this.view.btnOptions.setVisible(false); + else if ((!this.embedConfig.embedUrl || this.appOptions.canFillForms) && !this.embedConfig.fullscreenUrl) + menuItems[8].setVisible(false); + + // common.controller.modals.attach({ + // share: '#idt-share', + // embed: '#idt-embed' + // }); + + screenTip = { + toolTip: new Common.UI.Tooltip({ + owner: this, + html: true, + title: this.txtPressLink, + cls: 'link-tooltip' + }), + strTip: '', + isHidden: true, + isVisible: false + }; + }, + attachUIEvents: function() { var me = this; diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index b66851e89..f93e830ac 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -222,8 +222,6 @@ - - From 76a6b27e280246d6012cae13c6adf3433bf5b8b6 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 19 Aug 2021 17:27:14 +0300 Subject: [PATCH 020/129] [DE] Adding styles buttons-context for Numbering --- apps/documenteditor/mobile/locale/en.json | 8 +++++++- apps/documenteditor/mobile/src/less/app-ios.less | 5 +++++ apps/documenteditor/mobile/src/less/app-material.less | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index def47747a..b50b95340 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -177,10 +177,16 @@ "menuReviewChange": "Review Change", "menuSplit": "Split", "menuViewComment": "View Comment", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index d4d95057a..1fb9a1d9b 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -4,6 +4,11 @@ background: #fff; } } + + // Stepper + .content-block.stepper-block { + margin: 20px 0; + } } // Color Schemes diff --git a/apps/documenteditor/mobile/src/less/app-material.less b/apps/documenteditor/mobile/src/less/app-material.less index 981437364..7c26f1924 100644 --- a/apps/documenteditor/mobile/src/less/app-material.less +++ b/apps/documenteditor/mobile/src/less/app-material.less @@ -51,6 +51,13 @@ font-size: 18px; } } + + // Stepper + .content-block.stepper-block { + display: flex; + justify-content: center; + margin: 30px 0 0; + } } // Color Schemes From e92ee583081318e8d291d303a46835e680f98a73 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Aug 2021 23:09:18 +0300 Subject: [PATCH 021/129] [DE forms] Refactoring submit form --- apps/common/forms/resources/less/common.less | 186 +++++------------- .../main/lib/component/SynchronizeTip.js | 9 +- .../main/resources/less/synchronize-tip.less | 5 +- .../app/controller/ApplicationController.js | 84 ++++---- .../forms/app/view/ApplicationView.js | 9 +- apps/documenteditor/forms/index.html | 2 +- 6 files changed, 106 insertions(+), 189 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 53ff04b18..b4da7ec3d 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -84,17 +84,17 @@ @toolbarBorderShadowColor: #FAFAFA; @toolbarTopColor: #F7F7F7; @toolbarBottomColor: #CCCCCC; -@toolbarHoverColor: #7698DE; +//@toolbarHoverColor: #7698DE; @toolbarFontSize: 12px; -@buttonFontSize: 11px; -@controlBtnHoverTopColor: #6180C4; -@controlBtnHoverBottomColor: #8AACF1; -@btnColor: #d8dadc; -@btnActiveColor: #7d858c; +//@buttonFontSize: 11px; +//@controlBtnHoverTopColor: #6180C4; +//@controlBtnHoverBottomColor: #8AACF1; +//@btnColor: #d8dadc; +//@btnActiveColor: #7d858c; @btnColored: #446995; @btnActiveColored: #293F59; @btnHoverColored: #375478; -@notificationColor: #fcfed7; +//@notificationColor: #fcfed7; @iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; @icon-socnet-size: 40px; @@ -248,6 +248,12 @@ .margin-right-large { margin-right: 12px; } + .margin-left-small { + margin-left: 8px; + } + .margin-left-large { + margin-left: 12px; + } } // Logo @@ -259,76 +265,25 @@ background: data-uri('../../../../common/forms/resources/img/logo.svg') no-repeat; } -// Control buttons -// ------------------------- -.control-btn { - display: inline-block; - vertical-align: middle; - cursor: pointer; - background-color: transparent; - border: 1px solid transparent; - border-radius: 2px; - - width: 22px; - height: 22px; - background-origin: content-box; - padding: 0 1px; - font-size: @buttonFontSize; - - &.has-caption { - width: auto; - padding-right: 5px; - } - +.btn-text-default { &.colored { padding: 0 16px; height: 28px; background-color: @btnColored; + border: 1px solid transparent; border-radius: 3px; color: #ffffff; font-weight: 700; - } - // Hover state - &:hover:not(:disabled) { - text-decoration: none; - background-color: @btnColor; - - &.colored { - background-color: @btnHoverColored; - } - } - - &:active:not(:disabled) { - & { - background-position-y: -@icon-height !important; + &:hover:not(.disabled), + .over:not(.disabled) { + background-color: @btnHoverColored !important; } - &.has-caption { - color: #ffffff + &:active:not(.disabled), + &.active:not(.disabled) { + background-color: @btnActiveColored !important;; } - - &.colored { - background-color: @btnActiveColored; - } - } - -// Focus state for keyboard and accessibility - &:focus { - .tab-focus(); - outline: none; - } - -// Active state - &.active:not(:disabled), - &:active:not(:disabled) { - outline: none; - border: 1px solid @btnActiveColor; - background-color: @btnActiveColor; - } - - &[disabled] { - opacity: 0.4; } } @@ -657,27 +612,6 @@ } } -.tooltip { - .tooltip-inner { - background-color: #fff; - border: 1px solid rgba(0,0,0,0.15); - color: #333; - font-weight: bold; - font-size: 11px; - box-shadow: 0 6px 12px rgba(0,0,0,0.175); - max-width: 350px; - - padding: 5px 12px; - white-space: pre-wrap; - text-align: left; - word-wrap: break-word; - } - - .tooltip-arrow { - display: none; - } -} - .submit-tooltip { position: absolute; z-index: 1000; @@ -686,68 +620,40 @@ padding: 7px 15px; border-radius: 5px; - background-color: @notificationColor; + background-color: @background-notification-popover; -webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); font-size: 11px; } -.required-tooltip { - position: absolute; - z-index: 1000; +.synch-tip-root { + &.colored { + @tip-width: 240px; + width: @tip-width; + .tip-text { + width: @tip-width - 40px; + } - padding: 15px; - border-radius: 5px; - background-color: @btnColored; - color: #fff; - -webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); - box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5); - font-size: 11px; - - &.bottom-left { - border-top-right-radius: 0; - margin: 15px 0 0 0; - - .tip-arrow { - position: absolute; - overflow: hidden; - right: 0; - top: -15px; - width: 15px; - height: 15px; - .box-shadow(8px 5px 8px -5px rgba(0, 0, 0, 0.2)); - - &:after { - content: ''; - position: absolute; - top: 8px; - left: 8px; - background-color: @btnColored; - width: 15px; - height: 15px; - - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -webkit-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - .box-shadow(0 0 8px -1px rgba(0, 0, 0, 0.2)); + .asc-synchronizetip { + background-color: @btnColored; + color: @text-toolbar-header; + .close { + &:before, &:after { + background-color: @text-toolbar-header; + } } } - } - .close-div { - display: inline-block; - border: 1px solid #fff; - border-radius: 2px; - padding: 3px 12px; - margin-top: 10px; - } -} -.tooltip { - .tooltip-inner { - .toolbar & { - font-weight: normal; + .tip-arrow:after { + background-color: @btnColored; + } + + .btn-div { + display: inline-block; + border: 1px solid #fff; + border-radius: 2px; + padding: 3px 12px; + margin-top: 10px; } } } diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index 139c00ae0..a29c32ac3 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -44,7 +44,8 @@ define([ target : $(document.body), text : '', placement: 'right-bottom', - showLink: true + showLink: true, + showButton: false }, template: _.template([ @@ -58,6 +59,9 @@ define([ '<% if ( scope.showLink ) { %>', '
    ', '<% } %>', + '<% if ( scope.showButton ) { %>', + '
    <%= scope.textButton %>
    ', + '<% } %>', '', '' ].join('')), @@ -71,6 +75,8 @@ define([ this.textLink = !_.isEmpty(this.options.textLink) ? this.options.textLink : this.textDontShow; this.placement = this.options.placement; this.showLink = this.options.showLink; + this.showButton = this.options.showButton; + this.textButton = this.options.textButton || ''; }, render: function() { @@ -79,6 +85,7 @@ define([ $(document.body).append(this.cmpEl); this.cmpEl.find('.close').on('click', _.bind(function() { this.trigger('closeclick');}, this)); this.cmpEl.find('.show-link label').on('click', _.bind(function() { this.trigger('dontshowclick');}, this)); + this.cmpEl.find('.btn-div').on('click', _.bind(function() { this.trigger('buttonclick');}, this)); } this.applyPlacement(); diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 63cad1831..5b1f03285 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -1,12 +1,13 @@ .synch-tip-root { position: absolute; z-index: @zindex-navbar + 2; + @tip-width: 300px; &:not(.simple) { - width: 300px; + width: @tip-width; .tip-text { - width: 260px; + width: @tip-width - 40px; } } diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index dcadaeb6e..e0eddd23a 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -5,6 +5,7 @@ define([ 'common/main/lib/component/Window', 'common/main/lib/component/LoadMask', 'common/main/lib/component/Tooltip', + 'common/main/lib/component/SynchronizeTip', 'common/main/lib/util/LocalStorage', 'common/main/lib/util/Shortcuts', 'documenteditor/forms/app/view/ApplicationView' @@ -14,8 +15,7 @@ define([ var LoadingDocument = -256, maxPages = 0, labelDocName, - btnSubmit, - _submitFail, $submitedTooltip, $requiredTooltip, + _submitFail, screenTip, mouseMoveData = null, isTooltipHiding = false, @@ -195,8 +195,8 @@ define([ case Asc.c_oAscError.ID.Submit: config.msg = this.errorSubmit; - // _submitFail = true; - // $submitedTooltip && $submitedTooltip.hide(); + _submitFail = true; + this.submitedTooltip && this.submitedTooltip.hide(); break; case Asc.c_oAscError.ID.EditingError: @@ -459,14 +459,12 @@ define([ AscCommon.UserInfoParser.setParser(true); AscCommon.UserInfoParser.setCurrentName(this.appOptions.user.fullname); - btnSubmit = $('#id-btn-submit'); - var me = this; + me.view.btnSubmit.setVisible(this.appOptions.canFillForms && this.appOptions.canSubmitForms); if (!this.appOptions.canFillForms) { me.view.btnPrev.setVisible(false); me.view.btnNext.setVisible(false); me.view.btnClear.setVisible(false); - btnSubmit.hide(); } else { me.view.btnPrev.on('click', function(){ me.api.asc_MoveToFillingForm(false); @@ -477,14 +475,9 @@ define([ me.view.btnClear.on('click', function(){ me.api.asc_ClearAllSpecialForms(); }); - - if (this.appOptions.canSubmitForms) { - btnSubmit.find('.caption').text(this.textSubmit); - btnSubmit.on('click', function(){ - me.api.asc_SendForm(); - }); - } else - btnSubmit.hide(); + me.view.btnSubmit.on('click', function(){ + me.api.asc_SendForm(); + }); this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); this.api.asc_SetFastCollaborative(true); @@ -557,9 +550,9 @@ define([ break; case Asc.c_oAscAsyncAction['Submit']: _submitFail = false; - $submitedTooltip && $submitedTooltip.hide(); - btnSubmit.attr({disabled: true}); - btnSubmit.css("pointer-events", "none"); + this.submitedTooltip && this.submitedTooltip.hide(); + this.view.btnSubmit.setDisabled(true); + this.view.btnSubmit.cmpEl.css("pointer-events", "none"); break; case LoadingDocument: text = this.textLoadingDocument + ' '; @@ -588,15 +581,16 @@ define([ action ? this.setLongActionView(action) : this.loadMask && this.loadMask.hide(); if (id==Asc.c_oAscAsyncAction['Submit']) { - btnSubmit.removeAttr('disabled'); - btnSubmit.css("pointer-events", "auto"); + this.view.btnSubmit.setDisabled(false); + this.view.btnSubmit.cmpEl.css("pointer-events", "auto"); if (!_submitFail) { - if (!$submitedTooltip) { - $submitedTooltip = $(''); - $(document.body).append($submitedTooltip); - $submitedTooltip.on('click', function() {$submitedTooltip.hide();}); + if (!this.submitedTooltip) { + var me = this; + this.submitedTooltip = $(''); + $(document.body).append(this.submitedTooltip); + this.submitedTooltip.on('click', function() {me.submitedTooltip.hide();}); } - $submitedTooltip.show(); + this.submitedTooltip.show(); } } }, @@ -715,14 +709,8 @@ define([ }, onFillRequiredFields: function(isFilled) { - if (isFilled) { - btnSubmit.removeAttr('disabled'); - btnSubmit.css("pointer-events", "auto"); - // $requiredTooltip && $requiredTooltip.hide(); - } else { - btnSubmit.attr({disabled: true}); - btnSubmit.css("pointer-events", "none"); - } + this.view.btnSubmit.setDisabled(!isFilled); + this.view.btnSubmit.cmpEl.css("pointer-events", isFilled ? "auto" : "none"); }, onProcessMouse: function(data) { @@ -1055,25 +1043,34 @@ define([ // TODO: add asc_hasRequiredFields to sdk if (this.appOptions.canSubmitForms && !this.api.asc_IsAllRequiredFormsFilled()) { + this.view.btnSubmit.setDisabled(true); + this.view.btnSubmit.cmpEl.css("pointer-events", "none"); var sgroup = $('#id-submit-group'); - btnSubmit.attr({disabled: true}); - btnSubmit.css("pointer-events", "none"); if (!Common.localStorage.getItem("de-embed-hide-submittip")) { - var offset = btnSubmit.offset(); - $requiredTooltip = $(''); - $(document.body).append($requiredTooltip); - $requiredTooltip.css({top : offset.top + btnSubmit.height() + 'px', left: offset.left + btnSubmit.outerWidth()/2 - $requiredTooltip.outerWidth() + 'px'}); - $requiredTooltip.find('.close-div').on('click', function() { - $requiredTooltip.hide(); + var requiredTooltip = new Common.UI.SynchronizeTip({ + extCls: 'colored', + placement: 'bottom-left', + target: this.view.btnSubmit.$el, + text: this.textRequired, + showLink: false, + showButton: true, + textButton: this.textGotIt + }); + var onclose = function () { + requiredTooltip.hide(); me.api.asc_MoveToFillingForm(true, true, true); - Common.localStorage.setItem("de-embed-hide-submittip", 1); sgroup.attr('data-toggle', 'tooltip'); sgroup.tooltip({ title : me.textRequired, placement : 'bottom' }); + }; + requiredTooltip.on('buttonclick', function () { + onclose(); + Common.localStorage.setItem("de-embed-hide-submittip", 1); }); - $requiredTooltip.show(); + requiredTooltip.on('closeclick', onclose); + requiredTooltip.show(); } else { sgroup.attr('data-toggle', 'tooltip'); sgroup.tooltip({ @@ -1126,7 +1123,6 @@ define([ errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', textNext: 'Next Field', textClear: 'Clear All Fields', - textSubmit: 'Submit', textSubmited: 'Form submitted successfully
    Click to close the tip.', errorSubmit: 'Submit failed.', errorEditingDownloadas: 'An error occurred during the work with the document.
    Use the \'Download as...\' option to save the file backup copy to your computer hard drive.', diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index e3f9ea6b6..5f2e3865b 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -54,6 +54,12 @@ define([ }); this.btnPrev.render($('#id-btn-prev-field')); + this.btnSubmit = new Common.UI.Button({ + cls: 'btn-text-default colored margin-left-small margin-right-small', + caption: this.textSubmit + }); + this.btnSubmit.render($('#id-submit-group')); + this.txtGoToPage = new Common.UI.InputField({ el: $('#page-number'), cls: 'masked', @@ -75,6 +81,7 @@ define([ txtDownloadDocx: 'Download as docx', txtDownloadPdf: 'Download as pdf', textNext: 'Next Field', - textClear: 'Clear All Fields' + textClear: 'Clear All Fields', + textSubmit: 'Submit' }); }); \ No newline at end of file diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index f93e830ac..1c296feb5 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -201,7 +201,7 @@
    of 1
    -
    +
    From 8cea823d64a96e2bb83ee3c4324971a15339b25c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 00:01:46 +0300 Subject: [PATCH 022/129] [DE forms] Use calendar component --- .../app/controller/ApplicationController.js | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index e0eddd23a..fadad3e5d 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -6,6 +6,8 @@ define([ 'common/main/lib/component/LoadMask', 'common/main/lib/component/Tooltip', 'common/main/lib/component/SynchronizeTip', + 'common/main/lib/component/DataView', + 'common/main/lib/component/Calendar', 'common/main/lib/util/LocalStorage', 'common/main/lib/util/Shortcuts', 'documenteditor/forms/app/view/ApplicationView' @@ -751,6 +753,9 @@ define([ onShowContentControlsActions: function(obj, x, y) { var me = this; switch (obj.type) { + case Asc.c_oAscContentControlSpecificType.DateTime: + this.onShowDateActions(obj, x, y); + break; case Asc.c_oAscContentControlSpecificType.Picture: if (obj.pr && obj.pr.get_Lock) { var lock = obj.pr.get_Lock(); @@ -860,6 +865,75 @@ define([ this._fromShowContentControls = false; }, + onShowDateActions: function(obj, x, y) { + var props = obj.pr, + specProps = props.get_DateTimePr(), + controlsContainer = this.boxSdk.find('#calendar-control-container'), + me = this; + + this._dateObj = props; + + if (controlsContainer.length < 1) { + controlsContainer = $('
    '); + this.boxSdk.append(controlsContainer); + } + + Common.UI.Menu.Manager.hideAll(); + + controlsContainer.css({left: x, top : y}); + controlsContainer.show(); + + if (!this.cmpCalendar) { + this.cmpCalendar = new Common.UI.Calendar({ + el: this.boxSdk.find('#id-document-calendar-control'), + enableKeyEvents: true, + firstday: 1 + }); + this.cmpCalendar.on('date:click', function (cmp, date) { + var specProps = me._dateObj.get_DateTimePr(); + specProps.put_FullDate(new Date(date)); + me.api.asc_SetContentControlDatePickerDate(specProps); + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); + }); + this.cmpCalendar.on('calendar:keydown', function (cmp, e) { + if (e.keyCode==Common.UI.Keys.ESC) { + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); + } + }); + $(document).on('mousedown', function(e) { + if (e.target.localName !== 'canvas' && controlsContainer.is(':visible') && controlsContainer.find(e.target).length==0) { + controlsContainer.hide(); + me.api.asc_UncheckContentControlButtons(); + } + }); + + } + this.cmpCalendar.setDate(new Date(specProps ? specProps.get_FullDate() : undefined)); + + // align + var offset = controlsContainer.offset(), + docW = Common.Utils.innerWidth(), + docH = Common.Utils.innerHeight() - 10, // Yep, it's magic number + menuW = this.cmpCalendar.cmpEl.outerWidth(), + menuH = this.cmpCalendar.cmpEl.outerHeight(), + buttonOffset = 22, + left = offset.left - menuW, + top = offset.top; + if (top + menuH > docH) { + top = docH - menuH; + left -= buttonOffset; + } + if (top < 0) + top = 0; + if (left + menuW > docW) + left = docW - menuW; + this.cmpCalendar.cmpEl.css({left: left, top : top}); + + this._preventClick = true; + }, + onDocumentContentReady: function() { var me = this; From 4d68bb6008514d4845d4d0e2069c0b5a6d0f52de Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 11:22:17 +0300 Subject: [PATCH 023/129] Add embed dialog --- apps/common/forms/lib/view/modals.js | 125 +++++++++++++++++ apps/common/forms/resources/less/common.less | 130 +++++++++++------- .../app/controller/ApplicationController.js | 4 + .../forms/app/view/ApplicationView.js | 3 +- apps/documenteditor/forms/app_dev.js | 1 + 5 files changed, 212 insertions(+), 51 deletions(-) create mode 100644 apps/common/forms/lib/view/modals.js diff --git a/apps/common/forms/lib/view/modals.js b/apps/common/forms/lib/view/modals.js new file mode 100644 index 000000000..e535b8fdc --- /dev/null +++ b/apps/common/forms/lib/view/modals.js @@ -0,0 +1,125 @@ + +!window.Common && (window.Common = {}); +!Common.Views && (Common.Views = {}); + +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/MetricSpinner', + 'common/main/lib/component/TextareaField' +], function () { 'use strict'; + + Common.Views.ShareDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 300, + header: true, + style: 'min-width: 300px;', + cls: 'modal-dlg', + buttons: null + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, options || {}); + + this.template = [ + '
    ', + '
    ', + '', + '', + '', + '', + '', + '', + '', + '
    ', + '', + '
    ', + '    		', + '', + '
    ', + '
    ', + '
    ', + '
    ', + '', + '
    ', + '
    ', + '', + '
    ' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + this.embedConfig = this.options.embedConfig; + this.embedCode = ''; + + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + this.spnWidth = new Common.UI.MetricSpinner({ + el: $('#share-size-spin-width'), + step: 1, + width: 70, + defaultUnit : "px", + value: '400 px', + minValue: 400, + maxValue: 10000 + }); + this.spnWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + this.updateEmbedCode(); + }, this)); + + this.spnHeight = new Common.UI.MetricSpinner({ + el: $('#share-size-spin-height'), + step: 1, + width: 70, + defaultUnit : "px", + value: '600 px', + minValue: 600, + maxValue: 10000 + }); + this.spnHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + this.updateEmbedCode(); + }, this)); + + this.textareaInput = new Common.UI.TextareaField({ + el : $('#share-embed'), + style : 'width: 100%; height: 65px;', + value : '' + }); + this.updateEmbedCode(); + + this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + }, + + getFocusedComponents: function() { + return [this.spnWidth, this.spnHeight, this.textareaInput]; + }, + + getDefaultFocusableComponent: function () { + return this.textareaInput; + }, + + onBtnClick: function(event) { + this.textareaInput._input.select(); + if ( !document.execCommand('copy') ) { + Common.UI.warning({ + msg: this.warnCopy, + buttons: ['ok'] + }); + } + }, + + updateEmbedCode: function() { + this.textareaInput.setValue(Common.Utils.String.format(this.embedCode, this.embedConfig.embedUrl, this.spnWidth.getNumberValue(), this.spnHeight.getNumberValue())); + }, + + textTitle: 'Embed', + textWidth: 'Width', + textHeight: 'Height', + txtCopy: 'Copy to clipboard', + warnCopy: 'Browser\'s error! Use keyboard shortcut [Ctrl] + [C]' + }, Common.Views.ShareDialog || {})) +}); \ No newline at end of file diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index b4da7ec3d..95e5893d5 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -76,6 +76,7 @@ @import "../../../../common/main/resources/less/common.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; @import "../../../../common/main/resources/less/calendar.less"; +@import "../../../../common/main/resources/less/spinner.less"; //@import "loadmask.less"; @@ -538,60 +539,91 @@ margin: -3px 4px 0 -24px; } -.modal-dialog { - margin-top: 100px; - .share-buttons { - height: 40px; - text-align: center; - - span { - display: inline-block; - margin: 0 7px; - cursor: pointer; - } - } - - .share-link { - margin: 0 0 15px 0; - } -} - -.modal-header { - padding-bottom: 10px; - text-align: center; - - .close { - margin-top: 0; - opacity: 0.5; - - &:hover { - opacity: 0.7; - } - } -} - -.modal-body { - padding: 20px; -} - -.modal-footer { - text-align: center; -} - -#dlg-share, #dlg-embed { - .modal-dialog { - width: 330px; - } - +.modal-dlg { textarea { - width: 288px; + .user-select(text); + width: 100%; resize: none; - cursor: auto; - font-size: 1em; - border-radius: 0; + margin-bottom: 5px; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; + border: @scaled-one-px-value solid @border-regular-control; + height: 100%; + + &.disabled { + opacity: @component-disabled-opacity; + cursor: default !important; + } + } + + label { + .font-size-normal(); + font-weight: normal; + + &.input-label{ + margin-bottom: 0; + vertical-align: middle; + } + + &.header { + font-weight: bold; + } } } +//.modal-dialog { +// margin-top: 100px; +// .share-buttons { +// height: 40px; +// text-align: center; +// +// span { +// display: inline-block; +// margin: 0 7px; +// cursor: pointer; +// } +// } +// +// .share-link { +// margin: 0 0 15px 0; +// } +//} + +//.modal-header { +// padding-bottom: 10px; +// text-align: center; +// +// .close { +// margin-top: 0; +// opacity: 0.5; +// +// &:hover { +// opacity: 0.7; +// } +// } +//} +// +//.modal-body { +// padding: 20px; +//} + +//.modal-footer { +// text-align: center; +//} +// +//#dlg-share, #dlg-embed { +// .modal-dialog { +// width: 330px; +// } +// +// textarea { +// width: 288px; +// resize: none; +// cursor: auto; +// font-size: 1em; +// border-radius: 0; +// } +//} + .masked { background-color: transparent; border-color: transparent; diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index fadad3e5d..9a6259b02 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -10,6 +10,7 @@ define([ 'common/main/lib/component/Calendar', 'common/main/lib/util/LocalStorage', 'common/main/lib/util/Shortcuts', + 'common/forms/lib/view/modals', 'documenteditor/forms/app/view/ApplicationView' ], function (Viewport) { 'use strict'; @@ -1007,6 +1008,9 @@ define([ case 'share': break; case 'embed': + (new Common.Views.ShareDialog({ + embedConfig: this.embedConfig + })).show(); break; } }, diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index 5f2e3865b..87a0eb765 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -5,8 +5,7 @@ define([ 'common/main/lib/util/utils', 'common/main/lib/component/InputField', 'common/main/lib/component/Button', - 'common/main/lib/component/Menu', - 'common/main/lib/component/Calendar' + 'common/main/lib/component/Menu' ], function ($, _, Backbone) { 'use strict'; diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js index d83c567fa..82741e502 100644 --- a/apps/documenteditor/forms/app_dev.js +++ b/apps/documenteditor/forms/app_dev.js @@ -140,6 +140,7 @@ require([ 'documenteditor/forms/app/view/ApplicationView', 'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage', + 'common/forms/lib/view/modals' ], function() { window.compareVersions = true; app.start(); From fd10ef5ce96e902b5d5501385a4c22f572e25d78 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 12:49:11 +0300 Subject: [PATCH 024/129] [DE forms] Refactoring embed/share dialog --- apps/common/forms/lib/view/modals.js | 109 ++++++++++++++++-- apps/common/forms/resources/less/common.less | 4 + .../app/controller/ApplicationController.js | 8 +- 3 files changed, 112 insertions(+), 9 deletions(-) diff --git a/apps/common/forms/lib/view/modals.js b/apps/common/forms/lib/view/modals.js index e535b8fdc..6cdaac565 100644 --- a/apps/common/forms/lib/view/modals.js +++ b/apps/common/forms/lib/view/modals.js @@ -8,7 +8,7 @@ define([ 'common/main/lib/component/TextareaField' ], function () { 'use strict'; - Common.Views.ShareDialog = Common.UI.Window.extend(_.extend({ + Common.Views.EmbedDialog = Common.UI.Window.extend(_.extend({ options: { width: 300, header: true, @@ -28,16 +28,16 @@ define([ '', '', '', - '
    ', + '
    ', '', '', '', - '
    ', + '
    ', '', '', '', '', - '
    ', + '
    ', '', '', '', @@ -59,7 +59,7 @@ define([ Common.UI.Window.prototype.render.call(this); this.spnWidth = new Common.UI.MetricSpinner({ - el: $('#share-size-spin-width'), + el: $('#embed-size-spin-width'), step: 1, width: 70, defaultUnit : "px", @@ -72,7 +72,7 @@ define([ }, this)); this.spnHeight = new Common.UI.MetricSpinner({ - el: $('#share-size-spin-height'), + el: $('#embed-size-spin-height'), step: 1, width: 70, defaultUnit : "px", @@ -85,10 +85,11 @@ define([ }, this)); this.textareaInput = new Common.UI.TextareaField({ - el : $('#share-embed'), + el : $('#embed-textarea'), style : 'width: 100%; height: 65px;', value : '' }); + this.textareaInput._input.attr('readonly', true); this.updateEmbedCode(); this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); @@ -121,5 +122,99 @@ define([ textHeight: 'Height', txtCopy: 'Copy to clipboard', warnCopy: 'Browser\'s error! Use keyboard shortcut [Ctrl] + [C]' + }, Common.Views.EmbedDialog || {})); + + Common.Views.ShareDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 300, + header: true, + style: 'min-width: 300px;', + cls: 'modal-dlg', + buttons: null + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, options || {}); + + this.template = [ + '
    ', + '', + '', + '', + '', + '', + '', + '', + '
    ', + '', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '
    ', + '', + '
    ' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + this.embedConfig = this.options.embedConfig; + + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + this.textUrl = new Common.UI.InputField({ + el : $('#share-link-txt'), + editable : false, + value: this.embedConfig.shareUrl || '' + }); + this.updateShareCode(); + + this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + }, + + onBtnClick: function(event) { + this.textUrl._input.select(); + if ( !document.execCommand('copy') ) { + Common.UI.warning({ + msg: this.warnCopy, + buttons: ['ok'] + }); + } + }, + + updateShareCode: function() { + var me = this, + _encoded = encodeURIComponent(this.embedConfig.shareUrl), + docTitle = this.embedConfig.docTitle || '', + _mailto = 'mailto:?subject=I have shared a document with you: ' + docTitle + '&body=I have shared a document with you: ' + _encoded; + + this.getChild().find('.share-buttons > span').on('click', function(e){ + var _url; + switch ($(e.target).attr('data-name')) { + case 'facebook': + _url = 'https://www.facebook.com/sharer/sharer.php?u=' + me.embedConfig.shareUrl + '&t=' + encodeURI(docTitle); + window.open(_url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600'); + break; + case 'twitter': + _url = 'https://twitter.com/share?url='+ _encoded; + !!docTitle && (_url += encodeURIComponent('&text=' + docTitle)); + window.open(_url, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600'); + break; + case 'email': + window.open(_mailto, '_self'); + break; + } + }); + }, + + textTitle: 'Share Link', + txtCopy: 'Copy to clipboard', + warnCopy: 'Browser\'s error! Use keyboard shortcut [Ctrl] + [C]' }, Common.Views.ShareDialog || {})) }); \ No newline at end of file diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 95e5893d5..3e9946037 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -553,6 +553,10 @@ opacity: @component-disabled-opacity; cursor: default !important; } + + &[readonly] { + cursor: auto; + } } label { diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 9a6259b02..b74067606 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -403,7 +403,8 @@ define([ labelDocName = $('#title-doc-name'); if (data.doc) { - labelDocName.text(data.doc.title || '') + labelDocName.text(data.doc.title || ''); + this.embedConfig.docTitle = data.doc.title; } }, @@ -1006,9 +1007,12 @@ define([ Common.Analytics.trackEvent('Save'); break; case 'share': + (new Common.Views.ShareDialog({ + embedConfig: this.embedConfig + })).show(); break; case 'embed': - (new Common.Views.ShareDialog({ + (new Common.Views.EmbedDialog({ embedConfig: this.embedConfig })).show(); break; From 519cba50f9733635d7d4f06d618c97f8644ecad7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 23:30:10 +0300 Subject: [PATCH 025/129] [DE forms] Fix share dialog --- apps/common/forms/lib/view/modals.js | 13 ++-- apps/common/forms/resources/less/common.less | 73 ++++---------------- 2 files changed, 24 insertions(+), 62 deletions(-) diff --git a/apps/common/forms/lib/view/modals.js b/apps/common/forms/lib/view/modals.js index 6cdaac565..dae9f042a 100644 --- a/apps/common/forms/lib/view/modals.js +++ b/apps/common/forms/lib/view/modals.js @@ -139,7 +139,7 @@ define([ }, options || {}); this.template = [ - '
    ', + '
    ', '', '', '', '', '', - '', + '', '', '
    ', @@ -147,9 +147,14 @@ define([ '
    ', - '
    ', - '    		', + '', + '
    ', '
    ', diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 3e9946037..21f911f47 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -553,10 +553,6 @@ opacity: @component-disabled-opacity; cursor: default !important; } - - &[readonly] { - cursor: auto; - } } label { @@ -572,62 +568,23 @@ font-weight: bold; } } + + .form-control[readonly] { + cursor: auto; + } + + .share-buttons { + height: 40px; + text-align: center; + + span { + display: inline-block; + margin: 0 7px; + cursor: pointer; + } + } } -//.modal-dialog { -// margin-top: 100px; -// .share-buttons { -// height: 40px; -// text-align: center; -// -// span { -// display: inline-block; -// margin: 0 7px; -// cursor: pointer; -// } -// } -// -// .share-link { -// margin: 0 0 15px 0; -// } -//} - -//.modal-header { -// padding-bottom: 10px; -// text-align: center; -// -// .close { -// margin-top: 0; -// opacity: 0.5; -// -// &:hover { -// opacity: 0.7; -// } -// } -//} -// -//.modal-body { -// padding: 20px; -//} - -//.modal-footer { -// text-align: center; -//} -// -//#dlg-share, #dlg-embed { -// .modal-dialog { -// width: 330px; -// } -// -// textarea { -// width: 288px; -// resize: none; -// cursor: auto; -// font-size: 1em; -// border-radius: 0; -// } -//} - .masked { background-color: transparent; border-color: transparent; From 3940e70940e89b73291b036fe39611b7d99e51bb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 23:31:00 +0300 Subject: [PATCH 026/129] [DE forms] Fix loading mask --- apps/common/forms/resources/less/common.less | 5 +- .../common/forms/resources/less/loadmask.less | 74 ------------------- 2 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 apps/common/forms/resources/less/loadmask.less diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 21f911f47..8fc348073 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -78,9 +78,6 @@ @import "../../../../common/main/resources/less/calendar.less"; @import "../../../../common/main/resources/less/spinner.less"; - -//@import "loadmask.less"; - @toolbarBorderColor: #dbdbdb; @toolbarBorderShadowColor: #FAFAFA; @toolbarTopColor: #F7F7F7; @@ -100,6 +97,8 @@ @iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; @icon-socnet-size: 40px; +@loadmask-zindex: 10000; + .embed-body { -moz-user-select: -moz-none; -khtml-user-select: none; diff --git a/apps/common/forms/resources/less/loadmask.less b/apps/common/forms/resources/less/loadmask.less deleted file mode 100644 index 26d068654..000000000 --- a/apps/common/forms/resources/less/loadmask.less +++ /dev/null @@ -1,74 +0,0 @@ -@loadmask-zindex: 10000; -@loadmask-image-height: 28px; -@loadmask-image-width: 28px; -@loadmask-small-image-height: 20px; -@loadmask-small-image-width: 20px; -@background-loader-ie: fade(#000, 65%); -@background-loader: fade(#181818, 90%); -@text-contrast-background-ie: #fff; -@text-contrast-background: #fff; - -.asc-loadmask { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - zoom: 1; - background-color: transparent; - z-index: @loadmask-zindex; -} - -.asc-loadmask-body { - position: absolute; - z-index: @loadmask-zindex + 1; - padding: 24px; - line-height: @loadmask-image-height; - border: none; - background-image: none; - background-color: @background-loader-ie; - background-color: @background-loader; - color: @text-contrast-background-ie; - color: @text-contrast-background; - border-radius: 6px; - - left: 50%; - top: 50%; - transform: translate(-50%); - - & > div { - display: inline-block; - vertical-align: middle; - } - - .asc-loadmask-image { - background-image: ~"url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyOCAyOCI+PGNpcmNsZSBjeD0iMTQiIGN5PSIxNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjEuNSIgcj0iMTAuMjUiIHN0cm9rZS1kYXNoYXJyYXk9IjE2MCUsIDQwJSIgLz48L3N2Zz4=)"; - height: 28px; - width: 28px; - float: left; - margin-left: 8px; - } - - .asc-loadmask-title { - font-size: 13px; - margin: 0 8px 0 12px; - white-space: pre-wrap; - } -} - -@keyframes rotation { - from { - transform: rotate(0); - } - - to { - transform: rotate(360deg); - } -} - -#loadmask-spinner { - animation-duration: .8s; - animation-name: rotation; - animation-iteration-count: infinite; - animation-timing-function: linear; -} From 4a1fd64001e5a9d24b11308e433a5f07a4e69b46 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Aug 2021 23:47:34 +0300 Subject: [PATCH 027/129] [DE forms] Refactoring --- apps/common/forms/resources/less/common.less | 8 ------- .../app/controller/ApplicationController.js | 21 +++---------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index 8fc348073..3ff2c1ecb 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -81,18 +81,10 @@ @toolbarBorderColor: #dbdbdb; @toolbarBorderShadowColor: #FAFAFA; @toolbarTopColor: #F7F7F7; -@toolbarBottomColor: #CCCCCC; -//@toolbarHoverColor: #7698DE; @toolbarFontSize: 12px; -//@buttonFontSize: 11px; -//@controlBtnHoverTopColor: #6180C4; -//@controlBtnHoverBottomColor: #8AACF1; -//@btnColor: #d8dadc; -//@btnActiveColor: #7d858c; @btnColored: #446995; @btnActiveColored: #293F59; @btnHoverColored: #375478; -//@notificationColor: #fcfed7; @iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png"; @icon-socnet-size: 40px; diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index b74067606..672795458 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -59,7 +59,6 @@ define([ $(window).on('resize', this.onDocumentResize.bind(this)); this.boxSdk = $('#editor_sdk'); - // this.boxSdk.css('border-left', 'none'); this.boxSdk.on('click', function(e) { if (e.target.localName == 'canvas') { if (me._preventClick) @@ -276,18 +275,9 @@ define([ this.editorConfig = $.extend(this.editorConfig, data.config); this.embedConfig = $.extend(this.embedConfig, data.config.embedded); - // common.controller.modals.init(this.embedConfig); - - // Docked toolbar - if (this.embedConfig.toolbarDocked === 'bottom') { - $('#toolbar').addClass('bottom'); - this.boxSdk.addClass('bottom'); - ttOffset[1] = -40; - } else { - $('#toolbar').addClass('top'); - this.boxSdk.addClass('top'); - ttOffset[1] = 40; - } + $('#toolbar').addClass('top'); + this.boxSdk.addClass('top'); + ttOffset[1] = 40; this.appOptions.customization = this.editorConfig.customization; this.appOptions.canRenameAnonymous = !((typeof (this.appOptions.customization) == 'object') && (typeof (this.appOptions.customization.anonymous) == 'object') && (this.appOptions.customization.anonymous.request===false)); @@ -1070,11 +1060,6 @@ define([ else if ((!this.embedConfig.embedUrl || this.appOptions.canFillForms) && !this.embedConfig.fullscreenUrl) menuItems[8].setVisible(false); - // common.controller.modals.attach({ - // share: '#idt-share', - // embed: '#idt-embed' - // }); - screenTip = { toolTip: new Common.UI.Tooltip({ owner: this, From 065cb196463bc1a4347263fef4eb92342c7cff53 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 24 Aug 2021 16:34:30 +0300 Subject: [PATCH 028/129] [SSE mobile] Fix Bug 52115 --- .../mobile/src/view/edit/Edit.jsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 2115c773d..17ca519c0 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -328,7 +328,6 @@ const EditLayoutContent = ({ editors }) => { const EditTabs = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); - const store = props.storeFocusObjects; const settings = !store.focusOn ? [] : (store.focusOn === 'obj' ? store.objects : store.selections); let editors = []; @@ -374,7 +373,7 @@ const EditTabs = props => { component: }) } - if (settings.indexOf('hyperlink') > -1) { + if (settings.indexOf('hyperlink') > -1 || (props.hyperinfo && props.isAddShapeHyperlink)) { editors.push({ caption: _t.textHyperlink, id: 'edit-link', @@ -404,10 +403,10 @@ const EditView = props => { return ( show_popover ? props.onClosed()}> - + : props.onClosed()}> - + ) }; @@ -428,8 +427,13 @@ const EditOptions = props => { props.onclosed(); }; + const api = Common.EditorApi.get(); + const cellinfo = api.asc_getCellInfo(); + const hyperinfo = cellinfo.asc_getHyperlink(); + const isAddShapeHyperlink = api.asc_canAddShapeHyperlink(); + return ( - + ) }; From e343a3a4f661d38f4f7eb5a08a72ae36f5aa84b8 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 24 Aug 2021 20:18:40 +0300 Subject: [PATCH 029/129] [PE mobile] Fix Bug 47072 --- apps/presentationeditor/mobile/src/controller/edit/EditText.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 46dae3c2a..af17d99a8 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -138,7 +138,7 @@ class EditTextController extends Component { } else { typeof size === 'undefined' || size == '' ? api.FontSizeIn() : size = Math.min(300, ++size); } - if (typeof size !== 'undefined' || size == '') { + if (typeof size !== 'undefined' && size !== '') { api.put_TextPrFontSize(size); } }; From 6ae57c93119c98c9c1f4582ba22c95a9eb6c8d23 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 25 Aug 2021 16:00:51 +0300 Subject: [PATCH 030/129] [DE mobile] Bug 47403 --- .../src/view/settings/DocumentSettings.jsx | 46 ++++++++----------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx index e9430a4f8..dd620d449 100644 --- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx @@ -12,29 +12,7 @@ const PageDocumentFormats = props => { const pageSizesIndex = storeSettings.pageSizesIndex; const pageSizes = storeSettings.getPageSizesList(); const textMetric = Common.Utils.Metric.getCurrentMetricName(); - const margins = props.getMargins(); - const maxMarginsW = margins.maxMarginsW; - const maxMarginsH = margins.maxMarginsH; - - // console.log(margins.left, margins.right, margins.top, margins.bottom); - // console.log(maxMarginsW, maxMarginsH); - - const onFormatChange = (value) => { - let errorMsg; - - if (margins.left + margins.right > maxMarginsW) { - errorMsg = _t.textMarginsW; - } else if (margins.top + margins.bottom > maxMarginsH) { - errorMsg = _t.textMarginsH; - } - - if(errorMsg) { - f7.dialog.alert(errorMsg, _t.notcriticalErrorTitle); - } else { - props.onFormatChange(value); - } - } - + return ( @@ -45,7 +23,7 @@ const PageDocumentFormats = props => { subtitle={parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[0]).toFixed(2)) + ' ' + textMetric + ' x ' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(item.value[1]).toFixed(2)) + ' ' + textMetric} name="format-size-checkbox" checked={pageSizesIndex === index} - onClick={e => onFormatChange(item.value)} + onClick={e => props.onFormatChange(item.value)} >)} @@ -58,6 +36,8 @@ const PageDocumentMargins = props => { const _t = t('Settings', {returnObjects: true}); const metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); const margins = props.getMargins(); + const maxMarginsW = margins.maxMarginsW; + const maxMarginsH = margins.maxMarginsH; const [stateTop, setTop] = useState(margins.top); const [stateBottom, setBottom] = useState(margins.bottom); const [stateLeft, setLeft] = useState(margins.left); @@ -65,7 +45,7 @@ const PageDocumentMargins = props => { const onChangeMargins = (align, isDecrement) => { const step = Common.Utils.Metric.fnRecalcToMM(Common.Utils.Metric.getCurrentMetric() === Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1); - let marginValue; + let marginValue, errorMsg; switch (align) { case 'left': marginValue = stateLeft; break; @@ -77,7 +57,21 @@ const PageDocumentMargins = props => { if (isDecrement) { marginValue = Math.max(0, marginValue - step); } else { - marginValue = Math.min((align == 'left' || align == 'right') ? margins.maxMarginsW : margins.maxMarginsH, marginValue + step); + if(align == 'left' || align == 'right') { + marginValue = Math.min(maxMarginsW, marginValue + step); + if(stateLeft + stateRight + step > maxMarginsW) + errorMsg = _t.textMarginsW; + + } else { + marginValue = Math.min(maxMarginsH, marginValue + step); + if(stateTop + stateBottom + step > maxMarginsH) + errorMsg = _t.textMarginsH; + } + + if(errorMsg) { + f7.dialog.alert(errorMsg, _t.notcriticalErrorTitle); + return; + } } switch (align) { From 38f3d5ad374d0c6f8a4f14ffe18cd379c58be03c Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 26 Aug 2021 10:55:16 +0300 Subject: [PATCH 031/129] [DE] Add buttons for Bullets --- apps/documenteditor/mobile/locale/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index b50b95340..2f2d0a313 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -180,6 +180,8 @@ "menuStartNewList": "Start new list", "menuStartNumberingFrom": "Set numbering value", "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", From 0bcadfc32c2aef22f550b09dbd858c96c8562127 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 26 Aug 2021 14:23:24 +0300 Subject: [PATCH 032/129] [DE PE SSE mobile] Deleted unnecessary --- apps/documenteditor/mobile/src/store/textSettings.js | 8 -------- apps/presentationeditor/mobile/src/store/textSettings.js | 8 -------- apps/spreadsheeteditor/mobile/src/store/textSettings.js | 8 -------- 3 files changed, 24 deletions(-) diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js index c948bca09..e6a64506c 100644 --- a/apps/documenteditor/mobile/src/store/textSettings.js +++ b/apps/documenteditor/mobile/src/store/textSettings.js @@ -115,14 +115,6 @@ export class storeTextSettings { const applicationPixelRatio = Common.Utils.applicationPixelRatio(); - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); - this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); let currentDistance = 0; diff --git a/apps/presentationeditor/mobile/src/store/textSettings.js b/apps/presentationeditor/mobile/src/store/textSettings.js index 81a5e2edb..e82800153 100644 --- a/apps/presentationeditor/mobile/src/store/textSettings.js +++ b/apps/presentationeditor/mobile/src/store/textSettings.js @@ -116,14 +116,6 @@ export class storeTextSettings { const applicationPixelRatio = Common.Utils.applicationPixelRatio(); - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); - this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); let currentDistance = 0; diff --git a/apps/spreadsheeteditor/mobile/src/store/textSettings.js b/apps/spreadsheeteditor/mobile/src/store/textSettings.js index 0cf134fdd..fb43012ce 100644 --- a/apps/spreadsheeteditor/mobile/src/store/textSettings.js +++ b/apps/spreadsheeteditor/mobile/src/store/textSettings.js @@ -119,14 +119,6 @@ export class storeTextSettings { const applicationPixelRatio = Common.Utils.applicationPixelRatio(); - if (typeof window['AscDesktopEditor'] === 'object') { - this.thumbs[0].path = window['AscDesktopEditor'].getFontsSprite(''); - this.thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x'); - this.thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x'); - this.thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x'); - this.thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x'); - } - let bestDistance = Math.abs(applicationPixelRatio - this.thumbs[0].ratio); let currentDistance = 0; From f336d0ef0a561c3a00ef22c6288d92c02fdc2c6e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Aug 2021 15:14:29 +0300 Subject: [PATCH 033/129] Fix Bug 50683 --- apps/documenteditor/main/app/controller/Toolbar.js | 13 ++++++++++--- .../mobile/src/controller/add/AddImage.jsx | 2 +- .../main/app/controller/Toolbar.js | 13 ++++++++++--- .../main/app/view/DocumentHolder.js | 2 +- .../mobile/src/controller/add/AddImage.jsx | 2 +- .../main/app/controller/Toolbar.js | 13 ++++++++++--- .../mobile/src/controller/add/AddImage.jsx | 2 +- 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index e03d1e1df..5c19fbc84 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1584,7 +1584,7 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(checkUrl); + me.api.AddImageUrl([checkUrl]); Common.component.Analytics.trackEvent('ToolBar', 'Image'); } else { @@ -1618,9 +1618,16 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && (!data.c || data.c=='add')) { + if (data && (data.url || data.images) && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); - this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + var arr = []; + if (data.images && data.images.length>0) { + for (var i=0; i0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, diff --git a/apps/documenteditor/mobile/src/controller/add/AddImage.jsx b/apps/documenteditor/mobile/src/controller/add/AddImage.jsx index c3a10eaff..73145f992 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddImage.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddImage.jsx @@ -36,7 +36,7 @@ class AddImageController extends Component { if ((/((^https?)|(^ftp)):\/\/.+/i.test(_value))) { this.closeModal(); const api = Common.EditorApi.get(); - api.AddImageUrl(_value); + api.AddImageUrl([_value]); } else { f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); } diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 50652a01b..eff6bf4c4 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1584,7 +1584,7 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.AddImageUrl(checkUrl); + me.api.AddImageUrl([checkUrl]); Common.component.Analytics.trackEvent('ToolBar', 'Image'); } else { @@ -1618,9 +1618,16 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && (!data.c || data.c=='add')) { + if (data && (data.url || data.images) && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); - this.api.AddImageUrl(data.url, undefined, data.token);// for loading from storage + var arr = []; + if (data.images && data.images.length>0) { + for (var i=0; i0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 1dfba5554..e120004d1 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3633,7 +3633,7 @@ define([ var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { if (placeholder) - me.api.AddImageUrl(checkUrl, undefined, undefined, obj); + me.api.AddImageUrl([checkUrl], undefined, undefined, obj); else { var props = new Asc.asc_CImgProperty(); props.put_ImageUrl(checkUrl); diff --git a/apps/presentationeditor/mobile/src/controller/add/AddImage.jsx b/apps/presentationeditor/mobile/src/controller/add/AddImage.jsx index 4aafae09b..ad68b85b0 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddImage.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddImage.jsx @@ -36,7 +36,7 @@ class AddImageController extends Component { if ((/((^https?)|(^ftp)):\/\/.+/i.test(_value))) { this.closeModal(); const api = Common.EditorApi.get(); - api.AddImageUrl(_value); + api.AddImageUrl([_value]); } else { f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index d5df8f779..cf64478a0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -865,7 +865,7 @@ define([ var checkUrl = value.replace(/\s/g, ''); if (!_.isEmpty(checkUrl)) { me.toolbar.fireEvent('insertimage', me.toolbar); - me.api.asc_addImageDrawingObject(checkUrl); + me.api.asc_addImageDrawingObject([checkUrl]); Common.component.Analytics.trackEvent('ToolBar', 'Image'); } else { @@ -899,9 +899,16 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && (!data.c || data.c=='add')) { + if (data && (data.url || data.images) && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); - this.api.asc_addImageDrawingObject(data.url, undefined, data.token);// for loading from storage + var arr = []; + if (data.images && data.images.length>0) { + for (var i=0; i0) && this.api.asc_addImageDrawingObject(arr, undefined, data.token);// for loading from storage Common.component.Analytics.trackEvent('ToolBar', 'Image'); } }, diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddImage.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddImage.jsx index 10815d5f4..8939dc6ab 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddImage.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddImage.jsx @@ -36,7 +36,7 @@ class AddImageController extends Component { if ((/((^https?)|(^ftp)):\/\/.+/i.test(_value))) { this.closeModal(); const api = Common.EditorApi.get(); - api.asc_addImageDrawingObject(_value); + api.asc_addImageDrawingObject([_value]); } else { f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); } From 8221ad5e63c970adbef68cb3bbdd03bc771fd3ac Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Aug 2021 16:43:18 +0300 Subject: [PATCH 034/129] [DE] Add settings for changes display: tooltips or balloons (customization->review->hoverMode) --- .../main/app/view/FileMenuPanels.js | 37 ++++++++++++++++++- apps/documenteditor/main/locale/en.json | 3 ++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 6bdc32cad..eb70fd98a 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -212,6 +212,10 @@ define([ '
    ', '','', /** coauthoring end **/ + '', + '', + '', + '','', '', '', '
    ', @@ -522,6 +526,20 @@ define([ dataHintOffset: 'big' }); + this.cmbReviewHover = new Common.UI.ComboBox({ + el : $markup.findById('#fms-cmb-review-hover'), + style : 'width: 160px;', + editable : false, + cls : 'input-group-nr', + data : [ + { value: false, displayValue: this.txtChangesBalloons }, + { value: true, displayValue: this.txtChangesTip } + ], + dataHint: '2', + dataHintDirection: 'bottom', + dataHintOffset: 'big' + }); + $markup.find('.btn.primary').each(function(index, el){ (new Common.UI.Button({ el: $(el) @@ -587,6 +605,7 @@ define([ $('tr.coauth', this.el)[mode.isEdit && mode.canCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes-mode', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring && mode.canChangeCoAuthoring ? 'show' : 'hide'](); $('tr.coauth.changes-show', this.el)[mode.isEdit && !mode.isOffline && mode.canCoAuthoring ? 'show' : 'hide'](); + $('tr.view-review', this.el)[mode.canViewReview ? 'show' : 'hide'](); $('tr.comments', this.el)[mode.canCoAuthoring ? 'show' : 'hide'](); /** coauthoring end **/ @@ -666,6 +685,12 @@ define([ item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); } + + if (this.mode.canViewReview) { + value = Common.Utils.InternalSettings.get("de-settings-review-hover-mode"); + item = this.cmbReviewHover.store.findWhere({value: value}); + this.cmbReviewHover.setValue(item ? item.get('value') : false); + } }, applySettings: function() { @@ -698,6 +723,13 @@ define([ Common.localStorage.setItem("de-macros-mode", this.cmbMacros.getValue()); Common.Utils.InternalSettings.set("de-macros-mode", this.cmbMacros.getValue()); + if (this.mode.canViewReview) { + var val = this.cmbReviewHover.getValue(); + Common.localStorage.setBool("de-settings-review-hover-mode", val); + Common.Utils.InternalSettings.set("de-settings-review-hover-mode", val); + this.mode.reviewHoverMode = val; + } + Common.localStorage.setItem("de-settings-paste-button", this.chPaste.isChecked() ? 1 : 0); Common.localStorage.save(); @@ -794,7 +826,10 @@ define([ strPasteButton: 'Show Paste Options button when content is pasted', txtProofing: 'Proofing', strTheme: 'Theme', - txtAutoCorrect: 'AutoCorrect options...' + txtAutoCorrect: 'AutoCorrect options...', + strReviewHover: 'Track Changes Display', + txtChangesTip: 'Show by hover in tooltips', + txtChangesBalloons: 'Show by click in balloons' }, DE.Views.FileMenuPanels.Settings || {})); DE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({ diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 21c03ec22..99575292a 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1755,6 +1755,9 @@ "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Track Changes Display", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Show by hover in tooltips", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Show by click in balloons", "DE.Views.FormSettings.textAlways": "Always", "DE.Views.FormSettings.textAspect": "Lock aspect ratio", "DE.Views.FormSettings.textAutofit": "AutoFit", From b6aa262f2b3fbbf9d7f26a7d8986d42409c167fc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Aug 2021 23:56:09 +0300 Subject: [PATCH 035/129] [DE] For Bug 29082: load recipient list from url or file --- .../main/app/controller/Toolbar.js | 60 +++++++++++++------ apps/documenteditor/main/app/view/Toolbar.js | 15 ++++- apps/documenteditor/main/locale/en.json | 4 ++ 3 files changed, 60 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5c19fbc84..bdb789fcf 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -338,7 +338,7 @@ define([ toolbar.mnuPageSize.on('item:click', _.bind(this.onPageSizeClick, this)); toolbar.mnuColorSchema.on('item:click', _.bind(this.onColorSchemaClick, this)); toolbar.mnuColorSchema.on('show:after', _.bind(this.onColorSchemaShow, this)); - toolbar.btnMailRecepients.on('click', _.bind(this.onSelectRecepientsClick, this)); + toolbar.mnuMailRecepients.on('item:click', _.bind(this.onSelectRecepientsClick, this)); toolbar.mnuPageNumberPosPicker.on('item:click', _.bind(this.onInsertPageNumberClick, this)); toolbar.btnEditHeader.menu.on('item:click', _.bind(this.onEditHeaderFooterClick, this)); toolbar.btnInsDateTime.on('click', _.bind(this.onInsDateTimeClick, this)); @@ -2879,8 +2879,10 @@ define([ this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true); this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true); this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint); - if (!this._state.mmdisable && (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients)) + if (!this._state.mmdisable) { this.toolbar.btnMailRecepients.setDisabled(false); + this.toolbar.mnuMailRecepients.items[2].setVisible(this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients); + } this._state.activated = true; var props = this.api.asc_GetSectionProps(); @@ -3096,22 +3098,45 @@ define([ disable ? Common.util.Shortcuts.suspendEvents('alt+h') : Common.util.Shortcuts.resumeEvents('alt+h'); }, - onSelectRecepientsClick: function() { + onSelectRecepientsClick: function(menu, item, e) { if (this._mailMergeDlg) return; - if (this.toolbar.mode.canRequestMailMergeRecipients) { - Common.Gateway.requestMailMergeRecipients(); - } else { - var me = this; - me._mailMergeDlg = new Common.Views.SelectFileDlg({ - fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") - }); - me._mailMergeDlg.on('selectfile', function(obj, recepients){ - me.setMailMergeRecipients(recepients); - }).on('close', function(obj){ - me._mailMergeDlg = undefined; - }); - me._mailMergeDlg.show(); + var me = this; + if (item.value === 'file') { + this.api && this.api.asc_StartMailMerge(); + } else if (item.value === 'url') { + (new Common.Views.ImageFromUrlDialog({ + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + var checkUrl = value.replace(/ /g, ''); + if (!_.isEmpty(checkUrl)) { + me.api.asc_StartMailMerge(checkUrl); + } else { + Common.UI.warning({ + msg: me.textEmptyMMergeUrl + }); + } + } + + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + } + })).show(); + } else if (item.value === 'storage') { + if (this.toolbar.mode.canRequestMailMergeRecipients) { + Common.Gateway.requestMailMergeRecipients(); + } else { + me._mailMergeDlg = new Common.Views.SelectFileDlg({ + fileChoiceUrl: this.toolbar.mode.fileChoiceUrl.replace("{fileExt}", "xlsx").replace("{documentType}", "") + }); + me._mailMergeDlg.on('selectfile', function(obj, recepients){ + me.setMailMergeRecipients(recepients); + }).on('close', function(obj){ + me._mailMergeDlg = undefined; + }); + me._mailMergeDlg.show(); + } } }, @@ -3619,7 +3644,8 @@ define([ txtMarginsH: 'Top and bottom margins are too high for a given page height', textInsert: 'Insert', textTabForms: 'Forms', - textGroup: 'Group' + textGroup: 'Group', + textEmptyMMergeUrl: 'You need to specify URL.' }, DE.Controllers.Toolbar || {})); }); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 62a0501cc..89b39e1e5 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1146,7 +1146,14 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-mailmerge', dataHint: '1', - dataHintDirection: 'bottom' + dataHintDirection: 'bottom', + menu: new Common.UI.Menu({ + items: [ + {caption: this.mniFromFile, value: 'file'}, + {caption: this.mniFromUrl, value: 'url'}, + {caption: this.mniFromStorage, value: 'storage'} + ] + }) }); me.btnImgAlign = new Common.UI.Button({ @@ -1234,6 +1241,7 @@ define([ this.mnuPageSize = this.btnPageSize.menu; this.mnuColorSchema = this.btnColorSchemas.menu; this.mnuChangeCase = this.btnChangeCase.menu; + this.mnuMailRecepients = this.btnMailRecepients.menu; this.cmbFontSize = new Common.UI.ComboBox({ cls: 'input-group-nr', @@ -2602,7 +2610,10 @@ define([ mniToggleCase: 'tOGGLE cASE', textChangeLevel: 'Change List Level', mniTextToTable: 'Convert Text to Table', - txtScheme22: 'New Office' + txtScheme22: 'New Office', + mniFromFile: 'From File', + mniFromUrl: 'From URL', + mniFromStorage: 'From Storage' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 99575292a..8995b8bc6 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1219,6 +1219,7 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", + "DE.Controllers.Toolbar.textEmptyMMergeUrl": "You need to specify URL.", "DE.Controllers.Viewport.textFitPage": "Fit to Page", "DE.Controllers.Viewport.textFitWidth": "Fit to Width", "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:", @@ -2759,6 +2760,9 @@ "DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme9": "Foundry", + "DE.Views.Toolbar.mniFromFile": "From File", + "DE.Views.Toolbar.mniFromUrl": "From URL", + "DE.Views.Toolbar.mniFromStorage": "From Storage", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", From 49263c3e55fac180b41924b7bad04ac86b03a950 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 01:05:16 +0300 Subject: [PATCH 036/129] [DE forms] Add app scripts --- apps/documenteditor/forms/app.js | 165 ++++++++++++++ apps/documenteditor/forms/index.html | 16 -- apps/documenteditor/forms/index.html.deploy | 226 ++++++++++++++++++++ 3 files changed, 391 insertions(+), 16 deletions(-) create mode 100644 apps/documenteditor/forms/app.js create mode 100644 apps/documenteditor/forms/index.html.deploy diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js new file mode 100644 index 000000000..39125c57e --- /dev/null +++ b/apps/documenteditor/forms/app.js @@ -0,0 +1,165 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * +*/ + +'use strict'; +var reqerr; +require.config({ + // The shim config allows us to configure dependencies for + // scripts that do not call define() to register a module + baseUrl: '../../', + paths: { + jquery : '../vendor/jquery/jquery', + underscore : '../vendor/underscore/underscore', + backbone : '../vendor/backbone/backbone', + bootstrap : '../vendor/bootstrap/dist/js/bootstrap', + text : '../vendor/requirejs-text/text', + perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', + jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', + xregexp : '../vendor/xregexp/xregexp-all-min', + sockjs : '../vendor/sockjs/sockjs.min', + jszip : '../vendor/jszip/jszip.min', + jsziputils : '../vendor/jszip-utils/jszip-utils.min', + allfonts : '../../sdkjs/common/AllFonts', + sdk : '../../sdkjs/word/sdk-all-min', + api : 'api/documents/api', + core : 'common/main/lib/core/application', + notification : 'common/main/lib/core/NotificationCenter', + keymaster : 'common/main/lib/core/keymaster', + tip : 'common/main/lib/util/Tip', + localstorage : 'common/main/lib/util/LocalStorage', + analytics : 'common/Analytics', + gateway : 'common/Gateway', + locale : 'common/locale', + irregularstack : 'common/IrregularStack' + }, + + shim: { + underscore: { + exports: '_' + }, + backbone: { + deps: [ + 'underscore', + 'jquery' + ], + exports: 'Backbone' + }, + bootstrap: { + deps: [ + 'jquery' + ] + }, + perfectscrollbar: { + deps: [ + 'jmousewheel' + ] + }, + notification: { + deps: [ + 'backbone' + ] + }, + core: { + deps: [ + 'backbone', + 'notification', + 'irregularstack' + ] + }, + sdk: { + deps: [ + 'jquery', + 'underscore', + 'allfonts', + 'xregexp', + 'sockjs', + 'jszip', + 'jsziputils' + ] + }, + gateway: { + deps: [ + 'jquery' + ] + }, + analytics: { + deps: [ + 'jquery' + ] + } + } +}); + +require([ + 'backbone', + 'bootstrap', + 'core', + 'sdk', + 'api', + 'analytics', + 'gateway', + 'locale' +], function (Backbone, Bootstrap, Core) { + Backbone.history.start(); + + /** + * Application instance with DE namespace defined + */ + var app = new Backbone.Application({ + nameSpace: 'DE', + autoCreate: false, + controllers : [ + 'ApplicationController' + ] + }); + + Common.Locale.apply( + function() { + require([ + 'documenteditor/forms/app/controller/ApplicationController', + 'documenteditor/forms/app/view/ApplicationView', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/forms/lib/view/modals' + ], function() { + app.start(); + }); + } + ); +}, function(err) { + if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { + reqerr = window.requireTimeourError(); + window.alert(reqerr); + window.location.reload(); + } +}); \ No newline at end of file diff --git a/apps/documenteditor/forms/index.html b/apps/documenteditor/forms/index.html index 1c296feb5..9113d5d23 100644 --- a/apps/documenteditor/forms/index.html +++ b/apps/documenteditor/forms/index.html @@ -206,22 +206,6 @@
    - - diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy new file mode 100644 index 000000000..863f02048 --- /dev/null +++ b/apps/documenteditor/forms/index.html.deploy @@ -0,0 +1,226 @@ + + + + + Documents + + + + + + + + + + + + + + + +
    + + + +
    + +
    +
      +
      • +
      • +
    +
    + +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    of 1 +
    +
    + +
    +
    + + + + + + + + From 62c542cf840e69adeda166c090118d51c8723430 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Fri, 27 Aug 2021 10:11:53 +0300 Subject: [PATCH 037/129] [DE] Edit styles in 'Numbering Value' --- .../mobile/src/less/app-ios.less | 29 ++++++++++++++++++ .../mobile/src/less/app-material.less | 30 ++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/less/app-ios.less b/apps/documenteditor/mobile/src/less/app-ios.less index 1fb9a1d9b..5fb8ff040 100644 --- a/apps/documenteditor/mobile/src/less/app-ios.less +++ b/apps/documenteditor/mobile/src/less/app-ios.less @@ -8,6 +8,35 @@ // Stepper .content-block.stepper-block { margin: 20px 0; + + .stepper.stepper-large { + height: 35px; + border-radius: var(--f7-button-border-radius); + box-shadow: var(--f7-button-box-shadow); + } + + .stepper-button-minus, .stepper-button-plus { + color: #446995; + border: 1px solid #446995; + + &:before, &:after{ + display: none; + } + } + + .stepper-button-minus.active-state, .stepper-button-plus.active-state { + background-color: var(--f7-list-link-pressed-bg-color); + } + + .stepper-input-wrap { + border-top: 1px solid #446995; + border-bottom: 1px solid #446995; + input { + color: #000; + font-size: 17px; + font-weight: var(--f7-list-item-after-line-height); + } + } } } diff --git a/apps/documenteditor/mobile/src/less/app-material.less b/apps/documenteditor/mobile/src/less/app-material.less index 7c26f1924..b40c69124 100644 --- a/apps/documenteditor/mobile/src/less/app-material.less +++ b/apps/documenteditor/mobile/src/less/app-material.less @@ -56,7 +56,35 @@ .content-block.stepper-block { display: flex; justify-content: center; - margin: 30px 0 0; + margin: 25px 0 0; + + .stepper { + --f7-touch-ripple-color: none; + } + + .stepper-button, .stepper-button-minus, .stepper-button-plus { + border: none; + border-radius: 0; + + &:before, &:after{ + display: none; + } + } + + .stepper-button-minus.active-state, .stepper-button-plus.active-state { + background-color: var(--f7-list-link-pressed-bg-color); + } + + .stepper-input-wrap{ + border:none; + + input { + color: #000; + font-size: 16px; + width: 40px; + font-weight: var(--f7-list-item-after-line-height); + } + } } } From 34d89a20432ca5bd4b39d0f62bb929bd9a13f4da Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 11:19:59 +0300 Subject: [PATCH 038/129] [DE] Fix loading mail merge from URL --- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index bdb789fcf..177560006 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -3111,7 +3111,7 @@ define([ if (me.api) { var checkUrl = value.replace(/ /g, ''); if (!_.isEmpty(checkUrl)) { - me.api.asc_StartMailMerge(checkUrl); + me.api.asc_StartMailMerge({ fileType: "csv", url: checkUrl }); } else { Common.UI.warning({ msg: me.textEmptyMMergeUrl From 0c0d9a06b2221416d0b4ebc606ed49c04aa39bc1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 13:22:08 +0300 Subject: [PATCH 039/129] [Wopi] Support insert image from storage: EnableInsertRemoteImage from CheckFileInfo --- apps/api/wopi/editor-wopi.ejs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/api/wopi/editor-wopi.ejs b/apps/api/wopi/editor-wopi.ejs index a5f0dca1c..f0a0df55d 100644 --- a/apps/api/wopi/editor-wopi.ejs +++ b/apps/api/wopi/editor-wopi.ejs @@ -102,6 +102,7 @@ div { var sendNotificationTimer; var sessionId; var fileInfo; + var insertImageType; var innerAlert = function (message) { if (console && console.log) @@ -117,6 +118,12 @@ div { innerAlert('Grab_Focus'); docEditor.grabFocus(); }, + 'Action_InsertGraphic': function (data) { + data && data.Values && docEditor.insertImage({ + "c": insertImageType, + "images": [{ "url": data.Values.url }] + }); + }, 'Host_PostmessageReady': function (data) { innerAlert('Host_PostmessageReady'); } @@ -226,6 +233,11 @@ div { window.open(fileInfo.FileVersionUrl, "_blank"); }; + var onRequestInsertImage = function (event) { + insertImageType = event.data.c; + _postMessage('UI_InsertGraphic', {}); + }; + var onError = function (event) { if (event) innerAlert(event.data); @@ -304,7 +316,8 @@ div { "onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined, "onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined, "onRequestSharingSettings": fileInfo.FileSharingPostMessage || fileInfo.FileSharingUrl ? onRequestSharingSettings : undefined, - "onRequestHistory": fileInfo.FileVersionUrl || fileInfo.FileVersionPostMessage ? onRequestHistory : undefined + "onRequestHistory": fileInfo.FileVersionUrl || fileInfo.FileVersionPostMessage ? onRequestHistory : undefined, + "onRequestInsertImage": fileInfo.EnableInsertRemoteImage ? onRequestInsertImage : undefined } }; From 7b57bdb6b7b8ed6a3f59b6a59ea4106d7e1c8d2d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 14:07:50 +0300 Subject: [PATCH 040/129] Fix loading images from storage --- .../documenteditor/main/app/controller/Toolbar.js | 15 +++++++++------ apps/documenteditor/main/app/view/FormSettings.js | 4 ++-- .../documenteditor/main/app/view/ImageSettings.js | 4 ++-- .../documenteditor/main/app/view/ShapeSettings.js | 4 ++-- .../main/app/view/WatermarkSettingsDialog.js | 4 ++-- .../main/app/controller/Toolbar.js | 15 +++++++++------ .../main/app/view/ImageSettings.js | 4 ++-- .../main/app/view/ShapeSettings.js | 4 ++-- .../main/app/view/SlideSettings.js | 4 ++-- .../main/app/controller/Toolbar.js | 15 +++++++++------ .../main/app/view/ImageSettings.js | 4 ++-- .../main/app/view/ShapeSettings.js | 4 ++-- 12 files changed, 45 insertions(+), 36 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5c19fbc84..ed2f9cfb3 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1618,8 +1618,15 @@ define([ }, insertImageFromStorage: function(data) { - if (data && (data.url || data.images) && (!data.c || data.c=='add')) { + if (data && data._urls && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); + (data._urls.length>0) && this.api.AddImageUrl(data._urls, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); + } + }, + + insertImage: function(data) { // gateway + if (data && (data.url || data.images)) { var arr = []; if (data.images && data.images.length>0) { for (var i=0; i0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); + data._urls = arr; } - }, - - insertImage: function(data) { // gateway Common.NotificationCenter.trigger('storage:image-insert', data); }, diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index f9b071d43..12959beca 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -711,8 +711,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='control') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='control') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 4b781e009..9cc3c39cf 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -495,8 +495,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='change') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='change') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 3cb452e10..6bd98fb15 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -719,8 +719,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='fill') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='fill') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js index 072deeb48..ee81ac628 100644 --- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js @@ -411,8 +411,8 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template', this.api.asc_registerCallback('asc_onWatermarkImageLoaded', onApiWMLoaded); var insertImageFromStorage = function(data) { - if (data && data.url && data.c=='watermark') { - me.props.put_ImageUrl(data.url, data.token); + if (data && data._urls && data.c=='watermark') { + me.props.put_ImageUrl(data._urls[0], data.token); } }; Common.NotificationCenter.on('storage:image-insert', insertImageFromStorage); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index eff6bf4c4..cfea951bc 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -1618,8 +1618,15 @@ define([ }, insertImageFromStorage: function(data) { - if (data && (data.url || data.images) && (!data.c || data.c=='add')) { + if (data && data._urls && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); + (data._urls.length>0) && this.api.AddImageUrl(data._urls, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); + } + }, + + insertImage: function(data) { // gateway + if (data && (data.url || data.images)) { var arr = []; if (data.images && data.images.length>0) { for (var i=0; i0) && this.api.AddImageUrl(arr, undefined, data.token);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); + data._urls = arr; } - }, - - insertImage: function(data) { // gateway Common.NotificationCenter.trigger('storage:image-insert', data); }, diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 39de33f36..a001a63f6 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -331,8 +331,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='change') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='change') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index cd82caf5c..97404aec3 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -659,8 +659,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='fill') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='fill') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 97bb099fd..dc80ccb8b 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -639,8 +639,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='slide') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='slide') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index cf64478a0..993366fde 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -899,8 +899,15 @@ define([ }, insertImageFromStorage: function(data) { - if (data && (data.url || data.images) && (!data.c || data.c=='add')) { + if (data && data._urls && (!data.c || data.c=='add')) { this.toolbar.fireEvent('insertimage', this.toolbar); + (data._urls.length>0) && this.api.asc_addImageDrawingObject(data._urls, undefined, data.token);// for loading from storage + Common.component.Analytics.trackEvent('ToolBar', 'Image'); + } + }, + + insertImage: function(data) { // gateway + if (data && (data.url || data.images)) { var arr = []; if (data.images && data.images.length>0) { for (var i=0; i0) && this.api.asc_addImageDrawingObject(arr, undefined, data.token);// for loading from storage - Common.component.Analytics.trackEvent('ToolBar', 'Image'); + data._urls = arr; } - }, - - insertImage: function(data) { // gateway Common.NotificationCenter.trigger('storage:image-insert', data); }, diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 3047f920b..1dc632327 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -468,8 +468,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='change') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='change') { + this.setImageUrl(data._urls[0], data.token); } }, diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index affc07f69..fb9c26e30 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -679,8 +679,8 @@ define([ }, insertImageFromStorage: function(data) { - if (data && data.url && data.c=='fill') { - this.setImageUrl(data.url, data.token); + if (data && data._urls && data.c=='fill') { + this.setImageUrl(data._urls[0], data.token); } }, From baf37cc490cabe7bbd31f48df33156558da490ef Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 14:42:59 +0300 Subject: [PATCH 041/129] [DE][PE] Fix Bug 49584 --- .../lib/template/AutoCorrectDialog.template | 3 +- .../common/main/lib/view/AutoCorrectDialog.js | 54 +++++++++---------- .../main/app/controller/Main.js | 4 ++ apps/documenteditor/main/locale/en.json | 1 + .../main/app/controller/Main.js | 4 ++ apps/presentationeditor/main/locale/en.json | 1 + 6 files changed, 39 insertions(+), 28 deletions(-) diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index 73781d55d..b682a1e0a 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -68,7 +68,8 @@
    -
    +
    +
    diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index c10153856..765dd8f71 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -113,10 +113,11 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var $window = this.getChild(); var me = this; + var panelAutoFormat = $window.find('#id-autocorrect-dialog-settings-' + this.appPrefix + 'autoformat'); // Math correct this.chReplaceType = new Common.UI.CheckBox({ - el: $window.findById('#auto-correct-chb-replace-type'), + el: $window.find('#auto-correct-chb-replace-type'), labelText: this.textReplaceType, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-math-correct-replace-type") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -197,17 +198,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', // this.inputBy.cmpEl.find('input').css('font-size', '13px'); this.btnReset = new Common.UI.Button({ - el: $('#auto-correct-btn-reset') + el: $window.find('#auto-correct-btn-reset') }); this.btnReset.on('click', _.bind(this.onResetToDefault, this)); this.btnEdit = new Common.UI.Button({ - el: $('#auto-correct-btn-edit') + el: $window.find('#auto-correct-btn-edit') }); this.btnEdit.on('click', _.bind(this.onEdit, this, false)); this.btnDelete = new Common.UI.Button({ - el: $('#auto-correct-btn-delete') + el: $window.find('#auto-correct-btn-delete') }); this.btnDelete.on('click', _.bind(this.onDelete, this, false)); @@ -269,23 +270,23 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }); this.btnResetRec = new Common.UI.Button({ - el: $('#auto-correct-btn-rec-reset') + el: $window.find('#auto-correct-btn-rec-reset') }); this.btnResetRec.on('click', _.bind(this.onResetRecToDefault, this)); this.btnAddRec = new Common.UI.Button({ - el: $('#auto-correct-btn-rec-edit') + el: $window.find('#auto-correct-btn-rec-edit') }); this.btnAddRec.on('click', _.bind(this.onAddRec, this, false)); this.btnDeleteRec = new Common.UI.Button({ - el: $('#auto-correct-btn-rec-delete') + el: $window.find('#auto-correct-btn-rec-delete') }); this.btnDeleteRec.on('click', _.bind(this.onDeleteRec, this, false)); if (this.appPrefix=='de-' || this.appPrefix=='pe-') { this.chQuotes = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-quotes'), + el: $window.find('#id-autocorrect-dialog-chk-quotes'), labelText: this.textQuotes, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-smart-quotes") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -295,7 +296,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', me.api.asc_SetAutoCorrectSmartQuotes(checked); }); this.chHyphens = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-hyphens'), + el: $window.find('#id-autocorrect-dialog-chk-hyphens'), labelText: this.textHyphens, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyphens") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -305,7 +306,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', me.api.asc_SetAutoCorrectHyphensWithDash(checked); }); this.chBulleted = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-bulleted'), + el: $window.find('#id-autocorrect-dialog-chk-bulleted'), labelText: this.textBulleted, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-bulleted") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -315,7 +316,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', me.api.asc_SetAutomaticBulletedLists(checked); }); this.chNumbered = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-numbered'), + el: $window.find('#id-autocorrect-dialog-chk-numbered'), labelText: this.textNumbered, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-numbered") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -326,7 +327,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }); // AutoCorrect this.chFLSentence = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-fl-sentence'), + el: $window.find('#id-autocorrect-dialog-chk-fl-sentence'), labelText: this.textFLSentence, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-sentence") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -339,7 +340,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false)); } else if (this.appPrefix=='sse-') { this.chNewRows = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-new-rows'), + el: $window.find('#id-autocorrect-dialog-chk-new-rows'), labelText: this.textNewRowCol, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-new-rows") }).on('change', function(field, newValue, oldValue, eOpts){ @@ -348,18 +349,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-new-rows", checked); me.api.asc_setIncludeNewRowColTable(checked); }); - - this.chHyperlink = new Common.UI.CheckBox({ - el: $('#id-autocorrect-dialog-chk-hyperlink'), - labelText: this.textHyperlink, - value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyperlink") - }).on('change', function(field, newValue, oldValue, eOpts){ - var checked = (field.getValue()==='checked'); - Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked); - Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked); - me.api.asc_setAutoCorrectHyperlinks(checked); - }); } + this.chHyperlink = new Common.UI.CheckBox({ + el: panelAutoFormat.find('#id-autocorrect-dialog-chk-hyperlink'), + labelText: this.textHyperlink, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyperlink") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked); + me.api.asc_setAutoCorrectHyperlinks(checked); + }); this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false)); this.btnsCategory[1].on('click', _.bind(this.onRecCategoryClick, this, false)); @@ -381,9 +381,9 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var arr = [ this.chReplaceType, this.inputReplace, this.inputBy, this.mathList, this.btnReset, this.btnEdit, this.btnDelete, // 0 tab this.inputRecFind, this.mathRecList, this.btnResetRec, this.btnAddRec, this.btnDeleteRec, // 1 tab - this.chFLSentence // 3 tab + this.chHyperlink // 2 tab ]; - arr = arr.concat(this.chNewRows ? [this.chHyperlink, this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]); + arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]); arr = arr.concat(this.chFLSentence ? [this.chFLSentence] : []); return arr; }, @@ -453,7 +453,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', onAutoformatCategoryClick: function(delay) { var me = this; _.delay(function(){ - me.chHyperlink ? me.chHyperlink.focus() : me.chQuotes.focus(); + (me.appPrefix=='sse-') ? me.chHyperlink.focus() : me.chQuotes.focus(); },delay ? 50 : 0); }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 749392a85..d1b87484a 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2605,6 +2605,10 @@ define([ value = Common.localStorage.getBool("de-settings-autoformat-fl-sentence", true); Common.Utils.InternalSettings.set("de-settings-autoformat-fl-sentence", value); me.api.asc_SetAutoCorrectFirstLetterOfSentences(value); + + value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value); + me.api.asc_setAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 99575292a..450ee10fd 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -214,6 +214,7 @@ "Common.Views.AutoCorrectDialog.textBy": "By", "Common.Views.AutoCorrectDialog.textDelete": "Delete", "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalize first letter of sentences", + "Common.Views.AutoCorrectDialog.textHyperlink": "Internet and network paths with hyperlinks", "Common.Views.AutoCorrectDialog.textHyphens": "Hyphens (--) with dash (—)", "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect", "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 7367b8ec4..893d26a39 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2227,6 +2227,10 @@ define([ value = Common.localStorage.getBool("pe-settings-autoformat-fl-sentence", true); Common.Utils.InternalSettings.set("pe-settings-autoformat-fl-sentence", value); me.api.asc_SetAutoCorrectFirstLetterOfSentences(value); + + value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true); + Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value); + me.api.asc_setAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 34a6b664c..716f411b2 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -107,6 +107,7 @@ "Common.Views.AutoCorrectDialog.textBy": "By", "Common.Views.AutoCorrectDialog.textDelete": "Delete", "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalize first letter of sentences", + "Common.Views.AutoCorrectDialog.textHyperlink": "Internet and network paths with hyperlinks", "Common.Views.AutoCorrectDialog.textHyphens": "Hyphens (--) with dash (—)", "Common.Views.AutoCorrectDialog.textMathCorrect": "Math AutoCorrect", "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists", From 687ada7b50c84077452e71bfa33d46c703927fb2 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 27 Aug 2021 16:07:58 +0300 Subject: [PATCH 042/129] [SSE PE] refactoring --- apps/presentationeditor/mobile/src/less/icons-ios.less | 6 ------ apps/spreadsheeteditor/mobile/src/less/icons-ios.less | 5 ----- 2 files changed, 11 deletions(-) diff --git a/apps/presentationeditor/mobile/src/less/icons-ios.less b/apps/presentationeditor/mobile/src/less/icons-ios.less index b72ce6628..a24403d20 100644 --- a/apps/presentationeditor/mobile/src/less/icons-ios.less +++ b/apps/presentationeditor/mobile/src/less/icons-ios.less @@ -1,12 +1,6 @@ // Icons .device-ios { i.icon { - &.icon-logo { - width: 100px; - height: 14px; - background: url('../../../../common/mobile/resources/img/header/logo-ios.svg') no-repeat center; - } - &.icon-search { width: 22px; height: 22px; diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index 9f308f240..875a0c8e6 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -2,11 +2,6 @@ .device-ios { i.icon { - &.icon-logo { - width: 100px; - height: 14px; - background: url('../../../../common/mobile/resources/img/header/logo-ios.svg') no-repeat center; - } &.icon-search { width: 24px; height: 24px; From 1df4077990952609f8c4794ca9534894b24ec8f7 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 23 Aug 2021 12:50:25 +0300 Subject: [PATCH 043/129] [SSE] Fix Bug 50875 --- apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx index 131ba83e4..1a214d32c 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx @@ -49,7 +49,7 @@ const FilterOptionsController = () => { let $target = $$('#idx-context-menu-target') .css({left: `${posX}px`, top: `${posY}px`}); - f7.popover.open('#picker-popover',$target); + if(!$$('#picker-popover.modal-in').length) f7.popover.open('#picker-popover',$target); } } From c06fc3b0342ab3345ddeed83a7da53118b19a7bc Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 23 Aug 2021 17:45:42 +0300 Subject: [PATCH 044/129] Fix Bug 47724 --- apps/common/mobile/resources/less/common-material.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index ae9e9d669..65c4f182d 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -80,6 +80,10 @@ } } + .coauth__sheet{ + max-height: 65%; + } + // Buttons .segmented { .decrement, .increment { From 78cdc5f8737f04d3ee7207e2d0f446e7dee06366 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 27 Aug 2021 16:16:28 +0300 Subject: [PATCH 045/129] [SSE mobile] Added functions list --- apps/common/mobile/resources/less/common.less | 32 +++++++++++++++++++ .../mobile/src/controller/CellEditor.jsx | 22 +++++++++++-- .../mobile/src/view/CellEditor.jsx | 16 ++++++++-- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 1584e33e9..41f856066 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -871,6 +871,38 @@ input[type="number"]::-webkit-inner-spin-button { } } +// Functions List + +.cell-editor { + overflow: initial; +} + +.functions-list { + width: 100%; + height: 150px; + overflow-y: auto; + position: absolute; + top: 30px; + left: 0; + right: 0; + background-color: @white; + .list { + margin: 0; + ul:before { + display: none; + } + .item-content { + padding-left: 0; + } + .item-inner { + padding-left: calc(var(--f7-list-item-padding-horizontal) + var(--f7-safe-area-left) - var(--menu-list-offset)); + } + .item-title { + font-size: 14px; + } + } +} + diff --git a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx index 06db117bf..fe0a15874 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx @@ -1,17 +1,20 @@ import React, { useEffect, useState } from 'react'; import CellEditorView from '../view/CellEditor'; +import { f7 } from 'framework7-react'; const CellEditor = props => { useEffect(() => { Common.Notifications.on('engineCreated', api => { api.asc_registerCallback('asc_onSelectionNameChanged', onApiCellSelection.bind(this)); api.asc_registerCallback('asc_onSelectionChanged', onApiSelectionChanged.bind(this)); + api.asc_registerCallback('asc_onFormulaCompleteMenu', onFormulaCompleteMenu.bind(this)); }); }, []); const [cellName, setCellName] = useState(''); const [stateCoauth, setCoauthDisabled] = useState(null); + const [stateFuncArr, setFuncArr] = useState(''); const onApiCellSelection = info => { setCellName(typeof(info)=='string' ? info : info.asc_getName()); @@ -20,10 +23,23 @@ const CellEditor = props => { const onApiSelectionChanged = info => { setCoauthDisabled(info.asc_getLocked() === true || info.asc_getLockedTable() === true || info.asc_getLockedPivotTable()===true); } + + const onFormulaCompleteMenu = funcArr => setFuncArr(funcArr); + + const insertFormula = (name, type) => { + const api = Common.EditorApi.get(); + api.asc_insertInCell(name, type, false); + } - return + return ( + + ) }; export default CellEditor; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx index 9e914b4bd..ff08cd9fc 100644 --- a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; -import { Input, View, Button, Link } from 'framework7-react'; +import { Input, View, Button, Link, Popover, ListItem, List } from 'framework7-react'; import {observer, inject} from "mobx-react"; const viewStyle = { @@ -15,12 +15,13 @@ const CellEditorView = props => { const [expanded, setExpanded] = useState(false); const storeAppOptions = props.storeAppOptions; const isEdit = storeAppOptions.isEdit; + const funcArr = props.funcArr; const expandClick = e => { setExpanded(!expanded); }; - return + return
    {props.cellName} {props.onClickToOpenAddOptions('function', '#idx-btn-function');}}> @@ -33,6 +34,17 @@ const CellEditorView = props => {
    + {funcArr && funcArr.length && +
    + + {funcArr.map((elem, index) => { + return ( + props.insertFormula(elem.name, elem.type)}> + ) + })} + +
    + } ; }; From 7819049bd68523731af6cac6127ff66ad1d7482e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Aug 2021 17:52:09 +0300 Subject: [PATCH 046/129] [Mobile] Update translation --- apps/documenteditor/mobile/locale/be.json | 16 +- apps/documenteditor/mobile/locale/bg.json | 16 +- apps/documenteditor/mobile/locale/ca.json | 16 +- apps/documenteditor/mobile/locale/cs.json | 16 +- apps/documenteditor/mobile/locale/da.json | 16 +- apps/documenteditor/mobile/locale/de.json | 16 +- apps/documenteditor/mobile/locale/el.json | 16 +- apps/documenteditor/mobile/locale/en.json | 12 +- apps/documenteditor/mobile/locale/es.json | 16 +- apps/documenteditor/mobile/locale/fi.json | 16 +- apps/documenteditor/mobile/locale/fr.json | 16 +- apps/documenteditor/mobile/locale/hu.json | 16 +- apps/documenteditor/mobile/locale/it.json | 16 +- apps/documenteditor/mobile/locale/ja.json | 16 +- apps/documenteditor/mobile/locale/ko.json | 16 +- apps/documenteditor/mobile/locale/lo.json | 16 +- apps/documenteditor/mobile/locale/lv.json | 16 +- apps/documenteditor/mobile/locale/nb.json | 16 +- apps/documenteditor/mobile/locale/nl.json | 16 +- apps/documenteditor/mobile/locale/pl.json | 16 +- apps/documenteditor/mobile/locale/pt.json | 16 +- apps/documenteditor/mobile/locale/ro.json | 16 +- apps/documenteditor/mobile/locale/ru.json | 18 +- apps/documenteditor/mobile/locale/sk.json | 16 +- apps/documenteditor/mobile/locale/sl.json | 16 +- apps/documenteditor/mobile/locale/sv.json | 16 +- apps/documenteditor/mobile/locale/tr.json | 16 +- apps/documenteditor/mobile/locale/uk.json | 16 +- apps/documenteditor/mobile/locale/vi.json | 16 +- apps/documenteditor/mobile/locale/zh.json | 14 +- apps/presentationeditor/mobile/locale/en.json | 2 +- apps/presentationeditor/mobile/locale/ja.json | 2 +- apps/presentationeditor/mobile/locale/ru.json | 4 +- apps/spreadsheeteditor/mobile/locale/be.json | 17 +- apps/spreadsheeteditor/mobile/locale/bg.json | 17 +- apps/spreadsheeteditor/mobile/locale/ca.json | 17 +- apps/spreadsheeteditor/mobile/locale/cs.json | 17 +- apps/spreadsheeteditor/mobile/locale/de.json | 17 +- apps/spreadsheeteditor/mobile/locale/el.json | 17 +- apps/spreadsheeteditor/mobile/locale/en.json | 1300 ++++++++--------- apps/spreadsheeteditor/mobile/locale/es.json | 17 +- apps/spreadsheeteditor/mobile/locale/fr.json | 19 +- apps/spreadsheeteditor/mobile/locale/hu.json | 17 +- apps/spreadsheeteditor/mobile/locale/it.json | 17 +- apps/spreadsheeteditor/mobile/locale/ja.json | 17 +- apps/spreadsheeteditor/mobile/locale/ko.json | 17 +- apps/spreadsheeteditor/mobile/locale/lo.json | 17 +- apps/spreadsheeteditor/mobile/locale/lv.json | 17 +- apps/spreadsheeteditor/mobile/locale/nb.json | 17 +- apps/spreadsheeteditor/mobile/locale/nl.json | 17 +- apps/spreadsheeteditor/mobile/locale/pl.json | 17 +- apps/spreadsheeteditor/mobile/locale/pt.json | 17 +- apps/spreadsheeteditor/mobile/locale/ro.json | 17 +- apps/spreadsheeteditor/mobile/locale/ru.json | 19 +- apps/spreadsheeteditor/mobile/locale/sk.json | 17 +- apps/spreadsheeteditor/mobile/locale/sl.json | 17 +- apps/spreadsheeteditor/mobile/locale/tr.json | 17 +- apps/spreadsheeteditor/mobile/locale/uk.json | 17 +- apps/spreadsheeteditor/mobile/locale/vi.json | 17 +- apps/spreadsheeteditor/mobile/locale/zh.json | 17 +- 60 files changed, 1458 insertions(+), 772 deletions(-) diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/be.json +++ b/apps/documenteditor/mobile/locale/be.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/bg.json +++ b/apps/documenteditor/mobile/locale/bg.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/ca.json b/apps/documenteditor/mobile/locale/ca.json index 83849e340..129133dd8 100644 --- a/apps/documenteditor/mobile/locale/ca.json +++ b/apps/documenteditor/mobile/locale/ca.json @@ -181,7 +181,15 @@ "textColumns": "Columnes", "textCopyCutPasteActions": "Accions de copia, talla i enganxa ", "textDoNotShowAgain": "No ho mostris més", - "textRows": "Files" + "textRows": "Files", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Advertiment", @@ -569,7 +577,11 @@ "txtScheme7": "Equitat", "txtScheme8": "Flux", "txtScheme9": "Foneria", - "textOk": "Ok" + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "textOk": "Ok", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Teniu canvis sense desar. Cliqueu a \"Mantingueu-vos en aquesta pàgina\" per esperar al desament automàtic. Cliqueu a \"Deixar aquesta pàgina\" per descartar tots els canvis no desats.", diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/cs.json +++ b/apps/documenteditor/mobile/locale/cs.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/da.json b/apps/documenteditor/mobile/locale/da.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/da.json +++ b/apps/documenteditor/mobile/locale/da.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index 0415b88a0..5f2985aa8 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -181,7 +181,15 @@ "textColumns": "Spalten", "textCopyCutPasteActions": "Kopieren, Ausschneiden und Einfügen", "textDoNotShowAgain": "Nicht mehr anzeigen", - "textRows": "Zeilen" + "textRows": "Zeilen", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warnung", @@ -569,7 +577,11 @@ "txtScheme6": "Halle", "txtScheme7": "Kapital", "txtScheme8": "Fluss", - "txtScheme9": "Gießerei" + "txtScheme9": "Gießerei", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Sie haben nicht gespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und warten Sie, bis die Datei automatisch gespeichert wird. Klicken Sie auf \"Die Seite verlassen\", um nicht gespeicherte Änderungen zu verwerfen.", diff --git a/apps/documenteditor/mobile/locale/el.json b/apps/documenteditor/mobile/locale/el.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/el.json +++ b/apps/documenteditor/mobile/locale/el.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index ae84af729..626c53d84 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -75,7 +75,6 @@ "textBold": "Bold", "textBreakBefore": "Page break before", "textCancel": "Cancel", - "textOk": "Ok", "textCaps": "All caps", "textCenter": "Align center", "textChart": "Chart", @@ -123,6 +122,7 @@ "textNot": "Not ", "textNoWidow": "No widow control", "textNum": "Change numbering", + "textOk": "Ok", "textOriginal": "Original", "textParaDeleted": "Paragraph Deleted", "textParaFormatted": "Paragraph Formatted", @@ -491,6 +491,8 @@ "textCancel": "Cancel", "textCaseSensitive": "Case Sensitive", "textCentimeter": "Centimeter", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", "textCollaboration": "Collaboration", "textColorSchemes": "Color Schemes", "textComment": "Comment", @@ -554,7 +556,9 @@ "textTop": "Top", "textUnitOfMeasurement": "Unit Of Measurement", "textUploaded": "Uploaded", + "txtDownloadTxt": "Download TXT", "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", "txtProtected": "Once you enter the password and open the file, the current password will be reset", "txtScheme1": "Office", "txtScheme10": "Median", @@ -577,11 +581,7 @@ "txtScheme6": "Concourse", "txtScheme7": "Equity", "txtScheme8": "Flow", - "txtScheme9": "Foundry", - "textChooseTxtOptions": "Choose TXT Options", - "txtDownloadTxt": "Download TXT", - "textChooseEncoding": "Choose Encoding", - "txtOk": "Ok" + "txtScheme9": "Foundry" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json index 5b9b57f80..2a730c31a 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -181,7 +181,15 @@ "textColumns": "Columnas", "textCopyCutPasteActions": "Acciones de Copiar, Cortar y Pegar", "textDoNotShowAgain": "No mostrar de nuevo", - "textRows": "Filas" + "textRows": "Filas", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Advertencia", @@ -569,7 +577,11 @@ "txtScheme6": "Concurrencia", "txtScheme7": "Equidad ", "txtScheme8": "Flujo", - "txtScheme9": "Fundición" + "txtScheme9": "Fundición", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Tiene cambios sin guardar. Haga clic en \"Permanecer en esta página\" para esperar a que se guarde automáticamente. Haga clic en \"Salir de esta página\" para descartar todos los cambios no guardados.", diff --git a/apps/documenteditor/mobile/locale/fi.json b/apps/documenteditor/mobile/locale/fi.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/fi.json +++ b/apps/documenteditor/mobile/locale/fi.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json index 7fff82875..c0e70943b 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -181,7 +181,15 @@ "textColumns": "Colonnes", "textCopyCutPasteActions": "Fonctions de Copier, Couper et Coller", "textDoNotShowAgain": "Ne plus afficher", - "textRows": "Lignes" + "textRows": "Lignes", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Avertissement", @@ -569,7 +577,11 @@ "txtScheme6": "Rotonde", "txtScheme7": "Capitaux", "txtScheme8": "Flux", - "txtScheme9": "Fonderie" + "txtScheme9": "Fonderie", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur Rester sur cette page et attendez l'enregistrement automatique. Cliquez sur Quitter cette page pour annuler toutes les modifications non enregistrées.", diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/hu.json +++ b/apps/documenteditor/mobile/locale/hu.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/ja.json b/apps/documenteditor/mobile/locale/ja.json index de76f446c..27ffa8c79 100644 --- a/apps/documenteditor/mobile/locale/ja.json +++ b/apps/documenteditor/mobile/locale/ja.json @@ -81,7 +81,6 @@ "textBaseline": "Baseline", "textBold": "Bold", "textBreakBefore": "Page break before", - "textOk": "Ok", "textCaps": "All caps", "textChart": "Chart", "textCollaboration": "Collaboration", @@ -125,6 +124,7 @@ "textNot": "Not ", "textNoWidow": "No widow control", "textNum": "Change numbering", + "textOk": "Ok", "textOriginal": "Original", "textParaDeleted": "Paragraph Deleted", "textParaFormatted": "Paragraph Formatted", @@ -178,10 +178,18 @@ "menuReviewChange": "Review Change", "menuSplit": "Split", "menuViewComment": "View Comment", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "textActualSize": "実際のサイズ", @@ -445,6 +453,8 @@ "textBottom": "Bottom", "textCaseSensitive": "Case Sensitive", "textCentimeter": "Centimeter", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", "textCollaboration": "Collaboration", "textColorSchemes": "Color Schemes", "textComment": "Comment", @@ -506,7 +516,9 @@ "textTop": "Top", "textUnitOfMeasurement": "Unit Of Measurement", "textUploaded": "Uploaded", + "txtDownloadTxt": "Download TXT", "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", "txtProtected": "Once you enter the password and open the file, the current password will be reset", "txtScheme1": "Office", "txtScheme10": "Median", diff --git a/apps/documenteditor/mobile/locale/ko.json b/apps/documenteditor/mobile/locale/ko.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/ko.json +++ b/apps/documenteditor/mobile/locale/ko.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/lo.json +++ b/apps/documenteditor/mobile/locale/lo.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/lv.json +++ b/apps/documenteditor/mobile/locale/lv.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/nb.json b/apps/documenteditor/mobile/locale/nb.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/nb.json +++ b/apps/documenteditor/mobile/locale/nb.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json index bdb36e7cc..d18c0f265 100644 --- a/apps/documenteditor/mobile/locale/nl.json +++ b/apps/documenteditor/mobile/locale/nl.json @@ -181,7 +181,15 @@ "textColumns": "Kolommen", "textCopyCutPasteActions": "Acties Kopiëren, Knippen en Plakken", "textDoNotShowAgain": "Niet meer laten zien.", - "textRows": "Rijen" + "textRows": "Rijen", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Waarschuwing", @@ -569,7 +577,11 @@ "txtScheme7": "Vermogen", "txtScheme8": "Stroom", "txtScheme9": "Gieterij", - "textOk": "Ok" + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "textOk": "Ok", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "U heeft nog niet opgeslagen wijzigingen. Klik op 'Blijf op deze pagina' om te wachten op automatisch opslaan. Klik op 'Verlaat deze pagina' om alle niet-opgeslagen wijzigingen te verwijderen.", diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/pl.json +++ b/apps/documenteditor/mobile/locale/pl.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/pt.json b/apps/documenteditor/mobile/locale/pt.json index 7a03aee36..c9042a421 100644 --- a/apps/documenteditor/mobile/locale/pt.json +++ b/apps/documenteditor/mobile/locale/pt.json @@ -181,7 +181,15 @@ "textColumns": "Colunas", "textCopyCutPasteActions": "Copiar, Cortar e Colar", "textDoNotShowAgain": "Não volte a aparecer", - "textRows": "Linhas" + "textRows": "Linhas", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Aviso", @@ -569,7 +577,11 @@ "txtScheme7": "Patrimônio Líquido", "txtScheme8": "Fluxo", "txtScheme9": "Fundição", - "textOk": "Ok" + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "textOk": "Ok", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Você tem mudanças não salvas. Clique em 'Ficar nesta página' para esperar pela auto-salvar. Clique em 'Sair desta página' para descartar todas as mudanças não salvas.", diff --git a/apps/documenteditor/mobile/locale/ro.json b/apps/documenteditor/mobile/locale/ro.json index f064a4ce4..de32a1ba2 100644 --- a/apps/documenteditor/mobile/locale/ro.json +++ b/apps/documenteditor/mobile/locale/ro.json @@ -181,7 +181,15 @@ "textColumns": "Coloane", "textCopyCutPasteActions": "Comenzile de copiere, decupare și lipire", "textDoNotShowAgain": "Nu mai afișa", - "textRows": "Rânduri" + "textRows": "Rânduri", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Avertisment", @@ -569,7 +577,11 @@ "txtScheme6": "Concurență", "txtScheme7": "Echilibru", "txtScheme8": "Flux", - "txtScheme9": "Forjă" + "txtScheme9": "Forjă", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și așteptați la salvare automată. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 166688a8e..6603e30cd 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -122,6 +122,7 @@ "textNot": "Не", "textNoWidow": "Без запрета висячих строк", "textNum": "Изменение нумерации", + "textOk": "Ok", "textOriginal": "Исходный документ", "textParaDeleted": "Абзац удален", "textParaFormatted": "Абзац отформатирован", @@ -154,8 +155,7 @@ "textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.", "textUnderline": "Подчёркнутый", "textUsers": "Пользователи", - "textWidow": "Запрет висячих строк", - "textOk": "Ok" + "textWidow": "Запрет висячих строк" }, "ThemeColorPalette": { "textCustomColors": "Пользовательские цвета", @@ -181,7 +181,15 @@ "textColumns": "Столбцы", "textCopyCutPasteActions": "Операции копирования, вырезания и вставки", "textDoNotShowAgain": "Больше не показывать", - "textRows": "Строки" + "textRows": "Строки", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Внимание", @@ -483,6 +491,8 @@ "textCancel": "Отмена", "textCaseSensitive": "С учетом регистра", "textCentimeter": "Сантиметр", + "textChooseEncoding": "Выбрать кодировку", + "textChooseTxtOptions": "Выбрать параметры текстового файла", "textCollaboration": "Совместная работа", "textColorSchemes": "Цветовые схемы", "textComment": "Комментарий", @@ -546,7 +556,9 @@ "textTop": "Верхнее", "textUnitOfMeasurement": "Единица измерения", "textUploaded": "Загружен", + "txtDownloadTxt": "Скачать TXT", "txtIncorrectPwd": "Неверный пароль", + "txtOk": "Ok", "txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен", "txtScheme1": "Стандартная", "txtScheme10": "Обычная", diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/sk.json +++ b/apps/documenteditor/mobile/locale/sk.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/sl.json b/apps/documenteditor/mobile/locale/sl.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/sl.json +++ b/apps/documenteditor/mobile/locale/sl.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/sv.json b/apps/documenteditor/mobile/locale/sv.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/sv.json +++ b/apps/documenteditor/mobile/locale/sv.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json index e562dc217..0682dc2ae 100644 --- a/apps/documenteditor/mobile/locale/tr.json +++ b/apps/documenteditor/mobile/locale/tr.json @@ -86,7 +86,6 @@ "textTabs": "Sekmeleri değiştir", "notcriticalErrorTitle": "Warning", "textBreakBefore": "Page break before", - "textOk": "Ok", "textColor": "Font color", "textComments": "Comments", "textContextual": "Don't add intervals between paragraphs of the same style", @@ -126,6 +125,7 @@ "textNoKeepNext": "Don't keep with next", "textNot": "Not ", "textNoWidow": "No widow control", + "textOk": "Ok", "textOriginal": "Original", "textParaDeleted": "Paragraph Deleted", "textParaFormatted": "Paragraph Formatted", @@ -179,9 +179,17 @@ "menuReviewChange": "Review Change", "menuSplit": "Split", "menuViewComment": "View Comment", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "textActualSize": "Gerçek Boyut", @@ -450,6 +458,8 @@ "advDRMOptions": "Protected File", "advDRMPassword": "Password", "notcriticalErrorTitle": "Warning", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", "textComment": "Comment", "textComments": "Comments", "textCommentsDisplay": "Comments Display", @@ -511,7 +521,9 @@ "textTop": "Top", "textUnitOfMeasurement": "Unit Of Measurement", "textUploaded": "Uploaded", + "txtDownloadTxt": "Download TXT", "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", "txtProtected": "Once you enter the password and open the file, the current password will be reset", "txtScheme1": "Office", "txtScheme10": "Median", diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/uk.json +++ b/apps/documenteditor/mobile/locale/uk.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json index 8940a60fe..8d03f2d52 100644 --- a/apps/documenteditor/mobile/locale/vi.json +++ b/apps/documenteditor/mobile/locale/vi.json @@ -181,7 +181,15 @@ "textColumns": "Columns", "textCopyCutPasteActions": "Copy, Cut and Paste Actions", "textDoNotShowAgain": "Don't show again", - "textRows": "Rows" + "textRows": "Rows", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -569,7 +577,11 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", - "textOk": "Ok" + "textOk": "Ok", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json index 2396e9a0f..ebf1f709b 100644 --- a/apps/documenteditor/mobile/locale/zh.json +++ b/apps/documenteditor/mobile/locale/zh.json @@ -181,7 +181,15 @@ "textColumns": "列", "textCopyCutPasteActions": "拷贝，剪切和粘贴操作", "textDoNotShowAgain": "不要再显示", - "textRows": "行" + "textRows": "行", + "menuStartNewList": "Start new list", + "menuStartNumberingFrom": "Set numbering value", + "menuContinueNumbering": "Continue numbering", + "menuSeparateList": "Separate list", + "menuJoinList": "Join to previous list", + "textOk": "OK", + "textCancel": "Cancel", + "textNumberingValue": "Numbering Value" }, "Edit": { "notcriticalErrorTitle": "警告", @@ -547,7 +555,11 @@ "textUploaded": "已上传", "txtIncorrectPwd": "密码有误", "txtProtected": "输入密码并打开文件后，当前密码将会被重设。", + "textChooseEncoding": "Choose Encoding", + "textChooseTxtOptions": "Choose TXT Options", "textOk": "Ok", + "txtDownloadTxt": "Download TXT", + "txtOk": "Ok", "txtScheme1": "Office", "txtScheme10": "Median", "txtScheme11": "Metro", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 8a1914967..eb61a4bb9 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -15,7 +15,6 @@ "textAddReply": "Add Reply", "textBack": "Back", "textCancel": "Cancel", - "textOk": "Ok", "textCollaboration": "Collaboration", "textComments": "Comments", "textDeleteComment": "Delete Comment", @@ -28,6 +27,7 @@ "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", "textNoComments": "This document doesn't contain comments", + "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve", "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", diff --git a/apps/presentationeditor/mobile/locale/ja.json b/apps/presentationeditor/mobile/locale/ja.json index 6b7b2e27d..c872a7766 100644 --- a/apps/presentationeditor/mobile/locale/ja.json +++ b/apps/presentationeditor/mobile/locale/ja.json @@ -16,7 +16,6 @@ "textBack": "戻る", "textEditUser": "ファイルを編集しているユーザー：", "textCancel": "Cancel", - "textOk": "Ok", "textCollaboration": "Collaboration", "textComments": "Comments", "textDeleteComment": "Delete Comment", @@ -28,6 +27,7 @@ "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", "textNoComments": "This document doesn't contain comments", + "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve", "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index a79fcb38d..7a3a65a2d 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "Вы действительно хотите удалить этот комментарий?", "textMessageDeleteReply": "Вы действительно хотите удалить этот ответ?", "textNoComments": "Этот документ не содержит комментариев", + "textOk": "Ok", "textReopen": "Переоткрыть", "textResolve": "Решить", "textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.", - "textUsers": "Пользователи", - "textOk": "Ok" + "textUsers": "Пользователи" }, "ThemeColorPalette": { "textCustomColors": "Пользовательские цвета", diff --git a/apps/spreadsheeteditor/mobile/locale/be.json b/apps/spreadsheeteditor/mobile/locale/be.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/be.json +++ b/apps/spreadsheeteditor/mobile/locale/be.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/bg.json +++ b/apps/spreadsheeteditor/mobile/locale/bg.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/ca.json b/apps/spreadsheeteditor/mobile/locale/ca.json index e077fd1fa..233174d56 100644 --- a/apps/spreadsheeteditor/mobile/locale/ca.json +++ b/apps/spreadsheeteditor/mobile/locale/ca.json @@ -337,7 +337,10 @@ "txtNotUrl": "Aquest camp hauria de ser una URL amb el format \"http://www.exemple.com\"", "txtSorting": "Ordenació", "txtSortSelected": "Ordena els objectes seleccionats", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Advertiment", @@ -636,7 +639,17 @@ "txtSpace": "Espai", "txtTab": "Tabulador", "warnDownloadAs": "Si continueu desant en aquest format, es perdran totes les característiques, excepte el text.
    Segur que voleu continuar?", - "textOk": "Ok" + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "textOk": "Ok", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/cs.json +++ b/apps/spreadsheeteditor/mobile/locale/cs.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index 7e85a82d7..77d87e99f 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -337,7 +337,10 @@ "txtExpandSort": "Die Daten neben der Auswahl werden nicht sortiert. Möchten Sie die Auswahl um die angrenzenden Daten erweitern oder nur mit der Sortierung der aktuell ausgewählten Zellen fortfahren?", "txtNotUrl": "Dieser Bereich soll eine URL im Format \"http://www.example.com\" sein.", "txtSorting": "Sortierung", - "txtSortSelected": "Ausgewählte sortieren" + "txtSortSelected": "Ausgewählte sortieren", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warnung", @@ -636,7 +639,17 @@ "txtScheme9": "Gießerei", "txtSpace": "Leerzeichen", "txtTab": "Tab", - "warnDownloadAs": "Wenn Sie mit dem Speichern in diesem Format fortsetzen, werden alle Objekte außer Text verloren gehen.
    Möchten Sie wirklich fortsetzen?" + "warnDownloadAs": "Wenn Sie mit dem Speichern in diesem Format fortsetzen, werden alle Objekte außer Text verloren gehen.
    Möchten Sie wirklich fortsetzen?", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/el.json +++ b/apps/spreadsheeteditor/mobile/locale/el.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 007043442..29db9ae79 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -1,655 +1,655 @@ { - "About": { - "textAbout": "About", - "textAddress": "Address", - "textBack": "Back", - "textEmail": "Email", - "textPoweredBy": "Powered By", - "textTel": "Tel", - "textVersion": "Version" - }, - "Common": { - "Collaboration": { - "notcriticalErrorTitle": "Warning", - "textAddComment": "Add Comment", - "textAddReply": "Add Reply", - "textBack": "Back", - "textCancel": "Cancel", + "About": { + "textAbout": "About", + "textAddress": "Address", + "textBack": "Back", + "textEmail": "Email", + "textPoweredBy": "Powered By", + "textTel": "Tel", + "textVersion": "Version" + }, + "Common": { + "Collaboration": { + "notcriticalErrorTitle": "Warning", + "textAddComment": "Add Comment", + "textAddReply": "Add Reply", + "textBack": "Back", + "textCancel": "Cancel", + "textCollaboration": "Collaboration", + "textComments": "Comments", + "textDeleteComment": "Delete Comment", + "textDeleteReply": "Delete Reply", + "textDone": "Done", + "textEdit": "Edit", + "textEditComment": "Edit Comment", + "textEditReply": "Edit Reply", + "textEditUser": "Users who are editing the file:", + "textMessageDeleteComment": "Do you really want to delete this comment?", + "textMessageDeleteReply": "Do you really want to delete this reply?", + "textNoComments": "This document doesn't contain comments", "textOk": "Ok", - "textCollaboration": "Collaboration", - "textComments": "Comments", - "textDeleteComment": "Delete Comment", - "textDeleteReply": "Delete Reply", - "textDone": "Done", - "textEdit": "Edit", - "textEditComment": "Edit Comment", - "textEditReply": "Edit Reply", - "textEditUser": "Users who are editing the file:", - "textMessageDeleteComment": "Do you really want to delete this comment?", - "textMessageDeleteReply": "Do you really want to delete this reply?", - "textNoComments": "This document doesn't contain comments", - "textReopen": "Reopen", - "textResolve": "Resolve", - "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", - "textUsers": "Users" - }, - "ThemeColorPalette": { - "textCustomColors": "Custom Colors", - "textStandartColors": "Standard Colors", - "textThemeColors": "Theme Colors" - } + "textReopen": "Reopen", + "textResolve": "Resolve", + "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", + "textUsers": "Users" }, - "ContextMenu": { - "errorCopyCutPaste": "Copy, cut, and paste actions using the context menu will be performed within the current file only.", - "menuAddComment": "Add Comment", - "menuAddLink": "Add Link", - "menuCancel": "Cancel", - "menuCell": "Cell", - "menuDelete": "Delete", - "menuEdit": "Edit", - "menuFreezePanes": "Freeze Panes", - "menuHide": "Hide", - "menuMerge": "Merge", - "menuMore": "More", - "menuOpenLink": "Open Link", - "menuShow": "Show", - "menuUnfreezePanes": "Unfreeze Panes", - "menuUnmerge": "Unmerge", - "menuUnwrap": "Unwrap", - "menuViewComment": "View Comment", - "menuWrap": "Wrap", - "notcriticalErrorTitle": "Warning", - "textCopyCutPasteActions": "Copy, Cut and Paste Actions", - "textDoNotShowAgain": "Don't show again", - "warnMergeLostData": "The operation can destroy data in the selected cells. Continue?" - }, - "Controller": { - "Main": { - "criticalErrorTitle": "Error", - "errorAccessDeny": "You are trying to perform an action you do not have rights for.
    Please, contact your admin.", - "errorProcessSaveResult": "Saving is failed.", - "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", - "errorUpdateVersion": "The file version has been changed. The page will be reloaded.", - "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", - "notcriticalErrorTitle": "Warning", - "SDK": { - "txtAccent": "Accent", - "txtAll": "(All)", - "txtArt": "Your text here", - "txtBlank": "(blank)", - "txtByField": "%1 of %2", - "txtClearFilter": "Clear Filter (Alt+C)", - "txtColLbls": "Column Labels", - "txtColumn": "Column", - "txtConfidential": "Confidential", - "txtDate": "Date", - "txtDays": "Days", - "txtDiagramTitle": "Chart Title", - "txtFile": "File", - "txtGrandTotal": "Grand Total", - "txtGroup": "Group", - "txtHours": "Hours", - "txtMinutes": "Minutes", - "txtMonths": "Months", - "txtMultiSelect": "Multi-Select (Alt+S)", - "txtOr": "%1 or %2", - "txtPage": "Page", - "txtPageOf": "Page %1 of %2", - "txtPages": "Pages", - "txtPreparedBy": "Prepared by", - "txtPrintArea": "Print_Area", - "txtQuarter": "Qtr", - "txtQuarters": "Quarters", - "txtRow": "Row", - "txtRowLbls": "Row Labels", - "txtSeconds": "Seconds", - "txtSeries": "Series", - "txtStyle_Bad": "Bad", - "txtStyle_Calculation": "Calculation", - "txtStyle_Check_Cell": "Check Cell", - "txtStyle_Comma": "Comma", - "txtStyle_Currency": "Currency", - "txtStyle_Explanatory_Text": "Explanatory Text", - "txtStyle_Good": "Good", - "txtStyle_Heading_1": "Heading 1", - "txtStyle_Heading_2": "Heading 2", - "txtStyle_Heading_3": "Heading 3", - "txtStyle_Heading_4": "Heading 4", - "txtStyle_Input": "Input", - "txtStyle_Linked_Cell": "Linked Cell", - "txtStyle_Neutral": "Neutral", - "txtStyle_Normal": "Normal", - "txtStyle_Note": "Note", - "txtStyle_Output": "Output", - "txtStyle_Percent": "Percent", - "txtStyle_Title": "Title", - "txtStyle_Total": "Total", - "txtStyle_Warning_Text": "Warning Text", - "txtTab": "Tab", - "txtTable": "Table", - "txtTime": "Time", - "txtValues": "Values", - "txtXAxis": "X Axis", - "txtYAxis": "Y Axis", - "txtYears": "Years" - }, - "textAnonymous": "Anonymous", - "textBuyNow": "Visit website", - "textClose": "Close", - "textContactUs": "Contact sales", - "textCustomLoader": "Sorry, you are not entitled to change the loader. Please, contact our sales department to get a quote.", - "textGuest": "Guest", - "textHasMacros": "The file contains automatic macros.
    Do you want to run macros?", - "textNo": "No", - "textNoLicenseTitle": "License limit reached", - "textPaidFeature": "Paid feature", - "textRemember": "Remember my choice", - "textYes": "Yes", - "titleServerVersion": "Editor updated", - "titleUpdateVersion": "Version changed", - "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.", - "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please, contact your admin.", - "warnLicenseLimitedRenewed": "License needs to be renewed. You have limited access to document editing functionality.
    Please contact your administrator to get full access", - "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", - "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.", - "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", - "warnProcessRightsChange": "You don't have permission to edit the file." - } - }, - "Error": { - "convertationTimeoutText": "Conversion timeout exceeded.", - "criticalErrorExtText": "Press 'OK' to go back to the document list.", - "criticalErrorTitle": "Error", - "downloadErrorText": "Download failed.", - "errorAccessDeny": "You are trying to perform an action you do not have rights for.
    Please, contact your admin.", - "errorArgsRange": "An error in the formula.
    Incorrect arguments range.", - "errorAutoFilterChange": "The operation is not allowed as it is attempting to shift cells in a table on your worksheet.", - "errorAutoFilterChangeFormatTable": "The operation could not be done for the selected cells as you cannot move a part of a table.
    Select another data range so that the whole table is shifted and try again.", - "errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range inside or outside the table and try again.", - "errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please, unhide the filtered elements and try again.", - "errorBadImageUrl": "Image url is incorrect", - "errorChangeArray": "You cannot change part of an array.", - "errorConnectToServer": "Can't save this doc. Check your connection settings or contact your admin.
    When you click the 'OK' button, you will be prompted to download the document.", - "errorCopyMultiselectArea": "This command cannot be used with multiple selections.
    Select a single range and try again.", - "errorCountArg": "An error in the formula.
    Invalid number of arguments.", - "errorCountArgExceed": "An error in the formula.
    Maximum number of arguments exceeded.", - "errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
    at the moment as some of them are being edited.", - "errorDatabaseConnection": "External error.
    Database connection error. Please, contact support.", - "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", - "errorDataRange": "Incorrect data range.", - "errorDataValidate": "The value you entered is not valid.
    A user has restricted values that can be entered into this cell.", - "errorDefaultMessage": "Error code: %1", - "errorEditingDownloadas": "An error occurred during the work with the document.
    Use the 'Download' option to save the file backup copy locally.", - "errorFilePassProtect": "The file is password protected and could not be opened.", - "errorFileRequest": "External error.
    File Request. Please, contact support.", - "errorFileSizeExceed": "The file size exceeds your server limitation.
    Please, contact your admin for details.", - "errorFileVKey": "External error.
    Incorrect security key. Please, contact support.", - "errorFillRange": "Could not fill the selected range of cells.
    All the merged cells need to be the same size.", - "errorFormulaName": "An error in the formula.
    Incorrect formula name.", - "errorFormulaParsing": "Internal error while the formula parsing.", - "errorFrmlMaxLength": "You cannot add this formula as its length exceeds the allowed number of characters.
    Please, edit it and try again.", - "errorFrmlMaxReference": "You cannot enter this formula because it has too many values,
    cell references, and/or names.", - "errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
    Use the CONCATENATE function or concatenation operator (&)", - "errorFrmlWrongReferences": "The function refers to a sheet that does not exist.
    Please, check the data and try again.", - "errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", - "errorKeyEncrypt": "Unknown key descriptor", - "errorKeyExpire": "Key descriptor expired", - "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", - "errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", - "errorLockedCellPivot": "You cannot change data inside a pivot table.", - "errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", - "errorMaxPoints": "The maximum number of points in series per chart is 4096.", - "errorMoveRange": "Cannot change a part of a merged cell", - "errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.", - "errorOpenWarning": "The length of one of the formulas in the file exceeded
    the allowed number of characters and it was removed.", - "errorOperandExpected": "The entered function syntax is not correct. Please, check if you missed one of the parentheses - '(' or ')'.", - "errorPasteMaxRange": "The copy and paste area does not match. Please, select an area of the same size or click the first cell in a row to paste the copied cells.", - "errorPrintMaxPagesCount": "Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
    This restriction will be eliminated in upcoming releases.", - "errorSessionAbsolute": "The document editing session has expired. Please, reload the page.", - "errorSessionIdle": "The document has not been edited for quite a long time. Please, reload the page.", - "errorSessionToken": "The connection to the server has been interrupted. Please, reload the page.", - "errorStockChart": "Incorrect row order. To build a stock chart, place the data on the sheet in the following order:
    opening price, max price, min price, closing price.", - "errorUnexpectedGuid": "External error.
    Unexpected Guid. Please, contact support.", - "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", - "errorUserDrop": "The file cannot be accessed right now.", - "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", - "errorViewerDisconnect": "Connection is lost. You can still view the document,
    but you won't be able to download or print it until the connection is restored and the page is reloaded.", - "errorWrongBracketsCount": "An error in the formula.
    Wrong number of brackets.", - "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
    Correct the error or use the Esc button to cancel the formula editing.", - "notcriticalErrorTitle": "Warning", - "openErrorText": "An error has occurred while opening the file", - "pastInMergeAreaError": "Cannot change a part of a merged cell", - "saveErrorText": "An error has occurred while saving the file", - "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please, reload the page.", - "unknownErrorText": "Unknown error.", - "uploadImageExtMessage": "Unknown image format.", - "uploadImageFileCountMessage": "No images uploaded.", - "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB." - }, - "LongActions": { - "applyChangesTextText": "Loading data...", - "applyChangesTitleText": "Loading Data", - "confirmMoveCellRange": "The destination cells range can contain data. Continue the operation?", - "confirmPutMergeRange": "The source data contains merged cells.
    They will be unmerged before they are pasted into the table.", - "confirmReplaceFormulaInTable": "Formulas in the header row will be removed and converted to static text.
    Do you want to continue?", - "downloadTextText": "Downloading document...", - "downloadTitleText": "Downloading Document", - "loadFontsTextText": "Loading data...", - "loadFontsTitleText": "Loading Data", - "loadFontTextText": "Loading data...", - "loadFontTitleText": "Loading Data", - "loadImagesTextText": "Loading images...", - "loadImagesTitleText": "Loading Images", - "loadImageTextText": "Loading image...", - "loadImageTitleText": "Loading Image", - "loadingDocumentTextText": "Loading document...", - "loadingDocumentTitleText": "Loading document", - "notcriticalErrorTitle": "Warning", - "openTextText": "Opening document...", - "openTitleText": "Opening Document", - "printTextText": "Printing document...", - "printTitleText": "Printing Document", - "savePreparingText": "Preparing to save", - "savePreparingTitle": "Preparing to save. Please wait...", - "saveTextText": "Saving document...", - "saveTitleText": "Saving Document", - "textLoadingDocument": "Loading document", - "textNo": "No", - "textOk": "Ok", - "textYes": "Yes", - "txtEditingMode": "Set editing mode...", - "uploadImageTextText": "Uploading image...", - "uploadImageTitleText": "Uploading Image", - "waitText": "Please, wait..." - }, - "Statusbar": { - "notcriticalErrorTitle": "Warning", - "textCancel": "Cancel", - "textDelete": "Delete", - "textDuplicate": "Duplicate", - "textErrNameExists": "Worksheet with this name already exists.", - "textErrNameWrongChar": "A sheet name cannot contains characters: \\, /, *, ?, [, ], :", - "textErrNotEmpty": "Sheet name must not be empty", - "textErrorLastSheet": "The workbook must have at least one visible worksheet.", - "textErrorRemoveSheet": "Can't delete the worksheet.", - "textHide": "Hide", - "textMore": "More", - "textOk": "Ok", - "textRename": "Rename", - "textRenameSheet": "Rename Sheet", - "textSheet": "Sheet", - "textSheetName": "Sheet Name", - "textUnhide": "Unhide", - "textWarnDeleteSheet": "The worksheet maybe has data. Proceed operation?" - }, - "Toolbar": { - "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", - "dlgLeaveTitleText": "You leave the application", - "leaveButtonText": "Leave this Page", - "stayButtonText": "Stay on this Page" - }, - "View": { - "Add": { - "errorMaxRows": "ERROR! The maximum number of data series per chart is 255.", - "errorStockChart": "Incorrect row order. To build a stock chart, place the data on the sheet in the following order:
    opening price, max price, min price, closing price.", - "notcriticalErrorTitle": "Warning", - "sCatDateAndTime": "Date and time", - "sCatEngineering": "Engineering", - "sCatFinancial": "Financial", - "sCatInformation": "Information", - "sCatLogical": "Logical", - "sCatLookupAndReference": "Lookup and Reference", - "sCatMathematic": "Math and trigonometry", - "sCatStatistical": "Statistical", - "sCatTextAndData": "Text and data", - "textAddLink": "Add Link", - "textAddress": "Address", - "textBack": "Back", - "textCancel": "Cancel", - "textChart": "Chart", - "textComment": "Comment", - "textDisplay": "Display", - "textEmptyImgUrl": "You need to specify the image URL.", - "textExternalLink": "External Link", - "textFilter": "Filter", - "textFunction": "Function", - "textGroups": "CATEGORIES", - "textImage": "Image", - "textImageURL": "Image URL", - "textInsert": "Insert", - "textInsertImage": "Insert Image", - "textInternalDataRange": "Internal Data Range", - "textInvalidRange": "ERROR! Invalid cells range", - "textLink": "Link", - "textLinkSettings": "Link Settings", - "textLinkType": "Link Type", - "textOther": "Other", - "textPictureFromLibrary": "Picture from library", - "textPictureFromURL": "Picture from URL", - "textRange": "Range", - "textRequired": "Required", - "textScreenTip": "Screen Tip", - "textSelectedRange": "Selected Range", - "textShape": "Shape", - "textSheet": "Sheet", - "textSortAndFilter": "Sort and Filter", - "txtExpand": "Expand and sort", - "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", - "txtSorting": "Sorting", - "txtSortSelected": "Sort selected", - "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", - "txtYes": "Yes", - "txtNo": "No" - }, - "Edit": { - "notcriticalErrorTitle": "Warning", - "textAccounting": "Accounting", - "textActualSize": "Actual Size", - "textAddCustomColor": "Add Custom Color", - "textAddress": "Address", - "textAlign": "Align", - "textAlignBottom": "Align Bottom", - "textAlignCenter": "Align Center", - "textAlignLeft": "Align Left", - "textAlignMiddle": "Align Middle", - "textAlignRight": "Align Right", - "textAlignTop": "Align Top", - "textAllBorders": "All Borders", - "textAngleClockwise": "Angle Clockwise", - "textAngleCounterclockwise": "Angle Counterclockwise", - "textAuto": "Auto", - "textAxisCrosses": "Axis Crosses", - "textAxisOptions": "Axis Options", - "textAxisPosition": "Axis Position", - "textAxisTitle": "Axis Title", - "textBack": "Back", - "textBetweenTickMarks": "Between Tick Marks", - "textBillions": "Billions", - "textBorder": "Border", - "textBorderStyle": "Border Style", - "textBottom": "Bottom", - "textBottomBorder": "Bottom Border", - "textBringToForeground": "Bring to Foreground", - "textCell": "Cell", - "textCellStyles": "Cell Styles", - "textCenter": "Center", - "textChart": "Chart", - "textChartTitle": "Chart Title", - "textClearFilter": "Clear Filter", - "textColor": "Color", - "textCross": "Cross", - "textCrossesValue": "Crosses Value", - "textCurrency": "Currency", - "textCustomColor": "Custom Color", - "textDataLabels": "Data Labels", - "textDate": "Date", - "textDefault": "Selected range", - "textDeleteFilter": "Delete Filter", - "textDesign": "Design", - "textDiagonalDownBorder": "Diagonal Down Border", - "textDiagonalUpBorder": "Diagonal Up Border", - "textDisplay": "Display", - "textDisplayUnits": "Display Units", - "textDollar": "Dollar", - "textEditLink": "Edit Link", - "textEffects": "Effects", - "textEmptyImgUrl": "You need to specify the image URL.", - "textEmptyItem": "{Blanks}", - "textErrorMsg": "You must choose at least one value", - "textErrorTitle": "Warning", - "textEuro": "Euro", - "textExternalLink": "External Link", - "textFill": "Fill", - "textFillColor": "Fill Color", - "textFilterOptions": "Filter Options", - "textFit": "Fit Width", - "textFonts": "Fonts", - "textFormat": "Format", - "textFraction": "Fraction", - "textFromLibrary": "Picture from Library", - "textFromURL": "Picture from URL", - "textGeneral": "General", - "textGridlines": "Gridlines", - "textHigh": "High", - "textHorizontal": "Horizontal", - "textHorizontalAxis": "Horizontal Axis", - "textHorizontalText": "Horizontal Text", - "textHundredMil": "100 000 000", - "textHundreds": "Hundreds", - "textHundredThousands": "100 000", - "textHyperlink": "Hyperlink", - "textImage": "Image", - "textImageURL": "Image URL", - "textIn": "In", - "textInnerBottom": "Inner Bottom", - "textInnerTop": "Inner Top", - "textInsideBorders": "Inside Borders", - "textInsideHorizontalBorder": "Inside Horizontal Border", - "textInsideVerticalBorder": "Inside Vertical Border", - "textInteger": "Integer", - "textInternalDataRange": "Internal Data Range", - "textInvalidRange": "Invalid cells range", - "textJustified": "Justified", - "textLabelOptions": "Label Options", - "textLabelPosition": "Label Position", - "textLayout": "Layout", - "textLeft": "Left", - "textLeftBorder": "Left Border", - "textLeftOverlay": "Left Overlay", - "textLegend": "Legend", - "textLink": "Link", - "textLinkSettings": "Link Settings", - "textLinkType": "Link Type", - "textLow": "Low", - "textMajor": "Major", - "textMajorAndMinor": "Major And Minor", - "textMajorType": "Major Type", - "textMaximumValue": "Maximum Value", - "textMedium": "Medium", - "textMillions": "Millions", - "textMinimumValue": "Minimum Value", - "textMinor": "Minor", - "textMinorType": "Minor Type", - "textMoveBackward": "Move Backward", - "textMoveForward": "Move Forward", - "textNextToAxis": "Next to Axis", - "textNoBorder": "No Border", - "textNone": "None", - "textNoOverlay": "No Overlay", - "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"", - "textNumber": "Number", - "textOnTickMarks": "On Tick Marks", - "textOpacity": "Opacity", - "textOut": "Out", - "textOuterTop": "Outer Top", - "textOutsideBorders": "Outside Borders", - "textOverlay": "Overlay", - "textPercentage": "Percentage", - "textPictureFromLibrary": "Picture from Library", - "textPictureFromURL": "Picture from URL", - "textPound": "Pound", - "textPt": "pt", - "textRange": "Range", - "textRemoveChart": "Remove Chart", - "textRemoveImage": "Remove Image", - "textRemoveLink": "Remove Link", - "textRemoveShape": "Remove Shape", - "textReorder": "Reorder", - "textReplace": "Replace", - "textReplaceImage": "Replace Image", - "textRequired": "Required", - "textRight": "Right", - "textRightBorder": "Right Border", - "textRightOverlay": "Right Overlay", - "textRotated": "Rotated", - "textRotateTextDown": "Rotate Text Down", - "textRotateTextUp": "Rotate Text Up", - "textRouble": "Rouble", - "textScientific": "Scientific", - "textScreenTip": "Screen Tip", - "textSelectAll": "Select All", - "textSelectObjectToEdit": "Select object to edit", - "textSendToBackground": "Send to Background", - "textSettings": "Settings", - "textShape": "Shape", - "textSheet": "Sheet", - "textSize": "Size", - "textStyle": "Style", - "textTenMillions": "10 000 000", - "textTenThousands": "10 000", - "textText": "Text", - "textTextColor": "Text Color", - "textTextFormat": "Text Format", - "textTextOrientation": "Text Orientation", - "textThick": "Thick", - "textThin": "Thin", - "textThousands": "Thousands", - "textTickOptions": "Tick Options", - "textTime": "Time", - "textTop": "Top", - "textTopBorder": "Top Border", - "textTrillions": "Trillions", - "textType": "Type", - "textValue": "Value", - "textValuesInReverseOrder": "Values in Reverse Order", - "textVertical": "Vertical", - "textVerticalAxis": "Vertical Axis", - "textVerticalText": "Vertical Text", - "textWrapText": "Wrap Text", - "textYen": "Yen", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", - "txtSortHigh2Low": "Sort Highest to Lowest", - "txtSortLow2High": "Sort Lowest to Highest" - }, - "Settings": { - "advCSVOptions": "Choose CSV options", - "advDRMEnterPassword": "Your password, please:", - "advDRMOptions": "Protected File", - "advDRMPassword": "Password", - "closeButtonText": "Close File", - "notcriticalErrorTitle": "Warning", - "textAbout": "About", - "textAddress": "Address", - "textApplication": "Application", - "textApplicationSettings": "Application Settings", - "textAuthor": "Author", - "textBack": "Back", - "textBottom": "Bottom", - "textByColumns": "By columns", - "textByRows": "By rows", - "textCancel": "Cancel", - "textCentimeter": "Centimeter", - "textCollaboration": "Collaboration", - "textColorSchemes": "Color Schemes", - "textComment": "Comment", - "textCommentingDisplay": "Commenting Display", - "textComments": "Comments", - "textCreated": "Created", - "textCustomSize": "Custom Size", - "textDisableAll": "Disable All", - "textDisableAllMacrosWithNotification": "Disable all macros with a notification", - "textDisableAllMacrosWithoutNotification": "Disable all macros without a notification", - "textDone": "Done", - "textDownload": "Download", - "textDownloadAs": "Download As", - "textEmail": "Email", - "textEnableAll": "Enable All", - "textEnableAllMacrosWithoutNotification": "Enable all macros without a notification", - "textFind": "Find", - "textFindAndReplace": "Find and Replace", - "textFindAndReplaceAll": "Find and Replace All", - "textFormat": "Format", - "textFormulaLanguage": "Formula Language", - "textFormulas": "Formulas", - "textHelp": "Help", - "textHideGridlines": "Hide Gridlines", - "textHideHeadings": "Hide Headings", - "textHighlightRes": "Highlight results", - "textInch": "Inch", - "textLandscape": "Landscape", - "textLastModified": "Last Modified", - "textLastModifiedBy": "Last Modified By", - "textLeft": "Left", - "textLocation": "Location", - "textLookIn": "Look In", - "textMacrosSettings": "Macros Settings", - "textMargins": "Margins", - "textMatchCase": "Match Case", - "textMatchCell": "Match Cell", - "textNoTextFound": "Text not found", - "textOk": "Ok", - "textOpenFile": "Enter a password to open the file", - "textOrientation": "Orientation", - "textOwner": "Owner", - "textPoint": "Point", - "textPortrait": "Portrait", - "textPoweredBy": "Powered By", - "textPrint": "Print", - "textR1C1Style": "R1C1 Reference Style", - "textRegionalSettings": "Regional Settings", - "textReplace": "Replace", - "textReplaceAll": "Replace All", - "textResolvedComments": "Resolved Comments", - "textRight": "Right", - "textSearch": "Search", - "textSearchBy": "Search", - "textSearchIn": "Search In", - "textSettings": "Settings", - "textSheet": "Sheet", - "textShowNotification": "Show Notification", - "textSpreadsheetFormats": "Spreadsheet Formats", - "textSpreadsheetInfo": "Spreadsheet Info", - "textSpreadsheetSettings": "Spreadsheet Settings", - "textSpreadsheetTitle": "Spreadsheet Title", - "textSubject": "Subject", - "textTel": "Tel", - "textTitle": "Title", - "textTop": "Top", - "textUnitOfMeasurement": "Unit Of Measurement", - "textUploaded": "Uploaded", - "textValues": "Values", - "textVersion": "Version", - "textWorkbook": "Workbook", - "txtDelimiter": "Delimiter", - "txtEncoding": "Encoding", - "txtIncorrectPwd": "Password is incorrect", - "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", - "txtScheme1": "Office", - "txtScheme10": "Median", - "txtScheme11": "Metro", - "txtScheme12": "Module", - "txtScheme13": "Opulent", - "txtScheme14": "Oriel", - "txtScheme15": "Origin", - "txtScheme16": "Paper", - "txtScheme17": "Solstice", - "txtScheme18": "Technic", - "txtScheme19": "Trek", - "txtScheme2": "Grayscale", - "txtScheme20": "Urban", - "txtScheme21": "Verve", - "txtScheme22": "New Office", - "txtScheme3": "Apex", - "txtScheme4": "Aspect", - "txtScheme5": "Civic", - "txtScheme6": "Concourse", - "txtScheme7": "Equity", - "txtScheme8": "Flow", - "txtScheme9": "Foundry", - "txtSpace": "Space", - "txtTab": "Tab", - "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textChooseCsvOptions": "Choose CSV Options", - "txtDownloadCsv": "Download CSV", - "textDelimeter": "Delimeter", - "textEncoding": "Encoding", - "textChooseEncoding": "Choose Encoding", - "textChooseDelimeter": "Choose Delimeter", - "txtComma": "Comma", - "txtSemicolon": "Semicolon", - "txtColon": "Colon", - "txtOk": "Ok" - } + "ThemeColorPalette": { + "textCustomColors": "Custom Colors", + "textStandartColors": "Standard Colors", + "textThemeColors": "Theme Colors" } + }, + "ContextMenu": { + "errorCopyCutPaste": "Copy, cut, and paste actions using the context menu will be performed within the current file only.", + "menuAddComment": "Add Comment", + "menuAddLink": "Add Link", + "menuCancel": "Cancel", + "menuCell": "Cell", + "menuDelete": "Delete", + "menuEdit": "Edit", + "menuFreezePanes": "Freeze Panes", + "menuHide": "Hide", + "menuMerge": "Merge", + "menuMore": "More", + "menuOpenLink": "Open Link", + "menuShow": "Show", + "menuUnfreezePanes": "Unfreeze Panes", + "menuUnmerge": "Unmerge", + "menuUnwrap": "Unwrap", + "menuViewComment": "View Comment", + "menuWrap": "Wrap", + "notcriticalErrorTitle": "Warning", + "textCopyCutPasteActions": "Copy, Cut and Paste Actions", + "textDoNotShowAgain": "Don't show again", + "warnMergeLostData": "The operation can destroy data in the selected cells. Continue?" + }, + "Controller": { + "Main": { + "criticalErrorTitle": "Error", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
    Please, contact your admin.", + "errorProcessSaveResult": "Saving is failed.", + "errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", + "errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", + "notcriticalErrorTitle": "Warning", + "SDK": { + "txtAccent": "Accent", + "txtAll": "(All)", + "txtArt": "Your text here", + "txtBlank": "(blank)", + "txtByField": "%1 of %2", + "txtClearFilter": "Clear Filter (Alt+C)", + "txtColLbls": "Column Labels", + "txtColumn": "Column", + "txtConfidential": "Confidential", + "txtDate": "Date", + "txtDays": "Days", + "txtDiagramTitle": "Chart Title", + "txtFile": "File", + "txtGrandTotal": "Grand Total", + "txtGroup": "Group", + "txtHours": "Hours", + "txtMinutes": "Minutes", + "txtMonths": "Months", + "txtMultiSelect": "Multi-Select (Alt+S)", + "txtOr": "%1 or %2", + "txtPage": "Page", + "txtPageOf": "Page %1 of %2", + "txtPages": "Pages", + "txtPreparedBy": "Prepared by", + "txtPrintArea": "Print_Area", + "txtQuarter": "Qtr", + "txtQuarters": "Quarters", + "txtRow": "Row", + "txtRowLbls": "Row Labels", + "txtSeconds": "Seconds", + "txtSeries": "Series", + "txtStyle_Bad": "Bad", + "txtStyle_Calculation": "Calculation", + "txtStyle_Check_Cell": "Check Cell", + "txtStyle_Comma": "Comma", + "txtStyle_Currency": "Currency", + "txtStyle_Explanatory_Text": "Explanatory Text", + "txtStyle_Good": "Good", + "txtStyle_Heading_1": "Heading 1", + "txtStyle_Heading_2": "Heading 2", + "txtStyle_Heading_3": "Heading 3", + "txtStyle_Heading_4": "Heading 4", + "txtStyle_Input": "Input", + "txtStyle_Linked_Cell": "Linked Cell", + "txtStyle_Neutral": "Neutral", + "txtStyle_Normal": "Normal", + "txtStyle_Note": "Note", + "txtStyle_Output": "Output", + "txtStyle_Percent": "Percent", + "txtStyle_Title": "Title", + "txtStyle_Total": "Total", + "txtStyle_Warning_Text": "Warning Text", + "txtTab": "Tab", + "txtTable": "Table", + "txtTime": "Time", + "txtValues": "Values", + "txtXAxis": "X Axis", + "txtYAxis": "Y Axis", + "txtYears": "Years" + }, + "textAnonymous": "Anonymous", + "textBuyNow": "Visit website", + "textClose": "Close", + "textContactUs": "Contact sales", + "textCustomLoader": "Sorry, you are not entitled to change the loader. Please, contact our sales department to get a quote.", + "textGuest": "Guest", + "textHasMacros": "The file contains automatic macros.
    Do you want to run macros?", + "textNo": "No", + "textNoLicenseTitle": "License limit reached", + "textPaidFeature": "Paid feature", + "textRemember": "Remember my choice", + "textYes": "Yes", + "titleServerVersion": "Editor updated", + "titleUpdateVersion": "Version changed", + "warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.", + "warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please, contact your admin.", + "warnLicenseLimitedRenewed": "License needs to be renewed. You have limited access to document editing functionality.
    Please contact your administrator to get full access", + "warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", + "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.", + "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", + "warnProcessRightsChange": "You don't have permission to edit the file." + } + }, + "Error": { + "convertationTimeoutText": "Conversion timeout exceeded.", + "criticalErrorExtText": "Press 'OK' to go back to the document list.", + "criticalErrorTitle": "Error", + "downloadErrorText": "Download failed.", + "errorAccessDeny": "You are trying to perform an action you do not have rights for.
    Please, contact your admin.", + "errorArgsRange": "An error in the formula.
    Incorrect arguments range.", + "errorAutoFilterChange": "The operation is not allowed as it is attempting to shift cells in a table on your worksheet.", + "errorAutoFilterChangeFormatTable": "The operation could not be done for the selected cells as you cannot move a part of a table.
    Select another data range so that the whole table is shifted and try again.", + "errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range inside or outside the table and try again.", + "errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
    Please, unhide the filtered elements and try again.", + "errorBadImageUrl": "Image url is incorrect", + "errorChangeArray": "You cannot change part of an array.", + "errorConnectToServer": "Can't save this doc. Check your connection settings or contact your admin.
    When you click the 'OK' button, you will be prompted to download the document.", + "errorCopyMultiselectArea": "This command cannot be used with multiple selections.
    Select a single range and try again.", + "errorCountArg": "An error in the formula.
    Invalid number of arguments.", + "errorCountArgExceed": "An error in the formula.
    Maximum number of arguments exceeded.", + "errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
    at the moment as some of them are being edited.", + "errorDatabaseConnection": "External error.
    Database connection error. Please, contact support.", + "errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", + "errorDataRange": "Incorrect data range.", + "errorDataValidate": "The value you entered is not valid.
    A user has restricted values that can be entered into this cell.", + "errorDefaultMessage": "Error code: %1", + "errorEditingDownloadas": "An error occurred during the work with the document.
    Use the 'Download' option to save the file backup copy locally.", + "errorFilePassProtect": "The file is password protected and could not be opened.", + "errorFileRequest": "External error.
    File Request. Please, contact support.", + "errorFileSizeExceed": "The file size exceeds your server limitation.
    Please, contact your admin for details.", + "errorFileVKey": "External error.
    Incorrect security key. Please, contact support.", + "errorFillRange": "Could not fill the selected range of cells.
    All the merged cells need to be the same size.", + "errorFormulaName": "An error in the formula.
    Incorrect formula name.", + "errorFormulaParsing": "Internal error while the formula parsing.", + "errorFrmlMaxLength": "You cannot add this formula as its length exceeds the allowed number of characters.
    Please, edit it and try again.", + "errorFrmlMaxReference": "You cannot enter this formula because it has too many values,
    cell references, and/or names.", + "errorFrmlMaxTextLength": "Text values in formulas are limited to 255 characters.
    Use the CONCATENATE function or concatenation operator (&)", + "errorFrmlWrongReferences": "The function refers to a sheet that does not exist.
    Please, check the data and try again.", + "errorInvalidRef": "Enter a correct name for the selection or a valid reference to go to.", + "errorKeyEncrypt": "Unknown key descriptor", + "errorKeyExpire": "Key descriptor expired", + "errorLoadingFont": "Fonts are not loaded.
    Please contact your Document Server administrator.", + "errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", + "errorLockedCellPivot": "You cannot change data inside a pivot table.", + "errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", + "errorMaxPoints": "The maximum number of points in series per chart is 4096.", + "errorMoveRange": "Cannot change a part of a merged cell", + "errorMultiCellFormula": "Multi-cell array formulas are not allowed in tables.", + "errorOpenWarning": "The length of one of the formulas in the file exceeded
    the allowed number of characters and it was removed.", + "errorOperandExpected": "The entered function syntax is not correct. Please, check if you missed one of the parentheses - '(' or ')'.", + "errorPasteMaxRange": "The copy and paste area does not match. Please, select an area of the same size or click the first cell in a row to paste the copied cells.", + "errorPrintMaxPagesCount": "Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
    This restriction will be eliminated in upcoming releases.", + "errorSessionAbsolute": "The document editing session has expired. Please, reload the page.", + "errorSessionIdle": "The document has not been edited for quite a long time. Please, reload the page.", + "errorSessionToken": "The connection to the server has been interrupted. Please, reload the page.", + "errorStockChart": "Incorrect row order. To build a stock chart, place the data on the sheet in the following order:
    opening price, max price, min price, closing price.", + "errorUnexpectedGuid": "External error.
    Unexpected Guid. Please, contact support.", + "errorUpdateVersionOnDisconnect": "Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.", + "errorUserDrop": "The file cannot be accessed right now.", + "errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", + "errorViewerDisconnect": "Connection is lost. You can still view the document,
    but you won't be able to download or print it until the connection is restored and the page is reloaded.", + "errorWrongBracketsCount": "An error in the formula.
    Wrong number of brackets.", + "errorWrongOperator": "An error in the entered formula. The wrong operator is used.
    Correct the error or use the Esc button to cancel the formula editing.", + "notcriticalErrorTitle": "Warning", + "openErrorText": "An error has occurred while opening the file", + "pastInMergeAreaError": "Cannot change a part of a merged cell", + "saveErrorText": "An error has occurred while saving the file", + "scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please, reload the page.", + "unknownErrorText": "Unknown error.", + "uploadImageExtMessage": "Unknown image format.", + "uploadImageFileCountMessage": "No images uploaded.", + "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB." + }, + "LongActions": { + "applyChangesTextText": "Loading data...", + "applyChangesTitleText": "Loading Data", + "confirmMoveCellRange": "The destination cells range can contain data. Continue the operation?", + "confirmPutMergeRange": "The source data contains merged cells.
    They will be unmerged before they are pasted into the table.", + "confirmReplaceFormulaInTable": "Formulas in the header row will be removed and converted to static text.
    Do you want to continue?", + "downloadTextText": "Downloading document...", + "downloadTitleText": "Downloading Document", + "loadFontsTextText": "Loading data...", + "loadFontsTitleText": "Loading Data", + "loadFontTextText": "Loading data...", + "loadFontTitleText": "Loading Data", + "loadImagesTextText": "Loading images...", + "loadImagesTitleText": "Loading Images", + "loadImageTextText": "Loading image...", + "loadImageTitleText": "Loading Image", + "loadingDocumentTextText": "Loading document...", + "loadingDocumentTitleText": "Loading document", + "notcriticalErrorTitle": "Warning", + "openTextText": "Opening document...", + "openTitleText": "Opening Document", + "printTextText": "Printing document...", + "printTitleText": "Printing Document", + "savePreparingText": "Preparing to save", + "savePreparingTitle": "Preparing to save. Please wait...", + "saveTextText": "Saving document...", + "saveTitleText": "Saving Document", + "textLoadingDocument": "Loading document", + "textNo": "No", + "textOk": "Ok", + "textYes": "Yes", + "txtEditingMode": "Set editing mode...", + "uploadImageTextText": "Uploading image...", + "uploadImageTitleText": "Uploading Image", + "waitText": "Please, wait..." + }, + "Statusbar": { + "notcriticalErrorTitle": "Warning", + "textCancel": "Cancel", + "textDelete": "Delete", + "textDuplicate": "Duplicate", + "textErrNameExists": "Worksheet with this name already exists.", + "textErrNameWrongChar": "A sheet name cannot contains characters: \\, /, *, ?, [, ], :", + "textErrNotEmpty": "Sheet name must not be empty", + "textErrorLastSheet": "The workbook must have at least one visible worksheet.", + "textErrorRemoveSheet": "Can't delete the worksheet.", + "textHide": "Hide", + "textMore": "More", + "textOk": "Ok", + "textRename": "Rename", + "textRenameSheet": "Rename Sheet", + "textSheet": "Sheet", + "textSheetName": "Sheet Name", + "textUnhide": "Unhide", + "textWarnDeleteSheet": "The worksheet maybe has data. Proceed operation?" + }, + "Toolbar": { + "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", + "dlgLeaveTitleText": "You leave the application", + "leaveButtonText": "Leave this Page", + "stayButtonText": "Stay on this Page" + }, + "View": { + "Add": { + "errorMaxRows": "ERROR! The maximum number of data series per chart is 255.", + "errorStockChart": "Incorrect row order. To build a stock chart, place the data on the sheet in the following order:
    opening price, max price, min price, closing price.", + "notcriticalErrorTitle": "Warning", + "sCatDateAndTime": "Date and time", + "sCatEngineering": "Engineering", + "sCatFinancial": "Financial", + "sCatInformation": "Information", + "sCatLogical": "Logical", + "sCatLookupAndReference": "Lookup and Reference", + "sCatMathematic": "Math and trigonometry", + "sCatStatistical": "Statistical", + "sCatTextAndData": "Text and data", + "textAddLink": "Add Link", + "textAddress": "Address", + "textBack": "Back", + "textCancel": "Cancel", + "textChart": "Chart", + "textComment": "Comment", + "textDisplay": "Display", + "textEmptyImgUrl": "You need to specify the image URL.", + "textExternalLink": "External Link", + "textFilter": "Filter", + "textFunction": "Function", + "textGroups": "CATEGORIES", + "textImage": "Image", + "textImageURL": "Image URL", + "textInsert": "Insert", + "textInsertImage": "Insert Image", + "textInternalDataRange": "Internal Data Range", + "textInvalidRange": "ERROR! Invalid cells range", + "textLink": "Link", + "textLinkSettings": "Link Settings", + "textLinkType": "Link Type", + "textOther": "Other", + "textPictureFromLibrary": "Picture from library", + "textPictureFromURL": "Picture from URL", + "textRange": "Range", + "textRequired": "Required", + "textScreenTip": "Screen Tip", + "textSelectedRange": "Selected Range", + "textShape": "Shape", + "textSheet": "Sheet", + "textSortAndFilter": "Sort and Filter", + "txtExpand": "Expand and sort", + "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "txtSorting": "Sorting", + "txtSortSelected": "Sort selected", + "txtYes": "Yes" + }, + "Edit": { + "notcriticalErrorTitle": "Warning", + "textAccounting": "Accounting", + "textActualSize": "Actual Size", + "textAddCustomColor": "Add Custom Color", + "textAddress": "Address", + "textAlign": "Align", + "textAlignBottom": "Align Bottom", + "textAlignCenter": "Align Center", + "textAlignLeft": "Align Left", + "textAlignMiddle": "Align Middle", + "textAlignRight": "Align Right", + "textAlignTop": "Align Top", + "textAllBorders": "All Borders", + "textAngleClockwise": "Angle Clockwise", + "textAngleCounterclockwise": "Angle Counterclockwise", + "textAuto": "Auto", + "textAxisCrosses": "Axis Crosses", + "textAxisOptions": "Axis Options", + "textAxisPosition": "Axis Position", + "textAxisTitle": "Axis Title", + "textBack": "Back", + "textBetweenTickMarks": "Between Tick Marks", + "textBillions": "Billions", + "textBorder": "Border", + "textBorderStyle": "Border Style", + "textBottom": "Bottom", + "textBottomBorder": "Bottom Border", + "textBringToForeground": "Bring to Foreground", + "textCell": "Cell", + "textCellStyles": "Cell Styles", + "textCenter": "Center", + "textChart": "Chart", + "textChartTitle": "Chart Title", + "textClearFilter": "Clear Filter", + "textColor": "Color", + "textCross": "Cross", + "textCrossesValue": "Crosses Value", + "textCurrency": "Currency", + "textCustomColor": "Custom Color", + "textDataLabels": "Data Labels", + "textDate": "Date", + "textDefault": "Selected range", + "textDeleteFilter": "Delete Filter", + "textDesign": "Design", + "textDiagonalDownBorder": "Diagonal Down Border", + "textDiagonalUpBorder": "Diagonal Up Border", + "textDisplay": "Display", + "textDisplayUnits": "Display Units", + "textDollar": "Dollar", + "textEditLink": "Edit Link", + "textEffects": "Effects", + "textEmptyImgUrl": "You need to specify the image URL.", + "textEmptyItem": "{Blanks}", + "textErrorMsg": "You must choose at least one value", + "textErrorTitle": "Warning", + "textEuro": "Euro", + "textExternalLink": "External Link", + "textFill": "Fill", + "textFillColor": "Fill Color", + "textFilterOptions": "Filter Options", + "textFit": "Fit Width", + "textFonts": "Fonts", + "textFormat": "Format", + "textFraction": "Fraction", + "textFromLibrary": "Picture from Library", + "textFromURL": "Picture from URL", + "textGeneral": "General", + "textGridlines": "Gridlines", + "textHigh": "High", + "textHorizontal": "Horizontal", + "textHorizontalAxis": "Horizontal Axis", + "textHorizontalText": "Horizontal Text", + "textHundredMil": "100 000 000", + "textHundreds": "Hundreds", + "textHundredThousands": "100 000", + "textHyperlink": "Hyperlink", + "textImage": "Image", + "textImageURL": "Image URL", + "textIn": "In", + "textInnerBottom": "Inner Bottom", + "textInnerTop": "Inner Top", + "textInsideBorders": "Inside Borders", + "textInsideHorizontalBorder": "Inside Horizontal Border", + "textInsideVerticalBorder": "Inside Vertical Border", + "textInteger": "Integer", + "textInternalDataRange": "Internal Data Range", + "textInvalidRange": "Invalid cells range", + "textJustified": "Justified", + "textLabelOptions": "Label Options", + "textLabelPosition": "Label Position", + "textLayout": "Layout", + "textLeft": "Left", + "textLeftBorder": "Left Border", + "textLeftOverlay": "Left Overlay", + "textLegend": "Legend", + "textLink": "Link", + "textLinkSettings": "Link Settings", + "textLinkType": "Link Type", + "textLow": "Low", + "textMajor": "Major", + "textMajorAndMinor": "Major And Minor", + "textMajorType": "Major Type", + "textMaximumValue": "Maximum Value", + "textMedium": "Medium", + "textMillions": "Millions", + "textMinimumValue": "Minimum Value", + "textMinor": "Minor", + "textMinorType": "Minor Type", + "textMoveBackward": "Move Backward", + "textMoveForward": "Move Forward", + "textNextToAxis": "Next to Axis", + "textNoBorder": "No Border", + "textNone": "None", + "textNoOverlay": "No Overlay", + "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "textNumber": "Number", + "textOnTickMarks": "On Tick Marks", + "textOpacity": "Opacity", + "textOut": "Out", + "textOuterTop": "Outer Top", + "textOutsideBorders": "Outside Borders", + "textOverlay": "Overlay", + "textPercentage": "Percentage", + "textPictureFromLibrary": "Picture from Library", + "textPictureFromURL": "Picture from URL", + "textPound": "Pound", + "textPt": "pt", + "textRange": "Range", + "textRemoveChart": "Remove Chart", + "textRemoveImage": "Remove Image", + "textRemoveLink": "Remove Link", + "textRemoveShape": "Remove Shape", + "textReorder": "Reorder", + "textReplace": "Replace", + "textReplaceImage": "Replace Image", + "textRequired": "Required", + "textRight": "Right", + "textRightBorder": "Right Border", + "textRightOverlay": "Right Overlay", + "textRotated": "Rotated", + "textRotateTextDown": "Rotate Text Down", + "textRotateTextUp": "Rotate Text Up", + "textRouble": "Rouble", + "textScientific": "Scientific", + "textScreenTip": "Screen Tip", + "textSelectAll": "Select All", + "textSelectObjectToEdit": "Select object to edit", + "textSendToBackground": "Send to Background", + "textSettings": "Settings", + "textShape": "Shape", + "textSheet": "Sheet", + "textSize": "Size", + "textStyle": "Style", + "textTenMillions": "10 000 000", + "textTenThousands": "10 000", + "textText": "Text", + "textTextColor": "Text Color", + "textTextFormat": "Text Format", + "textTextOrientation": "Text Orientation", + "textThick": "Thick", + "textThin": "Thin", + "textThousands": "Thousands", + "textTickOptions": "Tick Options", + "textTime": "Time", + "textTop": "Top", + "textTopBorder": "Top Border", + "textTrillions": "Trillions", + "textType": "Type", + "textValue": "Value", + "textValuesInReverseOrder": "Values in Reverse Order", + "textVertical": "Vertical", + "textVerticalAxis": "Vertical Axis", + "textVerticalText": "Vertical Text", + "textWrapText": "Wrap Text", + "textYen": "Yen", + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "txtSortHigh2Low": "Sort Highest to Lowest", + "txtSortLow2High": "Sort Lowest to Highest" + }, + "Settings": { + "advCSVOptions": "Choose CSV options", + "advDRMEnterPassword": "Your password, please:", + "advDRMOptions": "Protected File", + "advDRMPassword": "Password", + "closeButtonText": "Close File", + "notcriticalErrorTitle": "Warning", + "textAbout": "About", + "textAddress": "Address", + "textApplication": "Application", + "textApplicationSettings": "Application Settings", + "textAuthor": "Author", + "textBack": "Back", + "textBottom": "Bottom", + "textByColumns": "By columns", + "textByRows": "By rows", + "textCancel": "Cancel", + "textCentimeter": "Centimeter", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textCollaboration": "Collaboration", + "textColorSchemes": "Color Schemes", + "textComment": "Comment", + "textCommentingDisplay": "Commenting Display", + "textComments": "Comments", + "textCreated": "Created", + "textCustomSize": "Custom Size", + "textDelimeter": "Delimiter", + "textDisableAll": "Disable All", + "textDisableAllMacrosWithNotification": "Disable all macros with a notification", + "textDisableAllMacrosWithoutNotification": "Disable all macros without a notification", + "textDone": "Done", + "textDownload": "Download", + "textDownloadAs": "Download As", + "textEmail": "Email", + "textEnableAll": "Enable All", + "textEnableAllMacrosWithoutNotification": "Enable all macros without a notification", + "textEncoding": "Encoding", + "textFind": "Find", + "textFindAndReplace": "Find and Replace", + "textFindAndReplaceAll": "Find and Replace All", + "textFormat": "Format", + "textFormulaLanguage": "Formula Language", + "textFormulas": "Formulas", + "textHelp": "Help", + "textHideGridlines": "Hide Gridlines", + "textHideHeadings": "Hide Headings", + "textHighlightRes": "Highlight results", + "textInch": "Inch", + "textLandscape": "Landscape", + "textLastModified": "Last Modified", + "textLastModifiedBy": "Last Modified By", + "textLeft": "Left", + "textLocation": "Location", + "textLookIn": "Look In", + "textMacrosSettings": "Macros Settings", + "textMargins": "Margins", + "textMatchCase": "Match Case", + "textMatchCell": "Match Cell", + "textNoTextFound": "Text not found", + "textOk": "Ok", + "textOpenFile": "Enter a password to open the file", + "textOrientation": "Orientation", + "textOwner": "Owner", + "textPoint": "Point", + "textPortrait": "Portrait", + "textPoweredBy": "Powered By", + "textPrint": "Print", + "textR1C1Style": "R1C1 Reference Style", + "textRegionalSettings": "Regional Settings", + "textReplace": "Replace", + "textReplaceAll": "Replace All", + "textResolvedComments": "Resolved Comments", + "textRight": "Right", + "textSearch": "Search", + "textSearchBy": "Search", + "textSearchIn": "Search In", + "textSettings": "Settings", + "textSheet": "Sheet", + "textShowNotification": "Show Notification", + "textSpreadsheetFormats": "Spreadsheet Formats", + "textSpreadsheetInfo": "Spreadsheet Info", + "textSpreadsheetSettings": "Spreadsheet Settings", + "textSpreadsheetTitle": "Spreadsheet Title", + "textSubject": "Subject", + "textTel": "Tel", + "textTitle": "Title", + "textTop": "Top", + "textUnitOfMeasurement": "Unit Of Measurement", + "textUploaded": "Uploaded", + "textValues": "Values", + "textVersion": "Version", + "textWorkbook": "Workbook", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDelimiter": "Delimiter", + "txtDownloadCsv": "Download CSV", + "txtEncoding": "Encoding", + "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", + "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", + "txtScheme1": "Office", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme2": "Grayscale", + "txtScheme20": "Urban", + "txtScheme21": "Verve", + "txtScheme22": "New Office", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", + "txtSemicolon": "Semicolon", + "txtSpace": "Space", + "txtTab": "Tab", + "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?" + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index 27437f58a..a4812c59a 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -337,7 +337,10 @@ "txtExpandSort": "Los datos al lado del rango seleccionado no serán ordenados. ¿Quiere Usted expandir el rango seleccionado para incluir datos de las celdas adyacentes o continuar la ordenación del rango seleccionado?", "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\"", "txtSorting": "Ordenación", - "txtSortSelected": "Ordenar los objetos seleccionados" + "txtSortSelected": "Ordenar los objetos seleccionados", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Advertencia", @@ -636,7 +639,17 @@ "txtScheme9": "Fundición", "txtSpace": "Espacio", "txtTab": "Pestaña", - "warnDownloadAs": "Si sigue guardando en este formato, todas las características a excepción del texto se perderán.
    ¿Está seguro de que desea continuar?" + "warnDownloadAs": "Si sigue guardando en este formato, todas las características a excepción del texto se perderán.
    ¿Está seguro de que desea continuar?", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index 454515ca7..bfffdc5be 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -329,6 +329,7 @@ "textRange": "Plage", "textRequired": "Requis", "textScreenTip": "Info-bulle", + "textSelectedRange": "Plage sélectionnée", "textShape": "Forme", "textSheet": "Feuille", "textSortAndFilter": "Trier et filtrer", @@ -337,7 +338,9 @@ "txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\"", "txtSorting": "Tri", "txtSortSelected": "Trier l'objet sélectionné ", - "textSelectedRange": "Selected Range" + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Avertissement", @@ -636,7 +639,17 @@ "txtScheme9": "Fonderie", "txtSpace": "Espace", "txtTab": "Tabulation", - "warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.
    Êtes-vous sûr de vouloir continuer?" + "warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.
    Êtes-vous sûr de vouloir continuer?", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } -} +} \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/hu.json +++ b/apps/spreadsheeteditor/mobile/locale/hu.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index d10cc1140..26a7128b0 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -108,7 +108,6 @@ "textAddReply": "Add Reply", "textBack": "Back", "textCancel": "Cancel", - "textOk": "Ok", "textCollaboration": "Collaboration", "textComments": "Comments", "textDeleteComment": "Delete Comment", @@ -121,6 +120,7 @@ "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", "textNoComments": "This document doesn't contain comments", + "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve", "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", @@ -335,9 +335,12 @@ "textSortAndFilter": "Sort and Filter", "txtExpand": "Expand and sort", "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", - "txtSortSelected": "Sort selected" + "txtSortSelected": "Sort selected", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -537,6 +540,9 @@ "textByRows": "By rows", "textCancel": "Cancel", "textCentimeter": "Centimeter", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", "textCollaboration": "Collaboration", "textColorSchemes": "Color Schemes", "textComment": "Comment", @@ -544,6 +550,7 @@ "textComments": "Comments", "textCreated": "Created", "textCustomSize": "Custom Size", + "textDelimeter": "Delimiter", "textDisableAll": "Disable All", "textDisableAllMacrosWithNotification": "Disable all macros with a notification", "textDisableAllMacrosWithoutNotification": "Disable all macros without a notification", @@ -553,6 +560,7 @@ "textEmail": "Email", "textEnableAll": "Enable All", "textEnableAllMacrosWithoutNotification": "Enable all macros without a notification", + "textEncoding": "Encoding", "textFind": "Find", "textFindAndReplace": "Find and Replace", "textFindAndReplaceAll": "Find and Replace All", @@ -608,9 +616,13 @@ "textValues": "Values", "textVersion": "Version", "textWorkbook": "Workbook", + "txtColon": "Colon", + "txtComma": "Comma", "txtDelimiter": "Delimiter", + "txtDownloadCsv": "Download CSV", "txtEncoding": "Encoding", "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", "txtScheme1": "Office", "txtScheme10": "Median", @@ -634,6 +646,7 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", + "txtSemicolon": "Semicolon", "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?" diff --git a/apps/spreadsheeteditor/mobile/locale/ja.json b/apps/spreadsheeteditor/mobile/locale/ja.json index 0522f2303..5c23b7f5b 100644 --- a/apps/spreadsheeteditor/mobile/locale/ja.json +++ b/apps/spreadsheeteditor/mobile/locale/ja.json @@ -17,7 +17,6 @@ "textDone": "完了", "textEdit": "編集", "textBack": "Back", - "textOk": "Ok", "textCollaboration": "Collaboration", "textComments": "Comments", "textDeleteComment": "Delete Comment", @@ -28,6 +27,7 @@ "textMessageDeleteComment": "Do you really want to delete this comment?", "textMessageDeleteReply": "Do you really want to delete this reply?", "textNoComments": "This document doesn't contain comments", + "textOk": "Ok", "textReopen": "Reopen", "textResolve": "Resolve", "textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.", @@ -335,9 +335,12 @@ "textSortAndFilter": "Sort and Filter", "txtExpand": "Expand and sort", "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", - "txtSortSelected": "Sort selected" + "txtSortSelected": "Sort selected", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": " 警告", @@ -549,18 +552,23 @@ "textByColumns": "By columns", "textByRows": "By rows", "textCentimeter": "Centimeter", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", "textCollaboration": "Collaboration", "textColorSchemes": "Color Schemes", "textCommentingDisplay": "Commenting Display", "textComments": "Comments", "textCreated": "Created", "textCustomSize": "Custom Size", + "textDelimeter": "Delimiter", "textDisableAll": "Disable All", "textDisableAllMacrosWithNotification": "Disable all macros with a notification", "textDisableAllMacrosWithoutNotification": "Disable all macros without a notification", "textDownloadAs": "Download As", "textEnableAll": "Enable All", "textEnableAllMacrosWithoutNotification": "Enable all macros without a notification", + "textEncoding": "Encoding", "textFind": "Find", "textFindAndReplace": "Find and Replace", "textFindAndReplaceAll": "Find and Replace All", @@ -608,9 +616,13 @@ "textUploaded": "Uploaded", "textVersion": "Version", "textWorkbook": "Workbook", + "txtColon": "Colon", + "txtComma": "Comma", "txtDelimiter": "Delimiter", + "txtDownloadCsv": "Download CSV", "txtEncoding": "Encoding", "txtIncorrectPwd": "Password is incorrect", + "txtOk": "Ok", "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", "txtScheme1": "Office", "txtScheme10": "Median", @@ -634,6 +646,7 @@ "txtScheme7": "Equity", "txtScheme8": "Flow", "txtScheme9": "Foundry", + "txtSemicolon": "Semicolon", "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?" diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/ko.json +++ b/apps/spreadsheeteditor/mobile/locale/ko.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/lo.json b/apps/spreadsheeteditor/mobile/locale/lo.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/lo.json +++ b/apps/spreadsheeteditor/mobile/locale/lo.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/lv.json +++ b/apps/spreadsheeteditor/mobile/locale/lv.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/nb.json b/apps/spreadsheeteditor/mobile/locale/nb.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/nb.json +++ b/apps/spreadsheeteditor/mobile/locale/nb.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json index 71157306e..c450b5aa1 100644 --- a/apps/spreadsheeteditor/mobile/locale/nl.json +++ b/apps/spreadsheeteditor/mobile/locale/nl.json @@ -337,7 +337,10 @@ "txtNotUrl": "Dit veld moet een URL bevatten in de notatie \"http://www.internet.nl\"", "txtSorting": "Sorteren", "txtSortSelected": "Geselecteerde sorteren", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Waarschuwing", @@ -636,7 +639,17 @@ "txtSpace": "Spatie", "txtTab": "Tab", "warnDownloadAs": "Als u doorgaat met opslaan in dit formaat, gaat alle opmaak verloren en blijft alleen de tekst behouden.
    Wilt u doorgaan?", - "textOk": "Ok" + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "textOk": "Ok", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/pl.json +++ b/apps/spreadsheeteditor/mobile/locale/pl.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/pt.json b/apps/spreadsheeteditor/mobile/locale/pt.json index 1f621e07c..3105cb28b 100644 --- a/apps/spreadsheeteditor/mobile/locale/pt.json +++ b/apps/spreadsheeteditor/mobile/locale/pt.json @@ -337,7 +337,10 @@ "txtNotUrl": "Este campo deve ser uma URL no formato \"http://www.example.com\"", "txtSorting": "Classificação", "txtSortSelected": "Classificar selecionado", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Aviso", @@ -636,7 +639,17 @@ "txtSpace": "Espaço", "txtTab": "Aba", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "textOk": "Ok", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/ro.json b/apps/spreadsheeteditor/mobile/locale/ro.json index 5da47baa2..5615ef93c 100644 --- a/apps/spreadsheeteditor/mobile/locale/ro.json +++ b/apps/spreadsheeteditor/mobile/locale/ro.json @@ -337,7 +337,10 @@ "txtExpandSort": "Datele lângă selecție vor fi sortate. Doriți să extindeți selecția pentru a include datele adiacente sau doriți să continuați cu selecția curentă?", "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\"", "txtSorting": "Sortare", - "txtSortSelected": "Sortarea selecției" + "txtSortSelected": "Sortarea selecției", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Avertisment", @@ -636,7 +639,17 @@ "txtScheme9": "Forjă", "txtSpace": "Spațiu", "txtTab": "Fila", - "warnDownloadAs": "Dacă salvați în acest format de fișier, este posibil ca unele dintre caracteristici să se piardă, cu excepția textului.
    Sunteți sigur că doriți să continuați?" + "warnDownloadAs": "Dacă salvați în acest format de fișier, este posibil ca unele dintre caracteristici să se piardă, cu excepția textului.
    Sunteți sigur că doriți să continuați?", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 04d1a1637..4b0bb25f9 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "Вы действительно хотите удалить этот комментарий?", "textMessageDeleteReply": "Вы действительно хотите удалить этот ответ?", "textNoComments": "Этот документ не содержит комментариев", + "textOk": "Ok", "textReopen": "Переоткрыть", "textResolve": "Решить", "textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.", - "textUsers": "Пользователи", - "textOk": "Ok" + "textUsers": "Пользователи" }, "ThemeColorPalette": { "textCustomColors": "Пользовательские цвета", @@ -335,9 +335,12 @@ "textSortAndFilter": "Сортировка и фильтрация", "txtExpand": "Расширить и сортировать", "txtExpandSort": "Данные рядом с выделенным диапазоном не будут отсортированы. Вы хотите расширить выделенный диапазон, чтобы включить данные из смежных ячеек, или продолжить сортировку только выделенного диапазона?", + "txtLockSort": "Обнаружены данные рядом с выделенным диапазоном, но у вас недостаточно прав для изменения этих ячеек.
    Вы хотите продолжить работу с выделенным диапазоном?", + "txtNo": "Нет", "txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", "txtSorting": "Сортировка", - "txtSortSelected": "Сортировать выделенное" + "txtSortSelected": "Сортировать выделенное", + "txtYes": "Да" }, "Edit": { "notcriticalErrorTitle": "Внимание", @@ -537,6 +540,9 @@ "textByRows": "По строкам", "textCancel": "Отмена", "textCentimeter": "Сантиметр", + "textChooseCsvOptions": "Выбрать параметры CSV", + "textChooseDelimeter": "Выбрать разделитель", + "textChooseEncoding": "Выбрать кодировку", "textCollaboration": "Совместная работа", "textColorSchemes": "Цветовые схемы", "textComment": "Комментарий", @@ -544,6 +550,7 @@ "textComments": "Комментарии", "textCreated": "Создана", "textCustomSize": "Особый размер", + "textDelimeter": "Разделитель", "textDisableAll": "Отключить все", "textDisableAllMacrosWithNotification": "Отключить все макросы с уведомлением", "textDisableAllMacrosWithoutNotification": "Отключить все макросы без уведомления", @@ -553,6 +560,7 @@ "textEmail": "Еmail", "textEnableAll": "Включить все", "textEnableAllMacrosWithoutNotification": "Включить все макросы без уведомления", + "textEncoding": "Кодировка", "textFind": "Поиск", "textFindAndReplace": "Поиск и замена", "textFindAndReplaceAll": "Найти и заменить все", @@ -608,9 +616,13 @@ "textValues": "Значения", "textVersion": "Версия", "textWorkbook": "В книге", + "txtColon": "Двоеточие", + "txtComma": "Запятая", "txtDelimiter": "Разделитель", + "txtDownloadCsv": "Скачать CSV", "txtEncoding": "Кодировка", "txtIncorrectPwd": "Неверный пароль", + "txtOk": "Ok", "txtProtected": "Как только вы введете пароль и откроете файл, текущий пароль к файлу будет сброшен", "txtScheme1": "Стандартная", "txtScheme10": "Обычная", @@ -634,6 +646,7 @@ "txtScheme7": "Справедливость", "txtScheme8": "Поток", "txtScheme9": "Литейная", + "txtSemicolon": "Точка с запятой", "txtSpace": "Пробел", "txtTab": "Табуляция", "warnDownloadAs": "Если вы продолжите сохранение в этот формат, весь функционал, кроме текста, будет потерян.
    Вы действительно хотите продолжить?" diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/sk.json +++ b/apps/spreadsheeteditor/mobile/locale/sk.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/sl.json b/apps/spreadsheeteditor/mobile/locale/sl.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/sl.json +++ b/apps/spreadsheeteditor/mobile/locale/sl.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/tr.json +++ b/apps/spreadsheeteditor/mobile/locale/tr.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/uk.json +++ b/apps/spreadsheeteditor/mobile/locale/uk.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json index b86cade17..a970c0cc2 100644 --- a/apps/spreadsheeteditor/mobile/locale/vi.json +++ b/apps/spreadsheeteditor/mobile/locale/vi.json @@ -337,7 +337,10 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "textSelectedRange": "Selected Range" + "textSelectedRange": "Selected Range", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -636,7 +639,17 @@ "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "textOk": "Ok" + "textOk": "Ok", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json index f0b05a183..51b265cbc 100644 --- a/apps/spreadsheeteditor/mobile/locale/zh.json +++ b/apps/spreadsheeteditor/mobile/locale/zh.json @@ -336,8 +336,11 @@ "textSelectedRange": "Selected Range", "txtExpand": "Expand and sort", "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", + "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", + "txtNo": "No", "txtSorting": "Sorting", - "txtSortSelected": "Sort selected" + "txtSortSelected": "Sort selected", + "txtYes": "Yes" }, "Edit": { "notcriticalErrorTitle": "警告", @@ -614,7 +617,16 @@ "txtSpace": "空格", "txtTab": "标签", "warnDownloadAs": "如果您继续以此格式保存，除文本之外的所有功能将丢失。
    您确定要继续吗？", + "textChooseCsvOptions": "Choose CSV Options", + "textChooseDelimeter": "Choose Delimeter", + "textChooseEncoding": "Choose Encoding", + "textDelimeter": "Delimiter", + "textEncoding": "Encoding", "textOk": "Ok", + "txtColon": "Colon", + "txtComma": "Comma", + "txtDownloadCsv": "Download CSV", + "txtOk": "Ok", "txtScheme1": "Office", "txtScheme10": "Median", "txtScheme11": "Metro", @@ -636,7 +648,8 @@ "txtScheme6": "Concourse", "txtScheme7": "Equity", "txtScheme8": "Flow", - "txtScheme9": "Foundry" + "txtScheme9": "Foundry", + "txtSemicolon": "Semicolon" } } } \ No newline at end of file From 232b75bcf4d31286e5b1e864e4b069f0215258c6 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 27 Aug 2021 20:12:41 +0300 Subject: [PATCH 047/129] Fix address --- .../main/resources/img/controls/warnings2.svg | 28 ------------------- .../main/resources/less/opendialog.less | 3 +- apps/common/main/resources/less/window.less | 12 +++----- 3 files changed, 5 insertions(+), 38 deletions(-) delete mode 100644 apps/common/main/resources/img/controls/warnings2.svg diff --git a/apps/common/main/resources/img/controls/warnings2.svg b/apps/common/main/resources/img/controls/warnings2.svg deleted file mode 100644 index 0451e7eea..000000000 --- a/apps/common/main/resources/img/controls/warnings2.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 12e9ec683..420ed6401 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -83,8 +83,7 @@ height: 40px; &.warn { - background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; - //background-position: @alerts-offset-x @alerts-offset-y - 105px; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; } } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index df3ee3075..c6225f98c 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -172,8 +172,7 @@ .icon { &.warn { - background: url('../../../../common/main/resources/img/controls/warnings.svg#attention') no-repeat center; - //background-position: @alerts-offset-x @alerts-offset-y - 105px; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; } &.error, &.info, &.confirm, &.warn { @@ -182,18 +181,15 @@ } &.error { - background: url('../../../../common/main/resources/img/controls/warnings.svg#warning') no-repeat center; - //background-position: @alerts-offset-x @alerts-offset-y - 0; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#warning')" no-repeat center; } &.info { - background: url('../../../../common/main/resources/img/controls/warnings.svg#info') no-repeat center; - //background-position: @alerts-offset-x @alerts-offset-y - 35px; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#info')" no-repeat center; } &.confirm { - background: url('../../../../common/main/resources/img/controls/warnings.svg#done') no-repeat center; - //background-position: @alerts-offset-x @alerts-offset-y - 70px; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#done')" no-repeat center; } } From 34a787f85c18dedf7273637b69de01b854520fa8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 30 Aug 2021 01:04:46 +0300 Subject: [PATCH 048/129] Temp fix --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d1b87484a..336453b02 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2608,7 +2608,7 @@ define([ value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value); - me.api.asc_setAutoCorrectHyperlinks(value); + // me.api.asc_setAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 893d26a39..8bc4b8e07 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2230,7 +2230,7 @@ define([ value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value); - me.api.asc_setAutoCorrectHyperlinks(value); + // me.api.asc_setAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { From 423e6ed83de5c3e29b59156537fddcf03a4e0916 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Mon, 30 Aug 2021 16:53:27 +0300 Subject: [PATCH 049/129] refactoring --- apps/common/main/resources/less/opendialog.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 420ed6401..13b2ac71e 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -77,14 +77,12 @@ } } - .icon { + .icon.warn { float: left; width: 40px; height: 40px; + background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; - &.warn { - background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; - } } } } From 49011b72c34268b69f89be3618b619fefdf1fb24 Mon Sep 17 00:00:00 2001 From: AlexeyMatveev686 Date: Mon, 30 Aug 2021 17:59:46 +0300 Subject: [PATCH 050/129] Use plugin.deserialize and variatuin.deserialize --- apps/common/main/lib/controller/Plugins.js | 25 ++-------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 5b63032bd..1c30e57d6 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -203,34 +203,13 @@ define([ arr = []; storePlugins.each(function(item){ var plugin = new Asc.CPlugin(); - plugin.set_Name(item.get('name')); - plugin.set_Guid(item.get('guid')); - plugin.set_BaseUrl(item.get('baseUrl')); - plugin.set_MinVersion && plugin.set_MinVersion(item.get('minVersion')); + plugin.deserialize(item.attributes); var variations = item.get('variations'), variationsArr = []; variations.forEach(function(itemVar){ var variation = new Asc.CPluginVariation(); - variation.set_Description(itemVar.get('description')); - variation.set_Url(itemVar.get('url')); - variation.set_Icons(itemVar.get('icons')); - variation.set_Visual(itemVar.get('isVisual')); - variation.set_CustomWindow(itemVar.get('isCustomWindow')); - variation.set_System(itemVar.get('isSystem')); - variation.set_Viewer(itemVar.get('isViewer')); - variation.set_EditorsSupport(itemVar.get('EditorsSupport')); - variation.set_Modal(itemVar.get('isModal')); - variation.set_InsideMode(itemVar.get('isInsideMode')); - variation.set_InitDataType(itemVar.get('initDataType')); - variation.set_InitData(itemVar.get('initData')); - variation.set_UpdateOleOnResize(itemVar.get('isUpdateOleOnResize')); - variation.set_Buttons(itemVar.get('buttons')); - variation.set_Size(itemVar.get('size')); - variation.set_InitOnSelectionChanged(itemVar.get('initOnSelectionChanged')); - variation.set_Events(itemVar.get('events')); - variation.set_Help(itemVar.get('help')); - + variation.deserialize(itemVar.attributes); variationsArr.push(variation); }); From c12e2d1525b1095e31e93116d45ce38cc83ee29b Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 30 Aug 2021 18:29:44 +0300 Subject: [PATCH 051/129] [DE PE mobile] Fix Bug 51538 --- apps/common/mobile/lib/controller/ContextMenu.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index 8ddc3a61e..73af1007a 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -104,7 +104,7 @@ class ContextMenuController extends Component { } onApiOpenContextMenu(x, y) { - if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup').length < 1) { + if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup, .actions-modal.modal-in').length < 1) { this.setState({ items: this.initMenuItems(), extraItems: this.initExtraItems() From 4163904940d2b448c5e0c5822ec60e36cec47799 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 30 Aug 2021 18:45:52 +0300 Subject: [PATCH 052/129] [SSE] Adding user name highlighting --- .../mobile/lib/controller/ContextMenu.jsx | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index 8ddc3a61e..e7306d1ac 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -19,6 +19,7 @@ class ContextMenuController extends Component { }; this.fastCoAuthTips = []; + this.isOpenWindowUser = true; this.onMenuItemClick = this.onMenuItemClick.bind(this); this.onMenuClosed = this.onMenuClosed.bind(this); this.onActionClosed = this.onActionClosed.bind(this); @@ -27,6 +28,7 @@ class ContextMenuController extends Component { this.onApiHideContextMenu = this.onApiHideContextMenu.bind(this); this.onApiShowForeignCursorLabel = this.onApiShowForeignCursorLabel.bind(this); this.onApiHideForeignCursorLabel = this.onApiHideForeignCursorLabel.bind(this); + this.onApiMouseMove = this.onApiMouseMove.bind(this); } onDocumentReady() { @@ -44,6 +46,7 @@ class ContextMenuController extends Component { api.asc_registerCallback('asc_onHidePopMenu', this.onApiHideContextMenu); api.asc_registerCallback('asc_onShowForeignCursorLabel', this.onApiShowForeignCursorLabel); api.asc_registerCallback('asc_onHideForeignCursorLabel', this.onApiHideForeignCursorLabel); + api.asc_registerCallback('asc_onMouseMove', this.onApiMouseMove); } offsetPopoverTop(popover) { @@ -202,6 +205,52 @@ class ContextMenuController extends Component { /** coauthoring end **/ } + onApiMouseMove(dataarray) { + if ( dataarray[0].asc_getType() === Asc.c_oAscMouseMoveType.LockedObject && this.isOpenWindowUser ) { + const tipHeight = 20; + this.isOpenWindowUser = false; + let XY = [$$("#editor_sdk").offset().left - $(window).scrollLeft(), + $$("#editor_sdk").offset().top - $(window).scrollTop()], + data = dataarray[0], + X = data.asc_getX(), + Y = data.asc_getY(), + src = $$(`
    `); + + src.css({ + height : tipHeight + 'px', + position : 'absolute', + zIndex : '5000', + visibility : 'visible', + }); + + src.text(this.getUserName(data.asc_getUserId())); + src.addClass('active'); + $$(document.body).append(src); + + let showPoint = [ ($$(window).width() - (X + XY[0])), Y + XY[1] ]; + + if ( $$(window).width() - showPoint[0] < src.outerWidth() ) { + src.css({ + backgroundColor: '#ee3525', + left: '0px', + top: (showPoint[1] - tipHeight) + 'px', + }); + } else { + src.css({ + backgroundColor: '#ee3525', + right: showPoint[0] + 'px', + top: showPoint[1] - 1 + 'px', + }); + } + + setTimeout(() => { + this.isOpenWindowUser = true; + $$('.username-tip').remove(); + }, 1500); + + } + } + componentWillUnmount() { Common.Notifications.off('document:ready', this.onDocumentReady); @@ -210,6 +259,7 @@ class ContextMenuController extends Component { api.asc_unregisterCallback('asc_onHidePopMenu', this.onApiHideContextMenu); api.asc_unregisterCallback('asc_onShowForeignCursorLabel', this.onApiShowForeignCursorLabel); api.asc_unregisterCallback('asc_onHideForeignCursorLabel', this.onApiHideForeignCursorLabel); + api.asc_unregisterCallback('asc_onMouseMove', this.onApiMouseMove); } componentDidMount() { From 3fbb7e770339773fff6068c86992f1f4ec22f445 Mon Sep 17 00:00:00 2001 From: AlexeyMatveev686 Date: Mon, 30 Aug 2021 21:32:12 +0300 Subject: [PATCH 053/129] replaced tabs with spaces --- apps/common/main/lib/controller/Plugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 1c30e57d6..1513fc2cd 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -203,13 +203,13 @@ define([ arr = []; storePlugins.each(function(item){ var plugin = new Asc.CPlugin(); - plugin.deserialize(item.attributes); + plugin.deserialize(item.attributes); var variations = item.get('variations'), variationsArr = []; variations.forEach(function(itemVar){ var variation = new Asc.CPluginVariation(); - variation.deserialize(itemVar.attributes); + variation.deserialize(itemVar.attributes); variationsArr.push(variation); }); From 7523a0078f237e841cd560d69377318f48c95dc9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 30 Aug 2021 23:12:11 +0300 Subject: [PATCH 054/129] Fix Bug 49127 --- .../main/app/controller/RightMenu.js | 10 ++++---- .../main/app/view/SignatureSettings.js | 2 +- .../main/app/controller/RightMenu.js | 10 ++++---- .../main/app/view/SignatureSettings.js | 2 +- .../main/app/controller/RightMenu.js | 24 +++++++++---------- .../main/app/view/SignatureSettings.js | 2 +- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index 01f508e3e..1885894af 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -131,8 +131,8 @@ define([ this.rightmenu.fireEvent('editcomplete', this.rightmenu); }, - onFocusObject: function(SelectedObjects) { - if (!this.editMode) + onFocusObject: function(SelectedObjects, forceSignature) { + if (!this.editMode && !forceSignature) return; var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false; @@ -269,6 +269,7 @@ define([ if (priorityactive>-1) active = priorityactive; else if (lastactive>=0 && currentactive<0) active = lastactive; else if (currentactive>=0) active = currentactive; + else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature; else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge; if (active == undefined && open && lastactive>=0) @@ -423,8 +424,9 @@ define([ } this.rightmenu.chartSettings.disableControls(disabled); - if (!allowSignature && this.rightmenu.signatureSettings) { - this.rightmenu.btnSignature.setDisabled(disabled); + if (this.rightmenu.signatureSettings) { + !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled); + allowSignature && disabled && this.onFocusObject([], true); // force press signature button } if (disabled) { diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index c489c8e13..8b087ba4e 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -400,7 +400,7 @@ define([ allowMerge: false, allowSignature: true, allowProtect: true, - rightMenu: {clear: disable && (DE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, + rightMenu: {clear: false, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: false, diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js index c6f83d14a..8d6791d91 100644 --- a/apps/presentationeditor/main/app/controller/RightMenu.js +++ b/apps/presentationeditor/main/app/controller/RightMenu.js @@ -106,8 +106,8 @@ define([ this.rightmenu.fireEvent('editcomplete', this.rightmenu); }, - onFocusObject: function(SelectedObjects) { - if (!this.editMode) + onFocusObject: function(SelectedObjects, forceSignature) { + if (!this.editMode && !forceSignature) return; var open = this._initSettings ? !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false; @@ -194,6 +194,7 @@ define([ if (priorityactive>-1) active = priorityactive; else if (currentactive>=0) active = currentactive; else if (lastactive>=0) active = lastactive; + else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature; else active = Common.Utils.documentSettingsType.Slide; if (active !== undefined) { @@ -226,8 +227,9 @@ define([ this.rightmenu.imageSettings.disableControls(disabled); this.rightmenu.chartSettings.disableControls(disabled); - if (!allowSignature && this.rightmenu.signatureSettings) { - this.rightmenu.btnSignature.setDisabled(disabled); + if (this.rightmenu.signatureSettings) { + !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled); + allowSignature && disabled && this.onFocusObject([], true); // force press signature button } if (disabled) { diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js index c92af3468..2360de436 100644 --- a/apps/presentationeditor/main/app/view/SignatureSettings.js +++ b/apps/presentationeditor/main/app/view/SignatureSettings.js @@ -350,7 +350,7 @@ define([ Common.NotificationCenter.trigger('editing:disable', disable, { viewMode: disable, allowSignature: true, - rightMenu: {clear: disable && (PE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, + rightMenu: {clear: false, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: false, diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index be2acfa89..00bcf8923 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -168,14 +168,14 @@ define([ this.onFocusObject(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo); }, - onFocusObject: function(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo) { - if (!this.editMode) + onFocusObject: function(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo, forceSignature) { + if (!this.editMode && !forceSignature) return; - var isCellLocked = cellInfo.asc_getLocked() || this._state.wsProps['FormatCells'], - isTableLocked = (cellInfo.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter) || this._state.wsProps['FormatCells'], - isSparkLocked = (cellInfo.asc_getLockedSparkline()===true) || this._state.wsLock, - isPivotLocked = (cellInfo.asc_getLockedPivotTable()===true) || this._state.wsProps['PivotTables']; + var isCellLocked = cellInfo && cellInfo.asc_getLocked() || this._state.wsProps['FormatCells'], + isTableLocked = (cellInfo && cellInfo.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter) || this._state.wsProps['FormatCells'], + isSparkLocked = (cellInfo && cellInfo.asc_getLockedSparkline()===true) || this._state.wsLock, + isPivotLocked = (cellInfo && cellInfo.asc_getLockedPivotTable()===true) || this._state.wsProps['PivotTables']; for (var i=0; i-1) active = priorityactive; else if (lastactive>=0 && currentactive<0) active = lastactive; else if (currentactive>=0) active = currentactive; + else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature; if (active == undefined && this._openRightMenu && lastactive>=0) active = lastactive; @@ -425,12 +426,9 @@ define([ this.rightmenu.cellSettings.disableControls(disabled); this.rightmenu.slicerSettings.disableControls(disabled); - if (!allowSignature && this.rightmenu.signatureSettings) { - this.rightmenu.btnSignature.setDisabled(disabled); - } - - if (!allowSignature && this.rightmenu.signatureSettings) { - this.rightmenu.btnSignature.setDisabled(disabled); + if (this.rightmenu.signatureSettings) { + !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled); + allowSignature && disabled && this.onFocusObject([], undefined, undefined, undefined, undefined, true); // force press signature button } if (disabled) { diff --git a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js index 53836c5ac..e80268fee 100644 --- a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js @@ -397,7 +397,7 @@ define([ viewMode: disable, allowSignature: true, allowProtect: true, - rightMenu: {clear: disable && (SSE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, + rightMenu: {clear: false, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: false, From 05571638edbfad6a883647de63e72415a3e89a29 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 30 Aug 2021 23:13:40 +0300 Subject: [PATCH 055/129] [SSE] Fix protection --- apps/spreadsheeteditor/main/app/controller/WBProtection.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/WBProtection.js b/apps/spreadsheeteditor/main/app/controller/WBProtection.js index 53ae60bd0..9590cbc02 100644 --- a/apps/spreadsheeteditor/main/app/controller/WBProtection.js +++ b/apps/spreadsheeteditor/main/app/controller/WBProtection.js @@ -76,7 +76,6 @@ define([ }); Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this)); - Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('protect:sheet', _.bind(this.onSheetClick, this)); }, setConfig: function (data, api) { @@ -93,7 +92,6 @@ define([ this.api.asc_registerCallback('asc_onChangeProtectWorksheet',_.bind(this.onChangeProtectSheet, this)); this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onActiveSheetChanged, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChanged, this)); - this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); } }, @@ -352,10 +350,6 @@ define([ } } } - }, - - onCoAuthoringDisconnect: function() { - this.SetDisabled(true); } }, SSE.Controllers.WBProtection || {})); From c997bc62c804cba3569e4b3b7605d5ee4d6659e1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 30 Aug 2021 23:44:46 +0300 Subject: [PATCH 056/129] [Mobile] Use plugin.deserialize --- apps/common/mobile/lib/controller/Plugins.jsx | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/apps/common/mobile/lib/controller/Plugins.jsx b/apps/common/mobile/lib/controller/Plugins.jsx index 5ec997299..8c7d5394f 100644 --- a/apps/common/mobile/lib/controller/Plugins.jsx +++ b/apps/common/mobile/lib/controller/Plugins.jsx @@ -214,40 +214,7 @@ const PluginsController = inject('storeAppOptions')(observer(props => { plugins.forEach(item => { let plugin = new Asc.CPlugin(); - - plugin.set_Name(item['name']); - plugin.set_Guid(item['guid']); - plugin.set_BaseUrl(item['baseUrl']); - plugin.set_MinVersion && plugin.set_MinVersion(item['minVersion']); - - let variations = item['variations'], - variationsArr = []; - - variations.forEach(itemVar => { - let variation = new Asc.CPluginVariation(); - - variation.set_Description(itemVar['description']); - variation.set_Url(itemVar['url']); - variation.set_Icons(itemVar['icons']); - variation.set_Visual(itemVar['isVisual']); - variation.set_CustomWindow(itemVar['isCustomWindow']); - variation.set_System(itemVar['isSystem']); - variation.set_Viewer(itemVar['isViewer']); - variation.set_EditorsSupport(itemVar['EditorsSupport']); - variation.set_Modal(itemVar['isModal']); - variation.set_InsideMode(itemVar['isInsideMode']); - variation.set_InitDataType(itemVar['initDataType']); - variation.set_InitData(itemVar['initData']); - variation.set_UpdateOleOnResize(itemVar['isUpdateOleOnResize']); - variation.set_Buttons(itemVar['buttons']); - variation.set_Size(itemVar['size']); - variation.set_InitOnSelectionChanged(itemVar['initOnSelectionChanged']); - variation.set_Events(itemVar['events']); - - variationsArr.push(variation); - }); - - plugin["set_Variations"](variationsArr); + plugin.deserialize(item); arr.push(plugin); }); From 3d8f6167ed25239475041b904c930d79b42427fc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Aug 2021 00:12:45 +0300 Subject: [PATCH 057/129] Deprecate url parameter of the insertImage method --- apps/documenteditor/main/app/controller/Toolbar.js | 2 ++ apps/presentationeditor/main/app/controller/Toolbar.js | 2 ++ apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 ++ 3 files changed, 6 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index e3b20bdfd..8b7114bd4 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1627,6 +1627,8 @@ define([ insertImage: function(data) { // gateway if (data && (data.url || data.images)) { + data.url && console.log("Obsolete: The 'url' parameter of the 'insertImage' method is deprecated. Please use 'images' parameter instead."); + var arr = []; if (data.images && data.images.length>0) { for (var i=0; i0) { for (var i=0; i0) { for (var i=0; i Date: Mon, 30 Aug 2021 23:48:37 +0300 Subject: [PATCH 058/129] Update Gruntfile.js --- build/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index c386b41b2..9eb081ebb 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -537,7 +537,7 @@ module.exports = function(grunt) { options: { cwd: '../vendor/framework7-react', }, - cmd: 'npm i --include=dev', + cmd: 'npm i --include=dev --production=false', }, } }); From 79270471bd197758345085c4e2992ac841b44a38 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Aug 2021 15:11:16 +0300 Subject: [PATCH 059/129] Revert "[DE] Show full version of viewer for fill form mode" This reverts commit 190f614f71f6c0bca84985454522ddf4a5161747. --- apps/api/documents/api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8876075ac..c0a598c21 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -873,7 +873,8 @@ path += app + "/"; path += (config.type === "mobile" || isSafari_mobile) ? "mobile" - : (config.type === "embedded") + : (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && + (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view')) ? "embed" : "main"; From a160b89abaff6252b8ef659335cad9c3ebd8124e Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 31 Aug 2021 16:01:44 +0300 Subject: [PATCH 060/129] [SSE mobile] Fix Bug 52277 --- .../mobile/src/controller/Statusbar.jsx | 6 +++--- apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx index d0f131594..c2d4bbab9 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -23,10 +23,10 @@ const StatusbarController = inject('sheets', 'storeFocusObjects', 'users')(obser api.asc_registerCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); api.asc_registerCallback('asc_onHidePopMenu', onApiHideTabContextMenu); api.asc_registerCallback('asc_onUpdateTabColor', onApiUpdateTabColor); - // api.asc_registerCallback('asc_onCoAuthoringDisconnect', onApiDisconnect); + api.asc_registerCallback('asc_onCoAuthoringDisconnect', onApiDisconnect); }); Common.Notifications.on('document:ready', onApiSheetsChanged); - // Common.Notifications.on('api:disconnect', onApiDisconnect); + Common.Notifications.on('api:disconnect', onApiDisconnect); }); const onApiDisconnect = () => { @@ -180,7 +180,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(observer(props => if (index == api.asc_getActiveWorksheetIndex()) { if (!opened) { - if (isEdit && !sheets.isWorkbookLocked) { + if (isEdit && !isDisconnected) { api.asc_closeCellEditor(); f7.popover.open('#idx-tab-context-menu-popover', target); } diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx index 0b566123f..6ae773384 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx @@ -8,22 +8,23 @@ const viewStyle = { height: 30 }; -const StatusbarView = inject('storeAppOptions', 'sheets')(observer(props => { +const StatusbarView = inject('storeAppOptions', 'sheets', 'users')(observer(props => { const { t } = useTranslation(); const _t = t('Statusbar', {returnObjects: true}); const isAndroid = Device.android; const isPhone = Device.isPhone; - const {sheets, storeAppOptions} = props; + const {sheets, storeAppOptions, users} = props; const allSheets = sheets.sheets; const hiddenSheets = sheets.hiddenWorksheets(); - const isWorkbookLocked = sheets.isWorkbookLocked; + // const isWorkbookLocked = sheets.isWorkbookLocked; const isEdit = storeAppOptions.isEdit; + const isDisconnected = users.isDisconnected; return ( -
    - +
    +
    From cb7bd14600858d081135a8e607b1a27d1d7b2957 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Aug 2021 16:12:30 +0300 Subject: [PATCH 061/129] Add parameters to docinfo --- apps/documenteditor/embed/js/ApplicationController.js | 2 ++ .../forms/app/controller/ApplicationController.js | 4 +++- apps/documenteditor/main/app/controller/Main.js | 2 ++ apps/documenteditor/mobile/src/controller/Main.jsx | 4 +++- apps/presentationeditor/embed/js/ApplicationController.js | 2 ++ apps/presentationeditor/main/app/controller/Main.js | 4 +++- apps/presentationeditor/mobile/src/controller/Main.jsx | 2 ++ apps/spreadsheeteditor/embed/js/ApplicationController.js | 2 ++ apps/spreadsheeteditor/main/app/controller/Main.js | 2 ++ apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 2 ++ 10 files changed, 23 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index da52b2010..9b4a1bf81 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -124,6 +124,8 @@ DE.ApplicationController = new(function(){ docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); + docInfo.put_Lang(config.lang); + docInfo.put_Mode(config.mode); var enable = !config.customization || (config.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 672795458..2a8a1d8dd 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -370,7 +370,9 @@ define([ docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); - + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); + var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 336453b02..7203a5038 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -458,6 +458,8 @@ define([ docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index b5e5c902a..b39ad5f69 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -127,7 +127,9 @@ class MainController extends Component { docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); - + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); + let enable = !this.editorConfig.customization || (this.editorConfig.customization.macros !== false); docInfo.asc_putIsEnabledMacroses(!!enable); enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins !== false); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 8b5f0c351..88dfea366 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -119,6 +119,8 @@ PE.ApplicationController = new(function(){ docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); + docInfo.put_Lang(config.lang); + docInfo.put_Mode(config.mode); var enable = !config.customization || (config.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 8bc4b8e07..6935889a7 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -416,7 +416,9 @@ define([ docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); - + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); + var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); enable = !this.editorConfig.customization || (this.editorConfig.customization.plugins!==false); diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index f3a6221fc..5984a6681 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -121,6 +121,8 @@ class MainController extends Component { docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); let enable = !this.editorConfig.customization || (this.editorConfig.customization.macros !== false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 91b9968b2..a4ea1c58e 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -121,6 +121,8 @@ SSE.ApplicationController = new(function(){ docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); + docInfo.put_Lang(config.lang); + docInfo.put_Mode(config.mode); var enable = !config.customization || (config.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 65ca8591c..0afb4add5 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -486,6 +486,8 @@ define([ docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); docInfo.asc_putIsEnabledMacroses(!!enable); diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 545629359..44adf3d14 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -161,6 +161,8 @@ class MainController extends Component { docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); + docInfo.put_Lang(this.editorConfig.lang); + docInfo.put_Mode(this.editorConfig.mode); const appOptions = this.props.storeAppOptions; let enable = !appOptions.customization || (appOptions.customization.macros !== false); From 82b75a25b9a2cb043d6bb6e64fbcda97720d4f5e Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 31 Aug 2021 16:16:33 +0300 Subject: [PATCH 062/129] [SSE mobile] Fix Bug 52266 --- apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index 66e0d6e43..cb377eec2 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -816,7 +816,7 @@ const PageVerticalAxis = props => { props.onVerAxisMinValue(e.target.value)} onInput={e => setMinValue(e.target.value)} @@ -826,7 +826,7 @@ const PageVerticalAxis = props => { props.onVerAxisMaxValue(e.target.value)} onInput={e => setMaxValue(e.target.value)} From 6d4ed35b3d56d163db25a282a613adadb81b8f64 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 31 Aug 2021 17:03:39 +0300 Subject: [PATCH 063/129] [SSE] Fix bug 52232 --- apps/common/main/lib/component/TabBar.js | 99 ++----------------- .../main/app/controller/Statusbar.js | 22 ++--- .../main/app/view/Statusbar.js | 23 +---- 3 files changed, 22 insertions(+), 122 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index a1ef6a17f..837d59602 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -121,76 +121,6 @@ define([ me.tabBarRight = me.bounds[length - 1].right; me.tabBarRight = Math.min(me.tabBarRight, barBounds.right - 1); } - }, - - setHookTabs: function (e, bar, tabs) { - var me = this; - function dragComplete() { - if (!_.isUndefined(me.drag)) { - bar.dragging = false; - bar.$el.find('li.mousemove').removeClass('mousemove right'); - var arrSelectIndex = []; - tabs.forEach(function (item) { - arrSelectIndex.push(item.sheetindex); - }); - if (!_.isUndefined(me.drag.place)) { - me.bar.trigger('tab:move', arrSelectIndex, me.drag.place); - me.bar.$bar.scrollLeft(me.scrollLeft); - me.bar.scrollX = undefined; - } else { - me.bar.trigger('tab:move', arrSelectIndex); - me.bar.$bar.scrollLeft(me.scrollLeft); - me.bar.scrollX = undefined; - } - me.bar.checkInvisible(); - - me.drag = undefined; - me.bar.trigger('tab:drop', this); - } - } - function dragMove (event) { - if (!_.isUndefined(me.drag)) { - me.drag.moveX = event.clientX*Common.Utils.zoom(); - if (me.drag.moveX < me.leftBorder) { - me.scrollLeft -= 20; - me.bar.$bar.scrollLeft(me.scrollLeft); - me.calculateBounds(); - } else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) { - var name = $(event.target).parent().data('label'), - currentTab = _.findIndex(bar.tabs, {label: name}); - if (currentTab === -1) { - bar.$el.find('li.mousemove').removeClass('mousemove right'); - me.drag.place = undefined; - } else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) { - me.drag.place = currentTab; - $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right'); - $(event.target).parent().addClass('mousemove'); - } - } else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible - bar.$el.find('li.mousemove').removeClass('mousemove right'); - bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right'); - me.drag.place = bar.tabs.length; - } else if (me.drag.moveX - me.rightBorder > 3) { - me.scrollLeft += 20; - me.bar.$bar.scrollLeft(me.scrollLeft); - me.calculateBounds(); - } - } - } - if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) { - me.bar = bar; - me.drag = {tabs: tabs}; - bar.dragging = true; - this.calculateBounds(); - - $(document).on('mousemove.tabbar', dragMove); - $(document).on('mouseup.tabbar', function (e) { - dragComplete(e); - $(document).off('mouseup.tabbar'); - $(document).off('mousemove.tabbar', dragMove); - }); - this.bar.trigger('tab:drag', this.bar.selectTabs); - } } } }); @@ -277,7 +207,7 @@ define([ tab.$el.find('span').prop('title', ''); }); } - event.dataTransfer.effectAllowed = 'move'; + event.dataTransfer.effectAllowed = 'copyMove'; this.bar.trigger('tab:dragstart', event.dataTransfer, this.bar.selectTabs); }, this), dragenter: $.proxy(function (e) { @@ -285,14 +215,7 @@ define([ if (!this.bar.isEditFormula) { this.bar.$el.find('.mousemove').removeClass('mousemove right'); $(e.currentTarget).parent().addClass('mousemove'); - 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'; - } + event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move'; } else { event.dataTransfer.dropEffect = 'none'; } @@ -305,6 +228,7 @@ define([ if (!this.bar.isEditFormula) { this.bar.$el.find('.mousemove').removeClass('mousemove right'); $(e.currentTarget).parent().addClass('mousemove'); + event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move'; } else { event.dataTransfer.dropEffect = 'none'; } @@ -326,7 +250,7 @@ define([ var event = e.originalEvent, index = $(event.currentTarget).data('index'); this.bar.$el.find('.mousemove').removeClass('mousemove right'); - this.bar.trigger('tab:drop', event.dataTransfer, index); + this.bar.trigger('tab:drop', event.dataTransfer, index, event.ctrlKey || event.metaKey); this.bar.isDrop = true; }, this) }); @@ -365,23 +289,20 @@ define([ var eventname=(/Firefox/i.test(navigator.userAgent))? 'DOMMouseScroll' : 'mousewheel'; addEvent(this.$bar[0], eventname, _.bind(this._onMouseWheel,this)); addEvent(this.$bar[0], 'dragstart', _.bind(function (event) { - event.dataTransfer.effectAllowed = 'move'; + event.dataTransfer.effectAllowed = 'copyMove'; }, this)); addEvent(this.$bar[0], 'dragenter', _.bind(function (event) { - var data; - if (!Common.Utils.isIE) { - data = event.dataTransfer.getData('onlyoffice'); - event.dataTransfer.dropEffect = (!this.isEditFormula && data) ? 'move' : 'none'; + if (!this.isEditFormula) { + event.dataTransfer.dropEffect = event.metaKey || event.ctrlKey ? 'copy' : 'move'; } else { - data = event.dataTransfer.getData('text'); - event.dataTransfer.dropEffect = (data === 'sheet' && !this.isEditFormula) ? 'move' : 'none'; + event.dataTransfer.dropEffect = 'none'; } }, this)); addEvent(this.$bar[0], 'dragover', _.bind(function (event) { if (event.preventDefault) { event.preventDefault(); // Necessary. Allows us to drop. } - event.dataTransfer.dropEffect = !this.isEditFormula ? 'move' : 'none'; + event.dataTransfer.dropEffect = !this.isEditFormula ? (event.metaKey || event.ctrlKey ? 'copy' : 'move') : 'none'; !this.isEditFormula && this.tabs[this.tabs.length - 1].$el.addClass('mousemove right'); return false; }, this)); @@ -392,7 +313,7 @@ define([ addEvent(this.$bar[0], 'drop', _.bind(function (event) { this.$el.find('.mousemove').removeClass('mousemove right'); if (this.isDrop === undefined) { - this.trigger('tab:drop', event.dataTransfer, 'last'); + this.trigger('tab:drop', event.dataTransfer, 'last', event.ctrlKey || event.metaKey); } else { this.isDrop = undefined; } diff --git a/apps/spreadsheeteditor/main/app/controller/Statusbar.js b/apps/spreadsheeteditor/main/app/controller/Statusbar.js index 516d7e9fe..47c5c0e53 100644 --- a/apps/spreadsheeteditor/main/app/controller/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Statusbar.js @@ -459,7 +459,7 @@ define([ } }, - moveWorksheet: function(selectArr, cut, silent, index, destPos) { + moveWorksheet: function(selectArr, cut, silent, indTo) { var me = this; var wc = me.api.asc_getWorksheetsCount(), items = [], arrIndex = [], i = -1; while (++i < wc) { @@ -477,19 +477,17 @@ define([ } }); } + if (!_.isUndefined(silent)) { - if (_.isUndefined(selectArr)) { - me.api.asc_showWorksheet(items[index].inindex); - - Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + this.api.asc_getActiveWorksheetId()]); - - if (!_.isUndefined(destPos)) { - me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex); - } + if (cut) { + me.api.asc_moveWorksheet(indTo, arrIndex); + me.api.asc_enableKeyEvents(true); } else { - if (!_.isUndefined(destPos)) { - me.api.asc_moveWorksheet(items.length === destPos ? wc : items[destPos].inindex, arrIndex); - } + var arrNames = []; + arrIndex.forEach(function (item) { + arrNames.push(me.createCopyName(me.api.asc_getWorksheetName(item), arrNames)); + }); + me.api.asc_copyWorksheet(indTo, arrNames, arrIndex); } return; } diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 3d8d73df2..b9038e94a 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -219,24 +219,6 @@ define([ me.fireEvent('sheet:changename'); } }, this), - 'tab:move' : _.bind(function (selectTabs, index) { - me.tabBarScroll = {scrollLeft: me.tabbar.scrollX}; - if (_.isUndefined(selectTabs) || _.isUndefined(index) || (selectTabs && selectTabs.length === 1 && selectTabs[0] === index)) { - return; - } - if (_.isArray(selectTabs)) { - me.fireEvent('sheet:move', [selectTabs, false, true, undefined, index]); - } else { - var tabIndex = selectTabs; - - if (tabIndex < index) { - ++index; - } - - me.fireEvent('sheet:move', [undefined, false, true, tabIndex, index]); - } - - }, this), 'tab:dragstart': _.bind(function (dataTransfer, selectTabs) { Common.Utils.isIE && (this.isDrop = false); Common.UI.Menu.Manager.hideAll(); @@ -278,7 +260,7 @@ define([ } this.dropTabs = selectTabs; }, this), - 'tab:drop': _.bind(function (dataTransfer, index) { + 'tab:drop': _.bind(function (dataTransfer, index, copy) { 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; @@ -287,8 +269,7 @@ define([ if (arrData) { var key = _.findWhere(arrData, {type: 'key'}).value; if (Common.Utils.InternalSettings.get("sse-doc-info-key") === key) { - this.api.asc_moveWorksheet(_.isNumber(index) ? index : this.api.asc_getWorksheetsCount(), _.findWhere(arrData, {type: 'indexes'}).value); - this.api.asc_enableKeyEvents(true); + this.fireEvent('sheet:move', [_.findWhere(arrData, {type: 'indexes'}).value, !copy, true, _.isNumber(index) ? index : this.api.asc_getWorksheetsCount()]); Common.NotificationCenter.trigger('tabs:dragend', this); } else { var names = [], wc = this.api.asc_getWorksheetsCount(); From 5b937f3802164a744019f3546ae58ecde315bf4f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 31 Aug 2021 17:46:28 +0300 Subject: [PATCH 064/129] [DE mobile] Fix Bug 47403 --- .../controller/settings/DocumentSettings.jsx | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx index 5d6c73652..2769368ce 100644 --- a/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/DocumentSettings.jsx @@ -1,13 +1,16 @@ import React, {Component} from 'react'; import {DocumentSettings} from '../../view/settings/DocumentSettings'; - +import { inject, observer } from 'mobx-react'; +import { withTranslation } from 'react-i18next'; +import { f7 } from 'framework7-react'; class DocumentSettingsController extends Component { constructor (props) { super (props); this.getMargins = this.getMargins.bind(this); this.applyMargins = this.applyMargins.bind(this); + this.onFormatChange = this.onFormatChange.bind(this); } onPageOrientation (value){ @@ -19,24 +22,47 @@ class DocumentSettingsController extends Component { onFormatChange (value) { const api = Common.EditorApi.get(); + const storeDocumentSettings = this.props.storeDocumentSettings; + + this.widthDocument = storeDocumentSettings.widthDocument; + this.heightDocument = storeDocumentSettings.heightDocument; + if (api) { api.change_DocSize(value[0], value[1]); + this.getMargins(); } } getMargins() { const api = Common.EditorApi.get(); + const { t } = this.props; + const _t = t('Settings', {returnObjects: true}); + if (api) { this.localSectionProps = api.asc_GetSectionProps(); if (this.localSectionProps) { this.maxMarginsH = this.localSectionProps.get_H() - 2.6; this.maxMarginsW = this.localSectionProps.get_W() - 12.7; - + const top = this.localSectionProps.get_TopMargin(); const bottom = this.localSectionProps.get_BottomMargin(); const left = this.localSectionProps.get_LeftMargin(); const right = this.localSectionProps.get_RightMargin(); + let errorMsg; + + if(top + bottom > this.maxMarginsH || left + right > this.maxMarginsW) { + if(top + bottom > this.maxMarginsH) { + errorMsg = _t.textMarginsH; + } else { + errorMsg = _t.textMarginsH; + } + + f7.dialog.alert(errorMsg, _t.notcriticalErrorTitle); + api.change_DocSize(this.widthDocument, this.heightDocument); + return; + } + return { top, bottom, @@ -96,4 +122,4 @@ class DocumentSettingsController extends Component { } } -export default DocumentSettingsController; \ No newline at end of file +export default inject("storeDocumentSettings")(observer(withTranslation()(DocumentSettingsController))); \ No newline at end of file From 73e6d1ef6db093ea1728e4f00b4360028a7dbcde Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 31 Aug 2021 17:52:12 +0300 Subject: [PATCH 065/129] [SSE] Editing highlight user name --- .../mobile/lib/controller/ContextMenu.jsx | 50 ----------- .../mobile/src/controller/ContextMenu.jsx | 87 +++++++++++++++++++ .../mobile/src/less/app.less | 4 + 3 files changed, 91 insertions(+), 50 deletions(-) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index e7306d1ac..8ddc3a61e 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -19,7 +19,6 @@ class ContextMenuController extends Component { }; this.fastCoAuthTips = []; - this.isOpenWindowUser = true; this.onMenuItemClick = this.onMenuItemClick.bind(this); this.onMenuClosed = this.onMenuClosed.bind(this); this.onActionClosed = this.onActionClosed.bind(this); @@ -28,7 +27,6 @@ class ContextMenuController extends Component { this.onApiHideContextMenu = this.onApiHideContextMenu.bind(this); this.onApiShowForeignCursorLabel = this.onApiShowForeignCursorLabel.bind(this); this.onApiHideForeignCursorLabel = this.onApiHideForeignCursorLabel.bind(this); - this.onApiMouseMove = this.onApiMouseMove.bind(this); } onDocumentReady() { @@ -46,7 +44,6 @@ class ContextMenuController extends Component { api.asc_registerCallback('asc_onHidePopMenu', this.onApiHideContextMenu); api.asc_registerCallback('asc_onShowForeignCursorLabel', this.onApiShowForeignCursorLabel); api.asc_registerCallback('asc_onHideForeignCursorLabel', this.onApiHideForeignCursorLabel); - api.asc_registerCallback('asc_onMouseMove', this.onApiMouseMove); } offsetPopoverTop(popover) { @@ -205,52 +202,6 @@ class ContextMenuController extends Component { /** coauthoring end **/ } - onApiMouseMove(dataarray) { - if ( dataarray[0].asc_getType() === Asc.c_oAscMouseMoveType.LockedObject && this.isOpenWindowUser ) { - const tipHeight = 20; - this.isOpenWindowUser = false; - let XY = [$$("#editor_sdk").offset().left - $(window).scrollLeft(), - $$("#editor_sdk").offset().top - $(window).scrollTop()], - data = dataarray[0], - X = data.asc_getX(), - Y = data.asc_getY(), - src = $$(`
    `); - - src.css({ - height : tipHeight + 'px', - position : 'absolute', - zIndex : '5000', - visibility : 'visible', - }); - - src.text(this.getUserName(data.asc_getUserId())); - src.addClass('active'); - $$(document.body).append(src); - - let showPoint = [ ($$(window).width() - (X + XY[0])), Y + XY[1] ]; - - if ( $$(window).width() - showPoint[0] < src.outerWidth() ) { - src.css({ - backgroundColor: '#ee3525', - left: '0px', - top: (showPoint[1] - tipHeight) + 'px', - }); - } else { - src.css({ - backgroundColor: '#ee3525', - right: showPoint[0] + 'px', - top: showPoint[1] - 1 + 'px', - }); - } - - setTimeout(() => { - this.isOpenWindowUser = true; - $$('.username-tip').remove(); - }, 1500); - - } - } - componentWillUnmount() { Common.Notifications.off('document:ready', this.onDocumentReady); @@ -259,7 +210,6 @@ class ContextMenuController extends Component { api.asc_unregisterCallback('asc_onHidePopMenu', this.onApiHideContextMenu); api.asc_unregisterCallback('asc_onShowForeignCursorLabel', this.onApiShowForeignCursorLabel); api.asc_unregisterCallback('asc_onHideForeignCursorLabel', this.onApiHideForeignCursorLabel); - api.asc_unregisterCallback('asc_onMouseMove', this.onApiMouseMove); } componentDidMount() { diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx index 86d2dffaa..4494d0b5d 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx @@ -25,7 +25,10 @@ class ContextMenu extends ContextMenuController { // console.log('context menu controller created'); this.onApiShowComment = this.onApiShowComment.bind(this); this.onApiHideComment = this.onApiHideComment.bind(this); + this.isOpenWindowUser = false; + this.timer; this.getUserName = this.getUserName.bind(this); + this.onApiMouseMove = this.onApiMouseMove.bind(this); } static closeContextMenu() { @@ -43,6 +46,7 @@ class ContextMenu extends ContextMenuController { const api = Common.EditorApi.get(); api.asc_unregisterCallback('asc_onShowComment', this.onApiShowComment); api.asc_unregisterCallback('asc_onHideComment', this.onApiHideComment); + api.asc_unregisterCallback('asc_onMouseMove', this.onApiMouseMove); } @@ -164,6 +168,7 @@ class ContextMenu extends ContextMenuController { const api = Common.EditorApi.get(); api.asc_registerCallback('asc_onShowComment', this.onApiShowComment); api.asc_registerCallback('asc_onHideComment', this.onApiHideComment); + api.asc_registerCallback('asc_onMouseMove', this.onApiMouseMove); } initMenuItems() { @@ -230,6 +235,88 @@ class ContextMenu extends ContextMenuController { } } + onApiMouseMove(dataarray) { + let index_hyperlink, + index_comments, + index_locked, + index_column, index_row, + index_filter, + index_slicer, + index_foreign; + for (let i = dataarray.length; i > 0; i--) { + switch (dataarray[i-1].asc_getType()) { + case Asc.c_oAscMouseMoveType.Hyperlink: + index_hyperlink = i; + break; + case Asc.c_oAscMouseMoveType.Comment: + index_comments = i; + break; + case Asc.c_oAscMouseMoveType.LockedObject: + index_locked = i; + break; + case Asc.c_oAscMouseMoveType.ResizeColumn: + index_column = i; + break; + case Asc.c_oAscMouseMoveType.ResizeRow: + index_row = i; + break; + case Asc.c_oAscMouseMoveType.Filter: + index_filter = i; + break; + case Asc.c_oAscMouseMoveType.Tooltip: + index_slicer = i; + break; + case Asc.c_oAscMouseMoveType.ForeignSelect: + index_foreign = i; + break; + } + } + + if (!index_locked && this.isOpenWindowUser) { + this.timer = setTimeout(() => $$('.username-tip').remove(), 1500); + this.isOpenWindowUser = false; + } else { + clearTimeout(this.timer); + $$('.username-tip').remove(); + } + + if (index_locked ) { + const tipHeight = 20; + let editorOffset = $$("#editor_sdk").offset(), + XY = [ editorOffset.left - $(window).scrollLeft(), editorOffset.top - $(window).scrollTop()], + data = dataarray[index_locked - 1], + X = data.asc_getX(), + Y = data.asc_getY(), + src = $$(`
    `); + + src.css({ + height : tipHeight + 'px', + position : 'absolute', + zIndex : '5000', + visibility : 'visible', + }); + + src.text(this.getUserName(data.asc_getUserId())); + src.addClass('active'); + $$(document.body).append(src); + + let showPoint = [ ($$(window).width() - (X + XY[0])), Y + XY[1] ]; + + if ( $$(window).width() - showPoint[0] < src.outerWidth() ) { + src.css({ + left: '0px', + top: (showPoint[1] - tipHeight) + 'px', + }); + } else { + src.css({ + right: showPoint[0] + 'px', + top: showPoint[1] - 1 + 'px', + }); + } + this.isOpenWindowUser = true; + } + } + initExtraItems () { return (this.extraItems && this.extraItems.length > 0 ? this.extraItems : []); } diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index 66c3cd23a..6be8afc19 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -46,6 +46,10 @@ } } +.username-tip.active { + background-color: #ee3525; +} + // Skeleton of workbook .doc-placeholder { From 51fad69da61209f3e44c317f16dac9cbc44a7562 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Aug 2021 19:08:04 +0300 Subject: [PATCH 066/129] For Bug 49584 --- apps/common/main/lib/view/AutoCorrectDialog.js | 4 ++-- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 765dd8f71..67741da94 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -113,7 +113,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var $window = this.getChild(); var me = this; - var panelAutoFormat = $window.find('#id-autocorrect-dialog-settings-' + this.appPrefix + 'autoformat'); + var panelAutoFormat = $window.find('#id-autocorrect-dialog-settings-' + (this.appPrefix=='pe-' ? 'de-' : this.appPrefix) + 'autoformat'); // Math correct this.chReplaceType = new Common.UI.CheckBox({ @@ -358,7 +358,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var checked = (field.getValue()==='checked'); Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyperlink", checked); Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyperlink", checked); - me.api.asc_setAutoCorrectHyperlinks(checked); + me.api.asc_SetAutoCorrectHyperlinks(checked); }); this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false)); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 336453b02..0861e0dd2 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2608,7 +2608,7 @@ define([ value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value); - // me.api.asc_setAutoCorrectHyperlinks(value); + me.api.asc_SetAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 8bc4b8e07..320fb5f37 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2230,7 +2230,7 @@ define([ value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value); - // me.api.asc_setAutoCorrectHyperlinks(value); + me.api.asc_SetAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 65ca8591c..f5f43f48a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2731,7 +2731,7 @@ define([ value = Common.localStorage.getBool("sse-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("sse-settings-autoformat-hyperlink", value); - me.api.asc_setAutoCorrectHyperlinks(value); + me.api.asc_SetAutoCorrectHyperlinks(value); }, showRenameUserDialog: function() { From afa969e31443cf2a19e1548091da54023a78011c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 31 Aug 2021 23:18:55 +0300 Subject: [PATCH 067/129] [DE] added build script for "forms" app --- build/Gruntfile.js | 5 ++ build/appforms.js | 80 ++++++++++++++++++++++ build/appforms.json | 140 ++++++++++++++++++++++++++++++++++++++ build/documenteditor.json | 1 + 4 files changed, 226 insertions(+) create mode 100644 build/appforms.js create mode 100644 build/appforms.json diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 9eb081ebb..a99ebc3cb 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -11,6 +11,7 @@ module.exports = function(grunt) { ' *\n' + ' * Version: <%= pkg.version %> (build:<%= pkg.build %>)\n' + ' */\n'; + global.copyright = copyright; let iconv_lite, encoding = process.env.SYSTEM_ENCODING; grunt.log.writeln('platform: ' + process.platform.green); @@ -91,6 +92,8 @@ module.exports = function(grunt) { addons.forEach((element,index,self) => self[index] = path.join('../..', element, '/build')); addons = addons.filter(element => grunt.file.isDir(element)); + require('./appforms')(grunt); + grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-uglify'); @@ -187,6 +190,8 @@ module.exports = function(grunt) { if ( !!_extConfig && _extConfig.name == packageFile.name ) { _merge(packageFile, _extConfig); } + + global.packageFile = packageFile; } else grunt.log.error().writeln('Could not load config file'.red); }); } diff --git a/build/appforms.js b/build/appforms.js new file mode 100644 index 000000000..bff5d8013 --- /dev/null +++ b/build/appforms.js @@ -0,0 +1,80 @@ + +module.exports = (grunt) => { + grunt.registerTask('forms-app-init', function() { + const packageFile = global.packageFile; + if ( !global.packageFile ) + grunt.log.ok('no package file'.red); + else { + const config = require('./appforms.json'); + if ( config ) { + //packageFile.tasks.deploy.push(...config.tasks.deploy); + packageFile.forms = config.forms; + } + } + + grunt.initConfig({ + pkg: packageFile, + + clean: { + options: { + force: true + }, + postbuild: packageFile.forms.clean.postbuild, + prebuild: packageFile.forms.clean.prebuild + }, + + requirejs: { + compile: { + options: packageFile.forms.js.requirejs.options + } + }, + + less: { + production: { + options: { + compress: true, + ieCompat: false, + modifyVars: packageFile.forms.less.vars, + plugins: [ + new (require('less-plugin-clean-css'))() + ] + }, + files: { + "<%= pkg.forms.less.files.dest %>": packageFile.forms.less.files.src + } + } + }, + + concat: { + options: { + stripBanners: true, + banner: global.copyright + }, + dist: { + src: [packageFile.forms.js.requirejs.options.out], + dest: packageFile.forms.js.requirejs.options.out + } + }, + + copy: { + localization: { + files: packageFile.forms.copy.localization + }, + indexhtml: { + files: packageFile.forms.copy.indexhtml + } + }, + + inline: { + dist: { + src: `${packageFile.forms.copy.indexhtml.dest}/index.html` + } + } + + }); + }); + + grunt.registerTask('deploy-app-forms', ['forms-app-init', 'clean:prebuild', /*'imagemin',*/ 'less', + 'requirejs', 'concat', 'copy', 'inline', /*'json-minify',*/ + /*'replace:writeVersion',*/ /*'replace:prepareHelp',*/ 'clean:postbuild']); +} \ No newline at end of file diff --git a/build/appforms.json b/build/appforms.json new file mode 100644 index 000000000..8b37c8813 --- /dev/null +++ b/build/appforms.json @@ -0,0 +1,140 @@ +{ + "name": "documenteditor", + "version": "4.3.0", + "build": 1149, + "homepage": "http://www.onlyoffice.com", + "private": true, + "forms": { + "clean": { + "prebuild": [ + "../deploy/web-apps/apps/documenteditor/forms" + ], + "postbuild": [ + "../deploy/web-apps/apps/documenteditor/forms/resources/img" + ] + }, + "js": { + "requirejs": { + "options": { + "name": "../apps/documenteditor/forms/app.js", + "out": "../deploy/web-apps/apps/documenteditor/forms/app.js", + "baseUrl": "../apps/", + "inlineText": true, + "findNestedDependencies": true, + "preserveLicenseComments": false, + "optimizeAllPluginResources": true, + "paths": { + "jquery": "../vendor/jquery/jquery", + "underscore": "../vendor/underscore/underscore", + "backbone": "../vendor/backbone/backbone", + "text": "../vendor/requirejs-text/text", + "bootstrap": "../vendor/bootstrap/dist/js/bootstrap", + "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", + "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", + "xregexp": "empty:", + "sockjs": "empty:", + "jszip": "empty:", + "jszip-utils": "empty:", + "coapisettings": "empty:", + "allfonts": "empty:", + "sdk": "empty:", + "api": "empty:", + "core": "common/main/lib/core/application", + "notification": "common/main/lib/core/NotificationCenter", + "keymaster": "common/main/lib/core/keymaster", + "tip": "common/main/lib/util/Tip", + "analytics": "common/Analytics", + "gateway": "common/Gateway", + "locale": "common/locale", + "irregularstack": "common/IrregularStack" + }, + "shim": { + "underscore": { + "exports": "_" + }, + "backbone": { + "deps": [ + "underscore", + "jquery" + ], + "exports": "Backbone" + }, + "bootstrap": { + "deps": [ + "jquery" + ] + }, + "perfectscrollbar": { + "deps": [ + "jmousewheel" + ] + }, + "notification": { + "deps": [ + "backbone" + ] + }, + "core": { + "deps": [ + "backbone", + "notification" + ] + }, + "sdk": { + "deps": [ + "jquery", + "underscore", + "coapisettings", + "allfonts", + "xregexp", + "sockjs", + "jszip", + "jszip-utils" + ] + }, + "gateway": { + "deps": [ + "jquery" + ] + }, + "analytics": { + "deps": [ + "jquery" + ] + } + } + } + } + }, + "less": { + "files": { + "src": "../apps/documenteditor/forms/resources/less/application.less", + "dest": "../deploy/web-apps/apps/documenteditor/forms/resources/css/app.css" + }, + "vars": { + "app-image-const-path": "'../img'", + "common-image-const-path": "'../img'", + "app-image-path": "'../../../../../deploy/web-apps/apps/documenteditor/forms/resources/img'", + "common-image-path": "'../../../../../deploy/web-apps/apps/documenteditor/forms/resources/img'" + } + }, + "copy": { + "localization": [ + { + "expand": true, + "cwd": "../apps/documenteditor/forms/locale/", + "src": "*", + "dest": "../deploy/web-apps/apps/documenteditor/forms/locale/" + } + ], + "indexhtml": { + "../deploy/web-apps/apps/documenteditor/forms/index.html": "../apps/documenteditor/forms/index.html.deploy" + } + } + }, + "tasks": { + "deploy": [ + "deploy-app-forms" + ] + } +} \ No newline at end of file diff --git a/build/documenteditor.json b/build/documenteditor.json index 9f20bf075..2253ff379 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -368,6 +368,7 @@ "increment-build", "deploy-app-main", "deploy-app-mobile", + "deploy-app-forms", "deploy-app-embed" ] } From ff53ec15477355e5d576fab1fef0cc9c1f0e59cd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 31 Aug 2021 23:55:22 +0300 Subject: [PATCH 068/129] Fix Bug 49947 --- apps/common/main/lib/component/InputField.js | 18 ++++++++++++++++-- apps/common/main/lib/view/OpenDialog.js | 10 +--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index 5d16292f6..8ea0d65a0 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -81,12 +81,11 @@ define([ template: _.template([ '
    ', ' Date: Wed, 1 Sep 2021 09:10:12 +0300 Subject: [PATCH 069/129] Refactoring code --- .../mobile/src/controller/ContextMenu.jsx | 36 ++----------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx index 4494d0b5d..a229b1b05 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx @@ -236,40 +236,10 @@ class ContextMenu extends ContextMenuController { } onApiMouseMove(dataarray) { - let index_hyperlink, - index_comments, - index_locked, - index_column, index_row, - index_filter, - index_slicer, - index_foreign; + let index_locked; + for (let i = dataarray.length; i > 0; i--) { - switch (dataarray[i-1].asc_getType()) { - case Asc.c_oAscMouseMoveType.Hyperlink: - index_hyperlink = i; - break; - case Asc.c_oAscMouseMoveType.Comment: - index_comments = i; - break; - case Asc.c_oAscMouseMoveType.LockedObject: - index_locked = i; - break; - case Asc.c_oAscMouseMoveType.ResizeColumn: - index_column = i; - break; - case Asc.c_oAscMouseMoveType.ResizeRow: - index_row = i; - break; - case Asc.c_oAscMouseMoveType.Filter: - index_filter = i; - break; - case Asc.c_oAscMouseMoveType.Tooltip: - index_slicer = i; - break; - case Asc.c_oAscMouseMoveType.ForeignSelect: - index_foreign = i; - break; - } + if (dataarray[i-1].asc_getType() === Asc.c_oAscMouseMoveType.LockedObject) index_locked = i; } if (!index_locked && this.isOpenWindowUser) { From 2dd3d0a95beffc3441d87143f7df98f0b450065b Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 1 Sep 2021 12:19:00 +0300 Subject: [PATCH 070/129] [SSE] Allow draggable when ctrl is pressed --- apps/common/main/lib/component/TabBar.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 837d59602..b1843b26a 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -170,7 +170,7 @@ define([ this.trigger('tab:contextmenu', this, this.tabs.indexOf(tab), tab, this.selectTabs); }, this.bar), mousedown: $.proxy(function (e) { - if ((3 !== e.which) && !e.ctrlKey && !e.metaKey && !e.shiftKey) { + if ((3 !== e.which) && !e.shiftKey) { var lockDrag = tab.isLockTheDrag; this.bar.selectTabs.forEach(function (item) { if (item.isLockTheDrag) { @@ -181,8 +181,9 @@ define([ lockDrag = true; } this.bar.$el.find('ul > li > span').attr('draggable', !lockDrag); - if (!lockDrag) + if (!lockDrag && !e.ctrlKey && !e.metaKey) { tab.changeState(); + } } else { this.bar.$el.find('ul > li > span').attr('draggable', 'false'); } From 26141429b49515b66c1193700e800cb544533dea Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 1 Sep 2021 16:36:57 +0300 Subject: [PATCH 071/129] [themes] fix bug 52104 --- apps/common/main/lib/controller/Themes.js | 2 ++ .../main/resources/themes/classic-light.json | 20 ------------------- apps/common/main/resources/themes/themes.json | 4 +--- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 apps/common/main/resources/themes/classic-light.json diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 500545eb9..a6aa6cced 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -188,6 +188,8 @@ define([ function ( obj ) { if ( obj != 'error' ) { parse_themes_object(obj); + } else { + console.warn('failed to load/parse themes.json'); } } ); diff --git a/apps/common/main/resources/themes/classic-light.json b/apps/common/main/resources/themes/classic-light.json deleted file mode 100644 index deb591dca..000000000 --- a/apps/common/main/resources/themes/classic-light.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "Classic Light 2", - "id": "theme-classic-light2", - "type": "light", - "colors": { - "toolbar-header-document": "#446995", - "toolbar-header-spreadsheet": "#40865c", - "toolbar-header-presentation": "#aa5252", - - "background-normal": "#f00", - "background-toolbar": "#f100f1", - "background-toolbar-additional": "#f100f1", - "background-primary-dialog-button": "#7d858c", - "background-tab-underline": "#444", - "background-notification-popover": "#fcfed7", - "background-notification-badge": "#ffd112", - "background-scrim": "rgba(0,0,0, 0.2)", - "background-loader": "rgba(0,0,0, .65)" - } -} \ No newline at end of file diff --git a/apps/common/main/resources/themes/themes.json b/apps/common/main/resources/themes/themes.json index 3e8afe8db..943b2bef0 100644 --- a/apps/common/main/resources/themes/themes.json +++ b/apps/common/main/resources/themes/themes.json @@ -1,5 +1,3 @@ { - "themes": [ - "../../common/main/resources/themes/classic-light.json" - ] + "themes": [] } \ No newline at end of file From fc679a0c17522d44ed059b54787625e871ce2134 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 1 Sep 2021 17:18:44 +0300 Subject: [PATCH 072/129] [SSE] Fix drag and drop in statusbar for safari --- apps/common/main/lib/component/TabBar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index b1843b26a..28b23aec2 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -200,10 +200,10 @@ define([ tab.$el.children().on( {dragstart: $.proxy(function (e) { var event = e.originalEvent; - if (!Common.Utils.isIE) { + if (!Common.Utils.isIE && !Common.Utils.isSafari) { var img = document.createElement('div'); event.dataTransfer.setDragImage(img, 0, 0); - } else { + } else if (Common.Utils.isIE) { this.bar.selectTabs.forEach(function (tab) { tab.$el.find('span').prop('title', ''); }); From 0cd9932c146601820230aa29bcde804202fbc593 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 1 Sep 2021 17:23:13 +0300 Subject: [PATCH 073/129] [SSE] Fix bug 52175 --- apps/common/main/lib/component/TabBar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index 28b23aec2..386c4c6bc 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -240,7 +240,7 @@ define([ }, this), dragend: $.proxy(function (e) { var event = e.originalEvent; - if (event.dataTransfer.dropEffect === 'move') { + if (event.dataTransfer.dropEffect === 'move' && !event.dataTransfer.mozUserCancelled) { this.bar.trigger('tab:dragend', true); } else { this.bar.trigger('tab:dragend', false); From a7311327f8d668604de5b7254e9a30bac34f6a38 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 1 Sep 2021 19:22:51 +0300 Subject: [PATCH 074/129] [SSE mobile] Added function info --- apps/common/mobile/resources/less/common.less | 6 ++-- .../mobile/src/view/CellEditor.jsx | 31 ++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 41f856066..d14b0f595 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -878,12 +878,10 @@ input[type="number"]::-webkit-inner-spin-button { } .functions-list { - width: 100%; - height: 150px; + height: 175px; overflow-y: auto; position: absolute; top: 30px; - left: 0; right: 0; background-color: @white; .list { @@ -898,7 +896,7 @@ input[type="number"]::-webkit-inner-spin-button { padding-left: calc(var(--f7-list-item-padding-horizontal) + var(--f7-safe-area-left) - var(--menu-list-offset)); } .item-title { - font-size: 14px; + font-size: 15px; } } } diff --git a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx index ff08cd9fc..bdafdfa0e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx @@ -1,7 +1,10 @@ import React, { useState } from 'react'; -import { Input, View, Button, Link, Popover, ListItem, List } from 'framework7-react'; +import { Input, View, Button, Link, Popover, ListItem, List, Icon, f7 } from 'framework7-react'; import {observer, inject} from "mobx-react"; +// import {PageFunctionInfo} from "./add/AddFunction"; +import { __interactionsRef } from 'scheduler/tracing'; +import { Device } from '../../../../common/mobile/utils/device'; const viewStyle = { height: 30 @@ -13,7 +16,10 @@ const contentStyle = { const CellEditorView = props => { const [expanded, setExpanded] = useState(false); + const isPhone = Device.isPhone; const storeAppOptions = props.storeAppOptions; + const storeFunctions = props.storeFunctions; + const functions = storeFunctions.functions; const isEdit = storeAppOptions.isEdit; const funcArr = props.funcArr; @@ -35,11 +41,28 @@ const CellEditorView = props => {
    {funcArr && funcArr.length && -
    +
    {funcArr.map((elem, index) => { return ( - props.insertFormula(elem.name, elem.type)}> + props.insertFormula(elem.name, elem.type)}> +
    { + e.stopPropagation(); + let functionInfo = functions[elem.name]; + + if(functionInfo) { + f7.dialog.create({ + title: functionInfo.caption, + content: `

    ${functionInfo.caption} ${functionInfo.args}

    +

    ${functionInfo.descr}

    `, + buttons: [{text: 'Ok'}] + }).open(); + } + }}> + +
    +     ) })}     @@ -48,4 +71,4 @@ const CellEditorView = props => { ; }; -export default inject("storeAppOptions")(observer(CellEditorView)); +export default inject("storeAppOptions", "storeFunctions")(observer(CellEditorView)); From 776535557fe6671369008be5d5ab297b62b420d1 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 1 Sep 2021 21:18:05 +0300 Subject: [PATCH 075/129] [DE PE SSE mobile] Fix Bug 52090 --- apps/documenteditor/mobile/src/view/edit/Edit.jsx | 2 +- apps/presentationeditor/mobile/src/view/edit/Edit.jsx | 2 +- apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 42001e455..cf6c7e5d3 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -322,7 +322,7 @@ const EditView = props => { const show_popover = props.usePopover; return ( show_popover ? - props.onClosed()}> + props.onClosed()}> : props.onClosed()}> diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index f4d43fb8a..a6e048797 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -343,7 +343,7 @@ const EditView = props => { const show_popover = props.usePopover; return ( show_popover ? - props.onClosed()}> + props.onClosed()}> : props.onClosed()}> diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 17ca519c0..3b126b9c2 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -402,7 +402,7 @@ const EditView = props => { const show_popover = props.usePopover; return ( show_popover ? - props.onClosed()}> + props.onClosed()}> : props.onClosed()}> From 3cd99ddba36f1055543dde909e1f72179283ecf7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 1 Sep 2021 23:28:00 +0300 Subject: [PATCH 076/129] [build] fix message's icons --- .../img/controls/{warnings.svg => warnings_s.svg} | 0 apps/common/main/resources/less/opendialog.less | 2 +- apps/common/main/resources/less/window.less | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename apps/common/main/resources/img/controls/{warnings.svg => warnings_s.svg} (100%) diff --git a/apps/common/main/resources/img/controls/warnings.svg b/apps/common/main/resources/img/controls/warnings_s.svg similarity index 100% rename from apps/common/main/resources/img/controls/warnings.svg rename to apps/common/main/resources/img/controls/warnings_s.svg diff --git a/apps/common/main/resources/less/opendialog.less b/apps/common/main/resources/less/opendialog.less index 13b2ac71e..4172a765e 100644 --- a/apps/common/main/resources/less/opendialog.less +++ b/apps/common/main/resources/less/opendialog.less @@ -81,7 +81,7 @@ float: left; width: 40px; height: 40px; - background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; + background: ~"url('@{common-image-const-path}/controls/warnings_s.svg#attention')" no-repeat center; } } diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index c6225f98c..10de57b8e 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -172,7 +172,7 @@ .icon { &.warn { - background: ~"url('@{common-image-const-path}/controls/warnings.svg#attention')" no-repeat center; + background: ~"url('@{common-image-const-path}/controls/warnings_s.svg#attention')" no-repeat center; } &.error, &.info, &.confirm, &.warn { @@ -181,15 +181,15 @@ } &.error { - background: ~"url('@{common-image-const-path}/controls/warnings.svg#warning')" no-repeat center; + background: ~"url('@{common-image-const-path}/controls/warnings_s.svg#warning')" no-repeat center; } &.info { - background: ~"url('@{common-image-const-path}/controls/warnings.svg#info')" no-repeat center; + background: ~"url('@{common-image-const-path}/controls/warnings_s.svg#info')" no-repeat center; } &.confirm { - background: ~"url('@{common-image-const-path}/controls/warnings.svg#done')" no-repeat center; + background: ~"url('@{common-image-const-path}/controls/warnings_s.svg#done')" no-repeat center; } } From 4be8044c9e0ab0a0de0e054025e30efece83a706 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 2 Sep 2021 00:04:14 +0300 Subject: [PATCH 077/129] [scaling] fix bug 51863 --- apps/common/main/resources/less/common.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 300130c01..2a292dbb7 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -273,4 +273,10 @@ a { &:visited { color: @text-link-visited; } +} + +body { + &.pixel-ratio__1_75 { + image-rendering: crisp-edges; // FF only + } } \ No newline at end of file From e31fadc861008874e3ce5dc7d9c43e55ab854696 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 2 Sep 2021 00:25:49 +0300 Subject: [PATCH 078/129] [forms] fix build --- apps/documenteditor/forms/index.html.deploy | 2 +- build/appforms.js | 2 +- build/appforms.json | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index 863f02048..ed77608fc 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -198,7 +198,7 @@
    - + @@ -126,7 +127,8 @@ +
    @@ -208,10 +226,6 @@ - - - - @@ -219,28 +233,17 @@ window.sdk_scripts.forEach(function(item){ document.write(' + window.requireTimeourError = function(){ + var reqerr; - - diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index ed77608fc..3894cbdcd 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -21,7 +21,7 @@ overflow: hidden; border: none; background-color: #f4f4f4; - z-index: 10000; + z-index: 1001; } .loadmask > .brendpanel { @@ -119,7 +119,8 @@ + + if ( lang == 'de') reqerr = 'Die Verbindung ist zu langsam, einige Komponenten konnten nicht geladen werden. Aktualisieren Sie bitte die Seite.'; + else if ( lang == 'es') reqerr = 'La conexión es muy lenta, algunos de los componentes no han podido cargar. Por favor recargue la página.'; + else if ( lang == 'fr') reqerr = 'La connexion est trop lente, certains des composants n\'ons pas pu être chargé. Veuillez recharger la page.'; + else if ( lang == 'ru') reqerr = 'Слишком медленное соединение, не удается загрузить некоторые компоненты. Пожалуйста, обновите страницу.'; + else reqerr = 'The connection is too slow, some of the components could not be loaded. Please reload the page.'; - - + + From 26b6d2ad18e7c71a199983dbbe2a796734ee9b33 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 2 Sep 2021 01:56:21 +0300 Subject: [PATCH 080/129] [DE forms] Fix check license --- .../app/controller/ApplicationController.js | 68 +++++++++++++++++-- apps/documenteditor/forms/locale/en.json | 22 ++++-- 2 files changed, 81 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index d0a76a0f6..bbd385060 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -134,6 +134,12 @@ define([ }); window.onbeforeunload = _.bind(this.onBeforeUnload, this); + + this.warnNoLicense = this.warnNoLicense.replace(/%1/g, '{{COMPANY_NAME}}'); + this.warnNoLicenseUsers = this.warnNoLicenseUsers.replace(/%1/g, '{{COMPANY_NAME}}'); + this.textNoLicenseTitle = this.textNoLicenseTitle.replace(/%1/g, '{{COMPANY_NAME}}'); + this.warnLicenseExceeded = this.warnLicenseExceeded.replace(/%1/g, '{{COMPANY_NAME}}'); + this.warnLicenseUsersExceeded = this.warnLicenseUsersExceeded.replace(/%1/g, '{{COMPANY_NAME}}'); }, onDocumentResize: function() { @@ -385,7 +391,6 @@ define([ } this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); - // this.api.asc_registerCallback('asc_onLicenseChanged', _.bind(this.onLicenseChanged, this)); this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this)); this.api.asc_setDocInfo(docInfo); this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId); @@ -440,6 +445,8 @@ define([ if (params.asc_getRights() !== Asc.c_oRights.Edit) this.permissions.edit = this.permissions.review = false; + this.appOptions.trialMode = params.asc_getLicenseMode(); + this.appOptions.isBeta = params.asc_getIsBeta(); this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit); this.appOptions.canSubmitForms = this.appOptions.canLicense && (typeof (this.editorConfig.customization) == 'object') && !!this.editorConfig.customization.submitForm; this.appOptions.canFillForms = this.appOptions.canLicense && (this.permissions.fillForms===true) && (this.editorConfig.mode !== 'view'); @@ -531,6 +538,44 @@ define([ }); }, + applyLicense: function() { + if (this._state.licenseType) { + var license = this._state.licenseType, + buttons = ['ok'], + primary = 'ok'; + if ((this.appOptions.trialMode & Asc.c_oLicenseMode.Limited) !== 0 && + (license===Asc.c_oLicenseResult.SuccessLimit || license===Asc.c_oLicenseResult.ExpiredLimited || this.appOptions.permissionsLicense===Asc.c_oLicenseResult.SuccessLimit)) { + license = (license===Asc.c_oLicenseResult.ExpiredLimited) ? this.warnLicenseLimitedNoAccess : this.warnLicenseLimitedRenewed; + } else if (license===Asc.c_oLicenseResult.Connections || license===Asc.c_oLicenseResult.UsersCount) { + license = (license===Asc.c_oLicenseResult.Connections) ? this.warnLicenseExceeded : this.warnLicenseUsersExceeded; + } else { + license = (license===Asc.c_oLicenseResult.ConnectionsOS) ? this.warnNoLicense : this.warnNoLicenseUsers; + buttons = [{value: 'buynow', caption: this.textBuyNow}, {value: 'contact', caption: this.textContactUs}]; + primary = 'buynow'; + } + + var value = Common.localStorage.getItem("de-license-warning"); + value = (value!==null) ? parseInt(value) : 0; + var now = (new Date).getTime(); + if (now - value > 86400000) { + Common.UI.info({ + maxwidth: 500, + title: this.textNoLicenseTitle, + msg : license, + buttons: buttons, + primary: primary, + callback: function(btn) { + Common.localStorage.setItem("de-license-warning", now); + if (btn == 'buynow') + window.open('{{PUBLISHER_URL}}', "_blank"); + else if (btn == 'contact') + window.open('mailto:{{SALES_EMAIL}}', "_blank"); + } + }); + } + } + }, + onLongActionBegin: function(type, id) { var action = {id: id, type: type}; this.stackLongActions.push(action); @@ -952,9 +997,12 @@ define([ if (this.appOptions.canFillForms) { this.api.asc_registerCallback('asc_onShowContentControlsActions', _.bind(this.onShowContentControlsActions, this)); this.api.asc_registerCallback('asc_onHideContentControlsActions', _.bind(this.onHideContentControlsActions, this)); - // this.api.asc_SetHighlightRequiredFields(true); + this.api.asc_SetHighlightRequiredFields(true); } + if (this.editorConfig.mode !== 'view') // if want to open editor, but viewer is loaded + this.applyLicense(); + Common.Gateway.on('processmouse', _.bind(this.onProcessMouse, this)); Common.Gateway.on('downloadas', _.bind(this.onDownloadAs, this)); Common.Gateway.on('requestclose', _.bind(this.onRequestClose, this)); @@ -1190,8 +1238,6 @@ define([ txtClose: 'Close', errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
    Please contact your Document Server administrator for details.', errorUpdateVersionOnDisconnect: 'Internet connection has been restored, and the file version has been changed.
    Before you can continue working, you need to download the file or copy its content to make sure nothing is lost, and then reload this page.', - textNext: 'Next Field', - textClear: 'Clear All Fields', textSubmited: 'Form submitted successfully
    Click to close the tip.', errorSubmit: 'Submit failed.', errorEditingDownloadas: 'An error occurred during the work with the document.
    Use the \'Download as...\' option to save the file backup copy to your computer hard drive.', @@ -1204,6 +1250,18 @@ define([ txtPressLink: 'Press Ctrl and click link', txtEmpty: '(Empty)', titleServerVersion: 'Editor updated', - errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.' + errorServerVersion: 'The editor version has been updated. The page will be reloaded to apply the changes.', + titleUpdateVersion: 'Version changed', + errorUpdateVersion: 'The file version has been changed. The page will be reloaded.', + warnLicenseLimitedRenewed: 'License needs to be renewed.
    You have a limited access to document editing functionality.
    Please contact your administrator to get full access', + warnLicenseLimitedNoAccess: 'License expired.
    You have no access to document editing functionality.
    Please contact your administrator.', + warnLicenseExceeded: "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
    Contact your administrator to learn more.", + warnLicenseUsersExceeded: "You've reached the user limit for %1 editors. Contact your administrator to learn more.", + 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.", + warnNoLicenseUsers: "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", + textBuyNow: 'Visit website', + textNoLicenseTitle: 'License limit reached', + textContactUs: 'Contact sales' + }, DE.Controllers.ApplicationController)); }); diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json index 2db8c2ef8..982d66587 100644 --- a/apps/documenteditor/forms/locale/en.json +++ b/apps/documenteditor/forms/locale/en.json @@ -21,14 +21,11 @@ "DE.ApplicationController.notcriticalErrorTitle": "Warning", "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "DE.ApplicationController.textAnonymous": "Anonymous", - "DE.ApplicationController.textClear": "Clear All Fields", "DE.ApplicationController.textGotIt": "Got it", "DE.ApplicationController.textGuest": "Guest", "DE.ApplicationController.textLoadingDocument": "Loading document", - "DE.ApplicationController.textNext": "Next Field", "DE.ApplicationController.textOf": "of", "DE.ApplicationController.textRequired": "Fill all required fields to send form.", - "DE.ApplicationController.textSubmit": "Submit", "DE.ApplicationController.textSubmited": "Form submitted successfully
    Click to close the tip", "DE.ApplicationController.txtClose": "Close", "DE.ApplicationController.unknownErrorText": "Unknown error.", @@ -36,6 +33,20 @@ "DE.ApplicationController.waitText": "Please, wait...", "DE.ApplicationController.txtEmpty": "(Empty)", "DE.ApplicationController.txtPressLink": "Press Ctrl and click link", + "DE.ApplicationController.textCloseTip": "Click to close the tip.", + "DE.ApplicationController.titleServerVersion": "Editor updated", + "DE.ApplicationController.errorServerVersion": "The editor version has been updated. The page will be reloaded to apply the changes.", + "DE.ApplicationController.titleUpdateVersion": "Version changed", + "DE.ApplicationController.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", + "DE.ApplicationController.warnLicenseLimitedRenewed": "License needs to be renewed.
    You have a limited access to document editing functionality.
    Please contact your administrator to get full access", + "DE.ApplicationController.warnLicenseLimitedNoAccess": "License expired.
    You have no access to document editing functionality.
    Please contact your administrator.", + "DE.ApplicationController.warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
    Contact your administrator to learn more.", + "DE.ApplicationController.warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.", + "DE.ApplicationController.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.", + "DE.ApplicationController.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", + "DE.ApplicationController.textBuyNow": "Visit website", + "DE.ApplicationController.textNoLicenseTitle": "License limit reached", + "DE.ApplicationController.textContactUs": "Contact sales", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtDownloadDocx": "Download as docx", "DE.ApplicationView.txtDownloadPdf": "Download as pdf", @@ -43,5 +54,8 @@ "DE.ApplicationView.txtFileLocation": "Open file location", "DE.ApplicationView.txtFullScreen": "Full Screen", "DE.ApplicationView.txtPrint": "Print", - "DE.ApplicationView.txtShare": "Share" + "DE.ApplicationView.txtShare": "Share", + "DE.ApplicationView.textSubmit": "Submit", + "DE.ApplicationView.textClear": "Clear All Fields", + "DE.ApplicationView.textNext": "Next Field" } \ No newline at end of file From 8864d626aedf6c831a5b9eb017aab7a75cc0f0c6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 2 Sep 2021 12:55:40 +0300 Subject: [PATCH 081/129] Fix fileType in setHistoryData event --- apps/common/main/lib/controller/History.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 506b64280..cdac7eb07 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -202,6 +202,7 @@ define([ urlGetTime = new Date(); var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url, + fileType = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.fileType : opts.data.fileType, docId = opts.data.key ? opts.data.key : this.currentDocId, docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev, token = opts.data.token; @@ -217,7 +218,7 @@ define([ rev.set('docIdPrev', docIdPrev, {silent: true}); } rev.set('token', token, {silent: true}); - opts.data.fileType && rev.set('fileType', opts.data.fileType, {silent: true}); + fileType && rev.set('fileType', fileType, {silent: true}); } } var hist = new Asc.asc_CVersionHistory(); From 9d2de2698b6a4d4624446ebfb8c157ed08f847e7 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 2 Sep 2021 15:44:11 +0300 Subject: [PATCH 082/129] [DE PE SSE] Fix bug 51488 --- .../main/lib/template/Comments.template | 20 +++++++++++-------- .../lib/template/CommentsPopover.template | 20 +++++++++++-------- apps/common/main/resources/less/comments.less | 10 +++++++--- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template index d106dc70d..286f121c0 100644 --- a/apps/common/main/lib/template/Comments.template +++ b/apps/common/main/lib/template/Comments.template @@ -70,16 +70,20 @@ - <% if (!editText && !lock && !scope.viewmode) { %> + <% if (!editText && !lock) { %>
    - <% if (editable) { %> -
    + <% if (!scope.viewmode) { %> + <% if (editable) { %> +
    + <% } %> + <% if (removable) { %> +
    + <% } %> <% } %> - <% if (removable) { %> -
    - <% } %> - <% if (editable) { %> -
    + <% if (editable && !scope.viewmode) { %> +
    + <% } else if ((!editable || scope.viewmode) && resolved) { %> +
    <% } %>
    <% } %> diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index f7cfc1e66..cf0d529ee 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -71,16 +71,20 @@ - <% if (!editTextInPopover && !lock && !hint) { %> + <% if (!editTextInPopover && !lock) { %>
    - <% if (editable) { %> -
    + <% if (!hint) { %> + <% if (editable) { %> +
    + <% } %> + <% if (removable) { %> +
    + <% } %> <% } %> - <% if (removable) { %> -
    - <% } %> - <% if (editable) { %> -
    + <% if (editable && !hint) { %> +
    + <% } else if ((!editable || hint) && resolved) { %> +
    <% } %>
    <% } %> diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 12bb86df6..2a42718e1 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -277,13 +277,17 @@ cursor: pointer; } - .btn-edit,.btn-delete, .btn-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto { + .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto { width: 16px; height: 16px; margin: 0 0 0 5px; background-color: transparent; } + .icon-resolve { + float: left; + } + .btn-edit { background-position: -2px -232px; } @@ -350,7 +354,7 @@ } } - .btn-resolve,.btn-accept { + .btn-resolve, .btn-accept, .icon-resolve { position: relative; &:after { @@ -366,7 +370,7 @@ top: 0px; } - &.comment-resolved { + &.comment-resolved, &.i-comment-resolved { &:after { border-color: @icon-success-ie; border-color: @icon-success; From d2ce8e60c41cad84d51aca9610d450b96ea1fa78 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 2 Sep 2021 17:58:18 +0300 Subject: [PATCH 083/129] [DE][PE] Fix Bug 50031. Change set language button --- apps/common/main/resources/less/buttons.less | 51 ------------------- .../main/app/template/StatusBar.template | 7 +-- .../documenteditor/main/app/view/Statusbar.js | 46 +++++------------ .../main/resources/less/statusbar.less | 17 ++----- .../main/app/template/StatusBar.template | 7 +-- .../main/app/view/Statusbar.js | 43 +++++----------- .../main/resources/less/statusbar.less | 17 ++----- 7 files changed, 33 insertions(+), 155 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index cf35170d5..8d6164e5d 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -1019,57 +1019,6 @@ } } -.cnt-lang { - color: @text-normal-ie; - color: @text-normal; - height: 20px; - line-height: 18px; - border: 0; - .border-radius(1px); - vertical-align: middle; - - .dropdown-toggle { - margin: 0 6px 0 4px; - } - - &:hover:not(.disabled) { - background-color: @highlight-button-hover-ie; - background-color: @highlight-button-hover; - } - - &[disabled], &.disabled { - opacity: @component-disabled-opacity; - } - - .caret { - width: 4px; - height: 4px; - border: solid 1px @icon-normal-ie; - border: solid 1px @icon-normal; - border-bottom: none; - border-right: none; - background-image: none; - - transition: transform 0.2s ease; - transform: rotate(-135deg) translate(1px,1px); - } - - &.open:not(.disabled){ - &, .status-label { - color: @text-normal-pressed-ie; - color: @text-normal-pressed; - } - - background-color: @highlight-button-pressed-ie; - background-color: @highlight-button-pressed; - - .caret { - transform: rotate(45deg); - border-color: @icon-normal-pressed-ie; - border-color: @icon-normal-pressed; - } - } -} // Dialog buttons // ------------------------ diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index bcf70b81d..92c6fbed7 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -12,12 +12,7 @@
    -
    -
    - -
    -
    -
    +
    diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 55b69d8c3..62a7fdb48 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -67,10 +67,8 @@ define([ } function _clickLanguage(menu, item) { - var $parent = menu.$el.parent(); - $parent.find('#status-label-lang').text(item.caption); this.langMenu.prevTip = item.value.value; - + this.btnLanguage.setCaption(item.caption); this.fireEvent('langchanged', [this, item.value.code, item.caption]); } @@ -83,23 +81,6 @@ define([ if (me.btnLanguage && me.btnLanguage.cmpEl) { me.btnLanguage.updateHint(me.tipSetLang); - me.btnLanguage.cmpEl.on({ - 'show.bs.dropdown': function () { - _.defer(function () { - me.btnLanguage.cmpEl.find('ul').focus(); - }, 100); - }, - 'hide.bs.dropdown': function () { - _.defer(function () { - me.api.asc_enableKeyEvents(true); - }, 100); - }, - 'click': function (e) { - if (me.btnLanguage.isDisabled()) { - return false; - } - } - }); me.langMenu.on('item:click', _.bind(_clickLanguage, this)); } @@ -223,9 +204,14 @@ define([ }); this.btnLanguage = new Common.UI.Button({ - // el: panelLang, - hintAnchor: 'top-left', - disabled: true + cls : 'btn-toolbar', + caption : 'English (United States)', + hintAnchor : 'top-left', + style : 'margin-left: 6px;', + disabled: true, + dataHint : '0', + dataHintDirection: 'top', + menu: true }); this.langMenu = new Common.UI.MenuSimple({ @@ -299,11 +285,8 @@ define([ _btn_render(me.txtGoToPage, $('#status-goto-page', me.$layout)); if ( !config || config.isEdit ) { - var panelLang = $('.cnt-lang', me.$layout); - _btn_render(me.btnLanguage, panelLang); - - me.langMenu.render(panelLang); - me.langMenu.cmpEl.attr({tabindex: -1}); + me.btnLanguage.render($('#btn-cnt-lang', me.$layout)); + me.btnLanguage.setMenu(me.langMenu); me.langMenu.prevTip = 'en'; } @@ -360,9 +343,7 @@ define([ setLanguage: function(info) { if (this.langMenu.prevTip != info.value && info.code !== undefined) { - var $parent = $(this.langMenu.el.parentNode, this.$el); - $parent.find('#status-label-lang').text(info.displayValue); - + this.btnLanguage.setCaption(info.displayValue); this.langMenu.prevTip = info.value; var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; }); @@ -384,8 +365,7 @@ define([ }, SetDisabled: function(disable) { - var langs = this.langMenu.items.length>0; - this.btnLanguage.setDisabled(disable || !langs); + this.btnLanguage.setDisabled(disable || this.langMenu.items.length<1); }, onApiCoAuthoringDisconnect: function() { diff --git a/apps/documenteditor/main/resources/less/statusbar.less b/apps/documenteditor/main/resources/less/statusbar.less index 8fff9884c..ed9adabde 100644 --- a/apps/documenteditor/main/resources/less/statusbar.less +++ b/apps/documenteditor/main/resources/less/statusbar.less @@ -66,20 +66,9 @@ } } - .cnt-lang { - display: inline-block; - cursor: pointer; - margin-left: 6px; - - label { - cursor: pointer; - } - - &.disabled { - cursor: default; - label { - cursor: default; - } + #btn-cnt-lang { + button { + font-weight: 700; } } diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 892f2c76b..fed810b75 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -27,12 +27,7 @@
    -
    -
    - -
    -
    -
    +
    diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 8fb959e11..0cc204627 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -70,8 +70,7 @@ define([ } function _clickLanguage(menu, item) { - var $parent = menu.$el.parent(); - $parent.find('#status-label-lang').text(item.caption); + this.btnLanguage.setCaption(item.caption); this.langMenu.prevTip = item.value.value; this.fireEvent('langchanged', [this, item.value.code, item.caption]); @@ -250,7 +249,6 @@ define([ dataHintOffset: '0, -16' }); - var panelLang = $('.cnt-lang',this.el); this.langMenu = new Common.UI.MenuSimple({ cls: 'lang-menu', style: 'margin-top:-5px;', @@ -266,31 +264,17 @@ define([ }); this.btnLanguage = new Common.UI.Button({ - el: panelLang, + parentEl: $('#btn-cnt-lang', this.el), + cls : 'btn-toolbar', + caption : 'English (United States)', hint: this.tipSetLang, - hintAnchor: 'top-left', - disabled: true + hintAnchor : 'top-left', + style : 'margin-left: 6px;', + disabled: true, + dataHint : '0', + dataHintDirection: 'top', + menu: this.langMenu }); - this.btnLanguage.cmpEl.on({ - 'show.bs.dropdown': function () { - _.defer(function(){ - me.btnLanguage.cmpEl.find('ul').focus(); - }, 100); - }, - 'hide.bs.dropdown': function () { - _.defer(function(){ - me.api.asc_enableKeyEvents(true); - }, 100); - }, - 'click': function (e) { - if (me.btnLanguage.isDisabled()) { - return false; - } - } - }); - - this.langMenu.render(panelLang); - this.langMenu.cmpEl.attr({tabindex: -1}); this.langMenu.prevTip = 'en'; this.langMenu.on('item:click', _.bind(_clickLanguage,this)); @@ -351,9 +335,7 @@ define([ setLanguage: function(info) { if (this.langMenu.prevTip != info.value && info.code !== undefined) { - var $parent = $(this.langMenu.el.parentNode, this.$el); - $parent.find('#status-label-lang').text(info.displayValue); - + this.btnLanguage.setCaption(info.displayValue); this.langMenu.prevTip = info.value; var lang = _.find(this.langMenu.items, function(item) { return item.caption == info.displayValue; }); if (lang) { @@ -366,8 +348,7 @@ define([ }, SetDisabled: function(disable) { - var langs = this.langMenu.items.length>0; - this.btnLanguage.setDisabled(disable || !langs || this._state.no_paragraph); + this.btnLanguage.setDisabled(disable || this.langMenu.items.length<1 || this._state.no_paragraph); }, onApiFocusObject: function(selectedObjects) { diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index 9fcd30988..101197463 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -67,20 +67,9 @@ } } - .cnt-lang { - display: inline-block; - cursor: pointer; - margin-left: 6px; - - label { - cursor: pointer; - } - - &.disabled { - cursor: default; - label { - cursor: default; - } + #btn-cnt-lang { + button { + font-weight: 700; } } From 89e99a323f005feb1cb04b300fe3287e5e426ecd Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 2 Sep 2021 21:32:19 +0300 Subject: [PATCH 084/129] [DE] Fix bug 50062 --- .../main/app/controller/Main.js | 2 +- .../main/app/view/DocumentHolder.js | 56 ++++++++++++++----- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 89cfc517e..a8e39c689 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -767,7 +767,7 @@ define([ app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode); } if (options.documentHolder) { - app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect); + app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormwMode); } if (options.leftMenu) { if (options.leftMenu.disable) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 2eae506fd..5c8127202 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -223,7 +223,22 @@ define([ var showObjectMenu = function(event, docElement, eOpts){ if (me.api){ - var obj = (me.mode.isEdit && !me._isDisabled) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements()); + var obj; + if (me.mode.isEdit && !me._isDisabled) { + obj = fillMenuProps(me.api.getSelectedElements()); + } else if (me._fillFormwMode) { + var para = false, + elements = me.api.getSelectedElements(); + for (var i = 0; i < elements.length; i++) { + var elType = elements[i].get_ObjectType(); + if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { + para = true; + } + } + obj = para ? fillMenuProps(elements) : fillViewMenuProps(elements); + } else { + obj = fillViewMenuProps(me.api.getSelectedElements()); + } if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts); } }; @@ -3723,6 +3738,10 @@ define([ value: 'remove' }).on('click', _.bind(me.onControlsSelect, me)); + var menuParaCopyPasteSeparator = new Common.UI.MenuItem({ + caption : '--' + }); + var menuParaControlSettings = new Common.UI.MenuItem( { caption: me.textEditControls, @@ -3847,9 +3866,10 @@ define([ me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270); } menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart); - menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation); - menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation); - if (value.paraProps) { + menuParagraphAdvanced.setVisible(!me._fillFormwMode); + menuParagraphBreakBefore.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation); + menuParagraphKeepLines.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation); + if (value.paraProps && !me._fillFormwMode) { menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore()); menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines()); } @@ -3897,13 +3917,17 @@ define([ var cancopy = me.api && me.api.can_CopyCut(); menuParaCopy.setDisabled(!cancopy); + menuParaCut.setVisible(true); menuParaCut.setDisabled(disabled || !cancopy); + menuParaPaste.setVisible(true); menuParaPaste.setDisabled(disabled); menuParaPrint.setVisible(me.mode.canPrint); menuParaPrint.setDisabled(!cancopy); + menuParaCopyPasteSeparator.setVisible(!me._fillFormwMode); + // spellCheck - var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); + var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && !me._fillFormwMode); me.menuSpellPara.setVisible(spell); menuSpellcheckParaSeparator.setVisible(spell); menuIgnoreSpellPara.setVisible(spell); @@ -3941,9 +3965,9 @@ define([ if (frame_pr) menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin'); - menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart); - menuStyle.setVisible(me.mode.canEditStyles && !isInChart); - if (me.mode.canEditStyles && !isInChart) { + menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode); + menuStyle.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode); + if (me.mode.canEditStyles && !isInChart && !me._fillFormwMode) { me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName)); } @@ -3954,9 +3978,9 @@ define([ in_control = !in_toc && me.api.asc_IsContentControl(), control_props = in_control ? me.api.asc_GetContentControlProperties() : null, is_form = control_props && control_props.get_FormPr(); - menuParaRemoveControl.setVisible(in_control); - menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form); - menuParaControlSeparator.setVisible(in_control); + menuParaRemoveControl.setVisible(in_control && !me._fillFormwMode); + menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form && !me._fillFormwMode); + menuParaControlSeparator.setVisible(in_control && !me._fillFormwMode); if (in_control) { var lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; menuParaRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); @@ -3965,6 +3989,11 @@ define([ var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None; control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime; + + if (me._fillFormwMode && spectype !== Asc.c_oAscContentControlSpecificType.None) { + menuParaCut.setVisible(false); + menuParaPaste.setVisible(false); + } } menuParaTOCSettings.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc); @@ -4020,7 +4049,7 @@ define([ menuParaPrint, menuEquationInsertCaptionSeparator, menuEquationInsertCaption, - { caption: '--' }, + menuParaCopyPasteSeparator, menuEquationSeparator, menuParaRemoveControl, menuParaControlSettings, @@ -4427,9 +4456,10 @@ define([ _.defer(function(){ me.cmpEl.focus(); }, 50); }, - SetDisabled: function(state, canProtect) { + SetDisabled: function(state, canProtect, fillFormwMode) { this._isDisabled = state; this._canProtect = canProtect; + this._fillFormwMode = state ? fillFormwMode : false; }, alignmentText : 'Alignment', From c5326a95a756fc773d13841a349bc2339e766af0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 2 Sep 2021 23:26:46 +0300 Subject: [PATCH 085/129] [DE] Fix Bug 48154 --- .../main/app/view/TableOfContentsSettings.js | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index ba74998dd..a417d0e7c 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -319,8 +319,8 @@ define([ if (newValue) { this.levelsContainer.toggleClass('hidden', !newValue); this.stylesContainer.toggleClass('hidden', newValue); - if (this._needUpdateOutlineLevels) - this.synchronizeLevelsFromStyles(); + if (this._needUpdateOutlineLevels || this._forceUpdateOutlineLevels) + this.synchronizeLevelsFromStyles(true); } }, this)); @@ -354,19 +354,7 @@ define([ allowDecimal: false, maskExp: /[1-9]/ }); - this.spnLevels.on('change', _.bind(function(field, newValue, oldValue, eOpts){ - this._needUpdateStyles = true; - this.startLevel = 1; - this.endLevel = field.getNumberValue(); - - if (this.api && !this._noApply) { - var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr(); - properties.clear_Styles(); - properties.put_OutlineRange(this.startLevel, this.endLevel); - this.api.SetDrawImagePlaceContents('tableofcontents-img', properties); - this.scrollerY.update(); - } - }, this)); + this.spnLevels.on('change', _.bind(this.onLevelsChange, this)); this.stylesLevels = new Common.UI.DataViewStore(); @@ -629,6 +617,7 @@ define([ }); this.stylesLevels.reset(styles); if (checkStyles) { + this._forceUpdateOutlineLevels = true; this.radioStyles.setValue(true); this.stylesList.scroller.update({alwaysVisibleY: true}); var rec = this.stylesLevels.findWhere({checked: true}); @@ -715,7 +704,7 @@ define([ this._needUpdateStyles = false; }, - synchronizeLevelsFromStyles: function() { + synchronizeLevelsFromStyles: function(reset) { var new_start = -1, new_end = -1, empty_index = -1, disable_outlines = false; @@ -756,8 +745,10 @@ define([ this.startLevel = new_start; this.endLevel = new_end; - this.spnLevels.setValue(new_end>0 ? new_end : '', true); + this.spnLevels.setValue(new_end>0 ? new_end : (reset ? 9 : ''), true); + reset && (new_end<=0) && this.onLevelsChange(this.spnLevels); this._needUpdateOutlineLevels = false; + this._forceUpdateOutlineLevels = false; }, getSettings: function () { @@ -862,6 +853,20 @@ define([ } }, + onLevelsChange: function(field, newValue, oldValue, eOpts){ + this._needUpdateStyles = true; + this.startLevel = 1; + this.endLevel = field.getNumberValue(); + + if (this.api && !this._noApply) { + var properties = (this._originalProps) ? this._originalProps : new Asc.CTableOfContentsPr(); + properties.clear_Styles(); + properties.put_OutlineRange(this.startLevel, this.endLevel); + this.api.SetDrawImagePlaceContents('tableofcontents-img', properties); + this.scrollerY.update(); + } + }, + disableButtons: function() { this.type && this.btnOk.setDisabled(this.radioCaption.getValue() && this.cmbCaptions.getValue()===null || this.radioStyle.getValue() && this.cmbTOFStyles.length<1); }, From 51e2efcf9abfea2298f16ecfcf792d47099f922b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Sep 2021 00:31:19 +0300 Subject: [PATCH 086/129] [DE] Fix Bug 41845 --- apps/documenteditor/main/app/controller/Statusbar.js | 1 + apps/documenteditor/main/app/view/Statusbar.js | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index db122880e..987e3619d 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -103,6 +103,7 @@ define([ if (cfg.canReview) { me.btnTurnReview = review.getButton('turn', 'statusbar'); me.btnTurnReview.render(me.statusbar.$layout.find('#btn-doc-review')); + me.statusbar.btnTurnReview = me.btnTurnReview; } else { me.statusbar.$el.find('.el-review').hide(); } diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 62a7fdb48..d3731cf1c 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -366,6 +366,7 @@ define([ SetDisabled: function(disable) { this.btnLanguage.setDisabled(disable || this.langMenu.items.length<1); + this.btnTurnReview && this.btnTurnReview.setDisabled(disable); }, onApiCoAuthoringDisconnect: function() { From 1e3cc1d85b2f1e0289c15c21b4cd61df6b3df686 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Sep 2021 11:11:56 +0300 Subject: [PATCH 087/129] [DE PE SSE] Fix bug 52355 --- apps/common/main/lib/component/HintManager.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/component/HintManager.js b/apps/common/main/lib/component/HintManager.js index 095e4187c..af16505e2 100644 --- a/apps/common/main/lib/component/HintManager.js +++ b/apps/common/main/lib/component/HintManager.js @@ -368,8 +368,8 @@ Common.UI.HintManager = new(function() { _api = api; Common.NotificationCenter.on({ 'app:ready': function (mode) { - _lang = mode.lang; - _getAlphabetLetters(); + var lang = mode.lang ? mode.lang.toLowerCase() : 'en'; + _getAlphabetLetters(lang); }, 'hints:clear': _clearHints, 'window:resize': _clearHints @@ -492,10 +492,14 @@ Common.UI.HintManager = new(function() { }); }; - var _getAlphabetLetters = function () { + var _getAlphabetLetters = function (lng) { Common.Utils.loadConfig('../../common/main/resources/alphabetletters/alphabetletters.json', function (langsJson) { - _arrAlphabet = langsJson[_lang]; - _arrEnAlphabet = langsJson['en']; + var _setAlphabet = function (lang) { + _lang = lang; + _arrAlphabet = langsJson[lang]; + return _arrAlphabet; + }; + return !_setAlphabet(lng) ? (!_setAlphabet(lng.split(/[\-_]/)[0]) ? _setAlphabet('en') : true) : true; }); Common.Utils.loadConfig('../../common/main/resources/alphabetletters/qwertyletters.json', function (langsJson) { _arrQwerty = langsJson[_lang]; From b2777666b8cb9f87be3fcd83dcc17fa674beca70 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Fri, 3 Sep 2021 12:25:52 +0300 Subject: [PATCH 088/129] [themes] refactoring. skip es6 syntax --- apps/common/main/lib/controller/Themes.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index a6aa6cced..67d095eb5 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -249,12 +249,11 @@ define([ var theme_name = get_ui_theme_name(Common.localStorage.getItem('ui-theme')); if ( !theme_name ) { if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) - for (var i of document.body.classList.entries()) { - if ( i[1].startsWith('theme-') && !i[1].startsWith('theme-type-') ) { - theme_name = i[1]; - break; + document.body.classList.forEach(function (classname, i, o) { + if ( !theme_name && classname.startsWith('theme-') && !classname.startsWith('theme-type-') ) { + theme_name = classname; } - } + }); } if ( !themes_map[theme_name] ) From 8ab86fc4aed1e324607846c3e177259da8216456 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Sep 2021 13:58:58 +0300 Subject: [PATCH 089/129] Update translation --- apps/documenteditor/main/locale/be.json | 8 - apps/documenteditor/main/locale/bg.json | 5 - apps/documenteditor/main/locale/ca.json | 9 - apps/documenteditor/main/locale/cs.json | 7 - apps/documenteditor/main/locale/da.json | 9 - apps/documenteditor/main/locale/de.json | 9 - apps/documenteditor/main/locale/el.json | 9 - apps/documenteditor/main/locale/en.json | 33 +- apps/documenteditor/main/locale/es.json | 33 +- apps/documenteditor/main/locale/fi.json | 6 - apps/documenteditor/main/locale/fr.json | 20 +- apps/documenteditor/main/locale/hu.json | 9 - apps/documenteditor/main/locale/id.json | 6 - apps/documenteditor/main/locale/it.json | 27 +- apps/documenteditor/main/locale/ja.json | 9 - apps/documenteditor/main/locale/ko.json | 6 - apps/documenteditor/main/locale/lo.json | 9 - apps/documenteditor/main/locale/lv.json | 6 - apps/documenteditor/main/locale/nb.json | 4 +- apps/documenteditor/main/locale/nl.json | 9 - apps/documenteditor/main/locale/pl.json | 648 ++++++++++++++++++-- apps/documenteditor/main/locale/pt.json | 9 - apps/documenteditor/main/locale/ro.json | 27 +- apps/documenteditor/main/locale/ru.json | 33 +- apps/documenteditor/main/locale/sk.json | 9 - apps/documenteditor/main/locale/sl.json | 9 - apps/documenteditor/main/locale/sv.json | 9 - apps/documenteditor/main/locale/tr.json | 9 - apps/documenteditor/main/locale/uk.json | 7 - apps/documenteditor/main/locale/vi.json | 6 - apps/documenteditor/main/locale/zh.json | 8 - apps/presentationeditor/main/locale/be.json | 43 -- apps/presentationeditor/main/locale/bg.json | 43 -- apps/presentationeditor/main/locale/ca.json | 46 -- apps/presentationeditor/main/locale/cs.json | 43 -- apps/presentationeditor/main/locale/da.json | 44 -- apps/presentationeditor/main/locale/de.json | 44 -- apps/presentationeditor/main/locale/el.json | 44 -- apps/presentationeditor/main/locale/en.json | 102 +-- apps/presentationeditor/main/locale/es.json | 99 +-- apps/presentationeditor/main/locale/fi.json | 42 -- apps/presentationeditor/main/locale/fr.json | 44 -- apps/presentationeditor/main/locale/hu.json | 44 -- apps/presentationeditor/main/locale/id.json | 41 -- apps/presentationeditor/main/locale/it.json | 73 +-- apps/presentationeditor/main/locale/ja.json | 44 -- apps/presentationeditor/main/locale/ko.json | 43 -- apps/presentationeditor/main/locale/lo.json | 44 -- apps/presentationeditor/main/locale/lv.json | 42 -- apps/presentationeditor/main/locale/nl.json | 46 -- apps/presentationeditor/main/locale/pl.json | 122 ++-- apps/presentationeditor/main/locale/pt.json | 44 -- apps/presentationeditor/main/locale/ro.json | 99 +-- apps/presentationeditor/main/locale/ru.json | 101 +-- apps/presentationeditor/main/locale/sk.json | 44 -- apps/presentationeditor/main/locale/sl.json | 41 -- apps/presentationeditor/main/locale/sv.json | 48 +- apps/presentationeditor/main/locale/tr.json | 43 -- apps/presentationeditor/main/locale/uk.json | 42 -- apps/presentationeditor/main/locale/vi.json | 43 -- apps/presentationeditor/main/locale/zh.json | 43 -- apps/spreadsheeteditor/main/locale/be.json | 5 - apps/spreadsheeteditor/main/locale/bg.json | 5 - apps/spreadsheeteditor/main/locale/ca.json | 8 - apps/spreadsheeteditor/main/locale/cs.json | 5 - apps/spreadsheeteditor/main/locale/da.json | 6 - apps/spreadsheeteditor/main/locale/de.json | 6 - apps/spreadsheeteditor/main/locale/el.json | 6 - apps/spreadsheeteditor/main/locale/en.json | 142 ++--- apps/spreadsheeteditor/main/locale/es.json | 117 +++- apps/spreadsheeteditor/main/locale/fi.json | 5 - apps/spreadsheeteditor/main/locale/fr.json | 6 - apps/spreadsheeteditor/main/locale/hu.json | 6 - apps/spreadsheeteditor/main/locale/id.json | 4 - apps/spreadsheeteditor/main/locale/it.json | 12 +- apps/spreadsheeteditor/main/locale/ja.json | 6 - apps/spreadsheeteditor/main/locale/ko.json | 5 - apps/spreadsheeteditor/main/locale/lo.json | 6 - apps/spreadsheeteditor/main/locale/lv.json | 5 - apps/spreadsheeteditor/main/locale/nl.json | 6 - apps/spreadsheeteditor/main/locale/pl.json | 424 ++++++++++++- apps/spreadsheeteditor/main/locale/pt.json | 6 - apps/spreadsheeteditor/main/locale/ro.json | 121 +++- apps/spreadsheeteditor/main/locale/ru.json | 117 +++- apps/spreadsheeteditor/main/locale/sk.json | 5 - apps/spreadsheeteditor/main/locale/sl.json | 6 - apps/spreadsheeteditor/main/locale/sv.json | 10 +- apps/spreadsheeteditor/main/locale/tr.json | 5 - apps/spreadsheeteditor/main/locale/uk.json | 4 - apps/spreadsheeteditor/main/locale/vi.json | 5 - apps/spreadsheeteditor/main/locale/zh.json | 5 - 91 files changed, 1822 insertions(+), 1895 deletions(-) diff --git a/apps/documenteditor/main/locale/be.json b/apps/documenteditor/main/locale/be.json index 1f5a25a16..d22de3337 100644 --- a/apps/documenteditor/main/locale/be.json +++ b/apps/documenteditor/main/locale/be.json @@ -123,7 +123,6 @@ "Common.UI.Calendar.textShortTuesday": "Аў", "Common.UI.Calendar.textShortWednesday": "Сер", "Common.UI.Calendar.textYears": "Гады", - "Common.UI.ColorButton.textNewColor": "Дадаць новы адвольны колер", "Common.UI.ComboBorderSize.txtNoBorders": "Без межаў", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без межаў", "Common.UI.ComboDataView.emptyComboText": "Без стыляў", @@ -1548,11 +1547,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Дадатковыя налады…", "DE.Views.FileMenu.btnToEditCaption": "Рэдагаваць дакумент", "DE.Views.FileMenu.textDownload": "Спампаваць", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пусты", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Па шаблоне", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Стварыце новы пусты тэкставы дакумент, да якога зможаце ўжыць стылі і адфарматаваць яго пасля яго стварэння. Альбо вы можаце абраць адзін з шаблонаў, каб стварыць дакумент пэўнага тыпу альбо прызначэння, дзе ўжо загадзя ўжытыя пэўныя стылі.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новы тэкставы дакумент", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблон адсутнічае", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Ужыць", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Дадаць аўтара", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Дадаць тэкст", @@ -1645,7 +1639,6 @@ "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Паказваць апавяшчэнне", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Адключыць усе макрасы з апавяшчэннем", "DE.Views.FileMenuPanels.Settings.txtWin": "як Windows", - "DE.Views.FormsTab.textNewColor": "Дадаць новы адвольны колер", "DE.Views.HeaderFooterSettings.textBottomCenter": "Знізу па цэнтры", "DE.Views.HeaderFooterSettings.textBottomLeft": "Знізу злева", "DE.Views.HeaderFooterSettings.textBottomPage": "Унізе старонкі", @@ -2531,7 +2524,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Курсіў", "DE.Views.WatermarkSettingsDialog.textLanguage": "Мова", "DE.Views.WatermarkSettingsDialog.textLayout": "Макет", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Дадаць новы адвольны колер", "DE.Views.WatermarkSettingsDialog.textNone": "Няма", "DE.Views.WatermarkSettingsDialog.textScale": "Маштаб", "DE.Views.WatermarkSettingsDialog.textSelect": "Абраць выяву", diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json index 0900cd991..8ff3d70ce 100644 --- a/apps/documenteditor/main/locale/bg.json +++ b/apps/documenteditor/main/locale/bg.json @@ -1349,11 +1349,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Разширени настройки ...", "DE.Views.FileMenu.btnToEditCaption": "Редактиране на документ", "DE.Views.FileMenu.textDownload": "Изтегли", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Празно", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "От шаблон", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Създайте нов празен текстов документ, който ще можете да форматирате и форматирате, след като бъде създаден по време на редактирането. Или изберете един от шаблоните, за да стартирате документ от определен тип или цел, където някои стилове вече са били предварително приложени.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Нов текстов документ", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Няма шаблони", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добави автор", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", diff --git a/apps/documenteditor/main/locale/ca.json b/apps/documenteditor/main/locale/ca.json index dee4f0e8a..b9c4849d5 100644 --- a/apps/documenteditor/main/locale/ca.json +++ b/apps/documenteditor/main/locale/ca.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "dm.", "Common.UI.Calendar.textShortWednesday": "dc.", "Common.UI.Calendar.textYears": "Anys", - "Common.UI.ColorButton.textAutoColor": "Automàtic", - "Common.UI.ColorButton.textNewColor": "Afegeix un color personalitzat nou ", "Common.UI.ComboBorderSize.txtNoBorders": "Sense vores", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sense vores", "Common.UI.ComboDataView.emptyComboText": "Sense estils", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Configuració avançada...", "DE.Views.FileMenu.btnToEditCaption": "Edita el document", "DE.Views.FileMenu.textDownload": "Baixa", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Des de zero", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Des d'una plantilla", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creeu un nou document de text en blanc que podreu estilitzar i formatar després de crear-lo durant l'edició. O bé escolliu una de les plantilles per iniciar un document d'un determinat tipus o propòsit en què ja s'hagin aplicat prèviament alguns estils.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nou document de text", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hi ha plantilles", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplica", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Afegeix l'autor", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Afegeix text", @@ -1789,7 +1782,6 @@ "DE.Views.FormsTab.textClear": "Esborra els camps", "DE.Views.FormsTab.textClearFields": "Esborra tots els camps", "DE.Views.FormsTab.textHighlight": "Ressalta la configuració", - "DE.Views.FormsTab.textNewColor": "Afegeix un color personalitzat nou", "DE.Views.FormsTab.textNoHighlight": "Sense ressaltar", "DE.Views.FormsTab.textRequired": "Emplena tots els camps necessaris per enviar el formulari.", "DE.Views.FormsTab.textSubmited": "El formulari s'ha enviat correctament", @@ -2751,7 +2743,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Cursiva", "DE.Views.WatermarkSettingsDialog.textLanguage": "Idioma", "DE.Views.WatermarkSettingsDialog.textLayout": "Disposició", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Afegeix un color personalitzat nou ", "DE.Views.WatermarkSettingsDialog.textNone": "Cap", "DE.Views.WatermarkSettingsDialog.textScale": "Escala", "DE.Views.WatermarkSettingsDialog.textSelect": "Selecciona una imatge", diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index ae4078719..ce60179ab 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -118,7 +118,6 @@ "Common.UI.Calendar.textShortTuesday": "út", "Common.UI.Calendar.textShortWednesday": "st", "Common.UI.Calendar.textYears": "Let", - "Common.UI.ColorButton.textNewColor": "Přidat novou uživatelsky určenou barvu", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -1474,11 +1473,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Pokročilá nastavení…", "DE.Views.FileMenu.btnToEditCaption": "Upravit dokument", "DE.Views.FileMenu.textDownload": "Stáhnout", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdného", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Ze šablony", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvořte nový prázdný textový dokument, který si pak od začátku budete opatřovat styly a formátovat podle sebe. Nebo si vyberte jednu ze šablon a začněte s dokumentem určitého typu nebo účelu, kde už jsou některé styly předpřipravené.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nový textový dokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nejsou zde žádné šablony", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Použít", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Přidat autora", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Přidat text", @@ -2397,7 +2391,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Skloněné", "DE.Views.WatermarkSettingsDialog.textLanguage": "Jazyk", "DE.Views.WatermarkSettingsDialog.textLayout": "Rozvržení", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Přidat novou uživatelsky určenou barvu", "DE.Views.WatermarkSettingsDialog.textNone": "Žádné", "DE.Views.WatermarkSettingsDialog.textScale": "Změnit měřítko", "DE.Views.WatermarkSettingsDialog.textStrikeout": "Přeškrtnuté", diff --git a/apps/documenteditor/main/locale/da.json b/apps/documenteditor/main/locale/da.json index 968652305..08b451f3a 100644 --- a/apps/documenteditor/main/locale/da.json +++ b/apps/documenteditor/main/locale/da.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Ti", "Common.UI.Calendar.textShortWednesday": "Ons", "Common.UI.Calendar.textYears": "år", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Tilføj ny brugerdefineret farve", "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ingen rammer", "Common.UI.ComboDataView.emptyComboText": "Ingen stilarter", @@ -1620,11 +1618,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Avancerede indstillinger...", "DE.Views.FileMenu.btnToEditCaption": "Rediger dokument", "DE.Views.FileMenu.textDownload": "Hent", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Fra blank", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Fra skabelon", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Lav et nyt blankt tekst dokument, som di vil være i stand til at kunne formattere efter det er oprettet under redigeringen. Eller vælg en af skabelonerne til at oprette et dokument af en bestemt type som allerede har en bestemt formattering tilføjet. ", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nyt tekst dokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Der er ikke nogle skabeloner", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anvend", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tilføj forfatter", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tilføj tekst", @@ -1760,7 +1753,6 @@ "DE.Views.FormsTab.textClear": "Ryd felter", "DE.Views.FormsTab.textClearFields": "Ryd alle felter", "DE.Views.FormsTab.textHighlight": "Fremhæv indstillinger", - "DE.Views.FormsTab.textNewColor": "Tilføj ny brugerdefineret farve", "DE.Views.FormsTab.textNoHighlight": "Ingen fremhævning", "DE.Views.FormsTab.textSubmited": "Formular indsendt med succes", "DE.Views.FormsTab.tipCheckBox": "Indsæt afkrydsningsfelt", @@ -2695,7 +2687,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Kursiv", "DE.Views.WatermarkSettingsDialog.textLanguage": "Sprog", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Tilføj ny brugerdefineret farve", "DE.Views.WatermarkSettingsDialog.textNone": "ingen", "DE.Views.WatermarkSettingsDialog.textScale": "Størrelse", "DE.Views.WatermarkSettingsDialog.textSelect": "Vælg billede", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 54885acc5..6af49b8ab 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Di", "Common.UI.Calendar.textShortWednesday": "Mi", "Common.UI.Calendar.textYears": "Jahre", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Benutzerdefinierte Farbe", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1644,11 +1642,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Erweiterte Einstellungen...", "DE.Views.FileMenu.btnToEditCaption": "Dokument bearbeiten", "DE.Views.FileMenu.textDownload": "Herunterladen", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Aus leerer Datei", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Aus Vorlage", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Erstellen Sie ein leeres Textdokument, das Sie nach seiner Erstellung bei der Bearbeitung formatieren können. Oder wählen Sie eine der Vorlagen, um ein Dokument eines bestimmten Typs (für einen bestimmten Zweck) zu erstellen, wo einige Stile bereits angewandt sind.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Neues Textdokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Es gibt keine Vorlagen", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anwenden", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Autor hinzufügen", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Text hinzufügen", @@ -1794,7 +1787,6 @@ "DE.Views.FormsTab.textClear": "Felder löschen", "DE.Views.FormsTab.textClearFields": "Alle Felder löschen", "DE.Views.FormsTab.textHighlight": "Einstellungen für Hervorhebungen", - "DE.Views.FormsTab.textNewColor": "Benutzerdefinierte Farbe", "DE.Views.FormsTab.textNoHighlight": "Ohne Hervorhebung", "DE.Views.FormsTab.textRequired": "Füllen Sie alle erforderlichen Felder aus, um das Formular zu senden.", "DE.Views.FormsTab.textSubmited": "Das Formular wurde erfolgreich versandt", @@ -2756,7 +2748,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Kursiv", "DE.Views.WatermarkSettingsDialog.textLanguage": "Sprache", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Benutzerdefinierte Farbe", "DE.Views.WatermarkSettingsDialog.textNone": "Kein", "DE.Views.WatermarkSettingsDialog.textScale": "Maßstab", "DE.Views.WatermarkSettingsDialog.textSelect": "Bild auswählen", diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index 61c48162a..4f5f638be 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -157,8 +157,6 @@ "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": "Χωρίς περιγράμματα", "Common.UI.ComboDataView.emptyComboText": "Χωρίς τεχνοτροπίες", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Προηγμένες Ρυθμίσεις...", "DE.Views.FileMenu.btnToEditCaption": "Επεξεργασία Εγγράφου", "DE.Views.FileMenu.textDownload": "Λήψη", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Από Κενό", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Από Πρότυπο", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Δημιουργήστε ένα νέο κενό έγγραφο για μορφοποίηση κατά βούληση. Ή επιλέξτε ένα από τα πρότυπα για να δημιουργήσετε ένα έγγραφο συγκεκριμένου τύπου ή σκοπού με προ-εφαρμοσμένες τεχνοτροπίες.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Νέο Έγγραφο Κειμένου", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Δεν υπάρχουν πρότυπα", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Εφαρμογή", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Προσθήκη Συγγραφέα", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Προσθήκη Κειμένου", @@ -1789,7 +1782,6 @@ "DE.Views.FormsTab.textClear": "Εκκαθάριση Πεδίων", "DE.Views.FormsTab.textClearFields": "Εκκαθάριση Όλων των Πεδίων", "DE.Views.FormsTab.textHighlight": "Ρυθμίσεις Επισήμανσης", - "DE.Views.FormsTab.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", "DE.Views.FormsTab.textNoHighlight": "Χωρίς επισήμανση", "DE.Views.FormsTab.textRequired": "Συμπληρώστε όλα τα απαιτούμενα πεδία για την αποστολή της φόρμας.", "DE.Views.FormsTab.textSubmited": "Η φόρμα υποβλήθηκε επιτυχώς", @@ -2751,7 +2743,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Πλάγια", "DE.Views.WatermarkSettingsDialog.textLanguage": "Γλώσσα", "DE.Views.WatermarkSettingsDialog.textLayout": "Διάταξη", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", "DE.Views.WatermarkSettingsDialog.textNone": "Κανένα", "DE.Views.WatermarkSettingsDialog.textScale": "Κλίμακα", "DE.Views.WatermarkSettingsDialog.textSelect": "Επιλογή Εικόνας", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d4c486749..c7053b371 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -159,8 +159,6 @@ "Common.UI.Calendar.textShortTuesday": "Tu", "Common.UI.Calendar.textShortWednesday": "We", "Common.UI.Calendar.textYears": "Years", - "del_Common.UI.ColorButton.textAutoColor": "Automatic", - "del_Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -392,9 +390,9 @@ "Common.Views.ReviewChanges.txtFinalCap": "Final", "Common.Views.ReviewChanges.txtHistory": "Version History", "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", - "Common.Views.ReviewChanges.txtMarkupCap": "Markup", - "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)
    Turn off balloons", - "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Simple Markup", + "Common.Views.ReviewChanges.txtMarkupCap": "Markup and balloons", + "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)
    No balloons", + "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Only markup", "Common.Views.ReviewChanges.txtNext": "Next", "Common.Views.ReviewChanges.txtOff": "OFF for me", "Common.Views.ReviewChanges.txtOffGlobal": "OFF for me and everyone", @@ -887,6 +885,7 @@ "DE.Controllers.Toolbar.textAccent": "Accents", "DE.Controllers.Toolbar.textBracket": "Brackets", "DE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.", + "DE.Controllers.Toolbar.textEmptyMMergeUrl": "You need to specify URL.", "DE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
    Please enter a numeric value between 1 and 300", "DE.Controllers.Toolbar.textFraction": "Fractions", "DE.Controllers.Toolbar.textFunction": "Functions", @@ -1220,7 +1219,6 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", - "DE.Controllers.Toolbar.textEmptyMMergeUrl": "You need to specify URL.", "DE.Controllers.Viewport.textFitPage": "Fit to Page", "DE.Controllers.Viewport.textFitWidth": "Fit to Width", "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:", @@ -1657,13 +1655,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "DE.Views.FileMenu.btnToEditCaption": "Edit Document", "DE.Views.FileMenu.textDownload": "Download", - "del_DE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "del_DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "del_DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank text document which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a document of a certain type or purpose where some styles have already been pre-applied.", - "del_DE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Text Document", - "del_DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", - "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Blank Document", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Apply", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text", @@ -1716,6 +1709,7 @@ "DE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste", "DE.Views.FileMenuPanels.Settings.strPasteButton": "Show the Paste Options button when the content is pasted", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Turn on display of the resolved comments", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Track Changes Display", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Real-time Collaboration Changes", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Turn on spell checking option", "DE.Views.FileMenuPanels.Settings.strStrict": "Strict", @@ -1737,6 +1731,8 @@ "DE.Views.FileMenuPanels.Settings.txtAll": "View All", "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "AutoCorrect options...", "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Default cache mode", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Show by click in balloons", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Show by hover in tooltips", "DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width", @@ -1757,12 +1753,10 @@ "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", - "DE.Views.FileMenuPanels.Settings.strReviewHover": "Track Changes Display", - "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Show by hover in tooltips", - "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Show by click in balloons", "DE.Views.FormSettings.textAlways": "Always", "DE.Views.FormSettings.textAspect": "Lock aspect ratio", "DE.Views.FormSettings.textAutofit": "AutoFit", + "DE.Views.FormSettings.textBackgroundColor": "Background Color", "DE.Views.FormSettings.textCheckbox": "Checkbox", "DE.Views.FormSettings.textColor": "Border color", "DE.Views.FormSettings.textComb": "Comb of characters", @@ -1799,7 +1793,6 @@ "DE.Views.FormSettings.textUnlock": "Unlock", "DE.Views.FormSettings.textValue": "Value Options", "DE.Views.FormSettings.textWidth": "Cell width", - "DE.Views.FormSettings.textBackgroundColor": "Background Color", "DE.Views.FormsTab.capBtnCheckBox": "Checkbox", "DE.Views.FormsTab.capBtnComboBox": "Combo Box", "DE.Views.FormsTab.capBtnDropDown": "Dropdown", @@ -1813,7 +1806,6 @@ "DE.Views.FormsTab.textClear": "Clear Fields", "DE.Views.FormsTab.textClearFields": "Clear All Fields", "DE.Views.FormsTab.textHighlight": "Highlight Settings", - "del_DE.Views.FormsTab.textNewColor": "Add New Custom Color", "DE.Views.FormsTab.textNoHighlight": "No highlighting", "DE.Views.FormsTab.textRequired": "Fill all required fields to send form.", "DE.Views.FormsTab.textSubmited": "Form submitted successfully", @@ -2589,6 +2581,9 @@ "DE.Views.Toolbar.mniEditFooter": "Edit Footer", "DE.Views.Toolbar.mniEditHeader": "Edit Header", "DE.Views.Toolbar.mniEraseTable": "Erase Table", + "DE.Views.Toolbar.mniFromFile": "From File", + "DE.Views.Toolbar.mniFromStorage": "From Storage", + "DE.Views.Toolbar.mniFromUrl": "From URL", "DE.Views.Toolbar.mniHiddenBorders": "Hidden Table Borders", "DE.Views.Toolbar.mniHiddenChars": "Nonprinting Characters", "DE.Views.Toolbar.mniHighlightControls": "Highlight Settings", @@ -2762,9 +2757,6 @@ "DE.Views.Toolbar.txtScheme7": "Equity", "DE.Views.Toolbar.txtScheme8": "Flow", "DE.Views.Toolbar.txtScheme9": "Foundry", - "DE.Views.Toolbar.mniFromFile": "From File", - "DE.Views.Toolbar.mniFromUrl": "From URL", - "DE.Views.Toolbar.mniFromStorage": "From Storage", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Bold", "DE.Views.WatermarkSettingsDialog.textColor": "Text color", @@ -2778,7 +2770,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Italic", "DE.Views.WatermarkSettingsDialog.textLanguage": "Language", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "del_DE.Views.WatermarkSettingsDialog.textNewColor": "Add New Custom Color", "DE.Views.WatermarkSettingsDialog.textNone": "None", "DE.Views.WatermarkSettingsDialog.textScale": "Scale", "DE.Views.WatermarkSettingsDialog.textSelect": "Select Image", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index c8656096b..2553ef1d1 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -124,6 +124,8 @@ "Common.Translation.warnFileLocked": "No puede editar este archivo porque está siendo editado en otra aplicación.", "Common.Translation.warnFileLockedBtnEdit": "Crear una copia", "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar", + "Common.UI.ButtonColored.textAutoColor": "Automático", + "Common.UI.ButtonColored.textNewColor": "Añadir nuevo color personalizado", "Common.UI.Calendar.textApril": "Abril", "Common.UI.Calendar.textAugust": "Agosto", "Common.UI.Calendar.textDecember": "Diciembre", @@ -157,8 +159,6 @@ "Common.UI.Calendar.textShortTuesday": "ma.", "Common.UI.Calendar.textShortWednesday": "mi.", "Common.UI.Calendar.textYears": "Años", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Color personalizado", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -231,6 +231,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Cualquier autocorreción que haya agregado se eliminará y los modificados serán restaurados a sus valores originales. ¿Desea continuar?", "Common.Views.AutoCorrectDialog.warnRestore": "La entrada de autocorrección para %1 será restablecida a su valor original. ¿Desea continuar?", "Common.Views.Chat.textSend": "Enviar", + "Common.Views.Comments.mniAuthorAsc": "Autor de A a Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de Z a A", + "Common.Views.Comments.mniDateAsc": "Más antiguo", + "Common.Views.Comments.mniDateDesc": "Más reciente", + "Common.Views.Comments.mniPositionAsc": "Desde arriba", + "Common.Views.Comments.mniPositionDesc": "Desde abajo", "Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", @@ -238,6 +244,7 @@ "Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textCancel": "Cancelar", "Common.Views.Comments.textClose": "Cerrar", + "Common.Views.Comments.textClosePanel": "Cerrar comentarios", "Common.Views.Comments.textComments": "Comentarios", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Introduzca su comentario aquí", @@ -246,6 +253,7 @@ "Common.Views.Comments.textReply": "Responder", "Common.Views.Comments.textResolve": "Resolver", "Common.Views.Comments.textResolved": "Resuelto", + "Common.Views.Comments.textSort": "Ordenar comentarios", "Common.Views.CopyWarningDialog.textDontShow": "No volver a mostrar este mensaje", "Common.Views.CopyWarningDialog.textMsg": "Se puede realizar las acciones de copiar, cortar y pegar usando los botones en la barra de herramientas y el menú contextual sólo en esta pestaña del editor.

    Si quiere copiar o pegar algo fuera de esta pestaña, usa las combinaciones de teclas siguientes:", "Common.Views.CopyWarningDialog.textTitle": "Funciones de Copiar, Cortar y Pegar", @@ -381,9 +389,9 @@ "Common.Views.ReviewChanges.txtFinalCap": "Final", "Common.Views.ReviewChanges.txtHistory": "Historial de versiones", "Common.Views.ReviewChanges.txtMarkup": "Todos los cambios (Edición)", - "Common.Views.ReviewChanges.txtMarkupCap": "Margen", - "Common.Views.ReviewChanges.txtMarkupSimple": "Todos los cambios (Edición)
    Desactivar los globos", - "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Revisiones simples", + "Common.Views.ReviewChanges.txtMarkupCap": "Revisiones y globos", + "Common.Views.ReviewChanges.txtMarkupSimple": "Todos los cambios (Edición)
    Sin globos", + "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Sólo revisiones", "Common.Views.ReviewChanges.txtNext": "Al siguiente cambio", "Common.Views.ReviewChanges.txtOff": "Desactivar para mí", "Common.Views.ReviewChanges.txtOffGlobal": "Desactivar para mí y para todos", @@ -581,6 +589,7 @@ "DE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", "DE.Controllers.Main.textConvertEquation": "Esta ecuación fue creada con una versión antigua del editor de ecuaciones que ya no es compatible. Para editarla, convierta la ecuación al formato ML de Office Math.
    ¿Convertir ahora?", "DE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
    Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", + "DE.Controllers.Main.textDisconnect": "Se ha perdido la conexión", "DE.Controllers.Main.textGuest": "Invitado", "DE.Controllers.Main.textHasMacros": "El archivo contiene macros automáticas.
    ¿Quiere ejecutar macros?", "DE.Controllers.Main.textLearnMore": "Más información", @@ -1644,11 +1653,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Ajustes avanzados...", "DE.Views.FileMenu.btnToEditCaption": "Editar documento", "DE.Views.FileMenu.textDownload": "Descargar", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "De documento en blanco", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "De plantilla", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree un nuevo documento de texto en blanco para trabajar con el estilo y el formato y editarlo según sus necesidades. O seleccione una de las plantillas para iniciar documento de cierto tipo o propósito donde algunos estilos se han aplicado ya.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuevo documento de texto", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hay ningunas plantillas", + "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Documento en blanco", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Crear nuevo", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto", @@ -1701,6 +1707,7 @@ "DE.Views.FileMenuPanels.Settings.strPaste": "Cortar, copiar y pegar", "DE.Views.FileMenuPanels.Settings.strPasteButton": "Mostrar el botón Opciones de pegado cuando se pegue contenido", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Activar la visualización de los comentarios resueltos", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Mostrar el seguimiento de cambios", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Cambios de colaboración en tiempo real", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activar corrección ortográfica", "DE.Views.FileMenuPanels.Settings.strStrict": "Estricto", @@ -1722,6 +1729,8 @@ "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo", "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opciones de autocorrección", "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Modo de caché predeterminado", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Mostrar con un clic en los globos", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Mostrar al mantener el puntero en la información sobre herramientas", "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Ajustar a la página", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajustar al ancho", @@ -1794,7 +1803,6 @@ "DE.Views.FormsTab.textClear": "Borrar campos", "DE.Views.FormsTab.textClearFields": "Borrar todos los campos", "DE.Views.FormsTab.textHighlight": "Ajustes de resaltado", - "DE.Views.FormsTab.textNewColor": "Color personalizado", "DE.Views.FormsTab.textNoHighlight": "No resaltar", "DE.Views.FormsTab.textRequired": "Rellene todos los campos obligatorios para enviar el formulario.", "DE.Views.FormsTab.textSubmited": "El formulario se ha enviado correctamente", @@ -2650,7 +2658,7 @@ "DE.Views.Toolbar.textTabInsert": "Insertar", "DE.Views.Toolbar.textTabLayout": "Diseño", "DE.Views.Toolbar.textTabLinks": "Referencias", - "DE.Views.Toolbar.textTabProtect": "Proteción", + "DE.Views.Toolbar.textTabProtect": "Protección", "DE.Views.Toolbar.textTabReview": "Revisar", "DE.Views.Toolbar.textTitleError": "Error", "DE.Views.Toolbar.textToCurrent": "A la posición actual", @@ -2756,7 +2764,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Cursiva", "DE.Views.WatermarkSettingsDialog.textLanguage": "Idioma", "DE.Views.WatermarkSettingsDialog.textLayout": "Disposición", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Color personalizado", "DE.Views.WatermarkSettingsDialog.textNone": "Ninguno", "DE.Views.WatermarkSettingsDialog.textScale": "Escala", "DE.Views.WatermarkSettingsDialog.textSelect": "Seleccionar Imagen", diff --git a/apps/documenteditor/main/locale/fi.json b/apps/documenteditor/main/locale/fi.json index 9eb10f960..731ab5af9 100644 --- a/apps/documenteditor/main/locale/fi.json +++ b/apps/documenteditor/main/locale/fi.json @@ -63,7 +63,6 @@ "Common.Controllers.ReviewChanges.textTabs": "Vaihda välilehtiä", "Common.Controllers.ReviewChanges.textUnderline": "Alleviivaus", "Common.Controllers.ReviewChanges.textWidow": "Leskirivien hallinta", - "Common.UI.ColorButton.textNewColor": "Lisää uusi mukautettu väri", "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunusta", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia", "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä", @@ -1036,11 +1035,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Laajennetut asetukset...", "DE.Views.FileMenu.btnToEditCaption": "Muokkaa asiakirjaa", "DE.Views.FileMenu.textDownload": "Lataa", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Tyhjästä", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Mallipohjasta", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Luo uusi, tyhjä tekstiasiakirja, ja voit sitten vaihtaa tyyliä ja muotoa muokkauksen aikana. Tai valitse mallipohja tietynlaisen asiakirjan luomiseen tai tiettyyn tarkoitukseen, missä tietyt tyylit ovat jo ennakolta valittu.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Uusi tekstiasiakirja", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ei ole mallipohjia", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Lisää teksti", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Kirjoittaja", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Muuta pääsyoikeuksia", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 4feca73a0..5e8d3e748 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -124,6 +124,8 @@ "Common.Translation.warnFileLocked": "Vous ne pouvez pas modifier ce fichier car il a été modifié avec une autre application.", "Common.Translation.warnFileLockedBtnEdit": "Créer une copie", "Common.Translation.warnFileLockedBtnView": "Ouvrir pour visualisation", + "Common.UI.ButtonColored.textAutoColor": "Automatique", + "Common.UI.ButtonColored.textNewColor": "Ajouter une nouvelle couleur personnalisée", "Common.UI.Calendar.textApril": "avril", "Common.UI.Calendar.textAugust": "août", "Common.UI.Calendar.textDecember": "décembre", @@ -157,8 +159,6 @@ "Common.UI.Calendar.textShortTuesday": "mar.", "Common.UI.Calendar.textShortWednesday": "mer.", "Common.UI.Calendar.textYears": "années", - "Common.UI.ColorButton.textAutoColor": "Automatique", - "Common.UI.ColorButton.textNewColor": "Couleur personnalisée", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -231,6 +231,8 @@ "Common.Views.AutoCorrectDialog.warnReset": "Toutes les autocorrections que vous avez ajouté seront supprimées et celles que vous avez modifiées seront réinitialisées à leurs valeurs originales. Voulez-vous continuer ?", "Common.Views.AutoCorrectDialog.warnRestore": "Ce symbol d'autocorrection pour 1% sera réinitialisé à sa valeur initiale. Voulez-vous continuer ?", "Common.Views.Chat.textSend": "Envoyer", + "Common.Views.Comments.mniAuthorAsc": "Auteur de A à Z", + "Common.Views.Comments.mniAuthorDesc": "Auteur de Z à A", "Common.Views.Comments.textAdd": "Ajouter", "Common.Views.Comments.textAddComment": "Ajouter", "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document", @@ -381,9 +383,9 @@ "Common.Views.ReviewChanges.txtFinalCap": "Final", "Common.Views.ReviewChanges.txtHistory": "Historique des versions", "Common.Views.ReviewChanges.txtMarkup": "Toutes les modifications (Édition)", - "Common.Views.ReviewChanges.txtMarkupCap": "Balisage", - "Common.Views.ReviewChanges.txtMarkupSimple": "Toutes les modifications(Éditions)
    Désactiver les bulles", - "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marques simples", + "Common.Views.ReviewChanges.txtMarkupCap": "Balisage et ballons", + "Common.Views.ReviewChanges.txtMarkupSimple": "Tous les changements (Édition)
    Désactiver les ballons", + "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Balisage uniquement", "Common.Views.ReviewChanges.txtNext": "À la modification suivante", "Common.Views.ReviewChanges.txtOff": "OFF pour moi ", "Common.Views.ReviewChanges.txtOffGlobal": "OFF pour moi et tout le monde", @@ -1644,11 +1646,7 @@ "DE.Views.FileMenu.btnSettingsCaption": "Paramètres avancés...", "DE.Views.FileMenu.btnToEditCaption": "Modifier le document", "DE.Views.FileMenu.textDownload": "Télécharger", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "A partir d'un blanc", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "A partir d'un modèle", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un nouveau document texte vierge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer un document d'un certain type ou objectif.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau document texte ", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles", + "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Document vide", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte", @@ -1794,7 +1792,6 @@ "DE.Views.FormsTab.textClear": "Effacer les champs", "DE.Views.FormsTab.textClearFields": "Effacer tous les champs", "DE.Views.FormsTab.textHighlight": "Paramètres de surbrillance", - "DE.Views.FormsTab.textNewColor": "Couleur personnalisée", "DE.Views.FormsTab.textNoHighlight": "Pas de surbrillance ", "DE.Views.FormsTab.textRequired": "Veuillez remplir tous les champs obligatoires avant d'envoyer le formulaire.", "DE.Views.FormsTab.textSubmited": "Formulaire soumis avec succès", @@ -2756,7 +2753,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Italique", "DE.Views.WatermarkSettingsDialog.textLanguage": "Langue", "DE.Views.WatermarkSettingsDialog.textLayout": "Mise en page", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Couleur personnalisée", "DE.Views.WatermarkSettingsDialog.textNone": "Aucun", "DE.Views.WatermarkSettingsDialog.textScale": "Échelle", "DE.Views.WatermarkSettingsDialog.textSelect": "Sélectionner une image", diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 22f07e375..6ff09d40b 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Ke", "Common.UI.Calendar.textShortWednesday": "Sze", "Common.UI.Calendar.textYears": "Évek", - "Common.UI.ColorButton.textAutoColor": "Automatikus", - "Common.UI.ColorButton.textNewColor": "Új egyéni szín hozzáadása", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -1618,11 +1616,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Haladó beállítások...", "DE.Views.FileMenu.btnToEditCaption": "Dokumentum szerkesztése", "DE.Views.FileMenu.textDownload": "Letöltés", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Üres fájlból", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Sablonból", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Hozzon létre egy új üres szöveges dokumentumot, amelynek stílusát és formátumát a későbbi a szerkesztés során adhatja meg. Választhat továbbá bizonyos típusú vagy célú dokumentumsablonok közül, ahol bizonyos stílusokat már előzetesen létrehoztak.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Új szöveges dokumentum", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nincsenek sablonok", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Alkalmaz", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Szerző hozzáadása", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Szöveg hozzáadása", @@ -1758,7 +1751,6 @@ "DE.Views.FormsTab.textClear": "Mezők törlése", "DE.Views.FormsTab.textClearFields": "Az összes mező törlése", "DE.Views.FormsTab.textHighlight": "Kiemelés beállításai", - "DE.Views.FormsTab.textNewColor": "Új egyéni szín hozzáadása", "DE.Views.FormsTab.textNoHighlight": "Nincs kiemelés", "DE.Views.FormsTab.textSubmited": "Az űrlap sikeresen elküldve", "DE.Views.FormsTab.tipCheckBox": "Jelölőnégyzet beszúrása", @@ -2692,7 +2684,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Dőlt", "DE.Views.WatermarkSettingsDialog.textLanguage": "Nyelv", "DE.Views.WatermarkSettingsDialog.textLayout": "Elrendezés", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Új egyéni szín hozzáadása", "DE.Views.WatermarkSettingsDialog.textNone": "Nincs", "DE.Views.WatermarkSettingsDialog.textScale": "Mérték", "DE.Views.WatermarkSettingsDialog.textSelect": "Kép kiválasztása", diff --git a/apps/documenteditor/main/locale/id.json b/apps/documenteditor/main/locale/id.json index 844db0e42..1f6bf06d4 100644 --- a/apps/documenteditor/main/locale/id.json +++ b/apps/documenteditor/main/locale/id.json @@ -63,7 +63,6 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", - "Common.UI.ColorButton.textNewColor": "Tambahkan Warna Khusus Baru", "Common.UI.ComboBorderSize.txtNoBorders": "Tidak ada pembatas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Tidak ada pembatas", "Common.UI.ComboDataView.emptyComboText": "Tidak ada model", @@ -826,11 +825,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Pengaturan Lanjut...", "DE.Views.FileMenu.btnToEditCaption": "Edit Dokumen", "DE.Views.FileMenu.textDownload": "Download", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Dari Halaman Kosong", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Dari Template", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Buat sebuah dokumen kosong yang dapat Anda ubah model dan formatnya pada saat mengedit. Atau pilihlah salah satu template untuk mulai membuat dokumen dengan tipe tertentu atau untuk tujuan tertentu, dengan sejumlah model yang telah disediakan.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Dokumen Teks Baru", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tidak ada template", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Penulis", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Ubah hak akses", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Memuat...", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 957f6a994..efc9bd24b 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -124,6 +124,8 @@ "Common.Translation.warnFileLocked": "Non puoi modificare questo file perché è in fase di modifica in un'altra applicazione.", "Common.Translation.warnFileLockedBtnEdit": "Crea copia", "Common.Translation.warnFileLockedBtnView": "‎Aperto per la visualizzazione‎", + "Common.UI.ButtonColored.textAutoColor": "Automatico", + "Common.UI.ButtonColored.textNewColor": "Aggiungere un nuovo colore personalizzato", "Common.UI.Calendar.textApril": "Aprile", "Common.UI.Calendar.textAugust": "Agosto", "Common.UI.Calendar.textDecember": "Dicembre", @@ -157,8 +159,6 @@ "Common.UI.Calendar.textShortTuesday": "Mar", "Common.UI.Calendar.textShortWednesday": "Mer", "Common.UI.Calendar.textYears": "Anni", - "Common.UI.ColorButton.textAutoColor": "Automatico", - "Common.UI.ColorButton.textNewColor": "Aggiungi Colore personalizzato", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -231,6 +231,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Tutte le correzioni automaticche aggiunte verranno rimosse e quelle modificate verranno ripristinate ai valori originali. Vuoi continuare?‎", "Common.Views.AutoCorrectDialog.warnRestore": "La voce di correzione automatica per %1 verrà reimpostata al valore originale. Vuoi continuare?", "Common.Views.Chat.textSend": "Invia", + "Common.Views.Comments.mniAuthorAsc": "Autore dalla A alla Z", + "Common.Views.Comments.mniAuthorDesc": "Autore dalla Z alla A", + "Common.Views.Comments.mniDateAsc": "Più vecchio", + "Common.Views.Comments.mniDateDesc": "Più recente", + "Common.Views.Comments.mniPositionAsc": "Dall'alto", + "Common.Views.Comments.mniPositionDesc": "Dal basso", "Common.Views.Comments.textAdd": "Aggiungi", "Common.Views.Comments.textAddComment": "Aggiungi commento", "Common.Views.Comments.textAddCommentToDoc": "Aggiungi commento al documento", @@ -238,6 +244,7 @@ "Common.Views.Comments.textAnonym": "Ospite", "Common.Views.Comments.textCancel": "Annulla", "Common.Views.Comments.textClose": "Chiudi", + "Common.Views.Comments.textClosePanel": "Chiudere commenti", "Common.Views.Comments.textComments": "Commenti", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Inserisci commento qui", @@ -246,6 +253,7 @@ "Common.Views.Comments.textReply": "Rispondi", "Common.Views.Comments.textResolve": "Risolvere", "Common.Views.Comments.textResolved": "Chiuso", + "Common.Views.Comments.textSort": "Ordinare commenti", "Common.Views.CopyWarningDialog.textDontShow": "Non mostrare più questo messaggio", "Common.Views.CopyWarningDialog.textMsg": "Le azioni di copia, taglia e incolla utilizzando i pulsanti della barra degli strumenti dell'editor e le azioni del menu di scelta rapida verranno eseguite solo all'interno di questa scheda dell'editor.

    Per copiare o incollare in o da applicazioni esterne alla scheda dell'editor, utilizzare le seguenti combinazioni di tasti:", "Common.Views.CopyWarningDialog.textTitle": "Funzioni copia/taglia/incolla", @@ -381,7 +389,7 @@ "Common.Views.ReviewChanges.txtFinalCap": "Finale", "Common.Views.ReviewChanges.txtHistory": "Cronologia delle versioni", "Common.Views.ReviewChanges.txtMarkup": "Tutte le modifiche (Modifica)", - "Common.Views.ReviewChanges.txtMarkupCap": "Marcatura", + "Common.Views.ReviewChanges.txtMarkupCap": "Markup e balloons", "Common.Views.ReviewChanges.txtMarkupSimple": "Tutti cambiamenti (Modifiche)
    Disattivare le notifiche balloons", "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Markup semplici", "Common.Views.ReviewChanges.txtNext": "Successivo", @@ -581,6 +589,7 @@ "DE.Controllers.Main.textContactUs": "Contatta il team di vendite", "DE.Controllers.Main.textConvertEquation": "Questa equazione è stata creata con una vecchia versione dell'editor di equazioni che non è più supportata.Per modificarla, convertire l'equazione nel formato ML di Office Math.
    Convertire ora?", "DE.Controllers.Main.textCustomLoader": "Si prega di notare che, in base ai termini della licenza, non si ha il diritto di modificare il caricatore.
    Si prega di contattare il nostro reparto vendite per ottenere un preventivo.", + "DE.Controllers.Main.textDisconnect": "Connessione persa", "DE.Controllers.Main.textGuest": "Ospite", "DE.Controllers.Main.textHasMacros": "Il file contiene macro automatiche.
    Vuoi eseguire le macro?", "DE.Controllers.Main.textLearnMore": "Per saperne di più", @@ -1644,11 +1653,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "DE.Views.FileMenu.btnToEditCaption": "Modifica documento", "DE.Views.FileMenu.textDownload": "Scarica", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Da vuoto", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Da modello", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo documento di testo vuoto che potrai formattare in seguito durante la modifica. Oppure scegli uno dei modelli per creare un documento di un certo tipo al quale sono già applicati certi stili.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo documento di testo", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Documento Vuoto", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Crea nuovo", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", @@ -1701,6 +1707,7 @@ "DE.Views.FileMenuPanels.Settings.strPaste": "Taglia, copia e incolla", "DE.Views.FileMenuPanels.Settings.strPasteButton": "Mostra il pulsante opzioni Incolla quando il contenuto viene incollato", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Attiva la visualizzazione dei commenti risolti", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Visualizzazione di revisioni", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Evidenzia modifiche di collaborazione in tempo reale", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Attiva controllo ortografia", "DE.Views.FileMenuPanels.Settings.strStrict": "Rigorosa", @@ -1722,6 +1729,8 @@ "DE.Views.FileMenuPanels.Settings.txtAll": "Tutte", "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opzioni di correzione automatica ...", "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Modalità cache predefinita", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Mostrare tramite clic su balloons", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Mostrare tramite suggerimenti al passaggio del mouse", "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetro", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Adatta alla pagina", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Adatta alla larghezza", @@ -1794,7 +1803,6 @@ "DE.Views.FormsTab.textClear": "Campi liberi", "DE.Views.FormsTab.textClearFields": "‎Cancella tutti i campi‎", "DE.Views.FormsTab.textHighlight": "Impostazioni evidenziazione", - "DE.Views.FormsTab.textNewColor": "Aggiungi Colore personalizzato", "DE.Views.FormsTab.textNoHighlight": "Nessuna evidenziazione", "DE.Views.FormsTab.textRequired": "Compila tutti i campi richiesti per inviare il modulo.", "DE.Views.FormsTab.textSubmited": "Modulo inviato con successo", @@ -2756,7 +2764,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Corsivo", "DE.Views.WatermarkSettingsDialog.textLanguage": "Lingua", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout di Pagina", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Aggiungi Colore personalizzato", "DE.Views.WatermarkSettingsDialog.textNone": "Nessuno", "DE.Views.WatermarkSettingsDialog.textScale": "Ridimensiona", "DE.Views.WatermarkSettingsDialog.textSelect": "Seleziona Immagine", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 072c9c3b0..a8f5c4683 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -154,8 +154,6 @@ "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": "罫線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -1632,11 +1630,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "詳細設定...", "DE.Views.FileMenu.btnToEditCaption": "ドキュメントの編集", "DE.Views.FileMenu.textDownload": "ダウンロード", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "空白から", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "テンプレートから", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "編集の間スタイルを適用し、フォルマットすることができる新しい空白のテキストドキュメンを作成します。または特定の種類や目的のテキストドキュメンを開始するためにすでにスタイルを適用したテンプレートを選択してください。", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "新しいテキスト ドキュメント\t", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "テンプレートなし", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "適用する", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "著者を追加", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "テキストの追加", @@ -1782,7 +1775,6 @@ "DE.Views.FormsTab.textClear": "フィールドを解除する", "DE.Views.FormsTab.textClearFields": "すべてのフィールドをクリアする", "DE.Views.FormsTab.textHighlight": "強調表示設定", - "DE.Views.FormsTab.textNewColor": "ユーザー設定の色の追加", "DE.Views.FormsTab.textNoHighlight": "強調表示なし", "DE.Views.FormsTab.textRequired": "必須事項をすべて入力し、送信してください。", "DE.Views.FormsTab.textSubmited": "フォームの送信成功", @@ -2744,7 +2736,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "斜体", "DE.Views.WatermarkSettingsDialog.textLanguage": "言語", "DE.Views.WatermarkSettingsDialog.textLayout": "レイアウト", - "DE.Views.WatermarkSettingsDialog.textNewColor": "ユーザー設定の色の追加", "DE.Views.WatermarkSettingsDialog.textNone": "なし", "DE.Views.WatermarkSettingsDialog.textScale": "規模", "DE.Views.WatermarkSettingsDialog.textSelect": "画像を選択", diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index c7211a886..9ad67cbb9 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -63,7 +63,6 @@ "Common.Controllers.ReviewChanges.textTabs": "탭 변경", "Common.Controllers.ReviewChanges.textUnderline": "밑줄", "Common.Controllers.ReviewChanges.textWidow": "Widow control", - "Common.UI.ColorButton.textNewColor": "새로운 사용자 정의 색 추가", "Common.UI.ComboBorderSize.txtNoBorders": "테두리 없음", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "테두리 없음", "Common.UI.ComboDataView.emptyComboText": "스타일 없음", @@ -1057,11 +1056,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "고급 설정 ...", "DE.Views.FileMenu.btnToEditCaption": "문서 편집", "DE.Views.FileMenu.textDownload": "다운로드", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "템플릿에서", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "편집 중에 스타일을 지정하고 서식을 지정할 수있는 빈 텍스트 문서를 새로 만듭니다. 또는 템플릿 중 하나를 선택하여 특정 유형의 문서를 시작합니다 또는 일부 스타일이 미리 적용된 용도 ", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "새 텍스트 문서", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "템플릿이 없습니다", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "작성자", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "액세스 권한 변경", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "로드 중 ...", diff --git a/apps/documenteditor/main/locale/lo.json b/apps/documenteditor/main/locale/lo.json index 3ca4946eb..6710fc2eb 100644 --- a/apps/documenteditor/main/locale/lo.json +++ b/apps/documenteditor/main/locale/lo.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Tu", "Common.UI.Calendar.textShortWednesday": "ພວກເຮົາ", "Common.UI.Calendar.textYears": "ປີ", - "Common.UI.ColorButton.textAutoColor": "ອັດຕະໂນມັດ", - "Common.UI.ColorButton.textNewColor": "ເພີ່ມສີທີ່ກຳໜົດເອງໃໝ່", "Common.UI.ComboBorderSize.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboDataView.emptyComboText": "ບໍ່ມີຮູບແບບ", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "ຕັ້ງ​ຄ່າ​ຂັ້ນ​ສູງ...", "DE.Views.FileMenu.btnToEditCaption": "ແກ້ໄຂເອກະສານ", "DE.Views.FileMenu.textDownload": "ດາວໂຫຼດ", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "ຈາກບ່ອນວ່າງ", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "ຈາກແມ່ແບບ", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "ສ້າງຕົວອັກສອນຫວ່າງໃໝ່", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "ເອກະສານຂໍ້ຄວາມ ໃໝ່", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "ບໍ່ມີແມ່ແບບ", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "ໃຊ້", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "ເພີ່ມຜູ້ຂຽນ", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "ເພີ່ມຂໍ້ຄວາມ", @@ -1781,7 +1774,6 @@ "DE.Views.FormsTab.textClear": "ລ້າງອອກ", "DE.Views.FormsTab.textClearFields": "ລຶບລ້າງຟີລດທັງໝົດ", "DE.Views.FormsTab.textHighlight": "ໄຮໄລການຕັ້ງຄ່າ", - "DE.Views.FormsTab.textNewColor": "ເພີ່ມສີທີ່ກຳໜົດເອງໃໝ່", "DE.Views.FormsTab.textNoHighlight": "ບໍ່ມີຈຸດເດັ່ນ", "DE.Views.FormsTab.textSubmited": "ສົ່ງແບບຟອມແລ້ວ", "DE.Views.FormsTab.tipCheckBox": "ເພີ່ມເຂົ້າໃນກ່ອງ Checkbox", @@ -2741,7 +2733,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "ໂຕໜັງສືອຽງ", "DE.Views.WatermarkSettingsDialog.textLanguage": "ພາສາ", "DE.Views.WatermarkSettingsDialog.textLayout": "ແຜນຜັງ", - "DE.Views.WatermarkSettingsDialog.textNewColor": "ເພີ່ມສີທີ່ກຳໜົດເອງໃໝ່", "DE.Views.WatermarkSettingsDialog.textNone": "ບໍ່ມີ", "DE.Views.WatermarkSettingsDialog.textScale": "ຂະໜາດ", "DE.Views.WatermarkSettingsDialog.textSelect": "ເລືອກຮູບພາບ", diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index d7f3bc968..b0d5de9fb 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -63,7 +63,6 @@ "Common.Controllers.ReviewChanges.textTabs": "Change tabs", "Common.Controllers.ReviewChanges.textUnderline": "Underline", "Common.Controllers.ReviewChanges.textWidow": "Widow control", - "Common.UI.ColorButton.textNewColor": "Pievienot jauno krāsu", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -1048,11 +1047,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Papildu iestatījumi...", "DE.Views.FileMenu.btnToEditCaption": "Rediģēt dokumentu", "DE.Views.FileMenu.textDownload": "Download", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Sākt ar tukšo", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "No veidnes", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Izveidot jaunu tukšu teksta dokumentu, kurā jūs varēsiet piemērot stilu un formātu pēc izveides rediģēšanas laikā. Vai izvēlēties kādu no veidnēm, lai sāktu dokumentu konkrēta veida vai stilā, kur daži stili jau iepriekš piemēroti.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Jauns teksta dokuments", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nav veidnes", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autors", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ielādē...", diff --git a/apps/documenteditor/main/locale/nb.json b/apps/documenteditor/main/locale/nb.json index de38e5696..0fdfdd8d2 100644 --- a/apps/documenteditor/main/locale/nb.json +++ b/apps/documenteditor/main/locale/nb.json @@ -35,7 +35,6 @@ "Common.UI.Calendar.textDecember": "desember", "Common.UI.Calendar.textShortApril": "apr", "Common.UI.Calendar.textShortAugust": "Aug", - "Common.UI.ColorButton.textNewColor": "Legg til ny egendefinert farge", "Common.UI.ExtendedColorDialog.addButtonText": "Legg til", "Common.UI.ExtendedColorDialog.textCurrent": "Nåværende", "Common.UI.SearchDialog.textMatchCase": "Følsom for store og små bokstaver", @@ -649,6 +648,5 @@ "DE.Views.Toolbar.txtScheme6": "Mengde", "DE.Views.WatermarkSettingsDialog.textAuto": "Auto", "DE.Views.WatermarkSettingsDialog.textBold": "Fet", - "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Legg til ny egendefinert farge" + "DE.Views.WatermarkSettingsDialog.textDiagonal": "Diagonal" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 855439cc9..bfa80d429 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "di", "Common.UI.Calendar.textShortWednesday": "wij", "Common.UI.Calendar.textYears": "Jaren", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Nieuwe aangepaste kleur toevoegen", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Geavanceerde instellingen...", "DE.Views.FileMenu.btnToEditCaption": "Document bewerken", "DE.Views.FileMenu.textDownload": "Downloaden", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Van leeg bestand", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Van sjabloon", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Maak een nieuw leeg tekstdocument waarop u stijlen kunt toepassen en dat u in bewerksessies kunt opmaken nadat het is gemaakt. Of kies een van de sjablonen om een document van een bepaald type of met een bepaald doel te starten. In de sjabloon zijn sommige stijlen al toegepast.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nieuw tekstdocument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Er zijn geen sjablonen", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Toepassen", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Voeg auteur toe", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tekst toevoegen", @@ -1789,7 +1782,6 @@ "DE.Views.FormsTab.textClear": "Velden wissen ", "DE.Views.FormsTab.textClearFields": "Wis alle velden", "DE.Views.FormsTab.textHighlight": "Markeer Instellingen", - "DE.Views.FormsTab.textNewColor": "Nieuwe aangepaste kleur toevoegen", "DE.Views.FormsTab.textNoHighlight": "Geen accentuering", "DE.Views.FormsTab.textRequired": "Vul alle verplichte velden in om het formulier te verzenden.", "DE.Views.FormsTab.textSubmited": "Formulier succesvol ingediend ", @@ -2751,7 +2743,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Cursief", "DE.Views.WatermarkSettingsDialog.textLanguage": "Taal", "DE.Views.WatermarkSettingsDialog.textLayout": "Indeling", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Nieuwe aangepaste kleur toevoegen", "DE.Views.WatermarkSettingsDialog.textNone": "geen", "DE.Views.WatermarkSettingsDialog.textScale": "Schaal", "DE.Views.WatermarkSettingsDialog.textSelect": "Selecteer afbeelding", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index e4bdcd4eb..7fc1ea31f 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -67,17 +67,52 @@ "Common.Controllers.ReviewChanges.textTableRowsAdd": "Rzędy dodane do tabeli", "Common.Controllers.ReviewChanges.textTableRowsDel": "Rzędy tabeli usunięto", "Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki", - "Common.Controllers.ReviewChanges.textUnderline": "Podkreśl", + "Common.Controllers.ReviewChanges.textUnderline": "Podkreślenie", "Common.Controllers.ReviewChanges.textWidow": "Kontrola okna", - "Common.define.chartData.textArea": "Obszar", - "Common.define.chartData.textBar": "Pasek", - "Common.define.chartData.textColumn": "Kolumna", + "Common.define.chartData.textArea": "Warstwowy", + "Common.define.chartData.textAreaStacked": "Skumulowany warstwowy", + "Common.define.chartData.textAreaStackedPer": "100% skumulowany warstwowy", + "Common.define.chartData.textBar": "Słupkowy", + "Common.define.chartData.textBarNormal": "Kolumnowy grupowany", + "Common.define.chartData.textBarNormal3d": "Kolumnowy grupowany 3D", + "Common.define.chartData.textBarNormal3dPerspective": "Kolumnowy 3D", + "Common.define.chartData.textBarStacked": "Skumulowany kolumnowy", + "Common.define.chartData.textBarStacked3d": "Skumulowany kolumnowy 3D", + "Common.define.chartData.textBarStackedPer": "100% skumulowany kolumnowy", + "Common.define.chartData.textBarStackedPer3d": "100% skumulowany kolumnowy 3D", + "Common.define.chartData.textColumn": "Kolumnowy", + "Common.define.chartData.textCombo": "Kombi", + "Common.define.chartData.textComboAreaBar": "Skumulowany warstwowy - kolumnowy grupowany", + "Common.define.chartData.textComboBarLine": "Kolumnowy grupowany - liniowy", + "Common.define.chartData.textComboBarLineSecondary": "Kolumnowy grupowany - liniowy na osi pomocniczej", + "Common.define.chartData.textComboCustom": "Niestandardowy złożony", + "Common.define.chartData.textDoughnut": "Pierścieniowy", + "Common.define.chartData.textHBarNormal": "Słupkowy grupowany", + "Common.define.chartData.textHBarNormal3d": "Słupkowy grupowany 3D", + "Common.define.chartData.textHBarStacked": "Skumulowany słupkowy", + "Common.define.chartData.textHBarStacked3d": "Skumulowany słupkowy 3D", + "Common.define.chartData.textHBarStackedPer": "100% skumulowany słupkowy", + "Common.define.chartData.textHBarStackedPer3d": "100% skumulowany słupkowy 3D", "Common.define.chartData.textLine": "Liniowy", - "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textLine3d": "Liniowy 3D", + "Common.define.chartData.textLineMarker": "Liniowy ze znacznikami", + "Common.define.chartData.textLineStacked": "Skumulowany liniowy", + "Common.define.chartData.textLineStackedMarker": "Skumulowany liniowy ze znacznikami", + "Common.define.chartData.textLineStackedPer": "100% skumulowany liniowy", + "Common.define.chartData.textLineStackedPerMarker": "100% skumulowany liniowy ze znacznikami", + "Common.define.chartData.textPie": "Kołowy", + "Common.define.chartData.textPie3d": "Kołowy 3D", "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textScatter": "Punktowy", + "Common.define.chartData.textScatterLine": "Punktowy z prostymi liniami", + "Common.define.chartData.textScatterLineMarker": "Punktowy z prostymi liniami i znacznikami", + "Common.define.chartData.textScatterSmooth": "Punktowy z wygładzonymi liniami", + "Common.define.chartData.textScatterSmoothMarker": "Punktowy z wygładzonymi liniami i znacznikami", "Common.define.chartData.textStock": "Zbiory", "Common.define.chartData.textSurface": "Powierzchnia", - "Common.UI.ColorButton.textNewColor": "Dodaj nowy niestandardowy kolor", + "Common.Translation.warnFileLockedBtnEdit": "Utwórz kopię", + "Common.UI.ButtonColored.textNewColor": "Dodaj nowy niestandardowy kolor", + "Common.UI.Calendar.textMonths": "miesiące", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -101,6 +136,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Dokument został zmieniony przez innego użytkownika.
    Proszę kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.", "Common.UI.ThemeColorPalette.textStandartColors": "Kolory standardowe", "Common.UI.ThemeColorPalette.textThemeColors": "Kolory motywu", + "Common.UI.Themes.txtThemeClassicLight": "Klasyczny jasny", + "Common.UI.Themes.txtThemeDark": "Ciemny", + "Common.UI.Themes.txtThemeLight": "Jasny", "Common.UI.Window.cancelButtonText": "Anuluj", "Common.UI.Window.closeButtonText": "Zamknij", "Common.UI.Window.noButtonText": "Nie", @@ -121,6 +159,23 @@ "Common.Views.About.txtTel": "tel.:", "Common.Views.About.txtVersion": "Wersja", "Common.Views.AutoCorrectDialog.textAdd": "Dodaj", + "Common.Views.AutoCorrectDialog.textApplyText": "Zastosuj podczas pisania", + "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatuj automatycznie podczas pisania", + "Common.Views.AutoCorrectDialog.textBulleted": "Listy punktowane automatycznie", + "Common.Views.AutoCorrectDialog.textBy": "Na", + "Common.Views.AutoCorrectDialog.textDelete": "Usuń", + "Common.Views.AutoCorrectDialog.textHyphens": "Łączniki (--) na pauzy (—)", + "Common.Views.AutoCorrectDialog.textMathCorrect": "Autokorekta matematyczna", + "Common.Views.AutoCorrectDialog.textNumbered": "Listy numerowane automatycznie", + "Common.Views.AutoCorrectDialog.textQuotes": "Cudzysłowy \"proste\" na \"drukarskie\"", + "Common.Views.AutoCorrectDialog.textRecognized": "Rozpoznawane funkcje", + "Common.Views.AutoCorrectDialog.textRecognizedDesc": "Następujące wyrażenia są rozpoznawanymi wyrażeniami matematycznymi. Nie będą one automatycznie pisane kursywą.", + "Common.Views.AutoCorrectDialog.textReplace": "Zamień", + "Common.Views.AutoCorrectDialog.textReplaceText": "Zamień podczas pisania", + "Common.Views.AutoCorrectDialog.textReplaceType": "Zamień tekst podczas pisania", + "Common.Views.AutoCorrectDialog.textReset": "Resetuj", + "Common.Views.AutoCorrectDialog.textResetAll": "Przywróć ustawienia domyślne", + "Common.Views.AutoCorrectDialog.textTitle": "Autokorekta", "Common.Views.AutoCorrectDialog.textWarnResetRec": "Każde dodane wyrażenie zostanie usunięte, a usunięte zostaną przywrócone. Czy chcesz kontynuować?", "Common.Views.AutoCorrectDialog.warnReset": "Wszelkie dodane autokorekty zostaną usunięte, a zmienione zostaną przywrócone oryginalne wartości. Czy chcesz kontynuować?", "Common.Views.Chat.textSend": "Wyślij", @@ -156,12 +211,18 @@ "Common.Views.Header.labelCoUsersDescr": "Dokument jest obecnie edytowany przez kilku użytkowników.", "Common.Views.Header.textAdvSettings": "Ustawienia zaawansowane", "Common.Views.Header.textBack": "Idź do dokumentów", + "Common.Views.Header.textCompactView": "Ukryj pasek narzędzi", + "Common.Views.Header.textHideLines": "Ukryj linijki", + "Common.Views.Header.textHideStatusBar": "Ukryj pasek stanu", "Common.Views.Header.textRemoveFavorite": "Usuń z ulubionych", "Common.Views.Header.textZoom": "Powiększenie", "Common.Views.Header.tipAccessRights": "Zarządzaj prawami dostępu do dokumentu", "Common.Views.Header.tipDownload": "Pobierz plik", "Common.Views.Header.tipGoEdit": "Edytuj bieżący plik", "Common.Views.Header.tipPrint": "Drukuj plik", + "Common.Views.Header.tipRedo": "Wykonaj ponownie", + "Common.Views.Header.tipSave": "Zapisz", + "Common.Views.Header.tipUndo": "Cofnij", "Common.Views.Header.tipViewSettings": "Wyświetl ustawienia", "Common.Views.Header.tipViewUsers": "Wyświetl użytkowników i zarządzaj prawami dostępu do dokumentu", "Common.Views.Header.txtAccessRights": "Zmień prawa dostępu", @@ -188,10 +249,14 @@ "Common.Views.OpenDialog.txtIncorrectPwd": "Hasło jest nieprawidłowe.", "Common.Views.OpenDialog.txtOpenFile": "Wprowadź hasło, aby otworzyć plik", "Common.Views.OpenDialog.txtPassword": "Hasło", + "Common.Views.OpenDialog.txtPreview": "Podgląd", "Common.Views.OpenDialog.txtTitle": "Wybierz %1 opcji", "Common.Views.OpenDialog.txtTitleProtected": "Plik chroniony", "Common.Views.PasswordDialog.txtDescription": "Ustaw hasło aby zabezpieczyć ten dokument", "Common.Views.PasswordDialog.txtIncorrectPwd": "Hasła nie są takie same", + "Common.Views.PasswordDialog.txtPassword": "Hasło", + "Common.Views.PasswordDialog.txtRepeat": "Powtórz hasło", + "Common.Views.PasswordDialog.txtTitle": "Ustaw hasło", "Common.Views.PasswordDialog.txtWarning": "Uwaga: Jeśli zapomnisz lub zgubisz hasło, nie będzie możliwości odzyskania go. Zapisz go i nikomu nie udostępniaj.", "Common.Views.PluginDlg.textLoading": "Ładowanie", "Common.Views.Plugins.groupCaption": "Wtyczki", @@ -206,13 +271,19 @@ "Common.Views.Protection.txtDeletePwd": "Usuń hasło", "Common.Views.Protection.txtEncrypt": "Szyfruj", "Common.Views.Protection.txtInvisibleSignature": "Dodaj podpis cyfrowy", + "Common.Views.Protection.txtSignature": "Sygnatura", "Common.Views.Protection.txtSignatureLine": "Dodaj linię do podpisu", "Common.Views.RenameDialog.textName": "Nazwa pliku", "Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:", "Common.Views.ReviewChanges.hintNext": "Do następnej zmiany", "Common.Views.ReviewChanges.hintPrev": "Do poprzedniej zmiany", "Common.Views.ReviewChanges.strFast": "Szybki", + "Common.Views.ReviewChanges.strFastDesc": "Współedycja w czasie rzeczywistym. Wszystkie zmiany są zapisywane automatycznie.", + "Common.Views.ReviewChanges.strStrict": "Ścisły", + "Common.Views.ReviewChanges.strStrictDesc": "Użyj przycisku „Zapisz”, aby zsynchronizować zmiany wprowadzane przez Ciebie i innych.", + "Common.Views.ReviewChanges.textEnable": "Włącz", "Common.Views.ReviewChanges.tipAcceptCurrent": "Zaakceptuj bieżącą zmianę", + "Common.Views.ReviewChanges.tipCoAuthMode": "Ustaw tryb współedycji", "Common.Views.ReviewChanges.tipCommentRem": "Usuń komentarze", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Usuń aktualne komentarze", "Common.Views.ReviewChanges.tipHistory": "Pokaż historię wersji", @@ -237,6 +308,10 @@ "Common.Views.ReviewChanges.txtHistory": "Historia wersji", "Common.Views.ReviewChanges.txtMarkup": "Wszystkie zmiany (edycja)", "Common.Views.ReviewChanges.txtNext": "Do następnej zmiany", + "Common.Views.ReviewChanges.txtOff": "Wyłącz dla mnie", + "Common.Views.ReviewChanges.txtOffGlobal": "Wyłącz dla mnie i wszystkich", + "Common.Views.ReviewChanges.txtOn": "Włącz dla mnie", + "Common.Views.ReviewChanges.txtOnGlobal": "Włącz dla mnie i wszystkich", "Common.Views.ReviewChanges.txtOriginal": "Wszystkie zmiany odrzucone (podgląd)", "Common.Views.ReviewChanges.txtPrev": "Do poprzedniej zmiany", "Common.Views.ReviewChanges.txtReject": "Odrzuć", @@ -260,15 +335,53 @@ "Common.Views.ReviewPopover.textCancel": "Anuluj", "Common.Views.ReviewPopover.textClose": "Zamknij", "Common.Views.ReviewPopover.textEdit": "OK", + "Common.Views.ReviewPopover.textMention": "+wzmianka zapewni użytkownikowi dostęp do pliku i wyśle e-maila", + "Common.Views.ReviewPopover.textOpenAgain": "Otwórz ponownie", "Common.Views.ReviewPopover.textResolve": "Rozwiąż", + "Common.Views.SaveAsDlg.textLoading": "Ładowanie", + "Common.Views.SaveAsDlg.textTitle": "Folder do zapisu", + "Common.Views.SelectFileDlg.textLoading": "Ładowanie", + "Common.Views.SelectFileDlg.textTitle": "Wybierz źródło danych", "Common.Views.SignDialog.textBold": "Pogrubienie", "Common.Views.SignDialog.textCertificate": "Certyfikat", "Common.Views.SignDialog.textChange": "Zmień", "Common.Views.SignDialog.textItalic": "Kursywa", "Common.Views.SignDialog.textPurpose": "Cel podpisywania tego dokumentu", + "Common.Views.SignDialog.textSelect": "Wybierz", + "Common.Views.SignDialog.textSelectImage": "Wybierz obraz", "Common.Views.SignDialog.textTitle": "Podpisz dokument", + "Common.Views.SignDialog.tipFontSize": "Rozmiar czcionki", + "Common.Views.SignSettingsDialog.textAllowComment": "Zezwól podpisującemu na dodawanie komentarza w oknie podpisu", "Common.Views.SignSettingsDialog.textInfoEmail": "E-mail", + "Common.Views.SignSettingsDialog.textInfoName": "Nazwa", "Common.Views.SignSettingsDialog.textShowDate": "Pokaż datę wykonania podpisu", + "Common.Views.SymbolTableDialog.textCharacter": "Znak", + "Common.Views.SymbolTableDialog.textCode": "Nazwa Unicode", + "Common.Views.SymbolTableDialog.textCopyright": "Znak zastrzeżenia prawa autorskiego", + "Common.Views.SymbolTableDialog.textDCQuote": "Podwójny cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textDOQuote": "Podwójny cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textEllipsis": "Wielokropek", + "Common.Views.SymbolTableDialog.textEmDash": "Pauza", + "Common.Views.SymbolTableDialog.textEmSpace": "Długa spacja", + "Common.Views.SymbolTableDialog.textEnDash": "Półpauza", + "Common.Views.SymbolTableDialog.textEnSpace": "Krótka spacja", + "Common.Views.SymbolTableDialog.textFont": "Symbole", + "Common.Views.SymbolTableDialog.textNBHyphen": "Łącznik nierozdzielający", + "Common.Views.SymbolTableDialog.textNBSpace": "Spacja nierozdzielająca", + "Common.Views.SymbolTableDialog.textPilcrow": "Akapit", + "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 długiej spacji", + "Common.Views.SymbolTableDialog.textRange": "Zakres", + "Common.Views.SymbolTableDialog.textRecent": "Ostatnio używane symbole", + "Common.Views.SymbolTableDialog.textRegistered": "Zastrzeżony znak towarowy", + "Common.Views.SymbolTableDialog.textSCQuote": "Pojedynczy cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textSection": "Sekcja", + "Common.Views.SymbolTableDialog.textShortcut": "Klawisz skrótu", + "Common.Views.SymbolTableDialog.textSOQuote": "Pojedynczy cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textSpecial": "Znaki specjalne", + "Common.Views.SymbolTableDialog.textSymbols": "Symbole", + "Common.Views.SymbolTableDialog.textTitle": "Symbole", + "Common.Views.SymbolTableDialog.textTradeMark": "Znak towarowy", + "Common.Views.UserNameDialog.textDontShow": "Nie pytaj mnie ponownie", "DE.Controllers.LeftMenu.leavePageText": "Wszystkie niezapisane zmiany w tym dokumencie zostaną utracone. Kliknij przycisk \"Anuluj\", a następnie \"Zapisz\", aby je zapisać. Kliknij \"OK\", aby usunąć wszystkie niezapisane zmiany.", "DE.Controllers.LeftMenu.newDocumentTitle": "Nienazwany dokument", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Ostrzeżenie", @@ -293,9 +406,11 @@ "DE.Controllers.Main.errorCoAuthoringDisconnect": "Połączenie z serwerem zostało utracone. Nie można teraz edytować dokumentu.", "DE.Controllers.Main.errorConnectToServer": "Nie można zapisać dokumentu. Sprawdź ustawienia połączenia lub skontaktuj się z administratorem.
    Po kliknięciu przycisku \"OK\" zostanie wyświetlony monit o pobranie dokumentu.", "DE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.
    Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", + "DE.Controllers.Main.errorDataEncrypted": "Otrzymano zaszyfrowane zmiany, nie można ich odszyfrować.", "DE.Controllers.Main.errorDataRange": "Błędny zakres danych.", "DE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1", "DE.Controllers.Main.errorFilePassProtect": "Dokument jest chroniony hasłem i nie można go otworzyć.", + "DE.Controllers.Main.errorFileSizeExceed": "Rozmiar pliku przekracza ustalony limit dla twojego serwera.
    Proszę skontaktować z administratorem twojego Serwera Dokumentów w celu uzyskania szczegółowych informacji.", "DE.Controllers.Main.errorKeyEncrypt": "Nieznany deskryptor klucza", "DE.Controllers.Main.errorKeyExpire": "Okres ważności deskryptora klucza wygasł", "DE.Controllers.Main.errorMailMergeLoadFile": "Wczytywanie nie powiodło się", @@ -305,6 +420,7 @@ "DE.Controllers.Main.errorSessionAbsolute": "Sesja edycji dokumentu wygasła. Proszę ponownie załadować stronę.", "DE.Controllers.Main.errorSessionIdle": "Dokument nie był edytowany przez długi czas. Proszę ponownie załadować stronę.", "DE.Controllers.Main.errorSessionToken": "Połączenie z serwerem zostało przerwane. Proszę ponownie załadować stronę.", + "DE.Controllers.Main.errorSetPassword": "Nie można ustawić hasła", "DE.Controllers.Main.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
    cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", "DE.Controllers.Main.errorToken": "Token bezpieczeństwa dokumentu jest nieprawidłowo uformowany.
    Prosimy o kontakt z administratorem serwera dokumentów.", "DE.Controllers.Main.errorTokenExpire": "Token zabezpieczeń dokumentu wygasł.
    Prosimy o kontakt z administratorem serwera dokumentów.", @@ -313,6 +429,7 @@ "DE.Controllers.Main.errorUsersExceed": "Przekroczono liczbę dozwolonych użytkowników określonych przez plan cenowy wersji", "DE.Controllers.Main.errorViewerDisconnect": "Połączenie zostało utracone. Nadal możesz przeglądać dokument, ale nie będziesz mógł pobrać ani wydrukować dokumentu do momentu przywrócenia połączenia.", "DE.Controllers.Main.leavePageText": "Masz niezapisane zmiany w tym dokumencie. Kliknij przycisk \"Zostań na tej stronie\", a następnie \"Zapisz\", aby je zapisać. Kliknij przycisk \"Pozostaw tę stronę\", aby usunąć wszystkie niezapisane zmiany.", + "DE.Controllers.Main.leavePageTextOnClose": "Wszystkie niezapisane zmiany w tym dokumencie zostaną utracone. Kliknij przycisk \"Anuluj\", a następnie \"Zapisz\", aby je zapisać. Kliknij \"OK\", aby usunąć wszystkie niezapisane zmiany.", "DE.Controllers.Main.loadFontsTextText": "Ładowanie danych...", "DE.Controllers.Main.loadFontsTitleText": "Ładowanie danych", "DE.Controllers.Main.loadFontTextText": "Ładowanie danych...", @@ -350,11 +467,16 @@ "DE.Controllers.Main.textClose": "Zamknij", "DE.Controllers.Main.textCloseTip": "Kliknij, żeby zamknąć wskazówkę", "DE.Controllers.Main.textContactUs": "Skontaktuj się z działem sprzedaży", + "DE.Controllers.Main.textGuest": "Gość", + "DE.Controllers.Main.textHasMacros": "Plik zawiera automatyczne makra.
    Czy chcesz uruchomić makra?", + "DE.Controllers.Main.textLearnMore": "Dowiedz się więcej", "DE.Controllers.Main.textLoadingDocument": "Ładowanie dokumentu", "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE wersja open source", + "DE.Controllers.Main.textRenameLabel": "Wpisz nazwę, która ma być używana do współpracy", "DE.Controllers.Main.textShape": "Kształt", "DE.Controllers.Main.textStrict": "Tryb ścisły", "DE.Controllers.Main.textTryUndoRedo": "Funkcje Cofnij/Ponów są wyłączone w trybie \"Szybki\" współtworzenia.
    Kliknij przycisk \"Tryb ścisły\", aby przejść do trybu ścisłego edytowania, aby edytować plik bez ingerencji innych użytkowników i wysyłać zmiany tylko po zapisaniu. Możesz przełączać się między trybami współtworzenia, używając edytora Ustawienia zaawansowane.", + "DE.Controllers.Main.textTryUndoRedoWarn": "Funkcje Cofnij/Ponów są wyłączone w trybie Szybkim współtworzenia.", "DE.Controllers.Main.titleLicenseExp": "Upłynął okres ważności licencji", "DE.Controllers.Main.titleServerVersion": "Zaktualizowano edytor", "DE.Controllers.Main.titleUpdateVersion": "Wersja uległa zmianie", @@ -377,28 +499,148 @@ "DE.Controllers.Main.txtLines": "Linie", "DE.Controllers.Main.txtMath": "Matematyczne", "DE.Controllers.Main.txtNeedSynchronize": "Masz aktualizacje", + "DE.Controllers.Main.txtNone": "Brak", "DE.Controllers.Main.txtRectangles": "Prostokąty", + "DE.Controllers.Main.txtSameAsPrev": "Taki sam jak poprzednio", "DE.Controllers.Main.txtSection": "-Sekcja", "DE.Controllers.Main.txtSeries": "Serie", + "DE.Controllers.Main.txtShape_accentBorderCallout1": "Objaśnienie: linia z obramowaniem i paskiem wyróżniającym", + "DE.Controllers.Main.txtShape_accentBorderCallout2": "Objaśnienie: wygięta linia z obramowaniem i paskiem wyróżniającym", + "DE.Controllers.Main.txtShape_accentBorderCallout3": "Objaśnienie: podwójna wygięta linia z obramowaniem i paskiem wyróżniającym", + "DE.Controllers.Main.txtShape_accentCallout1": "Objaśnienie: linia z paskiem wyróżniającym", + "DE.Controllers.Main.txtShape_accentCallout2": "Objaśnienie: wygięta linia z paskiem wyróżniającym", + "DE.Controllers.Main.txtShape_accentCallout3": "Objaśnienie: podwójna wygięta linia z paskiem wyróżniającym", "DE.Controllers.Main.txtShape_actionButtonBackPrevious": "Przycisk powrotu", "DE.Controllers.Main.txtShape_actionButtonBeginning": "Przycisk rozpoczęcia", "DE.Controllers.Main.txtShape_actionButtonBlank": "Pusty przycisk", + "DE.Controllers.Main.txtShape_actionButtonDocument": "Przycisk dokument", + "DE.Controllers.Main.txtShape_actionButtonEnd": "Przycisk zakończenia ", + "DE.Controllers.Main.txtShape_actionButtonHelp": "Przycisk pomocy", + "DE.Controllers.Main.txtShape_actionButtonHome": "Przycisk dom", + "DE.Controllers.Main.txtShape_actionButtonInformation": "Przycisk informacji", + "DE.Controllers.Main.txtShape_actionButtonMovie": "Przycisk wideo", + "DE.Controllers.Main.txtShape_actionButtonReturn": "Przycisk powrotu", + "DE.Controllers.Main.txtShape_actionButtonSound": "Przycisk dźwięku", "DE.Controllers.Main.txtShape_arc": "Łuk", + "DE.Controllers.Main.txtShape_bentArrow": "Strzałka: wygięta", + "DE.Controllers.Main.txtShape_bentConnector5": "Łącznik: łamany", + "DE.Controllers.Main.txtShape_bentConnector5WithArrow": "Łącznik: łamany ze strzałką", + "DE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Łącznik: łamany z podwójną strzałką", + "DE.Controllers.Main.txtShape_bentUpArrow": "Strzałka: wygięta w górę", + "DE.Controllers.Main.txtShape_bevel": "Prostokąt: ze skosem", + "DE.Controllers.Main.txtShape_blockArc": "Łuk blokowy", + "DE.Controllers.Main.txtShape_borderCallout1": "Objaśnienie: linia", + "DE.Controllers.Main.txtShape_borderCallout2": "Objaśnienie: wygięta linia", + "DE.Controllers.Main.txtShape_borderCallout3": "Objaśnienie: podwójna wygięta linia", + "DE.Controllers.Main.txtShape_bracePair": "Para nawiasów klamrowych", + "DE.Controllers.Main.txtShape_callout1": "Objaśnienie: linia bez obramowania", + "DE.Controllers.Main.txtShape_callout2": "Objaśnienie: wygięta linia bez obramowania", + "DE.Controllers.Main.txtShape_callout3": "Objaśnienie: podwójna wygięta linia bez obramowania", "DE.Controllers.Main.txtShape_can": "Cylinder", - "DE.Controllers.Main.txtShape_cloud": "Chmura", + "DE.Controllers.Main.txtShape_cloud": "Chmurka", "DE.Controllers.Main.txtShape_corner": "Róg", "DE.Controllers.Main.txtShape_cube": "Sześcian", + "DE.Controllers.Main.txtShape_curvedConnector3": "Łącznik: zakrzywiony", + "DE.Controllers.Main.txtShape_curvedConnector3WithArrow": "Łącznik: zakrzywiony ze strzałką", + "DE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Łącznik: zakrzywiony z podwójną strzałką", + "DE.Controllers.Main.txtShape_curvedDownArrow": "Strzałka: zakrzywiona w dół", + "DE.Controllers.Main.txtShape_curvedLeftArrow": "Strzałka: zakrzywiona w lewo", + "DE.Controllers.Main.txtShape_curvedRightArrow": "Strzałka: zakrzywiona w prawo", + "DE.Controllers.Main.txtShape_curvedUpArrow": "Strzałka: zakrzywiona w górę", + "DE.Controllers.Main.txtShape_decagon": "Dziesięciokąt", + "DE.Controllers.Main.txtShape_diagStripe": "Pasek ukośny", "DE.Controllers.Main.txtShape_diamond": "Romb", + "DE.Controllers.Main.txtShape_dodecagon": "Dwunastokąt", + "DE.Controllers.Main.txtShape_donut": "Okrąg: pusty", + "DE.Controllers.Main.txtShape_doubleWave": "Podwójna fala", + "DE.Controllers.Main.txtShape_downArrow": "Strzałka: w dół", + "DE.Controllers.Main.txtShape_downArrowCallout": "Objaśnienie: strzałka w dół", "DE.Controllers.Main.txtShape_ellipse": "Elipsa", + "DE.Controllers.Main.txtShape_ellipseRibbon": "Wstęga: zakrzywiona i nachylona w dół", + "DE.Controllers.Main.txtShape_ellipseRibbon2": "Wstęga: zakrzywiona i nachylona w górę", + "DE.Controllers.Main.txtShape_flowChartAlternateProcess": "Schemat blokowy: proces alternatywny", + "DE.Controllers.Main.txtShape_flowChartCollate": "Schemat blokowy: zestawienie", + "DE.Controllers.Main.txtShape_flowChartConnector": "Schemat blokowy: łącznik", + "DE.Controllers.Main.txtShape_flowChartDecision": "Schemat blokowy: decyzja", + "DE.Controllers.Main.txtShape_flowChartDelay": "Schemat blokowy: opóźnienie", + "DE.Controllers.Main.txtShape_flowChartDisplay": "Schemat blokowy: ekran", + "DE.Controllers.Main.txtShape_flowChartDocument": "Schemat blokowy: dokument", + "DE.Controllers.Main.txtShape_flowChartExtract": "Schemat blokowy: wyodrębnianie", + "DE.Controllers.Main.txtShape_flowChartInputOutput": "Schemat blokowy: decyzja", + "DE.Controllers.Main.txtShape_flowChartInternalStorage": "Schemat blokowy: pamięć wewnętrzna", + "DE.Controllers.Main.txtShape_flowChartMagneticDisk": "Schemat blokowy: dysk magnetyczny", + "DE.Controllers.Main.txtShape_flowChartMagneticDrum": "Schemat blokowy: pamięć o dostępie bezpośrednim", + "DE.Controllers.Main.txtShape_flowChartMagneticTape": "Schemat blokowy: pamięć o dostępie sekwencyjnym", + "DE.Controllers.Main.txtShape_flowChartManualInput": "Schemat blokowy: ręczne wprowadzenie danych", + "DE.Controllers.Main.txtShape_flowChartManualOperation": "Schemat blokowy: operacja ręczna", + "DE.Controllers.Main.txtShape_flowChartMerge": "Schemat blokowy: scalanie", + "DE.Controllers.Main.txtShape_flowChartMultidocument": "Schemat blokowy: wiele dokumentów", + "DE.Controllers.Main.txtShape_flowChartOffpageConnector": "Schemat blokowy: łącznik międzystronicowy", + "DE.Controllers.Main.txtShape_flowChartOnlineStorage": "Schemat blokowy: przechowywane dane", + "DE.Controllers.Main.txtShape_flowChartOr": "Schemat blokowy: lub", + "DE.Controllers.Main.txtShape_flowChartPredefinedProcess": "Schemat blokowy: proces uprzednio zdefiniowany", + "DE.Controllers.Main.txtShape_flowChartPreparation": "Schemat blokowy: przygotowanie", + "DE.Controllers.Main.txtShape_flowChartProcess": "Schemat blokowy: proces", + "DE.Controllers.Main.txtShape_flowChartPunchedCard": "Schemat blokowy: karta", + "DE.Controllers.Main.txtShape_flowChartPunchedTape": "Schemat blokowy: taśma dziurkowana", + "DE.Controllers.Main.txtShape_flowChartSort": "Schemat blokowy: sortowanie", + "DE.Controllers.Main.txtShape_flowChartSummingJunction": "Schemat blokowy: operacja sumowania", + "DE.Controllers.Main.txtShape_flowChartTerminator": "Schemat blokowy: terminator", + "DE.Controllers.Main.txtShape_foldedCorner": "Prostokąt: zagięty narożnik", + "DE.Controllers.Main.txtShape_frame": "Ramka", + "DE.Controllers.Main.txtShape_halfFrame": "Połowa ramki", + "DE.Controllers.Main.txtShape_heart": "Serce", + "DE.Controllers.Main.txtShape_heptagon": "Siedmiokąt", + "DE.Controllers.Main.txtShape_hexagon": "Sześciokąt", + "DE.Controllers.Main.txtShape_homePlate": "Pięciokąt", + "DE.Controllers.Main.txtShape_horizontalScroll": "Zwój: poziomy", "DE.Controllers.Main.txtShape_irregularSeal1": "Eksplozja 1", "DE.Controllers.Main.txtShape_irregularSeal2": "Eksplozja 2", "DE.Controllers.Main.txtShape_leftArrow": "Lewa strzałka", + "DE.Controllers.Main.txtShape_leftArrowCallout": "Objaśnienie: strzałka w lewo", + "DE.Controllers.Main.txtShape_leftBrace": "Nawias klamrowy otwierający", + "DE.Controllers.Main.txtShape_leftBracket": "Nawias otwierający", + "DE.Controllers.Main.txtShape_leftRightArrow": "Strzałka: w lewo i w prawo", + "DE.Controllers.Main.txtShape_leftRightArrowCallout": "Objaśnienie: strzałka w lewo i w prawo", + "DE.Controllers.Main.txtShape_leftRightUpArrow": "Strzałka: w lewo wprawo i w górę", + "DE.Controllers.Main.txtShape_leftUpArrow": "Strzałka: w lewo i w górę", + "DE.Controllers.Main.txtShape_lightningBolt": "Błyskawica", "DE.Controllers.Main.txtShape_lineWithArrow": "Strzałka", + "DE.Controllers.Main.txtShape_lineWithTwoArrows": "Strzałka liniowa: podwójna", + "DE.Controllers.Main.txtShape_mathDivide": "Znak dzielenia", "DE.Controllers.Main.txtShape_mathEqual": "Równy", + "DE.Controllers.Main.txtShape_mathMinus": "Znak minus", + "DE.Controllers.Main.txtShape_mathMultiply": "Znak mnożenia", "DE.Controllers.Main.txtShape_mathNotEqual": "Różny od", "DE.Controllers.Main.txtShape_mathPlus": "Plus", + "DE.Controllers.Main.txtShape_moon": "Księżyc", "DE.Controllers.Main.txtShape_noSmoking": "Zakaz", + "DE.Controllers.Main.txtShape_notchedRightArrow": "Strzałka: w prawo z wcięciem", + "DE.Controllers.Main.txtShape_parallelogram": "Równoległobok", + "DE.Controllers.Main.txtShape_pentagon": "Pięciokąt", + "DE.Controllers.Main.txtShape_pie": "Kołowy", "DE.Controllers.Main.txtShape_plus": "Plus", + "DE.Controllers.Main.txtShape_polyline1": "Dowolny kształt: bazgroły", + "DE.Controllers.Main.txtShape_polyline2": "Dowolny kształt: kształt", + "DE.Controllers.Main.txtShape_quadArrow": "Strzałka: w cztery strony", + "DE.Controllers.Main.txtShape_quadArrowCallout": "Objaśnienie: strzałka w cztery strony", + "DE.Controllers.Main.txtShape_rect": "Prostokąt", + "DE.Controllers.Main.txtShape_ribbon": "Wstęga: nachylona w dół", + "DE.Controllers.Main.txtShape_ribbon2": "Wstęga: nachylona w górę", + "DE.Controllers.Main.txtShape_rightArrow": "Strzałka: w prawo", + "DE.Controllers.Main.txtShape_rightArrowCallout": "Objaśnienie: strzałka w prawo", + "DE.Controllers.Main.txtShape_rightBrace": "Nawias klamrowy zamykający", + "DE.Controllers.Main.txtShape_rightBracket": "Nawias zamykający", + "DE.Controllers.Main.txtShape_round1Rect": "Prostokąt: jeden zaokrąglony róg", + "DE.Controllers.Main.txtShape_round2DiagRect": "Prostokąt: zaokrąglone rogi po przekątnej", + "DE.Controllers.Main.txtShape_round2SameRect": "Prostokąt: zaokrąglone rogi u góry", + "DE.Controllers.Main.txtShape_roundRect": "Prostokąt: zaokrąglone rogi", + "DE.Controllers.Main.txtShape_rtTriangle": "Trójkąt równoramienny", + "DE.Controllers.Main.txtShape_smileyFace": "Uśmiechnięta buźka", + "DE.Controllers.Main.txtShape_snip1Rect": "Prostokąt: jeden ścięty róg ", + "DE.Controllers.Main.txtShape_snip2DiagRect": "Prostokąt: ścięte rogi po przekątnej", + "DE.Controllers.Main.txtShape_snip2SameRect": "Prostokąt: ścięte rogi u góry", + "DE.Controllers.Main.txtShape_snipRoundRect": "Prostokąt: zaokrąglony róg i ścięty róg u góry", "DE.Controllers.Main.txtShape_spline": "Krzywa", "DE.Controllers.Main.txtShape_star10": "Gwiazda 10-ramienna", "DE.Controllers.Main.txtShape_star12": "Gwiazda 12-ramienna", @@ -410,7 +652,23 @@ "DE.Controllers.Main.txtShape_star6": "Gwiazda 6-ramienna", "DE.Controllers.Main.txtShape_star7": "Gwiazda 7-ramienna", "DE.Controllers.Main.txtShape_star8": "Gwiazda 8-ramienna", + "DE.Controllers.Main.txtShape_stripedRightArrow": "Strzałka: prążkowana w prawo", + "DE.Controllers.Main.txtShape_sun": "Słoneczko", + "DE.Controllers.Main.txtShape_teardrop": "Łza", + "DE.Controllers.Main.txtShape_textRect": "Pole tekstowe", + "DE.Controllers.Main.txtShape_trapezoid": "Trapez", + "DE.Controllers.Main.txtShape_triangle": "Trójkąt równoramienny", + "DE.Controllers.Main.txtShape_upArrow": "Strzałka: w górę", + "DE.Controllers.Main.txtShape_upArrowCallout": "Objaśnienie: strzałka w górę", + "DE.Controllers.Main.txtShape_upDownArrow": "Strzałka: w górę i w dół", + "DE.Controllers.Main.txtShape_uturnArrow": "Strzałka: zawracanie", + "DE.Controllers.Main.txtShape_verticalScroll": "Zwój: pionowy", + "DE.Controllers.Main.txtShape_wave": "Fala", + "DE.Controllers.Main.txtShape_wedgeEllipseCallout": "Dymek mowy: owalny", + "DE.Controllers.Main.txtShape_wedgeRectCallout": "Dymek mowy: prostokąt", + "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Dymek mowy: prostokąt z zaokrąglonymi rogami", "DE.Controllers.Main.txtStarsRibbons": "Gwiazdy i wstążki", + "DE.Controllers.Main.txtStyle_Caption": "Podpis", "DE.Controllers.Main.txtStyle_footnote_text": "Przypis", "DE.Controllers.Main.txtStyle_Heading_1": "Nagłówek 1", "DE.Controllers.Main.txtStyle_Heading_2": "Nagłówek 2", @@ -429,6 +687,7 @@ "DE.Controllers.Main.txtStyle_Subtitle": "Podtytuł", "DE.Controllers.Main.txtStyle_Title": "Tytuł", "DE.Controllers.Main.txtTableOfContents": "Spis treści", + "DE.Controllers.Main.txtTableOfFigures": "Spis ilustracji", "DE.Controllers.Main.txtXAxis": "Oś X", "DE.Controllers.Main.txtYAxis": "Oś Y", "DE.Controllers.Main.unknownErrorText": "Nieznany błąd.", @@ -441,7 +700,11 @@ "DE.Controllers.Main.waitText": "Proszę czekać...", "DE.Controllers.Main.warnBrowserIE9": "Aplikacja ma małe możliwości w IE9. Użyj przeglądarki IE10 lub nowszej.", "DE.Controllers.Main.warnBrowserZoom": "Aktualne ustawienie powiększenia przeglądarki nie jest w pełni obsługiwane. Zresetuj domyślny zoom, naciskając Ctrl + 0.", + "DE.Controllers.Main.warnLicenseExceeded": "Ta wersja edytorów ONLYOFFICE ma pewne ograniczenia dla użytkowników.Dokument zostanie otwarty tylko do odczytu.Jeżeli potrzebujesz więcej, rozważ zakupienie licencji komercyjnej.", "DE.Controllers.Main.warnLicenseExp": "Twoja licencja wygasła.
    Zaktualizuj licencję i odśwież stronę.", + "DE.Controllers.Main.warnLicenseLimitedNoAccess": "Licencja wygasła.
    Nie masz dostępu do edycji dokumentu.
    Proszę skontaktować się ze swoim administratorem.", + "DE.Controllers.Main.warnLicenseLimitedRenewed": "Licencja musi zostać odnowiona.
    Masz ograniczony dostęp do edycji dokumentu.
    Skontaktuj się ze swoim administratorem, aby uzyskać pełny dostęp.", + "DE.Controllers.Main.warnLicenseUsersExceeded": "Osiągnąłeś limit dla użytkownia. Skontaktuj się z administratorem, aby dowiedzieć się więcej.", "DE.Controllers.Main.warnNoLicense": "Używasz wersji %1 w wersji open source. Wersja ma ograniczenia dla jednoczesnych połączeń z serwerem dokumentów (po 20 połączeń naraz). Jeśli potrzebujesz więcej, rozważ zakup licencji komercyjnej.", "DE.Controllers.Main.warnProcessRightsChange": "Nie masz prawa edytować tego pliku.", "DE.Controllers.Navigation.txtBeginning": "Początek dokumentu", @@ -457,6 +720,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "Wprowadzona wartość jest nieprawidłowa.
    Wprowadź wartość numeryczną w zakresie od 1 do 300", "DE.Controllers.Toolbar.textFraction": "Ułamki", "DE.Controllers.Toolbar.textFunction": "Funkcje", + "DE.Controllers.Toolbar.textInsert": "Wstaw", "DE.Controllers.Toolbar.textIntegral": "Całki", "DE.Controllers.Toolbar.textLargeOperator": "Duże operatory", "DE.Controllers.Toolbar.textLimitAndLog": "Limity i algorytmy", @@ -470,7 +734,7 @@ "DE.Controllers.Toolbar.txtAccent_ArrowD": "Strzałka w lewo - w prawo powyżej", "DE.Controllers.Toolbar.txtAccent_ArrowL": "Lewa strzałka powyżej", "DE.Controllers.Toolbar.txtAccent_ArrowR": "Strzałka w prawo powyżej", - "DE.Controllers.Toolbar.txtAccent_Bar": "Paskowy", + "DE.Controllers.Toolbar.txtAccent_Bar": "Słupkowy", "DE.Controllers.Toolbar.txtAccent_BarBot": " Kreska na dole", "DE.Controllers.Toolbar.txtAccent_BarTop": "Kreska od góry", "DE.Controllers.Toolbar.txtAccent_BorderBox": "Formuła w ramce (z wypełnieniem)", @@ -791,10 +1055,40 @@ "DE.Views.BookmarksDialog.textClose": "Zamknij", "DE.Views.BookmarksDialog.textCopy": "Kopiuj", "DE.Views.BookmarksDialog.textDelete": "Usuń", + "DE.Views.BookmarksDialog.textHidden": "Ukryte zakładki", + "DE.Views.BookmarksDialog.textLocation": "Lokalizacja", + "DE.Views.BookmarksDialog.textName": "Nazwa", + "DE.Views.BookmarksDialog.textSort": "Sortuj według", "DE.Views.BookmarksDialog.textTitle": "Zakładki", "DE.Views.BookmarksDialog.txtInvalidName": "Nazwa zakładki powinna zaczynać się literą i zawierać może ona tylko litery, liczby i znaki podkreślenia ", "DE.Views.CaptionDialog.textAdd": "Dodaj etykietę", "DE.Views.CaptionDialog.textAfter": "po", + "DE.Views.CaptionDialog.textBefore": "Przed", + "DE.Views.CaptionDialog.textCaption": "Podpis", + "DE.Views.CaptionDialog.textChapter": "Rozpocznij rozdział stylem", + "DE.Views.CaptionDialog.textChapterInc": "Dołącz numer rozdziału", + "DE.Views.CaptionDialog.textColon": "dwukropek", + "DE.Views.CaptionDialog.textDash": "półpauza", + "DE.Views.CaptionDialog.textDelete": "Usuń etykietę", + "DE.Views.CaptionDialog.textEquation": "Równanie", + "DE.Views.CaptionDialog.textExamples": "Przykłady: Tabela 2-A, Rysunek IV-1", + "DE.Views.CaptionDialog.textExclude": "Wyklucz etykietę z podpisu", + "DE.Views.CaptionDialog.textFigure": "Rysunek", + "DE.Views.CaptionDialog.textHyphen": "łącznik", + "DE.Views.CaptionDialog.textInsert": "Wstaw", + "DE.Views.CaptionDialog.textLabel": "Etykieta", + "DE.Views.CaptionDialog.textLongDash": "myślnik", + "DE.Views.CaptionDialog.textNumbering": "Format", + "DE.Views.CaptionDialog.textPeriod": "kropka", + "DE.Views.CaptionDialog.textSeparator": "Użyj separatora", + "DE.Views.CaptionDialog.textTable": "Tabela", + "DE.Views.CaptionDialog.textTitle": "Wstaw podpis", + "DE.Views.CellsAddDialog.textCol": "Kolumny", + "DE.Views.CellsAddDialog.textDown": "Pod kursorem", + "DE.Views.CellsAddDialog.textLeft": "Do lewej", + "DE.Views.CellsAddDialog.textRight": "Do prawej", + "DE.Views.CellsAddDialog.textRow": "Wiersze", + "DE.Views.CellsAddDialog.textTitle": "Wstaw kilka", "DE.Views.CellsAddDialog.textUp": "Nad kursorem", "DE.Views.ChartSettings.textAdvanced": "Pokaż ustawienia zaawansowane", "DE.Views.ChartSettings.textChartType": "Zmień typ wykresu", @@ -814,21 +1108,65 @@ "DE.Views.ChartSettings.txtTight": "szczelnie", "DE.Views.ChartSettings.txtTitle": "Wykres", "DE.Views.ChartSettings.txtTopAndBottom": "Góra i dół", + "DE.Views.ControlSettingsDialog.strGeneral": "Ogólny", "DE.Views.ControlSettingsDialog.textAdd": "Dodaj", "DE.Views.ControlSettingsDialog.textAppearance": "Wygląd", "DE.Views.ControlSettingsDialog.textApplyAll": "Zastosuj wszędzie", + "DE.Views.ControlSettingsDialog.textChange": "Edytuj", "DE.Views.ControlSettingsDialog.textColor": "Kolor", + "DE.Views.ControlSettingsDialog.textDelete": "Usuń", + "DE.Views.ControlSettingsDialog.textLang": "Język", "DE.Views.ControlSettingsDialog.textNone": "Brak", "DE.Views.ControlSettingsDialog.textShowAs": "Pokaż jako", "DE.Views.ControlSettingsDialog.textTitle": "Ustawienia kontroli treści", + "DE.Views.ControlSettingsDialog.textUp": "W górę", "DE.Views.ControlSettingsDialog.txtLockDelete": "Nie można usunąć kontroli treści", - "DE.Views.CrossReferenceDialog.textAboveBelow": "Ponad/poniżej", + "DE.Views.CrossReferenceDialog.textAboveBelow": "'wyżej/\"niżej'", + "DE.Views.CrossReferenceDialog.textBookmark": "Zakładka", + "DE.Views.CrossReferenceDialog.textBookmarkText": "Tekst zakładki", + "DE.Views.CrossReferenceDialog.textCaption": "Cały podpis", + "DE.Views.CrossReferenceDialog.textEndnote": "Przypis końcowy", + "DE.Views.CrossReferenceDialog.textEndNoteNum": "Numer przypisu końcowego", + "DE.Views.CrossReferenceDialog.textEndNoteNumForm": "Numer przypisu końcowego (sformatowany)", + "DE.Views.CrossReferenceDialog.textEquation": "Równanie", + "DE.Views.CrossReferenceDialog.textFigure": "Rysunek", + "DE.Views.CrossReferenceDialog.textFootnote": "Przypis dolny", + "DE.Views.CrossReferenceDialog.textHeading": "Nagłówek", + "DE.Views.CrossReferenceDialog.textHeadingNum": "Poziom nagłówka", + "DE.Views.CrossReferenceDialog.textHeadingNumFull": "Poziom nagłówka (pełen kontekst)", + "DE.Views.CrossReferenceDialog.textHeadingNumNo": "Poziom nagłówka (bez kontekstu)", + "DE.Views.CrossReferenceDialog.textHeadingText": "Tekst nagłówka", + "DE.Views.CrossReferenceDialog.textIncludeAbove": "Dołącz wyraz \"powyżej\" lub \"poniżej\"", + "DE.Views.CrossReferenceDialog.textInsert": "Wstaw", + "DE.Views.CrossReferenceDialog.textInsertAs": "Wstaw jako hiperłącze", + "DE.Views.CrossReferenceDialog.textLabelNum": "Tylko etykieta i numer", + "DE.Views.CrossReferenceDialog.textNoteNum": "Numer przypisu dolnego", + "DE.Views.CrossReferenceDialog.textNoteNumForm": "Numer przypisu dolnego (sformatowany)", + "DE.Views.CrossReferenceDialog.textOnlyCaption": "Tylko tekst podpisu", + "DE.Views.CrossReferenceDialog.textPageNum": "Numer strony", + "DE.Views.CrossReferenceDialog.textParagraph": "Element numerowany", + "DE.Views.CrossReferenceDialog.textParaNum": "Numer akapitu", + "DE.Views.CrossReferenceDialog.textParaNumFull": "Numer akapitu (pełen kontekst)", + "DE.Views.CrossReferenceDialog.textParaNumNo": "Numer akapitu (bez kontekstu)", + "DE.Views.CrossReferenceDialog.textSeparate": "Oddziel liczby znakiem", + "DE.Views.CrossReferenceDialog.textTable": "Tabela", + "DE.Views.CrossReferenceDialog.textText": "Tekst akapitu", + "DE.Views.CrossReferenceDialog.textWhichPara": "Dla którego z numerowanych elementów", + "DE.Views.CrossReferenceDialog.txtReference": "Wstaw odsyłacz do", + "DE.Views.CrossReferenceDialog.txtTitle": "Odsyłacz", + "DE.Views.CrossReferenceDialog.txtType": "Typ odsyłacza", "DE.Views.CustomColumnsDialog.textColumns": "Ilość kolumn", "DE.Views.CustomColumnsDialog.textSeparator": "Podział kolumn", "DE.Views.CustomColumnsDialog.textSpacing": "Przerwa między kolumnami", "DE.Views.CustomColumnsDialog.textTitle": "Kolumny", + "DE.Views.DateTimeDialog.textDefault": "Ustaw jako domyślne", + "DE.Views.DateTimeDialog.textFormat": "Dostępne formaty", + "DE.Views.DateTimeDialog.textLang": "Język", + "DE.Views.DateTimeDialog.textUpdate": "Aktualizuj automatycznie", + "DE.Views.DateTimeDialog.txtTitle": "Data i czas", "DE.Views.DocumentHolder.aboveText": "Powyżej", "DE.Views.DocumentHolder.addCommentText": "Dodaj komentarz", + "DE.Views.DocumentHolder.advancedDropCapText": "Inicjały Ustawienia", "DE.Views.DocumentHolder.advancedFrameText": "Zaawansowane ustawienia ramki", "DE.Views.DocumentHolder.advancedParagraphText": "Zaawansowane ustawienia akapitu", "DE.Views.DocumentHolder.advancedTableText": "Zaawansowane ustawienia tabeli", @@ -873,6 +1211,7 @@ "DE.Views.DocumentHolder.mergeCellsText": "Scal komórki", "DE.Views.DocumentHolder.moreText": "Więcej wariantów...", "DE.Views.DocumentHolder.noSpellVariantsText": "Brak wariantów", + "DE.Views.DocumentHolder.notcriticalErrorTitle": "Ostrzeżenie", "DE.Views.DocumentHolder.originalSizeText": "Domyślny rozmiar", "DE.Views.DocumentHolder.paragraphText": "Akapit", "DE.Views.DocumentHolder.removeHyperlinkText": "Usuń link", @@ -898,15 +1237,25 @@ "DE.Views.DocumentHolder.textArrangeBackward": "Przenieś do tyłu", "DE.Views.DocumentHolder.textArrangeForward": "Przenieś do przodu", "DE.Views.DocumentHolder.textArrangeFront": "Przejdź na pierwszy plan", + "DE.Views.DocumentHolder.textCells": "Komórki", + "DE.Views.DocumentHolder.textCol": "Usuń całą kolumnę", "DE.Views.DocumentHolder.textContentControls": "Kontrola treści", + "DE.Views.DocumentHolder.textContinueNumbering": "Kontynuuj numerowanie", "DE.Views.DocumentHolder.textCopy": "Kopiuj", "DE.Views.DocumentHolder.textCrop": "Przytnij", "DE.Views.DocumentHolder.textCropFill": "Wypełnij", + "DE.Views.DocumentHolder.textCropFit": "Dopasuj", "DE.Views.DocumentHolder.textCut": "Wytnij", + "DE.Views.DocumentHolder.textDistributeCols": "Rozłóż kolumny", + "DE.Views.DocumentHolder.textDistributeRows": "Rozłóż wiersze", "DE.Views.DocumentHolder.textEditControls": "Ustawienia kontroli treści", "DE.Views.DocumentHolder.textEditWrapBoundary": "Edytuj granicę owinięcia", "DE.Views.DocumentHolder.textFlipH": "Odwróć w poziomie", "DE.Views.DocumentHolder.textFlipV": "Odwróć w pionie", + "DE.Views.DocumentHolder.textFromFile": "Z pliku", + "DE.Views.DocumentHolder.textFromUrl": "Z adresu URL", + "DE.Views.DocumentHolder.textJoinList": "Dołącz do poprzedniej listy", + "DE.Views.DocumentHolder.textLeft": "Przesuń komórki w lewo", "DE.Views.DocumentHolder.textNextPage": "Następna strona", "DE.Views.DocumentHolder.textPaste": "Wklej", "DE.Views.DocumentHolder.textPrevPage": "Poprzednia strona", @@ -916,13 +1265,22 @@ "DE.Views.DocumentHolder.textRemove": "Usuń", "DE.Views.DocumentHolder.textRemoveControl": "Usuń kontrolę treści", "DE.Views.DocumentHolder.textRemPicture": "Usuń obraz", + "DE.Views.DocumentHolder.textReplace": "Zamień obraz", + "DE.Views.DocumentHolder.textRotate270": "Obróć w lewo o 90° ", + "DE.Views.DocumentHolder.textRotate90": "Obróć w prawo o 90°", + "DE.Views.DocumentHolder.textRow": "Usuń cały wiersz", + "DE.Views.DocumentHolder.textSeparateList": "Oddzielna lista ", "DE.Views.DocumentHolder.textSettings": "Ustawienia", + "DE.Views.DocumentHolder.textSeveral": "Kilka wierszy/kolumn ", "DE.Views.DocumentHolder.textShapeAlignBottom": "Wyrównaj do dołu", "DE.Views.DocumentHolder.textShapeAlignCenter": "Wyrównaj do środka", "DE.Views.DocumentHolder.textShapeAlignLeft": "Wyrównaj do lewej", "DE.Views.DocumentHolder.textShapeAlignMiddle": "Wyrównaj do środka", "DE.Views.DocumentHolder.textShapeAlignRight": "Wyrównaj do prawej", "DE.Views.DocumentHolder.textShapeAlignTop": "Wyrównaj do góry", + "DE.Views.DocumentHolder.textStartNewList": "Rozpocznij nową listę", + "DE.Views.DocumentHolder.textStartNumberingFrom": "Ustaw wartość numerowania", + "DE.Views.DocumentHolder.textTitleCellsRemove": "Usuń komórki", "DE.Views.DocumentHolder.textTOC": "Spis treści", "DE.Views.DocumentHolder.textTOCSettings": "Ustawienia tabeli zawartości", "DE.Views.DocumentHolder.textUndo": "Cofnij", @@ -954,6 +1312,9 @@ "DE.Views.DocumentHolder.txtDeleteEq": "Usuń równanie", "DE.Views.DocumentHolder.txtDeleteGroupChar": "Usuń znak", "DE.Views.DocumentHolder.txtDeleteRadical": "Usuń pierwiastek", + "DE.Views.DocumentHolder.txtDistribHor": "Rozdziel poziomo", + "DE.Views.DocumentHolder.txtDistribVert": "Rozdziel pionowo", + "DE.Views.DocumentHolder.txtEmpty": "(Pusty)", "DE.Views.DocumentHolder.txtFractionLinear": "Zmień na ułamek liniowy", "DE.Views.DocumentHolder.txtFractionSkewed": "Zmienić na ukośny prosty ułamek", "DE.Views.DocumentHolder.txtFractionStacked": "Zmień na ułożone ułamki", @@ -980,6 +1341,7 @@ "DE.Views.DocumentHolder.txtInsertArgAfter": "Wstaw argument po", "DE.Views.DocumentHolder.txtInsertArgBefore": "Wstaw argument przed", "DE.Views.DocumentHolder.txtInsertBreak": "Wstaw ręczną przerwę", + "DE.Views.DocumentHolder.txtInsertCaption": "Dodaj podpis", "DE.Views.DocumentHolder.txtInsertEqAfter": "Wstaw równanie po", "DE.Views.DocumentHolder.txtInsertEqBefore": "Wstaw równanie przed", "DE.Views.DocumentHolder.txtKeepTextOnly": "Zachowaj tylko tekst", @@ -990,10 +1352,12 @@ "DE.Views.DocumentHolder.txtMatrixAlign": "Wyrównanie macierzy", "DE.Views.DocumentHolder.txtOverbar": "Pasek nad tekstem", "DE.Views.DocumentHolder.txtPressLink": "Naciśnij CTRL i kliknij link", + "DE.Views.DocumentHolder.txtPrintSelection": "Drukuj wybrane", "DE.Views.DocumentHolder.txtRemFractionBar": "Usuń belkę ułamka", "DE.Views.DocumentHolder.txtRemLimit": "Usuń limit", "DE.Views.DocumentHolder.txtRemoveAccentChar": "Usuwanie akcentu", "DE.Views.DocumentHolder.txtRemoveBar": "Usuń pasek", + "DE.Views.DocumentHolder.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
    Nie można tego cofnąć.", "DE.Views.DocumentHolder.txtRemScripts": "Usuń indeksy", "DE.Views.DocumentHolder.txtRemSubscript": "Usuń indeks dolny", "DE.Views.DocumentHolder.txtRemSuperscript": "Usuń górny indeks", @@ -1064,6 +1428,7 @@ "DE.Views.FileMenu.btnHistoryCaption": "Historia wersji", "DE.Views.FileMenu.btnInfoCaption": "Informacje o dokumencie...", "DE.Views.FileMenu.btnPrintCaption": "Drukuj", + "DE.Views.FileMenu.btnProtectCaption": "Zabezpiecz", "DE.Views.FileMenu.btnRecentFilesCaption": "Otwórz ostatnie...", "DE.Views.FileMenu.btnRenameCaption": "Zmień nazwę...", "DE.Views.FileMenu.btnReturnCaption": "Powrót do dokumentu", @@ -1074,11 +1439,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Zaawansowane ustawienia...", "DE.Views.FileMenu.btnToEditCaption": "Edytuj dokument", "DE.Views.FileMenu.textDownload": "Pobierz", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z pustego", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z szablonu", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Utwórz nowy pusty dokument tekstowy, który będziesz mógł formatować po jego utworzeniu podczas edytowania. Możesz też wybrać jeden z szablonów, aby utworzyć dokument określonego typu lub celu, w którym niektóre style zostały wcześniej zastosowane.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nowy dokument tekstowy", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tam nie ma żadnych szablonów", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Utwórz nowy", + "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Zatwierdź", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj autora", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj tekst", "DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikacja", @@ -1087,18 +1449,24 @@ "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Komentarz", "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Utworzono", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ładowanie...", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Ostatnio zmodyfikowany przez", + "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Ostatnio zmodyfikowany", + "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Właściciel", "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strony", "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Akapity", "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokalizacja", "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osoby, które mają prawa", - "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symbole ze spacjami", + "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Znaki ze spacjami", "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statystyki", - "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Symbole", + "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Temat", + "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Znaki", "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Tytuł dokumentu", - "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Słowa", + "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Wyrazy", "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Zmień prawa dostępu", "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Osoby, które mają prawa", "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Ostrzeżenie", + "DE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "Za pomocą hasła", + "DE.Views.FileMenuPanels.ProtectDoc.strProtect": "Chroń dokument", "DE.Views.FileMenuPanels.ProtectDoc.strSignature": "Z sygnaturą", "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edytuj dokument", "DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?", @@ -1117,6 +1485,9 @@ "DE.Views.FileMenuPanels.Settings.strForcesave": "Zawsze zapisuj na serwer (w przeciwnym razie zapisz na serwer dopiero przy zamykaniu dokumentu)", "DE.Views.FileMenuPanels.Settings.strInputMode": "Włącz hieroglify", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Włącz wyświetlanie komentarzy", + "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Ustawienia Makr", + "DE.Views.FileMenuPanels.Settings.strPaste": "Wycinanie, kopiowanie i wklejanie", + "DE.Views.FileMenuPanels.Settings.strPasteButton": "Pokaż przycisk opcji wklejania po wklejeniu zawartości", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Włącz wyświetlanie rozwiązanych komentarzy", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Zmiany w czasie rzeczywistym podczas współtworzenia", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Włącz sprawdzanie pisowni", @@ -1134,7 +1505,10 @@ "DE.Views.FileMenuPanels.Settings.textDisabled": "Wyłączony", "DE.Views.FileMenuPanels.Settings.textForceSave": "Zapisz na serwer", "DE.Views.FileMenuPanels.Settings.textMinute": "Każda minuta", + "DE.Views.FileMenuPanels.Settings.textOldVersions": "Zachowaj kompatybilność ze starszymi wersjami programu MS Word podczas zapisywania jako DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Pokaż wszystkie", + "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opcje Autokorekty...", + "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Domyślny tryb pamięci podręcznej", "DE.Views.FileMenuPanels.Settings.txtCm": "Centymetr", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Dopasuj do strony", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Dopasuj do szerokości", @@ -1145,47 +1519,80 @@ "DE.Views.FileMenuPanels.Settings.txtMac": "jak OS X", "DE.Views.FileMenuPanels.Settings.txtNative": "Natywny", "DE.Views.FileMenuPanels.Settings.txtNone": "Nic nie pokazuj", + "DE.Views.FileMenuPanels.Settings.txtProofing": "Sprawdzanie", "DE.Views.FileMenuPanels.Settings.txtPt": "Punkt", + "DE.Views.FileMenuPanels.Settings.txtRunMacros": "Włącz wszystkie", + "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "Włącz wszystkie makra bez powiadomienia", "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Sprawdzanie pisowni", + "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Wyłącz wszystkie", + "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Wyłącz wszystkie makra bez powiadomienia", + "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Pokaż powiadomienie", + "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Wyłącz wszystkie makra z powiadomieniem", "DE.Views.FileMenuPanels.Settings.txtWin": "jak Windows", + "DE.Views.FormSettings.textAutofit": "Autodopasowanie", + "DE.Views.FormSettings.textColor": "Kolor obramowania", + "DE.Views.FormSettings.textDelete": "Usuń", + "DE.Views.FormSettings.textDisconnect": "Rozłączyć", + "DE.Views.FormSettings.textFromFile": "Z pliku", + "DE.Views.FormSettings.textFromUrl": "Z adresu URL", + "DE.Views.FormSettings.textImage": "Obraz", + "DE.Views.FormSettings.textKey": "Klucz", + "DE.Views.FormSettings.textNever": "nigdy", + "DE.Views.FormSettings.textSelectImage": "Wybierz obraz", + "DE.Views.FormsTab.capBtnImage": "Obraz", + "DE.Views.FormsTab.textHighlight": "Ustawienia wyróżniania", + "DE.Views.FormsTab.textNoHighlight": "Brak wyróżnienia", "DE.Views.HeaderFooterSettings.textBottomCenter": "Dolny środek", "DE.Views.HeaderFooterSettings.textBottomLeft": "Lewy dolny", "DE.Views.HeaderFooterSettings.textBottomPage": "Dół strony", "DE.Views.HeaderFooterSettings.textBottomRight": "Prawy dolny", "DE.Views.HeaderFooterSettings.textDiffFirst": "Inna pierwsza strona", "DE.Views.HeaderFooterSettings.textDiffOdd": "Różne dziwne i parzyste strony", + "DE.Views.HeaderFooterSettings.textFrom": "Rozpocznij od", "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "Stopka z dołu", "DE.Views.HeaderFooterSettings.textHeaderFromTop": "Nagłówek z góry", + "DE.Views.HeaderFooterSettings.textInsertCurrent": "Wstaw do aktualnej pozycji", "DE.Views.HeaderFooterSettings.textOptions": "Opcje", "DE.Views.HeaderFooterSettings.textPageNum": "Wstaw numer strony", + "DE.Views.HeaderFooterSettings.textPageNumbering": "Numerowanie Strony", "DE.Views.HeaderFooterSettings.textPosition": "Pozycja", + "DE.Views.HeaderFooterSettings.textPrev": "Kontynuuj z poprzedniej sekcji", "DE.Views.HeaderFooterSettings.textSameAs": "Odnośnik do poprzedniego", "DE.Views.HeaderFooterSettings.textTopCenter": "Górny środek", "DE.Views.HeaderFooterSettings.textTopLeft": "Lewy górny", + "DE.Views.HeaderFooterSettings.textTopPage": "Góra strony", "DE.Views.HeaderFooterSettings.textTopRight": "Prawy górny", "DE.Views.HyperlinkSettingsDialog.textDefault": "Wybrany fragment tekstu", "DE.Views.HyperlinkSettingsDialog.textDisplay": "Pokaż", "DE.Views.HyperlinkSettingsDialog.textExternal": "Link zewnętrzny", + "DE.Views.HyperlinkSettingsDialog.textInternal": "Miejsce w tym dokumencie", "DE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia linków", "DE.Views.HyperlinkSettingsDialog.textTooltip": "Tekst wskazówki na ekranie", "DE.Views.HyperlinkSettingsDialog.textUrl": "Link do", "DE.Views.HyperlinkSettingsDialog.txtBeginning": "Początek dokumentu", "DE.Views.HyperlinkSettingsDialog.txtBookmarks": "Zakładki", "DE.Views.HyperlinkSettingsDialog.txtEmpty": "To pole jest wymagane", + "DE.Views.HyperlinkSettingsDialog.txtHeadings": "Nagłówki", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "To pole powinno być adresem URL w formacie \"http://www.example.com\"", "DE.Views.ImageSettings.textAdvanced": "Pokaż ustawienia zaawansowane", "DE.Views.ImageSettings.textCrop": "Przytnij", "DE.Views.ImageSettings.textCropFill": "Wypełnij", + "DE.Views.ImageSettings.textCropFit": "Dopasuj", "DE.Views.ImageSettings.textEdit": "Edytuj", "DE.Views.ImageSettings.textEditObject": "Edytuj obiekt", "DE.Views.ImageSettings.textFitMargins": "Dopasuj do marginesu", + "DE.Views.ImageSettings.textFlip": "Przerzuć", "DE.Views.ImageSettings.textFromFile": "Z pliku", "DE.Views.ImageSettings.textFromUrl": "Z adresu URL", "DE.Views.ImageSettings.textHeight": "Wysokość", + "DE.Views.ImageSettings.textHint270": "Obróć w lewo o 90° ", + "DE.Views.ImageSettings.textHint90": "Obróć w prawo o 90°", "DE.Views.ImageSettings.textHintFlipH": "Odwróć w poziomie", "DE.Views.ImageSettings.textHintFlipV": "Odwróć w pionie", "DE.Views.ImageSettings.textInsert": "Zamień obraz", "DE.Views.ImageSettings.textOriginalSize": "Domyślny rozmiar", + "DE.Views.ImageSettings.textRotate90": "Obróć o 90°", + "DE.Views.ImageSettings.textRotation": "Obróć", "DE.Views.ImageSettings.textSize": "Rozmiar", "DE.Views.ImageSettings.textWidth": "Szerokość", "DE.Views.ImageSettings.textWrap": "Styl zawijania", @@ -1206,6 +1613,7 @@ "DE.Views.ImageSettingsAdvanced.textAngle": "Kąt", "DE.Views.ImageSettingsAdvanced.textArrows": "Strzałki", "DE.Views.ImageSettingsAdvanced.textAspectRatio": "Zablokuj współczynnik kształtu", + "DE.Views.ImageSettingsAdvanced.textAutofit": "Autodopasowanie", "DE.Views.ImageSettingsAdvanced.textBeginSize": "Początkowy rozmiar", "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Styl początkowy", "DE.Views.ImageSettingsAdvanced.textBelow": "Poniżej", @@ -1221,8 +1629,10 @@ "DE.Views.ImageSettingsAdvanced.textEndSize": "Rozmiar końcowy", "DE.Views.ImageSettingsAdvanced.textEndStyle": "Styl końcowy", "DE.Views.ImageSettingsAdvanced.textFlat": "Płaski", + "DE.Views.ImageSettingsAdvanced.textFlipped": "Odwrócony ", "DE.Views.ImageSettingsAdvanced.textHeight": "Wysokość", "DE.Views.ImageSettingsAdvanced.textHorizontal": "Poziomy", + "DE.Views.ImageSettingsAdvanced.textHorizontally": "Poziomo ", "DE.Views.ImageSettingsAdvanced.textJoinType": "Dołącz typ", "DE.Views.ImageSettingsAdvanced.textKeepRatio": "Stałe proporcje", "DE.Views.ImageSettingsAdvanced.textLeft": "Lewy", @@ -1244,16 +1654,19 @@ "DE.Views.ImageSettingsAdvanced.textRight": "Prawy", "DE.Views.ImageSettingsAdvanced.textRightMargin": "Prawy margines", "DE.Views.ImageSettingsAdvanced.textRightOf": "na prawo od", + "DE.Views.ImageSettingsAdvanced.textRotation": "Obróć", "DE.Views.ImageSettingsAdvanced.textRound": "Zaokrąglij", "DE.Views.ImageSettingsAdvanced.textShape": "Ustawienia kształtu", "DE.Views.ImageSettingsAdvanced.textSize": "Rozmiar", "DE.Views.ImageSettingsAdvanced.textSquare": "Kwadratowy", + "DE.Views.ImageSettingsAdvanced.textTextBox": "Pole tekstowe", "DE.Views.ImageSettingsAdvanced.textTitle": "Obraz - zaawansowane ustawienia", "DE.Views.ImageSettingsAdvanced.textTitleChart": "Wykres - zaawansowane ustawienia", "DE.Views.ImageSettingsAdvanced.textTitleShape": "Kształt - Zaawansowane ustawienia", "DE.Views.ImageSettingsAdvanced.textTop": "Góra", "DE.Views.ImageSettingsAdvanced.textTopMargin": "Margines górny", "DE.Views.ImageSettingsAdvanced.textVertical": "Pionowy", + "DE.Views.ImageSettingsAdvanced.textVertically": "Pionowo ", "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Wagi i strzałki", "DE.Views.ImageSettingsAdvanced.textWidth": "Szerokość", "DE.Views.ImageSettingsAdvanced.textWrap": "Styl zawijania", @@ -1273,26 +1686,67 @@ "DE.Views.LeftMenu.tipSupport": "Opinie i wsparcie", "DE.Views.LeftMenu.tipTitles": "Tytuły", "DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA", - "DE.Views.LineNumbersDialog.textAddLineNumbering": "Dodaj numerowanie linii", + "DE.Views.LineNumbersDialog.textAddLineNumbering": "Dodaj numerację wierszy", + "DE.Views.LineNumbersDialog.textApplyTo": "Zastosuj do", + "DE.Views.LineNumbersDialog.textContinuous": "Ciągłe", + "DE.Views.LineNumbersDialog.textCountBy": "Numeruj co", + "DE.Views.LineNumbersDialog.textDocument": "Cały dokument", + "DE.Views.LineNumbersDialog.textForward": "Od bieżącego miejsca", + "DE.Views.LineNumbersDialog.textFromText": "Od tekstu", + "DE.Views.LineNumbersDialog.textNumbering": "Numerowanie", + "DE.Views.LineNumbersDialog.textRestartEachPage": "Rozpocznij nową stronę", + "DE.Views.LineNumbersDialog.textRestartEachSection": "Rozpocznij nową sekcję", + "DE.Views.LineNumbersDialog.textSection": "Ta sekcja", + "DE.Views.LineNumbersDialog.textStartAt": "Rozpocznij od", + "DE.Views.LineNumbersDialog.textTitle": "Numery wierszy", + "DE.Views.LineNumbersDialog.txtAutoText": "Automatyczny", "DE.Views.Links.capBtnBookmarks": "Zakładka", + "DE.Views.Links.capBtnCaption": "Podpis", "DE.Views.Links.capBtnContentsUpdate": "Odśwież", + "DE.Views.Links.capBtnCrossRef": "Odsyłacz", "DE.Views.Links.capBtnInsContents": "Spis treści", "DE.Views.Links.capBtnInsFootnote": "Przypis", "DE.Views.Links.capBtnInsLink": "Link", + "DE.Views.Links.capBtnTOF": "Spis ilustracji", "DE.Views.Links.confirmDeleteFootnotes": "Czy chcesz usunąć wszystkie przypisy?", + "DE.Views.Links.mniConvertNote": "Konwertowanie przypisów", "DE.Views.Links.mniDelFootnote": "Usuń wszystkie przypisy", + "DE.Views.Links.mniInsEndnote": "Wstaw przypis końcowy", "DE.Views.Links.mniInsFootnote": "Wstaw przypis", "DE.Views.Links.mniNoteSettings": "Ustawienia notatek", "DE.Views.Links.textContentsRemove": "Usuń tabelę zawartości", "DE.Views.Links.textContentsSettings": "Ustawienia", + "DE.Views.Links.textConvertToEndnotes": "Konwertuj wszystkie przypisy dolne na przypisy końcowe", + "DE.Views.Links.textConvertToFootnotes": "Konwertuj wszystkie przypisy końcowe na przypisy dolne", + "DE.Views.Links.textGotoEndnote": "idź do przypisów końcowych", "DE.Views.Links.textGotoFootnote": "Idź do przypisów", + "DE.Views.Links.textSwapNotes": "Zamień miejscami przypisy dolne z przypisami końcowymi", "DE.Views.Links.textUpdateAll": "Odśwież całą tabelę", "DE.Views.Links.textUpdatePages": "Odśwież wyłącznie numery stron", "DE.Views.Links.tipBookmarks": "Utwórz zakładkę", + "DE.Views.Links.tipCaption": "Dodaj podpis", + "DE.Views.Links.tipContents": "Spis treści", "DE.Views.Links.tipContentsUpdate": "Odśwież tabelę zawartości", + "DE.Views.Links.tipCrossRef": "Wstaw odsyłacz", "DE.Views.Links.tipInsertHyperlink": "Dodaj link", "DE.Views.Links.tipNotes": "Wstawianie lub edytowanie przypisów", + "DE.Views.Links.tipTableFigures": "Wstaw spis ilustracji", + "DE.Views.ListSettingsDialog.textAuto": "Automatyczne", + "DE.Views.ListSettingsDialog.textCenter": "Do Środka", + "DE.Views.ListSettingsDialog.textLeft": "Do Lewej", + "DE.Views.ListSettingsDialog.textLevel": "Poziom", + "DE.Views.ListSettingsDialog.textPreview": "Podgląd", + "DE.Views.ListSettingsDialog.textRight": "Do Prawej", "DE.Views.ListSettingsDialog.txtAlign": "Wyrównanie", + "DE.Views.ListSettingsDialog.txtBullet": "Znak punktora", + "DE.Views.ListSettingsDialog.txtColor": "Kolor", + "DE.Views.ListSettingsDialog.txtFont": "Czcionka i Symbole", + "DE.Views.ListSettingsDialog.txtLikeText": "Jak tekst", + "DE.Views.ListSettingsDialog.txtNone": "Brak", + "DE.Views.ListSettingsDialog.txtSize": "Rozmiar", + "DE.Views.ListSettingsDialog.txtSymbol": "Symbole", + "DE.Views.ListSettingsDialog.txtTitle": "Ustawienia listy", + "DE.Views.ListSettingsDialog.txtType": "Typ", "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF", "DE.Views.MailMergeEmailDlg.okButtonText": "Wyślij", "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Motyw", @@ -1347,9 +1801,11 @@ "DE.Views.NoteSettingsDialog.textApplyTo": "Zatwierdź zmiany do", "DE.Views.NoteSettingsDialog.textContinue": "Ciągły", "DE.Views.NoteSettingsDialog.textCustom": "Znak niestandardowy", + "DE.Views.NoteSettingsDialog.textDocEnd": "Koniec dokumentu", "DE.Views.NoteSettingsDialog.textDocument": "Cały dokument", "DE.Views.NoteSettingsDialog.textEachPage": "Uruchom ponownie każdą stronę", "DE.Views.NoteSettingsDialog.textEachSection": "Uruchom ponownie każdą sekcję", + "DE.Views.NoteSettingsDialog.textEndnote": "Przypisy końcowe", "DE.Views.NoteSettingsDialog.textFootnote": "Ruchoma tablica", "DE.Views.NoteSettingsDialog.textFormat": "Formatowanie", "DE.Views.NoteSettingsDialog.textInsert": "Wstaw", @@ -1357,13 +1813,23 @@ "DE.Views.NoteSettingsDialog.textNumbering": "Numeracja", "DE.Views.NoteSettingsDialog.textNumFormat": "Format numeru", "DE.Views.NoteSettingsDialog.textPageBottom": "Dół strony", + "DE.Views.NoteSettingsDialog.textSectEnd": "Koniec sekcji", "DE.Views.NoteSettingsDialog.textSection": "Aktualna sekcja", "DE.Views.NoteSettingsDialog.textStart": "Zacznij w", "DE.Views.NoteSettingsDialog.textTextBottom": "Poniżej tekstu", "DE.Views.NoteSettingsDialog.textTitle": "Ustawienia notatek", + "DE.Views.NotesRemoveDialog.textFoot": "Usuń wszystkie przypisy", "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Ostrzeżenie", "DE.Views.PageMarginsDialog.textBottom": "Dół", + "DE.Views.PageMarginsDialog.textGutterPosition": "Pozycja marginesu na oprawę", + "DE.Views.PageMarginsDialog.textLandscape": "Krajobraz", "DE.Views.PageMarginsDialog.textLeft": "Lewy", + "DE.Views.PageMarginsDialog.textMirrorMargins": "Marginesy lustrzane", + "DE.Views.PageMarginsDialog.textMultiplePages": "Wiele stron", + "DE.Views.PageMarginsDialog.textNormal": "Normalny", + "DE.Views.PageMarginsDialog.textOrientation": "Orientacja", + "DE.Views.PageMarginsDialog.textPortrait": "Portret", + "DE.Views.PageMarginsDialog.textPreview": "Podgląd", "DE.Views.PageMarginsDialog.textRight": "Prawy", "DE.Views.PageMarginsDialog.textTitle": "Marginesy", "DE.Views.PageMarginsDialog.textTop": "Góra", @@ -1373,6 +1839,10 @@ "DE.Views.PageSizeDialog.textTitle": "Rozmiar strony", "DE.Views.PageSizeDialog.textWidth": "Szerokość", "DE.Views.PageSizeDialog.txtCustom": "Niestandardowy", + "DE.Views.ParagraphSettings.strIndent": "Wcięcie", + "DE.Views.ParagraphSettings.strIndentsLeftText": "Z lewej", + "DE.Views.ParagraphSettings.strIndentsRightText": "Z prawej", + "DE.Views.ParagraphSettings.strIndentsSpecial": "Specjalne", "DE.Views.ParagraphSettings.strLineHeight": "Rozstaw wierszy", "DE.Views.ParagraphSettings.strParagraphSpacing": "Odstępy akapitu", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu", @@ -1384,32 +1854,43 @@ "DE.Views.ParagraphSettings.textAuto": "Mnożnik", "DE.Views.ParagraphSettings.textBackColor": "Kolor tła", "DE.Views.ParagraphSettings.textExact": "Dokładnie", + "DE.Views.ParagraphSettings.textFirstLine": "Pierwszy wiersz", + "DE.Views.ParagraphSettings.textHanging": "Wysunięcie", + "DE.Views.ParagraphSettings.textNoneSpecial": "(brak)", "DE.Views.ParagraphSettings.txtAutoText": "Automatyczny", "DE.Views.ParagraphSettingsAdvanced.noTabs": "W tym polu zostaną wyświetlone określone karty", "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Wszystkie duże litery", "DE.Views.ParagraphSettingsAdvanced.strBorders": "Obramowania i wypełnienie", - "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Przerwanie strony przed", + "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Podział strony przed", "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Podwójne przekreślenie", - "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Lewy", - "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Prawy", + "DE.Views.ParagraphSettingsAdvanced.strIndent": "Wcięcia", + "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Z lewej", + "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interlinia", + "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Poziom konspektu", + "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Z prawej", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "po", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Przed", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Specjalne", "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Trzymaj wiersze razem", "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Trzymaj dalej", "DE.Views.ParagraphSettingsAdvanced.strMargins": "Wewnętrzne pola", "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Zakaz bękartów", "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Czcionka", "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Wcięcia i miejsca docelowe", + "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Podział wierszy i stron", "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Umieszczenie", "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Małe litery", "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu", - "DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślony", - "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks", + "DE.Views.ParagraphSettingsAdvanced.strSpacing": "Odstępy", + "DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślenie", + "DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks dolny", "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Indeks górny", + "DE.Views.ParagraphSettingsAdvanced.strSuppressLineNumbers": "Ukryj numerację wierszy", "DE.Views.ParagraphSettingsAdvanced.strTabs": "Karta", "DE.Views.ParagraphSettingsAdvanced.textAlign": "Wyrównanie", "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Co najmniej", "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Kolor tła", + "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Tekst podstawowy", "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Kolor", "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Kliknij na diagram lub użyj przycisków, aby wybrać granice i zastosuj do nich wybrany styl", "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Rozmiar obramowania", @@ -1418,15 +1899,20 @@ "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Rozstaw znaków", "DE.Views.ParagraphSettingsAdvanced.textDefault": "Domyślna zakładka", "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty", + "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Pierwszy wiersz", + "DE.Views.ParagraphSettingsAdvanced.textHanging": "Wysunięcie", + "DE.Views.ParagraphSettingsAdvanced.textJustified": "Wyjustowany", + "DE.Views.ParagraphSettingsAdvanced.textLeader": "Typ linii", "DE.Views.ParagraphSettingsAdvanced.textLeft": "Lewy", + "DE.Views.ParagraphSettingsAdvanced.textLevel": "Poziom", "DE.Views.ParagraphSettingsAdvanced.textNone": "Brak", "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(brak)", - "DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozycja", + "DE.Views.ParagraphSettingsAdvanced.textPosition": "Położenie", "DE.Views.ParagraphSettingsAdvanced.textRemove": "Usuń", "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Usuń wszystko", "DE.Views.ParagraphSettingsAdvanced.textRight": "Prawy", "DE.Views.ParagraphSettingsAdvanced.textSet": "Określ", - "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Rozstaw", + "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Odstępy", "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Środek", "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Lewy", "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Pozycja karty", @@ -1458,6 +1944,7 @@ "DE.Views.ShapeSettings.strFill": "Wypełnij", "DE.Views.ShapeSettings.strForeground": "Kolor pierwszoplanowy", "DE.Views.ShapeSettings.strPattern": "Wzór", + "DE.Views.ShapeSettings.strShadow": "Pokaż cień ", "DE.Views.ShapeSettings.strSize": "Rozmiar", "DE.Views.ShapeSettings.strStroke": "Obrys", "DE.Views.ShapeSettings.strTransparency": "Nieprzezroczystość", @@ -1468,23 +1955,31 @@ "DE.Views.ShapeSettings.textColor": "Kolor wypełnienia", "DE.Views.ShapeSettings.textDirection": "Kierunek", "DE.Views.ShapeSettings.textEmptyPattern": "Brak wzorca", + "DE.Views.ShapeSettings.textFlip": "Przerzuć", "DE.Views.ShapeSettings.textFromFile": "Z pliku", "DE.Views.ShapeSettings.textFromUrl": "Z adresu URL", "DE.Views.ShapeSettings.textGradient": "Gradient", "DE.Views.ShapeSettings.textGradientFill": "Wypełnienie gradientem", + "DE.Views.ShapeSettings.textHint270": "Obróć w lewo o 90° ", + "DE.Views.ShapeSettings.textHint90": "Obróć w prawo o 90°", "DE.Views.ShapeSettings.textHintFlipH": "Odwróć w poziomie", "DE.Views.ShapeSettings.textHintFlipV": "Odwróć w pionie", "DE.Views.ShapeSettings.textImageTexture": "Obraz lub tekstura", "DE.Views.ShapeSettings.textLinear": "Liniowy", "DE.Views.ShapeSettings.textNoFill": "Brak wypełnienia", "DE.Views.ShapeSettings.textPatternFill": "Wzór", + "DE.Views.ShapeSettings.textPosition": "Pozycja", "DE.Views.ShapeSettings.textRadial": "Promieniowy", + "DE.Views.ShapeSettings.textRotate90": "Obróć o 90°", + "DE.Views.ShapeSettings.textRotation": "Obróć", "DE.Views.ShapeSettings.textSelectTexture": "Wybierz", "DE.Views.ShapeSettings.textStretch": "Rozciągnij", "DE.Views.ShapeSettings.textStyle": "Styl", "DE.Views.ShapeSettings.textTexture": "Z tekstury", "DE.Views.ShapeSettings.textTile": "Płytka", "DE.Views.ShapeSettings.textWrap": "Styl zawijania", + "DE.Views.ShapeSettings.tipAddGradientPoint": "Dodaj punkt gradientu", + "DE.Views.ShapeSettings.tipRemoveGradientPoint": "Usuń punkt gradientu", "DE.Views.ShapeSettings.txtBehind": "Za", "DE.Views.ShapeSettings.txtBrownPaper": "Brązowy papier", "DE.Views.ShapeSettings.txtCanvas": "Płótno", @@ -1506,6 +2001,8 @@ "DE.Views.ShapeSettings.txtWood": "Drewno", "DE.Views.SignatureSettings.notcriticalErrorTitle": "Ostrzeżenie", "DE.Views.SignatureSettings.strDelete": "Usuń podpis", + "DE.Views.SignatureSettings.strDetails": "Szczegóły sygnatury", + "DE.Views.SignatureSettings.strInvalid": "Nieprawidłowe podpisy", "DE.Views.SignatureSettings.strSignature": "Sygnatura", "DE.Views.SignatureSettings.txtContinueEditing": "Edytuj mimo wszystko", "DE.Views.SignatureSettings.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?", @@ -1525,14 +2022,38 @@ "DE.Views.StyleTitleDialog.textTitle": "Tytuł", "DE.Views.StyleTitleDialog.txtEmpty": "To pole jest wymagane", "DE.Views.StyleTitleDialog.txtNotEmpty": "Pole nie może być puste", + "DE.Views.StyleTitleDialog.txtSameAs": "Taki sam, jak stworzony nowy styl", + "DE.Views.TableFormulaDialog.textBookmark": "Wklej zakładkę", + "DE.Views.TableFormulaDialog.textFormat": "Format liczby", + "DE.Views.TableFormulaDialog.textFormula": "Formuła", "DE.Views.TableFormulaDialog.textInsertFunction": "Wklej funkcję", "DE.Views.TableFormulaDialog.textTitle": "Ustawienia formuł", + "DE.Views.TableOfContentsSettings.strAlign": "Numery stron wyrównaj do prawej", + "DE.Views.TableOfContentsSettings.strFullCaption": "Dołącz etykietę i numer", + "DE.Views.TableOfContentsSettings.strLinks": "Użyj hiperłączy zamiast numerów stron", "DE.Views.TableOfContentsSettings.strShowPages": "Pokaż numery stron", + "DE.Views.TableOfContentsSettings.textBuildTable": "Zbuduj spis treści z", + "DE.Views.TableOfContentsSettings.textEquation": "Równanie", + "DE.Views.TableOfContentsSettings.textFigure": "Rysunek", + "DE.Views.TableOfContentsSettings.textLeader": "Znaki wiodące tabulacji", + "DE.Views.TableOfContentsSettings.textLevel": "Poziom", + "DE.Views.TableOfContentsSettings.textLevels": "Poziomy", "DE.Views.TableOfContentsSettings.textNone": "Brak", + "DE.Views.TableOfContentsSettings.textRadioCaption": "Podpis", + "DE.Views.TableOfContentsSettings.textRadioLevels": "Pokaż poziomy", + "DE.Views.TableOfContentsSettings.textRadioStyle": "Styl", + "DE.Views.TableOfContentsSettings.textRadioStyles": "Wybierz style", "DE.Views.TableOfContentsSettings.textStyle": "Styl", + "DE.Views.TableOfContentsSettings.textStyles": "Format", + "DE.Views.TableOfContentsSettings.textTable": "Tabela", "DE.Views.TableOfContentsSettings.textTitle": "Spis treści", + "DE.Views.TableOfContentsSettings.textTitleTOF": "Spis ilustracji", "DE.Views.TableOfContentsSettings.txtClassic": "Klasyczny", "DE.Views.TableOfContentsSettings.txtCurrent": "Obecny", + "DE.Views.TableOfContentsSettings.txtModern": "Nowoczesny", + "DE.Views.TableOfContentsSettings.txtOnline": "Online", + "DE.Views.TableOfContentsSettings.txtSimple": "Prosty", + "DE.Views.TableOfContentsSettings.txtStandard": "Standardowy", "DE.Views.TableSettings.deleteColumnText": "Usuń kolumnę", "DE.Views.TableSettings.deleteRowText": "Usuń wiersz", "DE.Views.TableSettings.deleteTableText": "Usuń tabelę", @@ -1556,15 +2077,19 @@ "DE.Views.TableSettings.textBorders": "Style obramowań", "DE.Views.TableSettings.textCellSize": "Rozmiar komórki", "DE.Views.TableSettings.textColumns": "Kolumny", + "DE.Views.TableSettings.textDistributeCols": "Rozłóż kolumny", + "DE.Views.TableSettings.textDistributeRows": "Rozłóż wiersze", "DE.Views.TableSettings.textEdit": "Wiersze i Kolumny", "DE.Views.TableSettings.textEmptyTemplate": "Brak szablonów", "DE.Views.TableSettings.textFirst": "Pierwszy", "DE.Views.TableSettings.textHeader": "Nagłówek", + "DE.Views.TableSettings.textHeight": "Wysokość", "DE.Views.TableSettings.textLast": "Ostatni", "DE.Views.TableSettings.textRows": "Wiersze", "DE.Views.TableSettings.textSelectBorders": "Wybierz obramowania, które chcesz zmienić stosując styl wybrany powyżej", "DE.Views.TableSettings.textTemplate": "Wybierz z szablonu", "DE.Views.TableSettings.textTotal": "Wszystkie", + "DE.Views.TableSettings.textWidth": "Szerokość", "DE.Views.TableSettings.tipAll": "Ustaw krawędź zewnętrzną i wszystkie wewnętrzne linie", "DE.Views.TableSettings.tipBottom": "Ustaw tylko obramowanie dolnej krawędzi", "DE.Views.TableSettings.tipInner": "Ustawić tylko linie wewnętrzne", @@ -1577,6 +2102,12 @@ "DE.Views.TableSettings.tipTop": "Ustaw tylko obramowanie górnej krawędzi", "DE.Views.TableSettings.txtNoBorders": "Bez krawędzi", "DE.Views.TableSettings.txtTable_Accent": "Akcent", + "DE.Views.TableSettings.txtTable_Dark": "Ciemny", + "DE.Views.TableSettings.txtTable_GridTable": "Tabela siatki", + "DE.Views.TableSettings.txtTable_Light": "Jasny", + "DE.Views.TableSettings.txtTable_ListTable": "Tabela listy", + "DE.Views.TableSettings.txtTable_PlainTable": "Zwykła tabela", + "DE.Views.TableSettings.txtTable_TableGrid": "Tabela - siatka", "DE.Views.TableSettingsAdvanced.textAlign": "Wyrównanie", "DE.Views.TableSettingsAdvanced.textAlignment": "Wyrównanie", "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Rozstaw między komórkami", @@ -1663,16 +2194,24 @@ "DE.Views.TextArtSettings.textGradientFill": "Wypełnienie gradientem", "DE.Views.TextArtSettings.textLinear": "Liniowy", "DE.Views.TextArtSettings.textNoFill": "Brak wypełnienia", + "DE.Views.TextArtSettings.textPosition": "Położenie", "DE.Views.TextArtSettings.textRadial": "Promieniowy", "DE.Views.TextArtSettings.textSelectTexture": "Wybierz", "DE.Views.TextArtSettings.textStyle": "Styl", "DE.Views.TextArtSettings.textTemplate": "Szablon", "DE.Views.TextArtSettings.textTransform": "Przekształcenie", + "DE.Views.TextArtSettings.tipAddGradientPoint": "Dodaj punkt gradientu", + "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Usuń punkt gradientu", "DE.Views.TextArtSettings.txtNoBorders": "Brak krawędzi", + "DE.Views.TextToTableDialog.textColumns": "Kolumny", + "DE.Views.TextToTableDialog.textPara": "Akapity", + "DE.Views.TextToTableDialog.textRows": "Wiersze", + "DE.Views.TextToTableDialog.txtAutoText": "Automatyczny", "DE.Views.Toolbar.capBtnAddComment": "Dodaj Komentarz", "DE.Views.Toolbar.capBtnBlankPage": "Pusta strona", "DE.Views.Toolbar.capBtnColumns": "Kolumny", "DE.Views.Toolbar.capBtnComment": "Komentarz", + "DE.Views.Toolbar.capBtnDateTime": "Data i czas", "DE.Views.Toolbar.capBtnInsChart": "Wykres", "DE.Views.Toolbar.capBtnInsDropcap": "Inicjały", "DE.Views.Toolbar.capBtnInsEquation": "Równanie", @@ -1680,39 +2219,52 @@ "DE.Views.Toolbar.capBtnInsImage": "Obraz", "DE.Views.Toolbar.capBtnInsPagebreak": "Przerwy", "DE.Views.Toolbar.capBtnInsShape": "Kształt", + "DE.Views.Toolbar.capBtnInsSymbol": "Symbole", "DE.Views.Toolbar.capBtnInsTable": "Tabela", "DE.Views.Toolbar.capBtnInsTextart": "Text Art", "DE.Views.Toolbar.capBtnInsTextbox": "Tekst", + "DE.Views.Toolbar.capBtnLineNumbers": "Numery wierszy", "DE.Views.Toolbar.capBtnMargins": "Marginesy", "DE.Views.Toolbar.capBtnPageOrient": "Orientacja", "DE.Views.Toolbar.capBtnPageSize": "Rozmiar", + "DE.Views.Toolbar.capBtnWatermark": "Znak wodny", "DE.Views.Toolbar.capImgAlign": "Wyrównaj", "DE.Views.Toolbar.capImgBackward": "Przenieś do tyłu", "DE.Views.Toolbar.capImgForward": "Przenieś do przodu", "DE.Views.Toolbar.capImgGroup": "Grupa", "DE.Views.Toolbar.capImgWrapping": "Zawijanie", + "DE.Views.Toolbar.mniCapitalizeWords": "Jak Nazwy Własne", "DE.Views.Toolbar.mniCustomTable": "Wstaw tabelę niestandardową", + "DE.Views.Toolbar.mniDrawTable": "Rysowanie tabeli", "DE.Views.Toolbar.mniEditDropCap": "Inicjały Ustawienia", "DE.Views.Toolbar.mniEditFooter": "Edytuj stopkę", "DE.Views.Toolbar.mniEditHeader": "Edytuj nagłówek", + "DE.Views.Toolbar.mniEraseTable": "Wymaż tabelę", "DE.Views.Toolbar.mniHiddenBorders": "Ukryte obramowanie tabeli", "DE.Views.Toolbar.mniHiddenChars": "Znaki niedrukowane", "DE.Views.Toolbar.mniHighlightControls": "Ustawienia wyróżniania", "DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku", "DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL", + "DE.Views.Toolbar.mniLowerCase": "małe litery", + "DE.Views.Toolbar.mniSentenceCase": "Jak w zdaniu", + "DE.Views.Toolbar.mniToggleCase": "zAMIANA nA mAŁE/wIELKIE", + "DE.Views.Toolbar.mniUpperCase": "WIELKI LITERY", "DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia", "DE.Views.Toolbar.textAutoColor": "Automatyczny", "DE.Views.Toolbar.textBold": "Pogrubienie", "DE.Views.Toolbar.textBottom": "Dół:", + "DE.Views.Toolbar.textChangeLevel": "Zmień Poziom Listy", "DE.Views.Toolbar.textColumnsCustom": "Niestandardowe kolumny", - "DE.Views.Toolbar.textColumnsLeft": "Lewy", - "DE.Views.Toolbar.textColumnsOne": "Jeden", - "DE.Views.Toolbar.textColumnsRight": "Prawy", + "DE.Views.Toolbar.textColumnsLeft": "Z lewej", + "DE.Views.Toolbar.textColumnsOne": "Jedna", + "DE.Views.Toolbar.textColumnsRight": "Z prawej", "DE.Views.Toolbar.textColumnsThree": "Trzy", - "DE.Views.Toolbar.textColumnsTwo": "Dwa", - "DE.Views.Toolbar.textContPage": "Ciągła strona", + "DE.Views.Toolbar.textColumnsTwo": "Dwie", + "DE.Views.Toolbar.textContinuous": "Ciągłe", + "DE.Views.Toolbar.textContPage": "Ciągły", + "DE.Views.Toolbar.textCustomLineNumbers": "Opcje numeracji wierszy", "DE.Views.Toolbar.textEditWatermark": "Własny znak wodny", - "DE.Views.Toolbar.textEvenPage": "Z parzystej strony", + "DE.Views.Toolbar.textEvenPage": "Parzysta strona", "DE.Views.Toolbar.textInMargin": "W marginesie", "DE.Views.Toolbar.textInsColumnBreak": "Wstaw podział kolumny", "DE.Views.Toolbar.textInsertPageCount": "Wstaw liczbę stron", @@ -1723,6 +2275,7 @@ "DE.Views.Toolbar.textItalic": "Kursywa", "DE.Views.Toolbar.textLandscape": "Krajobraz", "DE.Views.Toolbar.textLeft": "Lewo:", + "DE.Views.Toolbar.textListSettings": "Ustawienia listy", "DE.Views.Toolbar.textMarginsLast": "Ostatni niestandardowy", "DE.Views.Toolbar.textMarginsModerate": "Umiarkowany", "DE.Views.Toolbar.textMarginsNarrow": "Wąski", @@ -1739,6 +2292,8 @@ "DE.Views.Toolbar.textPortrait": "Portret", "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści", "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny", + "DE.Views.Toolbar.textRestartEachPage": "Rozpocznij nową stronę", + "DE.Views.Toolbar.textRestartEachSection": "Rozpocznij nową sekcję", "DE.Views.Toolbar.textRight": "Prawo:", "DE.Views.Toolbar.textStrikeout": "Skreślenie", "DE.Views.Toolbar.textStyleMenuDelete": "Usuń styl", @@ -1747,8 +2302,9 @@ "DE.Views.Toolbar.textStyleMenuRestore": "Przywróć domyślne", "DE.Views.Toolbar.textStyleMenuRestoreAll": "Przywróć wszystko do domyślnych stylów", "DE.Views.Toolbar.textStyleMenuUpdate": "Aktualizuj z wyboru", - "DE.Views.Toolbar.textSubscript": "Indeks", + "DE.Views.Toolbar.textSubscript": "Indeks dolny", "DE.Views.Toolbar.textSuperscript": "Indeks górny", + "DE.Views.Toolbar.textSuppressForCurrentParagraph": "Pomiń w bieżącym akapicie", "DE.Views.Toolbar.textTabCollaboration": "Współpraca", "DE.Views.Toolbar.textTabFile": "Plik", "DE.Views.Toolbar.textTabHome": "Narzędzia główne", @@ -1760,19 +2316,21 @@ "DE.Views.Toolbar.textTitleError": "Błąd", "DE.Views.Toolbar.textToCurrent": "Do aktualnej pozycji", "DE.Views.Toolbar.textTop": "Góra:", - "DE.Views.Toolbar.textUnderline": "Podkreśl", + "DE.Views.Toolbar.textUnderline": "Podkreślenie", "DE.Views.Toolbar.tipAlignCenter": "Wyrównaj do środka", "DE.Views.Toolbar.tipAlignJust": "Wyjustowany", "DE.Views.Toolbar.tipAlignLeft": "Wyrównaj do lewej", "DE.Views.Toolbar.tipAlignRight": "Wyrównaj do prawej", "DE.Views.Toolbar.tipBack": "Powrót", "DE.Views.Toolbar.tipBlankPage": "Wstaw pustą stronę", + "DE.Views.Toolbar.tipChangeCase": "Zmień wielkość liter", "DE.Views.Toolbar.tipChangeChart": "Zmień typ wykresu", "DE.Views.Toolbar.tipClearStyle": "Wyczyść style", "DE.Views.Toolbar.tipColorSchemas": "Zmień schemat kolorów", "DE.Views.Toolbar.tipColumns": "Wstaw kolumny", "DE.Views.Toolbar.tipCopy": "Kopiuj", "DE.Views.Toolbar.tipCopyStyle": "Kopiuj styl", + "DE.Views.Toolbar.tipDateTime": "Wstaw aktualną datę i godzinę", "DE.Views.Toolbar.tipDecFont": "Zmniejsz rozmiar czcionki", "DE.Views.Toolbar.tipDecPrLeft": "Zmniejsz wcięcie", "DE.Views.Toolbar.tipDropCap": "Wstaw dużą pierwszą literę", @@ -1791,9 +2349,11 @@ "DE.Views.Toolbar.tipInsertImage": "Wstaw obraz", "DE.Views.Toolbar.tipInsertNum": "Wstaw numer strony", "DE.Views.Toolbar.tipInsertShape": "Wstaw kształt", + "DE.Views.Toolbar.tipInsertSymbol": "Wstaw symbol", "DE.Views.Toolbar.tipInsertTable": "Wstaw tabelę", "DE.Views.Toolbar.tipInsertText": "Wstaw tekst", "DE.Views.Toolbar.tipInsertTextArt": "Wstaw tekst", + "DE.Views.Toolbar.tipLineNumbers": "Pokaż numery wierszy", "DE.Views.Toolbar.tipLineSpace": "Rozstaw wierszy akapitu", "DE.Views.Toolbar.tipMailRecepients": "Korespondencja seryjna", "DE.Views.Toolbar.tipMarkers": "Lista punktowa", @@ -1816,6 +2376,8 @@ "DE.Views.Toolbar.tipSynchronize": "Dokument został zmieniony przez innego użytkownika. Kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.", "DE.Views.Toolbar.tipUndo": "Cofnij", "DE.Views.Toolbar.tipWatermark": "Edytuj znak wodny", + "DE.Views.Toolbar.txtDistribHor": "Rozdziel poziomo", + "DE.Views.Toolbar.txtDistribVert": "Rozdziel pionowo", "DE.Views.Toolbar.txtMarginAlign": "Wyrównaj do marginesów", "DE.Views.Toolbar.txtObjectsAlign": "Wyrównaj zaznaczone obiekty", "DE.Views.Toolbar.txtPageAlign": "Wyrównaj do strony", @@ -1842,6 +2404,22 @@ "DE.Views.Toolbar.txtScheme9": "Odlewnia", "DE.Views.WatermarkSettingsDialog.textAuto": "Automatyczny", "DE.Views.WatermarkSettingsDialog.textBold": "Pogrubienie", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor", - "DE.Views.WatermarkSettingsDialog.textTitle": "Ustawienia znaków wodnych" + "DE.Views.WatermarkSettingsDialog.textColor": "Kolor tekstu", + "DE.Views.WatermarkSettingsDialog.textDiagonal": "Przekątna", + "DE.Views.WatermarkSettingsDialog.textFont": "Czcionka", + "DE.Views.WatermarkSettingsDialog.textFromFile": "Z pliku", + "DE.Views.WatermarkSettingsDialog.textFromUrl": "Z adresu URL", + "DE.Views.WatermarkSettingsDialog.textHor": "Poziomy", + "DE.Views.WatermarkSettingsDialog.textImageW": "Znak wodny obrazu", + "DE.Views.WatermarkSettingsDialog.textLanguage": "Język", + "DE.Views.WatermarkSettingsDialog.textLayout": "Układ", + "DE.Views.WatermarkSettingsDialog.textNone": "Brak", + "DE.Views.WatermarkSettingsDialog.textScale": "Skala", + "DE.Views.WatermarkSettingsDialog.textSelect": "Wybierz obraz", + "DE.Views.WatermarkSettingsDialog.textText": "Tekst", + "DE.Views.WatermarkSettingsDialog.textTextW": "Tekstowy znak wodny", + "DE.Views.WatermarkSettingsDialog.textTitle": "Ustawienia znaków wodnych", + "DE.Views.WatermarkSettingsDialog.textTransparency": "Półprzezroczysty", + "DE.Views.WatermarkSettingsDialog.textUnderline": "Podkreślenie", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Rozmiar czcionki" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index ea611da12..e5eba5fbf 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Ter", "Common.UI.Calendar.textShortWednesday": "Qua", "Common.UI.Calendar.textYears": "Anos", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Adicionar nova cor personalizada", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Configurações avançadas...", "DE.Views.FileMenu.btnToEditCaption": "Editar documento", "DE.Views.FileMenu.textDownload": "Baixar", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Do branco", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Do Modelo", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crie um novo documento de texto em branco que você será capaz de nomear e formatar após ele ser criado durante a edição. Ou escolha um dos modelos para iniciar um documento de um tipo ou propósito determinado onde alguns estilos já foram pré-aplicados.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Novo documento de texto", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Não há modelos", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adicionar Autor", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adicionar Texto", @@ -1789,7 +1782,6 @@ "DE.Views.FormsTab.textClear": "Limpar campos.", "DE.Views.FormsTab.textClearFields": "Limpar todos os campos", "DE.Views.FormsTab.textHighlight": "Configurações de destaque", - "DE.Views.FormsTab.textNewColor": "Adicionar nova cor personalizada", "DE.Views.FormsTab.textNoHighlight": "Sem destaque", "DE.Views.FormsTab.textRequired": "Preencha todos os campos obrigatórios para enviar o formulário.", "DE.Views.FormsTab.textSubmited": "Formulário enviado com sucesso", @@ -2751,7 +2743,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Itálico", "DE.Views.WatermarkSettingsDialog.textLanguage": "Idioma", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Adicionar Nova Cor Personalizada", "DE.Views.WatermarkSettingsDialog.textNone": "Nenhum", "DE.Views.WatermarkSettingsDialog.textScale": "Redimensionar", "DE.Views.WatermarkSettingsDialog.textSelect": "Selecionar Imagem", diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json index 060753879..8054dfd94 100644 --- a/apps/documenteditor/main/locale/ro.json +++ b/apps/documenteditor/main/locale/ro.json @@ -124,6 +124,8 @@ "Common.Translation.warnFileLocked": "Nu puteți edita fișierul deoarece el este editat într-o altă aplicație. ", "Common.Translation.warnFileLockedBtnEdit": "Crează o copie", "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea", + "Common.UI.ButtonColored.textAutoColor": "Automat", + "Common.UI.ButtonColored.textNewColor": "Adăugarea unei culori particularizate noi", "Common.UI.Calendar.textApril": "Aprilie", "Common.UI.Calendar.textAugust": "August", "Common.UI.Calendar.textDecember": "Decembrie", @@ -157,8 +159,6 @@ "Common.UI.Calendar.textShortTuesday": "Ma", "Common.UI.Calendar.textShortWednesday": "Mi", "Common.UI.Calendar.textYears": "Ani", - "Common.UI.ColorButton.textAutoColor": "Automat", - "Common.UI.ColorButton.textNewColor": "Сuloare particularizată", "Common.UI.ComboBorderSize.txtNoBorders": "Fără borduri", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Fără borduri", "Common.UI.ComboDataView.emptyComboText": "Fără stiluri", @@ -231,6 +231,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Corectare automată va fi dezactivată și fișierul va fi restabilit la valori inițiale. Doriți să continuați?", "Common.Views.AutoCorrectDialog.warnRestore": "Intrare de autocorectare pentru %1 va fi restabilită la valorile inițiale. Doriți să continuați?", "Common.Views.Chat.textSend": "Trimitere", + "Common.Views.Comments.mniAuthorAsc": "Autor de la A la Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de la Z la A", + "Common.Views.Comments.mniDateAsc": "Cele mai vechi", + "Common.Views.Comments.mniDateDesc": "Cele mai recente", + "Common.Views.Comments.mniPositionAsc": "De sus", + "Common.Views.Comments.mniPositionDesc": "De jos", "Common.Views.Comments.textAdd": "Adaugă", "Common.Views.Comments.textAddComment": "Adaugă comentariu", "Common.Views.Comments.textAddCommentToDoc": "Adăugare comentariu la document", @@ -238,6 +244,7 @@ "Common.Views.Comments.textAnonym": "Invitat", "Common.Views.Comments.textCancel": "Revocare", "Common.Views.Comments.textClose": "Închidere", + "Common.Views.Comments.textClosePanel": "Închide comentarii", "Common.Views.Comments.textComments": "Comentarii", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Comentați aici", @@ -246,6 +253,7 @@ "Common.Views.Comments.textReply": "Răspunde", "Common.Views.Comments.textResolve": "Rezolvare", "Common.Views.Comments.textResolved": "Rezolvat", + "Common.Views.Comments.textSort": "Sortare comentarii", "Common.Views.CopyWarningDialog.textDontShow": "Nu afișa acest mesaj din nou", "Common.Views.CopyWarningDialog.textMsg": "Operațiuni de copiere, decupare și lipire din bară de instrumente sau meniul contextual al editorului se execută numai în editorul.

    Pentru copiere și lipire din sau în aplicații exterioare folosiți următoarele combinații de taste:", "Common.Views.CopyWarningDialog.textTitle": "Comenzile de copiere, decupare și lipire", @@ -381,7 +389,7 @@ "Common.Views.ReviewChanges.txtFinalCap": "Final", "Common.Views.ReviewChanges.txtHistory": "Istoricul versiune", "Common.Views.ReviewChanges.txtMarkup": "Toate modificările (Editare)", - "Common.Views.ReviewChanges.txtMarkupCap": "Marcaj", + "Common.Views.ReviewChanges.txtMarkupCap": "Marcaj și baloane", "Common.Views.ReviewChanges.txtMarkupSimple": "Toate modificările (Editare)
    Dezactivare baloane", "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Marcare simplă", "Common.Views.ReviewChanges.txtNext": "Următorul", @@ -581,6 +589,7 @@ "DE.Controllers.Main.textContactUs": "Contactați Departamentul de Vânzări", "DE.Controllers.Main.textConvertEquation": "Această ecuație a fost creată în versiunea mai veche a editorului de ecuații, care nu mai este acceptată. Dacă doriți să o editați, trebuie să o convertiți în formatul Office Math ML.
    Doriți să o convertiți acum?", "DE.Controllers.Main.textCustomLoader": "Vă rugăm să rețineți că conform termenilor de licență nu aveți dreptul să modificați programul de încărcare.
    Pentru obținerea unei cotații de preț vă rugăm să contactați Departamentul de Vânzari.", + "DE.Controllers.Main.textDisconnect": "Conexiune pierdută", "DE.Controllers.Main.textGuest": "Invitat", "DE.Controllers.Main.textHasMacros": "Fișierul conține macrocomenzi.
    Doriți să le rulați?", "DE.Controllers.Main.textLearnMore": "Aflați mai multe", @@ -1644,11 +1653,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Setări avansate...", "DE.Views.FileMenu.btnToEditCaption": "Editare document", "DE.Views.FileMenu.textDownload": "Descărcare", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Din document necompletat", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Din șablon", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creați un document necompletat ca să-l puteți edita și formata în timpul editării după ce a fost creat. Sau alegeți un șablon cu stil predefinit pentru un anumit tip de document sau pentru un anumit scop.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Document text nou", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nu s-a găsit nici un șablon", + "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Document necompletat", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Creare nou", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicare", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adăugare autor", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adăugare text", @@ -1701,6 +1707,7 @@ "DE.Views.FileMenuPanels.Settings.strPaste": "Decupare, copiere și lipire", "DE.Views.FileMenuPanels.Settings.strPasteButton": "Afișarea butonului Opțiuni lipire de fiecare dată când lipiți conținut", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Activarea afișare comentarii rezolvate", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Afișarea modificărilor urmărite", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Modificările aduse documentului la colaborarea în timp real", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Activarea verificare ortografică", "DE.Views.FileMenuPanels.Settings.strStrict": "Strict", @@ -1722,6 +1729,8 @@ "DE.Views.FileMenuPanels.Settings.txtAll": "Vizualizare toate", "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opțiuni AutoCorecție...", "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Mod implicit memoria Cache", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Afișare în baloane cu un clic", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Afișarea sfaturilor ecran la trecere", "DE.Views.FileMenuPanels.Settings.txtCm": "Centimetru", "DE.Views.FileMenuPanels.Settings.txtFitPage": "Portivire la pagina", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Potrivire lățime", @@ -1794,7 +1803,6 @@ "DE.Views.FormsTab.textClear": "Ștergerea câmpurilor", "DE.Views.FormsTab.textClearFields": "Goleşte toate câmpurile", "DE.Views.FormsTab.textHighlight": "Evidențiere setări", - "DE.Views.FormsTab.textNewColor": "Сuloare particularizată", "DE.Views.FormsTab.textNoHighlight": "Fără evidențiere", "DE.Views.FormsTab.textRequired": "Toate câmpurile din formular trebuie completate înainte de a-l trimite.", "DE.Views.FormsTab.textSubmited": "Formularul a fost remis cu succes", @@ -2756,7 +2764,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Cursiv", "DE.Views.WatermarkSettingsDialog.textLanguage": "Limbă", "DE.Views.WatermarkSettingsDialog.textLayout": "Aspect", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Сuloare particularizată", "DE.Views.WatermarkSettingsDialog.textNone": "Niciunul", "DE.Views.WatermarkSettingsDialog.textScale": "Scară", "DE.Views.WatermarkSettingsDialog.textSelect": "Selectați imaginea", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index f3d4a043f..212e24332 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -124,6 +124,8 @@ "Common.Translation.warnFileLocked": "Вы не можете редактировать этот файл, потому что он уже редактируется в другом приложении.", "Common.Translation.warnFileLockedBtnEdit": "Создать копию", "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", + "Common.UI.ButtonColored.textAutoColor": "Автоматический", + "Common.UI.ButtonColored.textNewColor": "Пользовательский цвет", "Common.UI.Calendar.textApril": "Апрель", "Common.UI.Calendar.textAugust": "Август", "Common.UI.Calendar.textDecember": "Декабрь", @@ -157,8 +159,6 @@ "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": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", @@ -231,6 +231,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Все добавленные вами автозамены будут удалены, а для измененных будут восстановлены исходные значения. Вы хотите продолжить?", "Common.Views.AutoCorrectDialog.warnRestore": "Элемент автозамены для %1 будет сброшен на исходное значение. Вы хотите продолжить?", "Common.Views.Chat.textSend": "Отправить", + "Common.Views.Comments.mniAuthorAsc": "По автору от А до Я", + "Common.Views.Comments.mniAuthorDesc": "По автору от Я до А", + "Common.Views.Comments.mniDateAsc": "От старых к новым", + "Common.Views.Comments.mniDateDesc": "От новых к старым", + "Common.Views.Comments.mniPositionAsc": "Сверху", + "Common.Views.Comments.mniPositionDesc": "Снизу", "Common.Views.Comments.textAdd": "Добавить", "Common.Views.Comments.textAddComment": "Добавить", "Common.Views.Comments.textAddCommentToDoc": "Добавить комментарий к документу", @@ -238,6 +244,7 @@ "Common.Views.Comments.textAnonym": "Гость", "Common.Views.Comments.textCancel": "Отмена", "Common.Views.Comments.textClose": "Закрыть", + "Common.Views.Comments.textClosePanel": "Закрыть комментарии", "Common.Views.Comments.textComments": "Комментарии", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Введите здесь свой комментарий", @@ -246,6 +253,7 @@ "Common.Views.Comments.textReply": "Ответить", "Common.Views.Comments.textResolve": "Решить", "Common.Views.Comments.textResolved": "Решено", + "Common.Views.Comments.textSort": "Сортировать комментарии", "Common.Views.CopyWarningDialog.textDontShow": "Больше не показывать это сообщение", "Common.Views.CopyWarningDialog.textMsg": "Операции копирования, вырезания и вставки можно выполнить с помощью кнопок на панели инструментов и команд контекстного меню только в этой вкладке редактора.

    Для копирования в другие приложения и вставки из них используйте следующие сочетания клавиш:", "Common.Views.CopyWarningDialog.textTitle": "Операции копирования, вырезания и вставки", @@ -381,9 +389,9 @@ "Common.Views.ReviewChanges.txtFinalCap": "Измененный документ", "Common.Views.ReviewChanges.txtHistory": "История версий", "Common.Views.ReviewChanges.txtMarkup": "Все изменения (редактирование)", - "Common.Views.ReviewChanges.txtMarkupCap": "Все исправления", - "Common.Views.ReviewChanges.txtMarkupSimple": "Все изменения (редактирование)
    Отключить выноски", - "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Исправления", + "Common.Views.ReviewChanges.txtMarkupCap": "Исправления и выноски", + "Common.Views.ReviewChanges.txtMarkupSimple": "Все изменения (редактирование)
    Выноски выключены", + "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Только исправления", "Common.Views.ReviewChanges.txtNext": "К следующему", "Common.Views.ReviewChanges.txtOff": "ОТКЛ. для меня", "Common.Views.ReviewChanges.txtOffGlobal": "ОТКЛ. для меня и для всех", @@ -482,7 +490,7 @@ "DE.Controllers.LeftMenu.newDocumentTitle": "Документ без имени", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", "DE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", - "DE.Controllers.LeftMenu.textLoadHistory": "Загрузка журнала версий...", + "DE.Controllers.LeftMenu.textLoadHistory": "Загрузка истории версий...", "DE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.", "DE.Controllers.LeftMenu.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.", "DE.Controllers.LeftMenu.textReplaceSuccess": "Поиск выполнен. Заменено вхождений: {0}", @@ -581,6 +589,7 @@ "DE.Controllers.Main.textContactUs": "Связаться с отделом продаж", "DE.Controllers.Main.textConvertEquation": "Это уравнение создано в старой версии редактора уравнений, которая больше не поддерживается. Чтобы изменить это уравнение, его необходимо преобразовать в формат Office Math ML.
    Преобразовать сейчас?", "DE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
    Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", + "DE.Controllers.Main.textDisconnect": "Соединение потеряно", "DE.Controllers.Main.textGuest": "Гость", "DE.Controllers.Main.textHasMacros": "Файл содержит автозапускаемые макросы.
    Хотите запустить макросы?", "DE.Controllers.Main.textLearnMore": "Подробнее", @@ -1644,11 +1653,8 @@ "DE.Views.FileMenu.btnSettingsCaption": "Дополнительные параметры...", "DE.Views.FileMenu.btnToEditCaption": "Редактировать", "DE.Views.FileMenu.textDownload": "Скачать", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пустой", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "По шаблону", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новый пустой текстовый документ, к которому Вы сможете применить стили и отформатировать при редактировании после того, как он создан. Или выберите один из шаблонов, чтобы создать документ определенного типа или предназначения, где уже предварительно применены некоторые стили.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новый текстовый документ", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют", + "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Пустой документ", + "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Создать новый", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Применить", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст", @@ -1701,6 +1707,7 @@ "DE.Views.FileMenuPanels.Settings.strPaste": "Вырезание, копирование и вставка", "DE.Views.FileMenuPanels.Settings.strPasteButton": "Показывать кнопку Параметры вставки при вставке содержимого", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "Включить отображение решенных комментариев", + "DE.Views.FileMenuPanels.Settings.strReviewHover": "Отображение изменений при рецензировании", "DE.Views.FileMenuPanels.Settings.strShowChanges": "Отображать изменения при совместной работе", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Включить проверку орфографии", "DE.Views.FileMenuPanels.Settings.strStrict": "Строгий", @@ -1722,6 +1729,8 @@ "DE.Views.FileMenuPanels.Settings.txtAll": "Все", "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Параметры автозамены...", "DE.Views.FileMenuPanels.Settings.txtCacheMode": "Режим кэширования по умолчанию", + "DE.Views.FileMenuPanels.Settings.txtChangesBalloons": "Показывать при клике в выносках", + "DE.Views.FileMenuPanels.Settings.txtChangesTip": "Показывать при наведении в подсказках", "DE.Views.FileMenuPanels.Settings.txtCm": "Сантиметр", "DE.Views.FileMenuPanels.Settings.txtFitPage": "По размеру страницы", "DE.Views.FileMenuPanels.Settings.txtFitWidth": "По ширине", @@ -1794,7 +1803,6 @@ "DE.Views.FormsTab.textClear": "Очистить поля", "DE.Views.FormsTab.textClearFields": "Очистить все поля", "DE.Views.FormsTab.textHighlight": "Цвет подсветки", - "DE.Views.FormsTab.textNewColor": "Пользовательский цвет", "DE.Views.FormsTab.textNoHighlight": "Без подсветки", "DE.Views.FormsTab.textRequired": "Заполните все обязательные поля для отправки формы.", "DE.Views.FormsTab.textSubmited": "Форма успешно отправлена", @@ -2756,7 +2764,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Курсив", "DE.Views.WatermarkSettingsDialog.textLanguage": "Язык", "DE.Views.WatermarkSettingsDialog.textLayout": "Расположение", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Пользовательский цвет", "DE.Views.WatermarkSettingsDialog.textNone": "Нет", "DE.Views.WatermarkSettingsDialog.textScale": "Масштаб", "DE.Views.WatermarkSettingsDialog.textSelect": "Выбрать изображение", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index a015d51f6..af83e2b23 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -140,8 +140,6 @@ "Common.UI.Calendar.textShortThursday": "št", "Common.UI.Calendar.textShortTuesday": "út", "Common.UI.Calendar.textShortWednesday": "st", - "Common.UI.ColorButton.textAutoColor": "Automaticky", - "Common.UI.ColorButton.textNewColor": "Pridať novú vlastnú farbu", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -1499,11 +1497,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Pokročilé nastavenia...", "DE.Views.FileMenu.btnToEditCaption": "Upraviť dokument", "DE.Views.FileMenu.textDownload": "Stiahnuť", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdneho", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Zo šablóny", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvorte nový prázdny textový dokument, ktorý budete môcť štýlovať a formátovať po jeho vytvorení počas úpravy. Alebo si vyberte jednu zo šablón na spustenie dokumentu určitého typu alebo účelu, kde už niektoré štýly boli predbežne aplikované.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nový textový dokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Neexistujú žiadne šablóny", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Použiť", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Pridať autora", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Pridať text", @@ -1614,7 +1607,6 @@ "DE.Views.FormsTab.textClear": "Vyčistiť políčka", "DE.Views.FormsTab.textClearFields": "Vyčistiť všetky polia", "DE.Views.FormsTab.textHighlight": "Nastavenia zvýraznenia", - "DE.Views.FormsTab.textNewColor": "Pridať novú vlastnú farbu ", "DE.Views.FormsTab.textSubmited": "Formulár úspešne odoslaný", "DE.Views.FormsTab.tipCheckBox": "Vložiť začiarkavacie políčko", "DE.Views.FormsTab.tipComboBox": "Vložiť výberové pole", @@ -2514,7 +2506,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Kurzíva", "DE.Views.WatermarkSettingsDialog.textLanguage": "Jazyk", "DE.Views.WatermarkSettingsDialog.textLayout": "Rozloženie", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Pridať novú vlastnú farbu", "DE.Views.WatermarkSettingsDialog.textNone": "žiadny", "DE.Views.WatermarkSettingsDialog.textScale": "Škála", "DE.Views.WatermarkSettingsDialog.textSelect": "Vybrať obrázok", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 68ef7f146..254b1a19b 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -120,8 +120,6 @@ "Common.UI.Calendar.textShortMay": "Maj", "Common.UI.Calendar.textShortNovember": "Nov", "Common.UI.Calendar.textShortSeptember": "Sep", - "Common.UI.ColorButton.textAutoColor": "Samodejno", - "Common.UI.ColorButton.textNewColor": "Dodaj novo barvo po meri", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -1170,11 +1168,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Napredne nastavitve...", "DE.Views.FileMenu.btnToEditCaption": "Uredi dokument", "DE.Views.FileMenu.textDownload": "Download", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z praznine", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z predloge", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Ustvari nov prazen besedilni dokument, ki ga boste lahko oblikovali med urejanjem ko je že ustvarjen. Ali pa uporabite eno izmed predlog za ustvarjanje dokumenta določene vrste ali namena, kjer so nekateri slogi že pred-uporabljeni.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nov besedilni dokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ni predlog", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Uporabi", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj avtorja", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj besedilo", @@ -1253,7 +1246,6 @@ "DE.Views.FormSettings.textWidth": "Širina celice", "DE.Views.FormsTab.capBtnCheckBox": "Potrditveno polje", "DE.Views.FormsTab.textClearFields": "Počisti vsa polja", - "DE.Views.FormsTab.textNewColor": "Dodaj novo barvo po meri", "DE.Views.HeaderFooterSettings.textBottomCenter": "Središče dna", "DE.Views.HeaderFooterSettings.textBottomLeft": "Spodaj levo", "DE.Views.HeaderFooterSettings.textBottomPage": "Konec strani", @@ -1970,7 +1962,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Poševno", "DE.Views.WatermarkSettingsDialog.textLanguage": "Jezik", "DE.Views.WatermarkSettingsDialog.textLayout": "Postavitev", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Dodaj lastno barvo", "DE.Views.WatermarkSettingsDialog.textNone": "Nič", "DE.Views.WatermarkSettingsDialog.textSelect": "Izberi sliko", "DE.Views.WatermarkSettingsDialog.textText": "Besedilo", diff --git a/apps/documenteditor/main/locale/sv.json b/apps/documenteditor/main/locale/sv.json index 88ee007a6..4af36c438 100644 --- a/apps/documenteditor/main/locale/sv.json +++ b/apps/documenteditor/main/locale/sv.json @@ -157,8 +157,6 @@ "Common.UI.Calendar.textShortTuesday": "Tis", "Common.UI.Calendar.textShortWednesday": "Ons", "Common.UI.Calendar.textYears": "År", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Lägg till ny egen färg", "Common.UI.ComboBorderSize.txtNoBorders": "Inga ramar", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Inga ramar", "Common.UI.ComboDataView.emptyComboText": "Ingen stil", @@ -1639,11 +1637,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Avancerade inställningar...", "DE.Views.FileMenu.btnToEditCaption": "Redigera dokumentet", "DE.Views.FileMenu.textDownload": "Ladda ner", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Från blank", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Från mall", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Skapa ett nytt tomt textdokument som du kommer att kunna stil och format efter det skapas under redigeringen. Eller välja en av mallarna för att starta ett dokument av en viss typ eller ändamål där vissa stilar har redan i förväg tillämpas.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nytt textdokument", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Det finns inga mallar", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Tillämpa", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Lägg till författare", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Lägg till text", @@ -1789,7 +1782,6 @@ "DE.Views.FormsTab.textClear": "Rensa fält", "DE.Views.FormsTab.textClearFields": "Rensa fält", "DE.Views.FormsTab.textHighlight": "Markera inställningar", - "DE.Views.FormsTab.textNewColor": "Anpassad färg", "DE.Views.FormsTab.textNoHighlight": "Ingen markering", "DE.Views.FormsTab.textRequired": "Fyll i alla fält för att skicka formulär.", "DE.Views.FormsTab.textSubmited": "Formuläret skickades framgångsrikt", @@ -2751,7 +2743,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "Kursiv", "DE.Views.WatermarkSettingsDialog.textLanguage": "Språk", "DE.Views.WatermarkSettingsDialog.textLayout": "Layout", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Lägg till ny egen färg", "DE.Views.WatermarkSettingsDialog.textNone": "Ingen", "DE.Views.WatermarkSettingsDialog.textScale": "Skala", "DE.Views.WatermarkSettingsDialog.textSelect": "Välj bild", diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index b4ba632d6..eb2febe01 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -79,8 +79,6 @@ "Common.UI.Calendar.textAugust": "Ağustos", "Common.UI.Calendar.textDecember": "Aralık", "Common.UI.Calendar.textFebruary": "Şubat", - "Common.UI.ColorButton.textAutoColor": "Otomatik", - "Common.UI.ColorButton.textNewColor": "Yeni Özel Renk Ekle", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -1155,11 +1153,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Gelişmiş Ayarlar...", "DE.Views.FileMenu.btnToEditCaption": "Döküman Düzenle", "DE.Views.FileMenu.textDownload": "Download", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Boştan", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Şablondan", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş metin dosyası oluşturun. Yada belli tipte yada amaçta dökümana başlamak için şablonlardan birini seçin, bu şablonlar önceden düzenlenmiştir.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Metin Dökümanı", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Uygula", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Metin Ekle", @@ -1237,7 +1230,6 @@ "DE.Views.FormSettings.textTipDelete": "Değeri sil", "DE.Views.FormsTab.capBtnCheckBox": "Onay kutusu", "DE.Views.FormsTab.capBtnDropDown": "Aşağı açılır", - "DE.Views.FormsTab.textNewColor": "Yeni Özel Renk Ekle", "DE.Views.FormsTab.tipDropDown": "Aşağı açılır liste ekle", "DE.Views.HeaderFooterSettings.textBottomCenter": "Alt Orta", "DE.Views.HeaderFooterSettings.textBottomLeft": "Alt Sol", @@ -1984,7 +1976,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "İtalik", "DE.Views.WatermarkSettingsDialog.textLanguage": "Dil", "DE.Views.WatermarkSettingsDialog.textLayout": "Yerleşim", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Yeni özel renk ekle", "DE.Views.WatermarkSettingsDialog.textNone": "Filigran Yok", "DE.Views.WatermarkSettingsDialog.textScale": "Ölçek", "DE.Views.WatermarkSettingsDialog.textSelect": "Resim Seç..", diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index a75ad45d4..a7b59f0f6 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -72,7 +72,6 @@ "Common.define.chartData.textPoint": "XY (розсіювання)", "Common.define.chartData.textStock": "Запас", "Common.define.chartData.textSurface": "Поверхня", - "Common.UI.ColorButton.textNewColor": "Додати новий власний колір", "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів", "Common.UI.ComboDataView.emptyComboText": "Немає стилів", @@ -1034,11 +1033,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Розширені налаштування...", "DE.Views.FileMenu.btnToEditCaption": "Редагувати документ", "DE.Views.FileMenu.textDownload": "Звантажити", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "З бланку", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "З шаблону", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Створіть новий порожній текстовий документ, який ви зможете стильувати та форматувати після його створення під час редагування. Або виберіть один із шаблонів, щоб запустити документ певного типу або мети, де деякі стилі вже були попередньо застосовані.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новий текстовий документ", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Застосувати", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Додати автора", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Додати текст", @@ -1775,6 +1769,5 @@ "DE.Views.WatermarkSettingsDialog.textBold": "Грубий", "DE.Views.WatermarkSettingsDialog.textColor": "Колір тексту", "DE.Views.WatermarkSettingsDialog.textItalic": "Курсив", - "DE.Views.WatermarkSettingsDialog.textNewColor": "Додати новий власний колір", "DE.Views.WatermarkSettingsDialog.textStrikeout": "Викреслений" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index 92eb9fe08..043541be4 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -71,7 +71,6 @@ "Common.define.chartData.textPoint": "XY (Phân tán)", "Common.define.chartData.textStock": "Cổ phiếu", "Common.define.chartData.textSurface": "Bề mặt", - "Common.UI.ColorButton.textNewColor": "Thêm màu tùy chỉnh mới", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -938,11 +937,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "Cài đặt nâng cao...", "DE.Views.FileMenu.btnToEditCaption": "Chỉnh sửa Tài liệu", "DE.Views.FileMenu.textDownload": "Tải về", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "Từ trang trắng", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Từ template", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Tạo một tài liệu văn bản trống mới mà bạn sẽ có thể tạo kiểu và định dạng sau khi nó được tạo ra trong quá trình chỉnh sửa. Hoặc chọn một trong các template để bắt đầu một tài liệu của một loại hoặc cho một mục đích nhất định, trong đó đã áp dụng trước một số kiểu.", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "Tài liệu văn bản mới", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Không có template", "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả", "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập", "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Đang tải...", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index ebbeb5f4a..1c8fe0678 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -120,7 +120,6 @@ "Common.UI.Calendar.textShortTuesday": "星期二", "Common.UI.Calendar.textShortWednesday": "我们", "Common.UI.Calendar.textYears": "年", - "Common.UI.ColorButton.textNewColor": "添加新的自定义颜色", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1549,11 +1548,6 @@ "DE.Views.FileMenu.btnSettingsCaption": "高级设置…", "DE.Views.FileMenu.btnToEditCaption": "编辑文档", "DE.Views.FileMenu.textDownload": "下载", - "DE.Views.FileMenuPanels.CreateNew.fromBlankText": "从空白", - "DE.Views.FileMenuPanels.CreateNew.fromTemplateText": "从模板", - "DE.Views.FileMenuPanels.CreateNew.newDescriptionText": "创建一个新的空白文本文档，您可以在编辑过程中创建样式和格式。或者选择其中一个模板来启动某些类型或目的的文档，其中某些样式已经被预先应用。", - "DE.Views.FileMenuPanels.CreateNew.newDocumentText": "新文本文件", - "DE.Views.FileMenuPanels.CreateNew.noTemplatesText": "没有模板", "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "应用", "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "添加作者", "DE.Views.FileMenuPanels.DocumentInfo.txtAddText": "添加文本", @@ -1677,7 +1671,6 @@ "DE.Views.FormsTab.capBtnText": "文字字段", "DE.Views.FormsTab.capBtnView": "浏览表单", "DE.Views.FormsTab.textClearFields": "清除所有字段", - "DE.Views.FormsTab.textNewColor": "添加新的自定义颜色", "DE.Views.FormsTab.textNoHighlight": "无高亮", "DE.Views.FormsTab.tipCheckBox": "插入多选框", "DE.Views.FormsTab.tipComboBox": "插入组合框", @@ -2582,7 +2575,6 @@ "DE.Views.WatermarkSettingsDialog.textItalic": "斜体", "DE.Views.WatermarkSettingsDialog.textLanguage": "语言", "DE.Views.WatermarkSettingsDialog.textLayout": "布局", - "DE.Views.WatermarkSettingsDialog.textNewColor": "添加新的自定义颜色", "DE.Views.WatermarkSettingsDialog.textNone": "无", "DE.Views.WatermarkSettingsDialog.textScale": "规模", "DE.Views.WatermarkSettingsDialog.textSelect": "选择图像", diff --git a/apps/presentationeditor/main/locale/be.json b/apps/presentationeditor/main/locale/be.json index e67b62451..f083f1f1d 100644 --- a/apps/presentationeditor/main/locale/be.json +++ b/apps/presentationeditor/main/locale/be.json @@ -15,7 +15,6 @@ "Common.define.chartData.textStock": "Біржа", "Common.define.chartData.textSurface": "Паверхня", "Common.Translation.warnFileLocked": "Дакумент выкарыстоўваецца іншай праграмай. Вы можаце працягнуць рэдагаванне і захаваць яго як копію.", - "Common.UI.ColorButton.textNewColor": "Дадаць новы адвольны колер", "Common.UI.ComboBorderSize.txtNoBorders": "Без межаў", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без межаў", "Common.UI.ComboDataView.emptyComboText": "Без стыляў", @@ -1214,11 +1213,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Захаваць копію як…", "PE.Views.FileMenu.btnSettingsCaption": "Дадатковыя налады…", "PE.Views.FileMenu.btnToEditCaption": "Рэдагаваць прэзентацыю", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пустая", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Па шаблоне", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Стварыце новую пустую прэзентацыю, да якой вы зможаце ужыць стылі і адфарматаваць яе пасля яе стварэння. Альбо абярыце адзін з шаблонаў, каб стварыць прэзентацыю пэўнага тыпу, да якой ужо ўжытыя пэўныя стылі.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новая прэзентацыя", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблон адсутнічае", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Ужыць", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Дадаць аўтара", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Дадаць тэкст", @@ -1544,69 +1538,33 @@ "PE.Views.SlideSettings.strBackground": "Колер фону", "PE.Views.SlideSettings.strColor": "Колер", "PE.Views.SlideSettings.strDateTime": "Паказваць дату і час", - "PE.Views.SlideSettings.strDelay": "Затрымка", - "PE.Views.SlideSettings.strDuration": "Працягласць", - "PE.Views.SlideSettings.strEffect": "Эфект", "PE.Views.SlideSettings.strFill": "Фон", "PE.Views.SlideSettings.strForeground": "Колер пярэдняга плану", "PE.Views.SlideSettings.strPattern": "Узор", "PE.Views.SlideSettings.strSlideNum": "Паказваць нумар слайда", - "PE.Views.SlideSettings.strStartOnClick": "Запускаць пстрычкай", "PE.Views.SlideSettings.textAdvanced": "Дадатковыя налады", "PE.Views.SlideSettings.textAngle": "Вугал", - "PE.Views.SlideSettings.textApplyAll": "Ужыць да ўсіх слайдаў", - "PE.Views.SlideSettings.textBlack": "Праз чорны", - "PE.Views.SlideSettings.textBottom": "Знізу", - "PE.Views.SlideSettings.textBottomLeft": "Знізу злева", - "PE.Views.SlideSettings.textBottomRight": "Знізу справа", - "PE.Views.SlideSettings.textClock": "Гадзіннік", - "PE.Views.SlideSettings.textClockwise": "Па стрэлцы гадзінніка", "PE.Views.SlideSettings.textColor": "Заліўка колерам", - "PE.Views.SlideSettings.textCounterclockwise": "Супраць стрэлкі гадзінніка", - "PE.Views.SlideSettings.textCover": "Покрыва", "PE.Views.SlideSettings.textDirection": "Напрамак", "PE.Views.SlideSettings.textEmptyPattern": "Без узору", - "PE.Views.SlideSettings.textFade": "Выцвітанне", "PE.Views.SlideSettings.textFromFile": "З файла", "PE.Views.SlideSettings.textFromStorage": "Са сховішча", "PE.Views.SlideSettings.textFromUrl": "Па URL", "PE.Views.SlideSettings.textGradient": "Градыент", "PE.Views.SlideSettings.textGradientFill": "Градыентная заліўка", - "PE.Views.SlideSettings.textHorizontalIn": "Гарызантальна ўнутр", - "PE.Views.SlideSettings.textHorizontalOut": "Па гарызанталі вонкі", "PE.Views.SlideSettings.textImageTexture": "Малюнак альбо тэкстура", - "PE.Views.SlideSettings.textLeft": "Злева", "PE.Views.SlideSettings.textLinear": "Лінейны", "PE.Views.SlideSettings.textNoFill": "Без заліўкі", - "PE.Views.SlideSettings.textNone": "Няма", "PE.Views.SlideSettings.textPatternFill": "Узор", "PE.Views.SlideSettings.textPosition": "Пазіцыя", - "PE.Views.SlideSettings.textPreview": "Прагляд", - "PE.Views.SlideSettings.textPush": "Ссоўванне", "PE.Views.SlideSettings.textRadial": "Радыяльны", "PE.Views.SlideSettings.textReset": "Адкінуць змены", - "PE.Views.SlideSettings.textRight": "Справа", - "PE.Views.SlideSettings.textSec": "с", "PE.Views.SlideSettings.textSelectImage": "Абраць выяву", "PE.Views.SlideSettings.textSelectTexture": "Абраць", - "PE.Views.SlideSettings.textSmoothly": "Плаўна", - "PE.Views.SlideSettings.textSplit": "Панарама", "PE.Views.SlideSettings.textStretch": "Расцягванне", "PE.Views.SlideSettings.textStyle": "Стыль", "PE.Views.SlideSettings.textTexture": "З тэкстуры", "PE.Views.SlideSettings.textTile": "Плітка", - "PE.Views.SlideSettings.textTop": "Уверсе", - "PE.Views.SlideSettings.textTopLeft": "Уверсе злева", - "PE.Views.SlideSettings.textTopRight": "Зверху справа", - "PE.Views.SlideSettings.textUnCover": "Адкрыццё", - "PE.Views.SlideSettings.textVerticalIn": "Вертыкальна ўнутр", - "PE.Views.SlideSettings.textVerticalOut": "Вертыкальна вонкі", - "PE.Views.SlideSettings.textWedge": "Па крузе", - "PE.Views.SlideSettings.textWipe": "З’яўленне", - "PE.Views.SlideSettings.textZoom": "Маштаб", - "PE.Views.SlideSettings.textZoomIn": "Павелічэнне", - "PE.Views.SlideSettings.textZoomOut": "Памяншэнне", - "PE.Views.SlideSettings.textZoomRotate": "Павелічэнне і паварочванне", "PE.Views.SlideSettings.tipAddGradientPoint": "Дадаць кропку градыента", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Выдаліць кропку градыента", "PE.Views.SlideSettings.txtBrownPaper": "Карычневая папера", @@ -1805,7 +1763,6 @@ "PE.Views.Toolbar.textBold": "Тоўсты", "PE.Views.Toolbar.textItalic": "Курсіў", "PE.Views.Toolbar.textListSettings": "Налады спіса", - "PE.Views.Toolbar.textNewColor": "Адвольны колер", "PE.Views.Toolbar.textShapeAlignBottom": "Выраўнаваць па ніжняму краю", "PE.Views.Toolbar.textShapeAlignCenter": "Выраўнаваць па цэнтры", "PE.Views.Toolbar.textShapeAlignLeft": "Выраўнаваць па леваму краю", diff --git a/apps/presentationeditor/main/locale/bg.json b/apps/presentationeditor/main/locale/bg.json index 5f770678c..921f10ea2 100644 --- a/apps/presentationeditor/main/locale/bg.json +++ b/apps/presentationeditor/main/locale/bg.json @@ -14,7 +14,6 @@ "Common.define.chartData.textPoint": "XY (точкова)", "Common.define.chartData.textStock": "Борсова", "Common.define.chartData.textSurface": "Повърхност", - "Common.UI.ColorButton.textNewColor": "Цвят по избор", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1126,11 +1125,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Запазване на копия като ...", "PE.Views.FileMenu.btnSettingsCaption": "Разширени настройки ...", "PE.Views.FileMenu.btnToEditCaption": "Редактиране на презентацията", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "От празна", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "От шаблон", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Създайте нова празна презентация, която ще можете да форматирате и форматирате, след като бъде създадена по време на редактирането. Или изберете един от шаблоните, за да започнете презентация от определен тип или цел, където някои стилове вече са били предварително приложени.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Нова презентация", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Няма шаблони", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правата за достъп", @@ -1391,64 +1385,28 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Някои от цифровите подписи в презентацията са невалидни или не могат да бъдат проверени. Презентацията е защитена от редактиране.", "PE.Views.SlideSettings.strBackground": "Цвят на фона", "PE.Views.SlideSettings.strColor": "Цвят", - "PE.Views.SlideSettings.strDelay": "Закъснение", - "PE.Views.SlideSettings.strDuration": "Продължителност", - "PE.Views.SlideSettings.strEffect": "Ефект", "PE.Views.SlideSettings.strFill": "Заден план", "PE.Views.SlideSettings.strForeground": "Цвят на преден план", "PE.Views.SlideSettings.strPattern": "Модел", - "PE.Views.SlideSettings.strStartOnClick": "Старт на кликване", "PE.Views.SlideSettings.textAdvanced": "Показване на разширените настройки", - "PE.Views.SlideSettings.textApplyAll": "Приложи към всички слайдове", - "PE.Views.SlideSettings.textBlack": "Чрез черно", - "PE.Views.SlideSettings.textBottom": "Дъно", - "PE.Views.SlideSettings.textBottomLeft": "Долу вляво", - "PE.Views.SlideSettings.textBottomRight": "Долу вдясно", - "PE.Views.SlideSettings.textClock": "Часовник", - "PE.Views.SlideSettings.textClockwise": "По часовниковата стрелка", "PE.Views.SlideSettings.textColor": "Цветово пълнене", - "PE.Views.SlideSettings.textCounterclockwise": "Обратно на часовниковата стрелка", - "PE.Views.SlideSettings.textCover": "Покрийте", "PE.Views.SlideSettings.textDirection": "Посока", "PE.Views.SlideSettings.textEmptyPattern": "Без модел", - "PE.Views.SlideSettings.textFade": "Замирам", "PE.Views.SlideSettings.textFromFile": "От файла", "PE.Views.SlideSettings.textFromUrl": "От URL", "PE.Views.SlideSettings.textGradient": "Градиент", "PE.Views.SlideSettings.textGradientFill": "Градиентно запълване", - "PE.Views.SlideSettings.textHorizontalIn": "Хоризонтално навътре", - "PE.Views.SlideSettings.textHorizontalOut": "Хоризонтално навън", "PE.Views.SlideSettings.textImageTexture": "Картина или текстура", - "PE.Views.SlideSettings.textLeft": "Наляво", "PE.Views.SlideSettings.textLinear": "Линеен", "PE.Views.SlideSettings.textNoFill": "Без попълване", - "PE.Views.SlideSettings.textNone": "Нито един", "PE.Views.SlideSettings.textPatternFill": "Модел", - "PE.Views.SlideSettings.textPreview": "Предварителен преглед", - "PE.Views.SlideSettings.textPush": "Тласък", "PE.Views.SlideSettings.textRadial": "Радиален", "PE.Views.SlideSettings.textReset": "Нулиране на промените", - "PE.Views.SlideSettings.textRight": "Прав", - "PE.Views.SlideSettings.textSec": "с", "PE.Views.SlideSettings.textSelectTexture": "Изберете", - "PE.Views.SlideSettings.textSmoothly": "Плавно", - "PE.Views.SlideSettings.textSplit": "Разцепване", "PE.Views.SlideSettings.textStretch": "Разтягане", "PE.Views.SlideSettings.textStyle": "Стил", "PE.Views.SlideSettings.textTexture": "От текстура", "PE.Views.SlideSettings.textTile": "Плочка", - "PE.Views.SlideSettings.textTop": "Отгоре", - "PE.Views.SlideSettings.textTopLeft": "Горе вляво", - "PE.Views.SlideSettings.textTopRight": "Горе в дясно", - "PE.Views.SlideSettings.textUnCover": "Разкрийте", - "PE.Views.SlideSettings.textVerticalIn": "Вертикално в", - "PE.Views.SlideSettings.textVerticalOut": "Вертикален изход", - "PE.Views.SlideSettings.textWedge": "Клин", - "PE.Views.SlideSettings.textWipe": "Изтриване", - "PE.Views.SlideSettings.textZoom": "Мащаб", - "PE.Views.SlideSettings.textZoomIn": "Увеличавам", - "PE.Views.SlideSettings.textZoomOut": "Отдалечавам ", - "PE.Views.SlideSettings.textZoomRotate": "Увеличаване и завъртане", "PE.Views.SlideSettings.txtBrownPaper": "Кафява хартия", "PE.Views.SlideSettings.txtCanvas": "Платно", "PE.Views.SlideSettings.txtCarton": "Картонена кутия", @@ -1625,7 +1583,6 @@ "PE.Views.Toolbar.textArrangeFront": "Доведете до преден план", "PE.Views.Toolbar.textBold": "Получер", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textNewColor": "Цвят по избор", "PE.Views.Toolbar.textShapeAlignBottom": "Подравняване отдолу", "PE.Views.Toolbar.textShapeAlignCenter": "Подравняване на центъра", "PE.Views.Toolbar.textShapeAlignLeft": "Подравняване вляво", diff --git a/apps/presentationeditor/main/locale/ca.json b/apps/presentationeditor/main/locale/ca.json index 1eb1f1c69..886c18371 100644 --- a/apps/presentationeditor/main/locale/ca.json +++ b/apps/presentationeditor/main/locale/ca.json @@ -50,10 +50,6 @@ "Common.Translation.warnFileLocked": "El document és obert en una altra aplicació. Podeu continuar editant i guardar-lo com a còpia.", "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia", "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització", - "Common.UI.ColorButton.textAutoColor": "Automàtic", - "Common.UI.ColorButton.textNewColor": "Afegeix un color personalitzat nou ", - "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia", - "Common.Translation.warnFileLockedBtnView": "Obrir per veure", "Common.UI.ComboBorderSize.txtNoBorders": "Sense vores", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sense vores", "Common.UI.ComboDataView.emptyComboText": "Sense estils", @@ -1301,11 +1297,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Desa còpia com a...", "PE.Views.FileMenu.btnSettingsCaption": "Configuració avançada...", "PE.Views.FileMenu.btnToEditCaption": "Edita la presentació", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Des de zero", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Des d'una plantilla", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creeu una nova presentació en blanc a la qual podreu donar estil i format un cop creada durant l'edició. O bé trieu una de les plantilles per iniciar una presentació d'un determinat tipus o propòsit en la qual ja s'han aplicat prèviament alguns estils.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Presentació nova", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hi ha plantilles", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplica", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Afegeix l'autor", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Afegeix text", @@ -1636,70 +1627,34 @@ "PE.Views.SlideSettings.strBackground": "Color de fons", "PE.Views.SlideSettings.strColor": "Color", "PE.Views.SlideSettings.strDateTime": "Mostra l'hora i la data", - "PE.Views.SlideSettings.strDelay": "Retard", - "PE.Views.SlideSettings.strDuration": "Durada", - "PE.Views.SlideSettings.strEffect": "Efecte", "PE.Views.SlideSettings.strFill": "Fons", "PE.Views.SlideSettings.strForeground": "Color de primer pla", "PE.Views.SlideSettings.strPattern": "Patró", "PE.Views.SlideSettings.strSlideNum": "Mostra el número de diapositiva", - "PE.Views.SlideSettings.strStartOnClick": "Inicia clicant", "PE.Views.SlideSettings.strTransparency": "Opacitat", "PE.Views.SlideSettings.textAdvanced": "Mostra la configuració avançada", "PE.Views.SlideSettings.textAngle": "Angle", - "PE.Views.SlideSettings.textApplyAll": "Aplica-ho a totes les diapositives", - "PE.Views.SlideSettings.textBlack": "En negre", - "PE.Views.SlideSettings.textBottom": "Inferior", - "PE.Views.SlideSettings.textBottomLeft": "Inferior esquerra", - "PE.Views.SlideSettings.textBottomRight": "Inferior dreta", - "PE.Views.SlideSettings.textClock": "Rellotge", - "PE.Views.SlideSettings.textClockwise": "En sentit horari", "PE.Views.SlideSettings.textColor": "Color d'emplenament", - "PE.Views.SlideSettings.textCounterclockwise": "En sentit antihorari", - "PE.Views.SlideSettings.textCover": "Cobreix", "PE.Views.SlideSettings.textDirection": "Direcció", "PE.Views.SlideSettings.textEmptyPattern": "Sense patró", - "PE.Views.SlideSettings.textFade": "Esvaïment", "PE.Views.SlideSettings.textFromFile": "Des d'un fitxer", "PE.Views.SlideSettings.textFromStorage": "Des de l’emmagatzematge", "PE.Views.SlideSettings.textFromUrl": "Des de l'URL", "PE.Views.SlideSettings.textGradient": "Degradat", "PE.Views.SlideSettings.textGradientFill": "Emplenament de gradient", - "PE.Views.SlideSettings.textHorizontalIn": "Horitzontal entrant", - "PE.Views.SlideSettings.textHorizontalOut": "Horitzontal sortint", "PE.Views.SlideSettings.textImageTexture": "Imatge o textura", - "PE.Views.SlideSettings.textLeft": "Esquerra", "PE.Views.SlideSettings.textLinear": "Lineal", "PE.Views.SlideSettings.textNoFill": "Sense emplenament", - "PE.Views.SlideSettings.textNone": "Cap", "PE.Views.SlideSettings.textPatternFill": "Patró", "PE.Views.SlideSettings.textPosition": "Posició", - "PE.Views.SlideSettings.textPreview": "Visualització prèvia", - "PE.Views.SlideSettings.textPush": "Empeny", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Reinicia els canvis", - "PE.Views.SlideSettings.textRight": "Dreta", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Selecciona la imatge", "PE.Views.SlideSettings.textSelectTexture": "Selecciona", - "PE.Views.SlideSettings.textSmoothly": "Suau", - "PE.Views.SlideSettings.textSplit": "Dividir", "PE.Views.SlideSettings.textStretch": "Estirament", "PE.Views.SlideSettings.textStyle": "Estil", "PE.Views.SlideSettings.textTexture": "Des de la textura", "PE.Views.SlideSettings.textTile": "Mosaic", - "PE.Views.SlideSettings.textTop": "Superior", - "PE.Views.SlideSettings.textTopLeft": "Superior esquerra", - "PE.Views.SlideSettings.textTopRight": "Superior dreta", - "PE.Views.SlideSettings.textUnCover": "Descobreix", - "PE.Views.SlideSettings.textVerticalIn": "Vertical entrant", - "PE.Views.SlideSettings.textVerticalOut": "Vertical sortint", - "PE.Views.SlideSettings.textWedge": "Falca", - "PE.Views.SlideSettings.textWipe": "Eliminar", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Amplia", - "PE.Views.SlideSettings.textZoomOut": "Redueix", - "PE.Views.SlideSettings.textZoomRotate": "Amplia i gira", "PE.Views.SlideSettings.tipAddGradientPoint": "Afegeix un punt de degradat", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Suprimeix el punt de degradat", "PE.Views.SlideSettings.txtBrownPaper": "Paper marró", @@ -1909,7 +1864,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Dues columnes", "PE.Views.Toolbar.textItalic": "Cursiva", "PE.Views.Toolbar.textListSettings": "Configuració de la llista", - "PE.Views.Toolbar.textNewColor": "Afegeix un color personalitzat nou", "PE.Views.Toolbar.textShapeAlignBottom": "Alinea a baix", "PE.Views.Toolbar.textShapeAlignCenter": "Alinea al centre", "PE.Views.Toolbar.textShapeAlignLeft": "Alinea a l'esquerra", diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 7ec944d07..4c47c2329 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -14,7 +14,6 @@ "Common.define.chartData.textPoint": "Bodový graf", "Common.define.chartData.textStock": "Burzovní graf", "Common.define.chartData.textSurface": "Povrch", - "Common.UI.ColorButton.textNewColor": "Uživatelsky určená barva", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -1165,11 +1164,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Uložit kopii jako…", "PE.Views.FileMenu.btnSettingsCaption": "Pokročilá nastavení…", "PE.Views.FileMenu.btnToEditCaption": "Upravit prezentaci", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdného", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Ze šablony", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvořte novou prázdnou prezentaci, kterou si pak od začátku budete opatřovat styly a formátovat podle sebe. Nebo si vyberte jednu ze šablon a začněte s prezentací určitého typu nebo účelu, kde už jsou některé styly předpřipravené.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nová prezentace", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nejsou zde žádné šablony", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Použít", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Přidat autora", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Přidat text", @@ -1471,65 +1465,29 @@ "PE.Views.SlideSettings.strBackground": "Barva pozadí", "PE.Views.SlideSettings.strColor": "Barva", "PE.Views.SlideSettings.strDateTime": "Zobrazit datum a čas", - "PE.Views.SlideSettings.strDelay": "Prodleva", - "PE.Views.SlideSettings.strDuration": "Doba trvání", - "PE.Views.SlideSettings.strEffect": "Efekt", "PE.Views.SlideSettings.strFill": "Pozadí", "PE.Views.SlideSettings.strForeground": "Barva popředí", "PE.Views.SlideSettings.strPattern": "Vzor", "PE.Views.SlideSettings.strSlideNum": "Zobrazovat čísla snímků", - "PE.Views.SlideSettings.strStartOnClick": "Spustit kliknutím", "PE.Views.SlideSettings.textAdvanced": "Zobrazit pokročilá nastavení", - "PE.Views.SlideSettings.textApplyAll": "Použít na všechny snímky", - "PE.Views.SlideSettings.textBlack": "Přes černou", - "PE.Views.SlideSettings.textBottom": "Dole", - "PE.Views.SlideSettings.textBottomLeft": "Vlevo dole", - "PE.Views.SlideSettings.textBottomRight": "Vpravo dole", - "PE.Views.SlideSettings.textClock": "Hodiny", - "PE.Views.SlideSettings.textClockwise": "Po směru hodinových ručiček", "PE.Views.SlideSettings.textColor": "Vyplnit barvou", - "PE.Views.SlideSettings.textCounterclockwise": "Proti směru hodinových ručiček", - "PE.Views.SlideSettings.textCover": "Zakrýt", "PE.Views.SlideSettings.textDirection": "Směr", "PE.Views.SlideSettings.textEmptyPattern": "Bez vzoru", - "PE.Views.SlideSettings.textFade": "Vyblednout", "PE.Views.SlideSettings.textFromFile": "Ze souboru", "PE.Views.SlideSettings.textFromUrl": "Z URL adresy", "PE.Views.SlideSettings.textGradient": "Přechod", "PE.Views.SlideSettings.textGradientFill": "Výplň přechodem", - "PE.Views.SlideSettings.textHorizontalIn": "Vodorovně uvnitř", - "PE.Views.SlideSettings.textHorizontalOut": "Vodorovně vně", "PE.Views.SlideSettings.textImageTexture": "Obrázek nebo textura", - "PE.Views.SlideSettings.textLeft": "Vlevo", "PE.Views.SlideSettings.textLinear": "Lineární", "PE.Views.SlideSettings.textNoFill": "Bez výplně", - "PE.Views.SlideSettings.textNone": "Žádné", "PE.Views.SlideSettings.textPatternFill": "Vzor", - "PE.Views.SlideSettings.textPreview": "Náhled", - "PE.Views.SlideSettings.textPush": "Posunout", "PE.Views.SlideSettings.textRadial": "Kruhový", "PE.Views.SlideSettings.textReset": "Zrušit změny", - "PE.Views.SlideSettings.textRight": "Vpravo", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Vybrat", - "PE.Views.SlideSettings.textSmoothly": "Plynule", - "PE.Views.SlideSettings.textSplit": "Split", "PE.Views.SlideSettings.textStretch": "Roztáhnout", "PE.Views.SlideSettings.textStyle": "Styl", "PE.Views.SlideSettings.textTexture": "Z textury", "PE.Views.SlideSettings.textTile": "Dlaždice", - "PE.Views.SlideSettings.textTop": "Nahoře", - "PE.Views.SlideSettings.textTopLeft": "Vlevo nahoře", - "PE.Views.SlideSettings.textTopRight": "Vpravo nahoře", - "PE.Views.SlideSettings.textUnCover": "Odkrýt", - "PE.Views.SlideSettings.textVerticalIn": "Svislý uvnitř", - "PE.Views.SlideSettings.textVerticalOut": "Svislý vně", - "PE.Views.SlideSettings.textWedge": "Konjunkce", - "PE.Views.SlideSettings.textWipe": "Vyčistit", - "PE.Views.SlideSettings.textZoom": "Přiblížit", - "PE.Views.SlideSettings.textZoomIn": "Přiblížit", - "PE.Views.SlideSettings.textZoomOut": "Oddálit", - "PE.Views.SlideSettings.textZoomRotate": "Přiblížit a otočit", "PE.Views.SlideSettings.txtBrownPaper": "Hnědý papír", "PE.Views.SlideSettings.txtCanvas": "Plátno", "PE.Views.SlideSettings.txtCarton": "Karton", @@ -1720,7 +1678,6 @@ "PE.Views.Toolbar.textBold": "Tučně", "PE.Views.Toolbar.textItalic": "Skloněné", "PE.Views.Toolbar.textListSettings": "Nastavení seznamu", - "PE.Views.Toolbar.textNewColor": "Uživatelsky určená barva", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnat dolů", "PE.Views.Toolbar.textShapeAlignCenter": "Zarovnat na střed", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnat vlevo", diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 9a35d40fc..b12535b02 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -48,8 +48,6 @@ "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 en kopi.", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Brugerdefineret farve", "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ingen rammer", "Common.UI.ComboDataView.emptyComboText": "Ingen stilarter", @@ -1270,11 +1268,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Gem kopi som...", "PE.Views.FileMenu.btnSettingsCaption": "Avancerede indstillinger...", "PE.Views.FileMenu.btnToEditCaption": "Rediger præsentation", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Fra blank", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Fra skabelon", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Opret en ny blank præsentation, som du vil kunne style og formatere, når den er oprettet under redigering. Eller vælg en af ​​skabelonerne for at starte en præsentation af en bestemt type eller formål, hvor nogle stilarter allerede er blevet anvendt før.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Ny præsentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Der er ikke nogle skabeloner", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anvend", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tilføj forfatter", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tilføj tekst", @@ -1605,70 +1598,34 @@ "PE.Views.SlideSettings.strBackground": "Baggrundsfarve", "PE.Views.SlideSettings.strColor": "Farve", "PE.Views.SlideSettings.strDateTime": "Vis dato og tid", - "PE.Views.SlideSettings.strDelay": "Forsinket", - "PE.Views.SlideSettings.strDuration": "Varighed", - "PE.Views.SlideSettings.strEffect": "Effekt", "PE.Views.SlideSettings.strFill": "Baggrund", "PE.Views.SlideSettings.strForeground": "Forgrundsfarve", "PE.Views.SlideSettings.strPattern": "Mønster", "PE.Views.SlideSettings.strSlideNum": "Vis dias nummer", - "PE.Views.SlideSettings.strStartOnClick": "Start på Klik", "PE.Views.SlideSettings.strTransparency": "Gennemsigtighed", "PE.Views.SlideSettings.textAdvanced": "Vis avancerede indstillinger", "PE.Views.SlideSettings.textAngle": "Vinkel", - "PE.Views.SlideSettings.textApplyAll": "Anvend på alle dias", - "PE.Views.SlideSettings.textBlack": "Gennem Sort", - "PE.Views.SlideSettings.textBottom": "Bund", - "PE.Views.SlideSettings.textBottomLeft": "Nederst venstre", - "PE.Views.SlideSettings.textBottomRight": "Nederste højre", - "PE.Views.SlideSettings.textClock": "Ur", - "PE.Views.SlideSettings.textClockwise": "Med uret", "PE.Views.SlideSettings.textColor": "Farvefyld", - "PE.Views.SlideSettings.textCounterclockwise": "Mod uret", - "PE.Views.SlideSettings.textCover": "Dække over", "PE.Views.SlideSettings.textDirection": "Retning", "PE.Views.SlideSettings.textEmptyPattern": "Intet mønster", - "PE.Views.SlideSettings.textFade": "Falme", "PE.Views.SlideSettings.textFromFile": "Fra fil", "PE.Views.SlideSettings.textFromStorage": "Fra lager", "PE.Views.SlideSettings.textFromUrl": "Fra URL", "PE.Views.SlideSettings.textGradient": "Gradientpunkter", "PE.Views.SlideSettings.textGradientFill": "Gradient udfyldning", - "PE.Views.SlideSettings.textHorizontalIn": "Vandret i", - "PE.Views.SlideSettings.textHorizontalOut": "Vandret ud", "PE.Views.SlideSettings.textImageTexture": "Billede eller struktur", - "PE.Views.SlideSettings.textLeft": "Venstre", "PE.Views.SlideSettings.textLinear": "Linær", "PE.Views.SlideSettings.textNoFill": "Intet fyld", - "PE.Views.SlideSettings.textNone": "ingen", "PE.Views.SlideSettings.textPatternFill": "Mønster", "PE.Views.SlideSettings.textPosition": "Placering", - "PE.Views.SlideSettings.textPreview": "Forhåndsvisning", - "PE.Views.SlideSettings.textPush": "Skub", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Nulstil ændringer", - "PE.Views.SlideSettings.textRight": "Højre", - "PE.Views.SlideSettings.textSec": "S", "PE.Views.SlideSettings.textSelectImage": "Vælg billede", "PE.Views.SlideSettings.textSelectTexture": "Vælg", - "PE.Views.SlideSettings.textSmoothly": "Glat", - "PE.Views.SlideSettings.textSplit": "Dele", "PE.Views.SlideSettings.textStretch": "Stræk", "PE.Views.SlideSettings.textStyle": "Stilart", "PE.Views.SlideSettings.textTexture": "Fra struktur", "PE.Views.SlideSettings.textTile": "Flise", - "PE.Views.SlideSettings.textTop": "Top", - "PE.Views.SlideSettings.textTopLeft": "Top venstre", - "PE.Views.SlideSettings.textTopRight": "Top højre", - "PE.Views.SlideSettings.textUnCover": "Afdække", - "PE.Views.SlideSettings.textVerticalIn": "Lodret In", - "PE.Views.SlideSettings.textVerticalOut": "Lodret ud", - "PE.Views.SlideSettings.textWedge": "Kile", - "PE.Views.SlideSettings.textWipe": "Tørre", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom ind", - "PE.Views.SlideSettings.textZoomOut": "Zoom ud", - "PE.Views.SlideSettings.textZoomRotate": "Zoom og roter", "PE.Views.SlideSettings.tipAddGradientPoint": "Tilføj gradientpunkt", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Fjern gradientpunkt", "PE.Views.SlideSettings.txtBrownPaper": "Brunt papir", @@ -1878,7 +1835,6 @@ "PE.Views.Toolbar.textColumnsTwo": "To kolonner", "PE.Views.Toolbar.textItalic": "Kursiv", "PE.Views.Toolbar.textListSettings": "Liste-indstillinger", - "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 92ee221a1..fdab95d0e 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "Die Datei wird in einer anderen App bearbeitet. Sie können die Bearbeitung fortsetzen und die Kopie dieser Datei speichern.", "Common.Translation.warnFileLockedBtnEdit": "Kopie erstellen", "Common.Translation.warnFileLockedBtnView": "Schreibgeschützt öffnen", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Benutzerdefinierte Farbe", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1300,11 +1298,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Kopie speichern als...", "PE.Views.FileMenu.btnSettingsCaption": "Erweiterte Einstellungen...", "PE.Views.FileMenu.btnToEditCaption": "Präsentation bearbeiten", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Aus leerer Datei", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Aus Vorlage", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Erstellen Sie eine leere Präsentation, die Sie nach seiner Erstellung bei der Bearbeitung formatieren können. Oder wählen Sie eine der Vorlagen, um eine Präsentation eines bestimmten Typs (für einen bestimmten Zweck) zu erstellen, wo einige Stile bereits angewandt sind.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Neue Präsentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Es gibt keine Vorlagen", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anwenden", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Autor hinzufügen", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Text hinzufügen", @@ -1635,70 +1628,34 @@ "PE.Views.SlideSettings.strBackground": "Hintergrundfarbe", "PE.Views.SlideSettings.strColor": "Farbe", "PE.Views.SlideSettings.strDateTime": "Datum und Uhrzeit anzeigen", - "PE.Views.SlideSettings.strDelay": "Verzögern", - "PE.Views.SlideSettings.strDuration": "Dauer", - "PE.Views.SlideSettings.strEffect": "Effekt", "PE.Views.SlideSettings.strFill": "Hintergrund", "PE.Views.SlideSettings.strForeground": "Vordergrundfarbe", "PE.Views.SlideSettings.strPattern": "Muster", "PE.Views.SlideSettings.strSlideNum": "Foliennummer anzeigen", - "PE.Views.SlideSettings.strStartOnClick": "Bei Klicken beginnen", "PE.Views.SlideSettings.strTransparency": "Undurchsichtigkeit", "PE.Views.SlideSettings.textAdvanced": "Erweiterte Einstellungen anzeigen", "PE.Views.SlideSettings.textAngle": "Winkel", - "PE.Views.SlideSettings.textApplyAll": "Auf alle Folien anwenden", - "PE.Views.SlideSettings.textBlack": "Durch Schwarz", - "PE.Views.SlideSettings.textBottom": "Unten", - "PE.Views.SlideSettings.textBottomLeft": "Unten links", - "PE.Views.SlideSettings.textBottomRight": "Unten rechts", - "PE.Views.SlideSettings.textClock": "Uhr", - "PE.Views.SlideSettings.textClockwise": "Im Uhrzeigersinn", "PE.Views.SlideSettings.textColor": "Farbfüllung", - "PE.Views.SlideSettings.textCounterclockwise": "Gegen Uhrzeigersinn", - "PE.Views.SlideSettings.textCover": "Bedecken", "PE.Views.SlideSettings.textDirection": "Richtung", "PE.Views.SlideSettings.textEmptyPattern": "Kein Muster", - "PE.Views.SlideSettings.textFade": "Verblassen", "PE.Views.SlideSettings.textFromFile": "Aus Datei", "PE.Views.SlideSettings.textFromStorage": "aus dem Speicher", "PE.Views.SlideSettings.textFromUrl": "Aus URL", "PE.Views.SlideSettings.textGradient": "Farbverlauf", "PE.Views.SlideSettings.textGradientFill": "Füllung mit Farbverlauf", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal nach innen", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal nach außen", "PE.Views.SlideSettings.textImageTexture": "Bild oder Textur", - "PE.Views.SlideSettings.textLeft": "Links", "PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textNoFill": "Keine Füllung", - "PE.Views.SlideSettings.textNone": "Kein", "PE.Views.SlideSettings.textPatternFill": "Muster", "PE.Views.SlideSettings.textPosition": "Stellung", - "PE.Views.SlideSettings.textPreview": "Vorschau", - "PE.Views.SlideSettings.textPush": "Schieben", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Änderungen zurücksetzen", - "PE.Views.SlideSettings.textRight": "Rechts", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Bild auswählen", "PE.Views.SlideSettings.textSelectTexture": "Wählen", - "PE.Views.SlideSettings.textSmoothly": "Gleitend", - "PE.Views.SlideSettings.textSplit": "Aufteilen", "PE.Views.SlideSettings.textStretch": "Ausdehnung", "PE.Views.SlideSettings.textStyle": "Stil", "PE.Views.SlideSettings.textTexture": "Aus Textur", "PE.Views.SlideSettings.textTile": "Kachel", - "PE.Views.SlideSettings.textTop": "Oben", - "PE.Views.SlideSettings.textTopLeft": "Oben links", - "PE.Views.SlideSettings.textTopRight": "Oben rechts", - "PE.Views.SlideSettings.textUnCover": "Aufdecken", - "PE.Views.SlideSettings.textVerticalIn": "Vertikal nach innen", - "PE.Views.SlideSettings.textVerticalOut": "Vertikal nach außen", - "PE.Views.SlideSettings.textWedge": "Keil", - "PE.Views.SlideSettings.textWipe": "Wischen", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Vergrößern", - "PE.Views.SlideSettings.textZoomOut": "Verkleinern", - "PE.Views.SlideSettings.textZoomRotate": "Zoom und Drehung", "PE.Views.SlideSettings.tipAddGradientPoint": "Punkt des Farbverlaufs einfügen", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Punkt des Farbverlaufs entfernen", "PE.Views.SlideSettings.txtBrownPaper": "Kraftpapier", @@ -1908,7 +1865,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Zwei Spalten", "PE.Views.Toolbar.textItalic": "Kursiv", "PE.Views.Toolbar.textListSettings": "Listeneinstellungen", - "PE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe", "PE.Views.Toolbar.textShapeAlignBottom": "Unten ausrichten", "PE.Views.Toolbar.textShapeAlignCenter": "Zentriert ausrichten", "PE.Views.Toolbar.textShapeAlignLeft": "Links ausrichten", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index 87a9582af..f97223033 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "Το αρχείο τελεί υπό επεξεργασία σε άλλη εφαρμογή. Μπορείτε να συνεχίσετε την επεξεργασία και να το αποθηκεύσετε ως αντίγραφο.", "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου", "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή", - "Common.UI.ColorButton.textAutoColor": "Αυτόματα", - "Common.UI.ColorButton.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", "Common.UI.ComboBorderSize.txtNoBorders": "Χωρίς περιγράμματα", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Χωρίς περιγράμματα", "Common.UI.ComboDataView.emptyComboText": "Χωρίς τεχνοτροπίες", @@ -1292,11 +1290,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Αποθήκευση Αντιγράφου ως...", "PE.Views.FileMenu.btnSettingsCaption": "Προηγμένες Ρυθμίσεις...", "PE.Views.FileMenu.btnToEditCaption": "Επεξεργασία Παρουσίασης", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Από Κενό", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Από Πρότυπο", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Δημιουργία νέας κενής παρουσίασης που θα μπορείτε να μορφοποιήσετε μετά τη δημιουργία της κατά την σύνταξη. Ή επιλογή ενός προτύπου για έναρξη μιας παρουσίασης συγκεκριμένου τύπου ή σκοπού όπου κάποιες τεχνοτροπίες έχουν ήδη εφαρμοστεί.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Νέα Παρουσίαση", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Δεν υπάρχουν πρότυπα", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Εφαρμογή", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Προσθήκη Συγγραφέα", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Προσθήκη Κειμένου", @@ -1627,70 +1620,34 @@ "PE.Views.SlideSettings.strBackground": "Χρώμα παρασκηνίου", "PE.Views.SlideSettings.strColor": "Χρώμα", "PE.Views.SlideSettings.strDateTime": "Εμφάνιση Ημερομηνίας και Ώρας", - "PE.Views.SlideSettings.strDelay": "Καθυστέρηση", - "PE.Views.SlideSettings.strDuration": "Διάρκεια", - "PE.Views.SlideSettings.strEffect": "Εφέ", "PE.Views.SlideSettings.strFill": "Παρασκήνιο", "PE.Views.SlideSettings.strForeground": "Χρώμα προσκηνίου", "PE.Views.SlideSettings.strPattern": "Μοτίβο", "PE.Views.SlideSettings.strSlideNum": "Εμφάνιση Αριθμού Διαφάνειας", - "PE.Views.SlideSettings.strStartOnClick": "Έναρξη Με Κλικ", "PE.Views.SlideSettings.strTransparency": "Αδιαφάνεια", "PE.Views.SlideSettings.textAdvanced": "Εμφάνιση προηγμένων ρυθμίσεων", "PE.Views.SlideSettings.textAngle": "Γωνία", - "PE.Views.SlideSettings.textApplyAll": "Εφαρμογή σε Όλες τις Διαφάνειες", - "PE.Views.SlideSettings.textBlack": "Μέσω του Μαύρου", - "PE.Views.SlideSettings.textBottom": "Κάτω", - "PE.Views.SlideSettings.textBottomLeft": "Κάτω Αριστερά", - "PE.Views.SlideSettings.textBottomRight": "Κάτω Δεξιά", - "PE.Views.SlideSettings.textClock": "Ρολόι", - "PE.Views.SlideSettings.textClockwise": "Δεξιόστροφα", "PE.Views.SlideSettings.textColor": "Γέμισμα με Χρώμα", - "PE.Views.SlideSettings.textCounterclockwise": "Αριστερόστροφα", - "PE.Views.SlideSettings.textCover": "Εξώφυλλο", "PE.Views.SlideSettings.textDirection": "Κατεύθυνση", "PE.Views.SlideSettings.textEmptyPattern": "Χωρίς Σχέδιο", - "PE.Views.SlideSettings.textFade": "Σβήσιμο", "PE.Views.SlideSettings.textFromFile": "Από Αρχείο", "PE.Views.SlideSettings.textFromStorage": "Από Αποθηκευτικό Χώρο", "PE.Views.SlideSettings.textFromUrl": "Από διεύθυνση URL", "PE.Views.SlideSettings.textGradient": "Σημεία διαβάθμισης", "PE.Views.SlideSettings.textGradientFill": "Βαθμωτό Γέμισμα", - "PE.Views.SlideSettings.textHorizontalIn": "Οριζόντιο Εσωτερικό", - "PE.Views.SlideSettings.textHorizontalOut": "Οριζόντιο Εξωτερικό", "PE.Views.SlideSettings.textImageTexture": "Εικόνα ή Υφή", - "PE.Views.SlideSettings.textLeft": "Αριστερά", "PE.Views.SlideSettings.textLinear": "Γραμμικός", "PE.Views.SlideSettings.textNoFill": "Χωρίς Γέμισμα", - "PE.Views.SlideSettings.textNone": "Κανένα", "PE.Views.SlideSettings.textPatternFill": "Μοτίβο", "PE.Views.SlideSettings.textPosition": "Θέση", - "PE.Views.SlideSettings.textPreview": "Προεπισκόπηση", - "PE.Views.SlideSettings.textPush": "Ώθηση", "PE.Views.SlideSettings.textRadial": "Ακτινικός", "PE.Views.SlideSettings.textReset": "Επαναφορά Αλλαγών", - "PE.Views.SlideSettings.textRight": "Δεξιά", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Επιλογή Εικόνας", "PE.Views.SlideSettings.textSelectTexture": "Επιλογή", - "PE.Views.SlideSettings.textSmoothly": "Ομαλή μετάβαση", - "PE.Views.SlideSettings.textSplit": "Διαίρεση", "PE.Views.SlideSettings.textStretch": "Έκταση", "PE.Views.SlideSettings.textStyle": "Τεχνοτροπία", "PE.Views.SlideSettings.textTexture": "Από Υφή", "PE.Views.SlideSettings.textTile": "Πλακίδιο", - "PE.Views.SlideSettings.textTop": "Επάνω", - "PE.Views.SlideSettings.textTopLeft": "Πάνω Αριστερά", - "PE.Views.SlideSettings.textTopRight": "Πάνω Δεξιά", - "PE.Views.SlideSettings.textUnCover": "Αποκάλυψη", - "PE.Views.SlideSettings.textVerticalIn": "Κάθετο Εσωτερικό", - "PE.Views.SlideSettings.textVerticalOut": "Κάθετο Εξωτερικό", - "PE.Views.SlideSettings.textWedge": "Σύζευξη", - "PE.Views.SlideSettings.textWipe": "Εκκαθάριση", - "PE.Views.SlideSettings.textZoom": "Εστίαση", - "PE.Views.SlideSettings.textZoomIn": "Μεγέθυνση", - "PE.Views.SlideSettings.textZoomOut": "Σμίκρυνση", - "PE.Views.SlideSettings.textZoomRotate": "Εστίαση και Περιστροφή", "PE.Views.SlideSettings.tipAddGradientPoint": "Προσθήκη σημείου διαβάθμισης", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Αφαίρεση σημείου διαβάθμισης", "PE.Views.SlideSettings.txtBrownPaper": "Καφέ Χαρτί", @@ -1900,7 +1857,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Δύο Στήλες", "PE.Views.Toolbar.textItalic": "Πλάγια", "PE.Views.Toolbar.textListSettings": "Ρυθμίσεις Λίστας", - "PE.Views.Toolbar.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", "PE.Views.Toolbar.textShapeAlignBottom": "Στοίχιση Κάτω", "PE.Views.Toolbar.textShapeAlignCenter": "Στοίχιση στο Κέντρο", "PE.Views.Toolbar.textShapeAlignLeft": "Στοίχιση Αριστερά", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 716f411b2..bdbe2ea6d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -52,8 +52,6 @@ "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ButtonColored.textAutoColor": "Automatic", "Common.UI.ButtonColored.textNewColor": "Add New Custom Color", - "del_Common.UI.ColorButton.textAutoColor": "Automatic", - "del_Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -455,15 +453,18 @@ "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", "PE.Controllers.Main.textAnonymous": "Anonymous", + "PE.Controllers.Main.textApplyAll": "Apply to all equations", "PE.Controllers.Main.textBuyNow": "Visit website", "PE.Controllers.Main.textChangesSaved": "All changes saved", "PE.Controllers.Main.textClose": "Close", "PE.Controllers.Main.textCloseTip": "Click to close the tip", "PE.Controllers.Main.textContactUs": "Contact sales", + "PE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", "PE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.
    Please contact our Sales Department to get a quote.", "PE.Controllers.Main.textDisconnect": "Connection is lost", "PE.Controllers.Main.textGuest": "Guest", "PE.Controllers.Main.textHasMacros": "The file contains automatic macros.
    Do you want to run macros?", + "PE.Controllers.Main.textLearnMore": "Learn More", "PE.Controllers.Main.textLoadingDocument": "Loading presentation", "PE.Controllers.Main.textLongName": "Enter a name that is less than 128 characters.", "PE.Controllers.Main.textNoLicenseTitle": "License limit reached", @@ -749,9 +750,6 @@ "PE.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.", "PE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "PE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", - "PE.Controllers.Main.textLearnMore": "Learn More", - "PE.Controllers.Main.textApplyAll": "Apply to all equations", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
    The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
    Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", @@ -1315,13 +1313,8 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Save Copy as...", "PE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "PE.Views.FileMenu.btnToEditCaption": "Edit Presentation", - "del_PE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "del_PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "del_PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank presentation which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a presentation of a certain type or purpose where some styles have already been pre-applied.", - "del_PE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Presentation", - "del_PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", - "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "PE.Views.FileMenuPanels.CreateNew.txtBlank": "Blank Presentation", + "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Apply", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text", @@ -1652,70 +1645,34 @@ "PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strColor": "Color", "PE.Views.SlideSettings.strDateTime": "Show Date and Time", - "del_PE.Views.SlideSettings.strDelay": "Delay", - "del_PE.Views.SlideSettings.strDuration": "Duration", - "del_PE.Views.SlideSettings.strEffect": "Effect", "PE.Views.SlideSettings.strFill": "Background", "PE.Views.SlideSettings.strForeground": "Foreground color", "PE.Views.SlideSettings.strPattern": "Pattern", "PE.Views.SlideSettings.strSlideNum": "Show Slide Number", - "del_PE.Views.SlideSettings.strStartOnClick": "Start On Click", "PE.Views.SlideSettings.strTransparency": "Opacity", "PE.Views.SlideSettings.textAdvanced": "Show advanced settings", "PE.Views.SlideSettings.textAngle": "Angle", - "del_PE.Views.SlideSettings.textApplyAll": "Apply to All Slides", - "del_PE.Views.SlideSettings.textBlack": "Through Black", - "del_PE.Views.SlideSettings.textBottom": "Bottom", - "del_PE.Views.SlideSettings.textBottomLeft": "Bottom Left", - "del_PE.Views.SlideSettings.textBottomRight": "Bottom Right", - "del_PE.Views.SlideSettings.textClock": "Clock", - "del_PE.Views.SlideSettings.textClockwise": "Clockwise", "PE.Views.SlideSettings.textColor": "Color Fill", - "del_PE.Views.SlideSettings.textCounterclockwise": "Counterclockwise", - "del_PE.Views.SlideSettings.textCover": "Cover", "PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textEmptyPattern": "No Pattern", - "del_PE.Views.SlideSettings.textFade": "Fade", "PE.Views.SlideSettings.textFromFile": "From File", "PE.Views.SlideSettings.textFromStorage": "From Storage", "PE.Views.SlideSettings.textFromUrl": "From URL", "PE.Views.SlideSettings.textGradient": "Gradient points", "PE.Views.SlideSettings.textGradientFill": "Gradient Fill", - "del_PE.Views.SlideSettings.textHorizontalIn": "Horizontal In", - "del_PE.Views.SlideSettings.textHorizontalOut": "Horizontal Out", "PE.Views.SlideSettings.textImageTexture": "Picture or Texture", - "del_PE.Views.SlideSettings.textLeft": "Left", "PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textNoFill": "No Fill", - "del_PE.Views.SlideSettings.textNone": "None", "PE.Views.SlideSettings.textPatternFill": "Pattern", "PE.Views.SlideSettings.textPosition": "Position", - "del_PE.Views.SlideSettings.textPreview": "Preview", - "del_PE.Views.SlideSettings.textPush": "Push", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Reset Changes", - "del_PE.Views.SlideSettings.textRight": "Right", - "del_PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Select Picture", "PE.Views.SlideSettings.textSelectTexture": "Select", - "del_PE.Views.SlideSettings.textSmoothly": "Smoothly", - "del_PE.Views.SlideSettings.textSplit": "Split", "PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textTexture": "From Texture", "PE.Views.SlideSettings.textTile": "Tile", - "del_PE.Views.SlideSettings.textTop": "Top", - "del_PE.Views.SlideSettings.textTopLeft": "Top Left", - "del_PE.Views.SlideSettings.textTopRight": "Top Right", - "del_PE.Views.SlideSettings.textUnCover": "Uncover", - "del_PE.Views.SlideSettings.textVerticalIn": "Vertical In", - "del_PE.Views.SlideSettings.textVerticalOut": "Vertical Out", - "del_PE.Views.SlideSettings.textWedge": "Wedge", - "del_PE.Views.SlideSettings.textWipe": "Wipe", - "del_PE.Views.SlideSettings.textZoom": "Zoom", - "del_PE.Views.SlideSettings.textZoomIn": "Zoom In", - "del_PE.Views.SlideSettings.textZoomOut": "Zoom Out", - "del_PE.Views.SlideSettings.textZoomRotate": "Zoom and Rotate", "PE.Views.SlideSettings.tipAddGradientPoint": "Add gradient point", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Remove gradient point", "PE.Views.SlideSettings.txtBrownPaper": "Brown Paper", @@ -1925,7 +1882,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Two Columns", "PE.Views.Toolbar.textItalic": "Italic", "PE.Views.Toolbar.textListSettings": "List Settings", - "del_PE.Views.Toolbar.textNewColor": "Add New Custom Color", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", @@ -1944,6 +1900,7 @@ "PE.Views.Toolbar.textTabHome": "Home", "PE.Views.Toolbar.textTabInsert": "Insert", "PE.Views.Toolbar.textTabProtect": "Protection", + "PE.Views.Toolbar.textTabTransitions": "Transitions", "PE.Views.Toolbar.textTitleError": "Error", "PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.tipAddSlide": "Add slide", @@ -2023,41 +1980,40 @@ "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", "PE.Views.Toolbar.txtUngroup": "Ungroup", - "PE.Views.Transitions.txtSec": "s", - "PE.Views.Transitions.txtPreview": "Preview", - "PE.Views.Transitions.txtParameters": "Parameters", - "PE.Views.Transitions.txtApplyToAll": "Apply to All Slides", - "PE.Views.Transitions.strDuration": "Duration", "PE.Views.Transitions.strDelay": "Delay", + "PE.Views.Transitions.strDuration": "Duration", "PE.Views.Transitions.strStartOnClick": "Start On Click", - "PE.Views.Transitions.textNone": "None", - "PE.Views.Transitions.textFade": "Fade", - "PE.Views.Transitions.textPush": "Push", - "PE.Views.Transitions.textWipe": "Wipe", - "PE.Views.Transitions.textSplit": "Split", - "PE.Views.Transitions.textUnCover": "UnCover", - "PE.Views.Transitions.textCover": "Cover", - "PE.Views.Transitions.textClock": "Clock", - "PE.Views.Transitions.textZoom": "Zoom", - "PE.Views.Transitions.textSmoothly": "Smoothly", "PE.Views.Transitions.textBlack": "Through Black", - "PE.Views.Transitions.textLeft": "Left", - "PE.Views.Transitions.textTop": "Top", - "PE.Views.Transitions.textRight": "Right", "PE.Views.Transitions.textBottom": "Bottom", - "PE.Views.Transitions.textTopLeft": "Top-Left", - "PE.Views.Transitions.textTopRight": "Top-Right", "PE.Views.Transitions.textBottomLeft": "Bottom-Left", "PE.Views.Transitions.textBottomRight": "Bottom-Right", - "PE.Views.Transitions.textVerticalIn": "Vertical In", - "PE.Views.Transitions.textVerticalOut": "Vertical Out", - "PE.Views.Transitions.textHorizontalIn": "Horizontal In", - "PE.Views.Transitions.textHorizontalOut": "Horizontal Out", + "PE.Views.Transitions.textClock": "Clock", "PE.Views.Transitions.textClockwise": "Clockwise", "PE.Views.Transitions.textCounterclockwise": "Counterclockwise", + "PE.Views.Transitions.textCover": "Cover", + "PE.Views.Transitions.textFade": "Fade", + "PE.Views.Transitions.textHorizontalIn": "Horizontal In", + "PE.Views.Transitions.textHorizontalOut": "Horizontal Out", + "PE.Views.Transitions.textLeft": "Left", + "PE.Views.Transitions.textNone": "None", + "PE.Views.Transitions.textPush": "Push", + "PE.Views.Transitions.textRight": "Right", + "PE.Views.Transitions.textSmoothly": "Smoothly", + "PE.Views.Transitions.textSplit": "Split", + "PE.Views.Transitions.textTop": "Top", + "PE.Views.Transitions.textTopLeft": "Top-Left", + "PE.Views.Transitions.textTopRight": "Top-Right", + "PE.Views.Transitions.textUnCover": "UnCover", + "PE.Views.Transitions.textVerticalIn": "Vertical In", + "PE.Views.Transitions.textVerticalOut": "Vertical Out", "PE.Views.Transitions.textWedge": "Wedge", + "PE.Views.Transitions.textWipe": "Wipe", + "PE.Views.Transitions.textZoom": "Zoom", "PE.Views.Transitions.textZoomIn": "Zoom In", "PE.Views.Transitions.textZoomOut": "Zoom Out", "PE.Views.Transitions.textZoomRotate": "Zoom and Rotate", - "PE.Views.Toolbar.textTabTransitions": "Transitions" + "PE.Views.Transitions.txtApplyToAll": "Apply to All Slides", + "PE.Views.Transitions.txtParameters": "Parameters", + "PE.Views.Transitions.txtPreview": "Preview", + "PE.Views.Transitions.txtSec": "s" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index ddb13ce81..a6b251d96 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -50,8 +50,8 @@ "Common.Translation.warnFileLocked": "El archivo está siendo editado en otra aplicación. Puede continuar editándolo y guardarlo como una copia.", "Common.Translation.warnFileLockedBtnEdit": "Crear copia", "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Color personalizado", + "Common.UI.ButtonColored.textAutoColor": "Automático", + "Common.UI.ButtonColored.textNewColor": "Añadir nuevo color personalizado", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -124,6 +124,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Cualquier autocorreción que haya agregado se eliminará y los modificados serán restaurados a sus valores originales. ¿Desea continuar?", "Common.Views.AutoCorrectDialog.warnRestore": "La entrada de autocorrección para %1 será restablecida a su valor original. ¿Desea continuar?", "Common.Views.Chat.textSend": "Enviar", + "Common.Views.Comments.mniAuthorAsc": "Autor de A a Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de Z a A", + "Common.Views.Comments.mniDateAsc": "Más antiguo", + "Common.Views.Comments.mniDateDesc": "Más reciente", + "Common.Views.Comments.mniPositionAsc": "Desde arriba", + "Common.Views.Comments.mniPositionDesc": "Desde abajo", "Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", @@ -131,6 +137,7 @@ "Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textCancel": "Cancelar", "Common.Views.Comments.textClose": "Cerrar", + "Common.Views.Comments.textClosePanel": "Cerrar comentarios", "Common.Views.Comments.textComments": "Comentarios", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Introduzca su comentario aquí", @@ -139,6 +146,7 @@ "Common.Views.Comments.textReply": "Responder", "Common.Views.Comments.textResolve": "Resolver", "Common.Views.Comments.textResolved": "Resuelto", + "Common.Views.Comments.textSort": "Ordenar comentarios", "Common.Views.CopyWarningDialog.textDontShow": "No volver a mostrar este mensaje", "Common.Views.CopyWarningDialog.textMsg": "Se puede realizar las acciones de copiar, cortar y pegar usando los botones en la barra de herramientas y el menú contextual sólo en esta pestaña del editor.

    Si quiere copiar o pegar algo fuera de esta pestaña, usa las combinaciones de teclas siguientes:", "Common.Views.CopyWarningDialog.textTitle": "Funciones de Copiar, Cortar y Pegar", @@ -444,14 +452,18 @@ "PE.Controllers.Main.splitMaxColsErrorText": "El número de columnas debe ser menos que %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.", "PE.Controllers.Main.textAnonymous": "Anónimo", + "PE.Controllers.Main.textApplyAll": "Aplicar a todas las ecuaciones", "PE.Controllers.Main.textBuyNow": "Visitar sitio web", "PE.Controllers.Main.textChangesSaved": "Todos los cambios son guardados", "PE.Controllers.Main.textClose": "Cerrar", "PE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo", "PE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", + "PE.Controllers.Main.textConvertEquation": "Esta ecuación fue creada con una versión antigua del editor de ecuaciones que ya no es compatible. Para editarla, convierta la ecuación al formato ML de Office Math.
    ¿Convertir ahora?", "PE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
    Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", + "PE.Controllers.Main.textDisconnect": "Se ha perdido la conexión", "PE.Controllers.Main.textGuest": "Invitado", "PE.Controllers.Main.textHasMacros": "El archivo contiene macros automáticas.
    ¿Quiere ejecutar macros?", + "PE.Controllers.Main.textLearnMore": "Más información", "PE.Controllers.Main.textLoadingDocument": "Cargando presentación", "PE.Controllers.Main.textLongName": "Escriba un nombre que tenga menos de 128 caracteres.", "PE.Controllers.Main.textNoLicenseTitle": "Se ha alcanzado el límite de licencias", @@ -1300,11 +1312,8 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Guardar Copia como...", "PE.Views.FileMenu.btnSettingsCaption": "Ajustes avanzados...", "PE.Views.FileMenu.btnToEditCaption": "Editar presentación", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "De documento en blanco", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "De plantilla", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree una presentación en blanco nueva para trabajar con estilo y formato y editarla según sus necesidades. O seleccione una de las plantillas para iniciar la presentación de cierto tipo o propósito donde algunos estilos se han aplicado ya.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Presentación nueva", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "No hay ningunas plantillas", + "PE.Views.FileMenuPanels.CreateNew.txtBlank": "Presentación en blanco", + "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Crear nueva", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto", @@ -1635,70 +1644,34 @@ "PE.Views.SlideSettings.strBackground": "Color de fondo", "PE.Views.SlideSettings.strColor": "Color", "PE.Views.SlideSettings.strDateTime": "Mostrar Fecha y Hora", - "PE.Views.SlideSettings.strDelay": "Retraso", - "PE.Views.SlideSettings.strDuration": "Duración ", - "PE.Views.SlideSettings.strEffect": "Efecto", "PE.Views.SlideSettings.strFill": "Fondo", "PE.Views.SlideSettings.strForeground": "Color de primer plano", "PE.Views.SlideSettings.strPattern": "Patrón", "PE.Views.SlideSettings.strSlideNum": "Mostrar número de diapositiva", - "PE.Views.SlideSettings.strStartOnClick": "Iniciar al hacer clic", "PE.Views.SlideSettings.strTransparency": "Opacidad ", "PE.Views.SlideSettings.textAdvanced": "Mostrar ajustes avanzados", "PE.Views.SlideSettings.textAngle": "Ángulo", - "PE.Views.SlideSettings.textApplyAll": "Aplicar a todas diapositivas", - "PE.Views.SlideSettings.textBlack": "A través de negro", - "PE.Views.SlideSettings.textBottom": "Inferior", - "PE.Views.SlideSettings.textBottomLeft": "Inferior izquierdo", - "PE.Views.SlideSettings.textBottomRight": "Inferior derecho", - "PE.Views.SlideSettings.textClock": "Reloj", - "PE.Views.SlideSettings.textClockwise": "En la dirección de manecillas de reloj", "PE.Views.SlideSettings.textColor": "Color de relleno", - "PE.Views.SlideSettings.textCounterclockwise": "En el sentido antihorario", - "PE.Views.SlideSettings.textCover": "Cubrir", "PE.Views.SlideSettings.textDirection": "Dirección ", "PE.Views.SlideSettings.textEmptyPattern": "Sin patrón", - "PE.Views.SlideSettings.textFade": "Atenuación ", "PE.Views.SlideSettings.textFromFile": "De archivo", "PE.Views.SlideSettings.textFromStorage": "Desde almacenamiento", "PE.Views.SlideSettings.textFromUrl": "De URL", "PE.Views.SlideSettings.textGradient": "Puntos de degradado ", "PE.Views.SlideSettings.textGradientFill": "Relleno degradado", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal dentro", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal por fuera", "PE.Views.SlideSettings.textImageTexture": "Imagen o textura", - "PE.Views.SlideSettings.textLeft": "Izquierdo", "PE.Views.SlideSettings.textLinear": "Lineal", "PE.Views.SlideSettings.textNoFill": "Sin relleno", - "PE.Views.SlideSettings.textNone": "ninguno", "PE.Views.SlideSettings.textPatternFill": "Patrón", "PE.Views.SlideSettings.textPosition": "Posición", - "PE.Views.SlideSettings.textPreview": "Vista previa", - "PE.Views.SlideSettings.textPush": "Pulsación", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Anular cambios", - "PE.Views.SlideSettings.textRight": "Derecho", - "PE.Views.SlideSettings.textSec": "d", "PE.Views.SlideSettings.textSelectImage": "Seleccionar imagen", "PE.Views.SlideSettings.textSelectTexture": "Seleccionar", - "PE.Views.SlideSettings.textSmoothly": "Suavemente", - "PE.Views.SlideSettings.textSplit": "Dividir", "PE.Views.SlideSettings.textStretch": "Estirar", "PE.Views.SlideSettings.textStyle": "Estilo", "PE.Views.SlideSettings.textTexture": "De textura", "PE.Views.SlideSettings.textTile": "Mosaico", - "PE.Views.SlideSettings.textTop": "Superior", - "PE.Views.SlideSettings.textTopLeft": "Superior izquierdo", - "PE.Views.SlideSettings.textTopRight": "Superior derecho", - "PE.Views.SlideSettings.textUnCover": "Descubrir", - "PE.Views.SlideSettings.textVerticalIn": "Vertical dentro", - "PE.Views.SlideSettings.textVerticalOut": "Vertical por fuera", - "PE.Views.SlideSettings.textWedge": "Cuña", - "PE.Views.SlideSettings.textWipe": "Limpiar", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Acercar", - "PE.Views.SlideSettings.textZoomOut": "Alejar", - "PE.Views.SlideSettings.textZoomRotate": "Zoom y girar", "PE.Views.SlideSettings.tipAddGradientPoint": "Añadir punto de degradado", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Eliminar punto de degradado", "PE.Views.SlideSettings.txtBrownPaper": "Papel marrón", @@ -1908,7 +1881,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Dos columnas", "PE.Views.Toolbar.textItalic": "Cursiva", "PE.Views.Toolbar.textListSettings": "Ajustes de lista", - "PE.Views.Toolbar.textNewColor": "Color personalizado", "PE.Views.Toolbar.textShapeAlignBottom": "Alinear en la parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinear al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinear a la izquierda", @@ -1927,6 +1899,7 @@ "PE.Views.Toolbar.textTabHome": "Inicio", "PE.Views.Toolbar.textTabInsert": "Insertar", "PE.Views.Toolbar.textTabProtect": "Protección", + "PE.Views.Toolbar.textTabTransitions": "Transiciones", "PE.Views.Toolbar.textTitleError": "Error", "PE.Views.Toolbar.textUnderline": "Subrayar", "PE.Views.Toolbar.tipAddSlide": "Añadir diapositiva", @@ -2005,5 +1978,41 @@ "PE.Views.Toolbar.txtScheme8": "Flujo", "PE.Views.Toolbar.txtScheme9": "Fundición", "PE.Views.Toolbar.txtSlideAlign": "Alinear con la diapositiva", - "PE.Views.Toolbar.txtUngroup": "Desagrupar" + "PE.Views.Toolbar.txtUngroup": "Desagrupar", + "PE.Views.Transitions.strDelay": "Retraso", + "PE.Views.Transitions.strDuration": "Duración ", + "PE.Views.Transitions.strStartOnClick": "Iniciar al hacer clic", + "PE.Views.Transitions.textBlack": "En negro", + "PE.Views.Transitions.textBottom": "Abajo ", + "PE.Views.Transitions.textBottomLeft": "Abajo a la izquierda", + "PE.Views.Transitions.textBottomRight": "Abajo a la derecha", + "PE.Views.Transitions.textClock": "Reloj", + "PE.Views.Transitions.textClockwise": "En el sentido de las agujas del reloj", + "PE.Views.Transitions.textCounterclockwise": "En el sentido contrario a las agujas del reloj", + "PE.Views.Transitions.textCover": "Cubrir", + "PE.Views.Transitions.textFade": "Atenuación", + "PE.Views.Transitions.textHorizontalIn": "Horizontal entrante", + "PE.Views.Transitions.textHorizontalOut": "Horizontal saliente", + "PE.Views.Transitions.textLeft": "A la izquierda", + "PE.Views.Transitions.textNone": "Ninguna", + "PE.Views.Transitions.textPush": "Empuje", + "PE.Views.Transitions.textRight": "A la derecha", + "PE.Views.Transitions.textSmoothly": "Suavemente", + "PE.Views.Transitions.textSplit": "Dividir", + "PE.Views.Transitions.textTop": "Arriba", + "PE.Views.Transitions.textTopLeft": "Arriba a la izquierda", + "PE.Views.Transitions.textTopRight": "Arriba a la derecha", + "PE.Views.Transitions.textUnCover": "Revelar", + "PE.Views.Transitions.textVerticalIn": "Vertical entrante", + "PE.Views.Transitions.textVerticalOut": "Vertical saliente", + "PE.Views.Transitions.textWedge": "Cuña", + "PE.Views.Transitions.textWipe": "Barrer", + "PE.Views.Transitions.textZoom": "Zoom", + "PE.Views.Transitions.textZoomIn": "Acercar", + "PE.Views.Transitions.textZoomOut": "Alejar", + "PE.Views.Transitions.textZoomRotate": "Zoom y giro", + "PE.Views.Transitions.txtApplyToAll": "Aplicar a todas las diapositivas", + "PE.Views.Transitions.txtParameters": "Parámetros", + "PE.Views.Transitions.txtPreview": "Vista previa", + "PE.Views.Transitions.txtSec": "S" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/fi.json b/apps/presentationeditor/main/locale/fi.json index 1ecbb3478..a3daaaf00 100644 --- a/apps/presentationeditor/main/locale/fi.json +++ b/apps/presentationeditor/main/locale/fi.json @@ -5,7 +5,6 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "Sulje", "Common.Controllers.ExternalDiagramEditor.warningText": "Ohjekti ei ole käytössä koska toinen käyttäjä muokkaa sitä.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "Varoitus", - "Common.UI.ColorButton.textNewColor": "Mukautettu väri", "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunuksia", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia", "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä", @@ -881,11 +880,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Tallenna", "PE.Views.FileMenu.btnSettingsCaption": "Laajennetut asetukset...", "PE.Views.FileMenu.btnToEditCaption": "Muokkaa esitystä", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Tyhjästä", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Mallipohjasta", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Luo uusi tyhjä esitys, jossa voit luonnin jälkeen muokata tyylejä ja muotoja. Tai valitse mallipohja esityksen aloittamiseen tietyntyyppistä tarkoitusta varten, jossa muutamia tyylejä on jo käytetty.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Uusi esitys", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ei ole mallipohjia", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Kirjoittaja", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Muuta käyttöoikeuksia", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Sijainti", @@ -1091,63 +1085,28 @@ "PE.Views.SignatureSettings.strSignature": "Allekirjoitus", "PE.Views.SlideSettings.strBackground": "Taustan väri", "PE.Views.SlideSettings.strColor": "Väri", - "PE.Views.SlideSettings.strDelay": "Viive", - "PE.Views.SlideSettings.strDuration": "Kesto", - "PE.Views.SlideSettings.strEffect": "Efekti", "PE.Views.SlideSettings.strFill": "Täytä", "PE.Views.SlideSettings.strForeground": "Etualan väri", "PE.Views.SlideSettings.strPattern": "Kuvio", - "PE.Views.SlideSettings.strStartOnClick": "Aloita klikkauksella", "PE.Views.SlideSettings.textAdvanced": "Näytä laajennetut asetukset", - "PE.Views.SlideSettings.textApplyAll": "Käytä kaikkiin dioihin", - "PE.Views.SlideSettings.textBlack": "Mustan läpi", - "PE.Views.SlideSettings.textBottom": "Alhaalla", - "PE.Views.SlideSettings.textBottomLeft": "Alhaalla vasemmalla", - "PE.Views.SlideSettings.textBottomRight": "Alhaalla oikealla", - "PE.Views.SlideSettings.textClock": "Kello", - "PE.Views.SlideSettings.textClockwise": "Myötäpäivään", "PE.Views.SlideSettings.textColor": "Väritäyttö", - "PE.Views.SlideSettings.textCounterclockwise": "Vastapäivään", - "PE.Views.SlideSettings.textCover": "Kansi", "PE.Views.SlideSettings.textDirection": "Suunta", "PE.Views.SlideSettings.textEmptyPattern": "Ei kuviota", - "PE.Views.SlideSettings.textFade": "Häivytys", "PE.Views.SlideSettings.textFromFile": "Tiedostosta", "PE.Views.SlideSettings.textFromUrl": "URL-osoitteesta", "PE.Views.SlideSettings.textGradient": "Kalteva", "PE.Views.SlideSettings.textGradientFill": "Kalteva täyttö", - "PE.Views.SlideSettings.textHorizontalIn": "Sisään vaakasuoraan", - "PE.Views.SlideSettings.textHorizontalOut": "Ulos vaakasuoraan", "PE.Views.SlideSettings.textImageTexture": "Kuva tai pintarakenne", - "PE.Views.SlideSettings.textLeft": "Vasen", "PE.Views.SlideSettings.textLinear": "Lineaarinen", "PE.Views.SlideSettings.textNoFill": "Ei täyttöä", - "PE.Views.SlideSettings.textNone": "Ei mitään", "PE.Views.SlideSettings.textPatternFill": "Kuvio", - "PE.Views.SlideSettings.textPreview": "Esikatsele", - "PE.Views.SlideSettings.textPush": "Työnnä", "PE.Views.SlideSettings.textRadial": "Säteittäinen", "PE.Views.SlideSettings.textReset": "Aseta uudelleen muutokset", - "PE.Views.SlideSettings.textRight": "Oikea", "PE.Views.SlideSettings.textSelectTexture": "Valitse", - "PE.Views.SlideSettings.textSmoothly": "Pehmeästi", - "PE.Views.SlideSettings.textSplit": "Jaa", "PE.Views.SlideSettings.textStretch": "Venytä", "PE.Views.SlideSettings.textStyle": "Tyyli", "PE.Views.SlideSettings.textTexture": "Pintarakenteesta", "PE.Views.SlideSettings.textTile": "Laatta", - "PE.Views.SlideSettings.textTop": "Yläosa", - "PE.Views.SlideSettings.textTopLeft": "Ylhäällä vasemmalla", - "PE.Views.SlideSettings.textTopRight": "Ylhäällä oikealla", - "PE.Views.SlideSettings.textUnCover": "Paljasta", - "PE.Views.SlideSettings.textVerticalIn": "Pystysuoraan sisällä", - "PE.Views.SlideSettings.textVerticalOut": "Pystysuoraan Ulkona", - "PE.Views.SlideSettings.textWedge": "Kiila", - "PE.Views.SlideSettings.textWipe": "Pyyhkiä", - "PE.Views.SlideSettings.textZoom": "Suurenna", - "PE.Views.SlideSettings.textZoomIn": "Lähennä", - "PE.Views.SlideSettings.textZoomOut": "Loitonna", - "PE.Views.SlideSettings.textZoomRotate": "Suurenna ja Käännä", "PE.Views.SlideSettings.txtBrownPaper": "Ruskea paperi", "PE.Views.SlideSettings.txtCanvas": "Piirtoalusta", "PE.Views.SlideSettings.txtCarton": "Kartonki", @@ -1316,7 +1275,6 @@ "PE.Views.Toolbar.textArrangeFront": "Tuo etupuolelle", "PE.Views.Toolbar.textBold": "Lihavointi", "PE.Views.Toolbar.textItalic": "Kursivoitu", - "PE.Views.Toolbar.textNewColor": "Mukautettu väri", "PE.Views.Toolbar.textShapeAlignBottom": "Tasaa alas", "PE.Views.Toolbar.textShapeAlignCenter": "Keskitä", "PE.Views.Toolbar.textShapeAlignLeft": "Tasaa vasen", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index e06d8a66f..8b8861dbb 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "Ce fichier a été modifié avec une autre application. Vous pouvez continuer à le modifier et l'enregistrer comme une copie.", "Common.Translation.warnFileLockedBtnEdit": "Créer une copie", "Common.Translation.warnFileLockedBtnView": "Ouvrir pour visualisation", - "Common.UI.ColorButton.textAutoColor": "Automatique", - "Common.UI.ColorButton.textNewColor": "Couleur personnalisée", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1300,11 +1298,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Enregistrer une copie comme...", "PE.Views.FileMenu.btnSettingsCaption": "Paramètres avancés...", "PE.Views.FileMenu.btnToEditCaption": "Modifier la présentation", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "D'un blanc", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "D'un modèle", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez une nouvelle présentation vièrge que vous serez en mesure de styliser et de formater après sa création au cours de la modification. Ou choisissez un des modèles où certains styles sont déjà pré-appliqués pour commencer une présentation d'un certain type ou objectif.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouvelle présentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Pas de modèles", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte", @@ -1635,70 +1628,34 @@ "PE.Views.SlideSettings.strBackground": "Couleur d'arrière-plan", "PE.Views.SlideSettings.strColor": "Couleur", "PE.Views.SlideSettings.strDateTime": "Afficher la date et l'heure", - "PE.Views.SlideSettings.strDelay": "Retard", - "PE.Views.SlideSettings.strDuration": "Durée", - "PE.Views.SlideSettings.strEffect": "Effet", "PE.Views.SlideSettings.strFill": "Arrière-plan", "PE.Views.SlideSettings.strForeground": "Couleur de premier plan", "PE.Views.SlideSettings.strPattern": "Modèle", "PE.Views.SlideSettings.strSlideNum": "Afficher le numéro de diapositive", - "PE.Views.SlideSettings.strStartOnClick": "Démarrer en cliquant", "PE.Views.SlideSettings.strTransparency": "Opacité", "PE.Views.SlideSettings.textAdvanced": "Afficher les paramètres avancés", "PE.Views.SlideSettings.textAngle": "Angle", - "PE.Views.SlideSettings.textApplyAll": "Appliquer à toutes les diapositives", - "PE.Views.SlideSettings.textBlack": "A travers le noir", - "PE.Views.SlideSettings.textBottom": "En bas", - "PE.Views.SlideSettings.textBottomLeft": "En bas à gauche", - "PE.Views.SlideSettings.textBottomRight": "En bas à droite", - "PE.Views.SlideSettings.textClock": "Horloge", - "PE.Views.SlideSettings.textClockwise": "Dans le sens des aiguilles d'une montre", "PE.Views.SlideSettings.textColor": "Couleur de remplissage", - "PE.Views.SlideSettings.textCounterclockwise": "Dans le sens inverse des aiguilles d'une montre", - "PE.Views.SlideSettings.textCover": "Couvrir", "PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textEmptyPattern": "Pas de modèles", - "PE.Views.SlideSettings.textFade": "Fondu", "PE.Views.SlideSettings.textFromFile": "D'un fichier", "PE.Views.SlideSettings.textFromStorage": "A partir de l'espace de stockage", "PE.Views.SlideSettings.textFromUrl": "D'une URL", "PE.Views.SlideSettings.textGradient": "Dégradé", "PE.Views.SlideSettings.textGradientFill": "Remplissage en dégradé", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal intérieur", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal extérieur", "PE.Views.SlideSettings.textImageTexture": "Image ou Texture", - "PE.Views.SlideSettings.textLeft": "À gauche", "PE.Views.SlideSettings.textLinear": "Linéaire", "PE.Views.SlideSettings.textNoFill": "Pas de remplissage", - "PE.Views.SlideSettings.textNone": "Rien", "PE.Views.SlideSettings.textPatternFill": "Modèle", "PE.Views.SlideSettings.textPosition": "Position", - "PE.Views.SlideSettings.textPreview": "Aperçu", - "PE.Views.SlideSettings.textPush": "Expulsion", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Annuler modifications", - "PE.Views.SlideSettings.textRight": "A droite", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Sélectionner l'image", "PE.Views.SlideSettings.textSelectTexture": "Sélectionner", - "PE.Views.SlideSettings.textSmoothly": "Transition douce", - "PE.Views.SlideSettings.textSplit": "Diviser", "PE.Views.SlideSettings.textStretch": "Étirement", "PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textTexture": "D'une texture", "PE.Views.SlideSettings.textTile": "Mosaïque", - "PE.Views.SlideSettings.textTop": "En haut", - "PE.Views.SlideSettings.textTopLeft": "En haut à gauche", - "PE.Views.SlideSettings.textTopRight": "En haut à droite", - "PE.Views.SlideSettings.textUnCover": "Découvrir", - "PE.Views.SlideSettings.textVerticalIn": "Vertical intérieur", - "PE.Views.SlideSettings.textVerticalOut": "Vertical extérieur ", - "PE.Views.SlideSettings.textWedge": "Coin", - "PE.Views.SlideSettings.textWipe": "Effacement", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom avant", - "PE.Views.SlideSettings.textZoomOut": "Zoom arrière", - "PE.Views.SlideSettings.textZoomRotate": "Zoom et rotation", "PE.Views.SlideSettings.tipAddGradientPoint": "Ajouter un point de dégradé", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Supprimer le point de dégradé", "PE.Views.SlideSettings.txtBrownPaper": "Papier brun", @@ -1908,7 +1865,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Deux colonnes", "PE.Views.Toolbar.textItalic": "Italique", "PE.Views.Toolbar.textListSettings": "Paramètres de la liste", - "PE.Views.Toolbar.textNewColor": "Couleur personnalisée", "PE.Views.Toolbar.textShapeAlignBottom": "Aligner en bas", "PE.Views.Toolbar.textShapeAlignCenter": "Aligner au centre", "PE.Views.Toolbar.textShapeAlignLeft": "Aligner à gauche", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index d544aad51..d251e1021 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -48,8 +48,6 @@ "Common.define.chartData.textStock": "Részvény", "Common.define.chartData.textSurface": "Felület", "Common.Translation.warnFileLocked": "A fájlt egy másik alkalmazásban szerkesztik. Folytathatja a szerkesztést és elmentheti másolatként.", - "Common.UI.ColorButton.textAutoColor": "Automatikus", - "Common.UI.ColorButton.textNewColor": "Egyéni szín", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -1270,11 +1268,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Másolat mentése mint...", "PE.Views.FileMenu.btnSettingsCaption": "Haladó beállítások...", "PE.Views.FileMenu.btnToEditCaption": "Prezentáció szerkesztése", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Üres fájlból", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Sablonból", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Hozzon létre egy új üres prezentációt, és a szerkesztés során állítsa be stílusát, formátumát. Vagy válasszon egyet a sablonok közül, hogy elindítson egy olyan prezentációt, ahol bizonyos stílusokat már előzetesen beállítottak.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Új bemutató", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nincsenek sablonok", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Alkalmaz", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Szerző hozzáadása", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Szöveg hozzáadása", @@ -1604,70 +1597,34 @@ "PE.Views.SlideSettings.strBackground": "Háttérszín", "PE.Views.SlideSettings.strColor": "Szín", "PE.Views.SlideSettings.strDateTime": "Dátum és idő megjelenítése", - "PE.Views.SlideSettings.strDelay": "Várakozás", - "PE.Views.SlideSettings.strDuration": "Időtartam", - "PE.Views.SlideSettings.strEffect": "Effekt", "PE.Views.SlideSettings.strFill": "Háttér", "PE.Views.SlideSettings.strForeground": "Előtér színe", "PE.Views.SlideSettings.strPattern": "Minta", "PE.Views.SlideSettings.strSlideNum": "Dia számának mutatása", - "PE.Views.SlideSettings.strStartOnClick": "Kattintásra elindít", "PE.Views.SlideSettings.strTransparency": "Átlátszóság", "PE.Views.SlideSettings.textAdvanced": "Speciális beállítások megjelenítése", "PE.Views.SlideSettings.textAngle": "Szög", - "PE.Views.SlideSettings.textApplyAll": "Minden diára alkalmaz", - "PE.Views.SlideSettings.textBlack": "Fekete", - "PE.Views.SlideSettings.textBottom": "Alsó", - "PE.Views.SlideSettings.textBottomLeft": "Alul bal oldalt", - "PE.Views.SlideSettings.textBottomRight": "Jobb alsó", - "PE.Views.SlideSettings.textClock": "Óra", - "PE.Views.SlideSettings.textClockwise": "Óramutató járásával megegyezően", "PE.Views.SlideSettings.textColor": "Szín kitöltés", - "PE.Views.SlideSettings.textCounterclockwise": "Óramutató járásával ellenkezően", - "PE.Views.SlideSettings.textCover": "Fed", "PE.Views.SlideSettings.textDirection": "Irány", "PE.Views.SlideSettings.textEmptyPattern": "Nincs minta", - "PE.Views.SlideSettings.textFade": "Áttűnés", "PE.Views.SlideSettings.textFromFile": "Fájlból", "PE.Views.SlideSettings.textFromStorage": "Tárolóból", "PE.Views.SlideSettings.textFromUrl": "URL-ből", "PE.Views.SlideSettings.textGradient": "Színátmeneti pontok", "PE.Views.SlideSettings.textGradientFill": "Színátmenetes kitöltés", - "PE.Views.SlideSettings.textHorizontalIn": "Vízszintesen belül", - "PE.Views.SlideSettings.textHorizontalOut": "Vízszintesen kívül", "PE.Views.SlideSettings.textImageTexture": "Kép vagy textúra", - "PE.Views.SlideSettings.textLeft": "Bal", "PE.Views.SlideSettings.textLinear": "Egyenes", "PE.Views.SlideSettings.textNoFill": "Nincs kitöltés", - "PE.Views.SlideSettings.textNone": "nincs", "PE.Views.SlideSettings.textPatternFill": "Minta", "PE.Views.SlideSettings.textPosition": "Pozíció", - "PE.Views.SlideSettings.textPreview": "Előnézet", - "PE.Views.SlideSettings.textPush": "Nyom", "PE.Views.SlideSettings.textRadial": "Sugárirányú", "PE.Views.SlideSettings.textReset": "Változások visszaállítása", - "PE.Views.SlideSettings.textRight": "Jobb", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Kép kiválasztása", "PE.Views.SlideSettings.textSelectTexture": "Kiválaszt", - "PE.Views.SlideSettings.textSmoothly": "Simán", - "PE.Views.SlideSettings.textSplit": "Szétválaszt", "PE.Views.SlideSettings.textStretch": "Nyújt", "PE.Views.SlideSettings.textStyle": "Stílus", "PE.Views.SlideSettings.textTexture": "Textúrából", "PE.Views.SlideSettings.textTile": "Csempe", - "PE.Views.SlideSettings.textTop": "Felső", - "PE.Views.SlideSettings.textTopLeft": "Bal fent", - "PE.Views.SlideSettings.textTopRight": "Jobb fent", - "PE.Views.SlideSettings.textUnCover": "Felfed", - "PE.Views.SlideSettings.textVerticalIn": "Függőlegesen befele", - "PE.Views.SlideSettings.textVerticalOut": "Függőlegesen kifele", - "PE.Views.SlideSettings.textWedge": "Beékel", - "PE.Views.SlideSettings.textWipe": "Töröl", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom be", - "PE.Views.SlideSettings.textZoomOut": "Zoom ki", - "PE.Views.SlideSettings.textZoomRotate": "Zoom és elforgatás", "PE.Views.SlideSettings.tipAddGradientPoint": "Színátmenet pont hozzáadása", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Színátmenet pont eltávolítása", "PE.Views.SlideSettings.txtBrownPaper": "Barna papír", @@ -1877,7 +1834,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Két oszlop", "PE.Views.Toolbar.textItalic": "Dőlt", "PE.Views.Toolbar.textListSettings": "Lista beállítások", - "PE.Views.Toolbar.textNewColor": "Új egyéni szín hozzáadása", "PE.Views.Toolbar.textShapeAlignBottom": "Alulra rendez", "PE.Views.Toolbar.textShapeAlignCenter": "Középre rendez", "PE.Views.Toolbar.textShapeAlignLeft": "Balra rendez", diff --git a/apps/presentationeditor/main/locale/id.json b/apps/presentationeditor/main/locale/id.json index 28aa4d19d..83fcbb63a 100644 --- a/apps/presentationeditor/main/locale/id.json +++ b/apps/presentationeditor/main/locale/id.json @@ -304,11 +304,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Save", "PE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "PE.Views.FileMenu.btnToEditCaption": "Edit Presentation", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank presentation which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a presentation of a certain type or purpose where some styles have already been pre-applied.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Presentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location", @@ -489,63 +484,28 @@ "PE.Views.ShapeSettingsAdvanced.txtNone": "None", "PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strColor": "Color", - "PE.Views.SlideSettings.strDelay": "Delay", - "PE.Views.SlideSettings.strDuration": "Duration", - "PE.Views.SlideSettings.strEffect": "Effect", "PE.Views.SlideSettings.strFill": "Fill", "PE.Views.SlideSettings.strForeground": "Foreground color", "PE.Views.SlideSettings.strPattern": "Pattern", - "PE.Views.SlideSettings.strStartOnClick": "Start On Click", "PE.Views.SlideSettings.textAdvanced": "Show advanced settings", - "PE.Views.SlideSettings.textApplyAll": "Apply to All Slides", - "PE.Views.SlideSettings.textBlack": "Through Black", - "PE.Views.SlideSettings.textBottom": "Bottom", - "PE.Views.SlideSettings.textBottomLeft": "Bottom Left", - "PE.Views.SlideSettings.textBottomRight": "Bottom Right", - "PE.Views.SlideSettings.textClock": "Clock", - "PE.Views.SlideSettings.textClockwise": "Clockwise", "PE.Views.SlideSettings.textColor": "Color Fill", - "PE.Views.SlideSettings.textCounterclockwise": "Counterclockwise", - "PE.Views.SlideSettings.textCover": "Cover", "PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textEmptyPattern": "No Pattern", - "PE.Views.SlideSettings.textFade": "Fade", "PE.Views.SlideSettings.textFromFile": "From File", "PE.Views.SlideSettings.textFromUrl": "From URL", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "Gradient Fill", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal In", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal Out", "PE.Views.SlideSettings.textImageTexture": "Picture or Texture", - "PE.Views.SlideSettings.textLeft": "Left", "PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textNoFill": "No Fill", - "PE.Views.SlideSettings.textNone": "None", "PE.Views.SlideSettings.textPatternFill": "Pattern", - "PE.Views.SlideSettings.textPreview": "Preview", - "PE.Views.SlideSettings.textPush": "Push", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Reset Changes", - "PE.Views.SlideSettings.textRight": "Right", "PE.Views.SlideSettings.textSelectTexture": "Select", - "PE.Views.SlideSettings.textSmoothly": "Smoothly", - "PE.Views.SlideSettings.textSplit": "Split", "PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textTexture": "From Texture", "PE.Views.SlideSettings.textTile": "Tile", - "PE.Views.SlideSettings.textTop": "Top", - "PE.Views.SlideSettings.textTopLeft": "Top Left", - "PE.Views.SlideSettings.textTopRight": "Top Right", - "PE.Views.SlideSettings.textUnCover": "Uncover", - "PE.Views.SlideSettings.textVerticalIn": "Vertical In", - "PE.Views.SlideSettings.textVerticalOut": "Vertical Out", - "PE.Views.SlideSettings.textWedge": "Wedge", - "PE.Views.SlideSettings.textWipe": "Wipe", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom In", - "PE.Views.SlideSettings.textZoomOut": "Zoom Out", - "PE.Views.SlideSettings.textZoomRotate": "Zoom and Rotate", "PE.Views.SlideSettings.txtBrownPaper": "Brown Paper", "PE.Views.SlideSettings.txtCanvas": "Canvas", "PE.Views.SlideSettings.txtCarton": "Carton", @@ -690,7 +650,6 @@ "PE.Views.Toolbar.textArrangeFront": "Bring To Foreground", "PE.Views.Toolbar.textBold": "Bold", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textNewColor": "Custom Color", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index 1a63d41b9..66dbf05ef 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -50,8 +50,8 @@ "Common.Translation.warnFileLocked": "Il file è in fase di modifica in un'altra applicazione. Puoi continuare a modificarlo e salvarlo come copia.", "Common.Translation.warnFileLockedBtnEdit": "Crea una copia", "Common.Translation.warnFileLockedBtnView": "‎Aperto per la visualizzazione‎", - "Common.UI.ColorButton.textAutoColor": "Automatico", - "Common.UI.ColorButton.textNewColor": "Aggiungi Colore personalizzato", + "Common.UI.ButtonColored.textAutoColor": "Automatico", + "Common.UI.ButtonColored.textNewColor": "Aggiungere un nuovo colore personalizzato", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -124,6 +124,10 @@ "Common.Views.AutoCorrectDialog.warnReset": "Qualsiasi auto correzione automatica aggiunta verrà rimossa e quelle modificate verranno ripristinate ai valori originali. Vuoi continuare?", "Common.Views.AutoCorrectDialog.warnRestore": "La voce di correzione automatica per %1 verrà reimpostata al valore originale. Vuoi continuare?", "Common.Views.Chat.textSend": "Invia", + "Common.Views.Comments.mniAuthorAsc": "Autore dalla A alla Z", + "Common.Views.Comments.mniAuthorDesc": "Autore dalla Z alla A", + "Common.Views.Comments.mniPositionAsc": "Dall'alto", + "Common.Views.Comments.mniPositionDesc": "Dal basso", "Common.Views.Comments.textAdd": "Aggiungi", "Common.Views.Comments.textAddComment": "Aggiungi commento", "Common.Views.Comments.textAddCommentToDoc": "Aggiungi commento al documento", @@ -131,6 +135,7 @@ "Common.Views.Comments.textAnonym": "Ospite", "Common.Views.Comments.textCancel": "Annulla", "Common.Views.Comments.textClose": "Chiudi", + "Common.Views.Comments.textClosePanel": "Chiudere commenti", "Common.Views.Comments.textComments": "Commenti", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Inserisci commento qui", @@ -444,12 +449,14 @@ "PE.Controllers.Main.splitMaxColsErrorText": "Il numero di colonne deve essere inferiore a %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Il numero di righe deve essere inferiore a %1.", "PE.Controllers.Main.textAnonymous": "Anonimo", + "PE.Controllers.Main.textApplyAll": "Applicare a tutte le equazioni", "PE.Controllers.Main.textBuyNow": "Visita il sito web", "PE.Controllers.Main.textChangesSaved": "Tutte le modifiche sono state salvate", "PE.Controllers.Main.textClose": "Chiudi", "PE.Controllers.Main.textCloseTip": "Fai clic per chiudere il consiglio", "PE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", "PE.Controllers.Main.textCustomLoader": "Si prega di notare che, in base ai termini della licenza, non si ha il diritto di modificare il caricatore.
    Si prega di contattare il nostro reparto vendite per ottenere un preventivo.", + "PE.Controllers.Main.textDisconnect": "Connessione persa", "PE.Controllers.Main.textGuest": "Ospite", "PE.Controllers.Main.textHasMacros": "Il file contiene macro automatiche.
    Vuoi eseguire le macro?", "PE.Controllers.Main.textLoadingDocument": "Caricamento della presentazione", @@ -1300,11 +1307,8 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Salva copia come...", "PE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "PE.Views.FileMenu.btnToEditCaption": "Modifica presentazione", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Da vuoto", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Da modello", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea una nuova presentazione vuota che si potrà modellare e formattare dopo che è stata creata durante la modifica. Oppure sceglere uno dei modelli per iniziare una presentazione di un certo tipo o scopo in cui alcuni stili sono già stati preapplicati.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuova presentazione", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nessun modello", + "PE.Views.FileMenuPanels.CreateNew.txtBlank": "Presentazione vuota", + "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Crea nuovo", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", @@ -1635,70 +1639,34 @@ "PE.Views.SlideSettings.strBackground": "Colore sfondo", "PE.Views.SlideSettings.strColor": "Colore", "PE.Views.SlideSettings.strDateTime": "Visualizza Data e Ora", - "PE.Views.SlideSettings.strDelay": "Ritardo", - "PE.Views.SlideSettings.strDuration": "Durata", - "PE.Views.SlideSettings.strEffect": "Effetto", "PE.Views.SlideSettings.strFill": "Sfondo", "PE.Views.SlideSettings.strForeground": "Colore primo piano", "PE.Views.SlideSettings.strPattern": "Modello", "PE.Views.SlideSettings.strSlideNum": "Mostra numero diapositiva", - "PE.Views.SlideSettings.strStartOnClick": "Inizia al clic del mouse", "PE.Views.SlideSettings.strTransparency": "Opacità", "PE.Views.SlideSettings.textAdvanced": "Mostra impostazioni avanzate", "PE.Views.SlideSettings.textAngle": "Angolo", - "PE.Views.SlideSettings.textApplyAll": "Applica a tutte le diapositive", - "PE.Views.SlideSettings.textBlack": "Attraverso il nero", - "PE.Views.SlideSettings.textBottom": "In basso", - "PE.Views.SlideSettings.textBottomLeft": "In basso a sinistra", - "PE.Views.SlideSettings.textBottomRight": "In basso a destra", - "PE.Views.SlideSettings.textClock": "Orologio", - "PE.Views.SlideSettings.textClockwise": "In senso orario", "PE.Views.SlideSettings.textColor": "Colore di riempimento", - "PE.Views.SlideSettings.textCounterclockwise": "In senso antiorario", - "PE.Views.SlideSettings.textCover": "Copri", "PE.Views.SlideSettings.textDirection": "Direzione", "PE.Views.SlideSettings.textEmptyPattern": "Nessun modello", - "PE.Views.SlideSettings.textFade": "Dissolvenza", "PE.Views.SlideSettings.textFromFile": "Da file", "PE.Views.SlideSettings.textFromStorage": "Da spazio di archiviazione", "PE.Views.SlideSettings.textFromUrl": "Da URL", "PE.Views.SlideSettings.textGradient": "Sfumatura", "PE.Views.SlideSettings.textGradientFill": "Riempimento sfumato", - "PE.Views.SlideSettings.textHorizontalIn": "Avanti orizzontale", - "PE.Views.SlideSettings.textHorizontalOut": "Indietro orizzontale", "PE.Views.SlideSettings.textImageTexture": "Immagine o trama", - "PE.Views.SlideSettings.textLeft": "A sinistra", "PE.Views.SlideSettings.textLinear": "Lineare", "PE.Views.SlideSettings.textNoFill": "Nessun riempimento", - "PE.Views.SlideSettings.textNone": "Niente", "PE.Views.SlideSettings.textPatternFill": "Modello", "PE.Views.SlideSettings.textPosition": "Posizione", - "PE.Views.SlideSettings.textPreview": "Anteprima", - "PE.Views.SlideSettings.textPush": "Spinta", "PE.Views.SlideSettings.textRadial": "Radiale", "PE.Views.SlideSettings.textReset": "Reimposta modifiche", - "PE.Views.SlideSettings.textRight": "A destra", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Seleziona immagine", "PE.Views.SlideSettings.textSelectTexture": "Seleziona", - "PE.Views.SlideSettings.textSmoothly": "Sfumatura", - "PE.Views.SlideSettings.textSplit": "Dividi", "PE.Views.SlideSettings.textStretch": "Estendi", "PE.Views.SlideSettings.textStyle": "Stile", "PE.Views.SlideSettings.textTexture": "Da trama", "PE.Views.SlideSettings.textTile": "Tela", - "PE.Views.SlideSettings.textTop": "In alto", - "PE.Views.SlideSettings.textTopLeft": "In alto a sinistra", - "PE.Views.SlideSettings.textTopRight": "In alto a destra", - "PE.Views.SlideSettings.textUnCover": "Scopri", - "PE.Views.SlideSettings.textVerticalIn": "Avanti verticale", - "PE.Views.SlideSettings.textVerticalOut": "Indietro verticale", - "PE.Views.SlideSettings.textWedge": "Porzione", - "PE.Views.SlideSettings.textWipe": "Tendina", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom avanti", - "PE.Views.SlideSettings.textZoomOut": "Zoom indietro", - "PE.Views.SlideSettings.textZoomRotate": "Zoom e rotazione", "PE.Views.SlideSettings.tipAddGradientPoint": "‎Aggiungi punto di sfumatura‎", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Rimuovi punto sfumatura", "PE.Views.SlideSettings.txtBrownPaper": "Carta da pacchi", @@ -1908,7 +1876,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Due colonne", "PE.Views.Toolbar.textItalic": "Corsivo", "PE.Views.Toolbar.textListSettings": "Impostazioni elenco", - "PE.Views.Toolbar.textNewColor": "Aggiungi Colore personalizzato", "PE.Views.Toolbar.textShapeAlignBottom": "Allinea in basso", "PE.Views.Toolbar.textShapeAlignCenter": "Allinea al centro", "PE.Views.Toolbar.textShapeAlignLeft": "Allinea a sinistra", @@ -2005,5 +1972,21 @@ "PE.Views.Toolbar.txtScheme8": "Flusso", "PE.Views.Toolbar.txtScheme9": "Galassia", "PE.Views.Toolbar.txtSlideAlign": "Allinea alla diapositiva", - "PE.Views.Toolbar.txtUngroup": "Separa" + "PE.Views.Toolbar.txtUngroup": "Separa", + "PE.Views.Transitions.strDelay": "Ritardo", + "PE.Views.Transitions.strDuration": "Durata", + "PE.Views.Transitions.textBottom": "In basso", + "PE.Views.Transitions.textBottomLeft": "In basso a sinistra", + "PE.Views.Transitions.textBottomRight": "In basso a destra", + "PE.Views.Transitions.textClock": "Orologio", + "PE.Views.Transitions.textClockwise": "In senso orario", + "PE.Views.Transitions.textCounterclockwise": "In senso antiorario", + "PE.Views.Transitions.textCover": "Copertina", + "PE.Views.Transitions.textFade": "Dissolvenza", + "PE.Views.Transitions.textZoom": "Zoomare", + "PE.Views.Transitions.textZoomIn": "Ingrandire", + "PE.Views.Transitions.textZoomOut": "Rimpicciolire", + "PE.Views.Transitions.textZoomRotate": "Zoomare e Ruotare", + "PE.Views.Transitions.txtApplyToAll": "Applicare a tutte le diapositive", + "PE.Views.Transitions.txtSec": "s" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 246368f54..817918c4e 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -48,8 +48,6 @@ "Common.define.chartData.textSurface": "表面", "Common.Translation.warnFileLocked": "文書が別のアプリで使用されています。編集を続けて、コピーとして保存できます。", "Common.Translation.warnFileLockedBtnEdit": "コピーを作成", - "Common.UI.ColorButton.textAutoColor": "自動", - "Common.UI.ColorButton.textNewColor": "ユーザー設定の色の追加", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -1295,11 +1293,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "別名で保存...", "PE.Views.FileMenu.btnSettingsCaption": "詳細設定...", "PE.Views.FileMenu.btnToEditCaption": "プレゼンテーションの編集", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "空白から", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "テンプレートから", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "編集の間スタイルを適用し、フォルマットすることができる新しい空白のプレゼンテーションを作成します。または特定の種類や目的のプレゼンテーションを開始するためにすでにスタイルを適用したテンプレートを選択してください。", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "新しいプレゼンテーション", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "テンプレートなし", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "適用する", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "著者を追加する", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "テキストの追加", @@ -1630,70 +1623,34 @@ "PE.Views.SlideSettings.strBackground": "背景色", "PE.Views.SlideSettings.strColor": "色", "PE.Views.SlideSettings.strDateTime": "日付と時刻を表示", - "PE.Views.SlideSettings.strDelay": "遅延", - "PE.Views.SlideSettings.strDuration": "期間", - "PE.Views.SlideSettings.strEffect": "結果", "PE.Views.SlideSettings.strFill": "塗りつぶし", "PE.Views.SlideSettings.strForeground": "前景色", "PE.Views.SlideSettings.strPattern": "パターン", "PE.Views.SlideSettings.strSlideNum": "スライド番号を表示", - "PE.Views.SlideSettings.strStartOnClick": "クリック時", "PE.Views.SlideSettings.strTransparency": "不透明度", "PE.Views.SlideSettings.textAdvanced": "詳細設定の表示", "PE.Views.SlideSettings.textAngle": "角", - "PE.Views.SlideSettings.textApplyAll": "すべてのスライドに適用", - "PE.Views.SlideSettings.textBlack": "黒色を使う", - "PE.Views.SlideSettings.textBottom": "下", - "PE.Views.SlideSettings.textBottomLeft": "左下", - "PE.Views.SlideSettings.textBottomRight": "右下", - "PE.Views.SlideSettings.textClock": "時計", - "PE.Views.SlideSettings.textClockwise": "時計回り", "PE.Views.SlideSettings.textColor": "色での塗りつぶし", - "PE.Views.SlideSettings.textCounterclockwise": "反時計回り", - "PE.Views.SlideSettings.textCover": "カバー", "PE.Views.SlideSettings.textDirection": "方向", "PE.Views.SlideSettings.textEmptyPattern": "パターンなし", - "PE.Views.SlideSettings.textFade": "フェード", "PE.Views.SlideSettings.textFromFile": " ファイルから", "PE.Views.SlideSettings.textFromStorage": "ストレージから", "PE.Views.SlideSettings.textFromUrl": "URLから", "PE.Views.SlideSettings.textGradient": "グラデーション", "PE.Views.SlideSettings.textGradientFill": "塗りつぶし (グラデーション)", - "PE.Views.SlideSettings.textHorizontalIn": "水平（中）", - "PE.Views.SlideSettings.textHorizontalOut": "水平（外）", "PE.Views.SlideSettings.textImageTexture": "画像またはテクスチャ", - "PE.Views.SlideSettings.textLeft": "左", "PE.Views.SlideSettings.textLinear": "線形", "PE.Views.SlideSettings.textNoFill": "塗りつぶしなし", - "PE.Views.SlideSettings.textNone": "なし", "PE.Views.SlideSettings.textPatternFill": "パターン", "PE.Views.SlideSettings.textPosition": "位置", - "PE.Views.SlideSettings.textPreview": "プレビュー", - "PE.Views.SlideSettings.textPush": "プッシュ", "PE.Views.SlideSettings.textRadial": "放射状", "PE.Views.SlideSettings.textReset": "変更をリセットします", - "PE.Views.SlideSettings.textRight": "右に", - "PE.Views.SlideSettings.textSec": "分", "PE.Views.SlideSettings.textSelectImage": "画像の選択", "PE.Views.SlideSettings.textSelectTexture": "選択", - "PE.Views.SlideSettings.textSmoothly": "スムース", - "PE.Views.SlideSettings.textSplit": "分割", "PE.Views.SlideSettings.textStretch": "ストレッチ", "PE.Views.SlideSettings.textStyle": "スタイル", "PE.Views.SlideSettings.textTexture": "テクスチャから", "PE.Views.SlideSettings.textTile": "タイル", - "PE.Views.SlideSettings.textTop": "トップ", - "PE.Views.SlideSettings.textTopLeft": "左上", - "PE.Views.SlideSettings.textTopRight": "右上", - "PE.Views.SlideSettings.textUnCover": "アンカバー", - "PE.Views.SlideSettings.textVerticalIn": "縦（中）", - "PE.Views.SlideSettings.textVerticalOut": "縦（外）", - "PE.Views.SlideSettings.textWedge": "くさび形", - "PE.Views.SlideSettings.textWipe": "ワイプ", - "PE.Views.SlideSettings.textZoom": "ズーム", - "PE.Views.SlideSettings.textZoomIn": "拡大", - "PE.Views.SlideSettings.textZoomOut": "縮小", - "PE.Views.SlideSettings.textZoomRotate": "ズームと回転", "PE.Views.SlideSettings.tipAddGradientPoint": "グラデーションポイントを追加する", "PE.Views.SlideSettings.tipRemoveGradientPoint": "グラデーションポイントを削除する", "PE.Views.SlideSettings.txtBrownPaper": "クラフト紙", @@ -1903,7 +1860,6 @@ "PE.Views.Toolbar.textColumnsTwo": "2列", "PE.Views.Toolbar.textItalic": "斜体", "PE.Views.Toolbar.textListSettings": "リストの設定", - "PE.Views.Toolbar.textNewColor": "ユーザー設定の色", "PE.Views.Toolbar.textShapeAlignBottom": "下揃え", "PE.Views.Toolbar.textShapeAlignCenter": "中央揃え\t", "PE.Views.Toolbar.textShapeAlignLeft": "左揃え", diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index fce65d179..92c8716f5 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -5,7 +5,6 @@ "Common.Controllers.ExternalDiagramEditor.textClose": "닫기", "Common.Controllers.ExternalDiagramEditor.warningText": "다른 사용자가 편집 중이므로 개체를 사용할 수 없습니다.", "Common.Controllers.ExternalDiagramEditor.warningTitle": "경고", - "Common.UI.ColorButton.textNewColor": "사용자 정의 색상", "Common.UI.ComboBorderSize.txtNoBorders": "테두리 없음", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "테두리 없음", "Common.UI.ComboDataView.emptyComboText": "스타일 없음", @@ -903,11 +902,6 @@ "PE.Views.FileMenu.btnSaveCaption": "저장", "PE.Views.FileMenu.btnSettingsCaption": "고급 설정 ...", "PE.Views.FileMenu.btnToEditCaption": "프리젠 테이션 편집", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "빈칸에서부터", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "템플릿에서", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "편집 중에 스타일을 지정하고 서식을 지정할 수있는 빈 프레젠테이션을 새로 만듭니다. 또는 템플릿 중 하나를 선택하여 특정 유형의 프레젠테이션을 시작하거나 일부 스타일이 미리 적용된 목적 ", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "새 프레젠테이션", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "템플릿이 없습니다", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "작성자", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "액세스 권한 변경", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "위치", @@ -1136,64 +1130,28 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "프리젠테이션내 몇가지 디지털 서명이 유효하지 않거나 확인되지 않음. 이 프리젠테이션은 편집할 수 없도록 보호됨.", "PE.Views.SlideSettings.strBackground": "배경색", "PE.Views.SlideSettings.strColor": "Color", - "PE.Views.SlideSettings.strDelay": "지연", - "PE.Views.SlideSettings.strDuration": "재생 시간", - "PE.Views.SlideSettings.strEffect": "효과", "PE.Views.SlideSettings.strFill": "배경", "PE.Views.SlideSettings.strForeground": "전경색", "PE.Views.SlideSettings.strPattern": "패턴", - "PE.Views.SlideSettings.strStartOnClick": "시작시 클릭", "PE.Views.SlideSettings.textAdvanced": "고급 설정 표시", - "PE.Views.SlideSettings.textApplyAll": "모든 슬라이드에 적용", - "PE.Views.SlideSettings.textBlack": "검은 색을 통해", - "PE.Views.SlideSettings.textBottom": "Bottom", - "PE.Views.SlideSettings.textBottomLeft": "왼쪽 하단", - "PE.Views.SlideSettings.textBottomRight": "오른쪽 하단", - "PE.Views.SlideSettings.textClock": "시계", - "PE.Views.SlideSettings.textClockwise": "시계 방향", "PE.Views.SlideSettings.textColor": "색상 채우기", - "PE.Views.SlideSettings.textCounterclockwise": "반 시계 방향", - "PE.Views.SlideSettings.textCover": "표지", "PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textEmptyPattern": "패턴 없음", - "PE.Views.SlideSettings.textFade": "페이드", "PE.Views.SlideSettings.textFromFile": "파일로부터", "PE.Views.SlideSettings.textFromUrl": "URL로부터", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "그라데이션 채우기", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal In", - "PE.Views.SlideSettings.textHorizontalOut": "수평 출력", "PE.Views.SlideSettings.textImageTexture": "그림 또는 질감", - "PE.Views.SlideSettings.textLeft": "왼쪽", "PE.Views.SlideSettings.textLinear": "선형", "PE.Views.SlideSettings.textNoFill": "채우기 없음", - "PE.Views.SlideSettings.textNone": "없음", "PE.Views.SlideSettings.textPatternFill": "패턴", - "PE.Views.SlideSettings.textPreview": "미리보기", - "PE.Views.SlideSettings.textPush": "푸시", "PE.Views.SlideSettings.textRadial": "방사형", "PE.Views.SlideSettings.textReset": "변경 사항 재설정", - "PE.Views.SlideSettings.textRight": "오른쪽", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "선택", - "PE.Views.SlideSettings.textSmoothly": "부드럽게", - "PE.Views.SlideSettings.textSplit": "분할", "PE.Views.SlideSettings.textStretch": "늘이기", "PE.Views.SlideSettings.textStyle": "스타일", "PE.Views.SlideSettings.textTexture": "텍스처에서", "PE.Views.SlideSettings.textTile": "타일", - "PE.Views.SlideSettings.textTop": "Top", - "PE.Views.SlideSettings.textTopLeft": "왼쪽 상단", - "PE.Views.SlideSettings.textTopRight": "오른쪽 상단", - "PE.Views.SlideSettings.textUnCover": "언 커버", - "PE.Views.SlideSettings.textVerticalIn": "수직 인치", - "PE.Views.SlideSettings.textVerticalOut": "수직 출력", - "PE.Views.SlideSettings.textWedge": "Wedge", - "PE.Views.SlideSettings.textWipe": "닦아내 기", - "PE.Views.SlideSettings.textZoom": "확대 / 축소", - "PE.Views.SlideSettings.textZoomIn": "확대", - "PE.Views.SlideSettings.textZoomOut": "축소", - "PE.Views.SlideSettings.textZoomRotate": "확대 / 축소 및 회전", "PE.Views.SlideSettings.txtBrownPaper": "갈색 종이", "PE.Views.SlideSettings.txtCanvas": "Canvas", "PE.Views.SlideSettings.txtCarton": "Carton", @@ -1366,7 +1324,6 @@ "PE.Views.Toolbar.textArrangeFront": "전경으로 가져 오기", "PE.Views.Toolbar.textBold": "Bold", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textNewColor": "사용자 정의 색상", "PE.Views.Toolbar.textShapeAlignBottom": "아래쪽 정렬", "PE.Views.Toolbar.textShapeAlignCenter": "정렬 중심", "PE.Views.Toolbar.textShapeAlignLeft": "왼쪽 정렬", diff --git a/apps/presentationeditor/main/locale/lo.json b/apps/presentationeditor/main/locale/lo.json index 5560d5fad..786ca4d6b 100644 --- a/apps/presentationeditor/main/locale/lo.json +++ b/apps/presentationeditor/main/locale/lo.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "ແຟ້ມ ກຳ ລັງຖືກດັດແກ້ຢູ່ໃນແອັບ ອື່ນ. ທ່ານສາມາດສືບຕໍ່ດັດແກ້ແລະບັນທຶກເປັນ ສຳ ເນົາ", "Common.Translation.warnFileLockedBtnEdit": "ສ້າງສຳເນົາ", "Common.Translation.warnFileLockedBtnView": "ເປີດເບິ່ງ", - "Common.UI.ColorButton.textAutoColor": "ອັດຕະໂນມັດ", - "Common.UI.ColorButton.textNewColor": "ເພີມສີທີ່ກຳນົດເອງໃໝ່", "Common.UI.ComboBorderSize.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboDataView.emptyComboText": "ບໍ່ມີຮູບແບບ", @@ -1292,11 +1290,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "ບັນທຶກສຳເນົາເປັນ...", "PE.Views.FileMenu.btnSettingsCaption": "ຕັ້ງ​ຄ່າ​ຂັ້ນ​ສູງ...", "PE.Views.FileMenu.btnToEditCaption": "ແກ້ໄຂບົດນຳສະເໜີ", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "ຈາກບ່ອນວ່າງ", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "ຈາກແມ່ແບບ", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "ສ້າງການນຳ ສະ ເໜີ ເປົ່າວ່າງໃໝ່ ທີ່ທ່ານຈະສາມາດອອກແບບແລະຮູບແບບຫຼັງຈາກມັນຖືກສ້າງຂື້ນໃນລະຫວ່າງການດັດແກ້. ຫຼືເລືອກ ໜຶ່ງ ຂອງແມ່ແບບເພື່ອເລີ່ມຕົ້ນການ ນຳ ສະ ເໜີ ປະເພດໃດ ໜຶ່ງ ຫຼືຈຸດປະສົງໃດ ໜຶ່ງ ທີ່ບາງຮູບແບບໄດ້ ນຳ ໃຊ້ມາກ່ອນແລ້ວ.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "ບົດນຳສະເໜີໃໝ່", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "ບໍ່ມີແມ່ແບບ", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "ໃຊ້", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "ເພີ່ມຜູ້ຂຽນ", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "ເພີ່ມຂໍ້ຄວາມ", @@ -1627,70 +1620,34 @@ "PE.Views.SlideSettings.strBackground": "ສີພື້ນຫຼັງ", "PE.Views.SlideSettings.strColor": "ສີ", "PE.Views.SlideSettings.strDateTime": "ສະເເດງວັນືທີ ແລະ ເວລາ", - "PE.Views.SlideSettings.strDelay": "ລ້າຊ້າ, ເລື່ອນ", - "PE.Views.SlideSettings.strDuration": "ໄລຍະ", - "PE.Views.SlideSettings.strEffect": "ຜົນ, ຜົນເສຍ", "PE.Views.SlideSettings.strFill": "ພື້ນຫຼັງ", "PE.Views.SlideSettings.strForeground": "ສີໜ້າຈໍ", "PE.Views.SlideSettings.strPattern": "ຮູບແບບ", "PE.Views.SlideSettings.strSlideNum": "ສະແດງຕົວເລກສະໄລ", - "PE.Views.SlideSettings.strStartOnClick": "ເລີ່ມຕົ້ນກົດ", "PE.Views.SlideSettings.strTransparency": "ຄວາມເຂັ້ມ", "PE.Views.SlideSettings.textAdvanced": "ສະແດງການຕັ້ງຄ່າຂັ້ນສູງ", "PE.Views.SlideSettings.textAngle": "ຫລ່ຽມ", - "PE.Views.SlideSettings.textApplyAll": "ນຳໃຊ້ກັບທຸກໆແຜ່ນສະໄລ້", - "PE.Views.SlideSettings.textBlack": "ຜ່ານສີດຳ", - "PE.Views.SlideSettings.textBottom": "ລຸ່ມສຸດ", - "PE.Views.SlideSettings.textBottomLeft": "ປູ່ມດ້ານຊ້າຍ", - "PE.Views.SlideSettings.textBottomRight": "ລຸ່ມດ້ານຂວາ", - "PE.Views.SlideSettings.textClock": "ໂມງ", - "PE.Views.SlideSettings.textClockwise": "ການໝຸນຂອງເຂັມໂມງ", "PE.Views.SlideSettings.textColor": "ເຕີມສີ", - "PE.Views.SlideSettings.textCounterclockwise": "ໝຸນກັບຄືນ", - "PE.Views.SlideSettings.textCover": "ໜ້າປົກ", "PE.Views.SlideSettings.textDirection": "ທິດທາງ", "PE.Views.SlideSettings.textEmptyPattern": "ບໍ່ມີແບບຮູບ", - "PE.Views.SlideSettings.textFade": "ເລື່ອນ, ເລື່ອນຫາຍໄປ", "PE.Views.SlideSettings.textFromFile": "ຈາກຟາຍ", "PE.Views.SlideSettings.textFromStorage": "ຈາກບ່ອນເກັບ", "PE.Views.SlideSettings.textFromUrl": "ຈາກ URL", "PE.Views.SlideSettings.textGradient": "ຈຸດໆ Gradient", "PE.Views.SlideSettings.textGradientFill": "ລາດສີ", - "PE.Views.SlideSettings.textHorizontalIn": "ລວງນອນທາງໃນ", - "PE.Views.SlideSettings.textHorizontalOut": "ລວງນອນທາງນອກ", "PE.Views.SlideSettings.textImageTexture": "ຮູບພາບ ຫລື ພື້ນ ", - "PE.Views.SlideSettings.textLeft": "ຊ້າຍ", "PE.Views.SlideSettings.textLinear": "ເສັ້ນຊື່", "PE.Views.SlideSettings.textNoFill": "ບໍ່ມີການຕື່ມຂໍ້ມູນໃສ່", - "PE.Views.SlideSettings.textNone": "ບໍ່ມີ", "PE.Views.SlideSettings.textPatternFill": "ຮູບແບບ", "PE.Views.SlideSettings.textPosition": "ຕໍາແໜ່ງ", - "PE.Views.SlideSettings.textPreview": "ເບິ່ງຕົວຢ່າງ", - "PE.Views.SlideSettings.textPush": "ດັນ, ຍູ້", "PE.Views.SlideSettings.textRadial": "ລັງສີ", "PE.Views.SlideSettings.textReset": "ປັບການປ່ຽນແປງ ໃໝ່", - "PE.Views.SlideSettings.textRight": "ຂວາ", - "PE.Views.SlideSettings.textSec": "S", "PE.Views.SlideSettings.textSelectImage": "ເລືອກຮູບພາບ", "PE.Views.SlideSettings.textSelectTexture": "ເລືອກ", - "PE.Views.SlideSettings.textSmoothly": "ຄ່ອງຕົວ, ສະດວກ", - "PE.Views.SlideSettings.textSplit": "ແຍກ, ແບ່ງເປັນ", "PE.Views.SlideSettings.textStretch": "ຢຶດ, ຂະຫຍາຍ", "PE.Views.SlideSettings.textStyle": "ປະເພດ ", "PE.Views.SlideSettings.textTexture": "ຈາກ ໂຄງສ້າງ", "PE.Views.SlideSettings.textTile": "ດິນຂໍ, ຫລື ກະໂລ", - "PE.Views.SlideSettings.textTop": "ຂ້າງເທີງ", - "PE.Views.SlideSettings.textTopLeft": "ຂ້າງຊ້າຍດ້ານເທິງ", - "PE.Views.SlideSettings.textTopRight": "ດ້ານເທິງຂ້າງຂວາ", - "PE.Views.SlideSettings.textUnCover": "ເປີດເຜີຍ", - "PE.Views.SlideSettings.textVerticalIn": "ລວງຕັ້ງດ້ານໃນ", - "PE.Views.SlideSettings.textVerticalOut": "ລວງຕັ້ງງດ້ານນອກ", - "PE.Views.SlideSettings.textWedge": "ລີ່ມ", - "PE.Views.SlideSettings.textWipe": "ເຊັດ, ຖູ", - "PE.Views.SlideSettings.textZoom": "ຂະຫຍາຍ ", - "PE.Views.SlideSettings.textZoomIn": "ຊຸມເຂົ້າ", - "PE.Views.SlideSettings.textZoomOut": "ຂະຫຍາຍອອກ", - "PE.Views.SlideSettings.textZoomRotate": "ຂະຫຍາຍ ແລະ ໝຸນ", "PE.Views.SlideSettings.tipAddGradientPoint": "ເພີ່ມຈຸດໄລ່ລະດັບ", "PE.Views.SlideSettings.tipRemoveGradientPoint": "ລົບຈຸດສີ", "PE.Views.SlideSettings.txtBrownPaper": "ເຈ້ຍສີນ້ຳຕານ", @@ -1900,7 +1857,6 @@ "PE.Views.Toolbar.textColumnsTwo": "2ຖັນ", "PE.Views.Toolbar.textItalic": "ໂຕໜັງສືອຽງ", "PE.Views.Toolbar.textListSettings": "ຕັ້ງຄ່າລາຍການ", - "PE.Views.Toolbar.textNewColor": "ປະເພດ ຂອງສີ, ການກຳນົດສີ", "PE.Views.Toolbar.textShapeAlignBottom": "ຈັດຕ່ຳແໜ່ງທາງດ້ານລຸ່ມ", "PE.Views.Toolbar.textShapeAlignCenter": "ຈັດຕຳແໜ່ງເຄິ່ງກາງ", "PE.Views.Toolbar.textShapeAlignLeft": "ຈັດຕຳແໜ່ງຕິດຊ້າຍ", diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index ab434f328..fa0796080 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -899,11 +899,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Save", "PE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "PE.Views.FileMenu.btnToEditCaption": "Edit Presentation", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank presentation which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a presentation of a certain type or purpose where some styles have already been pre-applied.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Presentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "There are no templates", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location", @@ -1132,64 +1127,28 @@ "PE.Views.SignatureSettings.txtSignedInvalid": "Daži no prezentācijas digitālajiem parakstiem ir nederīgi vai tos nevar pārbaudīt. Prezentāciju nevar rediģēt.", "PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strColor": "Color", - "PE.Views.SlideSettings.strDelay": "Delay", - "PE.Views.SlideSettings.strDuration": "Duration", - "PE.Views.SlideSettings.strEffect": "Effect", "PE.Views.SlideSettings.strFill": "Fill", "PE.Views.SlideSettings.strForeground": "Foreground color", "PE.Views.SlideSettings.strPattern": "Pattern", - "PE.Views.SlideSettings.strStartOnClick": "Start On Click", "PE.Views.SlideSettings.textAdvanced": "Show advanced settings", - "PE.Views.SlideSettings.textApplyAll": "Apply to All Slides", - "PE.Views.SlideSettings.textBlack": "Through Black", - "PE.Views.SlideSettings.textBottom": "Bottom", - "PE.Views.SlideSettings.textBottomLeft": "Bottom Left", - "PE.Views.SlideSettings.textBottomRight": "Bottom Right", - "PE.Views.SlideSettings.textClock": "Clock", - "PE.Views.SlideSettings.textClockwise": "Clockwise", "PE.Views.SlideSettings.textColor": "Color Fill", - "PE.Views.SlideSettings.textCounterclockwise": "Counterclockwise", - "PE.Views.SlideSettings.textCover": "Cover", "PE.Views.SlideSettings.textDirection": "Direction", "PE.Views.SlideSettings.textEmptyPattern": "No Pattern", - "PE.Views.SlideSettings.textFade": "Fade", "PE.Views.SlideSettings.textFromFile": "From File", "PE.Views.SlideSettings.textFromUrl": "From URL", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "Gradient Fill", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal In", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal Out", "PE.Views.SlideSettings.textImageTexture": "Picture or Texture", - "PE.Views.SlideSettings.textLeft": "Left", "PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textNoFill": "No Fill", - "PE.Views.SlideSettings.textNone": "None", "PE.Views.SlideSettings.textPatternFill": "Pattern", - "PE.Views.SlideSettings.textPreview": "Preview", - "PE.Views.SlideSettings.textPush": "Push", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Reset Changes", - "PE.Views.SlideSettings.textRight": "Right", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Select", - "PE.Views.SlideSettings.textSmoothly": "Smoothly", - "PE.Views.SlideSettings.textSplit": "Split", "PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textTexture": "From Texture", "PE.Views.SlideSettings.textTile": "Tile", - "PE.Views.SlideSettings.textTop": "Top", - "PE.Views.SlideSettings.textTopLeft": "Top Left", - "PE.Views.SlideSettings.textTopRight": "Top Right", - "PE.Views.SlideSettings.textUnCover": "Uncover", - "PE.Views.SlideSettings.textVerticalIn": "Vertical In", - "PE.Views.SlideSettings.textVerticalOut": "Vertical Out", - "PE.Views.SlideSettings.textWedge": "Wedge", - "PE.Views.SlideSettings.textWipe": "Wipe", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Zoom In", - "PE.Views.SlideSettings.textZoomOut": "Zoom Out", - "PE.Views.SlideSettings.textZoomRotate": "Zoom and Rotate", "PE.Views.SlideSettings.txtBrownPaper": "Brown Paper", "PE.Views.SlideSettings.txtCanvas": "Canvas", "PE.Views.SlideSettings.txtCarton": "Carton", @@ -1362,7 +1321,6 @@ "PE.Views.Toolbar.textArrangeFront": "Bring To Foreground", "PE.Views.Toolbar.textBold": "Bold", "PE.Views.Toolbar.textItalic": "Italic", - "PE.Views.Toolbar.textNewColor": "Custom Color", "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom", "PE.Views.Toolbar.textShapeAlignCenter": "Align Center", "PE.Views.Toolbar.textShapeAlignLeft": "Align Left", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index 972967cd7..3291e0bdb 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -50,10 +50,6 @@ "Common.Translation.warnFileLocked": "Het bestand wordt bewerkt in een andere app. U kunt doorgaan met bewerken en als kopie opslaan.", "Common.Translation.warnFileLockedBtnEdit": "Maak een kopie", "Common.Translation.warnFileLockedBtnView": "Open voor lezen", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Nieuwe aangepaste kleur toevoegen", - "Common.Translation.warnFileLockedBtnEdit": "Maak een kopie", - "Common.Translation.warnFileLockedBtnView": "Open voor lezen", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -1301,11 +1297,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Kopie opslaan als...", "PE.Views.FileMenu.btnSettingsCaption": "Geavanceerde instellingen...", "PE.Views.FileMenu.btnToEditCaption": "Presentatie bewerken", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Van leeg bestand", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Van sjabloon", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Maak een nieuwe lege presentatie. Op de lege presentatie kunt u vervolgens stijlen en opmaak toepassen tijdens het bewerken. U kunt ook een van de sjablonen kiezen om te beginnen met een presentatie van een bepaald type of met een bepaald doel. In dat geval zijn sommige stijlen al toegepast.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nieuwe presentatie", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Er zijn geen sjablonen", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Toepassen", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Voeg auteur toe", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tekst toevoegen", @@ -1636,70 +1627,34 @@ "PE.Views.SlideSettings.strBackground": "Achtergrondkleur", "PE.Views.SlideSettings.strColor": "Kleur", "PE.Views.SlideSettings.strDateTime": "Weergeef datum & tijd", - "PE.Views.SlideSettings.strDelay": "Vertragen", - "PE.Views.SlideSettings.strDuration": "Duur", - "PE.Views.SlideSettings.strEffect": "Effect", "PE.Views.SlideSettings.strFill": "Achtergrond", "PE.Views.SlideSettings.strForeground": "Voorgrondkleur", "PE.Views.SlideSettings.strPattern": "Patroon", "PE.Views.SlideSettings.strSlideNum": "Toon dia nummer", - "PE.Views.SlideSettings.strStartOnClick": "Bij klik starten", "PE.Views.SlideSettings.strTransparency": "Ondoorzichtigheid", "PE.Views.SlideSettings.textAdvanced": "Geavanceerde instellingen tonen", "PE.Views.SlideSettings.textAngle": "Hoek", - "PE.Views.SlideSettings.textApplyAll": "Toepassen op alle dia's", - "PE.Views.SlideSettings.textBlack": "Door zwart", - "PE.Views.SlideSettings.textBottom": "Onder", - "PE.Views.SlideSettings.textBottomLeft": "Linksonder", - "PE.Views.SlideSettings.textBottomRight": "Rechtsonder", - "PE.Views.SlideSettings.textClock": "Klok", - "PE.Views.SlideSettings.textClockwise": "Rechtsom", "PE.Views.SlideSettings.textColor": "Kleuropvulling", - "PE.Views.SlideSettings.textCounterclockwise": "Linksom", - "PE.Views.SlideSettings.textCover": "Bedekken", "PE.Views.SlideSettings.textDirection": "Richting", "PE.Views.SlideSettings.textEmptyPattern": "Geen patroon", - "PE.Views.SlideSettings.textFade": "Vervagen", "PE.Views.SlideSettings.textFromFile": "Van bestand", "PE.Views.SlideSettings.textFromStorage": "Van Opslag", "PE.Views.SlideSettings.textFromUrl": "Van URL", "PE.Views.SlideSettings.textGradient": "Kleurovergangpunten", "PE.Views.SlideSettings.textGradientFill": "Vulling met kleurovergang", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontaal naar binnen", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontaal naar buiten", "PE.Views.SlideSettings.textImageTexture": "Afbeelding of textuur", - "PE.Views.SlideSettings.textLeft": "Links", "PE.Views.SlideSettings.textLinear": "Lineair", "PE.Views.SlideSettings.textNoFill": "Geen vulling", - "PE.Views.SlideSettings.textNone": "Geen", "PE.Views.SlideSettings.textPatternFill": "Patroon", "PE.Views.SlideSettings.textPosition": "Positie", - "PE.Views.SlideSettings.textPreview": "Voorbeeld", - "PE.Views.SlideSettings.textPush": "Duwen", "PE.Views.SlideSettings.textRadial": "Radiaal", "PE.Views.SlideSettings.textReset": "Wijzigingen herstellen", - "PE.Views.SlideSettings.textRight": "Rechts", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "selecteer afbeelding", "PE.Views.SlideSettings.textSelectTexture": "Selecteren", - "PE.Views.SlideSettings.textSmoothly": "Vloeiend", - "PE.Views.SlideSettings.textSplit": "Splitsen", "PE.Views.SlideSettings.textStretch": "Uitrekken", "PE.Views.SlideSettings.textStyle": "Stijl", "PE.Views.SlideSettings.textTexture": "Van textuur", "PE.Views.SlideSettings.textTile": "Tegel", - "PE.Views.SlideSettings.textTop": "Boven", - "PE.Views.SlideSettings.textTopLeft": "Linksboven", - "PE.Views.SlideSettings.textTopRight": "Rechtsboven", - "PE.Views.SlideSettings.textUnCover": "Onthullen", - "PE.Views.SlideSettings.textVerticalIn": "Verticaal naar binnen", - "PE.Views.SlideSettings.textVerticalOut": "Verticaal naar buiten", - "PE.Views.SlideSettings.textWedge": "Wig", - "PE.Views.SlideSettings.textWipe": "Wissen", - "PE.Views.SlideSettings.textZoom": "Zoomen", - "PE.Views.SlideSettings.textZoomIn": "Inzoomen", - "PE.Views.SlideSettings.textZoomOut": "Uitzoomen", - "PE.Views.SlideSettings.textZoomRotate": "Zoomen en draaien", "PE.Views.SlideSettings.tipAddGradientPoint": "Kleurovergangpunt toevoegen", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Kleurovergangpunt verwijderen", "PE.Views.SlideSettings.txtBrownPaper": "Bruin papier", @@ -1909,7 +1864,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Twee kolommen", "PE.Views.Toolbar.textItalic": "Cursief", "PE.Views.Toolbar.textListSettings": "Lijst instellingen", - "PE.Views.Toolbar.textNewColor": "Aangepaste kleur", "PE.Views.Toolbar.textShapeAlignBottom": "Onder uitlijnen", "PE.Views.Toolbar.textShapeAlignCenter": "Midden uitlijnen", "PE.Views.Toolbar.textShapeAlignLeft": "Links uitlijnen", diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index 035fbca33..580273e06 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -13,7 +13,6 @@ "Common.define.chartData.textPoint": "XY (Punktowy)", "Common.define.chartData.textStock": "Zbiory", "Common.define.chartData.textSurface": "Powierzchnia", - "Common.UI.ColorButton.textNewColor": "Własny kolor", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -56,6 +55,17 @@ "Common.Views.About.txtPoweredBy": "zasilany przez", "Common.Views.About.txtTel": "tel.:", "Common.Views.About.txtVersion": "Wersja", + "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatuj automatycznie podczas pisania", + "Common.Views.AutoCorrectDialog.textBulleted": "Listy punktowane automatycznie", + "Common.Views.AutoCorrectDialog.textBy": "Na", + "Common.Views.AutoCorrectDialog.textDelete": "Usuń", + "Common.Views.AutoCorrectDialog.textMathCorrect": "Autokorekta matematyczna", + "Common.Views.AutoCorrectDialog.textNumbered": "Listy numerowane automatycznie", + "Common.Views.AutoCorrectDialog.textRecognized": "Rozpoznawane funkcje", + "Common.Views.AutoCorrectDialog.textRecognizedDesc": "Następujące wyrażenia są rozpoznawanymi wyrażeniami matematycznymi. Nie będą one automatycznie pisane kursywą.", + "Common.Views.AutoCorrectDialog.textReplace": "Zamień", + "Common.Views.AutoCorrectDialog.textResetAll": "Przywróć ustawienia domyślne", + "Common.Views.AutoCorrectDialog.textTitle": "Autokorekta", "Common.Views.Chat.textSend": "Wyslać", "Common.Views.Comments.textAdd": "Dodać", "Common.Views.Comments.textAddComment": "Dodaj komentarz", @@ -85,6 +95,9 @@ "Common.Views.ExternalDiagramEditor.textTitle": "Edytor wykresu", "Common.Views.Header.labelCoUsersDescr": "Dokument jest obecnie edytowany przez kilku użytkowników.", "Common.Views.Header.textBack": "Przejdź do Dokumentów", + "Common.Views.Header.textCompactView": "Ukryj pasek narzędzi", + "Common.Views.Header.textHideLines": "Ukryj linijki", + "Common.Views.Header.textHideStatusBar": "Ukryj pasek stanu", "Common.Views.Header.textSaveBegin": "Zapisywanie ...", "Common.Views.Header.textSaveChanged": "Zmodyfikowano", "Common.Views.Header.textSaveEnd": "Wszystkie zmiany zapisane", @@ -93,6 +106,9 @@ "Common.Views.Header.tipDownload": "Pobierz plik", "Common.Views.Header.tipGoEdit": "Edytuj bieżący plik", "Common.Views.Header.tipPrint": "Drukuj plik", + "Common.Views.Header.tipRedo": "Wykonaj ponownie", + "Common.Views.Header.tipSave": "Zapisz", + "Common.Views.Header.tipUndo": "Cofnij", "Common.Views.Header.tipViewUsers": "Wyświetl użytkowników i zarządzaj prawami dostępu do dokumentu", "Common.Views.Header.txtAccessRights": "Zmień prawa dostępu", "Common.Views.Header.txtRename": "Zmień nazwę", @@ -107,6 +123,7 @@ "Common.Views.InsertTableDialog.txtTitle": "Rozmiar tablicy", "Common.Views.InsertTableDialog.txtTitleSplit": "Podziel komórkę", "Common.Views.LanguageDialog.labelSelect": "Wybierz język dokumentu", + "Common.Views.ListSettingsDialog.txtSymbol": "Symbole", "Common.Views.OpenDialog.txtEncoding": "Kodowanie", "Common.Views.OpenDialog.txtIncorrectPwd": "Hasło jest nieprawidłowe.", "Common.Views.OpenDialog.txtOpenFile": "Wprowadź hasło, aby otworzyć plik", @@ -124,9 +141,39 @@ "Common.Views.RenameDialog.textName": "Nazwa pliku", "Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:", "Common.Views.ReviewPopover.textAddReply": "Dodaj odpowiedź", + "Common.Views.SaveAsDlg.textTitle": "Folder do zapisu", + "Common.Views.SymbolTableDialog.textCharacter": "Znak", + "Common.Views.SymbolTableDialog.textCode": "Nazwa Unicode", + "Common.Views.SymbolTableDialog.textCopyright": "Znak zastrzeżenia prawa autorskiego", + "Common.Views.SymbolTableDialog.textDCQuote": "Podwójny cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textDOQuote": "Podwójny cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textEllipsis": "Wielokropek", + "Common.Views.SymbolTableDialog.textEmDash": "Pauza", + "Common.Views.SymbolTableDialog.textEmSpace": "Długa spacja", + "Common.Views.SymbolTableDialog.textEnDash": "Półpauza", + "Common.Views.SymbolTableDialog.textEnSpace": "Krótka spacja", + "Common.Views.SymbolTableDialog.textFont": "Czcionka", + "Common.Views.SymbolTableDialog.textNBHyphen": "Łącznik nierozdzielający", + "Common.Views.SymbolTableDialog.textNBSpace": "Spacja nierozdzielająca", + "Common.Views.SymbolTableDialog.textPilcrow": "Akapit", + "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 długiej spacji", + "Common.Views.SymbolTableDialog.textRange": "Zakres", + "Common.Views.SymbolTableDialog.textRecent": "Ostatnio używane symbole", + "Common.Views.SymbolTableDialog.textRegistered": "Zastrzeżony znak towarowy", + "Common.Views.SymbolTableDialog.textSCQuote": "Pojedynczy cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textSection": "Sekcja", + "Common.Views.SymbolTableDialog.textShortcut": "Klawisz skrótu", + "Common.Views.SymbolTableDialog.textSOQuote": "Pojedynczy cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textSpecial": "Znaki specjalne", + "Common.Views.SymbolTableDialog.textSymbols": "Symbole", + "Common.Views.SymbolTableDialog.textTitle": "Symbole", + "Common.Views.SymbolTableDialog.textTradeMark": "Znak towarowy", + "Common.Views.UserNameDialog.textDontShow": "Nie pytaj mnie ponownie", + "PE.Controllers.LeftMenu.leavePageText": "Wszystkie niezapisane zmiany w tym dokumencie zostaną utracone. Kliknij przycisk \"Anuluj\", a następnie \"Zapisz\", aby je zapisać. Kliknij \"OK\", aby usunąć wszystkie niezapisane zmiany.", "PE.Controllers.LeftMenu.newDocumentTitle": "Nienazwana prezentacja", "PE.Controllers.LeftMenu.requestEditRightsText": "Żądanie praw do edycji...", "PE.Controllers.LeftMenu.textNoTextFound": "Nie znaleziono danych, których szukasz. Proszę dostosuj opcje wyszukiwania.", + "PE.Controllers.LeftMenu.textReplaceSuccess": "Wyszukiwanie zakończone. Zastąpiono {0}", "PE.Controllers.Main.applyChangesTextText": "Ładowanie danych...", "PE.Controllers.Main.applyChangesTitleText": "Ładowanie danych", "PE.Controllers.Main.convertationTimeoutText": "Przekroczono limit czasu konwersji.", @@ -194,9 +241,11 @@ "PE.Controllers.Main.textContactUs": "Skontaktuj się z działem sprzedaży", "PE.Controllers.Main.textLoadingDocument": "Ładowanie prezentacji", "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE wersja open source", + "PE.Controllers.Main.textRenameLabel": "Wpisz nazwę, która ma być używana do współpracy", "PE.Controllers.Main.textShape": "Kształt", "PE.Controllers.Main.textStrict": "Tryb ścisły", "PE.Controllers.Main.textTryUndoRedo": "Funkcje Cofnij/Ponów są wyłączone w trybie \"Szybki\" współtworzenia.
    Kliknij przycisk \"Tryb ścisły\", aby przejść do trybu ścisłego edytowania, aby edytować plik bez ingerencji innych użytkowników i wysyłać zmiany tylko po zapisaniu. Możesz przełączać się między trybami współtworzenia, używając edytora Ustawienia zaawansowane.", + "PE.Controllers.Main.textTryUndoRedoWarn": "Funkcje Cofnij/Ponów są wyłączone w trybie Szybkim współtworzenia.", "PE.Controllers.Main.titleLicenseExp": "Upłynął okres ważności licencji", "PE.Controllers.Main.titleServerVersion": "Zaktualizowano edytor", "PE.Controllers.Main.txtArt": "Twój tekst tutaj", @@ -221,6 +270,14 @@ "PE.Controllers.Main.txtPicture": "Obraz", "PE.Controllers.Main.txtRectangles": "Prostokąty", "PE.Controllers.Main.txtSeries": "Serie", + "PE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Łącznik: łamany z podwójną strzałką", + "PE.Controllers.Main.txtShape_bracePair": "Para nawiasów klamrowych", + "PE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Łącznik: zakrzywiony z podwójną strzałką", + "PE.Controllers.Main.txtShape_donut": "Okrąg: pusty", + "PE.Controllers.Main.txtShape_doubleWave": "Podwójna fala", + "PE.Controllers.Main.txtShape_horizontalScroll": "Zwój: poziomy", + "PE.Controllers.Main.txtShape_lineWithTwoArrows": "Strzałka liniowa: podwójna", + "PE.Controllers.Main.txtShape_mathMultiply": "Znak mnożenia", "PE.Controllers.Main.txtSldLtTBlank": "Pusty", "PE.Controllers.Main.txtSldLtTChart": "Wykres", "PE.Controllers.Main.txtSldLtTChartAndTx": "Wykres i tekst", @@ -285,6 +342,7 @@ "PE.Controllers.Toolbar.textFontSizeErr": "Wprowadzona wartość jest nieprawidłowa.
    Wprowadź wartość numeryczną w zakresie od 1 do 300", "PE.Controllers.Toolbar.textFraction": "Ułamki", "PE.Controllers.Toolbar.textFunction": "Funkcje", + "PE.Controllers.Toolbar.textInsert": "Wstaw", "PE.Controllers.Toolbar.textIntegral": "Całki", "PE.Controllers.Toolbar.textLargeOperator": "Duże operatory", "PE.Controllers.Toolbar.textLimitAndLog": "Limity i algorytmy", @@ -676,6 +734,7 @@ "PE.Views.DocumentHolder.textArrangeFront": "Przejdź na pierwszy plan", "PE.Views.DocumentHolder.textCopy": "Kopiuj", "PE.Views.DocumentHolder.textCut": "Wytnij", + "PE.Views.DocumentHolder.textFlipH": "Odwróć w poziomie", "PE.Views.DocumentHolder.textNextPage": "Następny slajd", "PE.Views.DocumentHolder.textPaste": "Wklej", "PE.Views.DocumentHolder.textPrevPage": "Poprzedni slajd", @@ -804,13 +863,9 @@ "PE.Views.FileMenu.btnRightsCaption": "Prawa dostępu...", "PE.Views.FileMenu.btnSaveAsCaption": "Zapisz jako", "PE.Views.FileMenu.btnSaveCaption": "Zapisz", + "PE.Views.FileMenu.btnSaveCopyAsCaption": "Zapisz kopię jako…", "PE.Views.FileMenu.btnSettingsCaption": "Zaawansowane ustawienia...", "PE.Views.FileMenu.btnToEditCaption": "Edytuj prezentację", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z pustego", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z szablonu", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Utwórz nową pustą prezentację, którą będzie można ułożyć i formatować po jej utworzeniu podczas edycji. Możesz też wybrać jeden z szablonów, aby rozpocząć prezentację określonego typu lub celu, w którym niektóre style zostały wcześniej zastosowane.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nowa prezentacja", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Tam nie ma żadnych szablonów", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokalizacja", @@ -844,14 +899,19 @@ "PE.Views.FileMenuPanels.Settings.textForceSave": "Zapisz na serwer", "PE.Views.FileMenuPanels.Settings.textMinute": "Każda minuta", "PE.Views.FileMenuPanels.Settings.txtAll": "Pokaż wszystkie", + "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opcje Autokorekty...", "PE.Views.FileMenuPanels.Settings.txtCm": "Centymetr", "PE.Views.FileMenuPanels.Settings.txtFitSlide": "Dopasuj do slajdu", "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Dopasuj do szerokości", "PE.Views.FileMenuPanels.Settings.txtInch": "Cale", "PE.Views.FileMenuPanels.Settings.txtInput": "Alternatywne wejście", "PE.Views.FileMenuPanels.Settings.txtLast": "Pokaż ostatni", + "PE.Views.FileMenuPanels.Settings.txtProofing": "Sprawdzanie", "PE.Views.FileMenuPanels.Settings.txtPt": "Punkt", "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Sprawdzanie pisowni", + "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Wyłącz Wszystkie", + "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Wyłącz wszystkie makra bez powiadomienia", + "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Wyłącz wszystkie makra z powiadomieniem", "PE.Views.HyperlinkSettingsDialog.strDisplay": "Pokaż", "PE.Views.HyperlinkSettingsDialog.strLinkTo": "Link do", "PE.Views.HyperlinkSettingsDialog.textDefault": "Wybrany fragment tekstu", @@ -875,6 +935,7 @@ "PE.Views.ImageSettings.textFromFile": "Z pliku", "PE.Views.ImageSettings.textFromUrl": "Z adresu URL", "PE.Views.ImageSettings.textHeight": "Wysokość", + "PE.Views.ImageSettings.textHintFlipH": "Odwróć w poziomie", "PE.Views.ImageSettings.textInsert": "Zamień obraz", "PE.Views.ImageSettings.textOriginalSize": "Domyślny rozmiar", "PE.Views.ImageSettings.textSize": "Rozmiar", @@ -884,6 +945,7 @@ "PE.Views.ImageSettingsAdvanced.textAltTip": "Alternatywna prezentacja wizualnych informacji o obiektach, które będą czytane osobom z wadami wzroku lub zmysłu poznawczego, aby lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształtach, wykresie lub tabeli.", "PE.Views.ImageSettingsAdvanced.textAltTitle": "Tytuł", "PE.Views.ImageSettingsAdvanced.textHeight": "Wysokość", + "PE.Views.ImageSettingsAdvanced.textHorizontally": "Poziomo ", "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Stałe proporcje", "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Domyślny rozmiar", "PE.Views.ImageSettingsAdvanced.textPlacement": "Umieszczenie", @@ -960,6 +1022,7 @@ "PE.Views.ShapeSettings.textFromUrl": "Z adresu URL", "PE.Views.ShapeSettings.textGradient": "Gradient", "PE.Views.ShapeSettings.textGradientFill": "Wypełnienie gradientem", + "PE.Views.ShapeSettings.textHintFlipH": "Odwróć w poziomie", "PE.Views.ShapeSettings.textImageTexture": "Obraz lub tekstura", "PE.Views.ShapeSettings.textLinear": "Liniowy", "PE.Views.ShapeSettings.textNoFill": "Brak wypełnienia", @@ -1000,6 +1063,7 @@ "PE.Views.ShapeSettingsAdvanced.textEndStyle": "Styl końcowy", "PE.Views.ShapeSettingsAdvanced.textFlat": "Płaski", "PE.Views.ShapeSettingsAdvanced.textHeight": "Wysokość", + "PE.Views.ShapeSettingsAdvanced.textHorizontally": "Poziomo ", "PE.Views.ShapeSettingsAdvanced.textJoinType": "Dołącz typ", "PE.Views.ShapeSettingsAdvanced.textKeepRatio": "Stałe proporcje", "PE.Views.ShapeSettingsAdvanced.textLeft": "Lewy", @@ -1015,66 +1079,31 @@ "PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Wagi i strzałki", "PE.Views.ShapeSettingsAdvanced.textWidth": "Szerokość", "PE.Views.ShapeSettingsAdvanced.txtNone": "Nie", + "PE.Views.SignatureSettings.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
    Nie można tego cofnąć.", "PE.Views.SlideSettings.strBackground": "Kolor tła", "PE.Views.SlideSettings.strColor": "Kolor", - "PE.Views.SlideSettings.strDelay": "Opóźnienie", - "PE.Views.SlideSettings.strDuration": "Czas trwania", - "PE.Views.SlideSettings.strEffect": "Efekt", "PE.Views.SlideSettings.strFill": "Tło", "PE.Views.SlideSettings.strForeground": "Kolor pierwszoplanowy", "PE.Views.SlideSettings.strPattern": "Wzór", - "PE.Views.SlideSettings.strStartOnClick": "Uruchomić kliknięciem", "PE.Views.SlideSettings.textAdvanced": "Pokaż ustawienia zaawansowane", - "PE.Views.SlideSettings.textApplyAll": "Zatwierdź dla wszystkich slajdów", - "PE.Views.SlideSettings.textBlack": "Przez czarne", - "PE.Views.SlideSettings.textBottom": "Dół", - "PE.Views.SlideSettings.textBottomLeft": "Lewy dolny", - "PE.Views.SlideSettings.textBottomRight": "Prawy dolny", - "PE.Views.SlideSettings.textClock": "Zegar", - "PE.Views.SlideSettings.textClockwise": "Zgodnie z ruchem wskazówek zegara", "PE.Views.SlideSettings.textColor": "Kolor wypełnienia", - "PE.Views.SlideSettings.textCounterclockwise": "Przeciwnie do ruchu wskazówek zegara", - "PE.Views.SlideSettings.textCover": "Pokryj", "PE.Views.SlideSettings.textDirection": "Kierunek", "PE.Views.SlideSettings.textEmptyPattern": "Brak wzorca", - "PE.Views.SlideSettings.textFade": "Blaknąć", "PE.Views.SlideSettings.textFromFile": "Z pliku", "PE.Views.SlideSettings.textFromUrl": "Z adresu URL", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "Wypełnienie gradientem", - "PE.Views.SlideSettings.textHorizontalIn": "W poziomie do środka", - "PE.Views.SlideSettings.textHorizontalOut": "W poziomie na zewnątrz", "PE.Views.SlideSettings.textImageTexture": "Obraz lub tekstura", - "PE.Views.SlideSettings.textLeft": "Lewy", "PE.Views.SlideSettings.textLinear": "Liniowy", "PE.Views.SlideSettings.textNoFill": "Brak wypełnienia", - "PE.Views.SlideSettings.textNone": "Nie", "PE.Views.SlideSettings.textPatternFill": "Wzór", - "PE.Views.SlideSettings.textPreview": "Podgląd", - "PE.Views.SlideSettings.textPush": "Pchnij", "PE.Views.SlideSettings.textRadial": "Promieniowy", "PE.Views.SlideSettings.textReset": "Zresetuj zmiany", - "PE.Views.SlideSettings.textRight": "Prawy", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Wybierz", - "PE.Views.SlideSettings.textSmoothly": "Płynnie", - "PE.Views.SlideSettings.textSplit": "Podziel", "PE.Views.SlideSettings.textStretch": "Rozciągnij", "PE.Views.SlideSettings.textStyle": "Styl", "PE.Views.SlideSettings.textTexture": "Z tekstury", "PE.Views.SlideSettings.textTile": "Płytka", - "PE.Views.SlideSettings.textTop": "Góra", - "PE.Views.SlideSettings.textTopLeft": "Lewy górny", - "PE.Views.SlideSettings.textTopRight": "Prawy górny", - "PE.Views.SlideSettings.textUnCover": "Odkryj", - "PE.Views.SlideSettings.textVerticalIn": "W pionie", - "PE.Views.SlideSettings.textVerticalOut": "W pionie na zewnątrz", - "PE.Views.SlideSettings.textWedge": "Zaklinuj", - "PE.Views.SlideSettings.textWipe": "Wytrzyj", - "PE.Views.SlideSettings.textZoom": "Powiększenie", - "PE.Views.SlideSettings.textZoomIn": "Powiększ", - "PE.Views.SlideSettings.textZoomOut": "Powiększ", - "PE.Views.SlideSettings.textZoomRotate": "Powiększenie i obrót", "PE.Views.SlideSettings.tipAddGradientPoint": "Dodaj punkt gradientu", "PE.Views.SlideSettings.txtBrownPaper": "Papier pakowy", "PE.Views.SlideSettings.txtCanvas": "Płótno", @@ -1142,11 +1171,13 @@ "PE.Views.TableSettings.textEmptyTemplate": "Brak szablonów", "PE.Views.TableSettings.textFirst": "pierwszy", "PE.Views.TableSettings.textHeader": "Nagłówek", + "PE.Views.TableSettings.textHeight": "Wysokość", "PE.Views.TableSettings.textLast": "Ostatni", "PE.Views.TableSettings.textRows": "Wiersze", "PE.Views.TableSettings.textSelectBorders": "Wybierz obramowania, które chcesz zmienić stosując styl wybrany powyżej", "PE.Views.TableSettings.textTemplate": "Wybierz z szablonu", "PE.Views.TableSettings.textTotal": "Razem", + "PE.Views.TableSettings.textWidth": "Szerokość", "PE.Views.TableSettings.tipAll": "Ustaw krawędź zewnętrzną i wszystkie wewnętrzne linie", "PE.Views.TableSettings.tipBottom": "Ustaw tylko obramowanie dolnej krawędzi", "PE.Views.TableSettings.tipInner": "Ustawić tylko linie wewnętrzne", @@ -1214,6 +1245,7 @@ "PE.Views.TextArtSettings.txtWood": "Drewno", "PE.Views.Toolbar.capAddSlide": "Dodaj slajd", "PE.Views.Toolbar.capBtnComment": "Komentarz", + "PE.Views.Toolbar.capBtnInsSymbol": "Symbole", "PE.Views.Toolbar.capInsertChart": "Wykres", "PE.Views.Toolbar.capInsertEquation": "Równanie", "PE.Views.Toolbar.capInsertHyperlink": "Hiperlink", @@ -1243,7 +1275,6 @@ "PE.Views.Toolbar.textArrangeFront": "Przejdź na pierwszy plan", "PE.Views.Toolbar.textBold": "Pogrubione", "PE.Views.Toolbar.textItalic": "Kursywa", - "PE.Views.Toolbar.textNewColor": "Własny kolor", "PE.Views.Toolbar.textShapeAlignBottom": "Wyrównaj do dołu", "PE.Views.Toolbar.textShapeAlignCenter": "Wyrównaj do środka", "PE.Views.Toolbar.textShapeAlignLeft": "Wyrównaj do lewej", @@ -1283,6 +1314,7 @@ "PE.Views.Toolbar.tipInsertHyperlink": "Dodaj hiperlink", "PE.Views.Toolbar.tipInsertImage": "Wstaw obraz", "PE.Views.Toolbar.tipInsertShape": "Wstaw kształt", + "PE.Views.Toolbar.tipInsertSymbol": "Wstaw symbol", "PE.Views.Toolbar.tipInsertTable": "Wstaw tabelę", "PE.Views.Toolbar.tipInsertText": "Wstaw tekst", "PE.Views.Toolbar.tipInsertTextArt": "Wstaw tekst Art", @@ -1327,5 +1359,7 @@ "PE.Views.Toolbar.txtScheme7": "Kapitał", "PE.Views.Toolbar.txtScheme8": "Przepływ", "PE.Views.Toolbar.txtScheme9": "Odlewnia", - "PE.Views.Toolbar.txtUngroup": "Rozgrupuj" + "PE.Views.Toolbar.txtUngroup": "Rozgrupuj", + "PE.Views.Transitions.textHorizontalIn": "W poziomie do środka", + "PE.Views.Transitions.textHorizontalOut": "W poziomie na zewnątrz" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index c1d338f03..b442770e0 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "Documento está em uso por outra aplicação. Você pode continuar editando e salvá-lo como uma cópia.", "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia", "Common.Translation.warnFileLockedBtnView": "Aberto para visualização", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Adicionar nova cor personalizada", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -1299,11 +1297,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Salvar cópia como...", "PE.Views.FileMenu.btnSettingsCaption": "Configurações avançadas...", "PE.Views.FileMenu.btnToEditCaption": "Editar apresentação", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Do branco", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Do modelo", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Criar uma nova apresentação em branco que você vai ser capaz de produzir e formatar depois que ele for criado durante a edição. Ou escolha um dos modelos para iniciar uma apresentação de um determinado tipo ou finalidade, onde alguns estilos já foram pré-aplicados.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nova apresentação", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Não há modelos", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adicionar Autor", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adicionar Texto", @@ -1634,70 +1627,34 @@ "PE.Views.SlideSettings.strBackground": "Cor do plano de fundo", "PE.Views.SlideSettings.strColor": "Cor", "PE.Views.SlideSettings.strDateTime": "Mostrar Data e Hora", - "PE.Views.SlideSettings.strDelay": "Atraso", - "PE.Views.SlideSettings.strDuration": "Duração", - "PE.Views.SlideSettings.strEffect": "Efeito", "PE.Views.SlideSettings.strFill": "Preencher", "PE.Views.SlideSettings.strForeground": "Cor do plano de fundo", "PE.Views.SlideSettings.strPattern": "Padrão", "PE.Views.SlideSettings.strSlideNum": "Mostrar número do slide", - "PE.Views.SlideSettings.strStartOnClick": "Iniciar ao clicar", "PE.Views.SlideSettings.strTransparency": "Opacidade", "PE.Views.SlideSettings.textAdvanced": "Exibir configurações avançadas", "PE.Views.SlideSettings.textAngle": "Ângulo", - "PE.Views.SlideSettings.textApplyAll": "Aplicar a todos os slides", - "PE.Views.SlideSettings.textBlack": "Através preto", - "PE.Views.SlideSettings.textBottom": "Inferior", - "PE.Views.SlideSettings.textBottomLeft": "Esquerda inferior", - "PE.Views.SlideSettings.textBottomRight": "Direita inferior", - "PE.Views.SlideSettings.textClock": "Relógio", - "PE.Views.SlideSettings.textClockwise": "Sentido horário", "PE.Views.SlideSettings.textColor": "Preenchimento de cor", - "PE.Views.SlideSettings.textCounterclockwise": "Sentido anti-horário", - "PE.Views.SlideSettings.textCover": "Folha de rosto", "PE.Views.SlideSettings.textDirection": "Direção", "PE.Views.SlideSettings.textEmptyPattern": "Sem padrão", - "PE.Views.SlideSettings.textFade": "Esmaecer", "PE.Views.SlideSettings.textFromFile": "Do arquivo", "PE.Views.SlideSettings.textFromStorage": "De armazenamento", "PE.Views.SlideSettings.textFromUrl": "Da URL", "PE.Views.SlideSettings.textGradient": "Pontos de gradiente", "PE.Views.SlideSettings.textGradientFill": "Preenchimento gradiente", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontal para dentro", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontal para fora", "PE.Views.SlideSettings.textImageTexture": "Imagem ou Textura", - "PE.Views.SlideSettings.textLeft": "Esquerda", "PE.Views.SlideSettings.textLinear": "Linear", "PE.Views.SlideSettings.textNoFill": "Sem preenchimento", - "PE.Views.SlideSettings.textNone": "Nenhum", "PE.Views.SlideSettings.textPatternFill": "Padrão", "PE.Views.SlideSettings.textPosition": "Posição", - "PE.Views.SlideSettings.textPreview": "Pré-visualizar", - "PE.Views.SlideSettings.textPush": "Empurrar", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Resetar alterações", - "PE.Views.SlideSettings.textRight": "Direita", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Selecionar imagem", "PE.Views.SlideSettings.textSelectTexture": "Selecionar", - "PE.Views.SlideSettings.textSmoothly": "Suavemente", - "PE.Views.SlideSettings.textSplit": "Dividir", "PE.Views.SlideSettings.textStretch": "Alongar", "PE.Views.SlideSettings.textStyle": "Estilo", "PE.Views.SlideSettings.textTexture": "Da textura", "PE.Views.SlideSettings.textTile": "Lado a lado", - "PE.Views.SlideSettings.textTop": "Parte superior", - "PE.Views.SlideSettings.textTopLeft": "Superior esquerdo", - "PE.Views.SlideSettings.textTopRight": "Superior direito", - "PE.Views.SlideSettings.textUnCover": "Descobrir", - "PE.Views.SlideSettings.textVerticalIn": "Vertical para dentro", - "PE.Views.SlideSettings.textVerticalOut": "Vertical para fora", - "PE.Views.SlideSettings.textWedge": "Triangular", - "PE.Views.SlideSettings.textWipe": "Revelar", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Ampliar", - "PE.Views.SlideSettings.textZoomOut": "Reduzir", - "PE.Views.SlideSettings.textZoomRotate": "Zoom e Rotação", "PE.Views.SlideSettings.tipAddGradientPoint": "Adicionar ponto de gradiente", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Remover ponto de gradiente", "PE.Views.SlideSettings.txtBrownPaper": "Papel pardo", @@ -1907,7 +1864,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Duas Colunas", "PE.Views.Toolbar.textItalic": "Itálico", "PE.Views.Toolbar.textListSettings": "Configurações da lista", - "PE.Views.Toolbar.textNewColor": "Adicionar nova cor personalizada", "PE.Views.Toolbar.textShapeAlignBottom": "Alinhar à parte inferior", "PE.Views.Toolbar.textShapeAlignCenter": "Alinhar ao centro", "PE.Views.Toolbar.textShapeAlignLeft": "Alinhar à esquerda", diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index be0af47e2..8080ecc8e 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -50,8 +50,8 @@ "Common.Translation.warnFileLocked": "Fișierul este editat într-o altă aplicație. Puteți continua să editați și să-l salvați ca o copie.", "Common.Translation.warnFileLockedBtnEdit": "Crează o copie", "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea", - "Common.UI.ColorButton.textAutoColor": "Automat", - "Common.UI.ColorButton.textNewColor": "Сuloare particularizată", + "Common.UI.ButtonColored.textAutoColor": "Automat", + "Common.UI.ButtonColored.textNewColor": "Adăugarea unei culori particularizate noi", "Common.UI.ComboBorderSize.txtNoBorders": "Fără borduri", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Fără borduri", "Common.UI.ComboDataView.emptyComboText": "Fără stiluri", @@ -124,6 +124,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Corectare automată va fi dezactivată și fișierul va fi restabilit la valori inițiale. Doriți să continuați?", "Common.Views.AutoCorrectDialog.warnRestore": "Intrare de autocorectare pentru %1 va fi restabilită la valorile inițiale. Doriți să continuați?", "Common.Views.Chat.textSend": "Trimitere", + "Common.Views.Comments.mniAuthorAsc": "Autor de la A la Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de la Z la A", + "Common.Views.Comments.mniDateAsc": "Cele mai vechi", + "Common.Views.Comments.mniDateDesc": "Cele mai recente", + "Common.Views.Comments.mniPositionAsc": "De sus", + "Common.Views.Comments.mniPositionDesc": "De jos", "Common.Views.Comments.textAdd": "Adaugă", "Common.Views.Comments.textAddComment": "Adaugă comentariu", "Common.Views.Comments.textAddCommentToDoc": "Adăugare comentariu la document", @@ -131,6 +137,7 @@ "Common.Views.Comments.textAnonym": "Invitat", "Common.Views.Comments.textCancel": "Revocare", "Common.Views.Comments.textClose": "Închidere", + "Common.Views.Comments.textClosePanel": "Închide comentarii", "Common.Views.Comments.textComments": "Comentarii", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Comentați aici", @@ -139,6 +146,7 @@ "Common.Views.Comments.textReply": "Răspunde", "Common.Views.Comments.textResolve": "Rezolvare", "Common.Views.Comments.textResolved": "Rezolvat", + "Common.Views.Comments.textSort": "Sortare comentarii", "Common.Views.CopyWarningDialog.textDontShow": "Nu afișa acest mesaj din nou", "Common.Views.CopyWarningDialog.textMsg": "Operațiuni de copiere, decupare și lipire din bară de instrumente sau meniul contextual al editorului se execută numai în editorul.

    Pentru copiere și lipire din sau în aplicații exterioare folosiți următoarele combinații de taste:", "Common.Views.CopyWarningDialog.textTitle": "Comenzile de copiere, decupare și lipire", @@ -444,14 +452,18 @@ "PE.Controllers.Main.splitMaxColsErrorText": "Numărul maxim de coloane trebuie să fie mai mic decât %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Numărul de rânduri trebuie să fie mai mic decât %1", "PE.Controllers.Main.textAnonymous": "Anonim", + "PE.Controllers.Main.textApplyAll": "Se aplică pentru toate ecuații", "PE.Controllers.Main.textBuyNow": "Vizitarea site-ul Web", "PE.Controllers.Main.textChangesSaved": "Toate modificările au fost salvate", "PE.Controllers.Main.textClose": "Închidere", "PE.Controllers.Main.textCloseTip": "Faceți clic pentru a închide sfatul", "PE.Controllers.Main.textContactUs": "Contactați Departamentul de Vânzări", + "PE.Controllers.Main.textConvertEquation": "Această ecuație a fost creată în versiunea mai veche a editorului de ecuații, care nu mai este acceptată. Dacă doriți să o editați, trebuie să o convertiți în formatul Office Math ML.
    Doriți să o convertiți acum?", "PE.Controllers.Main.textCustomLoader": "Vă rugăm să rețineți că conform termenilor de licență nu aveți dreptul să modificați programul de încărcare.
    Pentru obținerea unei cotații de preț vă rugăm să contactați Departamentul de Vânzari.", + "PE.Controllers.Main.textDisconnect": "Conexiune pierdută", "PE.Controllers.Main.textGuest": "Invitat", "PE.Controllers.Main.textHasMacros": "Fișierul conține macrocomenzi.
    Doriți să le rulați?", + "PE.Controllers.Main.textLearnMore": "Aflați mai multe", "PE.Controllers.Main.textLoadingDocument": "Încărcare prezentare", "PE.Controllers.Main.textLongName": "Numărul maxim de caractere dintr-un nume este 128 caractere.", "PE.Controllers.Main.textNoLicenseTitle": "Ați atins limita stabilită de licență", @@ -1300,11 +1312,8 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Salvare copie ca...", "PE.Views.FileMenu.btnSettingsCaption": "Setări avansate...", "PE.Views.FileMenu.btnToEditCaption": "Editarea prezentării", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Din document necompletat", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Din șablon", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creați o prezentare necompletată pe care o să puteți edita și formata după ce a fost creată. Sau alegeți un șablon cu stil predefinit pentru un anumit tip de prezentare sau un anumit scop.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Prezentare nouă", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Nu s-a găsit nici un șablon", + "PE.Views.FileMenuPanels.CreateNew.txtBlank": "Prezentare necompletată", + "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Creare nou", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicare", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adăugare autor", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adăugare text", @@ -1635,70 +1644,34 @@ "PE.Views.SlideSettings.strBackground": "Culoare de fundal", "PE.Views.SlideSettings.strColor": "Culoare", "PE.Views.SlideSettings.strDateTime": "Afișare data și ora", - "PE.Views.SlideSettings.strDelay": "Amânare", - "PE.Views.SlideSettings.strDuration": "Durată", - "PE.Views.SlideSettings.strEffect": "Efect", "PE.Views.SlideSettings.strFill": "Fundal", "PE.Views.SlideSettings.strForeground": "Culoarea de prim plan", "PE.Views.SlideSettings.strPattern": "Model", "PE.Views.SlideSettings.strSlideNum": "Afișare număr de diapozitiv", - "PE.Views.SlideSettings.strStartOnClick": "Pornire la clic", "PE.Views.SlideSettings.strTransparency": "Transparență", "PE.Views.SlideSettings.textAdvanced": "Afișare setări avansate", "PE.Views.SlideSettings.textAngle": "Unghi", - "PE.Views.SlideSettings.textApplyAll": "Aplicarea la toate diapozitivele ", - "PE.Views.SlideSettings.textBlack": "Prin negru", - "PE.Views.SlideSettings.textBottom": "Jos", - "PE.Views.SlideSettings.textBottomLeft": "Stânga jos", - "PE.Views.SlideSettings.textBottomRight": "Dreapta jos", - "PE.Views.SlideSettings.textClock": "Ceas", - "PE.Views.SlideSettings.textClockwise": "În sensul acelor de ceasornic", "PE.Views.SlideSettings.textColor": "Culoare de umplere", - "PE.Views.SlideSettings.textCounterclockwise": "In sens opus acelor de ceasornic", - "PE.Views.SlideSettings.textCover": "Acoperire", "PE.Views.SlideSettings.textDirection": "Orientare", "PE.Views.SlideSettings.textEmptyPattern": "Fără model", - "PE.Views.SlideSettings.textFade": "Estompare", "PE.Views.SlideSettings.textFromFile": "Din Fișier", "PE.Views.SlideSettings.textFromStorage": "Din serviciul stocare", "PE.Views.SlideSettings.textFromUrl": "Prin URL-ul", "PE.Views.SlideSettings.textGradient": "Stop gradient", "PE.Views.SlideSettings.textGradientFill": "Umplere gradient", - "PE.Views.SlideSettings.textHorizontalIn": "Orizontal în interior", - "PE.Views.SlideSettings.textHorizontalOut": "Orizontal în exterior", "PE.Views.SlideSettings.textImageTexture": "Imagine sau textură", - "PE.Views.SlideSettings.textLeft": "Stânga", "PE.Views.SlideSettings.textLinear": "Liniar", "PE.Views.SlideSettings.textNoFill": "Fără umplere", - "PE.Views.SlideSettings.textNone": "Niciunul", "PE.Views.SlideSettings.textPatternFill": "Model", "PE.Views.SlideSettings.textPosition": "Poziție", - "PE.Views.SlideSettings.textPreview": "Previzualizare", - "PE.Views.SlideSettings.textPush": "Împingere", "PE.Views.SlideSettings.textRadial": "Radială", "PE.Views.SlideSettings.textReset": "Renunțare la modificări", - "PE.Views.SlideSettings.textRight": "Dreapta", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Selectați imaginea", "PE.Views.SlideSettings.textSelectTexture": "Selectare", - "PE.Views.SlideSettings.textSmoothly": "Lin", - "PE.Views.SlideSettings.textSplit": "Scindare", "PE.Views.SlideSettings.textStretch": "Întindere", "PE.Views.SlideSettings.textStyle": "Stil", "PE.Views.SlideSettings.textTexture": "Din textură", "PE.Views.SlideSettings.textTile": "Placă", - "PE.Views.SlideSettings.textTop": "Sus", - "PE.Views.SlideSettings.textTopLeft": "Sus stânga", - "PE.Views.SlideSettings.textTopRight": "Dreapta sus", - "PE.Views.SlideSettings.textUnCover": "Descoperire", - "PE.Views.SlideSettings.textVerticalIn": "Vertical în interior", - "PE.Views.SlideSettings.textVerticalOut": "Vertical în exterior", - "PE.Views.SlideSettings.textWedge": "Pană", - "PE.Views.SlideSettings.textWipe": "Ștergere", - "PE.Views.SlideSettings.textZoom": "Zoom", - "PE.Views.SlideSettings.textZoomIn": "Mărire", - "PE.Views.SlideSettings.textZoomOut": "Micșorare", - "PE.Views.SlideSettings.textZoomRotate": "Zoom și rotire", "PE.Views.SlideSettings.tipAddGradientPoint": "Adăugare stop gradient", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Eliminare stop gradient", "PE.Views.SlideSettings.txtBrownPaper": "Hârtie reciclată", @@ -1908,7 +1881,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Două coloane", "PE.Views.Toolbar.textItalic": "Cursiv", "PE.Views.Toolbar.textListSettings": "Setări lista", - "PE.Views.Toolbar.textNewColor": "Сuloare particularizată", "PE.Views.Toolbar.textShapeAlignBottom": "Aliniere jos", "PE.Views.Toolbar.textShapeAlignCenter": "Aliniere la centru", "PE.Views.Toolbar.textShapeAlignLeft": "Aliniere la stânga", @@ -1927,6 +1899,7 @@ "PE.Views.Toolbar.textTabHome": "Acasă", "PE.Views.Toolbar.textTabInsert": "Inserare", "PE.Views.Toolbar.textTabProtect": "Protejare", + "PE.Views.Toolbar.textTabTransitions": "Tranziții", "PE.Views.Toolbar.textTitleError": "Eroare", "PE.Views.Toolbar.textUnderline": "Subliniat", "PE.Views.Toolbar.tipAddSlide": "Adăugare diapozitiv", @@ -2005,5 +1978,41 @@ "PE.Views.Toolbar.txtScheme8": "Flux", "PE.Views.Toolbar.txtScheme9": "Forjă", "PE.Views.Toolbar.txtSlideAlign": "Aliniere la diapozitiv", - "PE.Views.Toolbar.txtUngroup": "Anularea grupării" + "PE.Views.Toolbar.txtUngroup": "Anularea grupării", + "PE.Views.Transitions.strDelay": "Amânare", + "PE.Views.Transitions.strDuration": "Durată", + "PE.Views.Transitions.strStartOnClick": "Pornire la clic", + "PE.Views.Transitions.textBlack": "Prin negru", + "PE.Views.Transitions.textBottom": "Jos", + "PE.Views.Transitions.textBottomLeft": "La stânga jos", + "PE.Views.Transitions.textBottomRight": "La dreapta jos", + "PE.Views.Transitions.textClock": "Ceas", + "PE.Views.Transitions.textClockwise": "În sensul acelor de ceasornic", + "PE.Views.Transitions.textCounterclockwise": "In sens opus acelor de ceasornic", + "PE.Views.Transitions.textCover": "Acoperire", + "PE.Views.Transitions.textFade": "Estompare", + "PE.Views.Transitions.textHorizontalIn": "Orizontal în interior", + "PE.Views.Transitions.textHorizontalOut": "Orizontal în exterior", + "PE.Views.Transitions.textLeft": "Stânga", + "PE.Views.Transitions.textNone": "Fără", + "PE.Views.Transitions.textPush": "Împingere", + "PE.Views.Transitions.textRight": "Dreapta", + "PE.Views.Transitions.textSmoothly": "Lin", + "PE.Views.Transitions.textSplit": "Scindare", + "PE.Views.Transitions.textTop": "Sus", + "PE.Views.Transitions.textTopLeft": "Stânga sus", + "PE.Views.Transitions.textTopRight": "Dreapta sus", + "PE.Views.Transitions.textUnCover": "Descoperire", + "PE.Views.Transitions.textVerticalIn": "Vertical în interior", + "PE.Views.Transitions.textVerticalOut": "Vertical în exterior", + "PE.Views.Transitions.textWedge": "Pană", + "PE.Views.Transitions.textWipe": "Ștergere", + "PE.Views.Transitions.textZoom": "Zoom", + "PE.Views.Transitions.textZoomIn": "Mărire", + "PE.Views.Transitions.textZoomOut": "Micșorare", + "PE.Views.Transitions.textZoomRotate": "Zoom și rotire", + "PE.Views.Transitions.txtApplyToAll": "Aplicarea la toate diapozitivele ", + "PE.Views.Transitions.txtParameters": "Opțiuni", + "PE.Views.Transitions.txtPreview": "Previzualizare", + "PE.Views.Transitions.txtSec": "s" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 4031d105c..b1daf8eb7 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -50,8 +50,8 @@ "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", "Common.Translation.warnFileLockedBtnEdit": "Создать копию", "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", - "Common.UI.ColorButton.textAutoColor": "Автоматический", - "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", + "Common.UI.ButtonColored.textAutoColor": "Автоматический", + "Common.UI.ButtonColored.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", @@ -124,6 +124,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Все добавленные вами автозамены будут удалены, а для измененных будут восстановлены исходные значения. Вы хотите продолжить?", "Common.Views.AutoCorrectDialog.warnRestore": "Элемент автозамены для %1 будет сброшен на исходное значение. Вы хотите продолжить?", "Common.Views.Chat.textSend": "Отправить", + "Common.Views.Comments.mniAuthorAsc": "По автору от А до Я", + "Common.Views.Comments.mniAuthorDesc": "По автору от Я до А", + "Common.Views.Comments.mniDateAsc": "От старых к новым", + "Common.Views.Comments.mniDateDesc": "От новых к старым", + "Common.Views.Comments.mniPositionAsc": "Сверху", + "Common.Views.Comments.mniPositionDesc": "Снизу", "Common.Views.Comments.textAdd": "Добавить", "Common.Views.Comments.textAddComment": "Добавить", "Common.Views.Comments.textAddCommentToDoc": "Добавить комментарий к документу", @@ -131,6 +137,7 @@ "Common.Views.Comments.textAnonym": "Гость", "Common.Views.Comments.textCancel": "Отмена", "Common.Views.Comments.textClose": "Закрыть", + "Common.Views.Comments.textClosePanel": "Закрыть комментарии", "Common.Views.Comments.textComments": "Комментарии", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Введите здесь свой комментарий", @@ -139,6 +146,7 @@ "Common.Views.Comments.textReply": "Ответить", "Common.Views.Comments.textResolve": "Решить", "Common.Views.Comments.textResolved": "Решено", + "Common.Views.Comments.textSort": "Сортировать комментарии", "Common.Views.CopyWarningDialog.textDontShow": "Больше не показывать это сообщение", "Common.Views.CopyWarningDialog.textMsg": "Операции копирования, вырезания и вставки можно выполнить с помощью кнопок на панели инструментов и команд контекстного меню только в этой вкладке редактора.

    Для копирования в другие приложения и вставки из них используйте следующие сочетания клавиш:", "Common.Views.CopyWarningDialog.textTitle": "Операции копирования, вырезания и вставки", @@ -365,7 +373,7 @@ "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Внимание", "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", - "PE.Controllers.LeftMenu.textLoadHistory": "Загрузка журнала версий...", + "PE.Controllers.LeftMenu.textLoadHistory": "Загрузка истории версий...", "PE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.", "PE.Controllers.LeftMenu.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.", "PE.Controllers.LeftMenu.textReplaceSuccess": "Поиск выполнен. Заменено вхождений: {0}", @@ -444,14 +452,18 @@ "PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.", "PE.Controllers.Main.textAnonymous": "Аноним", + "PE.Controllers.Main.textApplyAll": "Применить ко всем уравнениям", "PE.Controllers.Main.textBuyNow": "Перейти на сайт", "PE.Controllers.Main.textChangesSaved": "Все изменения сохранены", "PE.Controllers.Main.textClose": "Закрыть", "PE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку", "PE.Controllers.Main.textContactUs": "Связаться с отделом продаж", + "PE.Controllers.Main.textConvertEquation": "Это уравнение создано в старой версии редактора уравнений, которая больше не поддерживается. Чтобы изменить это уравнение, его необходимо преобразовать в формат Office Math ML.
    Преобразовать сейчас?", "PE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
    Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", + "PE.Controllers.Main.textDisconnect": "Соединение потеряно", "PE.Controllers.Main.textGuest": "Гость", "PE.Controllers.Main.textHasMacros": "Файл содержит автозапускаемые макросы.
    Хотите запустить макросы?", + "PE.Controllers.Main.textLearnMore": "Подробнее", "PE.Controllers.Main.textLoadingDocument": "Загрузка презентации", "PE.Controllers.Main.textLongName": "Введите имя длиной менее 128 символов.", "PE.Controllers.Main.textNoLicenseTitle": "Лицензионное ограничение", @@ -1300,11 +1312,8 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Сохранить копию как...", "PE.Views.FileMenu.btnSettingsCaption": "Дополнительные параметры...", "PE.Views.FileMenu.btnToEditCaption": "Редактировать", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пустая", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "По шаблону", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новую пустую презентацию, к которой Вы сможете применить стили и отформатировать при редактировании после того, как она будет создана. Или выберите один из шаблонов, чтобы создать презентацию определенного типа или предназначения, где уже предварительно применены некоторые стили.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новая презентация", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Шаблоны отсутствуют", + "PE.Views.FileMenuPanels.CreateNew.txtBlank": "Пустая презентация", + "PE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Создать новую", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Применить", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст", @@ -1635,70 +1644,34 @@ "PE.Views.SlideSettings.strBackground": "Цвет фона", "PE.Views.SlideSettings.strColor": "Цвет", "PE.Views.SlideSettings.strDateTime": "Показывать дату и время", - "PE.Views.SlideSettings.strDelay": "Задержка", - "PE.Views.SlideSettings.strDuration": "Длит.", - "PE.Views.SlideSettings.strEffect": "Эффект", "PE.Views.SlideSettings.strFill": "Фон", "PE.Views.SlideSettings.strForeground": "Цвет переднего плана", "PE.Views.SlideSettings.strPattern": "Узор", "PE.Views.SlideSettings.strSlideNum": "Показывать номер слайда", - "PE.Views.SlideSettings.strStartOnClick": "Запускать щелчком", "PE.Views.SlideSettings.strTransparency": "Непрозрачность", "PE.Views.SlideSettings.textAdvanced": "Дополнительные параметры", "PE.Views.SlideSettings.textAngle": "Угол", - "PE.Views.SlideSettings.textApplyAll": "Применить ко всем слайдам", - "PE.Views.SlideSettings.textBlack": "Через черное", - "PE.Views.SlideSettings.textBottom": "Снизу", - "PE.Views.SlideSettings.textBottomLeft": "Снизу слева", - "PE.Views.SlideSettings.textBottomRight": "Снизу справа", - "PE.Views.SlideSettings.textClock": "Часы", - "PE.Views.SlideSettings.textClockwise": "По часовой стрелке", "PE.Views.SlideSettings.textColor": "Заливка цветом", - "PE.Views.SlideSettings.textCounterclockwise": "Против часовой стрелки", - "PE.Views.SlideSettings.textCover": "Наплыв", "PE.Views.SlideSettings.textDirection": "Направление", "PE.Views.SlideSettings.textEmptyPattern": "Без узора", - "PE.Views.SlideSettings.textFade": "Выцветание", "PE.Views.SlideSettings.textFromFile": "Из файла", "PE.Views.SlideSettings.textFromStorage": "Из хранилища", "PE.Views.SlideSettings.textFromUrl": "По URL", "PE.Views.SlideSettings.textGradient": "Точки градиента", "PE.Views.SlideSettings.textGradientFill": "Градиентная заливка", - "PE.Views.SlideSettings.textHorizontalIn": "По горизонтали внутрь", - "PE.Views.SlideSettings.textHorizontalOut": "По горизонтали наружу", "PE.Views.SlideSettings.textImageTexture": "Изображение или текстура", - "PE.Views.SlideSettings.textLeft": "Слева", "PE.Views.SlideSettings.textLinear": "Линейный", "PE.Views.SlideSettings.textNoFill": "Без заливки", - "PE.Views.SlideSettings.textNone": "Нет", "PE.Views.SlideSettings.textPatternFill": "Узор", "PE.Views.SlideSettings.textPosition": "Положение", - "PE.Views.SlideSettings.textPreview": "Просмотр", - "PE.Views.SlideSettings.textPush": "Задвигание", "PE.Views.SlideSettings.textRadial": "Радиальный", "PE.Views.SlideSettings.textReset": "Сбросить изменения", - "PE.Views.SlideSettings.textRight": "Справа", - "PE.Views.SlideSettings.textSec": "сек", "PE.Views.SlideSettings.textSelectImage": "Выбрать изображение", "PE.Views.SlideSettings.textSelectTexture": "Выбрать", - "PE.Views.SlideSettings.textSmoothly": "Плавно", - "PE.Views.SlideSettings.textSplit": "Панорама", "PE.Views.SlideSettings.textStretch": "Растяжение", "PE.Views.SlideSettings.textStyle": "Стиль", "PE.Views.SlideSettings.textTexture": "Из текстуры", "PE.Views.SlideSettings.textTile": "Плитка", - "PE.Views.SlideSettings.textTop": "Сверху", - "PE.Views.SlideSettings.textTopLeft": "Сверху слева", - "PE.Views.SlideSettings.textTopRight": "Сверху справа", - "PE.Views.SlideSettings.textUnCover": "Открывание", - "PE.Views.SlideSettings.textVerticalIn": "По вертикали внутрь", - "PE.Views.SlideSettings.textVerticalOut": "По вертикали наружу", - "PE.Views.SlideSettings.textWedge": "Симметрично по кругу", - "PE.Views.SlideSettings.textWipe": "Появление", - "PE.Views.SlideSettings.textZoom": "Масштабирование", - "PE.Views.SlideSettings.textZoomIn": "Увеличение", - "PE.Views.SlideSettings.textZoomOut": "Уменьшение", - "PE.Views.SlideSettings.textZoomRotate": "Увеличение с поворотом", "PE.Views.SlideSettings.tipAddGradientPoint": "Добавить точку градиента", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Удалить точку градиента", "PE.Views.SlideSettings.txtBrownPaper": "Крафт-бумага", @@ -1908,7 +1881,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Две колонки", "PE.Views.Toolbar.textItalic": "Курсив", "PE.Views.Toolbar.textListSettings": "Параметры списка", - "PE.Views.Toolbar.textNewColor": "Пользовательский цвет", "PE.Views.Toolbar.textShapeAlignBottom": "Выровнять по нижнему краю", "PE.Views.Toolbar.textShapeAlignCenter": "Выровнять по центру", "PE.Views.Toolbar.textShapeAlignLeft": "Выровнять по левому краю", @@ -1927,6 +1899,7 @@ "PE.Views.Toolbar.textTabHome": "Главная", "PE.Views.Toolbar.textTabInsert": "Вставка", "PE.Views.Toolbar.textTabProtect": "Защита", + "PE.Views.Toolbar.textTabTransitions": "Переходы", "PE.Views.Toolbar.textTitleError": "Ошибка", "PE.Views.Toolbar.textUnderline": "Подчеркнутый", "PE.Views.Toolbar.tipAddSlide": "Добавить слайд", @@ -2005,5 +1978,41 @@ "PE.Views.Toolbar.txtScheme8": "Поток", "PE.Views.Toolbar.txtScheme9": "Литейная", "PE.Views.Toolbar.txtSlideAlign": "Выровнять относительно слайда", - "PE.Views.Toolbar.txtUngroup": "Разгруппировать" + "PE.Views.Toolbar.txtUngroup": "Разгруппировать", + "PE.Views.Transitions.strDelay": "Задержка", + "PE.Views.Transitions.strDuration": "Длит.", + "PE.Views.Transitions.strStartOnClick": "Запускать щелчком", + "PE.Views.Transitions.textBlack": "Через черное", + "PE.Views.Transitions.textBottom": "Снизу", + "PE.Views.Transitions.textBottomLeft": "Снизу слева", + "PE.Views.Transitions.textBottomRight": "Снизу справа", + "PE.Views.Transitions.textClock": "Часы", + "PE.Views.Transitions.textClockwise": "По часовой стрелке", + "PE.Views.Transitions.textCounterclockwise": "Против часовой стрелки", + "PE.Views.Transitions.textCover": "Наплыв", + "PE.Views.Transitions.textFade": "Выцветание", + "PE.Views.Transitions.textHorizontalIn": "По горизонтали внутрь", + "PE.Views.Transitions.textHorizontalOut": "По горизонтали наружу", + "PE.Views.Transitions.textLeft": "Слева", + "PE.Views.Transitions.textNone": "Нет", + "PE.Views.Transitions.textPush": "Задвигание", + "PE.Views.Transitions.textRight": "Справа", + "PE.Views.Transitions.textSmoothly": "Плавно", + "PE.Views.Transitions.textSplit": "Панорама", + "PE.Views.Transitions.textTop": "Сверху", + "PE.Views.Transitions.textTopLeft": "Сверху слева", + "PE.Views.Transitions.textTopRight": "Сверху справа", + "PE.Views.Transitions.textUnCover": "Открывание", + "PE.Views.Transitions.textVerticalIn": "По вертикали внутрь", + "PE.Views.Transitions.textVerticalOut": "По вертикали наружу", + "PE.Views.Transitions.textWedge": "Симметрично по кругу", + "PE.Views.Transitions.textWipe": "Появление", + "PE.Views.Transitions.textZoom": "Масштабирование", + "PE.Views.Transitions.textZoomIn": "Увеличение", + "PE.Views.Transitions.textZoomOut": "Уменьшение", + "PE.Views.Transitions.textZoomRotate": "Увеличение с поворотом", + "PE.Views.Transitions.txtApplyToAll": "Применить ко всем слайдам", + "PE.Views.Transitions.txtParameters": "Параметры", + "PE.Views.Transitions.txtPreview": "Просмотр", + "PE.Views.Transitions.txtSec": "сек" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 4d80f2919..182251ab9 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -20,8 +20,6 @@ "Common.define.chartData.textPoint": "Bodový graf", "Common.define.chartData.textStock": "Akcie/burzový graf", "Common.define.chartData.textSurface": "Povrch", - "Common.UI.ColorButton.textAutoColor": "Automaticky", - "Common.UI.ColorButton.textNewColor": "Pridať novú vlastnú farbu", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -1057,11 +1055,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Uložiť", "PE.Views.FileMenu.btnSettingsCaption": "Pokročilé nastavenia...", "PE.Views.FileMenu.btnToEditCaption": "Upraviť prezentáciu", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdneho", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Zo šablóny", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvorte novú prázdnu prezentáciu, ktorú budete môcť štýlovať a formátovať po jej vytvorení počas úpravy. Alebo si vyberte jednu zo šablón, aby ste spustili prezentáciu určitého typu alebo účelu, kde niektoré štýly už boli predbežne aplikované.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nová prezentácia", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Neexistujú žiadne šablóny", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Použiť", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Pridať autora", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Pridať text", @@ -1356,66 +1349,30 @@ "PE.Views.SignatureSettings.txtRemoveWarning": "Chcete odstrániť tento podpis?
    Nie je možné to vrátiť späť.", "PE.Views.SlideSettings.strBackground": "Farba pozadia", "PE.Views.SlideSettings.strColor": "Farba", - "PE.Views.SlideSettings.strDelay": "Oneskorenie", - "PE.Views.SlideSettings.strDuration": "Trvanie", - "PE.Views.SlideSettings.strEffect": "Efekt", "PE.Views.SlideSettings.strFill": "Pozadie", "PE.Views.SlideSettings.strForeground": "Farba popredia", "PE.Views.SlideSettings.strPattern": "Vzor", - "PE.Views.SlideSettings.strStartOnClick": "Začať kliknutím", "PE.Views.SlideSettings.textAdvanced": "Zobraziť pokročilé nastavenia", "PE.Views.SlideSettings.textAngle": "Uhol", - "PE.Views.SlideSettings.textApplyAll": "Použiť na všetky snímky", - "PE.Views.SlideSettings.textBlack": "Prostredníctvom čiernej", - "PE.Views.SlideSettings.textBottom": "Dole", - "PE.Views.SlideSettings.textBottomLeft": "Dole vľavo", - "PE.Views.SlideSettings.textBottomRight": "Dole vpravo", - "PE.Views.SlideSettings.textClock": "Hodiny", - "PE.Views.SlideSettings.textClockwise": "V smere hodinových ručičiek", "PE.Views.SlideSettings.textColor": "Vyplniť farbou", - "PE.Views.SlideSettings.textCounterclockwise": "Proti smeru hodinových ručičiek", - "PE.Views.SlideSettings.textCover": "Zakryť", "PE.Views.SlideSettings.textDirection": "Smer", "PE.Views.SlideSettings.textEmptyPattern": "Bez vzoru", - "PE.Views.SlideSettings.textFade": "Vyblednúť", "PE.Views.SlideSettings.textFromFile": "Zo súboru", "PE.Views.SlideSettings.textFromStorage": "Z úložiska", "PE.Views.SlideSettings.textFromUrl": "Z URL adresy ", "PE.Views.SlideSettings.textGradient": "Prechod", "PE.Views.SlideSettings.textGradientFill": "Výplň prechodom", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontálne dnu", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontálne von", "PE.Views.SlideSettings.textImageTexture": "Obrázok alebo textúra", - "PE.Views.SlideSettings.textLeft": "Vľavo", "PE.Views.SlideSettings.textLinear": "Lineárny/čiarový", "PE.Views.SlideSettings.textNoFill": "Bez výplne", - "PE.Views.SlideSettings.textNone": "Žiadny", "PE.Views.SlideSettings.textPatternFill": "Vzor", - "PE.Views.SlideSettings.textPreview": "Náhľad", - "PE.Views.SlideSettings.textPush": "Posunúť", "PE.Views.SlideSettings.textRadial": "Kruhový/hviezdicovitý", "PE.Views.SlideSettings.textReset": "Obnoviť zmeny", - "PE.Views.SlideSettings.textRight": "Vpravo", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Vybrať", - "PE.Views.SlideSettings.textSmoothly": "Plynule", - "PE.Views.SlideSettings.textSplit": "Rozdeliť", "PE.Views.SlideSettings.textStretch": "Roztiahnuť", "PE.Views.SlideSettings.textStyle": "Štýl", "PE.Views.SlideSettings.textTexture": "Z textúry", "PE.Views.SlideSettings.textTile": "Dlaždica", - "PE.Views.SlideSettings.textTop": "Hore", - "PE.Views.SlideSettings.textTopLeft": "Hore vľavo", - "PE.Views.SlideSettings.textTopRight": "Hore vpravo", - "PE.Views.SlideSettings.textUnCover": "Odkryť", - "PE.Views.SlideSettings.textVerticalIn": "Vertikálne dnu", - "PE.Views.SlideSettings.textVerticalOut": "Vertikálne von", - "PE.Views.SlideSettings.textWedge": "Konjunkcia", - "PE.Views.SlideSettings.textWipe": "Rozotrieť", - "PE.Views.SlideSettings.textZoom": "Priblíženie", - "PE.Views.SlideSettings.textZoomIn": "Priblížiť", - "PE.Views.SlideSettings.textZoomOut": "Oddialiť", - "PE.Views.SlideSettings.textZoomRotate": "Priblížiť a otáčať", "PE.Views.SlideSettings.tipAddGradientPoint": "Pridať spádový bod", "PE.Views.SlideSettings.txtBrownPaper": "Hnedý/baliaci papier", "PE.Views.SlideSettings.txtCanvas": "Plátno", @@ -1602,7 +1559,6 @@ "PE.Views.Toolbar.textBold": "Tučné", "PE.Views.Toolbar.textColumnsCustom": "Vlastné stĺpce", "PE.Views.Toolbar.textItalic": "Kurzíva", - "PE.Views.Toolbar.textNewColor": "Vlastná farba", "PE.Views.Toolbar.textShapeAlignBottom": "Zarovnať dole", "PE.Views.Toolbar.textShapeAlignCenter": "Centrovať", "PE.Views.Toolbar.textShapeAlignLeft": "Zarovnať doľava", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index 912644b66..d811f69d6 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -441,11 +441,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Shrani", "PE.Views.FileMenu.btnSettingsCaption": "Napredne nastavitve...", "PE.Views.FileMenu.btnToEditCaption": "Uredi predstavitev", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z praznine", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z predloge", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Ustvari novo prazno predstavitev, ki jo boste po ustvaritvi lahko stilizirali in formatirali med urejanjem. Ali pa izberite eno izmed predlog za začetek predstavitve določene vrste ali namena z nekaterimi vnaprej določenimi slogi.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nova predstavitev", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Ni predlog", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Uporabi", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj avtorja", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj besedilo", @@ -656,64 +651,29 @@ "PE.Views.ShapeSettingsAdvanced.txtNone": "nič", "PE.Views.SlideSettings.strBackground": "Barva ozadja", "PE.Views.SlideSettings.strColor": "Barva", - "PE.Views.SlideSettings.strDelay": "Zamik", - "PE.Views.SlideSettings.strDuration": "Trajanje", - "PE.Views.SlideSettings.strEffect": "Učinek", "PE.Views.SlideSettings.strFill": "Dopolni", "PE.Views.SlideSettings.strForeground": "Barva ospredja", "PE.Views.SlideSettings.strPattern": "Vzorec", - "PE.Views.SlideSettings.strStartOnClick": "Začni z klikom", "PE.Views.SlideSettings.textAdvanced": "Prikaži napredne nastavitve", - "PE.Views.SlideSettings.textApplyAll": "Uporabi za vse diapozitive", - "PE.Views.SlideSettings.textBlack": "Skozi črno", - "PE.Views.SlideSettings.textBottom": "Dno", - "PE.Views.SlideSettings.textBottomLeft": "Spodaj levo", - "PE.Views.SlideSettings.textBottomRight": "Spodaj desno", - "PE.Views.SlideSettings.textClock": "Ura", - "PE.Views.SlideSettings.textClockwise": "V smeri urinega kazalca", "PE.Views.SlideSettings.textColor": "Barvna izpolnitev", - "PE.Views.SlideSettings.textCounterclockwise": "V nasprotni smeri urinega kazalca", - "PE.Views.SlideSettings.textCover": "Pokrov", "PE.Views.SlideSettings.textDirection": "Smer", "PE.Views.SlideSettings.textEmptyPattern": "Ni vzorcev", - "PE.Views.SlideSettings.textFade": "Zbledi", "PE.Views.SlideSettings.textFromFile": "z datoteke", "PE.Views.SlideSettings.textFromStorage": "Iz shrambe", "PE.Views.SlideSettings.textFromUrl": "z URL", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "Polnjenje gradienta", - "PE.Views.SlideSettings.textHorizontalIn": "Horizontalno v", - "PE.Views.SlideSettings.textHorizontalOut": "Horizontalno iz", "PE.Views.SlideSettings.textImageTexture": "Slika ali tekstura", - "PE.Views.SlideSettings.textLeft": "Levo", "PE.Views.SlideSettings.textLinear": "Linearna", "PE.Views.SlideSettings.textNoFill": "Ni polnila", - "PE.Views.SlideSettings.textNone": "nič", "PE.Views.SlideSettings.textPatternFill": "Vzorec", - "PE.Views.SlideSettings.textPreview": "Predogled", - "PE.Views.SlideSettings.textPush": "Potisni", "PE.Views.SlideSettings.textRadial": "Radial", "PE.Views.SlideSettings.textReset": "Ponastavi spremembe", - "PE.Views.SlideSettings.textRight": "Desno", "PE.Views.SlideSettings.textSelectTexture": "Izberi", - "PE.Views.SlideSettings.textSmoothly": "Gladko", - "PE.Views.SlideSettings.textSplit": "Razdeli", "PE.Views.SlideSettings.textStretch": "Raztegni", "PE.Views.SlideSettings.textStyle": "Slog", "PE.Views.SlideSettings.textTexture": "S teksture", "PE.Views.SlideSettings.textTile": "Ploščica", - "PE.Views.SlideSettings.textTop": "Vrh", - "PE.Views.SlideSettings.textTopLeft": "Zgoraj levo", - "PE.Views.SlideSettings.textTopRight": "Zgoraj desno", - "PE.Views.SlideSettings.textUnCover": "Razkrij", - "PE.Views.SlideSettings.textVerticalIn": "Vertikalen v", - "PE.Views.SlideSettings.textVerticalOut": "Vertikalen iz", - "PE.Views.SlideSettings.textWedge": "Zagozda", - "PE.Views.SlideSettings.textWipe": "Obriši", - "PE.Views.SlideSettings.textZoom": "Povečava", - "PE.Views.SlideSettings.textZoomIn": "Približaj", - "PE.Views.SlideSettings.textZoomOut": "Oddalji", - "PE.Views.SlideSettings.textZoomRotate": "Povečaj in zavrti", "PE.Views.SlideSettings.txtBrownPaper": "Rjav papir", "PE.Views.SlideSettings.txtCanvas": "Platno", "PE.Views.SlideSettings.txtCarton": "Karton", @@ -874,7 +834,6 @@ "PE.Views.Toolbar.textArrangeFront": "Premakni v ospredje", "PE.Views.Toolbar.textBold": "Krepko", "PE.Views.Toolbar.textItalic": "Poševno", - "PE.Views.Toolbar.textNewColor": "Barva po meri", "PE.Views.Toolbar.textShapeAlignBottom": "Poravnaj dno", "PE.Views.Toolbar.textShapeAlignCenter": "Poravnaj središče", "PE.Views.Toolbar.textShapeAlignLeft": "Poravnaj levo", diff --git a/apps/presentationeditor/main/locale/sv.json b/apps/presentationeditor/main/locale/sv.json index 971256441..e9cf9a3cc 100644 --- a/apps/presentationeditor/main/locale/sv.json +++ b/apps/presentationeditor/main/locale/sv.json @@ -50,8 +50,6 @@ "Common.Translation.warnFileLocked": "Dokumentet används av ett annat program. Du kan fortsätta redigera och spara den som en kopia.", "Common.Translation.warnFileLockedBtnEdit": "Skapa en kopia", "Common.Translation.warnFileLockedBtnView": "Öppna skrivskyddad", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Lägg till ny egen färg", "Common.UI.ComboBorderSize.txtNoBorders": "Inga ramar", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Inga ramar", "Common.UI.ComboDataView.emptyComboText": "Inga stilar", @@ -153,7 +151,7 @@ "Common.Views.Header.labelCoUsersDescr": "Dokumentet redigeras för närvarande av flera användare.", "Common.Views.Header.textAddFavorite": "Markera som favorit", "Common.Views.Header.textAdvSettings": "Avancerade inställningar", - "Common.Views.Header.textBack": "Gå till filens plats", + "Common.Views.Header.textBack": "Gå till dokument", "Common.Views.Header.textCompactView": "Dölj verktygsrad", "Common.Views.Header.textHideLines": "Dölj linjaler", "Common.Views.Header.textHideNotes": "Dölj noteringar", @@ -1281,7 +1279,7 @@ "PE.Views.DocumentPreview.txtPrev": "Föregående bild", "PE.Views.DocumentPreview.txtReset": "Återställ", "PE.Views.FileMenu.btnAboutCaption": "Om", - "PE.Views.FileMenu.btnBackCaption": "Gå till filens plats", + "PE.Views.FileMenu.btnBackCaption": "Gå till dokument", "PE.Views.FileMenu.btnCloseMenuCaption": "Stäng meny", "PE.Views.FileMenu.btnCreateNewCaption": "Skapa ny", "PE.Views.FileMenu.btnDownloadCaption": "Ladda ner som...", @@ -1299,11 +1297,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Spara kopia som...", "PE.Views.FileMenu.btnSettingsCaption": "Avancerade inställningar...", "PE.Views.FileMenu.btnToEditCaption": "Redigera presentation", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Från blank", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Från mall", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Skapa en ny tom presentation som du kan utforma och formatera efter att den har skapats. Eller välj en av mallarna för att starta en presentation av en viss typ där vissa stilar redan har applicerats i förväg.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Ny presentation", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Det finns inga mallar", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Tillämpa", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Lägg till författare", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Lägg till text", @@ -1634,70 +1627,34 @@ "PE.Views.SlideSettings.strBackground": "Bakgrundsfärg", "PE.Views.SlideSettings.strColor": "Färg", "PE.Views.SlideSettings.strDateTime": "Visa datum och tid", - "PE.Views.SlideSettings.strDelay": "Fördröjning", - "PE.Views.SlideSettings.strDuration": "Varaktighet", - "PE.Views.SlideSettings.strEffect": "Effekt", "PE.Views.SlideSettings.strFill": "Bakgrund", "PE.Views.SlideSettings.strForeground": "Förgrundsfärg", "PE.Views.SlideSettings.strPattern": "Mönster", "PE.Views.SlideSettings.strSlideNum": "Visa bildnummer", - "PE.Views.SlideSettings.strStartOnClick": "Börja vid klick", "PE.Views.SlideSettings.strTransparency": "Opacitet", "PE.Views.SlideSettings.textAdvanced": "Visa avancerade inställningar", "PE.Views.SlideSettings.textAngle": "Vinkel", - "PE.Views.SlideSettings.textApplyAll": "Applicera på alla bilder", - "PE.Views.SlideSettings.textBlack": "Genom svart", - "PE.Views.SlideSettings.textBottom": "Nederst", - "PE.Views.SlideSettings.textBottomLeft": "Nederst vänster", - "PE.Views.SlideSettings.textBottomRight": "Nederst höger", - "PE.Views.SlideSettings.textClock": "Klocka", - "PE.Views.SlideSettings.textClockwise": "Medurs", "PE.Views.SlideSettings.textColor": "Färgfyllnad", - "PE.Views.SlideSettings.textCounterclockwise": "Moturs", - "PE.Views.SlideSettings.textCover": "Omslag", "PE.Views.SlideSettings.textDirection": "Riktning", "PE.Views.SlideSettings.textEmptyPattern": "Inget mönster", - "PE.Views.SlideSettings.textFade": "Fade", "PE.Views.SlideSettings.textFromFile": "Från fil", "PE.Views.SlideSettings.textFromStorage": "Från lagring", "PE.Views.SlideSettings.textFromUrl": "Från URL", "PE.Views.SlideSettings.textGradient": "Fyllning", "PE.Views.SlideSettings.textGradientFill": "Fyllning", - "PE.Views.SlideSettings.textHorizontalIn": "Horisontell in", - "PE.Views.SlideSettings.textHorizontalOut": "Horisontell ut", "PE.Views.SlideSettings.textImageTexture": "Bild eller mönster", - "PE.Views.SlideSettings.textLeft": "Vänster", "PE.Views.SlideSettings.textLinear": "Linjär", "PE.Views.SlideSettings.textNoFill": "Ingen fyllning", - "PE.Views.SlideSettings.textNone": "Inga", "PE.Views.SlideSettings.textPatternFill": "Mönster", "PE.Views.SlideSettings.textPosition": "Position", - "PE.Views.SlideSettings.textPreview": "Förhandsgranska", - "PE.Views.SlideSettings.textPush": "Tryck", "PE.Views.SlideSettings.textRadial": "Radiell", "PE.Views.SlideSettings.textReset": "Återställ ändringar", - "PE.Views.SlideSettings.textRight": "Höger", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "Välj bild", "PE.Views.SlideSettings.textSelectTexture": "Välj", - "PE.Views.SlideSettings.textSmoothly": "Smoothly", - "PE.Views.SlideSettings.textSplit": "Dela", "PE.Views.SlideSettings.textStretch": "Sträck", "PE.Views.SlideSettings.textStyle": "Stil", "PE.Views.SlideSettings.textTexture": "Från mönster", "PE.Views.SlideSettings.textTile": "Bricka", - "PE.Views.SlideSettings.textTop": "Överst", - "PE.Views.SlideSettings.textTopLeft": "Vänsterjustera i överkant", - "PE.Views.SlideSettings.textTopRight": "Övre höger", - "PE.Views.SlideSettings.textUnCover": "Avtäcka", - "PE.Views.SlideSettings.textVerticalIn": "Vertikal in", - "PE.Views.SlideSettings.textVerticalOut": "Vertikal ut", - "PE.Views.SlideSettings.textWedge": "Kil", - "PE.Views.SlideSettings.textWipe": "Rensa", - "PE.Views.SlideSettings.textZoom": "Zooma", - "PE.Views.SlideSettings.textZoomIn": "Zooma in", - "PE.Views.SlideSettings.textZoomOut": "Zooma ut", - "PE.Views.SlideSettings.textZoomRotate": "Zooma och rotera", "PE.Views.SlideSettings.tipAddGradientPoint": "Lägg till lutningspunkt", "PE.Views.SlideSettings.tipRemoveGradientPoint": "Ta bort lutningspunkten", "PE.Views.SlideSettings.txtBrownPaper": "Brunt papper", @@ -1907,7 +1864,6 @@ "PE.Views.Toolbar.textColumnsTwo": "Två kolumner", "PE.Views.Toolbar.textItalic": "Kursiv", "PE.Views.Toolbar.textListSettings": "Listinställningar", - "PE.Views.Toolbar.textNewColor": "Anpassad färg", "PE.Views.Toolbar.textShapeAlignBottom": "Justera nederst", "PE.Views.Toolbar.textShapeAlignCenter": "Centrera", "PE.Views.Toolbar.textShapeAlignLeft": "Vänsterjustera", diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index d82b8f1b7..b1362cc9c 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -13,7 +13,6 @@ "Common.define.chartData.textPoint": "Nokta grafiği", "Common.define.chartData.textStock": "Stok Grafiği", "Common.define.chartData.textSurface": "Yüzey", - "Common.UI.ColorButton.textNewColor": "Özel Renk", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -830,11 +829,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Kaydet", "PE.Views.FileMenu.btnSettingsCaption": "Gelişmiş Ayarlar...", "PE.Views.FileMenu.btnToEditCaption": "Sunumu Düzenle", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Boştan", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Şablondan", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş bir sunum oluşturun. Yada şablonlardan birini seçerek belli tipte yada amaç için sunum başlatın.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Sunum", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Şablon yok", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Yazar Ekle", "PE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Uygulama", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı", @@ -1044,64 +1038,28 @@ "PE.Views.ShapeSettingsAdvanced.txtNone": "hiçbiri", "PE.Views.SlideSettings.strBackground": "Arka plan rengi", "PE.Views.SlideSettings.strColor": "Renk", - "PE.Views.SlideSettings.strDelay": "Geciktir", - "PE.Views.SlideSettings.strDuration": "Süre", - "PE.Views.SlideSettings.strEffect": "Efekt", "PE.Views.SlideSettings.strFill": "Doldur", "PE.Views.SlideSettings.strForeground": "Önplan rengi", "PE.Views.SlideSettings.strPattern": "Desen", - "PE.Views.SlideSettings.strStartOnClick": "Tıkla Başla", "PE.Views.SlideSettings.textAdvanced": "Gelişmiş ayarları göster", - "PE.Views.SlideSettings.textApplyAll": "Tüm Slaytlar için Uygula", - "PE.Views.SlideSettings.textBlack": "Siyah Üzerinden", - "PE.Views.SlideSettings.textBottom": "Alt", - "PE.Views.SlideSettings.textBottomLeft": "Alt Sol", - "PE.Views.SlideSettings.textBottomRight": "Alt Sağ", - "PE.Views.SlideSettings.textClock": "Saat", - "PE.Views.SlideSettings.textClockwise": "Saat yönünde", "PE.Views.SlideSettings.textColor": "Renk Dolgusu", - "PE.Views.SlideSettings.textCounterclockwise": "Ters saat yönü", - "PE.Views.SlideSettings.textCover": "Kılıf", "PE.Views.SlideSettings.textDirection": "Yön", "PE.Views.SlideSettings.textEmptyPattern": "Desen Yok", - "PE.Views.SlideSettings.textFade": "Gölge", "PE.Views.SlideSettings.textFromFile": "Dosyadan", "PE.Views.SlideSettings.textFromUrl": "URL'den", "PE.Views.SlideSettings.textGradient": "Gradyan", "PE.Views.SlideSettings.textGradientFill": "Gradyan Dolgu", - "PE.Views.SlideSettings.textHorizontalIn": "Yatay İçeri", - "PE.Views.SlideSettings.textHorizontalOut": "Yatay Dışarı", "PE.Views.SlideSettings.textImageTexture": "Resim yada Doldurma Deseni", - "PE.Views.SlideSettings.textLeft": "Sol", "PE.Views.SlideSettings.textLinear": "Doğrusal", "PE.Views.SlideSettings.textNoFill": "Dolgu Yok", - "PE.Views.SlideSettings.textNone": "hiçbiri", "PE.Views.SlideSettings.textPatternFill": "Desen", - "PE.Views.SlideSettings.textPreview": "Önizleme", - "PE.Views.SlideSettings.textPush": "İt", "PE.Views.SlideSettings.textRadial": "Radyal", "PE.Views.SlideSettings.textReset": "Reset Changes", - "PE.Views.SlideSettings.textRight": "Sağ", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Seç", - "PE.Views.SlideSettings.textSmoothly": "Kolayca", - "PE.Views.SlideSettings.textSplit": "Ayır", "PE.Views.SlideSettings.textStretch": "Esnet", "PE.Views.SlideSettings.textStyle": "Stil", "PE.Views.SlideSettings.textTexture": "Doldurma deseninden", "PE.Views.SlideSettings.textTile": "Desen", - "PE.Views.SlideSettings.textTop": "Üst", - "PE.Views.SlideSettings.textTopLeft": "Üst Sol", - "PE.Views.SlideSettings.textTopRight": "Üst Sağ", - "PE.Views.SlideSettings.textUnCover": "Meydana çıkar", - "PE.Views.SlideSettings.textVerticalIn": "Dikey İçeri", - "PE.Views.SlideSettings.textVerticalOut": "Dikey Dışarı", - "PE.Views.SlideSettings.textWedge": "Yarma", - "PE.Views.SlideSettings.textWipe": "Temizle", - "PE.Views.SlideSettings.textZoom": "Zum", - "PE.Views.SlideSettings.textZoomIn": "Yakınlaştır", - "PE.Views.SlideSettings.textZoomOut": "Uzaklaştır", - "PE.Views.SlideSettings.textZoomRotate": "Zum ve Döndür", "PE.Views.SlideSettings.txtBrownPaper": "Kahverengi Kağıt", "PE.Views.SlideSettings.txtCanvas": "Tuval", "PE.Views.SlideSettings.txtCarton": "Karton", @@ -1269,7 +1227,6 @@ "PE.Views.Toolbar.textArrangeFront": "Önplana Getir", "PE.Views.Toolbar.textBold": "Kalın", "PE.Views.Toolbar.textItalic": "İtalik", - "PE.Views.Toolbar.textNewColor": "Özel Renk", "PE.Views.Toolbar.textShapeAlignBottom": "Alta Hizala", "PE.Views.Toolbar.textShapeAlignCenter": "Ortaya Hizala", "PE.Views.Toolbar.textShapeAlignLeft": "Sola Hizala", diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index a31530045..c2c7a706b 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -843,11 +843,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "Зберегти копію як...", "PE.Views.FileMenu.btnSettingsCaption": "Розширені налаштування...", "PE.Views.FileMenu.btnToEditCaption": "Редагувати презентацію", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "З бланку", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "З шаблону", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Створіть нову порожню презентацію, яку ви зможете стилювати та форматувати під час редагування. Або виберіть один з шаблонів, щоб розпочати розроблення презентації певного типу або мети, де деякі стилі вже були попередньо застосовані.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Нова презентація", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Немає шаблонів", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Застосувати", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Додати автора", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Додати текст", @@ -1079,64 +1074,28 @@ "PE.Views.SignatureSettings.notcriticalErrorTitle": "Увага", "PE.Views.SlideSettings.strBackground": "Колір фону", "PE.Views.SlideSettings.strColor": "Колір", - "PE.Views.SlideSettings.strDelay": "Затримка", - "PE.Views.SlideSettings.strDuration": "Тривалість", - "PE.Views.SlideSettings.strEffect": "Ефект", "PE.Views.SlideSettings.strFill": "Задній фон", "PE.Views.SlideSettings.strForeground": "Колір переднього плану", "PE.Views.SlideSettings.strPattern": "Візерунок", - "PE.Views.SlideSettings.strStartOnClick": "Натисніть на старт", "PE.Views.SlideSettings.textAdvanced": "Показати додаткові налаштування", - "PE.Views.SlideSettings.textApplyAll": "Додати до усіх слайдів", - "PE.Views.SlideSettings.textBlack": "Через Чорний", - "PE.Views.SlideSettings.textBottom": "Внизу", - "PE.Views.SlideSettings.textBottomLeft": "Внизу зліва", - "PE.Views.SlideSettings.textBottomRight": "Внизу справа", - "PE.Views.SlideSettings.textClock": "Годинник", - "PE.Views.SlideSettings.textClockwise": "За годинниковою стрілкою", "PE.Views.SlideSettings.textColor": "Заповнити колір", - "PE.Views.SlideSettings.textCounterclockwise": "Проти годинникової стрілки", - "PE.Views.SlideSettings.textCover": "Покрити", "PE.Views.SlideSettings.textDirection": "Напрямок", "PE.Views.SlideSettings.textEmptyPattern": "Немає шаблону", - "PE.Views.SlideSettings.textFade": "Зникати", "PE.Views.SlideSettings.textFromFile": "З файлу", "PE.Views.SlideSettings.textFromUrl": "З URL", "PE.Views.SlideSettings.textGradient": "Градієнт", "PE.Views.SlideSettings.textGradientFill": "Заповнити градієнт", - "PE.Views.SlideSettings.textHorizontalIn": "Горизонтально в", - "PE.Views.SlideSettings.textHorizontalOut": "Горизонтальний вихід", "PE.Views.SlideSettings.textImageTexture": "Зображення або текстура", - "PE.Views.SlideSettings.textLeft": "Лівий", "PE.Views.SlideSettings.textLinear": "Лінійний", "PE.Views.SlideSettings.textNoFill": "Немає заповнення", - "PE.Views.SlideSettings.textNone": "Жоден", "PE.Views.SlideSettings.textPatternFill": "Візерунок", - "PE.Views.SlideSettings.textPreview": "Попередній перегляд", - "PE.Views.SlideSettings.textPush": "Натиснути", "PE.Views.SlideSettings.textRadial": "Радіальний", "PE.Views.SlideSettings.textReset": "Встановити зміни", - "PE.Views.SlideSettings.textRight": "Право", - "PE.Views.SlideSettings.textSec": "с", "PE.Views.SlideSettings.textSelectTexture": "Обрати", - "PE.Views.SlideSettings.textSmoothly": "Гладко", - "PE.Views.SlideSettings.textSplit": "Розкол", "PE.Views.SlideSettings.textStretch": "Розтягнути", "PE.Views.SlideSettings.textStyle": "Стиль", "PE.Views.SlideSettings.textTexture": "З текстури", "PE.Views.SlideSettings.textTile": "Забеспечити таємність", - "PE.Views.SlideSettings.textTop": "Верх", - "PE.Views.SlideSettings.textTopLeft": "Верх зліва", - "PE.Views.SlideSettings.textTopRight": "Верх справа", - "PE.Views.SlideSettings.textUnCover": "Розкрий", - "PE.Views.SlideSettings.textVerticalIn": "Вертикальний вхід", - "PE.Views.SlideSettings.textVerticalOut": "Вертикальний вихід", - "PE.Views.SlideSettings.textWedge": "Трикутна призма", - "PE.Views.SlideSettings.textWipe": "Витирати", - "PE.Views.SlideSettings.textZoom": "Збільшити", - "PE.Views.SlideSettings.textZoomIn": "Збільшити зображення", - "PE.Views.SlideSettings.textZoomOut": "Зменшити зображення", - "PE.Views.SlideSettings.textZoomRotate": "Збільшити і обертати", "PE.Views.SlideSettings.txtBrownPaper": "Коричневий папір", "PE.Views.SlideSettings.txtCanvas": "Полотно", "PE.Views.SlideSettings.txtCarton": "Картинка", @@ -1309,7 +1268,6 @@ "PE.Views.Toolbar.textArrangeFront": "Перенести на передній план", "PE.Views.Toolbar.textBold": "Жирний", "PE.Views.Toolbar.textItalic": "Курсив", - "PE.Views.Toolbar.textNewColor": "Власний колір", "PE.Views.Toolbar.textShapeAlignBottom": "Вирівняти знизу", "PE.Views.Toolbar.textShapeAlignCenter": "Вирівняти центр", "PE.Views.Toolbar.textShapeAlignLeft": "Вирівняти зліва", diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index cda9b4c23..c793ad8d1 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -13,7 +13,6 @@ "Common.define.chartData.textPoint": "XY (Phân tán)", "Common.define.chartData.textStock": "Cổ phiếu", "Common.define.chartData.textSurface": "Bề mặt", - "Common.UI.ColorButton.textNewColor": "Màu tùy chỉnh", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -803,11 +802,6 @@ "PE.Views.FileMenu.btnSaveCaption": "Lưu", "PE.Views.FileMenu.btnSettingsCaption": "Cài đặt nâng cao...", "PE.Views.FileMenu.btnToEditCaption": "Chỉnh sửa bản trình chiếu", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "Từ trang trắng", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Từ template", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Tạo thuyết trình mới để bạn có thể tạo kiểu và định dạng sau khi nó được tạo trong quá trình chỉnh sửa. Hoặc chọn một trong các template để bắt đầu trình bày một loại hoặc mục đích nào đó với một số kiểu có sẵn từ trước.", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "Bản trình chiếu mới", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "Không có template", "PE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả", "PE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập", "PE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Địa điểm", @@ -1013,64 +1007,28 @@ "PE.Views.ShapeSettingsAdvanced.txtNone": "không", "PE.Views.SlideSettings.strBackground": "Màu nền", "PE.Views.SlideSettings.strColor": "Màu sắc", - "PE.Views.SlideSettings.strDelay": "Trì hoãn", - "PE.Views.SlideSettings.strDuration": "Thời lượng", - "PE.Views.SlideSettings.strEffect": "Hiệu ứng", "PE.Views.SlideSettings.strFill": "Nền", "PE.Views.SlideSettings.strForeground": "Màu Foreground", "PE.Views.SlideSettings.strPattern": "Hoa văn", - "PE.Views.SlideSettings.strStartOnClick": "Bắt đầu bằng Nhấp chuột", "PE.Views.SlideSettings.textAdvanced": "Hiển thị Cài đặt Nâng cao", - "PE.Views.SlideSettings.textApplyAll": "Áp dụng cho tất cả slide", - "PE.Views.SlideSettings.textBlack": "Qua màu đen", - "PE.Views.SlideSettings.textBottom": "Dưới cùng", - "PE.Views.SlideSettings.textBottomLeft": "Dưới cùng bên trái", - "PE.Views.SlideSettings.textBottomRight": "Dưới cùng bên phải", - "PE.Views.SlideSettings.textClock": "Đồng hồ", - "PE.Views.SlideSettings.textClockwise": "Theo chiều kim đồng hồ", "PE.Views.SlideSettings.textColor": "Đổ màu", - "PE.Views.SlideSettings.textCounterclockwise": "Ngược chiều kim đồng hồ", - "PE.Views.SlideSettings.textCover": "Slide mở đầu", "PE.Views.SlideSettings.textDirection": "Hướng", "PE.Views.SlideSettings.textEmptyPattern": "Không hoa văn", - "PE.Views.SlideSettings.textFade": "Mất dần", "PE.Views.SlideSettings.textFromFile": "Từ file", "PE.Views.SlideSettings.textFromUrl": "Từ URL", "PE.Views.SlideSettings.textGradient": "Gradient", "PE.Views.SlideSettings.textGradientFill": "Đổ màu Gradient", - "PE.Views.SlideSettings.textHorizontalIn": "Ngang trong", - "PE.Views.SlideSettings.textHorizontalOut": "Ngang ngoài", "PE.Views.SlideSettings.textImageTexture": "Hình ảnh hoặc Texture", - "PE.Views.SlideSettings.textLeft": "Trái", "PE.Views.SlideSettings.textLinear": "Tuyến tính", "PE.Views.SlideSettings.textNoFill": "Không đổ màu", - "PE.Views.SlideSettings.textNone": "Không", "PE.Views.SlideSettings.textPatternFill": "Hoa văn", - "PE.Views.SlideSettings.textPreview": "Xem trước", - "PE.Views.SlideSettings.textPush": "Đẩy", "PE.Views.SlideSettings.textRadial": "Tỏa tròn", "PE.Views.SlideSettings.textReset": "Thiết lập lại Thay đổi", - "PE.Views.SlideSettings.textRight": "Bên phải", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectTexture": "Chọn", - "PE.Views.SlideSettings.textSmoothly": "Nhẹ nhàng", - "PE.Views.SlideSettings.textSplit": "Chia tách", "PE.Views.SlideSettings.textStretch": "Kéo dài", "PE.Views.SlideSettings.textStyle": "Kiểu", "PE.Views.SlideSettings.textTexture": "Từ Texture", "PE.Views.SlideSettings.textTile": "Đá lát", - "PE.Views.SlideSettings.textTop": "Trên cùng", - "PE.Views.SlideSettings.textTopLeft": "Phía trên bên trái", - "PE.Views.SlideSettings.textTopRight": "Phía trên bên phải", - "PE.Views.SlideSettings.textUnCover": "Bỏ làm trang đầu", - "PE.Views.SlideSettings.textVerticalIn": "Dọc trong", - "PE.Views.SlideSettings.textVerticalOut": "Dọc ngoài", - "PE.Views.SlideSettings.textWedge": "Hình nêm", - "PE.Views.SlideSettings.textWipe": "Tẩy xóa", - "PE.Views.SlideSettings.textZoom": "Thu phóng", - "PE.Views.SlideSettings.textZoomIn": "Phóng to", - "PE.Views.SlideSettings.textZoomOut": "Thu nhỏ", - "PE.Views.SlideSettings.textZoomRotate": "Thu phóng và Xoay", "PE.Views.SlideSettings.txtBrownPaper": "Giấy nâu", "PE.Views.SlideSettings.txtCanvas": "Canvas", "PE.Views.SlideSettings.txtCarton": "Hộp bìa cứng", @@ -1238,7 +1196,6 @@ "PE.Views.Toolbar.textArrangeFront": "Đưa lên Cận cảnh", "PE.Views.Toolbar.textBold": "Đậm", "PE.Views.Toolbar.textItalic": "Nghiêng", - "PE.Views.Toolbar.textNewColor": "Màu tùy chỉnh", "PE.Views.Toolbar.textShapeAlignBottom": "Căn dưới cùng", "PE.Views.Toolbar.textShapeAlignCenter": "Căn trung tâm", "PE.Views.Toolbar.textShapeAlignLeft": "Căn trái", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 17acace94..fefae6a1a 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -17,7 +17,6 @@ "Common.define.chartData.textSurface": "平面", "Common.Translation.warnFileLocked": "另一个应用正在编辑本文件。你仍然可以继续编辑此文件，你可以将你的编辑保存成另一个拷贝。", "Common.Translation.warnFileLockedBtnEdit": "创建拷贝", - "Common.UI.ColorButton.textNewColor": "添加新的自定义颜色", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1240,11 +1239,6 @@ "PE.Views.FileMenu.btnSaveCopyAsCaption": "将副本另存为...", "PE.Views.FileMenu.btnSettingsCaption": "高级设置…", "PE.Views.FileMenu.btnToEditCaption": "编辑演示文稿", - "PE.Views.FileMenuPanels.CreateNew.fromBlankText": "从空白", - "PE.Views.FileMenuPanels.CreateNew.fromTemplateText": "从模板", - "PE.Views.FileMenuPanels.CreateNew.newDescriptionText": "创建一个新的空白演示文稿，您可以在编辑过程中创建样式和格式。或者选择其中一个模板来启用某种类型或目的的演示文稿，这些模板已经预制了一些样式。", - "PE.Views.FileMenuPanels.CreateNew.newDocumentText": "新建幻灯片", - "PE.Views.FileMenuPanels.CreateNew.noTemplatesText": "没有模板", "PE.Views.FileMenuPanels.DocumentInfo.okButtonText": "应用", "PE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "添加作者", "PE.Views.FileMenuPanels.DocumentInfo.txtAddText": "添加文本", @@ -1574,69 +1568,33 @@ "PE.Views.SlideSettings.strBackground": "背景颜色", "PE.Views.SlideSettings.strColor": "颜色", "PE.Views.SlideSettings.strDateTime": "显示日期和时间", - "PE.Views.SlideSettings.strDelay": "延迟", - "PE.Views.SlideSettings.strDuration": "持续时间", - "PE.Views.SlideSettings.strEffect": "影响", "PE.Views.SlideSettings.strFill": "背景", "PE.Views.SlideSettings.strForeground": "前景色", "PE.Views.SlideSettings.strPattern": "模式", "PE.Views.SlideSettings.strSlideNum": "显示幻灯片编号", - "PE.Views.SlideSettings.strStartOnClick": "开始点击", "PE.Views.SlideSettings.textAdvanced": "显示高级设置", "PE.Views.SlideSettings.textAngle": "角度", - "PE.Views.SlideSettings.textApplyAll": "适用于所有幻灯片", - "PE.Views.SlideSettings.textBlack": "通过黑色", - "PE.Views.SlideSettings.textBottom": "底部", - "PE.Views.SlideSettings.textBottomLeft": "左下", - "PE.Views.SlideSettings.textBottomRight": "右下", - "PE.Views.SlideSettings.textClock": "时钟", - "PE.Views.SlideSettings.textClockwise": "顺时针", "PE.Views.SlideSettings.textColor": "颜色填充", - "PE.Views.SlideSettings.textCounterclockwise": "逆时针", - "PE.Views.SlideSettings.textCover": "罩", "PE.Views.SlideSettings.textDirection": "方向", "PE.Views.SlideSettings.textEmptyPattern": "无图案", - "PE.Views.SlideSettings.textFade": "褪色", "PE.Views.SlideSettings.textFromFile": "从文件导入", "PE.Views.SlideSettings.textFromStorage": "来自存储设备", "PE.Views.SlideSettings.textFromUrl": "从URL", "PE.Views.SlideSettings.textGradient": "渐变", "PE.Views.SlideSettings.textGradientFill": "渐变填充", - "PE.Views.SlideSettings.textHorizontalIn": "水平在", - "PE.Views.SlideSettings.textHorizontalOut": "水平出", "PE.Views.SlideSettings.textImageTexture": "图片或纹理", - "PE.Views.SlideSettings.textLeft": "左", "PE.Views.SlideSettings.textLinear": "线性", "PE.Views.SlideSettings.textNoFill": "没有填充", - "PE.Views.SlideSettings.textNone": "没有", "PE.Views.SlideSettings.textPatternFill": "模式", "PE.Views.SlideSettings.textPosition": "位置", - "PE.Views.SlideSettings.textPreview": "预览", - "PE.Views.SlideSettings.textPush": "推", "PE.Views.SlideSettings.textRadial": "径向", "PE.Views.SlideSettings.textReset": "重置更改", - "PE.Views.SlideSettings.textRight": "右", - "PE.Views.SlideSettings.textSec": "s", "PE.Views.SlideSettings.textSelectImage": "选取图片", "PE.Views.SlideSettings.textSelectTexture": "选择", - "PE.Views.SlideSettings.textSmoothly": "顺利", - "PE.Views.SlideSettings.textSplit": "分裂", "PE.Views.SlideSettings.textStretch": "伸展", "PE.Views.SlideSettings.textStyle": "类型", "PE.Views.SlideSettings.textTexture": "从纹理", "PE.Views.SlideSettings.textTile": "瓦", - "PE.Views.SlideSettings.textTop": "顶部", - "PE.Views.SlideSettings.textTopLeft": "左上", - "PE.Views.SlideSettings.textTopRight": "右上", - "PE.Views.SlideSettings.textUnCover": "揭露", - "PE.Views.SlideSettings.textVerticalIn": "垂直的", - "PE.Views.SlideSettings.textVerticalOut": "垂直输出", - "PE.Views.SlideSettings.textWedge": "楔", - "PE.Views.SlideSettings.textWipe": "擦拭", - "PE.Views.SlideSettings.textZoom": "放大", - "PE.Views.SlideSettings.textZoomIn": "放大", - "PE.Views.SlideSettings.textZoomOut": "缩小", - "PE.Views.SlideSettings.textZoomRotate": "缩放并旋转", "PE.Views.SlideSettings.tipAddGradientPoint": "新增渐变点", "PE.Views.SlideSettings.tipRemoveGradientPoint": "删除渐变点", "PE.Views.SlideSettings.txtBrownPaper": "牛皮纸", @@ -1836,7 +1794,6 @@ "PE.Views.Toolbar.textBold": "加粗", "PE.Views.Toolbar.textItalic": "斜体", "PE.Views.Toolbar.textListSettings": "列表设置", - "PE.Views.Toolbar.textNewColor": "自定义颜色", "PE.Views.Toolbar.textShapeAlignBottom": "底部对齐", "PE.Views.Toolbar.textShapeAlignCenter": "居中对齐", "PE.Views.Toolbar.textShapeAlignLeft": "左对齐", diff --git a/apps/spreadsheeteditor/main/locale/be.json b/apps/spreadsheeteditor/main/locale/be.json index 6cc5c3017..30943f8a6 100644 --- a/apps/spreadsheeteditor/main/locale/be.json +++ b/apps/spreadsheeteditor/main/locale/be.json @@ -16,7 +16,6 @@ "Common.define.chartData.textSurface": "Паверхня", "Common.define.chartData.textWinLossSpark": "Выйгрыш/параза", "Common.Translation.warnFileLocked": "Дакумент выкарыстоўваецца іншай праграмай. Вы можаце працягнуць рэдагаванне і захаваць яго як копію.", - "Common.UI.ColorButton.textNewColor": "Дадаць новы адвольны колер", "Common.UI.ComboBorderSize.txtNoBorders": "Без межаў", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без межаў", "Common.UI.ComboDataView.emptyComboText": "Без стыляў", @@ -1712,10 +1711,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Захаваць копію як…", "SSE.Views.FileMenu.btnSettingsCaption": "Дадатковыя налады…", "SSE.Views.FileMenu.btnToEditCaption": "Рэдагаваць табліцу", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пустая", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Па шаблоне", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Стварыце новую пустую электронную табліцу, да якой вы зможаце ужыць стылі і адфарматаваць яе пасля яе стварэння. Альбо абярыце адзін з шаблонаў, каб стварыць прэзентацыю пэўнага тыпу, да якой ужо ўжытыя пэўныя стылі.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новая табліца", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Ужыць", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Дадаць аўтара", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Дадаць тэкст", diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index 9517c256e..0f5cf0184 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -15,7 +15,6 @@ "Common.define.chartData.textStock": "Борсова", "Common.define.chartData.textSurface": "Повърхност", "Common.define.chartData.textWinLossSpark": "Печалба/Загуба", - "Common.UI.ColorButton.textNewColor": "Нов Потребителски Цвят", "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници", "Common.UI.ComboDataView.emptyComboText": "Няма стилове", @@ -1434,10 +1433,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Запазване на копието като ...", "SSE.Views.FileMenu.btnSettingsCaption": "Разширени настройки ...", "SSE.Views.FileMenu.btnToEditCaption": "Редактиране на електронна таблица", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "От празна", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "От шаблон", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Създайте нова празна електронна таблица, която ще можете да форматирате и форматирате, след като бъде създадена по време на редактирането. Или изберете един от шаблоните, за да стартирате електронна таблица от определен тип или цел, където някои стилове вече са били предварително приложени.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Нова електронна таблица", "SSE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правата за достъп", diff --git a/apps/spreadsheeteditor/main/locale/ca.json b/apps/spreadsheeteditor/main/locale/ca.json index 457116245..b7b31101f 100644 --- a/apps/spreadsheeteditor/main/locale/ca.json +++ b/apps/spreadsheeteditor/main/locale/ca.json @@ -102,10 +102,6 @@ "Common.Translation.warnFileLocked": "El document és obert en una altra aplicació. Podeu continuar editant i guardar-lo com a còpia.", "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia", "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització", - "Common.UI.ColorButton.textAutoColor": "Automàtic", - "Common.UI.ColorButton.textNewColor": "Afegir un Nou Color Personalitzat", - "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia", - "Common.Translation.warnFileLockedBtnView": "Obrir per veure", "Common.UI.ComboBorderSize.txtNoBorders": "Sense vores", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sense vores", "Common.UI.ComboDataView.emptyComboText": "Sense estils", @@ -1974,10 +1970,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Desa còpia com a...", "SSE.Views.FileMenu.btnSettingsCaption": "Configuració avançada...", "SSE.Views.FileMenu.btnToEditCaption": "Edita el full de càlcul", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Des de zero", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Des d'una plantilla", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creeu un nou full de càlcul en blanc que podreu dissenyar i formatar després de crear-lo durant l'edició. O bé escolliu una de les plantilles per iniciar un full de càlcul d'un determinat tipus o propòsit en què ja s'hagin aplicat prèviament alguns estils.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Full de càlcul nou", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplica", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Afegeix l'autor", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Afegeix text", diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 5ed03a8b9..35e0ff6a9 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -15,7 +15,6 @@ "Common.define.chartData.textStock": "Burzovní graf", "Common.define.chartData.textSurface": "Povrch", "Common.define.chartData.textWinLossSpark": "Zisk/Ztráta ", - "Common.UI.ColorButton.textNewColor": "Přidat novou uživatelsky určenou barvu", "Common.UI.ComboBorderSize.txtNoBorders": "Bez ohraničení", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez ohraničení", "Common.UI.ComboDataView.emptyComboText": "Žádné styly", @@ -1537,10 +1536,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Uložit kopii jako…", "SSE.Views.FileMenu.btnSettingsCaption": "Pokročilá nastavení…", "SSE.Views.FileMenu.btnToEditCaption": "Upravit sešit", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdného", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Ze šablony", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvořte nový prázdný sešit, který si pak od začátku budete opatřovat styly a formátovat podle sebe. Nebo si vyberte jednu ze šablon a začněte se sešitem určitého typu nebo účelu, kde už jsou některé styly předpřipravené.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nový sešit", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Použít", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Přidat autora", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Přidat text", diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index 1bbb3e916..5784a95d0 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -49,8 +49,6 @@ "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 en kopi.", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Tilføj ny brugerdefineret farve", "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ingen rammer", "Common.UI.ComboDataView.emptyComboText": "Ingen stilarter", @@ -1858,10 +1856,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Gem kopi som...", "SSE.Views.FileMenu.btnSettingsCaption": "Avancerede indstillinger...", "SSE.Views.FileMenu.btnToEditCaption": "Rediger regneark", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Fra blank", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Fra skabelon", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Lav et nyt tomt regneark, som du kan formattere efter det er oprettet under redigeringen. Eller vælg en af skabelonerne for at oprette et regneark, af en bestemt type eller formål, hvor nogle formatteringer allerede er anvendt på forhånd.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nyt regneark", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anvend", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tilføj forfatter", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tilføj tekst", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index f92acf7e0..d16201273 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Die Datei wird in einer anderen App bearbeitet. Sie können die Bearbeitung fortsetzen und die Kopie dieser Datei speichern.", "Common.Translation.warnFileLockedBtnEdit": "Kopie erstellen", "Common.Translation.warnFileLockedBtnView": "Schreibgeschützt öffnen", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Benutzerdefinierte Farbe", "Common.UI.ComboBorderSize.txtNoBorders": "Keine Rahmen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Keine Rahmen", "Common.UI.ComboDataView.emptyComboText": "Keine Formate", @@ -1974,10 +1972,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Kopie speichern als...", "SSE.Views.FileMenu.btnSettingsCaption": "Erweiterte Einstellungen...", "SSE.Views.FileMenu.btnToEditCaption": "Tabelle bearbeiten", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Aus leerer Datei", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Aus Vorlage", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Erstellen Sie eine neue Kalkulationstabelle, die Sie nach ihrer Erstellung bei der Bearbeitung formatieren können. Oder wählen Sie eine der Vorlagen, um eine Kalkulationstabelle eines bestimmten Typs (für einen bestimmten Zweck) zu erstellen, wo einige Stile bereits angewandt sind.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Neue Tabelle", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Anwenden", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Autor hinzufügen", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Text hinzufügen", diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 52f389a82..f17e70980 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -67,8 +67,6 @@ "Common.Translation.warnFileLocked": "Το αρχείο τελεί υπό επεξεργασία σε άλλη εφαρμογή. Μπορείτε να συνεχίσετε την επεξεργασία και να το αποθηκεύσετε ως αντίγραφo.", "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου", "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή", - "Common.UI.ColorButton.textAutoColor": "Αυτόματα", - "Common.UI.ColorButton.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", "Common.UI.ComboBorderSize.txtNoBorders": "Χωρίς περιγράμματα", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Χωρίς περιγράμματα", "Common.UI.ComboDataView.emptyComboText": "Χωρίς τεχνοτροπίες", @@ -1884,10 +1882,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Αποθήκευση Αντιγράφου ως...", "SSE.Views.FileMenu.btnSettingsCaption": "Προηγμένες Ρυθμίσεις...", "SSE.Views.FileMenu.btnToEditCaption": "Επεξεργασία Λογιστικού Φύλλου", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Από Κενό", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Από Πρότυπο", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Δημιουργήστε ένα νέο κενό υπολογιστικό φύλλο που θα το μορφοποιήσετε μετά τη δημιουργία κατά την επεξεργασία. Ή επιλέξτε ένα από τα πρότυπα για να ξεκινήσετε με ένα υπολογιστικό φύλλο προεπιλεγμένου τύπου όπου κάποιες τεχνοτροπίες έχουν ήδη εφαρμοστεί.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Νέο Λογιστικό Φύλλο", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Εφαρμογή", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Προσθήκη Συγγραφέα", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Προσθήκη Κειμένου", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index abd46c0dd..4757f0849 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -105,8 +105,6 @@ "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ButtonColored.textAutoColor": "Automatic", "Common.UI.ButtonColored.textNewColor": "Add New Custom Color", - "del_Common.UI.ColorButton.textAutoColor": "Automatic", - "del_Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -535,6 +533,7 @@ "SSE.Controllers.DocumentHolder.txtLimitChange": "Change limits location", "SSE.Controllers.DocumentHolder.txtLimitOver": "Limit over text", "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limit under text", + "SSE.Controllers.DocumentHolder.txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Matrix alignment", "SSE.Controllers.DocumentHolder.txtNoChoices": "There are no choices for filling the cell.
    Only text values from the column can be selected for replacement.", @@ -588,7 +587,6 @@ "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion", "SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard", "SSE.Controllers.DocumentHolder.txtWidth": "Width", - "SSE.Controllers.DocumentHolder.txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", "SSE.Controllers.FormulaDialog.sCategoryAll": "All", "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube", "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database", @@ -607,6 +605,7 @@ "SSE.Controllers.LeftMenu.textByRows": "By rows", "SSE.Controllers.LeftMenu.textFormulas": "Formulas", "SSE.Controllers.LeftMenu.textItemEntireCell": "Entire cell contents", + "SSE.Controllers.LeftMenu.textLoadHistory": "Loading version history...", "SSE.Controllers.LeftMenu.textLookin": "Look in", "SSE.Controllers.LeftMenu.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.", "SSE.Controllers.LeftMenu.textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.", @@ -619,7 +618,6 @@ "SSE.Controllers.LeftMenu.textWorkbook": "Workbook", "SSE.Controllers.LeftMenu.txtUntitled": "Untitled", "SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
    Are you sure you want to continue?", - "SSE.Controllers.LeftMenu.textLoadHistory": "Loading version history...", "SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?", "SSE.Controllers.Main.confirmPutMergeRange": "The source data contained merged cells.
    They had been unmerged before they were pasted into the table.", "SSE.Controllers.Main.confirmReplaceFormulaInTable": "Formulas in the header row will be removed and converted to static text.
    Do you want to continue?", @@ -640,6 +638,7 @@ "SSE.Controllers.Main.errorCannotUngroup": "Cannot ungroup. To start an outline, select the detail rows or columns and group them.", "SSE.Controllers.Main.errorChangeArray": "You cannot change part of an array.", "SSE.Controllers.Main.errorChangeFilteredRange": "This will change a filtered range on your worksheet.
    To complete this task, please remove AutoFilters.", + "SSE.Controllers.Main.errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet.
    To make a change, unprotect the sheet. You might be requested to enter a password.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
    When you click the 'OK' button, you will be prompted to download the document.", "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.
    Select a single range and try again.", @@ -651,6 +650,8 @@ "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
    A user has restricted values that can be entered into this cell.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", + "SSE.Controllers.Main.errorDeleteColumnContainsLockedCell": "You are trying to delete a column that contains a locked cell. Locked cells cannot be deleted while the worksheet is protected.
    To delete a locked cell, unprotect the sheet. You might be requested to enter a password.", + "SSE.Controllers.Main.errorDeleteRowContainsLockedCell": "You are trying to delete a row that contains a locked cell. Locked cells cannot be deleted while the worksheet is protected.
    To delete a locked cell, unprotect the sheet. You might be requested to enter a password.", "SSE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.
    Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Main.errorEditingSaveas": "An error occurred during the work with the document.
    Use the 'Save as...' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Main.errorEditView": "The existing sheet view cannot be edited and the new ones cannot be created at the moment as some of them are being edited.", @@ -685,6 +686,7 @@ "SSE.Controllers.Main.errorNoDataToParse": "No data was selected to parse.", "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.errorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", "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.", @@ -710,9 +712,7 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
    but will not be able to download or print it until the connection is restored and page is reloaded.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
    Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
    Please correct the error.", - "SSE.Controllers.Main.errorPasswordIsNotCorrect": "The password you supplied is not correct.
    Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.", - "SSE.Controllers.Main.errorDeleteColumnContainsLockedCell": "You are trying to delete a column that contains a locked cell. Locked cells cannot be deleted while the worksheet is protected.
    To delete a locked cell, unprotect the sheet. You might be requested to enter a password.", - "SSE.Controllers.Main.errorDeleteRowContainsLockedCell": "You are trying to delete a row that contains a locked cell. Locked cells cannot be deleted while the worksheet is protected.
    To delete a locked cell, unprotect the sheet. You might be requested to enter a password.", + "SSE.Controllers.Main.errorWrongPassword": "The password you supplied is not correct.", "SSE.Controllers.Main.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.leavePageTextOnClose": "All unsaved changes in this spreadsheet will be lost.
    Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", @@ -743,17 +743,22 @@ "SSE.Controllers.Main.saveTitleText": "Saving Spreadsheet", "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "SSE.Controllers.Main.textAnonymous": "Anonymous", + "SSE.Controllers.Main.textApplyAll": "Apply to all equations", "SSE.Controllers.Main.textBuyNow": "Visit website", + "SSE.Controllers.Main.textChangesSaved": "All changes saved", "SSE.Controllers.Main.textClose": "Close", "SSE.Controllers.Main.textCloseTip": "Click to close the tip", "SSE.Controllers.Main.textConfirm": "Confirmation", "SSE.Controllers.Main.textContactUs": "Contact sales", + "SSE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", "SSE.Controllers.Main.textCustomLoader": "Please note that according to the terms of the license you are not entitled to change the loader.
    Please contact our Sales Department to get a quote.", "SSE.Controllers.Main.textDisconnect": "Connection is lost", "SSE.Controllers.Main.textGuest": "Guest", "SSE.Controllers.Main.textHasMacros": "The file contains automatic macros.
    Do you want to run macros?", + "SSE.Controllers.Main.textLearnMore": "Learn More", "SSE.Controllers.Main.textLoadingDocument": "Loading spreadsheet", "SSE.Controllers.Main.textLongName": "Enter a name that is less than 128 characters.", + "SSE.Controllers.Main.textNeedSynchronize": "You have updates", "SSE.Controllers.Main.textNo": "No", "SSE.Controllers.Main.textNoLicenseTitle": "License limit reached", "SSE.Controllers.Main.textPaidFeature": "Paid feature", @@ -787,6 +792,7 @@ "SSE.Controllers.Main.txtDays": "Days", "SSE.Controllers.Main.txtDiagramTitle": "Chart Title", "SSE.Controllers.Main.txtEditingMode": "Set editing mode...", + "SSE.Controllers.Main.txtErrorLoadHistory": "History loading failed", "SSE.Controllers.Main.txtFiguredArrows": "Figured Arrows", "SSE.Controllers.Main.txtFile": "File", "SSE.Controllers.Main.txtGrandTotal": "Grand Total", @@ -1006,6 +1012,10 @@ "SSE.Controllers.Main.txtTab": "Tab", "SSE.Controllers.Main.txtTable": "Table", "SSE.Controllers.Main.txtTime": "Time", + "SSE.Controllers.Main.txtUnlock": "Unlock", + "SSE.Controllers.Main.txtUnlockRange": "Unlock Range", + "SSE.Controllers.Main.txtUnlockRangeDescription": "Enter the password to change this range:", + "SSE.Controllers.Main.txtUnlockRangeWarning": "A range you are trying to change is password protected.", "SSE.Controllers.Main.txtValues": "Values", "SSE.Controllers.Main.txtXAxis": "X Axis", "SSE.Controllers.Main.txtYAxis": "Y Axis", @@ -1031,18 +1041,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.textNeedSynchronize": "You have an updates", - "SSE.Controllers.Main.textChangesSaved": "All changes saved", - "SSE.Controllers.Main.textConvertEquation": "This equation was created with an old version of the equation editor which is no longer supported. To edit it, convert the equation to the Office Math ML format.
    Convert now?", - "SSE.Controllers.Main.textLearnMore": "Learn More", - "SSE.Controllers.Main.textApplyAll": "Apply to all equations", - "SSE.Controllers.Main.txtErrorLoadHistory": "History loading failed", - "SSE.Controllers.Main.errorChangeOnProtectedSheet": "The cell or chart you are trying to change is on a protected sheet.
    To make a change, unprotect the sheet. You might be requested to enter a password.", - "SSE.Controllers.Main.txtUnlockRange": "Unlock Range", - "SSE.Controllers.Main.txtUnlockRangeWarning": "A range you are trying to change is password protected.", - "SSE.Controllers.Main.txtUnlockRangeDescription": "Enter the password to change this range:", - "SSE.Controllers.Main.txtUnlock": "Unlock", - "SSE.Controllers.Main.errorWrongPassword": "The password you supplied is not correct.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textFirstCol": "First column", "SSE.Controllers.Print.textFirstRow": "First row", @@ -1265,6 +1263,7 @@ "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithm", "SSE.Controllers.Toolbar.txtLimitLog_Max": "Maximum", "SSE.Controllers.Toolbar.txtLimitLog_Min": "Minimum", + "SSE.Controllers.Toolbar.txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", "SSE.Controllers.Toolbar.txtMatrix_1_2": "1x2 empty matrix", "SSE.Controllers.Toolbar.txtMatrix_1_3": "1x3 empty matrix", "SSE.Controllers.Toolbar.txtMatrix_2_1": "2x1 empty matrix", @@ -1415,7 +1414,6 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
    Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
    Are you sure you want to continue?", - "SSE.Controllers.Toolbar.txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textFreezePanesShadow": "Show Frozen Panes Shadow", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", @@ -1999,6 +1997,7 @@ "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", "SSE.Views.FileMenu.btnDownloadCaption": "Download as...", "SSE.Views.FileMenu.btnHelpCaption": "Help...", + "SSE.Views.FileMenu.btnHistoryCaption": "Version History", "SSE.Views.FileMenu.btnInfoCaption": "Spreadsheet Info...", "SSE.Views.FileMenu.btnPrintCaption": "Print", "SSE.Views.FileMenu.btnProtectCaption": "Protect", @@ -2011,13 +2010,8 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Save Copy as...", "SSE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "SSE.Views.FileMenu.btnToEditCaption": "Edit Spreadsheet", - "SSE.Views.FileMenu.btnHistoryCaption": "Version History", - "del_SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "del_SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "del_SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank spreadsheet which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a spreadsheet of a certain type or purpose where some styles have already been pre-applied.", - "del_SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Spreadsheet", - "SSE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "SSE.Views.FileMenuPanels.CreateNew.txtBlank": "Blank Spreadsheet", + "SSE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Create New", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Apply", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Add Author", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Add Text", @@ -2724,56 +2718,56 @@ "SSE.Views.PrintTitlesDialog.textSelectRange": "Select range", "SSE.Views.PrintTitlesDialog.textTitle": "Print Titles", "SSE.Views.PrintTitlesDialog.textTop": "Repeat rows at top", - "SSE.Views.ProtectDialog.txtPassword": "Password", - "SSE.Views.ProtectDialog.txtRepeat": "Repeat password", - "SSE.Views.ProtectDialog.txtIncorrectPwd": "Confirmation password is not identical", - "SSE.Views.ProtectDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.", - "SSE.Views.ProtectDialog.txtOptional": "optional", - "SSE.Views.ProtectDialog.txtProtect": "Protect", - "SSE.Views.ProtectDialog.txtSelLocked": "Select locked cells", - "SSE.Views.ProtectDialog.txtSelUnLocked": "Select unlocked cells", + "SSE.Views.ProtectDialog.textExistName": "ERROR! Range with such a title already exists", + "SSE.Views.ProtectDialog.textInvalidName": "The range title must begin with a letter and may only contain letters, numbers, and spaces.", + "SSE.Views.ProtectDialog.textInvalidRange": "ERROR! Invalid cells range", + "SSE.Views.ProtectDialog.textSelectData": "Select Data", + "SSE.Views.ProtectDialog.txtAllow": "Allow all users of this sheet to", + "SSE.Views.ProtectDialog.txtAutofilter": "Use AutoFilter", + "SSE.Views.ProtectDialog.txtDelCols": "Delete columns", + "SSE.Views.ProtectDialog.txtDelRows": "Delete rows", + "SSE.Views.ProtectDialog.txtEmpty": "This field is required", "SSE.Views.ProtectDialog.txtFormatCells": "Format cells", "SSE.Views.ProtectDialog.txtFormatCols": "Format columns", "SSE.Views.ProtectDialog.txtFormatRows": "Format rows", + "SSE.Views.ProtectDialog.txtIncorrectPwd": "Confirmation password is not identical", "SSE.Views.ProtectDialog.txtInsCols": "Insert columns", - "SSE.Views.ProtectDialog.txtInsRows": "Insert rows", "SSE.Views.ProtectDialog.txtInsHyper": "Insert hyperlink", - "SSE.Views.ProtectDialog.txtDelCols": "Delete columns", - "SSE.Views.ProtectDialog.txtDelRows": "Delete rows", - "SSE.Views.ProtectDialog.txtSort": "Sort", - "SSE.Views.ProtectDialog.txtAutofilter": "Use AutoFilter", - "SSE.Views.ProtectDialog.txtPivot": "Use PivotTable and PivotChart", + "SSE.Views.ProtectDialog.txtInsRows": "Insert rows", "SSE.Views.ProtectDialog.txtObjs": "Edit objects", + "SSE.Views.ProtectDialog.txtOptional": "optional", + "SSE.Views.ProtectDialog.txtPassword": "Password", + "SSE.Views.ProtectDialog.txtPivot": "Use PivotTable and PivotChart", + "SSE.Views.ProtectDialog.txtProtect": "Protect", + "SSE.Views.ProtectDialog.txtRange": "Range", + "SSE.Views.ProtectDialog.txtRangeName": "Title", + "SSE.Views.ProtectDialog.txtRepeat": "Repeat password", "SSE.Views.ProtectDialog.txtScen": "Edit scenarios", - "SSE.Views.ProtectDialog.txtWBDescription": "To prevent other users from viewing hidden worksheets, adding, moving, deleting, or hiding worksheets and renaming worksheets, you can protect the structure of your workbook with a password.", - "SSE.Views.ProtectDialog.txtWBTitle": "Protect Workbook structure", + "SSE.Views.ProtectDialog.txtSelLocked": "Select locked cells", + "SSE.Views.ProtectDialog.txtSelUnLocked": "Select unlocked cells", "SSE.Views.ProtectDialog.txtSheetDescription": "Prevent unwanted changes from others by limiting their ability to edit.", "SSE.Views.ProtectDialog.txtSheetTitle": "Protect Sheet", - "SSE.Views.ProtectDialog.txtAllow": "Allow all users of this sheet to", - "SSE.Views.ProtectDialog.txtRangeName": "Title", - "SSE.Views.ProtectDialog.txtRange": "Range", - "SSE.Views.ProtectDialog.txtEmpty": "This field is required", - "SSE.Views.ProtectDialog.textSelectData": "Select Data", - "SSE.Views.ProtectDialog.textInvalidRange": "ERROR! Invalid cells range", - "SSE.Views.ProtectDialog.textInvalidName": "The range title must begin with a letter and may only contain letters, numbers, and spaces.", - "SSE.Views.ProtectDialog.textExistName": "ERROR! Range with such a title already exists", - "SSE.Views.ProtectRangesDlg.txtTitle": "Allow Users to Edit Ranges", + "SSE.Views.ProtectDialog.txtSort": "Sort", + "SSE.Views.ProtectDialog.txtWarning": "Warning: If you lose or forget the password, it cannot be recovered. Please keep it in a safe place.", + "SSE.Views.ProtectDialog.txtWBDescription": "To prevent other users from viewing hidden worksheets, adding, moving, deleting, or hiding worksheets and renaming worksheets, you can protect the structure of your workbook with a password.", + "SSE.Views.ProtectDialog.txtWBTitle": "Protect Workbook structure", + "SSE.Views.ProtectRangesDlg.guestText": "Guest", + "SSE.Views.ProtectRangesDlg.textDelete": "Delete", + "SSE.Views.ProtectRangesDlg.textEdit": "Edit", + "SSE.Views.ProtectRangesDlg.textEmpty": "No ranges allowed for edit.", + "SSE.Views.ProtectRangesDlg.textNew": "New", + "SSE.Views.ProtectRangesDlg.textProtect": "Protect Sheet", + "SSE.Views.ProtectRangesDlg.textPwd": "Password", + "SSE.Views.ProtectRangesDlg.textRange": "Range", "SSE.Views.ProtectRangesDlg.textRangesDesc": "Ranges unlocked by a password when sheet is protected (this works only for locked cells)", "SSE.Views.ProtectRangesDlg.textTitle": "Title", - "SSE.Views.ProtectRangesDlg.textRange": "Range", - "SSE.Views.ProtectRangesDlg.textPwd": "Password", - "SSE.Views.ProtectRangesDlg.textNew": "New", - "SSE.Views.ProtectRangesDlg.textEdit": "Edit", - "SSE.Views.ProtectRangesDlg.textDelete": "Delete", - "SSE.Views.ProtectRangesDlg.textEmpty": "No ranges allowed for edit.", - "SSE.Views.ProtectRangesDlg.guestText": "Guest", "SSE.Views.ProtectRangesDlg.tipIsLocked": "This element is being edited by another user.", - "SSE.Views.ProtectRangesDlg.warnDelete": "Are you sure you want to delete the name {0}?", - "SSE.Views.ProtectRangesDlg.textProtect": "Protect Sheet", - "SSE.Views.ProtectRangesDlg.txtYes": "Yes", - "SSE.Views.ProtectRangesDlg.txtNo": "No", "SSE.Views.ProtectRangesDlg.txtEditRange": "Edit Range", "SSE.Views.ProtectRangesDlg.txtNewRange": "New Range", + "SSE.Views.ProtectRangesDlg.txtNo": "No", + "SSE.Views.ProtectRangesDlg.txtTitle": "Allow Users to Edit Ranges", + "SSE.Views.ProtectRangesDlg.txtYes": "Yes", + "SSE.Views.ProtectRangesDlg.warnDelete": "Are you sure you want to delete the name {0}?", "SSE.Views.RemoveDuplicatesDialog.textColumns": "Columns", "SSE.Views.RemoveDuplicatesDialog.textDescription": "To delete duplicate values, select one or more columns that contain duplicates.", "SSE.Views.RemoveDuplicatesDialog.textHeaders": "My data has headers", @@ -3077,16 +3071,17 @@ "SSE.Views.Statusbar.itemMaximum": "Maximum", "SSE.Views.Statusbar.itemMinimum": "Minimum", "SSE.Views.Statusbar.itemMove": "Move", + "SSE.Views.Statusbar.itemProtect": "Protect", "SSE.Views.Statusbar.itemRename": "Rename", + "SSE.Views.Statusbar.itemStatus": "Saving status", "SSE.Views.Statusbar.itemSum": "Sum", "SSE.Views.Statusbar.itemTabColor": "Tab Color", - "SSE.Views.Statusbar.itemStatus": "Saving status", - "SSE.Views.Statusbar.itemProtect": "Protect", "SSE.Views.Statusbar.itemUnProtect": "Unprotect", "SSE.Views.Statusbar.RenameDialog.errNameExists": "Worksheet with such a name already exists.", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "A sheet name cannot contain the following characters: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name", "SSE.Views.Statusbar.selectAllSheets": "Select All Sheets", + "SSE.Views.Statusbar.sheetIndexText": "Sheet {0} of {1}", "SSE.Views.Statusbar.textAverage": "Average", "SSE.Views.Statusbar.textCount": "Count", "SSE.Views.Statusbar.textMax": "Max", @@ -3104,7 +3099,6 @@ "SSE.Views.Statusbar.tipZoomOut": "Zoom out", "SSE.Views.Statusbar.ungroupSheets": "Ungroup Sheets", "SSE.Views.Statusbar.zoomText": "Zoom {0}%", - "SSE.Views.Statusbar.sheetIndexText": "Sheet {0} of {1}", "SSE.Views.TableOptionsDialog.errorAutoFilterDataRange": "The operation could not be done for the selected range of cells.
    Select a uniform data range different from the existing one and try again.", "SSE.Views.TableOptionsDialog.errorFTChangeTableRangeError": "Operation could not be completed for the selected cell range.
    Select a range so that the first table row was on the same row
    and the resulting table overlapped the current one.", "SSE.Views.TableOptionsDialog.errorFTRangeIncludedOtherTables": "Operation could not be completed for the selected cell range.
    Select a range which does not include other tables.", @@ -3524,18 +3518,18 @@ "SSE.Views.ViewTab.tipCreate": "Create sheet view", "SSE.Views.ViewTab.tipFreeze": "Freeze panes", "SSE.Views.ViewTab.tipSheetView": "Sheet view", - "SSE.Views.WBProtection.txtProtectWB": "Protect Workbook", - "SSE.Views.WBProtection.txtProtectSheet": "Protect Sheet", - "SSE.Views.WBProtection.txtAllowRanges": "Allow Edit Ranges", - "SSE.Views.WBProtection.hintProtectWB": "Protect workbook", - "SSE.Views.WBProtection.hintProtectSheet": "Protect sheet", "SSE.Views.WBProtection.hintAllowRanges": "Allow edit ranges", + "SSE.Views.WBProtection.hintProtectSheet": "Protect sheet", + "SSE.Views.WBProtection.hintProtectWB": "Protect workbook", + "SSE.Views.WBProtection.txtAllowRanges": "Allow Edit Ranges", + "SSE.Views.WBProtection.txtHiddenFormula": "Hidden Formulas", "SSE.Views.WBProtection.txtLockedCell": "Locked Cell", "SSE.Views.WBProtection.txtLockedShape": "Shape Locked", "SSE.Views.WBProtection.txtLockedText": "Lock Text", - "SSE.Views.WBProtection.txtHiddenFormula": "Hidden Formulas", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect Workbook", - "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", + "SSE.Views.WBProtection.txtProtectSheet": "Protect Sheet", + "SSE.Views.WBProtection.txtProtectWB": "Protect Workbook", + "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect Sheet", - "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet" + "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect Workbook" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 69f20b27a..998d0c450 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -2,6 +2,7 @@ "cancelButtonText": "Cancelar", "Common.Controllers.Chat.notcriticalErrorTitle": "Aviso", "Common.Controllers.Chat.textEnterMessage": "Introduzca su mensaje aquí", + "Common.Controllers.History.notcriticalErrorTitle": "Advertencia", "Common.define.chartData.textArea": "Área", "Common.define.chartData.textAreaStacked": "Área apilada", "Common.define.chartData.textAreaStackedPer": "Área apilada 100% ", @@ -102,8 +103,8 @@ "Common.Translation.warnFileLocked": "El archivo está siendo editado en otra aplicación. Puede continuar editándolo y guardarlo como una copia.", "Common.Translation.warnFileLockedBtnEdit": "Crear copia", "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Color Personalizado", + "Common.UI.ButtonColored.textAutoColor": "Automático", + "Common.UI.ButtonColored.textNewColor": "Añadir nuevo color personalizado", "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes", "Common.UI.ComboDataView.emptyComboText": "Sin estilo", @@ -173,6 +174,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Cualquier autocorreción que haya agregado se eliminará y los modificados serán restaurados a sus valores originales. ¿Desea continuar?", "Common.Views.AutoCorrectDialog.warnRestore": "La entrada de autocorrección para %1 será restablecida a su valor original. ¿Desea continuar?", "Common.Views.Chat.textSend": "Enviar", + "Common.Views.Comments.mniAuthorAsc": "Autor de A a Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de Z a A", + "Common.Views.Comments.mniDateAsc": "Más antiguo", + "Common.Views.Comments.mniDateDesc": "Más reciente", + "Common.Views.Comments.mniPositionAsc": "Desde arriba", + "Common.Views.Comments.mniPositionDesc": "Desde abajo", "Common.Views.Comments.textAdd": "Añadir", "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", @@ -180,6 +187,7 @@ "Common.Views.Comments.textAnonym": "Visitante", "Common.Views.Comments.textCancel": "Cancelar", "Common.Views.Comments.textClose": "Cerrar", + "Common.Views.Comments.textClosePanel": "Cerrar comentarios", "Common.Views.Comments.textComments": "Comentarios", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Introduzca su comentario aquí", @@ -188,6 +196,7 @@ "Common.Views.Comments.textReply": "Responder", "Common.Views.Comments.textResolve": "Resolver", "Common.Views.Comments.textResolved": "Resuelto", + "Common.Views.Comments.textSort": "Ordenar comentarios", "Common.Views.CopyWarningDialog.textDontShow": "No volver a mostrar este mensaje", "Common.Views.CopyWarningDialog.textMsg": "Se puede realizar las acciones de copiar, cortar y pegar usando los botones en la barra de herramientas y el menú contextual sólo en esta pestaña del editor.

    Si quiere copiar o pegar algo fuera de esta pestaña, use las combinaciones de teclas siguientes:", "Common.Views.CopyWarningDialog.textTitle": "Funciones de Copiar, Cortar y Pegar", @@ -223,6 +232,13 @@ "Common.Views.Header.tipViewUsers": "Ver usuarios y gestionar derechos de acceso a documentos", "Common.Views.Header.txtAccessRights": "Cambiar derechos de acceso", "Common.Views.Header.txtRename": "Cambiar nombre", + "Common.Views.History.textCloseHistory": "Cerrar historial", + "Common.Views.History.textHide": "Contraer", + "Common.Views.History.textHideAll": "Ocultar cambios detallados", + "Common.Views.History.textRestore": "Restaurar", + "Common.Views.History.textShow": "Expandir", + "Common.Views.History.textShowAll": "Mostrar cambios detallados", + "Common.Views.History.textVer": "ver.", "Common.Views.ImageFromUrlDialog.textUrl": "Pegar URL de imagen:", "Common.Views.ImageFromUrlDialog.txtEmpty": "Este campo es obligatorio", "Common.Views.ImageFromUrlDialog.txtNotUrl": "Este campo debe ser una URL en el formato \"http://www.example.com\"", @@ -517,6 +533,7 @@ "SSE.Controllers.DocumentHolder.txtLimitChange": "Cambiar ubicación de límites", "SSE.Controllers.DocumentHolder.txtLimitOver": "Límite sobre el texto", "SSE.Controllers.DocumentHolder.txtLimitUnder": "Límite debajo del texto", + "SSE.Controllers.DocumentHolder.txtLockSort": "Se encuentran datos junto a su selección, pero no tiene permisos suficientes para modificar esas celdas.
    ¿Desea continuar con la selección actual?", "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Coincidir corchetes con el alto de los argumentos", "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Alineación de la matriz", "SSE.Controllers.DocumentHolder.txtNoChoices": "No hay selecciones para llenar la celda.
    Se puede seleccionar solo valores de texto de columna para recambio.", @@ -588,6 +605,7 @@ "SSE.Controllers.LeftMenu.textByRows": "Filas", "SSE.Controllers.LeftMenu.textFormulas": "Fórmulas ", "SSE.Controllers.LeftMenu.textItemEntireCell": "Todo el contenido de celda", + "SSE.Controllers.LeftMenu.textLoadHistory": "Cargando historial de versiones...", "SSE.Controllers.LeftMenu.textLookin": "Buscar en ", "SSE.Controllers.LeftMenu.textNoTextFound": "No se puede encontrar los datos que usted busca. Por favor, ajuste los parámetros de búsqueda.", "SSE.Controllers.LeftMenu.textReplaceSkipped": "Se ha realizado el reemplazo. {0} ocurrencias fueron saltadas.", @@ -620,6 +638,7 @@ "SSE.Controllers.Main.errorCannotUngroup": "No se puede desagrupar. Para crear un esquema de documento seleccione filas o columnas y agrúpelas.", "SSE.Controllers.Main.errorChangeArray": "No se puede cambiar parte de una matriz.", "SSE.Controllers.Main.errorChangeFilteredRange": "Esto cambiará un rango filtrado de la hoja de cálculo.
    Para completar esta tarea, quite los Autofiltros.", + "SSE.Controllers.Main.errorChangeOnProtectedSheet": "La celda o el gráfico que está intentando cambiar se encuentra en una hoja protegida.
    Para hacer un cambio, quitele la protección a la hoja. Es posible que se le pida que introduzca una contraseña.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Se ha perdido la conexión con servidor. El documento no puede ser editado ahora.", "SSE.Controllers.Main.errorConnectToServer": "No se consiguió guardar el documento. Por favor, compruebe los ajustes de conexión o póngase en contacto con su administrador.
    Al hacer clic en el botón 'OK' se le solicitará que descargue el documento.", "SSE.Controllers.Main.errorCopyMultiselectArea": "No se puede usar este comando con varias selecciones.
    Seleccione un solo rango e intente de nuevo.", @@ -631,6 +650,8 @@ "SSE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", "SSE.Controllers.Main.errorDataValidate": "El valor que ha introducido no es válido.
    Un usuario ha restringido los valores que pueden ser introducidos en esta celda.", "SSE.Controllers.Main.errorDefaultMessage": "Código de error: %1", + "SSE.Controllers.Main.errorDeleteColumnContainsLockedCell": "Está intentando eliminar una columna que contiene una celda bloqueada. Las celdas bloqueadas no pueden borrarse mientras la hoja de cálculo esté protegida.
    Para borrar una celda bloqueada, desproteja la hoja. Es posible que se le pida que introduzca una contraseña.", + "SSE.Controllers.Main.errorDeleteRowContainsLockedCell": "Está intentando eliminar una fila que contiene una celda bloqueada. Las celdas bloqueadas no se pueden eliminar mientras la hoja de cálculo esté protegida.
    Para eliminar una celda bloqueada, desproteja la hoja. Es posible que se le pida que introduzca una contraseña.", "SSE.Controllers.Main.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.
    Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su computadora.", "SSE.Controllers.Main.errorEditingSaveas": "Se produjo un error durante el trabajo con el documento.
    Use la opción 'Guardar como...' para guardar la copia de seguridad de este archivo en el disco duro de su computadora.", "SSE.Controllers.Main.errorEditView": "La vista de hoja existente no puede ser editada y las nuevas no se pueden crear en este momento, ya que algunas de ellas se están editando.", @@ -665,6 +686,7 @@ "SSE.Controllers.Main.errorNoDataToParse": "No se seleccionaron datos para redistribuir.", "SSE.Controllers.Main.errorOpenWarning": "Una de las fórmulas del archivo excede el límite de 8192 caracteres.
    La fórmula fue eliminada.", "SSE.Controllers.Main.errorOperandExpected": "La función de sintaxis introducida no es correcta. Le recomendamos verificar si no le hace falta uno del paréntesis - '(' o ')'", + "SSE.Controllers.Main.errorPasswordIsNotCorrect": "La contraseña que ha proporcionado no es correcta.
    Verifique que la tecla Bloq Mayús está desactivada y asegúrese de utilizar las mayúsculas correctas.", "SSE.Controllers.Main.errorPasteMaxRange": "El área de copiar no coincide con el área de pegar.
    Para pegar las celdas copiadas, por favor, seleccione una zona con el mismo tamaño o haga clic en la primera celda de una fila.", "SSE.Controllers.Main.errorPasteMultiSelect": "Esta acción no se puede realizar en un rango de selecciones múltiples.
    Seleccione un solo rango y vuelva a intentarlo.", "SSE.Controllers.Main.errorPasteSlicerError": "Las segmentaciones de tabla no pueden ser copiadas de un libro a otro.", @@ -690,6 +712,7 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Se ha perdido la conexión. Usted todavía puede visualizar el documento,
    pero no puede descargarlo o imprimirlo hasta que la conexión sea restaurada y la página sea recargada.", "SSE.Controllers.Main.errorWrongBracketsCount": "Un error en la fórmula introducida.
    Está usando un número incorrecto de corchetes.", "SSE.Controllers.Main.errorWrongOperator": "Un error en la fórmula introducida. Un operador no válido está siendo usado.
    Por favor, corrija el error.", + "SSE.Controllers.Main.errorWrongPassword": "La contraseña que ha proporcionado no es correcta.", "SSE.Controllers.Main.errRemDuplicates": "Duplicar valores encontrados y eliminados: {0}, valores únicos restantes: {1}.", "SSE.Controllers.Main.leavePageText": "Usted tiene cambios no guardados en esta hoja de cálculo. Haga clic en 'Permanecer en esta página', después 'Guardar' para guardarlos. Haga clic en 'Abandonar esta página' para descartar todos los cambios no guardados.", "SSE.Controllers.Main.leavePageTextOnClose": "Todos los cambios no guardados en esta hoja de cálculo se perderán.
    Haga clic en \"Cancelar\" y luego en \"Guardar\" para guardarlos. Haga clic en \" OK \" para deshacerse de todos los cambios no guardados.", @@ -720,16 +743,22 @@ "SSE.Controllers.Main.saveTitleText": "Guardando hoja de cálculo", "SSE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "SSE.Controllers.Main.textAnonymous": "Anónimo", + "SSE.Controllers.Main.textApplyAll": "Aplicar a todas las ecuaciones", "SSE.Controllers.Main.textBuyNow": "Visitar sitio web", + "SSE.Controllers.Main.textChangesSaved": "Todos los cambios son guardados", "SSE.Controllers.Main.textClose": "Cerrar", "SSE.Controllers.Main.textCloseTip": "Pulse para cerrar el consejo", "SSE.Controllers.Main.textConfirm": "Confirmación", "SSE.Controllers.Main.textContactUs": "Contactar con equipo de ventas", + "SSE.Controllers.Main.textConvertEquation": "Esta ecuación fue creada con una versión antigua del editor de ecuaciones que ya no es compatible. Para editarla, convierta la ecuación al formato ML de Office Math.
    ¿Convertir ahora?", "SSE.Controllers.Main.textCustomLoader": "Note, por favor, que según los términos de la licencia Usted no tiene derecho a cambiar el cargador.
    Por favor, póngase en contacto con nuestro Departamento de Ventas para obtener una cotización.", + "SSE.Controllers.Main.textDisconnect": "Se ha perdido la conexión", "SSE.Controllers.Main.textGuest": "Invitado", "SSE.Controllers.Main.textHasMacros": "El archivo contiene macros automáticas.
    ¿Quiere ejecutar macros?", + "SSE.Controllers.Main.textLearnMore": "Más información", "SSE.Controllers.Main.textLoadingDocument": "Cargando hoja de cálculo", "SSE.Controllers.Main.textLongName": "Escriba un nombre que tenga menos de 128 caracteres.", + "SSE.Controllers.Main.textNeedSynchronize": "Usted tiene actualizaciones", "SSE.Controllers.Main.textNo": "No", "SSE.Controllers.Main.textNoLicenseTitle": "Se ha alcanzado el límite de licencias", "SSE.Controllers.Main.textPaidFeature": "Función de pago", @@ -763,6 +792,7 @@ "SSE.Controllers.Main.txtDays": "Días", "SSE.Controllers.Main.txtDiagramTitle": "Título del gráfico", "SSE.Controllers.Main.txtEditingMode": "Establecer el modo de edición...", + "SSE.Controllers.Main.txtErrorLoadHistory": "Error al cargar el historial", "SSE.Controllers.Main.txtFiguredArrows": "Formas de flecha", "SSE.Controllers.Main.txtFile": "Archivo", "SSE.Controllers.Main.txtGrandTotal": "Total general", @@ -982,6 +1012,10 @@ "SSE.Controllers.Main.txtTab": "Pestaña", "SSE.Controllers.Main.txtTable": "Tabla", "SSE.Controllers.Main.txtTime": "Hora", + "SSE.Controllers.Main.txtUnlock": "Desbloquear", + "SSE.Controllers.Main.txtUnlockRange": "Desbloquear rango", + "SSE.Controllers.Main.txtUnlockRangeDescription": "Introduzca la contraseña para cambiar este rango:", + "SSE.Controllers.Main.txtUnlockRangeWarning": "Un rango que está tratando de cambiar está protegido por contraseña.", "SSE.Controllers.Main.txtValues": "Valores", "SSE.Controllers.Main.txtXAxis": "Eje X", "SSE.Controllers.Main.txtYAxis": "Eje Y", @@ -1229,6 +1263,7 @@ "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Logaritmo", "SSE.Controllers.Toolbar.txtLimitLog_Max": "Máximo", "SSE.Controllers.Toolbar.txtLimitLog_Min": "Mínimo", + "SSE.Controllers.Toolbar.txtLockSort": "Se encuentran datos junto a su selección, pero no tiene permisos suficientes para modificar esas celdas.
    ¿Desea continuar con la selección actual?", "SSE.Controllers.Toolbar.txtMatrix_1_2": "Matriz vacía 1x2", "SSE.Controllers.Toolbar.txtMatrix_1_3": "Matriz vacía 1x3", "SSE.Controllers.Toolbar.txtMatrix_2_1": "Matriz vacía 2x1", @@ -1962,6 +1997,7 @@ "SSE.Views.FileMenu.btnCreateNewCaption": "Crear nueva", "SSE.Views.FileMenu.btnDownloadCaption": "Descargar como...", "SSE.Views.FileMenu.btnHelpCaption": "Ayuda...", + "SSE.Views.FileMenu.btnHistoryCaption": "Historial de versiones", "SSE.Views.FileMenu.btnInfoCaption": "Info sobre hoja de cálculo...", "SSE.Views.FileMenu.btnPrintCaption": "Imprimir", "SSE.Views.FileMenu.btnProtectCaption": "Proteger", @@ -1974,10 +2010,8 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Guardar Copia como...", "SSE.Views.FileMenu.btnSettingsCaption": "Ajustes Avanzados...", "SSE.Views.FileMenu.btnToEditCaption": "Editar hoja de cálculo", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "De documento en blanco", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "De plantilla", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Cree nueva hoja de cálculo en blanco para poder ajustar sus estilos y el formato. O seleccione una de las plantillas para iniciar hoja de cálculo de cierto tipo o motivo donde algunos estilos se han aplicado antes.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nueva hoja de cálculo", + "SSE.Views.FileMenuPanels.CreateNew.txtBlank": "Hoja de cálculo en blanco", + "SSE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Crear nueva", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Añadir autor", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Añadir texto", @@ -2061,6 +2095,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Neerlandés", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polaco", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punto", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtbr": "Portugués (Brasil)", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Portugués", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Rumano", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Ruso", @@ -2683,6 +2718,56 @@ "SSE.Views.PrintTitlesDialog.textSelectRange": "Seleccionar rango", "SSE.Views.PrintTitlesDialog.textTitle": "Imprimir títulos", "SSE.Views.PrintTitlesDialog.textTop": "Repetir filas en la parte superior", + "SSE.Views.ProtectDialog.textExistName": "¡ERROR! El rango con ese título ya existe", + "SSE.Views.ProtectDialog.textInvalidName": "El título del rango debe comenzar con una letra y sólo puede contener letras, números y espacios.", + "SSE.Views.ProtectDialog.textInvalidRange": "¡ERROR! Rango de celdas no válido", + "SSE.Views.ProtectDialog.textSelectData": "Seleccionar datos", + "SSE.Views.ProtectDialog.txtAllow": "Permitir a todos los usuarios de esta hoja", + "SSE.Views.ProtectDialog.txtAutofilter": "Usar Autofiltro", + "SSE.Views.ProtectDialog.txtDelCols": "Eliminar columnas", + "SSE.Views.ProtectDialog.txtDelRows": "Borrar filas", + "SSE.Views.ProtectDialog.txtEmpty": "Este campo es obligatorio", + "SSE.Views.ProtectDialog.txtFormatCells": "Aplicar formato a celdas", + "SSE.Views.ProtectDialog.txtFormatCols": "Aplicar formato a columnas", + "SSE.Views.ProtectDialog.txtFormatRows": "Aplicar formato a filas", + "SSE.Views.ProtectDialog.txtIncorrectPwd": "La contraseña de confirmación no es idéntica", + "SSE.Views.ProtectDialog.txtInsCols": "Insertar columnas", + "SSE.Views.ProtectDialog.txtInsHyper": "Insertar hiperenlace", + "SSE.Views.ProtectDialog.txtInsRows": "Insertar filas", + "SSE.Views.ProtectDialog.txtObjs": "Editar objetos", + "SSE.Views.ProtectDialog.txtOptional": "opcional", + "SSE.Views.ProtectDialog.txtPassword": "Contraseña", + "SSE.Views.ProtectDialog.txtPivot": "Utilizar tabla y gráfico dinámicos", + "SSE.Views.ProtectDialog.txtProtect": "Proteger", + "SSE.Views.ProtectDialog.txtRange": "Rango", + "SSE.Views.ProtectDialog.txtRangeName": "Título", + "SSE.Views.ProtectDialog.txtRepeat": "Repetir contraseña", + "SSE.Views.ProtectDialog.txtScen": "Editar escenarios", + "SSE.Views.ProtectDialog.txtSelLocked": "Seleccionar celdas bloqueadas", + "SSE.Views.ProtectDialog.txtSelUnLocked": "Seleccionar celdas desbloqueadas", + "SSE.Views.ProtectDialog.txtSheetDescription": "Evite los cambios no deseados de otros limitando su capacidad de edición.", + "SSE.Views.ProtectDialog.txtSheetTitle": "Proteger hoja", + "SSE.Views.ProtectDialog.txtSort": "Ordenar", + "SSE.Views.ProtectDialog.txtWarning": "Precaución: Si pierde u olvida su contraseña, no podrá recuperarla. Guárdelo en un lugar seguro.", + "SSE.Views.ProtectDialog.txtWBDescription": "Para evitar que otros usuarios vean las hojas de cálculo ocultas, añadan, muevan, eliminen u oculten hojas de cálculo y cambien el nombre de las mismas, puede proteger la estructura de su libro con una contraseña.", + "SSE.Views.ProtectDialog.txtWBTitle": "Proteger la estructura del Libro", + "SSE.Views.ProtectRangesDlg.guestText": "Invitado", + "SSE.Views.ProtectRangesDlg.textDelete": "Eliminar", + "SSE.Views.ProtectRangesDlg.textEdit": "Editar", + "SSE.Views.ProtectRangesDlg.textEmpty": "No hay rangos permitidos para la edición.", + "SSE.Views.ProtectRangesDlg.textNew": "Nuevo", + "SSE.Views.ProtectRangesDlg.textProtect": "Proteger hoja", + "SSE.Views.ProtectRangesDlg.textPwd": "Contraseña", + "SSE.Views.ProtectRangesDlg.textRange": "Rango", + "SSE.Views.ProtectRangesDlg.textRangesDesc": "Rangos desbloqueados por una contraseña cuando la hoja está protegida (esto funciona sólo para las celdas bloqueadas)", + "SSE.Views.ProtectRangesDlg.textTitle": "Título", + "SSE.Views.ProtectRangesDlg.tipIsLocked": "Este elemento se está editando por otro usuario.", + "SSE.Views.ProtectRangesDlg.txtEditRange": "Editar rango", + "SSE.Views.ProtectRangesDlg.txtNewRange": "Nuevo rango", + "SSE.Views.ProtectRangesDlg.txtNo": "No", + "SSE.Views.ProtectRangesDlg.txtTitle": "Permitir a los usuarios editar rangos", + "SSE.Views.ProtectRangesDlg.txtYes": "Sí", + "SSE.Views.ProtectRangesDlg.warnDelete": "¿Esta seguro/a de que quiere borrar el nombre {0}?", "SSE.Views.RemoveDuplicatesDialog.textColumns": "Columnas", "SSE.Views.RemoveDuplicatesDialog.textDescription": "Para eliminar los valores duplicados, seleccione una o más columnas que contienen duplicados.", "SSE.Views.RemoveDuplicatesDialog.textHeaders": "Mis datos tienen encabezados", @@ -2986,13 +3071,17 @@ "SSE.Views.Statusbar.itemMaximum": "Máximo", "SSE.Views.Statusbar.itemMinimum": "Mínimo", "SSE.Views.Statusbar.itemMove": "Mover", + "SSE.Views.Statusbar.itemProtect": "Proteger", "SSE.Views.Statusbar.itemRename": "Cambiar nombre", + "SSE.Views.Statusbar.itemStatus": "Guardando estado", "SSE.Views.Statusbar.itemSum": "Suma", "SSE.Views.Statusbar.itemTabColor": "Color de tab", + "SSE.Views.Statusbar.itemUnProtect": "Quitar la protección", "SSE.Views.Statusbar.RenameDialog.errNameExists": "Hoja de Cálculo con tal nombre ya existe", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "El nombre de hoja no puede contener los caracteres siguientes: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Nombre de hoja", "SSE.Views.Statusbar.selectAllSheets": "Seleccionar todas las hojas", + "SSE.Views.Statusbar.sheetIndexText": "Hoja {0} de {1}", "SSE.Views.Statusbar.textAverage": "Promedio", "SSE.Views.Statusbar.textCount": "Contar", "SSE.Views.Statusbar.textMax": "Máx.", @@ -3428,5 +3517,19 @@ "SSE.Views.ViewTab.tipClose": "Cerrar vista de hoja", "SSE.Views.ViewTab.tipCreate": "Crear vista de hoja", "SSE.Views.ViewTab.tipFreeze": "Congelar paneles", - "SSE.Views.ViewTab.tipSheetView": "Vista de hoja" + "SSE.Views.ViewTab.tipSheetView": "Vista de hoja", + "SSE.Views.WBProtection.hintAllowRanges": "Permitir editar rangos", + "SSE.Views.WBProtection.hintProtectSheet": "Proteger hoja", + "SSE.Views.WBProtection.hintProtectWB": "Proteger libro", + "SSE.Views.WBProtection.txtAllowRanges": "Permitir editar rangos", + "SSE.Views.WBProtection.txtHiddenFormula": "Fórmulas ocultas", + "SSE.Views.WBProtection.txtLockedCell": "Celda bloqueada", + "SSE.Views.WBProtection.txtLockedShape": "Forma bloqueada", + "SSE.Views.WBProtection.txtLockedText": "Bloquear texto", + "SSE.Views.WBProtection.txtProtectSheet": "Proteger hoja", + "SSE.Views.WBProtection.txtProtectWB": "Proteger libro", + "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduzca una contraseña para quitarle la protección a la hoja", + "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger hoja", + "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduzca una contraseña para quitarle la protección al libro", + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger libro" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json index 08dcccbdf..768c9a19c 100644 --- a/apps/spreadsheeteditor/main/locale/fi.json +++ b/apps/spreadsheeteditor/main/locale/fi.json @@ -2,7 +2,6 @@ "cancelButtonText": "Peruuta", "Common.Controllers.Chat.notcriticalErrorTitle": "Varoitus", "Common.Controllers.Chat.textEnterMessage": "Syötä viestisi tässä", - "Common.UI.ColorButton.textNewColor": "Lisää uusi mukautettu väri", "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunuksia", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia", "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä", @@ -972,10 +971,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Tallenna", "SSE.Views.FileMenu.btnSettingsCaption": "Laajennetut asetukset...", "SSE.Views.FileMenu.btnToEditCaption": "Muokkaa työkirjaa", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Tyhjästä", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Mallipohjasta", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Luo uusi tyhjä taulukko, jonka voit luonnin jälkeen tyylittää ja muotoilla muokkauksen aikna. Tai valitse jokin mallipohjista tietynlaista työkirjaa varten, jossa tyylit ovat jo määritelty.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Uusi laskentataulukko", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Kirjoittaja", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Muuta käyttöoikeuksia", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Sijainti", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 9c3da55e7..24f302ab3 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Ce fichier a été modifié avec une autre application. Vous pouvez continuer à le modifier et l'enregistrer comme une copie.", "Common.Translation.warnFileLockedBtnEdit": "Créer une copie", "Common.Translation.warnFileLockedBtnView": "Ouvrir pour visualisation", - "Common.UI.ColorButton.textAutoColor": "Automatique", - "Common.UI.ColorButton.textNewColor": "Couleur personnalisée", "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures", "Common.UI.ComboDataView.emptyComboText": "Aucun style", @@ -1974,10 +1972,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Enregistrer une copie comme...", "SSE.Views.FileMenu.btnSettingsCaption": "Paramètres avancés...", "SSE.Views.FileMenu.btnToEditCaption": "Modifier la feuille de calcul", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "D'un blanc", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "A partir d'un modèle", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Créez un classeur que vous serez en mesure de styliser et de mettre en forme une fois qu'il est créé. Ou choisissez l'un des modèles pour commencer un classeur d'un certain type où certains styles sont déjà pré-appliqués.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nouveau classeur", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Appliquer", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Ajouter un auteur", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Ajouter du texte", diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index 53513adbe..f63165f6f 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -49,8 +49,6 @@ "Common.define.chartData.textSurface": "Felület", "Common.define.chartData.textWinLossSpark": "Nyereség/veszteség", "Common.Translation.warnFileLocked": "A fájlt egy másik alkalmazásban szerkesztik. Folytathatja a szerkesztést és elmentheti másolatként.", - "Common.UI.ColorButton.textAutoColor": "Automatikus", - "Common.UI.ColorButton.textNewColor": "Új egyedi szín hozzáadása", "Common.UI.ComboBorderSize.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nincsenek szegélyek", "Common.UI.ComboDataView.emptyComboText": "Nincsenek stílusok", @@ -1858,10 +1856,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Másolat mentése mint...", "SSE.Views.FileMenu.btnSettingsCaption": "Haladó beállítások...", "SSE.Views.FileMenu.btnToEditCaption": "Munkafüzet szerkesztése", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Üres fájlból", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Sablonból", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Hozzon létre egy új üres munkafüzetet, amelyet a szerkesztés során formázhat. Vagy válasszon egyet a sablonok közül, ahol bizonyos stílusokat már előzetesen alkalmaztak.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Új munkafüzet", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Alkalmaz", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Szerző hozzáadása", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Szöveg hozzáadása", diff --git a/apps/spreadsheeteditor/main/locale/id.json b/apps/spreadsheeteditor/main/locale/id.json index 4237117f1..88e9c866f 100644 --- a/apps/spreadsheeteditor/main/locale/id.json +++ b/apps/spreadsheeteditor/main/locale/id.json @@ -409,10 +409,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Save", "SSE.Views.FileMenu.btnSettingsCaption": "Advanced Settings...", "SSE.Views.FileMenu.btnToEditCaption": "Edit Spreadsheet", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "From Template", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Create a new blank spreadsheet which you will be able to style and format after it is created during the editing. Or choose one of the templates to start a spreadsheet of a certain type or purpose where some styles have already been pre-applied.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "New Spreadsheet", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Author", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index def41f472..2bc5d7cd9 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Il file è in fase di modifica in un'altra applicazione. Puoi continuare a modificarlo e salvarlo come copia.", "Common.Translation.warnFileLockedBtnEdit": "Crea una copia", "Common.Translation.warnFileLockedBtnView": "‎Aperto per la visualizzazione‎", - "Common.UI.ColorButton.textAutoColor": "Automatico", - "Common.UI.ColorButton.textNewColor": "Aggiungi Colore personalizzato", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", "Common.UI.ComboDataView.emptyComboText": "Nessuno stile", @@ -1693,9 +1691,9 @@ "SSE.Views.DataTab.capBtnTextRemDuplicates": "Rimuovi duplicati", "SSE.Views.DataTab.capBtnTextToCol": "Testo a colonne", "SSE.Views.DataTab.capBtnUngroup": "Separa", - "SSE.Views.DataTab.capDataFromText": "Da Testo/CSV", - "SSE.Views.DataTab.mniFromFile": "Ottenere i dati da file", - "SSE.Views.DataTab.mniFromUrl": "Ottenere i dati da URL", + "SSE.Views.DataTab.capDataFromText": "Ottieni i dati", + "SSE.Views.DataTab.mniFromFile": "Dal locale TXT/CSV", + "SSE.Views.DataTab.mniFromUrl": "Dall'indirizzo web di TXT/CSV", "SSE.Views.DataTab.textBelow": "Righe di riepilogo sotto i dettagli", "SSE.Views.DataTab.textClear": "Elimina contorno", "SSE.Views.DataTab.textColumns": "Separare le colonne", @@ -1974,10 +1972,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Salva copia come...", "SSE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate...", "SSE.Views.FileMenu.btnToEditCaption": "Modifica foglio di calcolo", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Da vuoto", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Da modello", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crea un nuovo foglio di calcolo vuoto che potrai formattare durante la modifica. O scegli uno dei modelli per creare un foglio di calcolo di un certo tipo a quale sono già applicati certi stili.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nuovo foglio di calcolo", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Applica", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Aggiungi Autore", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Aggiungi testo", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index fe4924f71..fe4d69b33 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -61,8 +61,6 @@ "Common.define.conditionalData.textYesterday": "昨日", "Common.Translation.warnFileLocked": "文書が別のアプリで使用されています。編集を続けて、コピーとして保存できます。", "Common.Translation.warnFileLockedBtnEdit": "コピーを作成する", - "Common.UI.ColorButton.textAutoColor": "自動", - "Common.UI.ColorButton.textNewColor": "ユーザー設定の色の追加", "Common.UI.ComboBorderSize.txtNoBorders": "枠線なし", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "枠線なし", "Common.UI.ComboDataView.emptyComboText": "スタイルなし", @@ -1887,10 +1885,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "別名で保存...", "SSE.Views.FileMenu.btnSettingsCaption": "詳細設定...", "SSE.Views.FileMenu.btnToEditCaption": "スプレッドシートの編集", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "空白から", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "テンプレートから", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "編集の間スタイルを適用し、フォルマットすることができる新しい空白のスプレッドシートを作成します。または特定の種類や目的のスプレッドシートを開始するためにすでにスタイルを適用したテンプレートを選択してください。", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "新しいスプレッドシート", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "適用", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "著者を追加", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "テキストの追加", diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index a0a3192a1..4d8fd35a6 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -4,7 +4,6 @@ "Common.Controllers.Chat.textEnterMessage": "여기에 메시지를 입력하십시오", "Common.define.chartData.textArea": "영역", "Common.define.chartData.textBar": "막대", - "Common.UI.ColorButton.textNewColor": "새 맞춤 색상 추가", "Common.UI.ComboBorderSize.txtNoBorders": "테두리 없음", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "테두리 없음", "Common.UI.ComboDataView.emptyComboText": "스타일 없음", @@ -1218,10 +1217,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "저장", "SSE.Views.FileMenu.btnSettingsCaption": "고급 설정 ...", "SSE.Views.FileMenu.btnToEditCaption": "스프레드 시트 편집", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "From Blank", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "템플릿에서", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "편집 중에 스타일을 지정하고 서식을 지정할 수있는 빈 스프레드 시트를 새로 만들거나 템플릿 중 하나를 선택하여 특정 유형의 스프레드 시트를 시작하거나 일부 스타일이 미리 적용된 목적 ", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "새 스프레드 시트", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "적용", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "저자 추가", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "문장 추가", diff --git a/apps/spreadsheeteditor/main/locale/lo.json b/apps/spreadsheeteditor/main/locale/lo.json index 50d936046..3fb3a7da3 100644 --- a/apps/spreadsheeteditor/main/locale/lo.json +++ b/apps/spreadsheeteditor/main/locale/lo.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "ແຟ້ມ ກຳ ລັງຖືກດັດແກ້ຢູ່ໃນແອັບ ອື່ນ. ທ່ານສາມາດສືບຕໍ່ດັດແກ້ແລະບັນທຶກເປັນ ສຳ ເນົາ", "Common.Translation.warnFileLockedBtnEdit": "ສ້າງສຳເນົາ", "Common.Translation.warnFileLockedBtnView": "ເປີດເບິ່ງ", - "Common.UI.ColorButton.textAutoColor": "ອັດຕະໂນມັດ", - "Common.UI.ColorButton.textNewColor": "ເພີມສີທີ່ກຳນົດເອງໃໝ່", "Common.UI.ComboBorderSize.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "ບໍ່ມີຂອບ", "Common.UI.ComboDataView.emptyComboText": "ບໍ່ມີແບບ", @@ -1963,10 +1961,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "ບັນທຶກສຳເນົາເປັນ...", "SSE.Views.FileMenu.btnSettingsCaption": "ຕັ້ງ​ຄ່າ​ຂັ້ນ​ສູງ...", "SSE.Views.FileMenu.btnToEditCaption": "ແກ້ໄຂແຜ່ນງານ", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "ຈາກບ່ອນວ່າງ", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "ຈາກ ແບບ", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "ສ້າງແຜ່ນງານເປົ່າໃໝ່ຊຶ່ງທ່ານສາມາດຈັດສະໄຕ ແລະ ຮູບແບບຫຼັງຈາກສ້າງຂຶ້ນໃນລະຫວ່າງການແກ້ໄຂ. ຫຼື ແບບໃດແບບໜຶ່ງເພື່ອເລີ່ມແຜນງານຂອງປະເພດ ຫຼ ວັດຖຸປະສົງບາງຢ່າງທີ່ມີການໃຊ້ສະໄຕບາງຢ່າງໄວ້ຫຼວງໜ້າແລ້ວ.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Spreadsheet ໃໝ່", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "ໃຊ້", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "ເພີ່ມຜູ້ຂຽນ", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "ເພີ່ມຂໍ້ຄວາມ", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 76f1b6e6f..b15826435 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -2,7 +2,6 @@ "cancelButtonText": "Atcelt", "Common.Controllers.Chat.notcriticalErrorTitle": "Warning", "Common.Controllers.Chat.textEnterMessage": "Ievadiet savu ziņu šeit", - "Common.UI.ColorButton.textNewColor": "Pievienot jauno krāsu", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders", "Common.UI.ComboDataView.emptyComboText": "No styles", @@ -1147,10 +1146,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Saglabāt", "SSE.Views.FileMenu.btnSettingsCaption": "Papildu iestatījumi...", "SSE.Views.FileMenu.btnToEditCaption": "Rediģēt dokumentu", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Sākt ar tukšo", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "No veidnes", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Izveidot jaunu tukšu izklājlapu, kurā jūs varēsiet piemērot stilu un formātu pēc izveides rediģēšanas laikā. Vai izvēlēties kādu no veidnēm, lai sāktu dokumentu konkrēta veida vai stilā, kur daži stili jau iepriekš piemēroti.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Jauna Izklājlapa", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autors", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Vieta", diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index c87f86890..2c8b57ba8 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Het bestand wordt bewerkt in een andere app. U kunt doorgaan met bewerken en het als kopie opslaan.", "Common.Translation.warnFileLockedBtnEdit": "Maak een kopie", "Common.Translation.warnFileLockedBtnView": "Open voor lezen", - "Common.UI.ColorButton.textAutoColor": "Automatisch", - "Common.UI.ColorButton.textNewColor": "Nieuwe aangepaste kleur toevoegen", "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen", "Common.UI.ComboDataView.emptyComboText": "Geen stijlen", @@ -1969,10 +1967,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Kopie opslaan als...", "SSE.Views.FileMenu.btnSettingsCaption": "Geavanceerde instellingen...", "SSE.Views.FileMenu.btnToEditCaption": "Spreadsheet bewerken", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Van leeg bestand", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Van sjabloon", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Maak een nieuw leeg spreadsheet waarop u na het maken een stijl en opmaak kunt toepassen tijdens het bewerken. U kunt ook een van de sjablonen kiezen om te beginnen met een spreadsheet van een bepaald type of voor een bepaald doel waarop sommige stijlen al zijn toegepast.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nieuwe spreadsheet", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Toepassen", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Voeg auteur toe", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Tekst toevoegen", diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index 9a97c5d78..64c2b6580 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -3,18 +3,50 @@ "Common.Controllers.Chat.notcriticalErrorTitle": "Ostrzeżenie", "Common.Controllers.Chat.textEnterMessage": "Wprowadź swoją wiadomość tutaj", "Common.define.chartData.textArea": "Obszar", + "Common.define.chartData.textAreaStacked": "Skumulowany warstwowy", + "Common.define.chartData.textAreaStackedPer": "100% skumulowany warstwowy", "Common.define.chartData.textBar": "Pasek", + "Common.define.chartData.textBarNormal": "Kolumnowy grupowany", + "Common.define.chartData.textBarNormal3d": "Kolumnowy grupowany 3D", + "Common.define.chartData.textBarNormal3dPerspective": "Kolumnowy 3D", + "Common.define.chartData.textBarStacked": "Skumulowany kolumnowy", + "Common.define.chartData.textBarStacked3d": "Skumulowany kolumnowy 3D", + "Common.define.chartData.textBarStackedPer": "100% skumulowany kolumnowy", + "Common.define.chartData.textBarStackedPer3d": "100% skumulowany kolumnowy 3D", "Common.define.chartData.textColumn": "Kolumna", "Common.define.chartData.textColumnSpark": "Kolumna", + "Common.define.chartData.textComboAreaBar": "Skumulowany warstwowy - kolumnowy grupowany", + "Common.define.chartData.textComboBarLine": "Kolumnowy grupowany - liniowy", + "Common.define.chartData.textComboBarLineSecondary": "Kolumnowy grupowany - liniowy na osi pomocniczej", + "Common.define.chartData.textDoughnut": "Pierścieniowy", + "Common.define.chartData.textHBarNormal": "Słupkowy grupowany", + "Common.define.chartData.textHBarNormal3d": "Słupkowy grupowany 3D", + "Common.define.chartData.textHBarStacked": "Skumulowany słupkowy", + "Common.define.chartData.textHBarStacked3d": "Skumulowany słupkowy 3D", + "Common.define.chartData.textHBarStackedPer": "100% skumulowany słupkowy", + "Common.define.chartData.textHBarStackedPer3d": "100% skumulowany słupkowy 3D", "Common.define.chartData.textLine": "Liniowy", + "Common.define.chartData.textLine3d": "Liniowy 3D", + "Common.define.chartData.textLineMarker": "Liniowy ze znacznikami", "Common.define.chartData.textLineSpark": "Wiersz", + "Common.define.chartData.textLineStacked": "Skumulowany liniowy", + "Common.define.chartData.textLineStackedMarker": "Skumulowany liniowy ze znacznikami", + "Common.define.chartData.textLineStackedPer": "100% skumulowany liniowy", + "Common.define.chartData.textLineStackedPerMarker": "100% skumulowany liniowy ze znacznikami", "Common.define.chartData.textPie": "Kołowe", + "Common.define.chartData.textPie3d": "Kołowy 3D", "Common.define.chartData.textPoint": "XY (Punktowy)", + "Common.define.chartData.textScatter": "Punktowy", + "Common.define.chartData.textScatterLine": "Punktowy z prostymi liniami", + "Common.define.chartData.textScatterLineMarker": "Punktowy z prostymi liniami i znacznikami", + "Common.define.chartData.textScatterSmooth": "Punktowy z wygładzonymi liniami", + "Common.define.chartData.textScatterSmoothMarker": "Punktowy z wygładzonymi liniami i znacznikami", "Common.define.chartData.textSparks": "Sparklines", "Common.define.chartData.textStock": "Zbiory", "Common.define.chartData.textSurface": "Powierzchnia", "Common.define.chartData.textWinLossSpark": "Wygrana/przegrana", - "Common.UI.ColorButton.textNewColor": "Dodaj nowy niestandardowy kolor", + "Common.define.conditionalData.textText": "Tekst", + "Common.UI.ButtonColored.textNewColor": "Dodaj nowy niestandardowy kolor", "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi", "Common.UI.ComboDataView.emptyComboText": "Brak styli", @@ -38,6 +70,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Dokument został zmieniony przez innego użytkownika.
    Proszę kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.", "Common.UI.ThemeColorPalette.textStandartColors": "Kolory standardowe", "Common.UI.ThemeColorPalette.textThemeColors": "Kolory motywu", + "Common.UI.Themes.txtThemeClassicLight": "Klasyczny jasny", + "Common.UI.Themes.txtThemeDark": "Ciemny", + "Common.UI.Themes.txtThemeLight": "Jasny", "Common.UI.Window.cancelButtonText": "Anuluj", "Common.UI.Window.closeButtonText": "Zamknij", "Common.UI.Window.noButtonText": "Nie", @@ -58,6 +93,17 @@ "Common.Views.About.txtTel": "tel.:", "Common.Views.About.txtVersion": "Wersja", "Common.Views.AutoCorrectDialog.textAdd": "Dodaj", + "Common.Views.AutoCorrectDialog.textAutoCorrect": "Autokorekta", + "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatuj automatycznie podczas pisania", + "Common.Views.AutoCorrectDialog.textDelete": "Usuń", + "Common.Views.AutoCorrectDialog.textMathCorrect": "Autokorekta matematyczna", + "Common.Views.AutoCorrectDialog.textRecognized": "Rozpoznawane funkcje", + "Common.Views.AutoCorrectDialog.textRecognizedDesc": "Następujące wyrażenia są rozpoznawanymi wyrażeniami matematycznymi. Nie będą one automatycznie pisane kursywą.", + "Common.Views.AutoCorrectDialog.textReplace": "Zamień", + "Common.Views.AutoCorrectDialog.textReplaceText": "Zamień podczas pisania", + "Common.Views.AutoCorrectDialog.textReplaceType": "Zamień tekst podczas pisania", + "Common.Views.AutoCorrectDialog.textResetAll": "Przywróć ustawienia domyślne", + "Common.Views.AutoCorrectDialog.textTitle": "Autokorekta", "Common.Views.AutoCorrectDialog.textWarnResetRec": "Każde dodane wyrażenie zostanie usunięte, a usunięte zostaną przywrócone. Czy chcesz kontynuować?", "Common.Views.AutoCorrectDialog.warnReset": "Wszelkie dodane autokorekty zostaną usunięte, a zmienione zostaną przywrócone oryginalne wartości. Czy chcesz kontynuować?", "Common.Views.Chat.textSend": "Wyślij", @@ -87,6 +133,9 @@ "Common.Views.Header.labelCoUsersDescr": "Użytkownicy aktualnie edytujący plik:", "Common.Views.Header.textAdvSettings": "Zaawansowane ustawienia", "Common.Views.Header.textBack": "Otwórz lokalizację pliku", + "Common.Views.Header.textCompactView": "Ukryj pasek narzędzi", + "Common.Views.Header.textHideLines": "Ukryj linijki", + "Common.Views.Header.textHideStatusBar": "Ukryj pasek stanu", "Common.Views.Header.textRemoveFavorite": "Usuń z ulubionych", "Common.Views.Header.textSaveBegin": "Zapisywanie ...", "Common.Views.Header.textSaveChanged": "Zmodyfikowano", @@ -97,14 +146,23 @@ "Common.Views.Header.tipDownload": "Pobierz plik", "Common.Views.Header.tipGoEdit": "Edytuj bieżący plik", "Common.Views.Header.tipPrint": "Drukuj plik", + "Common.Views.Header.tipRedo": "Wykonaj ponownie", + "Common.Views.Header.tipSave": "Zapisz", + "Common.Views.Header.tipUndo": "Cofnij", "Common.Views.Header.tipViewUsers": "Wyświetl użytkowników i zarządzaj prawami dostępu do dokumentu", "Common.Views.Header.txtAccessRights": "Zmień prawa dostępu", "Common.Views.Header.txtRename": "Zmień nazwę", + "Common.Views.History.textHideAll": "Ukryj szczegółowe zmiany", + "Common.Views.History.textShowAll": "Pokaż szczegółowe zmiany", "Common.Views.ImageFromUrlDialog.textUrl": "Wklej link URL do obrazu:", "Common.Views.ImageFromUrlDialog.txtEmpty": "To pole jest wymagane", "Common.Views.ImageFromUrlDialog.txtNotUrl": "To pole powinno być adresem URL w formacie \"http://www.example.com\"", "Common.Views.ListSettingsDialog.textNumbering": "Numerowane", + "Common.Views.ListSettingsDialog.txtNone": "Żaden", "Common.Views.ListSettingsDialog.txtOfText": "% tekstu", + "Common.Views.ListSettingsDialog.txtStart": "Rozpocznij od", + "Common.Views.ListSettingsDialog.txtSymbol": "Symbole", + "Common.Views.OpenDialog.textInvalidRange": "Błędny zakres komórek.", "Common.Views.OpenDialog.txtAdvanced": "Zaawansowane", "Common.Views.OpenDialog.txtDelimiter": "Separator", "Common.Views.OpenDialog.txtEncoding": "Kodowanie", @@ -112,6 +170,7 @@ "Common.Views.OpenDialog.txtOpenFile": "Wprowadź hasło, aby otworzyć plik", "Common.Views.OpenDialog.txtOther": "Inny", "Common.Views.OpenDialog.txtPassword": "Hasło", + "Common.Views.OpenDialog.txtPreview": "Podgląd", "Common.Views.OpenDialog.txtProtected": "Po wprowadzeniu hasła i otwarciu pliku bieżące hasło do pliku zostanie zresetowane", "Common.Views.OpenDialog.txtSpace": "Odstęp", "Common.Views.OpenDialog.txtTab": "Karta", @@ -139,6 +198,7 @@ "Common.Views.Protection.txtSignatureLine": "Dodaj wiersz do podpisu", "Common.Views.RenameDialog.textName": "Nazwa pliku", "Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:", + "Common.Views.ReviewChanges.hintPrev": "Do poprzedniej zmiany", "Common.Views.ReviewChanges.tipAcceptCurrent": "Zaakceptuj bieżącą zmianę", "Common.Views.ReviewChanges.tipCommentRem": "Usuń komentarze", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Usuń aktualne komentarze", @@ -151,17 +211,48 @@ "Common.Views.ReviewChanges.txtCommentRemCurrent": "Usuń aktualne komentarze", "Common.Views.ReviewChanges.txtCommentRemMy": "Usuń moje komentarze", "Common.Views.ReviewChanges.txtCommentRemove": "Usuń", + "Common.Views.ReviewChanges.txtDocLang": "Język", "Common.Views.ReviewChanges.txtFinal": "Wszystkie zmiany zostały zaakceptowane (podgląd)", "Common.Views.ReviewChanges.txtMarkup": "Wszystkie zmiany (edycja)", "Common.Views.ReviewChanges.txtOriginal": "Wszystkie zmiany zostały odrzucone (podgląd)", + "Common.Views.ReviewChanges.txtPrev": "Poprzedni", "Common.Views.ReviewChanges.txtSpelling": "Sprawdzanie pisowni", "Common.Views.ReviewPopover.textAdd": "Dodaj", "Common.Views.ReviewPopover.textAddReply": "Dodaj odpowiedź", + "Common.Views.ReviewPopover.textCancel": "Anuluj", + "Common.Views.ReviewPopover.textEdit": "OK", "Common.Views.ReviewPopover.textMention": "+wzmianka zapewni użytkownikowi dostęp do pliku i wyśle e-maila", "Common.Views.ReviewPopover.textMentionNotify": "+wzmianka powiadomi użytkownika e-mailem", + "Common.Views.SaveAsDlg.textTitle": "Folder do zapisu", "Common.Views.SignDialog.tipFontSize": "Rozmiar czcionki", "Common.Views.SignSettingsDialog.textAllowComment": "Zezwól podpisującemu na dodawanie komentarza w oknie podpisu", + "Common.Views.SymbolTableDialog.textCharacter": "Znak", + "Common.Views.SymbolTableDialog.textCode": "Nazwa Unicode", + "Common.Views.SymbolTableDialog.textCopyright": "Znak zastrzeżenia prawa autorskiego", + "Common.Views.SymbolTableDialog.textDCQuote": "Podwójny cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textDOQuote": "Podwójny cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textEllipsis": "Wielokropek", + "Common.Views.SymbolTableDialog.textEmDash": "Pauza", + "Common.Views.SymbolTableDialog.textEmSpace": "Długa spacja", + "Common.Views.SymbolTableDialog.textEnDash": "Półpauza", + "Common.Views.SymbolTableDialog.textEnSpace": "Krótka spacja", + "Common.Views.SymbolTableDialog.textFont": "Czcionka", + "Common.Views.SymbolTableDialog.textNBHyphen": "Łącznik nierozdzielający", + "Common.Views.SymbolTableDialog.textNBSpace": "Spacja nierozdzielająca", + "Common.Views.SymbolTableDialog.textPilcrow": "Akapit", "Common.Views.SymbolTableDialog.textQEmSpace": "Ćwierć spacja", + "Common.Views.SymbolTableDialog.textRecent": "Ostatnio używane symbole", + "Common.Views.SymbolTableDialog.textRegistered": "Zastrzeżony znak towarowy", + "Common.Views.SymbolTableDialog.textSCQuote": "Pojedynczy cudzysłów zamykający", + "Common.Views.SymbolTableDialog.textSection": "Sekcja", + "Common.Views.SymbolTableDialog.textShortcut": "Klawisz skrótu", + "Common.Views.SymbolTableDialog.textSOQuote": "Pojedynczy cudzysłów otwierający", + "Common.Views.SymbolTableDialog.textSpecial": "Znaki specjalne", + "Common.Views.SymbolTableDialog.textSymbols": "Symbole", + "Common.Views.SymbolTableDialog.textTitle": "Symbole", + "Common.Views.SymbolTableDialog.textTradeMark": "Znak towarowy", + "Common.Views.UserNameDialog.textDontShow": "Nie pytaj mnie ponownie", + "SSE.Controllers.DataTab.textColumns": "Kolumny", "SSE.Controllers.DataTab.textRows": "Wiersze", "SSE.Controllers.DataTab.textWizard": "Tekst na kolumny", "SSE.Controllers.DataTab.txtExpandRemDuplicates": "Dane obok zaznaczenia nie zostaną usunięte. Czy chcesz rozszerzyć zaznaczenie, aby obejmowało sąsiednie dane, czy kontynuować tylko z aktualnie wybranymi komórkami?", @@ -266,10 +357,12 @@ "SSE.Controllers.DocumentHolder.txtPasteValFormat": "Wartość + wszystkie formatowania", "SSE.Controllers.DocumentHolder.txtPasteValNumFormat": "Wartość + formatowanie liczbowe", "SSE.Controllers.DocumentHolder.txtPasteValues": "Wklej wartość", + "SSE.Controllers.DocumentHolder.txtPercent": "Procentowe", "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Usunąć belkę frakcji", "SSE.Controllers.DocumentHolder.txtRemLimit": "Usuń limit", "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Usuwanie akcentu", "SSE.Controllers.DocumentHolder.txtRemoveBar": "Usuń pasek", + "SSE.Controllers.DocumentHolder.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
    Nie można tego cofnąć.", "SSE.Controllers.DocumentHolder.txtRemScripts": "Usuń indeksy", "SSE.Controllers.DocumentHolder.txtRemSubscript": "Usuń indeks dolny", "SSE.Controllers.DocumentHolder.txtRemSuperscript": "Usuń górny indeks", @@ -421,9 +514,11 @@ "SSE.Controllers.Main.textNoLicenseTitle": "Osiągnięto limit licencji", "SSE.Controllers.Main.textPleaseWait": "Operacja może potrwać dłużej niż oczekiwano. Proszę czekać...", "SSE.Controllers.Main.textRecalcFormulas": "Obliczanie formuł...", + "SSE.Controllers.Main.textRenameLabel": "Wpisz nazwę, która ma być używana do współpracy", "SSE.Controllers.Main.textShape": "Kształt", "SSE.Controllers.Main.textStrict": "Tryb ścisły", "SSE.Controllers.Main.textTryUndoRedo": "Funkcje Cofnij/Ponów są wyłączone w trybie \"Szybki\" współtworzenia.
    Kliknij przycisk \"Tryb ścisły\", aby przejść do trybu ścisłego edytowania, aby edytować plik bez ingerencji innych użytkowników i wysyłać zmiany tylko po zapisaniu. Możesz przełączać się między trybami współtworzenia, używając edytora Ustawienia zaawansowane.", + "SSE.Controllers.Main.textTryUndoRedoWarn": "Funkcje Cofnij/Ponów są wyłączone w trybie Szybkim współtworzenia.", "SSE.Controllers.Main.textYes": "Tak", "SSE.Controllers.Main.titleLicenseExp": "Upłynął okres ważności licencji", "SSE.Controllers.Main.titleRecalcFormulas": "Obliczanie...", @@ -446,8 +541,142 @@ "SSE.Controllers.Main.txtPrintArea": "Obszar_wydruku", "SSE.Controllers.Main.txtRectangles": "Prostokąty", "SSE.Controllers.Main.txtSeries": "Serie", + "SSE.Controllers.Main.txtShape_accentBorderCallout1": "Objaśnienie: linia z obramowaniem i paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_accentBorderCallout2": "Objaśnienie: wygięta linia z obramowaniem i paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_accentBorderCallout3": "Objaśnienie: podwójna wygięta linia z obramowaniem i paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_accentCallout1": "Objaśnienie: linia z paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_accentCallout2": "Objaśnienie: wygięta linia z paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_accentCallout3": "Objaśnienie: podwójna wygięta linia z paskiem wyróżniającym", + "SSE.Controllers.Main.txtShape_actionButtonBackPrevious": "Przycisk poprzedni", + "SSE.Controllers.Main.txtShape_actionButtonBeginning": "Przycisk rozpoczęcia", + "SSE.Controllers.Main.txtShape_actionButtonBlank": "Pusty przycisk", + "SSE.Controllers.Main.txtShape_actionButtonDocument": "Przycisk dokument", + "SSE.Controllers.Main.txtShape_actionButtonEnd": "Przycisk zakończenia ", + "SSE.Controllers.Main.txtShape_actionButtonForwardNext": "Przycisk następny", + "SSE.Controllers.Main.txtShape_actionButtonHelp": "Przycisk pomocy", + "SSE.Controllers.Main.txtShape_actionButtonHome": "Przycisk dom", + "SSE.Controllers.Main.txtShape_actionButtonInformation": "Przycisk informacji", + "SSE.Controllers.Main.txtShape_actionButtonMovie": "Przycisk wideo", + "SSE.Controllers.Main.txtShape_actionButtonReturn": "Przycisk powrotu", + "SSE.Controllers.Main.txtShape_actionButtonSound": "Przycisk dźwięku", "SSE.Controllers.Main.txtShape_arc": "Łuk", + "SSE.Controllers.Main.txtShape_bentArrow": "Strzałka: wygięta", + "SSE.Controllers.Main.txtShape_bentConnector5": "Łącznik: łamany", + "SSE.Controllers.Main.txtShape_bentConnector5WithArrow": "Łącznik: łamany ze strzałką", + "SSE.Controllers.Main.txtShape_bentConnector5WithTwoArrows": "Łącznik: łamany z podwójną strzałką", + "SSE.Controllers.Main.txtShape_bentUpArrow": "Strzałka: wygięta w górę", + "SSE.Controllers.Main.txtShape_bevel": "Prostokąt: ze skosem", + "SSE.Controllers.Main.txtShape_blockArc": "Łuk blokowy", + "SSE.Controllers.Main.txtShape_borderCallout1": "Objaśnienie: linia", + "SSE.Controllers.Main.txtShape_borderCallout2": "Objaśnienie: wygięta linia", + "SSE.Controllers.Main.txtShape_borderCallout3": "Objaśnienie: podwójna wygięta linia", + "SSE.Controllers.Main.txtShape_bracePair": "Para nawiasów klamrowych", + "SSE.Controllers.Main.txtShape_callout1": "Objaśnienie: linia bez obramowania", + "SSE.Controllers.Main.txtShape_callout2": "Objaśnienie: wygięta linia bez obramowania", + "SSE.Controllers.Main.txtShape_callout3": "Objaśnienie: podwójna wygięta linia bez obramowania", + "SSE.Controllers.Main.txtShape_chevron": "Strzałka: pagon", + "SSE.Controllers.Main.txtShape_chord": "Odcinek koła", + "SSE.Controllers.Main.txtShape_circularArrow": "Strzałka: kolista", + "SSE.Controllers.Main.txtShape_cloud": "Chmurka", + "SSE.Controllers.Main.txtShape_cloudCallout": "Dymek myśli: chmurka", + "SSE.Controllers.Main.txtShape_corner": "Kształt litery L", + "SSE.Controllers.Main.txtShape_curvedConnector3": "Łącznik: zakrzywiony", + "SSE.Controllers.Main.txtShape_curvedConnector3WithArrow": "Łącznik: zakrzywiony ze strzałką", + "SSE.Controllers.Main.txtShape_curvedConnector3WithTwoArrows": "Łącznik: zakrzywiony z podwójną strzałką", + "SSE.Controllers.Main.txtShape_curvedDownArrow": "Strzałka: zakrzywiona w dół", + "SSE.Controllers.Main.txtShape_curvedLeftArrow": "Strzałka: zakrzywiona w lewo", + "SSE.Controllers.Main.txtShape_curvedRightArrow": "Strzałka: zakrzywiona w prawo", + "SSE.Controllers.Main.txtShape_curvedUpArrow": "Strzałka: zakrzywiona w górę", + "SSE.Controllers.Main.txtShape_decagon": "Dziesięciokąt", + "SSE.Controllers.Main.txtShape_diagStripe": "Pasek ukośny", + "SSE.Controllers.Main.txtShape_dodecagon": "Dwunastokąt", + "SSE.Controllers.Main.txtShape_donut": "Okrąg: pusty", + "SSE.Controllers.Main.txtShape_doubleWave": "Podwójna fala", + "SSE.Controllers.Main.txtShape_downArrow": "Strzałka: w dół", + "SSE.Controllers.Main.txtShape_downArrowCallout": "Objaśnienie: strzałka w dół", + "SSE.Controllers.Main.txtShape_ellipseRibbon": "Wstęga: zakrzywiona i nachylona w dół", + "SSE.Controllers.Main.txtShape_ellipseRibbon2": "Wstęga: zakrzywiona i nachylona w górę", + "SSE.Controllers.Main.txtShape_flowChartAlternateProcess": "Schemat blokowy: proces alternatywny", + "SSE.Controllers.Main.txtShape_flowChartCollate": "Schemat blokowy: zestawienie", + "SSE.Controllers.Main.txtShape_flowChartConnector": "Schemat blokowy: łącznik", + "SSE.Controllers.Main.txtShape_flowChartDecision": "Schemat blokowy: decyzja", + "SSE.Controllers.Main.txtShape_flowChartDelay": "Schemat blokowy: opóźnienie", + "SSE.Controllers.Main.txtShape_flowChartDisplay": "Schemat blokowy: ekran", + "SSE.Controllers.Main.txtShape_flowChartDocument": "Schemat blokowy: dokument", + "SSE.Controllers.Main.txtShape_flowChartExtract": "Schemat blokowy: wyodrębnianie", + "SSE.Controllers.Main.txtShape_flowChartInputOutput": "Schemat blokowy: decyzja", + "SSE.Controllers.Main.txtShape_flowChartInternalStorage": "Schemat blokowy: pamięć wewnętrzna", + "SSE.Controllers.Main.txtShape_flowChartMagneticDisk": "Schemat blokowy: dysk magnetyczny", + "SSE.Controllers.Main.txtShape_flowChartMagneticDrum": "Schemat blokowy: pamięć o dostępie bezpośrednim", + "SSE.Controllers.Main.txtShape_flowChartMagneticTape": "Schemat blokowy: pamięć o dostępie sekwencyjnym", + "SSE.Controllers.Main.txtShape_flowChartManualInput": "Schemat blokowy: ręczne wprowadzenie danych", + "SSE.Controllers.Main.txtShape_flowChartManualOperation": "Schemat blokowy: operacja ręczna", + "SSE.Controllers.Main.txtShape_flowChartMerge": "Schemat blokowy: scalanie", + "SSE.Controllers.Main.txtShape_flowChartMultidocument": "Schemat blokowy: wiele dokumentów", + "SSE.Controllers.Main.txtShape_flowChartOffpageConnector": "Schemat blokowy: łącznik międzystronicowy", + "SSE.Controllers.Main.txtShape_flowChartOnlineStorage": "Schemat blokowy: przechowywane dane", + "SSE.Controllers.Main.txtShape_flowChartOr": "Schemat blokowy: lub", + "SSE.Controllers.Main.txtShape_flowChartPredefinedProcess": "Schemat blokowy: proces uprzednio zdefiniowany", + "SSE.Controllers.Main.txtShape_flowChartPreparation": "Schemat blokowy: przygotowanie", + "SSE.Controllers.Main.txtShape_flowChartProcess": "Schemat blokowy: proces", + "SSE.Controllers.Main.txtShape_flowChartPunchedCard": "Schemat blokowy: karta", + "SSE.Controllers.Main.txtShape_flowChartPunchedTape": "Schemat blokowy: taśma dziurkowana", + "SSE.Controllers.Main.txtShape_flowChartSort": "Schemat blokowy: sortowanie", + "SSE.Controllers.Main.txtShape_flowChartSummingJunction": "Schemat blokowy: operacja sumowania", + "SSE.Controllers.Main.txtShape_flowChartTerminator": "Schemat blokowy: terminator", + "SSE.Controllers.Main.txtShape_foldedCorner": "Prostokąt: zagięty narożnik", + "SSE.Controllers.Main.txtShape_frame": "Ramka", + "SSE.Controllers.Main.txtShape_halfFrame": "Połowa ramki", + "SSE.Controllers.Main.txtShape_heart": "Serce", + "SSE.Controllers.Main.txtShape_heptagon": "Siedmiokąt", + "SSE.Controllers.Main.txtShape_hexagon": "Sześciokąt", + "SSE.Controllers.Main.txtShape_horizontalScroll": "Zwój: poziomy", + "SSE.Controllers.Main.txtShape_leftArrow": "Strzałka: w lewo", + "SSE.Controllers.Main.txtShape_leftArrowCallout": "Objaśnienie: strzałka w lewo", + "SSE.Controllers.Main.txtShape_leftBrace": "Nawias klamrowy otwierający", + "SSE.Controllers.Main.txtShape_leftBracket": "Nawias otwierający", + "SSE.Controllers.Main.txtShape_leftRightArrow": "Strzałka: w lewo i w prawo", + "SSE.Controllers.Main.txtShape_leftRightArrowCallout": "Objaśnienie: strzałka w lewo i w prawo", + "SSE.Controllers.Main.txtShape_leftRightUpArrow": "Strzałka: w lewo wprawo i w górę", + "SSE.Controllers.Main.txtShape_leftUpArrow": "Strzałka: w lewo i w górę", + "SSE.Controllers.Main.txtShape_lightningBolt": "Błyskawica", + "SSE.Controllers.Main.txtShape_line": "Linia", + "SSE.Controllers.Main.txtShape_lineWithArrow": "Strzałka liniowa", + "SSE.Controllers.Main.txtShape_lineWithTwoArrows": "Strzałka liniowa: podwójna", + "SSE.Controllers.Main.txtShape_mathDivide": "Znak dzielenia", + "SSE.Controllers.Main.txtShape_mathMinus": "Znak minus", + "SSE.Controllers.Main.txtShape_mathMultiply": "Znak mnożenia", + "SSE.Controllers.Main.txtShape_mathPlus": "Znak plus", + "SSE.Controllers.Main.txtShape_moon": "Księżyc", "SSE.Controllers.Main.txtShape_noSmoking": "Symbol \"nie\"", + "SSE.Controllers.Main.txtShape_notchedRightArrow": "Strzałka: w prawo z wcięciem", + "SSE.Controllers.Main.txtShape_octagon": "Ośmiokąt", + "SSE.Controllers.Main.txtShape_parallelogram": "Równoległobok", + "SSE.Controllers.Main.txtShape_pentagon": "Pięciokąt", + "SSE.Controllers.Main.txtShape_pie": "Wycinek okręgu", + "SSE.Controllers.Main.txtShape_plaque": "Plakietka", + "SSE.Controllers.Main.txtShape_plus": "Znak plus", + "SSE.Controllers.Main.txtShape_polyline1": "Dowolny kształt: bazgroły", + "SSE.Controllers.Main.txtShape_polyline2": "Dowolny kształt: kształt", + "SSE.Controllers.Main.txtShape_quadArrow": "Strzałka: w cztery strony", + "SSE.Controllers.Main.txtShape_quadArrowCallout": "Objaśnienie: strzałka w cztery strony", + "SSE.Controllers.Main.txtShape_rect": "Prostokąt", + "SSE.Controllers.Main.txtShape_ribbon": "Wstęga: nachylona w dół", + "SSE.Controllers.Main.txtShape_ribbon2": "Wstęga: nachylona w górę", + "SSE.Controllers.Main.txtShape_rightArrow": "Strzałka: w prawo", + "SSE.Controllers.Main.txtShape_rightArrowCallout": "Objaśnienie: strzałka w prawo", + "SSE.Controllers.Main.txtShape_rightBrace": "Nawias klamrowy zamykający", + "SSE.Controllers.Main.txtShape_rightBracket": "Nawias zamykający", + "SSE.Controllers.Main.txtShape_round1Rect": "Prostokąt: jeden zaokrąglony róg", + "SSE.Controllers.Main.txtShape_round2DiagRect": "Prostokąt: zaokrąglone rogi po przekątnej", + "SSE.Controllers.Main.txtShape_round2SameRect": "Prostokąt: zaokrąglone rogi u góry", + "SSE.Controllers.Main.txtShape_roundRect": "Prostokąt: zaokrąglone rogi", + "SSE.Controllers.Main.txtShape_rtTriangle": "Trójkąt równoramienny", + "SSE.Controllers.Main.txtShape_smileyFace": "Uśmiechnięta buźka", + "SSE.Controllers.Main.txtShape_snip1Rect": "Prostokąt: jeden ścięty róg ", + "SSE.Controllers.Main.txtShape_snip2DiagRect": "Prostokąt: ścięte rogi po przekątnej", + "SSE.Controllers.Main.txtShape_snip2SameRect": "Prostokąt: ścięte rogi u góry", + "SSE.Controllers.Main.txtShape_snipRoundRect": "Prostokąt: zaokrąglony róg i ścięty róg u góry", "SSE.Controllers.Main.txtShape_star10": "10-Ramienna Gwiazda", "SSE.Controllers.Main.txtShape_star12": "12-Ramienna Gwiazda", "SSE.Controllers.Main.txtShape_star16": "16-Ramienna Gwiazda", @@ -458,6 +687,21 @@ "SSE.Controllers.Main.txtShape_star6": "6-Ramienna Gwiazda", "SSE.Controllers.Main.txtShape_star7": "7-Ramienna Gwiazda", "SSE.Controllers.Main.txtShape_star8": "8-Ramienna Gwiazda", + "SSE.Controllers.Main.txtShape_stripedRightArrow": "Strzałka: prążkowana w prawo", + "SSE.Controllers.Main.txtShape_sun": "Słoneczko", + "SSE.Controllers.Main.txtShape_teardrop": "Łza", + "SSE.Controllers.Main.txtShape_textRect": "Pole tekstowe", + "SSE.Controllers.Main.txtShape_trapezoid": "Trapez", + "SSE.Controllers.Main.txtShape_triangle": "Trójkąt równoramienny", + "SSE.Controllers.Main.txtShape_upArrow": "Strzałka: w górę", + "SSE.Controllers.Main.txtShape_upArrowCallout": "Objaśnienie: strzałka w górę", + "SSE.Controllers.Main.txtShape_upDownArrow": "Strzałka: w górę i w dół", + "SSE.Controllers.Main.txtShape_uturnArrow": "Strzałka: zawracanie", + "SSE.Controllers.Main.txtShape_verticalScroll": "Zwój: pionowy", + "SSE.Controllers.Main.txtShape_wave": "Fala", + "SSE.Controllers.Main.txtShape_wedgeEllipseCallout": "Dymek mowy: owalny", + "SSE.Controllers.Main.txtShape_wedgeRectCallout": "Dymek mowy: prostokąt", + "SSE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Dymek mowy: prostokąt z zaokrąglonymi rogami", "SSE.Controllers.Main.txtStarsRibbons": "Gwiazdy i wstążki", "SSE.Controllers.Main.txtStyle_Bad": "Zły", "SSE.Controllers.Main.txtStyle_Calculation": "Obliczenie", @@ -493,10 +737,15 @@ "SSE.Controllers.Main.waitText": "Proszę czekać...", "SSE.Controllers.Main.warnBrowserIE9": "Aplikacja ma małe możliwości w IE9. Użyj przeglądarki IE10 lub nowszej.", "SSE.Controllers.Main.warnBrowserZoom": "Aktualne ustawienie powiększenia przeglądarki nie jest w pełni obsługiwane. Zresetuj domyślny zoom, naciskając Ctrl + 0.", + "SSE.Controllers.Main.warnLicenseExceeded": "Ta wersja edytorów ONLYOFFICE ma pewne ograniczenia dla użytkowników.Dokument zostanie otwarty tylko do odczytu.Jeżeli potrzebujesz więcej, rozważ zakupienie licencji komercyjnej.", "SSE.Controllers.Main.warnLicenseExp": "Twoja licencja wygasła.
    Zaktualizuj licencję i odśwież stronę.", + "SSE.Controllers.Main.warnLicenseLimitedNoAccess": "Licencja wygasła.
    Nie masz dostępu do edycji dokumentu.
    Proszę skontaktować się ze swoim administratorem.", + "SSE.Controllers.Main.warnLicenseLimitedRenewed": "Licencja musi zostać odnowiona.
    Masz ograniczony dostęp do edycji dokumentu.
    Skontaktuj się ze swoim administratorem, aby uzyskać pełny dostęp.", + "SSE.Controllers.Main.warnLicenseUsersExceeded": "Osiągnąłeś limit dla użytkownia. Skontaktuj się z administratorem, aby dowiedzieć się więcej.", "SSE.Controllers.Main.warnNoLicense": "Osiągnięto limit jednoczesnych połączeń z %1 edytorami. Ten dokument zostanie otwarty tylko do odczytu.
    Skontaktuj się z %1 zespołem sprzedaży w celu omówienia indywidualnych warunków licencji.", "SSE.Controllers.Main.warnProcessRightsChange": "Nie masz prawa edytować tego pliku.", "SSE.Controllers.Print.strAllSheets": "Wszystkie arkusze", + "SSE.Controllers.Print.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", "SSE.Controllers.Print.textWarning": "Ostrzeżenie", "SSE.Controllers.Print.warnCheckMargings": "Marginesy są błędne", "SSE.Controllers.Statusbar.errorLastSheet": "Skoroszyt musi zawierać co najmniej jeden widoczny arkusz roboczy.", @@ -512,6 +761,7 @@ "SSE.Controllers.Toolbar.textFontSizeErr": "Wprowadzona wartość jest nieprawidłowa.
    Wprowadź wartość liczbową w zakresie od 1 do 409.", "SSE.Controllers.Toolbar.textFraction": "Ułamki", "SSE.Controllers.Toolbar.textFunction": "Funkcje", + "SSE.Controllers.Toolbar.textInsert": "Wstaw", "SSE.Controllers.Toolbar.textIntegral": "Całki", "SSE.Controllers.Toolbar.textLargeOperator": "Duże operatory", "SSE.Controllers.Toolbar.textLimitAndLog": "Limity i algorytmy", @@ -591,6 +841,7 @@ "SSE.Controllers.Toolbar.txtBracket_UppLim": "Klamry", "SSE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Pojedyńcza klamra", "SSE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Pojedyńcza klamra", + "SSE.Controllers.Toolbar.txtDeleteCells": "Usuń komórki", "SSE.Controllers.Toolbar.txtExpand": "Rozszerz i posortuj", "SSE.Controllers.Toolbar.txtExpandSort": "Dane obok zaznaczenia nie będą sortowane. Czy chcesz rozszerzyć wybór, aby uwzględnić sąsiednie dane lub kontynuować sortowanie tylko zaznaczonych komórek?", "SSE.Controllers.Toolbar.txtFractionDiagonal": "Skrzywiona frakcja", @@ -629,6 +880,7 @@ "SSE.Controllers.Toolbar.txtFunction_Sinh": "Funkcja hiperboliczna Sine", "SSE.Controllers.Toolbar.txtFunction_Tan": "Tangens", "SSE.Controllers.Toolbar.txtFunction_Tanh": "Tangens hiperboliczny", + "SSE.Controllers.Toolbar.txtInsertCells": "Wstaw komórki", "SSE.Controllers.Toolbar.txtIntegral": "Całka", "SSE.Controllers.Toolbar.txtIntegral_dtheta": "Mechanizm różnicowy", "SSE.Controllers.Toolbar.txtIntegral_dx": "Mechanizm różnicowy x", @@ -818,7 +1070,7 @@ "SSE.Controllers.Toolbar.txtSymbol_percent": "Procentowo", "SSE.Controllers.Toolbar.txtSymbol_phi": "Fi", "SSE.Controllers.Toolbar.txtSymbol_pi": "Pi", - "SSE.Controllers.Toolbar.txtSymbol_plus": "Plus", + "SSE.Controllers.Toolbar.txtSymbol_plus": "Znak plus", "SSE.Controllers.Toolbar.txtSymbol_pm": "Plus minus", "SSE.Controllers.Toolbar.txtSymbol_propto": "Proporcjonalny do", "SSE.Controllers.Toolbar.txtSymbol_psi": "Psi", @@ -899,11 +1151,28 @@ "SSE.Views.ChartDataDialog.errorMaxPoints": "Maksymalna liczba punktów w serii na wykres to 4096.", "SSE.Views.ChartDataDialog.errorMaxRows": "Maksymalna liczba serii danych na wykres to 255.", "SSE.Views.ChartDataDialog.errorNoSingleRowCol": "Odniesienie jest nieprawidłowe. Odniesienia do tytułów, wartości, rozmiarów lub etykiet danych muszą obejmować pojedynczą komórkę, wiersz lub kolumnę.", + "SSE.Views.ChartDataDialog.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
    cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", "SSE.Views.ChartDataDialog.textAdd": "Dodaj", + "SSE.Views.ChartDataDialog.textCategory": "Etykiety osi poziomej (kategorii)", + "SSE.Views.ChartDataDialog.textData": "Zakres danych wykresu", "SSE.Views.ChartDataDialog.textDelete": "Usuń", + "SSE.Views.ChartDataDialog.textEdit": "Edytuj", + "SSE.Views.ChartDataDialog.textInvalidRange": "Błędny zakres komórek.", + "SSE.Views.ChartDataDialog.textSelectData": "Wybierz dane", + "SSE.Views.ChartDataDialog.textSeries": "Wpisy legendy (serie danych)", + "SSE.Views.ChartDataDialog.textSwitch": "Przełącz wiersz/kolumnę", + "SSE.Views.ChartDataDialog.textTitle": "Dane wykresu", "SSE.Views.ChartDataRangeDialog.errorMaxPoints": "Maksymalna liczba punktów w serii na wykres to 4096.", "SSE.Views.ChartDataRangeDialog.errorMaxRows": "Maksymalna liczba serii danych na wykres to 255.", "SSE.Views.ChartDataRangeDialog.errorNoSingleRowCol": "Odniesienie jest nieprawidłowe. Odniesienia do tytułów, wartości, rozmiarów lub etykiet danych muszą obejmować pojedynczą komórkę, wiersz lub kolumnę.", + "SSE.Views.ChartDataRangeDialog.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
    cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", + "SSE.Views.ChartDataRangeDialog.textInvalidRange": "Błędny zakres komórek.", + "SSE.Views.ChartDataRangeDialog.textSelectData": "Wybierz dane", + "SSE.Views.ChartDataRangeDialog.txtAxisLabel": "Zakres etykiet osi", + "SSE.Views.ChartDataRangeDialog.txtSeriesName": "Nazwa serii", + "SSE.Views.ChartDataRangeDialog.txtTitleCategory": "Etykiety osi", + "SSE.Views.ChartDataRangeDialog.txtTitleSeries": "Edytowanie serii", + "SSE.Views.ChartDataRangeDialog.txtValues": "Wartości serii", "SSE.Views.ChartSettings.strLineWeight": "Waga linii", "SSE.Views.ChartSettings.strSparkColor": "Kolor", "SSE.Views.ChartSettings.strTemplate": "Szablon", @@ -940,6 +1209,7 @@ "SSE.Views.ChartSettingsDlg.textAxisOptions": "Opcje osi", "SSE.Views.ChartSettingsDlg.textAxisPos": "Pozycja osi", "SSE.Views.ChartSettingsDlg.textAxisSettings": "Ustawienia osi", + "SSE.Views.ChartSettingsDlg.textAxisTitle": "Tytuł osi", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Pomiędzy znakami Tick", "SSE.Views.ChartSettingsDlg.textBillions": "Miliardy", "SSE.Views.ChartSettingsDlg.textBottom": "Dół", @@ -957,10 +1227,12 @@ "SSE.Views.ChartSettingsDlg.textEmptyLine": "Podłącz punkty danych do wierszu", "SSE.Views.ChartSettingsDlg.textFit": "Dopasuj do szerokości", "SSE.Views.ChartSettingsDlg.textFixed": "Ustalony", + "SSE.Views.ChartSettingsDlg.textFormat": "Format etykiety", "SSE.Views.ChartSettingsDlg.textGaps": "Przerwy", "SSE.Views.ChartSettingsDlg.textGridLines": "Linie siatki", "SSE.Views.ChartSettingsDlg.textGroup": "Grupa Sparkline", "SSE.Views.ChartSettingsDlg.textHide": "Ukryj", + "SSE.Views.ChartSettingsDlg.textHideAxis": "Ukryj oś", "SSE.Views.ChartSettingsDlg.textHigh": "Wysoki", "SSE.Views.ChartSettingsDlg.textHorAxis": "Pozioma oś", "SSE.Views.ChartSettingsDlg.textHorizontal": "Poziomy", @@ -1022,6 +1294,7 @@ "SSE.Views.ChartSettingsDlg.textShowValues": "Pokaż wartości wykresu", "SSE.Views.ChartSettingsDlg.textSingle": "Pojedynczy Sparkline", "SSE.Views.ChartSettingsDlg.textSmooth": "Gładki", + "SSE.Views.ChartSettingsDlg.textSnap": "Przesuwanie komórek", "SSE.Views.ChartSettingsDlg.textSparkRanges": "Sparkline Ranges", "SSE.Views.ChartSettingsDlg.textStraight": "Prosty", "SSE.Views.ChartSettingsDlg.textStyle": "Styl", @@ -1044,7 +1317,14 @@ "SSE.Views.ChartSettingsDlg.textZero": "Zero", "SSE.Views.ChartSettingsDlg.txtEmpty": "To pole jest wymagane", "SSE.Views.ChartTypeDialog.errorSecondaryAxis": "Wybrany typ wykresu wymaga osi pomocniczej, której używa istniejący wykres. Wybierz inny typ wykresu.", + "SSE.Views.ChartTypeDialog.textSecondary": "Oś pomocnicza", + "SSE.Views.ChartTypeDialog.textSeries": "Nazwa serii", + "SSE.Views.ChartTypeDialog.textStyle": "Styl", + "SSE.Views.ChartTypeDialog.textTitle": "Typ wykresu", + "SSE.Views.ChartTypeDialog.textType": "Typ wykresu", + "SSE.Views.CreatePivotDialog.textInvalidRange": "Błędny zakres komórek.", "SSE.Views.CreatePivotDialog.textNew": "Nowy arkusz", + "SSE.Views.CreateSparklineDialog.textInvalidRange": "Błędny zakres komórek.", "SSE.Views.DataTab.capBtnGroup": "Grupuj", "SSE.Views.DataTab.capBtnTextCustomSort": "Niestandardowe sortowanie", "SSE.Views.DataTab.capBtnTextRemDuplicates": "Usuń duplikaty", @@ -1064,6 +1344,7 @@ "SSE.Views.DataValidationDialog.textCellSelected": "Gdy komórka jest zaznaczona, pokaż ten komunikat wejściowy", "SSE.Views.DataValidationDialog.textShowError": "Pokaż komunikat błędu po wprowadzeniu nieprawidłowych danych", "SSE.Views.DataValidationDialog.textShowInput": "Pokaż komunikat wejściowy, gdy komórka jest zaznaczona", + "SSE.Views.DataValidationDialog.textStyle": "Styl", "SSE.Views.DataValidationDialog.textUserEnters": "Pokaż ten komunikat błędu, gdy użytkownik wprowadzi nieprawidłowe dane", "SSE.Views.DataValidationDialog.txtWhole": "Cały numer", "SSE.Views.DigitalFilterDialog.capAnd": "I", @@ -1116,9 +1397,20 @@ "SSE.Views.DocumentHolder.textArrangeBackward": "Przenieś do tyłu", "SSE.Views.DocumentHolder.textArrangeForward": "Przenieś do przodu", "SSE.Views.DocumentHolder.textArrangeFront": "Przejdź na pierwszy plan", + "SSE.Views.DocumentHolder.textCount": "Zliczanie", "SSE.Views.DocumentHolder.textEntriesList": "Wybierz z rozwijalnej listy", + "SSE.Views.DocumentHolder.textFlipH": "Odwróć w poziomie", "SSE.Views.DocumentHolder.textFreezePanes": "Zablokuj panele", + "SSE.Views.DocumentHolder.textFromFile": "Z pliku", + "SSE.Views.DocumentHolder.textFromUrl": "Z adresu URL", + "SSE.Views.DocumentHolder.textMax": "Maksimum", + "SSE.Views.DocumentHolder.textMin": "Minimum", + "SSE.Views.DocumentHolder.textMoreFormats": "Więcej formatów", "SSE.Views.DocumentHolder.textNone": "Żaden", + "SSE.Views.DocumentHolder.textNumbering": "Numerowanie", + "SSE.Views.DocumentHolder.textReplace": "Zamień obraz", + "SSE.Views.DocumentHolder.textRotate270": "Obróć w lewo o 90° ", + "SSE.Views.DocumentHolder.textRotate90": "Obróć w prawo o 90°", "SSE.Views.DocumentHolder.textShapeAlignBottom": "Wyrównaj do dołu", "SSE.Views.DocumentHolder.textShapeAlignCenter": "Wyrównaj do środka", "SSE.Views.DocumentHolder.textShapeAlignLeft": "Wyrównaj do lewej", @@ -1128,7 +1420,7 @@ "SSE.Views.DocumentHolder.textUndo": "Cofnij", "SSE.Views.DocumentHolder.textUnFreezePanes": "Odblokuj panele", "SSE.Views.DocumentHolder.topCellText": "Wyrównaj do góry", - "SSE.Views.DocumentHolder.txtAccounting": "Księgowość", + "SSE.Views.DocumentHolder.txtAccounting": "Księgowy", "SSE.Views.DocumentHolder.txtAddComment": "Dodaj komentarz", "SSE.Views.DocumentHolder.txtAddNamedRange": "Zdefiniuj zakres", "SSE.Views.DocumentHolder.txtArrange": "Zorganizować", @@ -1142,32 +1434,40 @@ "SSE.Views.DocumentHolder.txtClearHyper": "Hiperlinki", "SSE.Views.DocumentHolder.txtClearSparklineGroups": "Wyczyść wybrane grupy Sparkline", "SSE.Views.DocumentHolder.txtClearSparklines": "Wyczyść wybrane pola typu Sparkline", - "SSE.Views.DocumentHolder.txtClearText": "Tekst", + "SSE.Views.DocumentHolder.txtClearText": "Tekstowe", "SSE.Views.DocumentHolder.txtColumn": "Wstaw kolumnę", "SSE.Views.DocumentHolder.txtColumnWidth": "Ustaw szerokość kolumny", "SSE.Views.DocumentHolder.txtCopy": "Kopiuj", + "SSE.Views.DocumentHolder.txtCurrency": "Walutowy", "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Niestandardowy rozmiar kolumny", "SSE.Views.DocumentHolder.txtCustomRowHeight": "Niestandardowa wysokość wiersza", "SSE.Views.DocumentHolder.txtCustomSort": "Niestandardowe sortowanie", "SSE.Views.DocumentHolder.txtCut": "Wytnij", + "SSE.Views.DocumentHolder.txtDate": "Data", "SSE.Views.DocumentHolder.txtDelete": "Usuń", "SSE.Views.DocumentHolder.txtDescending": "Malejąco", + "SSE.Views.DocumentHolder.txtDistribHor": "Rozdziel poziomo", + "SSE.Views.DocumentHolder.txtDistribVert": "Rozdziel pionowo", "SSE.Views.DocumentHolder.txtEditComment": "Edytuj komentarz", "SSE.Views.DocumentHolder.txtFilter": "Filtr", "SSE.Views.DocumentHolder.txtFilterCellColor": "Filtruj po kolorze komórki", "SSE.Views.DocumentHolder.txtFilterFontColor": "Filtruj po kolorze czcionki", "SSE.Views.DocumentHolder.txtFilterValue": "Filtruj po wybranych wartościach komórki", "SSE.Views.DocumentHolder.txtFormula": "Wstaw funkcję", + "SSE.Views.DocumentHolder.txtFraction": "Ułamkowe", + "SSE.Views.DocumentHolder.txtGeneral": "Ogólny", "SSE.Views.DocumentHolder.txtGroup": "Grupa", "SSE.Views.DocumentHolder.txtHide": "Ukryj", "SSE.Views.DocumentHolder.txtInsert": "Wstaw", "SSE.Views.DocumentHolder.txtInsHyperlink": "Hiperlink", - "SSE.Views.DocumentHolder.txtNumber": "Numer", + "SSE.Views.DocumentHolder.txtNumber": "Numeryczny", "SSE.Views.DocumentHolder.txtNumFormat": "Format liczbowy", "SSE.Views.DocumentHolder.txtPaste": "Wklej", + "SSE.Views.DocumentHolder.txtPercentage": "Procentowe", "SSE.Views.DocumentHolder.txtReapply": "Ponownie zastosuj", "SSE.Views.DocumentHolder.txtRow": "Cały wiersz", "SSE.Views.DocumentHolder.txtRowHeight": "Ustaw wysokość wiersza", + "SSE.Views.DocumentHolder.txtScientific": "Naukowy", "SSE.Views.DocumentHolder.txtSelect": "Wybierz", "SSE.Views.DocumentHolder.txtShiftDown": "Przesuń komórki w dół", "SSE.Views.DocumentHolder.txtShiftLeft": "Przesuń komórki w lewo", @@ -1179,10 +1479,13 @@ "SSE.Views.DocumentHolder.txtSortCellColor": "Wybrany kolor komórki na górze", "SSE.Views.DocumentHolder.txtSortFontColor": "Wybrany kolor czcionki na górze", "SSE.Views.DocumentHolder.txtSparklines": "Sparkline", + "SSE.Views.DocumentHolder.txtText": "Tekstowe", "SSE.Views.DocumentHolder.txtTextAdvanced": "Zaawansowane ustawienia tekstu", + "SSE.Views.DocumentHolder.txtTime": "Czas", "SSE.Views.DocumentHolder.txtUngroup": "Rozgrupuj", "SSE.Views.DocumentHolder.txtWidth": "Szerokość", "SSE.Views.DocumentHolder.vertAlignText": "Wyrównaj wertykalnie", + "SSE.Views.FieldSettingsDialog.strLayout": "Układ", "SSE.Views.FieldSettingsDialog.txtBottom": "Pokaż na dole grupy", "SSE.Views.FieldSettingsDialog.txtCountNums": "Odliczać cyfry", "SSE.Views.FieldSettingsDialog.txtTop": "Pokaż na górze grupy", @@ -1200,18 +1503,20 @@ "SSE.Views.FileMenu.btnRightsCaption": "Prawa dostępu...", "SSE.Views.FileMenu.btnSaveAsCaption": "Zapisz jako", "SSE.Views.FileMenu.btnSaveCaption": "Zapisz", + "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Zapisz kopię jako…", "SSE.Views.FileMenu.btnSettingsCaption": "Zaawansowane ustawienia...", "SSE.Views.FileMenu.btnToEditCaption": "Edytuj arkusz kalkulacyjny", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z pustego", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z szablonu", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Utwórz nowy, czysty arkusz kalkulacyjny, który będziesz mógł sformatować podczas edytowania po jego utworzeniu. Możesz też wybrać jeden z szablonów, aby utworzyć arkusz kalkulacyjny określonego typu lub celu, w którym niektóre style zostały wcześniej zastosowane.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nowy arkusz kalkulacyjny", + "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Zatwierdź", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj autora", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj tekst", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu", + "SSE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Ostatnio zmodyfikowany przez", + "SSE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Ostatnia modyfikacja", + "SSE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Właściciel", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokalizacja", "SSE.Views.FileMenuPanels.DocumentInfo.txtRights": "Osoby, które mają prawa", + "SSE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Temat", "SSE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Tytuł arkusza kalkulacyjnego", "SSE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Zmień prawa dostępu", "SSE.Views.FileMenuPanels.DocumentRights.txtRights": "Osoby, które mają prawa", @@ -1228,6 +1533,8 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Przykład: SUM; MIN; MAX; COUNT", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Włącz wyświetlanie komentarzy", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMacrosSettings": "Ustawienia Makr", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPaste": "Wycinanie, kopiowanie i wklejanie", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPasteButton": "Pokaż przycisk opcji wklejania po wklejeniu zawartości", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettings": "Ustawienia regionaln", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettingsEx": "Przykład:", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strResolvedComment": "Włącz wyświetlanie rozwiązanych komentarzy", @@ -1243,6 +1550,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Wyłączony", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Zapisz na serwer", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Każda minuta", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCacheMode": "Domyślny tryb pamięci podręcznej", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centymetr", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Niemiecki", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "Angielski", @@ -1253,13 +1561,20 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polski", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punkt", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Rosyjski", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacros": "Włącz Wszystkie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Włącz wszystkie makra bez powiadomienia", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Wyłącz Wszystkie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Wyłącz wszystkie makra bez powiadomienia", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Pokaż powiadomienie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Wyłącz wszystkie makra z powiadomieniem", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jak Windows", + "SSE.Views.FileMenuPanels.MainSpellCheckSettings.okButtonText": "Zatwierdź", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Język słownika", + "SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtAutoCorrect": "Opcje Autokorekty...", + "SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtProofing": "Sprawdzanie", "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "z hasłem", "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "\nChroń arkusz kalkulacyjny", + "SSE.Views.FileMenuPanels.ProtectDoc.strSignature": "Z sygnaturą", "SSE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edytuj arkusz kalkulacyjny", "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Edycja spowoduje usunięcie podpisów z arkusza kalkulacyjnego.
    Kontynuować?", "SSE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Ten arkusz kalkulacyjny został zabezpieczony hasłem", @@ -1268,24 +1583,37 @@ "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Ogólne", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Ustawienia strony", "SSE.Views.FileMenuPanels.Settings.txtSpellChecking": "Sprawdzanie pisowni", + "SSE.Views.FormatRulesEditDlg.textColor": "Kolor tekstu", + "SSE.Views.FormatRulesEditDlg.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", + "SSE.Views.FormatRulesEditDlg.textMiddleBorders": "Wewnątrz poziomych granic", + "SSE.Views.FormatRulesEditDlg.textNewColor": "Dodaj nowy niestandardowy kolor", + "SSE.Views.FormatRulesEditDlg.textNone": "Żaden", + "SSE.Views.FormatRulesEditDlg.textPreview": "Podgląd", + "SSE.Views.FormatRulesEditDlg.textStrikeout": "Przekreślenie", + "SSE.Views.FormatRulesEditDlg.textUnderline": "Podkreślenie", + "SSE.Views.FormatRulesEditDlg.txtText": "Tekst", + "SSE.Views.FormatRulesManagerDlg.textDelete": "Usuń", + "SSE.Views.FormatRulesManagerDlg.textNew": "Nowy", "SSE.Views.FormatSettingsDialog.textCategory": "Kategoria", "SSE.Views.FormatSettingsDialog.textDecimal": "Dziesiętny", "SSE.Views.FormatSettingsDialog.textFormat": "Formatowanie", + "SSE.Views.FormatSettingsDialog.textLinked": "Połączone ze źródłem", "SSE.Views.FormatSettingsDialog.textSeparator": "Użyj separatora 1000", "SSE.Views.FormatSettingsDialog.textSymbols": "Symbole", "SSE.Views.FormatSettingsDialog.textTitle": "Format numeru", - "SSE.Views.FormatSettingsDialog.txtAccounting": "Rachunkowy", + "SSE.Views.FormatSettingsDialog.txtAccounting": "Księgowy", "SSE.Views.FormatSettingsDialog.txtAs10": "Dziesiętnie (5/10)", "SSE.Views.FormatSettingsDialog.txtAs100": "Jak setne (50/100)", "SSE.Views.FormatSettingsDialog.txtAs16": "Jako szesnaście (8/16)", "SSE.Views.FormatSettingsDialog.txtAs2": "Jako połówki (1/2)", "SSE.Views.FormatSettingsDialog.txtAs4": "Czwartym udziałów (2/4)", "SSE.Views.FormatSettingsDialog.txtAs8": "Wyrównane poprawnie udziałów (4/8)", - "SSE.Views.FormatSettingsDialog.txtCurrency": "Waluta", + "SSE.Views.FormatSettingsDialog.txtCurrency": "Walutowy", "SSE.Views.FormatSettingsDialog.txtCustom": "Niestandardowy", "SSE.Views.FormatSettingsDialog.txtDate": "Data", - "SSE.Views.FormatSettingsDialog.txtFraction": "Ułamek", + "SSE.Views.FormatSettingsDialog.txtFraction": "Ułamkowe", "SSE.Views.FormatSettingsDialog.txtGeneral": "Ogólne", + "SSE.Views.FormatSettingsDialog.txtNone": "Żaden", "SSE.Views.FormatSettingsDialog.txtNumber": "Numeryczny", "SSE.Views.FormatSettingsDialog.txtPercentage": "Procentowo", "SSE.Views.FormatSettingsDialog.txtSample": "Przykład:", @@ -1299,12 +1627,18 @@ "SSE.Views.FormulaDialog.textGroupDescription": "Wybierz grupę funkcji", "SSE.Views.FormulaDialog.textListDescription": "Wybierz funkcję", "SSE.Views.FormulaDialog.txtTitle": "Wstaw funkcję", + "SSE.Views.FormulaTab.txtAutosumTip": "Autosumowanie", + "SSE.Views.FormulaTab.txtRecent": "Ostatnio używane", "SSE.Views.FormulaWizard.textNumber": "Numer", "SSE.Views.HeaderFooterDialog.textAlign": "Wyrównaj do marginesów strony", "SSE.Views.HeaderFooterDialog.textAll": "Wszystkie strony", + "SSE.Views.HeaderFooterDialog.textColor": "Kolor tekstu", + "SSE.Views.HeaderFooterDialog.textInsert": "Wstaw", "SSE.Views.HeaderFooterDialog.textNewColor": "Dodaj nowy niestandardowy kolor", "SSE.Views.HeaderFooterDialog.textPageNum": "Numer strony", "SSE.Views.HeaderFooterDialog.textSheet": "Nazwa arkusza", + "SSE.Views.HeaderFooterDialog.textUnderline": "Podkreślenie", + "SSE.Views.HeaderFooterDialog.tipFontName": "Czcionka", "SSE.Views.HeaderFooterDialog.tipFontSize": "Rozmiar czcionki", "SSE.Views.HyperlinkSettingsDialog.strDisplay": "Pokaż", "SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Link do", @@ -1328,9 +1662,13 @@ "SSE.Views.ImageSettings.textFromFile": "Z pliku", "SSE.Views.ImageSettings.textFromUrl": "Z URL", "SSE.Views.ImageSettings.textHeight": "Wysokość", + "SSE.Views.ImageSettings.textHint270": "Obróć w lewo o 90° ", + "SSE.Views.ImageSettings.textHint90": "Obróć w prawo o 90°", + "SSE.Views.ImageSettings.textHintFlipH": "Odwróć w poziomie", "SSE.Views.ImageSettings.textInsert": "Zamień obraz", "SSE.Views.ImageSettings.textKeepRatio": "Stałe proporcje", "SSE.Views.ImageSettings.textOriginalSize": "Rzeczywisty rozmiar", + "SSE.Views.ImageSettings.textRotate90": "Obróć o 90°", "SSE.Views.ImageSettings.textSize": "Rozmiar", "SSE.Views.ImageSettings.textWidth": "Szerokość", "SSE.Views.ImageSettingsAdvanced.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", @@ -1339,6 +1677,7 @@ "SSE.Views.ImageSettingsAdvanced.textAltTip": "Alternatywna, tekstowa prezentacja wizualnych informacji o obiektach, która będzie czytana osobom z wadami wzroku lub zmysłu poznawczego, aby pomóc im lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształcie, wykresie lub tabeli.", "SSE.Views.ImageSettingsAdvanced.textAltTitle": "Tytuł", "SSE.Views.ImageSettingsAdvanced.textAngle": "Kąt", + "SSE.Views.ImageSettingsAdvanced.textHorizontally": "Poziomo ", "SSE.Views.ImageSettingsAdvanced.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", "SSE.Views.ImageSettingsAdvanced.textTitle": "Obraz - zaawansowane ustawienia", "SSE.Views.ImageSettingsAdvanced.textTwoCell": "Przenieś i zmień rozmiar komórek", @@ -1408,6 +1747,8 @@ "SSE.Views.NameManagerDlg.textWorkbook": "Skoroszyt", "SSE.Views.NameManagerDlg.tipIsLocked": "Ten element jest właśnie edytowany przez innego użytkownika.", "SSE.Views.NameManagerDlg.txtTitle": "Menadżer zdefiniowanych zakresów", + "SSE.Views.PageMarginsDialog.textLeft": "Z lewej", + "SSE.Views.PageMarginsDialog.textRight": "Z prawej", "SSE.Views.PageMarginsDialog.textTitle": "Marginesy", "SSE.Views.ParagraphSettings.strLineHeight": "Rozstaw wierszy", "SSE.Views.ParagraphSettings.strParagraphSpacing": "Odstępy akapitu", @@ -1422,9 +1763,12 @@ "SSE.Views.ParagraphSettingsAdvanced.noTabs": "W tym polu zostaną wyświetlone określone karty", "SSE.Views.ParagraphSettingsAdvanced.strAllCaps": "Wszystkie duże znaki", "SSE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Podwójne przekreślenie", + "SSE.Views.ParagraphSettingsAdvanced.strIndent": "Wcięcia", "SSE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Lewy", + "SSE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Interlinia", "SSE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Prawy", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Po", + "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Specjalne", "SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Czcionka", "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Wcięcia i odstępy", "SSE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Małe litery", @@ -1433,9 +1777,14 @@ "SSE.Views.ParagraphSettingsAdvanced.strSuperscript": "Indeks górny", "SSE.Views.ParagraphSettingsAdvanced.strTabs": "Karta", "SSE.Views.ParagraphSettingsAdvanced.textAlign": "Wyrównanie", + "SSE.Views.ParagraphSettingsAdvanced.textAuto": "Wielokrotne", "SSE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Rozstaw znaków", "SSE.Views.ParagraphSettingsAdvanced.textDefault": "Domyślna zakładka", "SSE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty", + "SSE.Views.ParagraphSettingsAdvanced.textExact": "Dokładnie", + "SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "Pierwszy wiersz", + "SSE.Views.ParagraphSettingsAdvanced.textHanging": "Wysunięcie", + "SSE.Views.ParagraphSettingsAdvanced.textJustified": "Wyjustowany", "SSE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(brak)", "SSE.Views.ParagraphSettingsAdvanced.textRemove": "Usuń", "SSE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Usuń wszystko", @@ -1450,10 +1799,12 @@ "SSE.Views.PivotGroupDialog.textNumDays": "Liczba dni", "SSE.Views.PivotGroupDialog.txtTitle": "Grupowanie", "SSE.Views.PivotSettings.textAdvanced": "Pokaż ustawienia zaawansowane", + "SSE.Views.PivotSettings.textColumns": "Kolumny", "SSE.Views.PivotSettings.textRows": "Wiersze", "SSE.Views.PivotSettings.txtAddRow": "Dodaj do wierszy", "SSE.Views.PivotSettings.txtRemove": "Usuń pole", "SSE.Views.PivotSettingsAdvanced.textAlt": "Alternatywny tekst", + "SSE.Views.PivotSettingsAdvanced.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", "SSE.Views.PivotTable.capBlankRows": "Puste wiersze", "SSE.Views.PivotTable.capLayout": "Układ raportu", "SSE.Views.PivotTable.mniBottomSubtotals": "Pokaż wszystkie sumy pośrednie na dole grupy", @@ -1495,7 +1846,13 @@ "SSE.Views.PrintSettings.textShowGrid": "Pokaż linie siatki", "SSE.Views.PrintSettings.textShowHeadings": "Pokaż nagłówki wierszy i kolumn", "SSE.Views.PrintSettings.textTitle": "Ustawienia drukowania", + "SSE.Views.PrintTitlesDialog.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", "SSE.Views.PrintTitlesDialog.textTitle": "Wydrukuj tytuły", + "SSE.Views.ProtectDialog.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", + "SSE.Views.ProtectDialog.txtProtect": "Zabezpiecz", + "SSE.Views.ProtectRangesDlg.textDelete": "Usuń", + "SSE.Views.ProtectRangesDlg.textNew": "Nowy", + "SSE.Views.RemoveDuplicatesDialog.textColumns": "Kolumny", "SSE.Views.RemoveDuplicatesDialog.textDescription": "Aby usunąć zduplikowane wartości, wybierz jedną lub więcej kolumn zawierających duplikaty.", "SSE.Views.RemoveDuplicatesDialog.txtTitle": "Usuń duplikaty", "SSE.Views.RightMenu.txtChartSettings": "Ustawienia wykresu", @@ -1515,6 +1872,7 @@ "SSE.Views.ShapeSettings.strFill": "Wypełnij", "SSE.Views.ShapeSettings.strForeground": "Kolor pierwszoplanowy", "SSE.Views.ShapeSettings.strPattern": "Wzór", + "SSE.Views.ShapeSettings.strShadow": "Pokaż cień ", "SSE.Views.ShapeSettings.strSize": "Rozmiar", "SSE.Views.ShapeSettings.strStroke": "Obrys", "SSE.Views.ShapeSettings.strTransparency": "Nieprzezroczystość", @@ -1525,16 +1883,23 @@ "SSE.Views.ShapeSettings.textColor": "Kolor wypełnienia", "SSE.Views.ShapeSettings.textDirection": "Kierunek", "SSE.Views.ShapeSettings.textEmptyPattern": "Brak wzorca", + "SSE.Views.ShapeSettings.textFlip": "Przerzuć", "SSE.Views.ShapeSettings.textFromFile": "Z pliku", "SSE.Views.ShapeSettings.textFromUrl": "Z URL", "SSE.Views.ShapeSettings.textGradient": "Punkty gradientu", "SSE.Views.ShapeSettings.textGradientFill": "Wypełnienie gradientem", + "SSE.Views.ShapeSettings.textHint270": "Obróć w lewo o 90° ", + "SSE.Views.ShapeSettings.textHint90": "Obróć w prawo o 90°", + "SSE.Views.ShapeSettings.textHintFlipH": "Odwróć w poziomie", + "SSE.Views.ShapeSettings.textHintFlipV": "Odwróć w pionie", "SSE.Views.ShapeSettings.textImageTexture": "Obraz lub tekstura", "SSE.Views.ShapeSettings.textLinear": "Liniowy", "SSE.Views.ShapeSettings.textNoFill": "Brak wypełnienia", "SSE.Views.ShapeSettings.textOriginalSize": "Rozmiar oryginalny", "SSE.Views.ShapeSettings.textPatternFill": "Wzór", "SSE.Views.ShapeSettings.textRadial": "Promieniowy", + "SSE.Views.ShapeSettings.textRotate90": "Obróć o 90°", + "SSE.Views.ShapeSettings.textRotation": "Obróć", "SSE.Views.ShapeSettings.textSelectTexture": "Wybierz", "SSE.Views.ShapeSettings.textStretch": "Rozciągnij", "SSE.Views.ShapeSettings.textStyle": "Styl", @@ -1562,6 +1927,7 @@ "SSE.Views.ShapeSettingsAdvanced.textAltTitle": "Tytuł", "SSE.Views.ShapeSettingsAdvanced.textAngle": "Kąt", "SSE.Views.ShapeSettingsAdvanced.textArrows": "Strzałki", + "SSE.Views.ShapeSettingsAdvanced.textAutofit": "Autodopasowanie", "SSE.Views.ShapeSettingsAdvanced.textBeginSize": "Początkowy rozmiar", "SSE.Views.ShapeSettingsAdvanced.textBeginStyle": "Styl początkowy", "SSE.Views.ShapeSettingsAdvanced.textBevel": "Ukos", @@ -1571,21 +1937,27 @@ "SSE.Views.ShapeSettingsAdvanced.textEndSize": "Rozmiar końcowy", "SSE.Views.ShapeSettingsAdvanced.textEndStyle": "Styl końcowy", "SSE.Views.ShapeSettingsAdvanced.textFlat": "Płaski", + "SSE.Views.ShapeSettingsAdvanced.textFlipped": "Odwrócony ", "SSE.Views.ShapeSettingsAdvanced.textHeight": "Wysokość", + "SSE.Views.ShapeSettingsAdvanced.textHorizontally": "Poziomo ", "SSE.Views.ShapeSettingsAdvanced.textJoinType": "Dołącz typ", "SSE.Views.ShapeSettingsAdvanced.textKeepRatio": "Stałe proporcje", "SSE.Views.ShapeSettingsAdvanced.textLeft": "Lewy", "SSE.Views.ShapeSettingsAdvanced.textLineStyle": "Styl wierszy", "SSE.Views.ShapeSettingsAdvanced.textMiter": "prosty", "SSE.Views.ShapeSettingsAdvanced.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", + "SSE.Views.ShapeSettingsAdvanced.textResizeFit": "Dopasuj rozmiar kształtu do tekstu", "SSE.Views.ShapeSettingsAdvanced.textRight": "Prawy", + "SSE.Views.ShapeSettingsAdvanced.textRotation": "Obróć", "SSE.Views.ShapeSettingsAdvanced.textRound": "Zaokrąglij", "SSE.Views.ShapeSettingsAdvanced.textSize": "Rozmiar", "SSE.Views.ShapeSettingsAdvanced.textSpacing": "Przerwa między kolumnami", "SSE.Views.ShapeSettingsAdvanced.textSquare": "Kwadratowy", + "SSE.Views.ShapeSettingsAdvanced.textTextBox": "Pole tekstowe", "SSE.Views.ShapeSettingsAdvanced.textTitle": "Kształt - Zaawansowane ustawienia", "SSE.Views.ShapeSettingsAdvanced.textTop": "Góra", "SSE.Views.ShapeSettingsAdvanced.textTwoCell": "Przenieś i zmień rozmiar komórek", + "SSE.Views.ShapeSettingsAdvanced.textVertically": "Pionowo ", "SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Wagi i strzałki", "SSE.Views.ShapeSettingsAdvanced.textWidth": "Szerokość", "SSE.Views.SignatureSettings.strDelete": "Usuń podpis", @@ -1594,8 +1966,15 @@ "SSE.Views.SignatureSettings.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
    Nie można tego cofnąć.", "SSE.Views.SignatureSettings.txtSigned": "Prawidłowe podpisy zostały dodane do arkusza kalkulacyjnego. Arkusz kalkulacyjny jest chroniony przed edycją.", "SSE.Views.SignatureSettings.txtSignedInvalid": "Niektóre podpisy cyfrowe w arkuszu kalkulacyjnym są nieprawidłowe lub nie można ich zweryfikować. Arkusz kalkulacyjny jest chroniony przed edycją", + "SSE.Views.SlicerAddDialog.textColumns": "Kolumny", + "SSE.Views.SlicerSettings.textAdvanced": "Pokaż ustawienia zaawansowane", "SSE.Views.SlicerSettings.textAZ": "A do Z", + "SSE.Views.SlicerSettings.textColumns": "Kolumny", + "SSE.Views.SlicerSettings.textHor": "Poziomy", + "SSE.Views.SlicerSettings.textStyle": "Styl", "SSE.Views.SlicerSettings.textZA": "Z do A", + "SSE.Views.SlicerSettingsAdvanced.strColumns": "Kolumny", + "SSE.Views.SlicerSettingsAdvanced.strStyle": "Styl", "SSE.Views.SlicerSettingsAdvanced.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", "SSE.Views.SlicerSettingsAdvanced.textAlt": "Alternatywny tekst", "SSE.Views.SlicerSettingsAdvanced.textAZ": "A do Z", @@ -1611,10 +1990,13 @@ "SSE.Views.SortDialog.textAZ": "A do Z", "SSE.Views.SortDialog.textMoreCols": "(Więcej kolumn...)", "SSE.Views.SortDialog.textMoreRows": "(Więcej wierszy...)", + "SSE.Views.SortDialog.textNone": "Żaden", "SSE.Views.SortDialog.textZA": "Z do A", "SSE.Views.SortOptionsDialog.textOrientation": "Orientacja", "SSE.Views.SpecialPasteDialog.textAdd": "Dodaj", "SSE.Views.SpecialPasteDialog.textAll": "Wszystko", + "SSE.Views.SpecialPasteDialog.textMult": "Znak mnożenia", + "SSE.Views.SpecialPasteDialog.textNone": "(brak)", "SSE.Views.SpecialPasteDialog.textVNFormat": "Wartości i formaty liczb", "SSE.Views.Spellcheck.noSuggestions": "Brak sugestii dotyczących pisowni", "SSE.Views.Spellcheck.txtAddToDictionary": "Dodaj do słownika", @@ -1633,6 +2015,7 @@ "SSE.Views.Statusbar.itemHide": "Ukryj", "SSE.Views.Statusbar.itemInsert": "Wstaw", "SSE.Views.Statusbar.itemMove": "Przenieś", + "SSE.Views.Statusbar.itemProtect": "Zabezpiecz", "SSE.Views.Statusbar.itemRename": "Zmień nazwę", "SSE.Views.Statusbar.itemTabColor": "Kolor karty", "SSE.Views.Statusbar.RenameDialog.errNameExists": "Istnieje już arkusz roboczy o takiej samej nazwie.", @@ -1746,6 +2129,7 @@ "SSE.Views.TextArtSettings.txtWood": "Drewno", "SSE.Views.Toolbar.capBtnAddComment": "Dodaj komentarz", "SSE.Views.Toolbar.capBtnComment": "Komentarz", + "SSE.Views.Toolbar.capBtnInsSymbol": "Symbole", "SSE.Views.Toolbar.capBtnMargins": "Marginesy", "SSE.Views.Toolbar.capBtnPageOrient": "Orientacja", "SSE.Views.Toolbar.capBtnPrintArea": "Obszar wydruku", @@ -1758,7 +2142,7 @@ "SSE.Views.Toolbar.capInsertImage": "Obraz", "SSE.Views.Toolbar.capInsertShape": "Kształt", "SSE.Views.Toolbar.capInsertTable": "Tabela", - "SSE.Views.Toolbar.capInsertText": "Pole tekstowe", + "SSE.Views.Toolbar.capInsertText": "Text Box", "SSE.Views.Toolbar.mniImageFromFile": "Obraz z pliku", "SSE.Views.Toolbar.mniImageFromUrl": "Obraz z URL", "SSE.Views.Toolbar.textAddPrintArea": "Dodaj do obszaru drukowania", @@ -1791,6 +2175,7 @@ "SSE.Views.Toolbar.textItalic": "Kursywa", "SSE.Views.Toolbar.textLandscape": "Pozioma", "SSE.Views.Toolbar.textLeftBorders": "Lewe krawędzie", + "SSE.Views.Toolbar.textMarginsNormal": "Normalny", "SSE.Views.Toolbar.textMiddleBorders": "Wewnątrz poziomych granic", "SSE.Views.Toolbar.textMoreFormats": "Więcej formatów", "SSE.Views.Toolbar.textNewColor": "Dodaj nowy niestandardowy kolor", @@ -1803,6 +2188,7 @@ "SSE.Views.Toolbar.textRightBorders": "Prawe krawędzie", "SSE.Views.Toolbar.textRotateDown": "Obróć tekst w dół", "SSE.Views.Toolbar.textRotateUp": "Obróć tekst w górę", + "SSE.Views.Toolbar.textScale": "Skala", "SSE.Views.Toolbar.textSetPrintArea": "Ustaw Obszar Wydruku", "SSE.Views.Toolbar.textTabCollaboration": "Współpraca", "SSE.Views.Toolbar.textTabFile": "Plik", @@ -1811,7 +2197,7 @@ "SSE.Views.Toolbar.textTabLayout": "Układ", "SSE.Views.Toolbar.textTabProtect": "Ochrona", "SSE.Views.Toolbar.textTopBorders": "Górne krawędzie", - "SSE.Views.Toolbar.textUnderline": "Podkreśl", + "SSE.Views.Toolbar.textUnderline": "Podkreślenie", "SSE.Views.Toolbar.textZoom": "Powiększenie", "SSE.Views.Toolbar.tipAlignBottom": "Wyrównaj do dołu", "SSE.Views.Toolbar.tipAlignCenter": "Wyrównaj do środka", @@ -1835,6 +2221,7 @@ "SSE.Views.Toolbar.tipDigStyleCurrency": "Styl waluty", "SSE.Views.Toolbar.tipDigStylePercent": "Styl procentowy", "SSE.Views.Toolbar.tipEditChart": "Edytuj wykres", + "SSE.Views.Toolbar.tipEditChartData": "Wybierz dane", "SSE.Views.Toolbar.tipFontColor": "Kolor czcionki", "SSE.Views.Toolbar.tipFontName": "Czcionka", "SSE.Views.Toolbar.tipFontSize": "Rozmiar czcionki", @@ -1849,6 +2236,7 @@ "SSE.Views.Toolbar.tipInsertImage": "Wstaw obraz", "SSE.Views.Toolbar.tipInsertOpt": "Wstaw komórki", "SSE.Views.Toolbar.tipInsertShape": "Wstaw kształt", + "SSE.Views.Toolbar.tipInsertSymbol": "Wstaw symbol", "SSE.Views.Toolbar.tipInsertTable": "Wstaw tabelę", "SSE.Views.Toolbar.tipInsertText": "Wstaw pole tekstowe", "SSE.Views.Toolbar.tipInsertTextart": "Wstaw tekst", @@ -1869,9 +2257,10 @@ "SSE.Views.Toolbar.tipTextOrientation": "Orientacja", "SSE.Views.Toolbar.tipUndo": "Cofnij", "SSE.Views.Toolbar.tipWrap": "Zawijaj tekst", - "SSE.Views.Toolbar.txtAccounting": "Rachunkowy", + "SSE.Views.Toolbar.txtAccounting": "Księgowy", "SSE.Views.Toolbar.txtAdditional": "Inne funkcje", "SSE.Views.Toolbar.txtAscending": "Rosnąco", + "SSE.Views.Toolbar.txtAutosumTip": "Autosumowanie", "SSE.Views.Toolbar.txtClearAll": "Wszystko", "SSE.Views.Toolbar.txtClearComments": "Komentarze", "SSE.Views.Toolbar.txtClearFilter": "Wyczyść filtr", @@ -1944,8 +2333,13 @@ "SSE.Views.Top10FilterDialog.txtTitle": "Top 10 automatyczne filtrowanie", "SSE.Views.Top10FilterDialog.txtTop": "Góra", "SSE.Views.ValueFieldSettingsDialog.txtByField": "%1 z %2", + "SSE.Views.ViewManagerDlg.textDelete": "Usuń", "SSE.Views.ViewManagerDlg.textDuplicate": "Duplikuj", + "SSE.Views.ViewManagerDlg.textNew": "Nowy", + "SSE.Views.ViewManagerDlg.textRename": "Zmień nazwę", "SSE.Views.ViewTab.capBtnFreeze": "Zablokuj panele", + "SSE.Views.ViewTab.textCreate": "Nowy", + "SSE.Views.ViewTab.textDefault": "Domyślny", "SSE.Views.ViewTab.textFormula": "Pasek formuły", "SSE.Views.ViewTab.textGridlines": "Linie siatki", "SSE.Views.ViewTab.textHeadings": "Nagłówki", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 913875121..f29faa1f4 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Documento está em uso por outra aplicação. Você pode continuar editando e salvá-lo como uma cópia.", "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia", "Common.Translation.warnFileLockedBtnView": "Aberto para visualização", - "Common.UI.ColorButton.textAutoColor": "Automático", - "Common.UI.ColorButton.textNewColor": "Adicionar nova cor personalizada", "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas", "Common.UI.ComboDataView.emptyComboText": "Sem estilos", @@ -1969,10 +1967,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Salvar cópia como...", "SSE.Views.FileMenu.btnSettingsCaption": "Configurações avançadas...", "SSE.Views.FileMenu.btnToEditCaption": "Editar planilha", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Do branco", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Do Modelo", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Crie uma nova planilha em branco que você será capaz de nomear e formatar após ela ser criada durante a edição. Ou escolha um dos modelos para começar uma planilha de um tipo ou propósito determinado onde alguns estilos já foram pré-aplicados.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nova planilha", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicar", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adicionar Autor", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adicionar texto", diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index e6e963724..5d153da83 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -2,6 +2,7 @@ "cancelButtonText": "Anulare", "Common.Controllers.Chat.notcriticalErrorTitle": "Avertisment", "Common.Controllers.Chat.textEnterMessage": "Lăsați mesaj aici", + "Common.Controllers.History.notcriticalErrorTitle": "Avertisment", "Common.define.chartData.textArea": "Zona", "Common.define.chartData.textAreaStacked": "Arie stivuită", "Common.define.chartData.textAreaStackedPer": "Arie stivuită 100%", @@ -102,8 +103,8 @@ "Common.Translation.warnFileLocked": "Fișierul este editat într-o altă aplicație. Puteți continua să editați și să-l salvați ca o copie.", "Common.Translation.warnFileLockedBtnEdit": "Crează o copie", "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea", - "Common.UI.ColorButton.textAutoColor": "Automat", - "Common.UI.ColorButton.textNewColor": "Сuloare particularizată", + "Common.UI.ButtonColored.textAutoColor": "Automat", + "Common.UI.ButtonColored.textNewColor": "Adăugarea unei culori particularizate noi", "Common.UI.ComboBorderSize.txtNoBorders": "Fără borduri", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Fără borduri", "Common.UI.ComboDataView.emptyComboText": "Fără stiluri", @@ -173,6 +174,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Corectare automată va fi dezactivată și fișierul va fi restabilit la valori inițiale. Doriți să continuați?", "Common.Views.AutoCorrectDialog.warnRestore": "Intrare de autocorectare pentru %1 va fi restabilită la valorile inițiale. Doriți să continuați?", "Common.Views.Chat.textSend": "Trimitere", + "Common.Views.Comments.mniAuthorAsc": "Autor de la A la Z", + "Common.Views.Comments.mniAuthorDesc": "Autor de la Z la A", + "Common.Views.Comments.mniDateAsc": "Cele mai vechi", + "Common.Views.Comments.mniDateDesc": "Cele mai recente", + "Common.Views.Comments.mniPositionAsc": "De sus", + "Common.Views.Comments.mniPositionDesc": "De jos", "Common.Views.Comments.textAdd": "Adaugă", "Common.Views.Comments.textAddComment": "Adaugă comentariu", "Common.Views.Comments.textAddCommentToDoc": "Adăugare comentariu la document", @@ -180,6 +187,7 @@ "Common.Views.Comments.textAnonym": "Invitat", "Common.Views.Comments.textCancel": "Anulare", "Common.Views.Comments.textClose": "Închidere", + "Common.Views.Comments.textClosePanel": "Închide comentarii", "Common.Views.Comments.textComments": "Comentarii", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Comentați aici", @@ -188,6 +196,7 @@ "Common.Views.Comments.textReply": "Răspunde", "Common.Views.Comments.textResolve": "Rezolvare", "Common.Views.Comments.textResolved": "Rezolvat", + "Common.Views.Comments.textSort": "Sortare comentarii", "Common.Views.CopyWarningDialog.textDontShow": "Nu afișa acest mesaj din nou", "Common.Views.CopyWarningDialog.textMsg": "Operațiuni de copiere, decupare și lipire din bară de instrumente sau meniul contextual al editorului se execută numai în editorul.

    Pentru copiere și lipire din sau în aplicații exterioare folosiți următoarele combinații de taste:", "Common.Views.CopyWarningDialog.textTitle": "Comenzile de copiere, decupare și lipire", @@ -223,6 +232,13 @@ "Common.Views.Header.tipViewUsers": "Vizualizare utilizatori și gestionare permisiuni de acces", "Common.Views.Header.txtAccessRights": "Modificare permisiuni", "Common.Views.Header.txtRename": "Redenumire", + "Common.Views.History.textCloseHistory": "Închide istoricul", + "Common.Views.History.textHide": "Restrângere", + "Common.Views.History.textHideAll": "Ascundere modificări detaliate", + "Common.Views.History.textRestore": "Restabilire", + "Common.Views.History.textShow": "Extindere", + "Common.Views.History.textShowAll": "Afișare detaliată a modificărilor", + "Common.Views.History.textVer": "ver.", "Common.Views.ImageFromUrlDialog.textUrl": "Lipire imagine prin URL:", "Common.Views.ImageFromUrlDialog.txtEmpty": "Câmp obligatoriu", "Common.Views.ImageFromUrlDialog.txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\" ", @@ -517,6 +533,7 @@ "SSE.Controllers.DocumentHolder.txtLimitChange": "Modificare amplasări limite", "SSE.Controllers.DocumentHolder.txtLimitOver": "Limită deasupra textului", "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limită sub textul", + "SSE.Controllers.DocumentHolder.txtLockSort": "Alături de celulele selectate au fost găsite datele dar nu aveți permisiuni suficente ca să le modificați
    Doriți să continuați cu selecția curentă?", "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Portivire delimitatori la înălțimea argumentului", "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Aliniere matrice", "SSE.Controllers.DocumentHolder.txtNoChoices": "Opțiunele de completare datelor în celulă
    Pentru înlocuire puteți selecta numai valori de text în coloană.", @@ -588,6 +605,7 @@ "SSE.Controllers.LeftMenu.textByRows": "După rând", "SSE.Controllers.LeftMenu.textFormulas": "Formule", "SSE.Controllers.LeftMenu.textItemEntireCell": "Întreg conținut de celulă", + "SSE.Controllers.LeftMenu.textLoadHistory": "Încărcarea istoricului versiunii...", "SSE.Controllers.LeftMenu.textLookin": "Domenii de căutare", "SSE.Controllers.LeftMenu.textNoTextFound": "Datele căutate nu au fost găsite. Alegeți alte opțiuni de căutare.", "SSE.Controllers.LeftMenu.textReplaceSkipped": "A avut loc o înlocuire. {0} apariții ignorate.", @@ -620,6 +638,7 @@ "SSE.Controllers.Main.errorCannotUngroup": "Imposibil de anulat grupare. Pentru a crea o schiță, selectați rândurile sau coloanele de detalii și le grupați.", "SSE.Controllers.Main.errorChangeArray": "Nu puteți modifica parte dintr-o matrice.", "SSE.Controllers.Main.errorChangeFilteredRange": "Operațiunea va afecta zonă filtrată din foaia de calcul.
    Pentru a termina operațiunea dezactivați filtrarea automată. ", + "SSE.Controllers.Main.errorChangeOnProtectedSheet": "Celula sau diagrama pe care încercați să schimbați este din foaia de calcul protejată
    Dezactivați protejarea foii de calcul.Este posibil să fie necesară introducerea parolei.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Conexiunea la server a fost pierdută. Deocamdată, imposibil de editat documentul.", "SSE.Controllers.Main.errorConnectToServer": "Salvarea documentului nu poate fi finalizată. Verificați configurarea conexeunii sau contactaţi administratorul dumneavoastră de reţea
    Când faceți clic pe OK, vi se va solicita să descărcați documentul.", "SSE.Controllers.Main.errorCopyMultiselectArea": "Această comandă nu poate fi aplicată la selecții multiple
    Selectați o singură zonă și încercați din nou.", @@ -631,6 +650,8 @@ "SSE.Controllers.Main.errorDataRange": "Zonă de date incorectă.", "SSE.Controllers.Main.errorDataValidate": "Valoarea introdusă nu este validă
    Unul dintre utilizatori a restricționat valorile pe care utilizatorii le introduc într-o celulă. ", "SSE.Controllers.Main.errorDefaultMessage": "Codul de eroare: %1", + "SSE.Controllers.Main.errorDeleteColumnContainsLockedCell": "Dvs încercați să ștergeți o coloană care conține celule blocate. Este imposibil să ștergeți celulele blocate până când foaia de calcul rămâne protejată.
    Trebuie să anulați protecția foii de calcul ca să ștergeți celula blocată. Este posibil să fie necesară introducerea parolei.", + "SSE.Controllers.Main.errorDeleteRowContainsLockedCell": "Dvs încercați să ștergeți un rând care conține celule blocate. Este imposibil să ștergeți celulele blocate până când foaia de calcul rămâne protejată.
    Trebuie să anulați protecția foii de calcul ca să ștergeți celula blocată. Este posibil să fie necesară introducerea parolei.", "SSE.Controllers.Main.errorEditingDownloadas": "S-a produs o eroare în timpul editării documentului.
    Pentru copierea de rezervă pe PC utilizați opțiunea 'Descărcare ca...'.", "SSE.Controllers.Main.errorEditingSaveas": "S-a produs o eroare în timpul editării documentului.
    Pentru copierea de rezervă pe PC utilizați opțiunea 'Salvare ca...'.", "SSE.Controllers.Main.errorEditView": "Editările în vizualizarea curentă nu pot fi efectuate dar și o vizualizare nouă nu puteți crea deoarece unii dintre ei sunt editate în acest moment.", @@ -665,6 +686,7 @@ "SSE.Controllers.Main.errorNoDataToParse": "Datele pentru parsare nu au fost selectate.", "SSE.Controllers.Main.errorOpenWarning": "O formulă din fișier depășește limita maximă de 8192 caractere.
    Formula a fost eliminată.", "SSE.Controllers.Main.errorOperandExpected": "Sintaxa funcției incorectă. Verificați încadrarea în paranteze - '(' sau ')'.", + "SSE.Controllers.Main.errorPasswordIsNotCorrect": "Parola introdusă este incorectă.
    Verificaţi dacă nu este activată tasta CAPS LOCK și vă asigurați că utilizați introducerea corectă a majusculelor.", "SSE.Controllers.Main.errorPasteMaxRange": "Zona de copiere nu corespunde zonei de lipire.
    Pentru lipirea celulelor copiate, selectați o zonă de aceeași demensiune sau faceți clic pe prima celula din rând.", "SSE.Controllers.Main.errorPasteMultiSelect": "Operaţia nu poate fi efectuată asupra zonelor selectate multiple.
    Selectați o singură zonă și încercați încă o dată.", "SSE.Controllers.Main.errorPasteSlicerError": "Slicere din tabel nu pot fi copiate dintr-un registru de calcul în altul.", @@ -690,6 +712,7 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Conexiunea a fost pierdută. Încă mai puteți vizualiza documentul,
    dar nu și să-l descărcați sau imprimați până când conexiunea se restabilește și pagina se reîmprospătează.", "SSE.Controllers.Main.errorWrongBracketsCount": "Eroare în formulă.
    Numărul de paranteze incorect.", "SSE.Controllers.Main.errorWrongOperator": "Eroare în formulă. Operator necorespunzător.
    Corectați eroarea.", + "SSE.Controllers.Main.errorWrongPassword": "Parola introdusă este incorectă.", "SSE.Controllers.Main.errRemDuplicates": "Valori dublate au fost identificate și eliminate: {0}, valorile unice rămase: {1}.", "SSE.Controllers.Main.leavePageText": "Nu ați salvat modificările din foaia de calcul. Faceți clic pe Rămâi în pagină și apoi pe Salvare dacă doriți să le salvați. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.", "SSE.Controllers.Main.leavePageTextOnClose": "Toate modificările nesalvate din foaia de calcul vor fi pierdute.
    Pentru a le salva, faceți clic pe Revocare și apoi pe Salvare. Apăsați OK dacă doriți să renunțați la modificările nesalvate.", @@ -720,16 +743,22 @@ "SSE.Controllers.Main.saveTitleText": "Salvarea foaie de calcul", "SSE.Controllers.Main.scriptLoadError": "Conexeunea e prea lentă și unele elemente nu se încarcă. Încercați să reîmprospătati pagina.", "SSE.Controllers.Main.textAnonymous": "Anonim", + "SSE.Controllers.Main.textApplyAll": "Se aplică pentru toate ecuații", "SSE.Controllers.Main.textBuyNow": "Vizitarea site-ul Web", + "SSE.Controllers.Main.textChangesSaved": "Toate modificările au fost salvate", "SSE.Controllers.Main.textClose": "Închidere", "SSE.Controllers.Main.textCloseTip": "Faceți clic pentru a închide sfatul", "SSE.Controllers.Main.textConfirm": "Confirmare", "SSE.Controllers.Main.textContactUs": "Contactați Departamentul de Vânzări", + "SSE.Controllers.Main.textConvertEquation": "Această ecuație a fost creată în versiunea mai veche a editorului de ecuații, care nu mai este acceptată. Dacă doriți să o editați, trebuie să o convertiți în formatul Office Math ML.
    Doriți să o convertiți acum?", "SSE.Controllers.Main.textCustomLoader": "Vă rugăm să rețineți că conform termenilor de licență nu aveți dreptul să modificați programul de încărcare.
    Pentru obținerea unei cotații de preț vă rugăm să contactați Departamentul de Vânzari.", + "SSE.Controllers.Main.textDisconnect": "Conexiune pierdută", "SSE.Controllers.Main.textGuest": "Invitat", "SSE.Controllers.Main.textHasMacros": "Fișierul conține macrocomenzi.
    Doriți să le rulați?", + "SSE.Controllers.Main.textLearnMore": "Aflați mai multe", "SSE.Controllers.Main.textLoadingDocument": "Încărcare foaie de calcul", "SSE.Controllers.Main.textLongName": "Numărul maxim de caractere dintr-un nume este 128 caractere.", + "SSE.Controllers.Main.textNeedSynchronize": "Aveți actualizări disponibile", "SSE.Controllers.Main.textNo": "Nu", "SSE.Controllers.Main.textNoLicenseTitle": "Ați atins limita stabilită de licență", "SSE.Controllers.Main.textPaidFeature": "Funcția contra plată", @@ -763,6 +792,7 @@ "SSE.Controllers.Main.txtDays": "Zile", "SSE.Controllers.Main.txtDiagramTitle": "Titlu diagramă", "SSE.Controllers.Main.txtEditingMode": "Setare modul de editare...", + "SSE.Controllers.Main.txtErrorLoadHistory": "Încărcarea istoricului a eșuat", "SSE.Controllers.Main.txtFiguredArrows": "Săgeți în forme diferite", "SSE.Controllers.Main.txtFile": "Fişier", "SSE.Controllers.Main.txtGrandTotal": "Totaluri generale", @@ -982,6 +1012,10 @@ "SSE.Controllers.Main.txtTab": "Fila", "SSE.Controllers.Main.txtTable": "Tabel", "SSE.Controllers.Main.txtTime": "Oră", + "SSE.Controllers.Main.txtUnlock": "Deblocare", + "SSE.Controllers.Main.txtUnlockRange": "Debrocare zonă", + "SSE.Controllers.Main.txtUnlockRangeDescription": "Introduceți parola pentru modifacea zonei:", + "SSE.Controllers.Main.txtUnlockRangeWarning": "Zonă, pe care doriţi să o modificaţi, este protejată prin parolă. ", "SSE.Controllers.Main.txtValues": "Valori", "SSE.Controllers.Main.txtXAxis": "Axa X", "SSE.Controllers.Main.txtYAxis": "Axa Y", @@ -1229,6 +1263,7 @@ "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Logaritm", "SSE.Controllers.Toolbar.txtLimitLog_Max": "Maxim", "SSE.Controllers.Toolbar.txtLimitLog_Min": "Minim", + "SSE.Controllers.Toolbar.txtLockSort": "Alături de celulele selectate au fost găsite datele dar nu aveți permisiuni suficente ca să le modificați
    Doriți să continuați cu selecția curentă?", "SSE.Controllers.Toolbar.txtMatrix_1_2": "Matrice goală 1x2 ", "SSE.Controllers.Toolbar.txtMatrix_1_3": "Matrice goală 1x3", "SSE.Controllers.Toolbar.txtMatrix_2_1": "Matrice goală 2x1 ", @@ -1695,7 +1730,7 @@ "SSE.Views.DataTab.capBtnUngroup": "Anularea grupării", "SSE.Views.DataTab.capDataFromText": "Obținere date", "SSE.Views.DataTab.mniFromFile": "Din fișier local", - "SSE.Views.DataTab.mniFromUrl": "Prin adresa web a fișierului TXT/CSV", + "SSE.Views.DataTab.mniFromUrl": "Prin adresa URL a fișierului TXT/CSV", "SSE.Views.DataTab.textBelow": "Rânduri rezumative sub detalii", "SSE.Views.DataTab.textClear": "Golire schiță", "SSE.Views.DataTab.textColumns": "Anularea grupării coloanelor", @@ -1962,6 +1997,7 @@ "SSE.Views.FileMenu.btnCreateNewCaption": "Crearea unui document nou", "SSE.Views.FileMenu.btnDownloadCaption": "Descărcare ca...", "SSE.Views.FileMenu.btnHelpCaption": "Asistență...", + "SSE.Views.FileMenu.btnHistoryCaption": "Istoricul versiune", "SSE.Views.FileMenu.btnInfoCaption": "Informații despre foaia de calcul...", "SSE.Views.FileMenu.btnPrintCaption": "Imprimare", "SSE.Views.FileMenu.btnProtectCaption": "Protejare", @@ -1974,10 +2010,8 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Salvare copie ca...", "SSE.Views.FileMenu.btnSettingsCaption": "Setări avansate...", "SSE.Views.FileMenu.btnToEditCaption": "Editare foaie de calcul", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Din document necompletat", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Din șablon", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Creați o foaie de calcul necompletată ca s-o puteți edita și formata în timpul editării după ce a fost creată. Sau alegeți un șablon cu stil predefinit pentru un anumit tip de foi de calcul sau pentru un anumit scop.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Foaie de calcul nouă", + "SSE.Views.FileMenuPanels.CreateNew.txtBlank": "Foaie de calcul necompletată", + "SSE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Creare nou", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplicare", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Adăugare autor", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Adăugare text", @@ -2061,6 +2095,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Neerlandeză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Poloneză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punct", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtbr": "Portugeză (Brazilia)", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Portugheză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Română", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Rusă", @@ -2683,6 +2718,56 @@ "SSE.Views.PrintTitlesDialog.textSelectRange": "Selectați zonă", "SSE.Views.PrintTitlesDialog.textTitle": "Imprimare titluri", "SSE.Views.PrintTitlesDialog.textTop": "Rânduri de repetat la început", + "SSE.Views.ProtectDialog.textExistName": "EROARE! Titlul de zonă există deja", + "SSE.Views.ProtectDialog.textInvalidName": "Titlul zonei trebuie să înceapă cu o literă și poate conține numai litere, cifre și spații.", + "SSE.Views.ProtectDialog.textInvalidRange": "EROARE! Zonă de celule nu este validă", + "SSE.Views.ProtectDialog.textSelectData": "Selectare date", + "SSE.Views.ProtectDialog.txtAllow": "Se permite tuturor utilizatorilor foii de calcul", + "SSE.Views.ProtectDialog.txtAutofilter": "Utilizarea Filtrării automate", + "SSE.Views.ProtectDialog.txtDelCols": "Ștergere coloane", + "SSE.Views.ProtectDialog.txtDelRows": "Ștergere rânduri", + "SSE.Views.ProtectDialog.txtEmpty": "Câmp obligatoriu", + "SSE.Views.ProtectDialog.txtFormatCells": "Formatare celule", + "SSE.Views.ProtectDialog.txtFormatCols": "Formatare coloane", + "SSE.Views.ProtectDialog.txtFormatRows": "Formatare rânduri", + "SSE.Views.ProtectDialog.txtIncorrectPwd": "Parolă introdusă pentru confirmare nu este indentică cu prima", + "SSE.Views.ProtectDialog.txtInsCols": "Inserare coloane", + "SSE.Views.ProtectDialog.txtInsHyper": "Inserare hyperlink", + "SSE.Views.ProtectDialog.txtInsRows": "Inserare rânduri", + "SSE.Views.ProtectDialog.txtObjs": "Editare obiecte", + "SSE.Views.ProtectDialog.txtOptional": "opțional", + "SSE.Views.ProtectDialog.txtPassword": "Parola", + "SSE.Views.ProtectDialog.txtPivot": "Utilizarea PivotTable și PivotChart", + "SSE.Views.ProtectDialog.txtProtect": "Protejare", + "SSE.Views.ProtectDialog.txtRange": "Zona", + "SSE.Views.ProtectDialog.txtRangeName": "Titlu", + "SSE.Views.ProtectDialog.txtRepeat": "Reintroduceți parola", + "SSE.Views.ProtectDialog.txtScen": "Editare scenarii", + "SSE.Views.ProtectDialog.txtSelLocked": "Selectează celulele blocate", + "SSE.Views.ProtectDialog.txtSelUnLocked": "Selectează celulele deblocate", + "SSE.Views.ProtectDialog.txtSheetDescription": "Împiedicați modificările nedorite prin limitarea permisiunilor pentru editare.", + "SSE.Views.ProtectDialog.txtSheetTitle": "Protejarea foii de calcul", + "SSE.Views.ProtectDialog.txtSort": "Sortare", + "SSE.Views.ProtectDialog.txtWarning": "Atenție: Dacă pierdeți sau uitați parola, ea nu poate fi recuperată. Să o păstrați într-un loc sigur.", + "SSE.Views.ProtectDialog.txtWBDescription": "Puteți proteja structura registrului de calcul prin parolă pentru împiedicarea utilizatorilor de a vizualiza registrele de calcul mascate, de a adăuga, deplasa, șterge, masca și redenumi registrele de calcul. ", + "SSE.Views.ProtectDialog.txtWBTitle": "Protejarea structurei registrului de calcul", + "SSE.Views.ProtectRangesDlg.guestText": "Invitat", + "SSE.Views.ProtectRangesDlg.textDelete": "Ștergere", + "SSE.Views.ProtectRangesDlg.textEdit": "Editare", + "SSE.Views.ProtectRangesDlg.textEmpty": "Zonele permise pentru editare nu sunt", + "SSE.Views.ProtectRangesDlg.textNew": "Nou", + "SSE.Views.ProtectRangesDlg.textProtect": "Protejarea foii de calcul", + "SSE.Views.ProtectRangesDlg.textPwd": "Parola", + "SSE.Views.ProtectRangesDlg.textRange": "Zona", + "SSE.Views.ProtectRangesDlg.textRangesDesc": "Zonele deblocate prin parolă când foaia de calcul este protejată (se aplică numai celulelor blocate)", + "SSE.Views.ProtectRangesDlg.textTitle": "Titlu", + "SSE.Views.ProtectRangesDlg.tipIsLocked": "Acest element este editat de către un alt utilizator.", + "SSE.Views.ProtectRangesDlg.txtEditRange": "Modificare zonă", + "SSE.Views.ProtectRangesDlg.txtNewRange": "Zonă nouă", + "SSE.Views.ProtectRangesDlg.txtNo": "Nu", + "SSE.Views.ProtectRangesDlg.txtTitle": "Se permite utilizatorilor să editeze zonele", + "SSE.Views.ProtectRangesDlg.txtYes": "Da", + "SSE.Views.ProtectRangesDlg.warnDelete": "Sunteți sigur că doriți să ștergeți numele {0}?", "SSE.Views.RemoveDuplicatesDialog.textColumns": "Coloane", "SSE.Views.RemoveDuplicatesDialog.textDescription": "Pentru a șterge valorile dublate, selectați una sau mai multe coloane care conțin dubluri.", "SSE.Views.RemoveDuplicatesDialog.textHeaders": "Tabelul meu are anteturi", @@ -2986,13 +3071,17 @@ "SSE.Views.Statusbar.itemMaximum": "Maxim", "SSE.Views.Statusbar.itemMinimum": "Minim", "SSE.Views.Statusbar.itemMove": "Mută", + "SSE.Views.Statusbar.itemProtect": "Protejare", "SSE.Views.Statusbar.itemRename": "Redenumire", + "SSE.Views.Statusbar.itemStatus": "Statutul de salvare", "SSE.Views.Statusbar.itemSum": "Sumă", "SSE.Views.Statusbar.itemTabColor": "Culoare filă", + "SSE.Views.Statusbar.itemUnProtect": "Anularea protecției", "SSE.Views.Statusbar.RenameDialog.errNameExists": "O foaie de calcul cu același nume există deja.", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Numele foii nu poate conține următoarele caracterele: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Numele foii", "SSE.Views.Statusbar.selectAllSheets": "Selectare totală foi", + "SSE.Views.Statusbar.sheetIndexText": "Foaia de calcul {0} din {1}", "SSE.Views.Statusbar.textAverage": "Medie", "SSE.Views.Statusbar.textCount": "Contorizare", "SSE.Views.Statusbar.textMax": "Max", @@ -3038,7 +3127,7 @@ "SSE.Views.TableSettings.textConvertRange": "Conversie la interval", "SSE.Views.TableSettings.textEdit": "Rânduri și coloane", "SSE.Views.TableSettings.textEmptyTemplate": "Fără șablon", - "SSE.Views.TableSettings.textExistName": "EROARE! Acest interval de nume există deja", + "SSE.Views.TableSettings.textExistName": "EROARE! Numele de zonă există deja", "SSE.Views.TableSettings.textFilter": "Butonul de filtrare", "SSE.Views.TableSettings.textFirst": "Primul", "SSE.Views.TableSettings.textHeader": "Antet", @@ -3428,5 +3517,19 @@ "SSE.Views.ViewTab.tipClose": "Închidere vizualizare de foi", "SSE.Views.ViewTab.tipCreate": "Creare vizualizări de foi", "SSE.Views.ViewTab.tipFreeze": "Înghețare panouri", - "SSE.Views.ViewTab.tipSheetView": "Vizualizare de foaie" + "SSE.Views.ViewTab.tipSheetView": "Vizualizare de foaie", + "SSE.Views.WBProtection.hintAllowRanges": "Se permite modificarea zonelor", + "SSE.Views.WBProtection.hintProtectSheet": "Protejarea foii de calcul", + "SSE.Views.WBProtection.hintProtectWB": "Protejarea registrului de calcul", + "SSE.Views.WBProtection.txtAllowRanges": "Se permite modificarea zonelor", + "SSE.Views.WBProtection.txtHiddenFormula": "Formule mascate", + "SSE.Views.WBProtection.txtLockedCell": "Celula blocată", + "SSE.Views.WBProtection.txtLockedShape": "Forma blocată", + "SSE.Views.WBProtection.txtLockedText": "Blocare text", + "SSE.Views.WBProtection.txtProtectSheet": "Protejarea foii de calcul", + "SSE.Views.WBProtection.txtProtectWB": "Protejarea registrului de calcul", + "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduceți parola pentru dezactivarea protejării a foii de calcul", + "SSE.Views.WBProtection.txtSheetUnlockTitle": "Anularea protecției foii de calcul", + "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduceți parola pentru dezactivarea protejării a registrului de calcul", + "SSE.Views.WBProtection.txtWBUnlockTitle": "Dezactivarea protejării registrului de calcul" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 8a3a22ecc..9cdeb5213 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -2,6 +2,7 @@ "cancelButtonText": "Отмена", "Common.Controllers.Chat.notcriticalErrorTitle": "Предупреждение", "Common.Controllers.Chat.textEnterMessage": "Введите здесь своё сообщение", + "Common.Controllers.History.notcriticalErrorTitle": "Внимание", "Common.define.chartData.textArea": "С областями", "Common.define.chartData.textAreaStacked": "Диаграмма с областями с накоплением", "Common.define.chartData.textAreaStackedPer": "Нормированная с областями и накоплением", @@ -102,8 +103,8 @@ "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", "Common.Translation.warnFileLockedBtnEdit": "Создать копию", "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", - "Common.UI.ColorButton.textAutoColor": "Автоматический", - "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", + "Common.UI.ButtonColored.textAutoColor": "Автоматический", + "Common.UI.ButtonColored.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без границ", "Common.UI.ComboDataView.emptyComboText": "Без стилей", @@ -173,6 +174,12 @@ "Common.Views.AutoCorrectDialog.warnReset": "Все добавленные вами автозамены будут удалены, а для измененных будут восстановлены исходные значения. Вы хотите продолжить?", "Common.Views.AutoCorrectDialog.warnRestore": "Элемент автозамены для %1 будет сброшен на исходное значение. Вы хотите продолжить?", "Common.Views.Chat.textSend": "Отправить", + "Common.Views.Comments.mniAuthorAsc": "По автору от А до Я", + "Common.Views.Comments.mniAuthorDesc": "По автору от Я до А", + "Common.Views.Comments.mniDateAsc": "От старых к новым", + "Common.Views.Comments.mniDateDesc": "От новых к старым", + "Common.Views.Comments.mniPositionAsc": "Сверху", + "Common.Views.Comments.mniPositionDesc": "Снизу", "Common.Views.Comments.textAdd": "Добавить", "Common.Views.Comments.textAddComment": "Добавить", "Common.Views.Comments.textAddCommentToDoc": "Добавить комментарий к документу", @@ -180,6 +187,7 @@ "Common.Views.Comments.textAnonym": "Гость", "Common.Views.Comments.textCancel": "Отмена", "Common.Views.Comments.textClose": "Закрыть", + "Common.Views.Comments.textClosePanel": "Закрыть комментарии", "Common.Views.Comments.textComments": "Комментарии", "Common.Views.Comments.textEdit": "OK", "Common.Views.Comments.textEnterCommentHint": "Введите здесь свой комментарий", @@ -188,6 +196,7 @@ "Common.Views.Comments.textReply": "Ответить", "Common.Views.Comments.textResolve": "Решить", "Common.Views.Comments.textResolved": "Решено", + "Common.Views.Comments.textSort": "Сортировать комментарии", "Common.Views.CopyWarningDialog.textDontShow": "Больше не показывать это сообщение", "Common.Views.CopyWarningDialog.textMsg": "Операции копирования, вырезания и вставки можно выполнить с помощью кнопок на панели инструментов и команд контекстного меню только в этой вкладке редактора.

    Для копирования в другие приложения и вставки из них используйте следующие сочетания клавиш:", "Common.Views.CopyWarningDialog.textTitle": "Операции копирования, вырезания и вставки", @@ -223,6 +232,13 @@ "Common.Views.Header.tipViewUsers": "Просмотр пользователей и управление правами доступа к документу", "Common.Views.Header.txtAccessRights": "Изменить права доступа", "Common.Views.Header.txtRename": "Переименовать", + "Common.Views.History.textCloseHistory": "Закрыть историю", + "Common.Views.History.textHide": "Свернуть", + "Common.Views.History.textHideAll": "Скрыть подробные изменения", + "Common.Views.History.textRestore": "Восстановить", + "Common.Views.History.textShow": "Развернуть", + "Common.Views.History.textShowAll": "Показать подробные изменения", + "Common.Views.History.textVer": "вер.", "Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:", "Common.Views.ImageFromUrlDialog.txtEmpty": "Это поле необходимо заполнить", "Common.Views.ImageFromUrlDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", @@ -517,6 +533,7 @@ "SSE.Controllers.DocumentHolder.txtLimitChange": "Изменить положение пределов", "SSE.Controllers.DocumentHolder.txtLimitOver": "Предел над текстом", "SSE.Controllers.DocumentHolder.txtLimitUnder": "Предел под текстом", + "SSE.Controllers.DocumentHolder.txtLockSort": "Обнаружены данные рядом с выделенным диапазоном, но у вас недостаточно прав для изменения этих ячеек.
    Вы хотите продолжить работу с выделенным диапазоном?", "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Изменить размер скобок в соответствии с высотой аргумента", "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Выравнивание матрицы", "SSE.Controllers.DocumentHolder.txtNoChoices": "Нет вариантов для заполнения ячейки.
    Для замены можно выбрать только текстовые значения из столбца.", @@ -588,6 +605,7 @@ "SSE.Controllers.LeftMenu.textByRows": "По строкам", "SSE.Controllers.LeftMenu.textFormulas": "Формулы", "SSE.Controllers.LeftMenu.textItemEntireCell": "Все содержимое ячеек", + "SSE.Controllers.LeftMenu.textLoadHistory": "Загрузка истории версий...", "SSE.Controllers.LeftMenu.textLookin": "Область поиска", "SSE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.", "SSE.Controllers.LeftMenu.textReplaceSkipped": "Замена выполнена. Пропущено вхождений - {0}.", @@ -620,6 +638,7 @@ "SSE.Controllers.Main.errorCannotUngroup": "Невозможно разгруппировать. Чтобы создать структуру документа, выделите столбцы или строки и сгруппируйте их.", "SSE.Controllers.Main.errorChangeArray": "Нельзя изменить часть массива.", "SSE.Controllers.Main.errorChangeFilteredRange": "Это приведет к изменению отфильтрованного диапазона листа.
    Чтобы выполнить эту задачу, необходимо удалить автофильтры.", + "SSE.Controllers.Main.errorChangeOnProtectedSheet": "Ячейка или диаграмма, которую вы пытаетесь изменить, находится на защищенном листе.
    Чтобы внести изменения, снимите защиту листа. Возможно, потребуется ввести пароль.", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", "SSE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
    Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.", "SSE.Controllers.Main.errorCopyMultiselectArea": "Данная команда неприменима для несвязных диапазонов.
    Выберите один диапазон и повторите попытку.", @@ -631,6 +650,8 @@ "SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", "SSE.Controllers.Main.errorDataValidate": "Введенное значение недопустимо.
    Значения, которые можно ввести в эту ячейку, ограничены.", "SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", + "SSE.Controllers.Main.errorDeleteColumnContainsLockedCell": "Вы пытаетесь удалить столбец с заблокированной ячейкой. Заблокированные ячейки нельзя удалять, если лист защищен.
    Чтобы удалить заблокированную ячейку, снимите защиту листа. Возможно, потребуется ввести пароль.", + "SSE.Controllers.Main.errorDeleteRowContainsLockedCell": "Вы пытаетесь удалить строку с заблокированной ячейкой. Заблокированные ячейки нельзя удалять, если лист защищен.
    Чтобы удалить заблокированную ячейку, снимите защиту листа. Возможно, потребуется ввести пароль.", "SSE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.
    Используйте опцию 'Скачать как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.", "SSE.Controllers.Main.errorEditingSaveas": "В ходе работы с документом произошла ошибка.
    Используйте опцию 'Сохранить как...', чтобы сохранить резервную копию файла на жесткий диск компьютера.", "SSE.Controllers.Main.errorEditView": "Сейчас нельзя отредактировать существующее представление листа и нельзя создавать новые, так как некоторые из них редактируются.", @@ -665,6 +686,7 @@ "SSE.Controllers.Main.errorNoDataToParse": "Не выделены данные для разбора.", "SSE.Controllers.Main.errorOpenWarning": "Одна из формул в файле превышает ограничение в 8192 символа.
    Формула была удалена.", "SSE.Controllers.Main.errorOperandExpected": "Синтаксис введенной функции некорректен. Проверьте, не пропущена ли одна из скобок - '(' или ')'.", + "SSE.Controllers.Main.errorPasswordIsNotCorrect": "Неверный пароль.
    Убедитесь, что отключена клавиша CAPS LOCK и используется правильный регистр.", "SSE.Controllers.Main.errorPasteMaxRange": "Область копирования не соответствует области вставки.
    Для вставки скопированных ячеек выделите область такого же размера или щелкните по первой ячейке в строке.", "SSE.Controllers.Main.errorPasteMultiSelect": "Данное действие неприменимо к нескольким выделенным диапазонам.
    Выделите один диапазон и повторите попытку.", "SSE.Controllers.Main.errorPasteSlicerError": "Срезы таблиц нельзя копировать из одной рабочей книги в другую.", @@ -690,6 +712,7 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
    но не сможете скачать или напечатать его до восстановления подключения и обновления страницы.", "SSE.Controllers.Main.errorWrongBracketsCount": "Ошибка во введенной формуле.
    Использовано неверное количество скобок.", "SSE.Controllers.Main.errorWrongOperator": "Ошибка во введенной формуле. Использован неправильный оператор.
    Пожалуйста, исправьте ошибку.", + "SSE.Controllers.Main.errorWrongPassword": "Неверный пароль.", "SSE.Controllers.Main.errRemDuplicates": "Найдено и удалено повторяющихся значений: {0}, осталось уникальных значений: {1}.", "SSE.Controllers.Main.leavePageText": "Электронная таблица содержит несохраненные изменения. Чтобы сохранить их, нажмите 'Остаться на этой странице', затем 'Сохранить'. Нажмите 'Покинуть эту страницу', чтобы сбросить все несохраненные изменения.", "SSE.Controllers.Main.leavePageTextOnClose": "Все несохраненные изменения в этой электронной таблице будут потеряны.
    Нажмите кнопку \"Отмена\", а затем нажмите кнопку \"Сохранить\", чтобы сохранить их. Нажмите кнопку \"OK\", чтобы сбросить все несохраненные изменения.", @@ -720,16 +743,22 @@ "SSE.Controllers.Main.saveTitleText": "Сохранение электронной таблицы", "SSE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "SSE.Controllers.Main.textAnonymous": "Аноним", + "SSE.Controllers.Main.textApplyAll": "Применить ко всем уравнениям", "SSE.Controllers.Main.textBuyNow": "Перейти на сайт", + "SSE.Controllers.Main.textChangesSaved": "Все изменения сохранены", "SSE.Controllers.Main.textClose": "Закрыть", "SSE.Controllers.Main.textCloseTip": "Щелкните, чтобы закрыть эту подсказку", "SSE.Controllers.Main.textConfirm": "Подтверждение", "SSE.Controllers.Main.textContactUs": "Связаться с отделом продаж", + "SSE.Controllers.Main.textConvertEquation": "Это уравнение создано в старой версии редактора уравнений, которая больше не поддерживается. Чтобы изменить это уравнение, его необходимо преобразовать в формат Office Math ML.
    Преобразовать сейчас?", "SSE.Controllers.Main.textCustomLoader": "Обратите внимание, что по условиям лицензии у вас нет прав изменять экран, отображаемый при загрузке.
    Пожалуйста, обратитесь в наш отдел продаж, чтобы сделать запрос.", + "SSE.Controllers.Main.textDisconnect": "Соединение потеряно", "SSE.Controllers.Main.textGuest": "Гость", "SSE.Controllers.Main.textHasMacros": "Файл содержит автозапускаемые макросы.
    Хотите запустить макросы?", + "SSE.Controllers.Main.textLearnMore": "Подробнее", "SSE.Controllers.Main.textLoadingDocument": "Загрузка таблицы", "SSE.Controllers.Main.textLongName": "Введите имя длиной менее 128 символов.", + "SSE.Controllers.Main.textNeedSynchronize": "Есть обновления", "SSE.Controllers.Main.textNo": "Нет", "SSE.Controllers.Main.textNoLicenseTitle": "Лицензионное ограничение", "SSE.Controllers.Main.textPaidFeature": "Платная функция", @@ -763,6 +792,7 @@ "SSE.Controllers.Main.txtDays": "Дни", "SSE.Controllers.Main.txtDiagramTitle": "Заголовок диаграммы", "SSE.Controllers.Main.txtEditingMode": "Установка режима редактирования...", + "SSE.Controllers.Main.txtErrorLoadHistory": "Не удалось загрузить историю", "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки", "SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtGrandTotal": "Общий итог", @@ -982,6 +1012,10 @@ "SSE.Controllers.Main.txtTab": "Лист", "SSE.Controllers.Main.txtTable": "Таблица", "SSE.Controllers.Main.txtTime": "Время", + "SSE.Controllers.Main.txtUnlock": "Разблокировать", + "SSE.Controllers.Main.txtUnlockRange": "Разблокировать диапазон", + "SSE.Controllers.Main.txtUnlockRangeDescription": "Введите пароль для изменения этого диапазона:", + "SSE.Controllers.Main.txtUnlockRangeWarning": "Диапазон, который вы пытаетесь изменить, защищен с помощью пароля.", "SSE.Controllers.Main.txtValues": "Значения", "SSE.Controllers.Main.txtXAxis": "Ось X", "SSE.Controllers.Main.txtYAxis": "Ось Y", @@ -1229,6 +1263,7 @@ "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Логарифм", "SSE.Controllers.Toolbar.txtLimitLog_Max": "Максимум", "SSE.Controllers.Toolbar.txtLimitLog_Min": "Минимум", + "SSE.Controllers.Toolbar.txtLockSort": "Обнаружены данные рядом с выделенным диапазоном, но у вас недостаточно прав для изменения этих ячеек.
    Вы хотите продолжить работу с выделенным диапазоном?", "SSE.Controllers.Toolbar.txtMatrix_1_2": "Пустая матрица 1 x 2", "SSE.Controllers.Toolbar.txtMatrix_1_3": "Пустая матрица 1 x 3", "SSE.Controllers.Toolbar.txtMatrix_2_1": "Пустая матрица 2 x 1", @@ -1962,6 +1997,7 @@ "SSE.Views.FileMenu.btnCreateNewCaption": "Создать новую", "SSE.Views.FileMenu.btnDownloadCaption": "Скачать как...", "SSE.Views.FileMenu.btnHelpCaption": "Справка...", + "SSE.Views.FileMenu.btnHistoryCaption": "История версий", "SSE.Views.FileMenu.btnInfoCaption": "Сведения о таблице...", "SSE.Views.FileMenu.btnPrintCaption": "Печать", "SSE.Views.FileMenu.btnProtectCaption": "Защитить", @@ -1974,10 +2010,8 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Сохранить копию как...", "SSE.Views.FileMenu.btnSettingsCaption": "Дополнительные параметры...", "SSE.Views.FileMenu.btnToEditCaption": "Редактировать таблицу", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Пустая", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "По шаблону", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Создайте новую пустую электронную таблицу, к которой Вы сможете применить стили и отформатировать при редактировании после того, как она создана. Или выберите один из шаблонов, чтобы создать электронную таблицу определенного типа или предназначения, где уже предварительно применены некоторые стили.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Новая электронная таблица", + "SSE.Views.FileMenuPanels.CreateNew.txtBlank": "Пустая таблица", + "SSE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Создать новую", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Применить", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добавить автора", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Добавить текст", @@ -2061,6 +2095,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Голландский", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Польский", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Пункт", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtbr": "Португальский (Бразилия)", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Португальский", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Румынский", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Русский", @@ -2683,6 +2718,56 @@ "SSE.Views.PrintTitlesDialog.textSelectRange": "Выбор диапазона", "SSE.Views.PrintTitlesDialog.textTitle": "Печатать заголовки", "SSE.Views.PrintTitlesDialog.textTop": "Повторять строки сверху", + "SSE.Views.ProtectDialog.textExistName": "ОШИБКА! Диапазон с таким названием уже существует", + "SSE.Views.ProtectDialog.textInvalidName": "Название диапазона должно начинаться с буквы и может содержать только буквы, цифры и пробелы.", + "SSE.Views.ProtectDialog.textInvalidRange": "ОШИБКА! Недопустимый диапазон ячеек", + "SSE.Views.ProtectDialog.textSelectData": "Выбор данных", + "SSE.Views.ProtectDialog.txtAllow": "Разрешить всем пользователям этого листа", + "SSE.Views.ProtectDialog.txtAutofilter": "Использовать автофильтр", + "SSE.Views.ProtectDialog.txtDelCols": "Удалять столбцы", + "SSE.Views.ProtectDialog.txtDelRows": "Удалять строки", + "SSE.Views.ProtectDialog.txtEmpty": "Это поле необходимо заполнить", + "SSE.Views.ProtectDialog.txtFormatCells": "Форматировать ячейки", + "SSE.Views.ProtectDialog.txtFormatCols": "Форматировать столбцы", + "SSE.Views.ProtectDialog.txtFormatRows": "Форматировать строки", + "SSE.Views.ProtectDialog.txtIncorrectPwd": "Пароль и его подтверждение не совпадают", + "SSE.Views.ProtectDialog.txtInsCols": "Вставлять столбцы", + "SSE.Views.ProtectDialog.txtInsHyper": "Вставлять гиперссылку", + "SSE.Views.ProtectDialog.txtInsRows": "Вставлять строки", + "SSE.Views.ProtectDialog.txtObjs": "Редактировать объекты", + "SSE.Views.ProtectDialog.txtOptional": "необязательно", + "SSE.Views.ProtectDialog.txtPassword": "Пароль", + "SSE.Views.ProtectDialog.txtPivot": "Использовать сводную таблицу и сводную диаграмму", + "SSE.Views.ProtectDialog.txtProtect": "Защитить", + "SSE.Views.ProtectDialog.txtRange": "Диапазон", + "SSE.Views.ProtectDialog.txtRangeName": "Название", + "SSE.Views.ProtectDialog.txtRepeat": "Повторить пароль", + "SSE.Views.ProtectDialog.txtScen": "Редактировать сценарии", + "SSE.Views.ProtectDialog.txtSelLocked": "Выделять заблокированные ячейки", + "SSE.Views.ProtectDialog.txtSelUnLocked": "Выделять разблокированные ячейки", + "SSE.Views.ProtectDialog.txtSheetDescription": "Запретите внесение нежелательных изменений другими пользователями путем ограничения их права на редактирование.", + "SSE.Views.ProtectDialog.txtSheetTitle": "Защитить лист", + "SSE.Views.ProtectDialog.txtSort": "Сортировать", + "SSE.Views.ProtectDialog.txtWarning": "Внимание: Если пароль забыт или утерян, его нельзя восстановить. Храните его в надежном месте.", + "SSE.Views.ProtectDialog.txtWBDescription": "Чтобы запретить другим пользователям просмотр скрытых листов, добавление, перемещение, удаление или скрытие листов и переименование листов, вы можете защитить структуру книги с помощью пароля.", + "SSE.Views.ProtectDialog.txtWBTitle": "Защитить структуру книги", + "SSE.Views.ProtectRangesDlg.guestText": "Гость", + "SSE.Views.ProtectRangesDlg.textDelete": "Удалить", + "SSE.Views.ProtectRangesDlg.textEdit": "Редактировать", + "SSE.Views.ProtectRangesDlg.textEmpty": "Нет диапазонов, разрешенных для редактирования.", + "SSE.Views.ProtectRangesDlg.textNew": "Новый", + "SSE.Views.ProtectRangesDlg.textProtect": "Защитить лист", + "SSE.Views.ProtectRangesDlg.textPwd": "Пароль", + "SSE.Views.ProtectRangesDlg.textRange": "Диапазон", + "SSE.Views.ProtectRangesDlg.textRangesDesc": "Диапазоны защищенного листа, разблокируемые паролем (только для заблокированных ячеек)", + "SSE.Views.ProtectRangesDlg.textTitle": "Название", + "SSE.Views.ProtectRangesDlg.tipIsLocked": "Этот элемент редактируется другим пользователем.", + "SSE.Views.ProtectRangesDlg.txtEditRange": "Редактировать диапазон", + "SSE.Views.ProtectRangesDlg.txtNewRange": "Новый диапазон", + "SSE.Views.ProtectRangesDlg.txtNo": "Нет", + "SSE.Views.ProtectRangesDlg.txtTitle": "Разрешить пользователям редактировать диапазоны", + "SSE.Views.ProtectRangesDlg.txtYes": "Да", + "SSE.Views.ProtectRangesDlg.warnDelete": "Вы действительно хотите удалить имя {0}?", "SSE.Views.RemoveDuplicatesDialog.textColumns": "Столбцы", "SSE.Views.RemoveDuplicatesDialog.textDescription": "Чтобы удалить повторяющиеся значения, выделите один или несколько столбцов, содержащих их.", "SSE.Views.RemoveDuplicatesDialog.textHeaders": "Мои данные содержат заголовки", @@ -2986,13 +3071,17 @@ "SSE.Views.Statusbar.itemMaximum": "Максимум", "SSE.Views.Statusbar.itemMinimum": "Минимум", "SSE.Views.Statusbar.itemMove": "Переместить", + "SSE.Views.Statusbar.itemProtect": "Защитить", "SSE.Views.Statusbar.itemRename": "Переименовать", + "SSE.Views.Statusbar.itemStatus": "Статус сохранения", "SSE.Views.Statusbar.itemSum": "Сумма", "SSE.Views.Statusbar.itemTabColor": "Цвет ярлычка", + "SSE.Views.Statusbar.itemUnProtect": "Снять защиту", "SSE.Views.Statusbar.RenameDialog.errNameExists": "Лист с таким именем уже существует.", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Имя листа не может содержать следующие символы: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Имя листа", "SSE.Views.Statusbar.selectAllSheets": "Выбрать все листы", + "SSE.Views.Statusbar.sheetIndexText": "Лист {0} из {1}", "SSE.Views.Statusbar.textAverage": "Среднее", "SSE.Views.Statusbar.textCount": "Количество", "SSE.Views.Statusbar.textMax": "Макс", @@ -3428,5 +3517,19 @@ "SSE.Views.ViewTab.tipClose": "Закрыть представление листа", "SSE.Views.ViewTab.tipCreate": "Создать представление листа", "SSE.Views.ViewTab.tipFreeze": "Закрепить области", - "SSE.Views.ViewTab.tipSheetView": "Представление листа" + "SSE.Views.ViewTab.tipSheetView": "Представление листа", + "SSE.Views.WBProtection.hintAllowRanges": "Разрешить редактировать диапазоны", + "SSE.Views.WBProtection.hintProtectSheet": "Защитить лист", + "SSE.Views.WBProtection.hintProtectWB": "Защитить книгу", + "SSE.Views.WBProtection.txtAllowRanges": "Разрешить редактировать диапазоны", + "SSE.Views.WBProtection.txtHiddenFormula": "Скрытые формулы", + "SSE.Views.WBProtection.txtLockedCell": "Заблокированная ячейка", + "SSE.Views.WBProtection.txtLockedShape": "Заблокированная фигура", + "SSE.Views.WBProtection.txtLockedText": "Заблокировать текст", + "SSE.Views.WBProtection.txtProtectSheet": "Защитить лист", + "SSE.Views.WBProtection.txtProtectWB": "Защитить книгу", + "SSE.Views.WBProtection.txtSheetUnlockDescription": "Введите пароль для отключения защиты листа", + "SSE.Views.WBProtection.txtSheetUnlockTitle": "Снять защиту листа", + "SSE.Views.WBProtection.txtWBUnlockDescription": "Введите пароль для отключения защиты книги", + "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index 831ef2073..94c1fbe2d 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -15,7 +15,6 @@ "Common.define.chartData.textStock": "Akcie/burzový graf", "Common.define.chartData.textSurface": "Povrch", "Common.define.chartData.textWinLossSpark": "Zisk/strata", - "Common.UI.ColorButton.textNewColor": "Pridať novú vlastnú farbu", "Common.UI.ComboBorderSize.txtNoBorders": "Bez orámovania", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez orámovania", "Common.UI.ComboDataView.emptyComboText": "Žiadne štýly", @@ -1375,10 +1374,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Uložiť", "SSE.Views.FileMenu.btnSettingsCaption": "Pokročilé nastavenia...", "SSE.Views.FileMenu.btnToEditCaption": "Upraviť zošit", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z prázdneho", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Zo šablóny", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Vytvorte novú prázdnu tabuľku, ktorú budete môcť štýlovať a formátovať po jej vytvorení počas úpravy. Alebo si vyberte jednu zo šablón, ak chcete spustiť tabuľku určitého typu alebo účelu, kde niektoré štýly už boli predbežne aplikované.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nový zošit", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Aplikovať", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Pridať autora", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Pridať text", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index 10cc3044a..a2dfa819d 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -24,8 +24,6 @@ "Common.define.conditionalData.textFormula": "Formula", "Common.define.conditionalData.textNotContains": "Ne vsebuje", "Common.Translation.warnFileLockedBtnEdit": "Ustvari kopijo", - "Common.UI.ColorButton.textAutoColor": "Samodejeno", - "Common.UI.ColorButton.textNewColor": "Dodaj novo barvo po meri", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", "Common.UI.ComboDataView.emptyComboText": "Ni slogov", @@ -730,10 +728,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Shrani", "SSE.Views.FileMenu.btnSettingsCaption": "Napredne nastavitve...", "SSE.Views.FileMenu.btnToEditCaption": "Uredi razpredelnico", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Z praznine", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Z predloge", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Ustvari novo prazno razpredelnico, ki jo boste lahko med urejanjem stilizirali in formatirali, ko je ustvarjena. Ali pa izberite eno izmed predlog za ustvarjanje razpredelnice določene vrste ali namena, kjer so bili nekateri slogi določeni vnaprej.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nova razpredelnica", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Uporabi", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Dodaj avtorja", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Dodaj besedilo", diff --git a/apps/spreadsheeteditor/main/locale/sv.json b/apps/spreadsheeteditor/main/locale/sv.json index bc78b4323..b8fcf28ce 100644 --- a/apps/spreadsheeteditor/main/locale/sv.json +++ b/apps/spreadsheeteditor/main/locale/sv.json @@ -102,8 +102,6 @@ "Common.Translation.warnFileLocked": "Dokumentet används av ett annat program. Du kan fortsätta redigera och spara den som en kopia.", "Common.Translation.warnFileLockedBtnEdit": "Skapa en kopia", "Common.Translation.warnFileLockedBtnView": "Öppna skrivskyddad", - "Common.UI.ColorButton.textAutoColor": "Automatisk", - "Common.UI.ColorButton.textNewColor": "Lägg till ny egen färg", "Common.UI.ComboBorderSize.txtNoBorders": "Inga ramar", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Inga ramar", "Common.UI.ComboDataView.emptyComboText": "Inga stilar", @@ -1839,7 +1837,7 @@ "SSE.Views.DocumentHolder.textMacro": "Tilldela makro", "SSE.Views.DocumentHolder.textMax": "Max", "SSE.Views.DocumentHolder.textMin": "Min", - "SSE.Views.DocumentHolder.textMore": "Mera funktioner", + "SSE.Views.DocumentHolder.textMore": "Fler funktioner", "SSE.Views.DocumentHolder.textMoreFormats": "Flera format", "SSE.Views.DocumentHolder.textNone": "Ingen", "SSE.Views.DocumentHolder.textNumbering": "Numrering", @@ -1969,10 +1967,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Spara kopia som...", "SSE.Views.FileMenu.btnSettingsCaption": "Avancerade inställningar...", "SSE.Views.FileMenu.btnToEditCaption": "Redigera kalkylblad", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Från blank", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Från mall", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Skapa ett nytt tomt kalkylblad som du kan anpassa och formatera efter att det skapats (under redigering). Eller välj en av mallarna för att skapa ett kalkylblad av en viss typ eller syfte där vissa stilar redan har applicerats.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Nytt kalkylblad", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Tillämpa", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Lägg till författare", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "Lägg till text", @@ -2284,7 +2278,7 @@ "SSE.Views.FormulaTab.txtCalculation": "Beräkning", "SSE.Views.FormulaTab.txtFormula": "Funktion", "SSE.Views.FormulaTab.txtFormulaTip": "Infoga funktion", - "SSE.Views.FormulaTab.txtMore": "Mera funktioner", + "SSE.Views.FormulaTab.txtMore": "Fler funktioner", "SSE.Views.FormulaTab.txtRecent": "Tidigare använda", "SSE.Views.FormulaWizard.textAny": "Någon", "SSE.Views.FormulaWizard.textArgument": "Argument", diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index 16275015b..391631828 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -10,7 +10,6 @@ "Common.define.chartData.textPoint": "Nokta grafiği", "Common.define.chartData.textStock": "Stok Grafiği", "Common.define.chartData.textSurface": "Yüzey", - "Common.UI.ColorButton.textNewColor": "Yeni Özel Renk Ekle", "Common.UI.ComboBorderSize.txtNoBorders": "Sınır yok", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sınır yok", "Common.UI.ComboDataView.emptyComboText": "Stil yok", @@ -1038,10 +1037,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Kaydet", "SSE.Views.FileMenu.btnSettingsCaption": "Gelişmiş Ayarlar...", "SSE.Views.FileMenu.btnToEditCaption": "Spreadsheet düzenle", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Boştan", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Şablondan", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Oluşturulduktan sonra düzenleme sırasında stil ve format verebileceğiniz yeni boş bir spreadsheet oluşturun. Yada şablonlardan birini seçerek belli tipte yada amaç için spreadsheet başlatın.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Yeni Spreadsheet", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Yayıncı", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Erişim haklarını değiştir", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasyon", diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 094d894ef..0e70de793 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -1054,10 +1054,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Зберегти", "SSE.Views.FileMenu.btnSettingsCaption": "Розширені налаштування...", "SSE.Views.FileMenu.btnToEditCaption": "Редагувати електронну таблицю", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "З бланку", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "З шаблону", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Створіть нову порожню електронну таблицю, яку ви зможете форматувати після створення під час редагування. Або виберіть один із шаблонів, щоб запустити таблицю певного типу або призначення, де деякі стилі вже були попередньо застосовані.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Нова таблиця", "SSE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Додаток", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Змінити права доступу", diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index 19848f11d..217694910 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -14,7 +14,6 @@ "Common.define.chartData.textStock": "Cổ phiếu", "Common.define.chartData.textSurface": "Bề mặt", "Common.define.chartData.textWinLossSpark": "Win/Loss", - "Common.UI.ColorButton.textNewColor": "Thêm màu tùy chỉnh mới", "Common.UI.ComboBorderSize.txtNoBorders": "Không viền", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền", "Common.UI.ComboDataView.emptyComboText": "Không có kiểu", @@ -1041,10 +1040,6 @@ "SSE.Views.FileMenu.btnSaveCaption": "Lưu", "SSE.Views.FileMenu.btnSettingsCaption": "Cài đặt nâng cao...", "SSE.Views.FileMenu.btnToEditCaption": "Chỉnh sửa Bảng tính", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "Từ trang trắng", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "Từ template", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "Tạo một bảng tính mới để bạn sẽ có thể tạo kiểu và định dạng sau khi nó được tạo ra trong quá trình chỉnh sửa. Hoặc chọn một trong các template để bắt đầu một bảng tính theo loại hoặc mục đích nhất định đã được áp dụng sẵn các kiểu.", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "Bảng tính mới", "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Tác giả", "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Thay đổi quyền truy cập", "SSE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Địa điểm", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index c06c9f234..08b1e6882 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -16,7 +16,6 @@ "Common.define.chartData.textSurface": "平面", "Common.define.chartData.textWinLossSpark": "赢/输", "Common.Translation.warnFileLocked": "另一个应用程序正在编辑本文件。你可以继续编辑，并另存为副本。", - "Common.UI.ColorButton.textNewColor": "添加新的自定义颜色", "Common.UI.ComboBorderSize.txtNoBorders": "没有边框", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "没有边框", "Common.UI.ComboDataView.emptyComboText": "没有风格", @@ -1694,10 +1693,6 @@ "SSE.Views.FileMenu.btnSaveCopyAsCaption": "将副本另存为...", "SSE.Views.FileMenu.btnSettingsCaption": "高级设置…", "SSE.Views.FileMenu.btnToEditCaption": "编辑电子表格", - "SSE.Views.FileMenuPanels.CreateNew.fromBlankText": "从空白", - "SSE.Views.FileMenuPanels.CreateNew.fromTemplateText": "从模板", - "SSE.Views.FileMenuPanels.CreateNew.newDescriptionText": "创建一个新的空白电子表格，您可以在编辑过程中创建样式和格式。或者选择其中一个模板来启用某种类型或目的的电子表格，这些模板已经预制了一些样式。", - "SSE.Views.FileMenuPanels.CreateNew.newDocumentText": "新建表格", "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "应用", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "添加作者", "SSE.Views.FileMenuPanels.DocumentInfo.txtAddText": "添加文本", From 99e61ff0b4bc85c2b3969186dbbe410194a220f7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Sep 2021 14:08:59 +0300 Subject: [PATCH 090/129] [Mobile] Update translation --- apps/documenteditor/mobile/locale/es.json | 14 ++++---- apps/documenteditor/mobile/locale/ro.json | 14 ++++---- apps/documenteditor/mobile/locale/ru.json | 2 +- apps/presentationeditor/mobile/locale/es.json | 4 +-- apps/presentationeditor/mobile/locale/ro.json | 4 +-- apps/spreadsheeteditor/mobile/locale/es.json | 32 +++++++++---------- apps/spreadsheeteditor/mobile/locale/ro.json | 32 +++++++++---------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json index 2a730c31a..4f032b710 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -122,6 +122,7 @@ "textNot": "No", "textNoWidow": "Sin control de viudas", "textNum": "Cambiar numeración", + "textOk": "OK", "textOriginal": "Original", "textParaDeleted": "Párrafo eliminado", "textParaFormatted": "Párrafo formateado", @@ -154,8 +155,7 @@ "textTryUndoRedo": "Las funciones Deshacer/Rehacer están desactivadas en el modo de co-edición rápido.", "textUnderline": "Subrayar", "textUsers": "Usuarios", - "textWidow": "Control de viudas", - "textOk": "Ok" + "textWidow": "Control de viudas" }, "ThemeColorPalette": { "textCustomColors": "Colores personalizados", @@ -491,6 +491,8 @@ "textCancel": "Cancelar", "textCaseSensitive": "Distinguir mayúsculas de minúsculas", "textCentimeter": "Centímetro", + "textChooseEncoding": "Elegir codificación", + "textChooseTxtOptions": "Elegir opciones de archivo TXT", "textCollaboration": "Colaboración", "textColorSchemes": "Esquemas de color", "textComment": "Comentario", @@ -554,7 +556,9 @@ "textTop": "Arriba", "textUnitOfMeasurement": "Unidad de medida", "textUploaded": "Cargado", + "txtDownloadTxt": "Descargar TXT", "txtIncorrectPwd": "La contraseña es incorrecta", + "txtOk": "OK", "txtProtected": "Una vez que introduzca la contraseña y abra el archivo, se restablecerá la contraseña actual", "txtScheme1": "Oficina", "txtScheme10": "Medio", @@ -577,11 +581,7 @@ "txtScheme6": "Concurrencia", "txtScheme7": "Equidad ", "txtScheme8": "Flujo", - "txtScheme9": "Fundición", - "textChooseEncoding": "Choose Encoding", - "textChooseTxtOptions": "Choose TXT Options", - "txtDownloadTxt": "Download TXT", - "txtOk": "Ok" + "txtScheme9": "Fundición" }, "Toolbar": { "dlgLeaveMsgText": "Tiene cambios sin guardar. Haga clic en \"Permanecer en esta página\" para esperar a que se guarde automáticamente. Haga clic en \"Salir de esta página\" para descartar todos los cambios no guardados.", diff --git a/apps/documenteditor/mobile/locale/ro.json b/apps/documenteditor/mobile/locale/ro.json index de32a1ba2..d703ac399 100644 --- a/apps/documenteditor/mobile/locale/ro.json +++ b/apps/documenteditor/mobile/locale/ro.json @@ -122,6 +122,7 @@ "textNot": "Nu", "textNoWidow": "Fără control văduvă", "textNum": "Modificarea numerotării", + "textOk": "OK", "textOriginal": "Inițial", "textParaDeleted": "Paragraful a fost șters", "textParaFormatted": "Paragraful a fost formatat", @@ -154,8 +155,7 @@ "textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.", "textUnderline": "Subliniat", "textUsers": "Utilizatori", - "textWidow": "Control văduvă", - "textOk": "Ok" + "textWidow": "Control văduvă" }, "ThemeColorPalette": { "textCustomColors": "Culori particularizate", @@ -491,6 +491,8 @@ "textCancel": "Revocare", "textCaseSensitive": "Sensibil la litere mari și mici", "textCentimeter": "Centimetru", + "textChooseEncoding": "Alegeți codificare", + "textChooseTxtOptions": "Selectează opțiunile TXT", "textCollaboration": "Colaborare", "textColorSchemes": "Scheme de culori", "textComment": "Comentariu", @@ -554,7 +556,9 @@ "textTop": "Sus", "textUnitOfMeasurement": "Unitate de măsură ", "textUploaded": "S-a încărcat", + "txtDownloadTxt": "Încărcare TXT", "txtIncorrectPwd": "Parolă incorectă", + "txtOk": "OK", "txtProtected": "Parola curentă la fișierul va fi resetată, de îndată ce este introdusă și fișierul este deschis", "txtScheme1": "Office", "txtScheme10": "Median", @@ -577,11 +581,7 @@ "txtScheme6": "Concurență", "txtScheme7": "Echilibru", "txtScheme8": "Flux", - "txtScheme9": "Forjă", - "textChooseEncoding": "Choose Encoding", - "textChooseTxtOptions": "Choose TXT Options", - "txtDownloadTxt": "Download TXT", - "txtOk": "Ok" + "txtScheme9": "Forjă" }, "Toolbar": { "dlgLeaveMsgText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și așteptați la salvare automată. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 6603e30cd..617af97a1 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -226,7 +226,7 @@ "textDifferentOddAndEvenPages": "Разные для четных и нечетных", "textDisplay": "Отобразить", "textDistanceFromText": "Расстояние до текста", - "textDoubleStrikethrough": "Двойное зачеркивание", + "textDoubleStrikethrough": "Двойное зачёркивание", "textEditLink": "Редактировать ссылку", "textEffects": "Эффекты", "textEmptyImgUrl": "Необходимо указать URL рисунка.", diff --git a/apps/presentationeditor/mobile/locale/es.json b/apps/presentationeditor/mobile/locale/es.json index 22a462365..0f5d6b04f 100644 --- a/apps/presentationeditor/mobile/locale/es.json +++ b/apps/presentationeditor/mobile/locale/es.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "¿Realmente quiere eliminar este comentario?", "textMessageDeleteReply": "¿Realmente quiere eliminar esta respuesta?", "textNoComments": "Este documento no contiene comentarios", + "textOk": "OK", "textReopen": "Volver a abrir", "textResolve": "Resolver", "textTryUndoRedo": "Las funciones Deshacer/Rehacer están desactivadas en el modo de co-edición rápido.", - "textUsers": "Usuarios", - "textOk": "Ok" + "textUsers": "Usuarios" }, "ThemeColorPalette": { "textCustomColors": "Colores personalizados", diff --git a/apps/presentationeditor/mobile/locale/ro.json b/apps/presentationeditor/mobile/locale/ro.json index dab536df2..16cd92870 100644 --- a/apps/presentationeditor/mobile/locale/ro.json +++ b/apps/presentationeditor/mobile/locale/ro.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "Sunteți sigur că doriți să stergeți acest comentariu?", "textMessageDeleteReply": "Sinteți sigur că doriți să ștergeți acest răspuns?", "textNoComments": "Documentul nu cuprinde comentarii", + "textOk": "OK", "textReopen": "Redeschide", "textResolve": "Rezolvare", "textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.", - "textUsers": "Utilizatori", - "textOk": "Ok" + "textUsers": "Utilizatori" }, "ThemeColorPalette": { "textCustomColors": "Culori particularizate", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index a4812c59a..b67bfdf9a 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "¿Realmente quiere eliminar este comentario?", "textMessageDeleteReply": "¿Realmente quiere eliminar esta respuesta?", "textNoComments": "Este documento no contiene comentarios", + "textOk": "OK", "textReopen": "Volver a abrir", "textResolve": "Resolver", "textTryUndoRedo": "Las funciones Deshacer/Rehacer están desactivadas en el modo de co-edición rápido.", - "textUsers": "Usuarios", - "textOk": "Ok" + "textUsers": "Usuarios" }, "ThemeColorPalette": { "textCustomColors": "Colores personalizados", @@ -335,12 +335,12 @@ "textSortAndFilter": "Ordenar y filtrar", "txtExpand": "Expandir y ordenar", "txtExpandSort": "Los datos al lado del rango seleccionado no serán ordenados. ¿Quiere Usted expandir el rango seleccionado para incluir datos de las celdas adyacentes o continuar la ordenación del rango seleccionado?", + "txtLockSort": "Se encuentran datos junto a su selección, pero no tiene permisos suficientes para modificar esas celdas.
    ¿Desea continuar con la selección actual?", + "txtNo": "No", "txtNotUrl": "Este campo debe ser una dirección URL en el formato \"http://www.example.com\"", "txtSorting": "Ordenación", "txtSortSelected": "Ordenar los objetos seleccionados", - "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", - "txtNo": "No", - "txtYes": "Yes" + "txtYes": "Sí" }, "Edit": { "notcriticalErrorTitle": "Advertencia", @@ -540,6 +540,9 @@ "textByRows": "Por filas", "textCancel": "Cancelar", "textCentimeter": "Centímetro", + "textChooseCsvOptions": "Elegir opciones de CSV", + "textChooseDelimeter": "Elegir delimitador", + "textChooseEncoding": "Elegir codificación", "textCollaboration": "Colaboración", "textColorSchemes": "Esquemas de color", "textComment": "Comentario", @@ -547,6 +550,7 @@ "textComments": "Comentarios", "textCreated": "Creado", "textCustomSize": "Tamaño personalizado", + "textDelimeter": "Delimitador", "textDisableAll": "Deshabilitar todo", "textDisableAllMacrosWithNotification": "Deshabilitar todas las macros con notificación", "textDisableAllMacrosWithoutNotification": "Deshabilitar todas las macros sin notificación", @@ -556,6 +560,7 @@ "textEmail": "E-mail", "textEnableAll": "Habilitar todo", "textEnableAllMacrosWithoutNotification": "Habilitar todas las macros sin notificación ", + "textEncoding": "Codificación", "textFind": "Buscar", "textFindAndReplace": "Buscar y reemplazar", "textFindAndReplaceAll": "Buscar y reemplazar todo", @@ -611,9 +616,13 @@ "textValues": "Valores", "textVersion": "Versión ", "textWorkbook": "Libro de trabajo", + "txtColon": "Dos puntos", + "txtComma": "Coma", "txtDelimiter": "Delimitador", + "txtDownloadCsv": "Descargar CSV", "txtEncoding": "Codificación", "txtIncorrectPwd": "La contraseña es incorrecta", + "txtOk": "OK", "txtProtected": "Una vez que se ha introducido la contraseña y abierto el archivo, la contraseña actual del archivo se restablecerá", "txtScheme1": "Oficina", "txtScheme10": "Medio", @@ -637,19 +646,10 @@ "txtScheme7": "Equidad ", "txtScheme8": "Flujo", "txtScheme9": "Fundición", + "txtSemicolon": "Punto y coma", "txtSpace": "Espacio", "txtTab": "Pestaña", - "warnDownloadAs": "Si sigue guardando en este formato, todas las características a excepción del texto se perderán.
    ¿Está seguro de que desea continuar?", - "textChooseCsvOptions": "Choose CSV Options", - "textChooseDelimeter": "Choose Delimeter", - "textChooseEncoding": "Choose Encoding", - "textDelimeter": "Delimiter", - "textEncoding": "Encoding", - "txtColon": "Colon", - "txtComma": "Comma", - "txtDownloadCsv": "Download CSV", - "txtOk": "Ok", - "txtSemicolon": "Semicolon" + "warnDownloadAs": "Si sigue guardando en este formato, todas las características a excepción del texto se perderán.
    ¿Está seguro de que desea continuar?" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/ro.json b/apps/spreadsheeteditor/mobile/locale/ro.json index 5615ef93c..3c3e46d35 100644 --- a/apps/spreadsheeteditor/mobile/locale/ro.json +++ b/apps/spreadsheeteditor/mobile/locale/ro.json @@ -27,11 +27,11 @@ "textMessageDeleteComment": "Sunteți sigur că doriți să stergeți acest comentariu?", "textMessageDeleteReply": "Sinteți sigur că doriți să ștergeți acest răspuns?", "textNoComments": "Documentul nu cuprinde comentarii", + "textOk": "OK", "textReopen": "Redeschidere", "textResolve": "Rezolvare", "textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.", - "textUsers": "Utilizatori", - "textOk": "Ok" + "textUsers": "Utilizatori" }, "ThemeColorPalette": { "textCustomColors": "Culori particularizate", @@ -335,12 +335,12 @@ "textSortAndFilter": "Sortare și filtrare", "txtExpand": "Extindere și sortare", "txtExpandSort": "Datele lângă selecție vor fi sortate. Doriți să extindeți selecția pentru a include datele adiacente sau doriți să continuați cu selecția curentă?", + "txtLockSort": "Alături de celulele selectate au fost găsite datele dar nu aveți permisiuni suficente ca să le modificați
    Doriți să continuați cu selecția curentă?", + "txtNo": "Nu", "txtNotUrl": "Câmpul trebuie să conțină adresa URL in format \"http://www.example.com\"", "txtSorting": "Sortare", "txtSortSelected": "Sortarea selecției", - "txtLockSort": "Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?", - "txtNo": "No", - "txtYes": "Yes" + "txtYes": "Da" }, "Edit": { "notcriticalErrorTitle": "Avertisment", @@ -540,6 +540,9 @@ "textByRows": "După rând", "textCancel": "Anulează", "textCentimeter": "Centimetru", + "textChooseCsvOptions": "Alegerea opțiunilor CSV", + "textChooseDelimeter": "Alegeți delimitator", + "textChooseEncoding": "Alegeți codificare", "textCollaboration": "Colaborare", "textColorSchemes": "Scheme de culori", "textComment": "Comentariu", @@ -547,6 +550,7 @@ "textComments": "Comentarii", "textCreated": "A fost creat la", "textCustomSize": "Dimensiunea particularizată", + "textDelimeter": "Delimitator", "textDisableAll": "Se dezactivează toate", "textDisableAllMacrosWithNotification": "Se dezactivează toate macrocomenzile, cu notificare ", "textDisableAllMacrosWithoutNotification": "Se dezactivează toate macrocomenzile, fără notificare", @@ -556,6 +560,7 @@ "textEmail": "Email", "textEnableAll": "Se activează toate", "textEnableAllMacrosWithoutNotification": "Se activează toate macrocomenzile, fără notificare", + "textEncoding": "Codificare", "textFind": "Găsire", "textFindAndReplace": "Găsire și înlocuire", "textFindAndReplaceAll": "Găsire și înlocuire totală", @@ -611,9 +616,13 @@ "textValues": "Valori", "textVersion": "Versiune", "textWorkbook": "Registru de calcul", + "txtColon": "Două puncte", + "txtComma": "Virgulă", "txtDelimiter": "Delimitator", + "txtDownloadCsv": "Încărcare CSV", "txtEncoding": "Codificare", "txtIncorrectPwd": "Parolă incorectă", + "txtOk": "OK", "txtProtected": "Parola curentă va fi resetată, de îndată ce parola este introdusă și fișierul este deschis.", "txtScheme1": "Office", "txtScheme10": "Median", @@ -637,19 +646,10 @@ "txtScheme7": "Echilibru", "txtScheme8": "Flux", "txtScheme9": "Forjă", + "txtSemicolon": "Punct și virgulă", "txtSpace": "Spațiu", "txtTab": "Fila", - "warnDownloadAs": "Dacă salvați în acest format de fișier, este posibil ca unele dintre caracteristici să se piardă, cu excepția textului.
    Sunteți sigur că doriți să continuați?", - "textChooseCsvOptions": "Choose CSV Options", - "textChooseDelimeter": "Choose Delimeter", - "textChooseEncoding": "Choose Encoding", - "textDelimeter": "Delimiter", - "textEncoding": "Encoding", - "txtColon": "Colon", - "txtComma": "Comma", - "txtDownloadCsv": "Download CSV", - "txtOk": "Ok", - "txtSemicolon": "Semicolon" + "warnDownloadAs": "Dacă salvați în acest format de fișier, este posibil ca unele dintre caracteristici să se piardă, cu excepția textului.
    Sunteți sigur că doriți să continuați?" } } } \ No newline at end of file From bc20db597bc796ba2d61c7afa047189334dbc888 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Sep 2021 14:39:20 +0300 Subject: [PATCH 091/129] Fix Bug 44992 --- .../main/app/view/DocumentHolder.js | 17 ++++++++++++++--- apps/documenteditor/main/locale/en.json | 1 + .../main/app/view/DocumentHolder.js | 17 ++++++++++++++--- apps/presentationeditor/main/locale/en.json | 1 + .../main/app/controller/DocumentHolder.js | 19 +++++++++++++------ apps/spreadsheeteditor/main/locale/en.json | 1 + 6 files changed, 44 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 2eae506fd..01e9ac917 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -443,8 +443,18 @@ define([ }); var onHyperlinkClick = function(url) { - if (url /*&& me.api.asc_getUrlType(url)>0*/) { - window.open(url); + if (url) { + if (me.api.asc_getUrlType(url)>0) + window.open(url); + else + Common.UI.warning({ + msg: me.txtWarnUrl, + buttons: ['yes', 'no'], + primary: 'yes', + callback: function(btn) { + (btn == 'yes') && window.open(url); + } + }); } }; @@ -4660,7 +4670,8 @@ define([ textRemPicture: 'Remove Image', textRemField: 'Remove Text Field', txtRemoveWarning: 'Do you want to remove this signature?
    It can\'t be undone.', - notcriticalErrorTitle: 'Warning' + notcriticalErrorTitle: 'Warning', + txtWarnUrl: 'Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?' }, DE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index c7053b371..1a50ea0b2 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1591,6 +1591,7 @@ "DE.Views.DocumentHolder.txtUngroup": "Ungroup", "DE.Views.DocumentHolder.updateStyleText": "Update %1 style", "DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "DE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?", "DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill", "DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap", "DE.Views.DropcapSettingsAdvanced.strMargins": "Margins", diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e120004d1..063930144 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -443,8 +443,18 @@ define([ }); var onHyperlinkClick = function(url) { - if (url /*&& me.api.asc_getUrlType(url)>0*/) { - window.open(url); + if (url) { + if (me.api.asc_getUrlType(url)>0) + window.open(url); + else + Common.UI.warning({ + msg: me.txtWarnUrl, + buttons: ['yes', 'no'], + primary: 'yes', + callback: function(btn) { + (btn == 'yes') && window.open(url); + } + }); } }; @@ -3954,7 +3964,8 @@ define([ addToLayoutText: 'Add to Layout', txtResetLayout: 'Reset Slide', mniCustomTable: 'Insert Custom Table', - textFromStorage: 'From Storage' + textFromStorage: 'From Storage', + txtWarnUrl: 'Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index bdbe2ea6d..3fb5f21c2 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1281,6 +1281,7 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close slideshow", diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 3385327c8..15a11225c 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1523,11 +1523,17 @@ define([ }); return; } - // if (this.api.asc_getUrlType(url)>0) { - var newDocumentPage = window.open(url, '_blank'); - if (newDocumentPage) - newDocumentPage.focus(); - // } + if (this.api.asc_getUrlType(url)>0) + window.open(url, '_blank'); + else + Common.UI.warning({ + msg: this.txtWarnUrl, + buttons: ['yes', 'no'], + primary: 'yes', + callback: function(btn) { + (btn == 'yes') && window.open(url, '_blank'); + } + }); }, onApiAutofilter: function(config) { @@ -3957,7 +3963,8 @@ define([ textStopExpand: 'Stop automatically expanding tables', textAutoCorrectSettings: 'AutoCorrect options', txtLockSort: 'Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?', - txtRemoveWarning: 'Do you want to remove this signature?
    It can\'t be undone.' + txtRemoveWarning: 'Do you want to remove this signature?
    It can\'t be undone.', + txtWarnUrl: 'Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?' }, SSE.Controllers.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 4757f0849..6b7cd7272 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -587,6 +587,7 @@ "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion", "SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard", "SSE.Controllers.DocumentHolder.txtWidth": "Width", + "SSE.Controllers.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.
    Are you sure you want to continue?", "SSE.Controllers.FormulaDialog.sCategoryAll": "All", "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube", "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database", From 633ddd4e9c798f7ad7a59674f47d557c406c33f4 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Sep 2021 15:46:42 +0300 Subject: [PATCH 092/129] [DE PE SSE] Add tooltips to resolved icon when we can not edit comment (bug 51488) --- apps/common/main/lib/controller/Comments.js | 2 -- apps/common/main/lib/template/Comments.template | 2 +- .../main/lib/template/CommentsPopover.template | 14 +++++++------- apps/common/main/lib/view/Comments.js | 8 +++++++- apps/common/main/lib/view/ReviewPopover.js | 8 +++++++- apps/documenteditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/en.json | 2 ++ 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 85e1eb635..953ab394a 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -903,8 +903,6 @@ define([ // хотим показать тот же коментарий что был и выбран return; } - if (this.mode && !this.mode.canComments) - hint = true; var popover = this.getPopover(); if (popover) { diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template index 286f121c0..5e6440929 100644 --- a/apps/common/main/lib/template/Comments.template +++ b/apps/common/main/lib/template/Comments.template @@ -83,7 +83,7 @@ <% if (editable && !scope.viewmode) { %>
    <% } else if ((!editable || scope.viewmode) && resolved) { %> -
    +
    <% } %>
    <% } %> diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index cf0d529ee..a0d7b0854 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -7,7 +7,7 @@
    <%= scope.getEncodedName(parsedName) %>
    <%=date%>
    - <% if (!editTextInPopover || hint) { %> + <% if (!editTextInPopover || hint || scope.viewmode) { %>
    <%=scope.pickLink(comment)%>
    <% } else { %>
    @@ -37,7 +37,7 @@
    <%=item.get("date")%>
    <% if (!item.get("editTextInPopover")) { %>
    <%=scope.pickLink(item.get("reply"))%>
    - <% if (!hint) { %> + <% if (!hint && !scope.viewmode) { %>
    <% if (item.get("editable")) { %>
    ">
    @@ -61,7 +61,7 @@ - <% if (!showReplyInPopover && !hideAddReply && !hint) { %> + <% if (!showReplyInPopover && !hideAddReply && !hint && !scope.viewmode) { %> <% if (replys.length && !add_arrow) { %> <% } else { %> @@ -73,7 +73,7 @@ <% if (!editTextInPopover && !lock) { %>
    - <% if (!hint) { %> + <% if (!hint && !scope.viewmode) { %> <% if (editable) { %>
    <% } %> @@ -81,10 +81,10 @@
    <% } %> <% } %> - <% if (editable && !hint) { %> + <% if (editable && !hint && !scope.viewmode) { %>
    - <% } else if ((!editable || hint) && resolved) { %> -
    + <% } else if (!hint && (!editable || scope.viewmode) && resolved) { %> +
    <% } %>
    <% } %> diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 14469baa8..447514a32 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -447,6 +447,11 @@ define([ btns.each(function(idx, item){ arr.push($(item).data('bs.tooltip').tip()); }); + btns = $(view.el).find('.i-comment-resolved'); + btns.tooltip({title: me.textViewResolved, placement: 'cursor'}); + btns.each(function(idx, item){ + arr.push($(item).data('bs.tooltip').tip()); + }); view.tipsArray = arr; }; @@ -831,6 +836,7 @@ define([ mniAuthorDesc: 'Author Z to A', mniDateDesc: 'Newest', mniDateAsc: 'Oldest', - textClosePanel: 'Close comments' + textClosePanel: 'Close comments', + textViewResolved: 'You have not permission for reopen comment' }, Common.Views.Comments || {})) }); \ No newline at end of file diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 36c6f6ac3..58aa5d301 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -269,6 +269,11 @@ define([ btns.each(function (idx, item) { arr.push($(item).data('bs.tooltip').tip()); }); + btns = $(view.el).find('.i-comment-resolved'); + btns.tooltip({title: me.textViewResolved, placement: 'cursor'}); + btns.each(function (idx, item) { + arr.push($(item).data('bs.tooltip').tip()); + }); view.tipsArray = arr; this.autoHeightTextBox(); }; @@ -1246,6 +1251,7 @@ define([ textOpenAgain : "Open Again", textFollowMove : 'Follow Move', textMention : '+mention will provide access to the document and send an email', - textMentionNotify : '+mention will notify the user via email' + textMentionNotify : '+mention will notify the user via email', + textViewResolved : 'You have not permission for reopen comment' }, Common.Views.ReviewPopover || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d4c486749..7d178ffce 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -257,6 +257,7 @@ "Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolved": "Resolved", "Common.Views.Comments.textSort": "Sort comments", + "Common.Views.Comments.textViewResolved": "You have not permission for reopen comment", "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again", "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.

    To copy or paste to or from applications outside the editor tab use the following keyboard combinations:", "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions", @@ -431,6 +432,7 @@ "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", + "Common.Views.ReviewPopover.textViewResolved": "You have not permission for reopen comment", "Common.Views.SaveAsDlg.textLoading": "Loading", "Common.Views.SaveAsDlg.textTitle": "Folder for save", "Common.Views.SelectFileDlg.textLoading": "Loading", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 716f411b2..8af78e0a2 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -150,6 +150,7 @@ "Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolved": "Resolved", "Common.Views.Comments.textSort": "Sort comments", + "Common.Views.Comments.textViewResolved": "You have not permission for reopen comment", "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again", "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.

    To copy or paste to or from applications outside the editor tab use the following keyboard combinations:", "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions", @@ -314,6 +315,7 @@ "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", + "Common.Views.ReviewPopover.textViewResolved": "You have not permission for reopen comment", "Common.Views.SaveAsDlg.textLoading": "Loading", "Common.Views.SaveAsDlg.textTitle": "Folder for save", "Common.Views.SelectFileDlg.textLoading": "Loading", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index abd46c0dd..e17f9da01 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -199,6 +199,7 @@ "Common.Views.Comments.textResolve": "Resolve", "Common.Views.Comments.textResolved": "Resolved", "Common.Views.Comments.textSort": "Sort comments", + "Common.Views.Comments.textViewResolved": "You have not permission for reopen comment", "Common.Views.CopyWarningDialog.textDontShow": "Don't show this message again", "Common.Views.CopyWarningDialog.textMsg": "Copy, cut and paste actions using the editor toolbar buttons and context menu actions will be performed within this editor tab only.

    To copy or paste to or from applications outside the editor tab use the following keyboard combinations:", "Common.Views.CopyWarningDialog.textTitle": "Copy, Cut and Paste Actions", @@ -366,6 +367,7 @@ "Common.Views.ReviewPopover.textOpenAgain": "Open Again", "Common.Views.ReviewPopover.textReply": "Reply", "Common.Views.ReviewPopover.textResolve": "Resolve", + "Common.Views.ReviewPopover.textViewResolved": "You have not permission for reopen comment", "Common.Views.SaveAsDlg.textLoading": "Loading", "Common.Views.SaveAsDlg.textTitle": "Folder for save", "Common.Views.SelectFileDlg.textLoading": "Loading", From 605c204bee19e8c50a980b3d74c16505ccd4766b Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 3 Sep 2021 16:37:48 +0300 Subject: [PATCH 093/129] [DE SSE mobile] Fix Bug 52338, Fix Bug 52336 --- .../mobile/src/controller/settings/Download.jsx | 6 +++--- .../mobile/src/controller/settings/Download.jsx | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/settings/Download.jsx b/apps/documenteditor/mobile/src/controller/settings/Download.jsx index 27c6678ee..88c2a7fb3 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Download.jsx @@ -25,6 +25,7 @@ class DownloadController extends Component { const _t = t("Settings", { returnObjects: true }); if(format) { + this.closeModal(); if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) { f7.dialog.create({ title: _t.notcriticalErrorTitle, @@ -37,8 +38,8 @@ class DownloadController extends Component { text: _t.textOk, onClick: () => { if (format == Asc.c_oAscFileType.TXT) { - const isDocReady = this.props.storeAppOptions.isDocReady; - onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady); + const advOptions = api.asc_getAdvancedOptions(); + Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.TXT, advOptions, 2, new Asc.asc_CDownloadOptions(format)); } else { setTimeout(() => { @@ -51,7 +52,6 @@ class DownloadController extends Component { }).open(); } else { - this.closeModal(); setTimeout(() => { api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); }, 400); diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx index 2d10d41f8..5bd3dbf81 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx @@ -25,6 +25,7 @@ class DownloadController extends Component { const _t = t("View.Settings", {returnObjects: true}); if (format) { + this.closeModal(); if (format == Asc.c_oAscFileType.CSV) { f7.dialog.create({ title: _t.notcriticalErrorTitle, @@ -36,13 +37,14 @@ class DownloadController extends Component { { text: _t.textOk, onClick: () => { - onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true); + const advOptions = api.asc_getAdvancedOptions(); + Common.Notifications.trigger('openEncoding', Asc.c_oAscAdvancedOptionsID.CSV, advOptions, 2, new Asc.asc_CDownloadOptions(format)) + // onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, true); } } ] }).open(); } else { - this.closeModal(); api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); } } From 5887cb5077ac362ba375b018ea8c7a23a2189d70 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 3 Sep 2021 17:14:08 +0300 Subject: [PATCH 094/129] [DE PE mobile] Fix Bug 52348 --- apps/documenteditor/mobile/src/view/edit/EditText.jsx | 4 ++-- apps/presentationeditor/mobile/src/view/edit/EditText.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index a00626bd1..b07f4eb7d 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -520,10 +520,10 @@ const EditText = props => { previewList = ''; break; case 0: - previewList = 'Bullets'; + previewList = t('Edit.textBullets'); break; case 1: - previewList = 'Numbers'; + previewList = t('Edit.textNumbers'); break; } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index 45b503bd6..d6c4084d9 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -34,10 +34,10 @@ const EditText = props => { previewList = ''; break; case 0: - previewList = 'Bullets'; + previewList = t('View.Edit.textBullets'); break; case 1: - previewList = 'Numbers'; + previewList = t('View.Edit.textNumbers'); break; } From ac851c39518d69aebb97fc7c98efa3364ea0ed1a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Sep 2021 17:38:49 +0300 Subject: [PATCH 095/129] [DE] Fix Bug 52172 --- apps/common/main/lib/view/ReviewChanges.js | 18 ++++++++++-------- apps/documenteditor/main/locale/en.json | 10 ++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 2dbbb9511..0ca680301 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -314,7 +314,7 @@ define([ checked: true, value: 'markup', template: menuTemplate, - description: this.txtMarkup + description: Common.Utils.String.format(this.txtMarkup, !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit ? '' : '(' + this.txtEditing + ')') }, { caption: this.txtMarkupSimpleCap, @@ -323,7 +323,7 @@ define([ checked: false, value: 'simple', template: menuTemplate, - description: this.txtMarkupSimple + description: Common.Utils.String.format(this.txtMarkupSimple, !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit ? '' : '(' + this.txtEditing + ')') }, { caption: this.txtFinalCap, @@ -331,7 +331,7 @@ define([ toggleGroup: 'menuReviewView', checked: false, template: menuTemplate, - description: this.txtFinal, + description: Common.Utils.String.format(this.txtFinal, !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit ? '' : '(' + this.txtPreview + ')'), value: 'final' }, { @@ -340,7 +340,7 @@ define([ toggleGroup: 'menuReviewView', checked: false, template: menuTemplate, - description: this.txtOriginal, + description: Common.Utils.String.format(this.txtOriginal, !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit ? '' : '(' + this.txtPreview + ')'), value: 'original' } ] @@ -862,9 +862,9 @@ define([ txtAcceptChanges: 'Accept Changes', txtRejectChanges: 'Reject Changes', txtView: 'Display Mode', - txtMarkup: 'Text with changes (Editing)', - txtFinal: 'All changes like accept (Preview)', - txtOriginal: 'Text without changes (Preview)', + txtMarkup: 'Text with changes {0}', + txtFinal: 'All changes like accept {0}', + txtOriginal: 'Text without changes {0}', tipReviewView: 'Select the way you want the changes to be displayed', tipAcceptCurrent: 'Accept current changes', tipRejectCurrent: 'Reject current changes', @@ -910,7 +910,9 @@ define([ textWarnTrackChanges: 'Track Changes will be switched ON for all users with full access. The next time anyone opens the doc, Track Changes will remain enabled.', textEnable: 'Enable', txtMarkupSimpleCap: 'Simple Markup', - txtMarkupSimple: 'All changes (Editing)
    Turn off balloons' + txtMarkupSimple: 'All changes {0}
    Turn off balloons', + txtEditing: 'Editing', + txtPreview: 'Preview' } }()), Common.Views.ReviewChanges || {})); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 1a50ea0b2..aa52f44fa 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -386,19 +386,19 @@ "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Resolve My Current Comments", "Common.Views.ReviewChanges.txtCompare": "Compare", "Common.Views.ReviewChanges.txtDocLang": "Language", - "Common.Views.ReviewChanges.txtFinal": "All changes accepted (Preview)", + "Common.Views.ReviewChanges.txtFinal": "All changes accepted {0}", "Common.Views.ReviewChanges.txtFinalCap": "Final", "Common.Views.ReviewChanges.txtHistory": "Version History", - "Common.Views.ReviewChanges.txtMarkup": "All changes (Editing)", + "Common.Views.ReviewChanges.txtMarkup": "All changes {0}", "Common.Views.ReviewChanges.txtMarkupCap": "Markup and balloons", - "Common.Views.ReviewChanges.txtMarkupSimple": "All changes (Editing)
    No balloons", + "Common.Views.ReviewChanges.txtMarkupSimple": "All changes {0}
    No balloons", "Common.Views.ReviewChanges.txtMarkupSimpleCap": "Only markup", "Common.Views.ReviewChanges.txtNext": "Next", "Common.Views.ReviewChanges.txtOff": "OFF for me", "Common.Views.ReviewChanges.txtOffGlobal": "OFF for me and everyone", "Common.Views.ReviewChanges.txtOn": "ON for me", "Common.Views.ReviewChanges.txtOnGlobal": "ON for me and everyone", - "Common.Views.ReviewChanges.txtOriginal": "All changes rejected (Preview)", + "Common.Views.ReviewChanges.txtOriginal": "All changes rejected {0}", "Common.Views.ReviewChanges.txtOriginalCap": "Original", "Common.Views.ReviewChanges.txtPrev": "Previous", "Common.Views.ReviewChanges.txtReject": "Reject", @@ -409,6 +409,8 @@ "Common.Views.ReviewChanges.txtSpelling": "Spell Checking", "Common.Views.ReviewChanges.txtTurnon": "Track Changes", "Common.Views.ReviewChanges.txtView": "Display Mode", + "Common.Views.ReviewChanges.txtEditing": "Editing", + "Common.Views.ReviewChanges.txtPreview": "Preview", "Common.Views.ReviewChangesDialog.textTitle": "Review Changes", "Common.Views.ReviewChangesDialog.txtAccept": "Accept", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Accept All Changes", From b1f5dac8abc906553e7bcb352f9766918bf68273 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 3 Sep 2021 18:14:41 +0300 Subject: [PATCH 096/129] [DE] Fix context menu for view form mode (for bug 50062) --- .../main/app/view/DocumentHolder.js | 78 +++++++++---------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 5c8127202..bd164dc94 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -223,22 +223,7 @@ define([ var showObjectMenu = function(event, docElement, eOpts){ if (me.api){ - var obj; - if (me.mode.isEdit && !me._isDisabled) { - obj = fillMenuProps(me.api.getSelectedElements()); - } else if (me._fillFormwMode) { - var para = false, - elements = me.api.getSelectedElements(); - for (var i = 0; i < elements.length; i++) { - var elType = elements[i].get_ObjectType(); - if (Asc.c_oAscTypeSelectElement.Paragraph == elType) { - para = true; - } - } - obj = para ? fillMenuProps(elements) : fillViewMenuProps(elements); - } else { - obj = fillViewMenuProps(me.api.getSelectedElements()); - } + var obj = (me.mode.isEdit && !me._isDisabled) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements()); if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts); } }; @@ -1604,6 +1589,7 @@ define([ : Common.util.Shortcuts.resumeEvents(hkComments); /** coauthoring end **/ this.editorConfig = {user: m.user}; + this._fillFormwMode = !this.mode.isEdit && this.mode.canFillForms; }; me.on('render:after', onAfterRender, me); @@ -1995,6 +1981,18 @@ define([ value: 'copy' }).on('click', _.bind(me.onCutCopyPaste, me)); + var menuViewPaste = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-paste', + caption : me.textPaste, + value : 'paste' + }).on('click', _.bind(me.onCutCopyPaste, me)); + + var menuViewCut = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-cut', + caption : me.textCut, + value : 'cut' + }).on('click', _.bind(me.onCutCopyPaste, me)); + var menuViewUndo = new Common.UI.MenuItem({ iconCls: 'menu__icon btn-undo', caption: me.textUndo @@ -2032,7 +2030,8 @@ define([ isInSign = !!signProps && me._canProtect, control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() || !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false, - canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled && !control_lock; + canComment = !isInChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled && !control_lock, + canEditControl = false; if (me.mode.compatibleFeatures) canComment = canComment && !isInShape; @@ -2041,6 +2040,8 @@ define([ spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None; canComment = canComment && !(spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime); + + canEditControl = spectype !== undefined && spectype === Asc.c_oAscContentControlSpecificType.None && !control_lock; } menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); @@ -2064,13 +2065,21 @@ define([ menuViewAddComment.setVisible(canComment); menuViewAddComment.setDisabled(value.paraProps && value.paraProps.locked === true); + var disabled = value.paraProps && value.paraProps.locked === true; var cancopy = me.api && me.api.can_CopyCut(); menuViewCopy.setDisabled(!cancopy); + menuViewCut.setVisible(me._fillFormwMode && canEditControl); + menuViewCut.setDisabled(disabled || !cancopy); + menuViewPaste.setVisible(me._fillFormwMode && canEditControl); + menuViewPaste.setDisabled(disabled); menuViewPrint.setVisible(me.mode.canPrint); menuViewPrint.setDisabled(!cancopy); + }, items: [ + menuViewCut, menuViewCopy, + menuViewPaste, menuViewUndo, menuViewPrint, menuViewCopySeparator, @@ -3738,10 +3747,6 @@ define([ value: 'remove' }).on('click', _.bind(me.onControlsSelect, me)); - var menuParaCopyPasteSeparator = new Common.UI.MenuItem({ - caption : '--' - }); - var menuParaControlSettings = new Common.UI.MenuItem( { caption: me.textEditControls, @@ -3866,10 +3871,9 @@ define([ me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270); } menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart); - menuParagraphAdvanced.setVisible(!me._fillFormwMode); - menuParagraphBreakBefore.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation); - menuParagraphKeepLines.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation); - if (value.paraProps && !me._fillFormwMode) { + menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation); + menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation); + if (value.paraProps) { menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore()); menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines()); } @@ -3917,17 +3921,13 @@ define([ var cancopy = me.api && me.api.can_CopyCut(); menuParaCopy.setDisabled(!cancopy); - menuParaCut.setVisible(true); menuParaCut.setDisabled(disabled || !cancopy); - menuParaPaste.setVisible(true); menuParaPaste.setDisabled(disabled); menuParaPrint.setVisible(me.mode.canPrint); menuParaPrint.setDisabled(!cancopy); - menuParaCopyPasteSeparator.setVisible(!me._fillFormwMode); - // spellCheck - var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && !me._fillFormwMode); + var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); me.menuSpellPara.setVisible(spell); menuSpellcheckParaSeparator.setVisible(spell); menuIgnoreSpellPara.setVisible(spell); @@ -3965,9 +3965,9 @@ define([ if (frame_pr) menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin'); - menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode); - menuStyle.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode); - if (me.mode.canEditStyles && !isInChart && !me._fillFormwMode) { + menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart); + menuStyle.setVisible(me.mode.canEditStyles && !isInChart); + if (me.mode.canEditStyles && !isInChart) { me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName)); } @@ -3978,9 +3978,9 @@ define([ in_control = !in_toc && me.api.asc_IsContentControl(), control_props = in_control ? me.api.asc_GetContentControlProperties() : null, is_form = control_props && control_props.get_FormPr(); - menuParaRemoveControl.setVisible(in_control && !me._fillFormwMode); - menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form && !me._fillFormwMode); - menuParaControlSeparator.setVisible(in_control && !me._fillFormwMode); + menuParaRemoveControl.setVisible(in_control); + menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form); + menuParaControlSeparator.setVisible(in_control); if (in_control) { var lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; menuParaRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); @@ -3990,10 +3990,6 @@ define([ control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime; - if (me._fillFormwMode && spectype !== Asc.c_oAscContentControlSpecificType.None) { - menuParaCut.setVisible(false); - menuParaPaste.setVisible(false); - } } menuParaTOCSettings.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc); @@ -4049,7 +4045,7 @@ define([ menuParaPrint, menuEquationInsertCaptionSeparator, menuEquationInsertCaption, - menuParaCopyPasteSeparator, + { caption: '--' }, menuEquationSeparator, menuParaRemoveControl, menuParaControlSettings, From 9fa4a32813977a293a76ed000f6925e78643acb8 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 6 Sep 2021 14:27:45 +0300 Subject: [PATCH 097/129] [PE] Fix bug 43440 --- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e120004d1..4116f3794 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3526,6 +3526,8 @@ define([ menuImgCut.setDisabled(disabled); menuImgPaste.setDisabled(disabled); + menuImgShapeArrange.setDisabled(disabled); + menuAddToLayoutImg.setDisabled(disabled); }, items: [ menuImgCut, From d04a355b35e5929b035ce8dc9c5437db9972352e Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 6 Sep 2021 14:59:03 +0300 Subject: [PATCH 098/129] [SSE mobile] Fix bug 52279 --- apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx index c2d4bbab9..51d75b610 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -180,7 +180,7 @@ const Statusbar = inject('sheets', 'storeAppOptions', 'users')(observer(props => if (index == api.asc_getActiveWorksheetIndex()) { if (!opened) { - if (isEdit && !isDisconnected) { + if (isEdit && !isDisconnected && !model.locked) { api.asc_closeCellEditor(); f7.popover.open('#idx-tab-context-menu-popover', target); } From b1bbf0877e42c0b730765dfc024bb10eb5225392 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 6 Sep 2021 19:01:04 +0300 Subject: [PATCH 099/129] [all] mark unused icons in sprite --- .../img/controls/common-controls.png | Bin 13240 -> 14158 bytes .../img/controls/common-controls@2x.png | Bin 24809 -> 29458 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png index a6e1609b619ebb030c9448e4fcf3843dec7044b7..f4b2fbe04379d3f9ddb2cb47a61d35753a406628 100755 GIT binary patch literal 14158 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⪙8!(x#_ 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 Gg8x6W(f7gt diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index 3275a09a82f5e878c24d2d6f8adea69f3e02b592..22c271fd0e68995b531160f7105ab896c64faa54 100755 GIT binary patch literal 29458 zcmaI81ymec(=Lola3?UpU_pZVA-D&3cefA-65QS0{Wdx8 z``vTzUH{KoEM~g*u3cSSz3Zu`stHz7ki>dM_6!aV4og}}LIwES2M32>frbKnvLV2E zI)G#*CNBmDR~~_JXM_xVN4JyGa)5)wz<>IMAD#EU0}eiSe5>jB-u9!Ti;?{YI6EVA z8%H*q4~}3iHV!sU{y!5Hrf_if5z-Q3s;>I`UKmZpYV{B5N=i*uY)qv1j5c`3U-H18 zlL`$#seVc%PNu1@pv^z;b>Na}aFtc%V@_D6k6XpUur;rzfBBwO6+0?AIw8|26TzNf z<5A?a+43SW!DS=qme=F({La;TFQNKlv*pKyO`S=t!V;+_Z?)2g-9VR=riZKMk_Edv zhJ$H4&szGk$Ha*6$F6rbiwM_;+#qM1l@&7GfqqibDr_sh;#mR+#1j!yyZ%_6jrTI_&nteU@J#!@opcB`ztyxxETo6(#Bzjspx;JzMZNy$ zq^&7^)XYJI^!BA3*sg3doZ`WSK2jgGnT^jlj4!+Jd}N8uo^JtW%rI%hf{W#fytK0t=gcyvQs=8%ga!AELfG4Hp zUQts!+fE;e)$2^Oy4}@$Y#q`zfOz^@CT;Lq$^CYBLTjQx?YQ1J-~%_emQVBXyQEmy zyWm2$hAm>dfw_93p;WKg3G*>Zsg4NI%X)_9yURRfo@?jT&QwKuzKPE!EqiF$gu+^X zAi1bJxW;&^=$PbAE+EsMucpZY;}t*T(AN^t39M97H$AS<%D4Ssh%bjNtiJZZBeE8{ z9QMuq$qJOOsQ$L){>3`@u3;74$|BlB(6Bo)48k1dv|=W-|dQ@FI>Ty zC%l3tAv;@k9%bMn6nW~eK*jW4abg3}*O1M{r`4oC<$>-|sPJybs9U$?gifJ!pJ3SM&Hl z#KYCpVBHs)BmLc+T;gyP%Qyirr1Sjr`3leZqBtO9?)72|q9j=5mgbplLx07_Z=5yD z#oJW*pQnU4y?Ep)?^wA%(L$$R)hmPANPMnklS~U!ZKshp9~}Og9%8h<+r3iyD8Vr5 z*55|Ok5Io9WZA{{7COte4}$tqVePQ?6uvv`diO7vLq}erI7M4w4}S=ujYJO=qU&Mu z?`+hX<%ar_e{qUgRsT>+e@ANdFK?555y@zc(+&9a23q!Vx(2YoQC5~fV^?``XSi`w z-k({Te|b(cx<82SBv6qG^U$W+a%v}NZL!lM)o&(&ftOiX)1>nqFON zKndfb^mc6)egPH?>wCC=TtQpI=?%wST^k&{b+Sh{9bj<5TYXEP3ZIIcimp%jokaEK z0t44@FJ20)Oui|=KzSo839bd*b8{*z%#CJc$%2z^Q503a%8YCF{&mnrZ+L{S_xR{Y zejlPM{f}Ew^q0}H)rGaF4wn5#8;{VuZp9I`C#U2B}_teqngmvaBe*b3S9qsbLOYfN8rI1-wxuH7lA*(Z+DI z?0bNqv`#IKksakn{}4KPA`Hl^I69Jb^cxPda2@bwa_3*^Z-ip#QxE!B-KIapGxaJZ z_m+0T9QD+#s4u#0rdeJ0t0xzr57(Qb=+XPnv)+Xzwtc(@E_hA~b=V^Z>9ck4j@HChVi#{W6*@Q5d>-)iK;UUn7Dv2xuK6ao z9?@6`2b&67PlkRjy6N&8Y&+nNaXDvgYPn@-txV|HI`Q}RGo)E@^YC13Xe@s&H-K80 zCrYWX>DC>6d;a>P5IQp~?>9L@)W>w(HnawOw09F2Vv8*{FvDsQc)<8ksnQeJD^A#U z?Vpijy`J}Y*C32^XCQrcuwo-M|B(ns&dZIFeJ_T5W@nz>q-mw@Y*dy4>I9*}AQahg^Vhx$x*UjGPL?#Q0@1WXOd+a{0i%l~ z01z^&^d!VS6CX7wjwr`fI{)3s@ktwaY28mOG8r*!w06PWQm{kqpNBsX18E3H#weXG ze1NTS@3{4T-&TW0_eo^bj|}XUBu9E&&qB7R3-ZtiM(mntQfVTr(%@+yK&0PdH?YU= z=Wp9g^$0h~b{OU{7F7Z_oXXNfb-}B+^A_+id-0HjSMB2#S!5!89#_cb)50sPWdXbq zXJARtG0c_N^~Kqd1ZtFi%K@F((6SR4Ej}G~X{73n6&pzU+x?CwApS`~JRg(mG~-ij z+eb1V1Es)|Z%rj_`YQ7dCy2ULa626t=86d=oSYgMWb;Irb%NN--G$!!?T=-d!DE7#ec_#d3r%E{xsyZ5Nsv)fD4sP!MzK1k?aO5QwgMTc(kLk9NTk zyOOI?0q&i(v>tCzr3W^A|9&hio$!S+@RY64O8eb6(QXJJTt7rrcJWDX z&$8x&gL^qZgmEeOtC#j4w4Itd(?m3B=3XEK+u6sI6xb&A)*& z1gx67hihg<_dAsp?M*PEzhSoP$donuL744(q<>=nlWkg&(U2e%!WNUZslr-$Dojvc zY2JbIL;Cdj3`BOEUl{-By!ZwQp$ku1Us$VU&^~X3tsBEc6$s3kGU2IYGpncMv`+(E84aljvdNN z()m0W7~X9v55~!Ige`S4F;Sj?<%PI7^7!{^(ACVBvQ4nB!)PNt!ml&8enIQJdOt#a zug=tQY6HY-bhLF$xY%2N2L@yn&qh>TFFJ)YdgLA+hpFymkMZs7iQ+1h7W%!py+ zF@9kq`;v2t{}0zOPpznA@xJ5&6&(qe<|ZQyH0m?`er@A)tyJ7Ug%X4$`o;bBS6H__x z!LY|(&Xn3-or7rrY8RApWBBu>#S9SrHxzT+`o((sMCuM3j$0yV^_uN|3Flj0I*u1P zUMFZ>bR5iOw{CbGix(+RzM>p6E--m!+3>jS_vOByHgY>zwErEETxsk2033O?3LPH)Gd(VR|yX>Z^w;%7*C#FV&Ldavm8 zQMMjzi5f-h^!nDX%J*LEq%FUaIHhhg5@$gj;kn~PXy&QpvS`EpE`A?xi(4h}f}^Na z`LtYAj-S+!(FLkG^{t;N`dvlLYUYgTxyUtDLCA-5LF=52KO=6Vn7?gmx`N|{n7j3` zXOqL^eB)7n1gwER`a}`~_lCHwlrLG;Wd`2tVH{8DH`I1}2$W#vvr8P$x3E_cL8`cV zQY1qNJbhSnn}C(7+U~`ojo12f4+q1n(<&)%i#I7?d;C|32Cjrd0{1HMkYUQGmFsCo z(UYEOIV4~nn(MV8F5TuQqbJLF=Rub4(g{&yR_a){AHdRWKt{=05eo<$%hlmdHxEy%RX z#o#RqWI$`&(xSY=LL*|?@uh;&kq)jD(*I=IA7D~LrJ;0EAbsk5 z0ITpoCYkwD3XAc26hV(Aw2^eeT91>KzOvv);cFRAeI&Ms*_U7AQQZM6GyQ5|jCAWz z$pRzc(qZea%1Z(gN3%v3g4nP*tQ9A28yhA&ZcdONS$abI)}b@>n(@5AMG71WuHjma zoo%-`CZFx@e3Y@;y(q8a+R}4$KkW(*H6Y{JBeMGXKI}K8!>`3Os#j}jfM|x}m2v#& zAjCf&74BX)X~xOmRQHimD`iISDhEkUeYtnU!8WsHPOk`HbVR6pSL8m3- zF0e|H+^TOMjGK_Ys?LvElh-KxAVwprwPTF%d%N-d(fuc$)U97_5cIR_`X;;m{I3|q zcR|Pa_HNZ*8vhEdhGbr-2S9Vhc?4;mJB^GPgMwXf1m~SzyHNQ2AZ2IzyTg9oS<;ue z^-B+D>mJuC#$K4%N39lX>Ox6bs6m}!1Y%46ELdoWT0jHj{QM%7HZp6-P3$Y}asET6 zwGpGf_s?$QCN4~JhKxY7%L-L-mW8yeiHmN1R(8t@QM6h?{K1y+x*Ntj zx3aa6LRI)7RI-5$D+fLNUmLqCLa;2re1u}#fA4Bm#|I`gA0MC$xUb>WLdsq zH-ysK^8=apzk(Gyan*Day;~e zX#6riasrM2q_Q@;BPV;5Jmn2q{EB_~Nbq_&X#WaUrU?BF`x&n-6embZTnkRldcqtq zOh+<*y1k*a#(mrT@?S&^djh0lum0qff+DedLD537GMc&9EzJ@O>G-kLm`CXmwrE zZD}|i%MU~wV@_`*F)o9Sq{e2;*Wfx5dj2c+R1cxvb}PT7j{j8Hn-v8mZXJTm(4YJ% znFW?UQZkgK@hr?1)hu-zzb|Gnd0QqIZ6)DomGjeXU*mm7(19L3uH$WHl^wdcQJF{n zNU^-46?+91LZWjJ%#Rhwj^AM7GQ&W2D=6xIzBlgikRonND^6+ijc$v@5Yj4Y!Vw7S z2!{s3w)59@$N2^sJbXV{5H3c>C)iQ~D_#TLDYzBoKZGKPre3|NeDVKEpb)UEs5gv!y|&_=g(YVpgD8>yrmVuv8Cbe|fV2NXOaRl- zMX#~|N?knJe8XCON24pz@d*TZ+lV3KKQp}DkW{3|k$}C-ncs>t^T z1!1euI3KlWB0WsjsrkPPu;O|R&hx2G#%qJYFIbqPimrJ@U&6hg;f87odrV|r%8a08 zUtGx2Ms_r~iFqlgk5OHl!(TDV5cKs#nRM-9WR49Mrc;)kon$HLmHyW-WH7?lN_ly| z`x6}mMPC|TSj9v1Q@FI6T1a_t2$}OxS)1<|RVP{U{z+)#CBSdxxt0HHnx@=(d27QF ze;h`#@6A5#-VFsm5k^5DUWrv#ZD0^E2za{h{ON1T^zliW*gq>A{$qN7-a~FZ+RP*4 z*ulhhRh$)GF+?ixr{S`o&=}f2S1(ObW&eoj)I52d^$K=xkCvU+9};44wO|G6t7 zBlZoFKfy6TUs^{Ozu3_0x(=bDbe>YNn~kLAp~`9UWx*D*s~$2##j-CRAeT5t%$?W> zV~x!G(a5rJeANnqIf{PkhBt)r?IYj!)*cd;vVV4cVXX%)P64*b$oGV!F*)ysTm+L( z`e?L5ox&%J9X@zF+@^E`mcDO~#gp3oC(a#Q?x2Xy#ryYYME!4!e8klGiRtR zEN){TpCrxMF{IS(vT1CTpTinZ(pHT5?=#i8m8oR;5sdQQrT&2nd-LQrPh^~h_2X|v zA*1H20RwG-H0Bu*!_A3VYEO7wESal#dF+WVm?uEtuMjd8^qx>7&20m52_TNG3KYWs zCcQ(Vn3PR277nfnbyx^%&3iaotSmBhCuT%Y-!X3~h9j0@bfl!sJj*}&1aGm(+~e<+ z8E3@80Dgb6iA0wA(Bhj2Cv=2h5TV?oLP2nl9@nb%3v*mzVchQ;RQ!94UZ#Kf*I$CZ zA1QisG%NjKeTjL`rtN9kkx}f6$j66`uy8&*J>~s~vK+~A#BciEgax}q|0Hj%ra%TR zZJ*@4GXG8XuzzNue?IbVv(R=18bXN5>3D2$?wb=&6|m#}AA+7e19DWqk^58WPPv?raUo=uT-Kfi2UzuOlZTz6LnWyD+ff3 zn?QA-%br?u!$^>jA`3~Br^(hi8%$`HL-T7qXMEwcItogHFZq5#sObgg!Js`c_H`2} zyEq$;MJzdK_8Suu6I;ITy~`@l5o(4;q*pE-T%7vvxK=p&NVGI+)z5_b=p(ny?j*j( z!^>CyOeal;CaE0)K=J^Hiqh|?@K$rEPZA~lJlB85-9Mh?ih7y#N7J`bx4fO}=vr(Q zBVDmO`!zDLzlwS|ZI(uHeRuj>@ypAbNBqdg)URcU4~!>#(kty<@7ZtSWI?;mQ-cDI zCk9=0=-2vFe3B|l?V^`+4)SYA#;q;!L7|pcCx1TeUM#w8rZh7RGR4;Ll~5lQ)_q}T zCywj!s4!>R^sz3H1>!XB!@vbeirGYSY^PY-?EQ|=UcZUkR6phWxIQ! zm25yS(2<@^J3<><`h&=v*{+%;TIp!Mo-Hy#@1tfT=s1d$7a@LAIR)WrT}Za-8@qvx z^>oDt0^uvoHtsrNb8s;qd;gT}j+AvszGKS%p00KmO^NawF>UDH=4Y8;eEsu|pY#n7 zgVYg#{S>n*+4?Oc}lEE2%lm&XlZ5R`U_)wT7H$#0?Ole4sje%NWbcnbziL`v7 zj(}3Kx(tyHYYB?*M9V1htGr2k9kBTCLaT%45SgrP@9c!^yl@O}{tH?8lYwpIQKjv- zZqnBCB4m?L_D@qb%%*~11bDh3V>Fk#Ke1l12gcEFU!X@QpqV!I61so6fw{|4d>Y%Je*q!2cfepQYN^3^;p1Iz z`0Z%v2IYl=9>~&V-bAnqK3rt?AWYQ5YRW^@$7<>%O_b-(JH!X8q`f*>jyfH6I*l?@ zuey({pa7oSYA6u6PBP%-JFmgqzIhru)|IsKPPYZV`ccKkygJ#V)6 zHLLBWKO<|D^HW{Xf4tc(PQMR9^~M2kyKeJ9)tQn+qLiQvH#^DQLoI5!Kdr0+_QP@V zy)J^Aw}c;U)qPp_$JYU=t=f3AI99vk1Jj?|-WJjK>|WgP*(86EPr&b! zAIsIjeVolrZ3x->b#|n?5zoagbp%^n6FrqY-ddDX2k10Zr?2=EV}{kx38D{aRKWS51YG8T3-^d(^h{{&`1zV5VzAK1+ zf+<&Mn|@;BEf)Nk%9Yb*s7$c39%+az=FXlwBtmay@n-F~Q~)92`t%XEG_-A9D~=J6 zt;4|S5^CTg0uclkF%xy2&pSJRIBQ9xFvk+82CBN#qKVY{Bq^PTinH(B9CrR#=Y5&N zurzSZ&{TsmsyPsrUp6YeeRFO;km}Kp>St8`OAVYix`lO^*L2>VQ6gtETRtS>bK)lI zf@HtKYkR3j65pqjXhAZr%*nz%zNCp8`C{}77SASP$8h9g!%5t}aY||l$t*nB8FNAq zPiW4$zuTF7t(fWk#E9Tgjo1e6W~)aBI#qE3NBhjhIy+!+xkS20G{$G5NZ7JS5-O%bLc$Qw4TwIqLc$d>gmZcWeN$AJOxoEsrA4&g3rc9P^-7j+8 zZqv0OV36>7^K&>ukf)XH>?2xJ==CtF1C)>H^cB_V*dlb+GfAd?G-_E|w{|<7ex$}eQj8H@ z$M2Jk5iw6|-Hz(164n|gm8B!?>X5Z6M0BdISHC&Jcb?*h-J@1UU_o-nb^<0HCN-K z!kuq4$)ZD;TCDlM0}lEwcUGqVa%mX)jXrvg^{j9%?mkJdXc>ggiX`z$~VKxg_) zuyl<9@)C#h*@z0R#3&`Y7I`5oOwYb7qY}QysMWpT;06c>bc7sdl}ZLoN^<;#<>7if zNekZ_LiZ_NY7&`Kn#p*$2NE8wvkha~Z{QP|YxE<84vjCFSy(AVgoE4DzQW&(49gACph?nQSJt^@)KkbmL3Sn*BA?Ipt@}>^y z^KY9RS8xv`R_ZL3HOQp1fru6H`KKz{)Kq=Pp52jGpJ*YEWqTac(C%D-8$S8Pdr7hi z6BE`_$(jo_)oUL7m9yEI{(<&)PyLEcV1p=o_o%3fkkU?n$mjv2b3RF3_nmc7q0JDz zwWCkC_AGl<67S&-QC-HV0)Y4GRzGo4ZteH0_`&|_CvDzs=E{wMlY0A*BgRREM>2V| zo)3T$li`R_R%f3`p&xNucis2mx+_x+W7x(*Z<`qk%~lHv(!AaX_0Lk+tY{sXKr=Ak zzl{7MQ(8QY3g(jOg?ck*7|U}no36miy32$|)BEsW+QmZ_=38S(6_pSBEnJ43-M20( zaU?#o%`3Ub^S@P=$C*yhhsFQ?QHTH?caox&E?=D3ujI3=6qUl;kN6Ra?TBtVUS?w~ zl;W;9Q4znbju=@b%lp+`(BD8IDb+^b^7hY}~Lzs@-{&lv|h9+Z3mheg>T^$q3?Lj;`Z3g)zC>Tp3|gICE6~ zLyN9JWm~w!f0@1mx7QR1#ox3+cNN#|@XF;}enXulg^TP^X=? ze|EjjKz&}fho#@NMu<<(psa>9wKTaTu2WkYPw5yO>Ui)@nh+mPqi*42whEms%&uxX%u6Q~Y z6S#MYEr*h4|5yZ*x1JXpJX~}U#6P;v)wRA`J{AAc6cR^x9!E48MrB)iK$(*m$oy@K zPU|>ops$e|*5q|WX)IL5(6l9-sYS=~pw1uf6mNse*%okaSswqT*_Yd4+f2k{ekNCu zk!r?_YIlTE7}WA6Jd@qI`T8rnw&vwU^Kz%g*z1JSV?1Mmx)y`hYAQ_7Cu`vYzR8=~ z!rSvoeIQ@&o)mDZPz36S+tBA9zUr^McK>=x@v_~e>${G*F zr852MKj{$*Ub>G%e3AS%z6?Sv@=X!YYJ2kZrSRgH;)w6xI$i;#eKl6w-=mLS&Quyd zI0`jzQ2jn`>AODH>p-Z#+BvUx+?H8mo*@2bLSr{D;Tr-hD=RELbd9Rl5&B_=_cgY? z9s!TI%Y&CAI)>>~e5#XPJVO|y<661V*;tJ&$o8;8Hpg9ZTwF~};{3Q1hFJUF-8pV_ zAWYb!r3Sj_#nLE6;ks04F`3tTv0E#EohH2Ty)}y>vsSD~Iwo-#C72G^KIqSUQ-P(r z7)d|st)ru`uBTRBNgLMA=~j6XnyiDWXEd8s@UqI?RE|vN&`7YI=y{- zz_x|G|8(o%c~_ZKWAZ3!;a`$t_Ui2_U*^1&m)lUX%Shz?)p2j_u7}UvT6Rp)X@9+= z0)>#K6`18=lB9KOMhD3w-0(0;^zowBwvznH_m<%X1(kD%+6l!UZ*mKgC`HaQm5d|w zev0=YBf?FBzGP%fX_Y#vK+_!cS@Vigo496^f3hqAYLM+1lmcnZ>q@`K%O|u_*zxuu z$+PBk_2_o|tD5aBnxA1bfj^#~xximE1hnN;Io*D*P=M|Q2Ra6?&XFR;O5ncJ&B}!V zp?|t`K}zxUI8cvxrW610{B0gBHqataaw_7Aj;mBlZ7Z15hhr<)86PMVWcC>~DE?D} zo25yb#>v1Hhu^6J6Z*6VgUqoKAi^d~%z>nm!&6n!l&`N?O(;mpv z?u&xW+9T*MOojQ7A5s;uptjWreI6BtmX)RPG-5G0=lvnLZ#QCyU{zS>Z3}tr2m9E2 zso$A>r_O9vWNi|6(6Ya$vR*ROo^cF1UXsn2Ma{I{MUP3+m#F1P5<(jye^6vH*03}< z0gUvc6jmv0B>p*;c!OqmQAzduujhW#J-<^uISoQPj+GCiB#eiXOm+)A6sv>Gl~ zT=wo#EhuVjK8D^4|L0$nBja=e{`3#bv7h-rU`}vXMr2JQa>ESmZy|ucPZzt`1}_PW z9~{}YnLTWwt%>@a=y59WVCs(`;e4a4(3^*woykQ1P*z%?6JqBbi>+Irs#irFcK_=e zrPB;8Dfa}j{fv3sDLh(Ij^M`LqZ5+-j?1Iu*BIn1R^gxQ{Ri{GQb64La#6pmpL8$Q zC;jTWVb~_ZFtLs;Qmaz)nYZe#z>#dc?mC+3Ry-yCs%e{MsKyw(YSP~-in5yD5yuL) z&Y8~xP!=4~)R+@6iq!$T%y-+{A?_1zyQe$~A6iL*ntJ&GpH*H|D3X4#~bBTD!M6rn$SC;m;%qFE| z%WlwGNTUMYDqRkfFs3oJb;N}5DQbQ9NF@UxNeqzltCV5D%FPg$z`PdL^K-ueB4PvT zsK|qx_x*b|ivi=3)QS8PA|lBs*VLoykT(EB1-8K&25y?bHg~$!|4Oa!8`ep2LSmW` z{8w|3DrO%H-;3q*d{))h+0V+Ww9pv}fy#sa4xoXQtP1>T<+ z{Q^Qmb))oBx9jS7RWR~(_rbXPX^^|{*u?`-2UZ0c_6TbYJXN(&UZSzW$>pbswQx&b zRvKJx9a|Fhj8H_Lnp9Ds;p5<5!E1n(Bm^;_IzXy7Kca3+e+7>yK1y&hVc=u1g+H=Q0|(N7S(7efIbe#eCQgHfuj~$ zm~TE@pKo@5xwZs>pb-hH7O2LFz7G{=ziw4Tx4z#OqKw z>)p$x&JLKH^cwEviP17-+<9-RJmJ^i%_du8(WqA#U!va|c(JL9Ja97~VP;TQqt?)3 z#6EM6YzNQ|yN=u27nM8AzBrpld6fS~Y=}eJ>vwzZv$s!l6@IVj4U8{TF$ZBDX<~Tv zzBtOS0HLE#6(rE%Ui-jx{oefxt@Ss8xG~$SFSL>OJr8N5y|Qc76Ik|Y77)@9kSdyL zKD-g5of5TD4vK$9pIAPGw_NV}`KcXtfiRG0V7+kX9dNsuMXl=?JDRy=;6s>RFT?5P z3+W?2>68OtpnG7>WQjc`|GTVuYo=2- zJn35_Mfn6?|DJ~^ZI4*0g&umonZGX`q9PWK-P-aEVSyATVlwwehdJa_%MGWk=<7)}|`+f(Z!IIUFM zVryyOm3Zuvq;I5-i1Tr2oRjuSZej^SlE2Ts>AC0vJ?~ZMqrb4#CCChbjd76)hMQ(I z#vO^J^5E4gt9-)-x6}QN9CAB!q%j4)Jm#&7(*z5Al%J*^nJ$xmh65Vv*6f1C z@r*!&5h#}7FCvXaql3|3D}DbBS!TaEtCu`|ZF#Kkv0SfypXz5LoYo&Q4oNthK-aL3 zL^~6a?ihYPB|dJLQi#5WBBG=HJ^#hD0yhkoqgwBj+ha#ibao}TQ4;=xeP*iB3N47v zSnqw{qIBkPFdt|>45d(+K+4>`qCkvY{z^3i%wQ)&Afm>2HtMg~je_L6c?tQQx^QtI z&y4x#;E0L~caQ`QSZBxoxfGC!`FjIQ)pz_m3W*vIdR_4`wvM5YOx3(2FhD%+g{LOp z)5r35nzl**mfzOrc7hcs4Q7op-GL&i7>Zawm#|VX(+0%Ykhp*O1=X!I6+~Z}J|{#y zsZQ;37hz>!^iwS7AncCNm=GN~mW;;j2m-j;k6fCH<_N)O8DC*ygOJZ{6)X)9cl$`h zueOn$CQagmZ_p-hd)^K6*%Ak7YCk89MWFlQ9>F&Ojl?jTZy4X&y?A?RQwiBP(n9n* zfgy4B(MINg*1$5gHrx#jUYw9A)=15)JQS3G&q&Z8lHg0bNIyQTQ!ovd0ye^S3A!m( z8aD?cl@xBJ5JEz?7|)91u6kDCEQwyzAkB7<85ZVGWPE?isWewI)M=n9I3-QCA*Ori zcxxP4rUj1DsN&#YB&0)|eCE<622!ooak+nus+IKUUEfTB5Y!4)2r1lhyiH7H_4@{g z-}Np6vL{Am7>RuW4_20&M6S60io1niM68{7lx44^YMzPV|JGQBfL)64)Cp#lJfZJs7_3aTGfuV@ zVkXxzh}TELut?mLs*a6|WE_+HBXZQAD$ZY5mY@_uC~uw#lQ{m$7Kt@^z$#GI#fWuo z0kooPjpc()V98z=k5+gjZhh#{d|Vs)z-stWX67`(;((5r_}$ui;N64b1;3nAKOE7# zCTaNbcOy;@humpSNUz*iN;@?^{389#=t-B`U(B`KtA>>j|3Y6`%4#eJ9X&INEqp&^ zM`9DpWXiM1;t+BBkuTS4keRi{e%{K*)P7H}79#B+6%~UT@>T~4OM_B^=ZbLmV z74P1X!<+@CWuByUI?E2wO5|#HxTN;{^%t-|m<(1$Z)I+^sm*9Ju(hSv6k>#Ro`>ZK z&>_3LqU1JdonMWIY;17-muUGz@{OzMi?ql8Ku^1zsesP6GpZ4fGDj4#5b}4;43-za z9QGZ)?}s+o*EqoF(87L1EfB*L^*I^yFxIl33tlJlJj;Ra%tQ1SI8QCIO?F6e(ASOQ z6i3S}lMXj-aGRwmE63trxQXyMT*B|WNqcv=GS0;PXO(N1s99J`Tl16#haZ9)_?*#d zK&g<{X0cogv=oTby}P0oOSS_g-%9@zlk?rIwv-Lqp78Z}_Dk{N@VbMG6up(HiI?6a zrI~+}B4!~PXBVd1MzEygY>AgLSQM`MZ-JO7mro6O*-^F}C|HkFah`W2tQn&9Ok$^B zt9ZL!nsOu{C%3XW95_F`!VV^A8=vvAH<{l>dno=>AFIC%E zC`e8)!?s~^2DVDVK5AM6JEW7fJCklcL;a@((SQXvB}p0^U28EF7rG0-=RiaryMc^= z=G>Htm>amnxX&OdT?*(}{JgMclETxNARE1}UcS;mqebDl={6T2CU|LoV!Zx?zghH( z%b3&g$3aG6t&ktHlVH52`38Ywqgb}cbBD2W!w-W&!dlq!wWVULQoxB?7b{}atL4&Y zd6n4jH9$*F4ufpg_62tkwn1&lJJz4+p(eAG+l{Ux2S+@kF+<%dUuS?@|DpEqJEutr zg|PdXJ9j4uP~}72#CG==J;rVt^$D1!;67vR+)iYD3p8X4Jp}Qk@_v6i7_EdikL}OBZ`?ZK`Rf>m?QNNbn|BM=v zB=cnE;qZ&69IL;P(-&yz^LG7qE-n(_AX=1M!M5^#r5XxLXcCu9wks3Kia(H!qa2EW zIVv>NoS{9be0`eAwvgZNQI@UMq)%rZ)3x0{8f?}UK}+bmymuB-b2@g7%s0`B)xO9V z$N{2dGcX}ApT;xsr5yb8lfd3^Huv$c7{ud4{<)PUx5(q#_1*e#yQ-iuW?OxfZCK5z z$uptwb6bfcp!SK`8#FLEC86!y^@_F#@P&zXU}f1DMU`Lg!2nYU-}%7Y6BT5pw12AG zq`E#gx1bc>;(NvXa3O#e*c!se+_E{-N0ZT;8M>bWU$GdO|d++;h~C4rv*13-san6$Ycxh4K1U#tzLLwG0?OxkRW}31bHiNGGQQt#m!;#!9v9WRp8225|`H zZ8;Gs`my?yis;7i2gz^Pe1>u55vG3^VC40c&9{!_3+e>vk{S`xh7O0S%&~kfj z>dw~%={tE<`tEZO#qr1s_(m`ztA@%UuwjySX6&JL$4(zvqG2Hoe1P{7d|G z)w*w`P~{ysaPK|3@@Kuz!;cn4t48@R;mei2;|J@_XFjT-uXHQ!g>tpIMH#TGp?8ck z>wr{r-mvSbG8M?+!qy9I+Nta4%+=nsyGng!TR3+`QNfuAKt#21oY5EDD~q~9xevQv zPHLmqYbbI9UW3^kS4bfqIhNZX+(0s3rSQ5*_5c{|iP(0(w4Bv>KJ(dnFj*!U^iu7x zN&(YxKw-2{1};Th5E0F)jA!k<;4Gp;u^#g2FMF&$OH+g!EJ|p$T5|a+EiXxFz7C580(vwaBxl6=2O?>!L zMK=1lKpYCJZ*c1k2bp`B_eDzn zp_|b2l*1;oTInIdLyBjGXwbDjqKR0hZ%(7qk5$-wOXU%Qj&+D#ix>R<)Zrnb=A#}L z_3WO@;=6?gdPcdzhHdhM8&&9zZ>|ajoNl%UJoccw80Y6MSH|>M5uXCLn8$N`kCObPgWp%L zvj)jnK$hzbz#-hxYkT=IT}i^v2?RwSd2WTVnyxQflq*0fiCSy`TKiL-YLVHpiI!w> z!to>VsD)bjN1{ZH;^kP)kHorR!)k`1krYwv-}hZ0OUsn|aic;))OdX7;K*)vs;6?( z^S2u+Z`$S5SqX`tb6J9(_}F{rclI}}!nrdA5cW|ym(sb=LlP<@My7L%_&1uQqi+&b zH0y^A2S+LNR%uquB{oS`aVSs?93~HPwFoY>=(k@s2aA61cs)`e!}H$(^b~?wo9k?1WJN7q#fg4?EWv*K zUl3K(f?P3p(zf}gc4j?tyeWdJZcgZnpSdRd%s)Rc5U>@gFRp6UUSz0U`&G%kiLwZG z-c&->hcdFwUN041kqL)QdukOT>KEAC{Lo7rcGH2gLlLC;+nr?hwa!!C3d-1)!Q#CS ziF;9k9t`(Tl3c*Gv+a}n$ME}G@`B8E?G5O`7+)7WI&~9EtqRuInC8bc+ngnXo`Qjg zJcp|^#r*u$kJD)?8ikHmg&IRv@8M{Ug5H$Z*FKx98=Lw`ZH;1wKEW6S9$SG+)Ci*}i+(IL|273>jIG zw}ggZw!tCML^QVFR(b&+hk<2)_e(tU^How5lwvrniMT|+Su3A5b;}hIjF*_tjO`*# zXl!h0+>43vo3T900tSBqZ~S~gDfC)gD0MBAmY$NZihD1QIm4mk)gjTD@3Bb7@1?pR z0razd((~o3a{hAOSF&2v>G3iS3AZb!3!0n^6WjgFh8_00fBRSuZRW)lp9PjOI>J+9 zSoo?b@Gl-1B%q|Eq^gEpMuz|MGfdXLD4HzMb@`jbR3h6+CDE1z6Y~|KqF(rX^#Hc6 z8Y#}7@q6tOS0z$P_PTc0>+y@#-uE{+ECwuSc}2zxa-cvs zb87kQK^{!Z5L6$tqAsJ?8<$qN_9<_`cgxIe*(7r5` z>D$jiW&5Ft6fQGdmJ3a8F0`0XnxO1o2<^{y8uVT#wShsb*hLAB?L}IZ8>bVxgI%N7 z{+6Z97ua3YsX8ClLlU1M$^LrcufP1S&b~9OsUTPsLg*4gXaW%;MS4*IDT)b2LhnVY zfPm6NmnOYPM>+_hNfo5`9;8U`f)tTnl`07O4&M9j`|huMzjyv5=VZ_9?C$K$?6eqU zD-avQ6%as(T21Df%?)RKNq_#Bt%<@VJ4aRq1QZV>ZDd3}K4qX4@WX~pUu9vjJxFaH z8(B&Qo+;XiG%CPhpFhK7qH21+@!h6oh2mi_6nD|=BD5qD)P4PxhdIv9)+aJeV%muC z(sCKbyWR&k49HzE%4zr3B=l13XakVwbo4N^oO;#Fwmjl)6Dp>@;KCMDTQ)y>`|1z7s{c9HVRn zI+qmOHL-_Gr2?ikN9cz^Wej@rpnB810;z5poM%p9A`hqX-qFNgL3qy=+n6xMI~7|O z1___L4k0VhrfOn8rQI9q5`v?p<;)|4n0I5Be9snMV~EnnCi5lZEJZ|}{h65KGxHLEKgWoY_yFyJ;f-PMdmp!wJlNi;LFmG_zNS1^ZQ>C6i|`)Ge2<062G3SKOk=! zx;FRIY@{8%G0_u^Mh|d72)$IweU(WR>aw&NJf=$C$G|grg$f7U%aItoyI>H4pCo1? z#)<%qh)d$tE7#qkW|N7)@y0!N-8m(CH=+lppldrnbLPPe#1K1VHjPk4I&9tFoW9f3 z3NehD5-bz~$~UxLPR4tfxc-P^;kQ{YOM3_TBTo=wcB@*5?p{ANM5SWq+km0Va+w4R z7*{Oo_QOeI1<$TG@NFfA;VvNvd4tC{mp@@tlPsJY+WCYJ+q)Md<;y%_FO8U8zLWo1 z;?dXAt{R$hHuJq28=PW>KFd(=Ey}NLzrrJ?+nGjc%EsPqx&3|onekYBCzeLkl(h?L z{mG5i&-Z<;^F~npm48=0OR5o(r~QWcYw}O`M@Ff~;T}JpK}fKagr_R%D~b0M$T1!$yZA zD6|4=?ydWGfk7Y9tCe(!K%}(SfO$@^J+v~tQl@)){`BULl#M3%MPW+k0>tkmdymrS z?BQ(j-;xKklFY}`OWTZf{O@hGlZbR~6_c%Ul&Ds9*9x!uOA~@NSuxSm1Ug_%%QB98 ziDHQ0suOdC4qr`^kMA-jWY*07xZp-pQ<%<8AczYIDsaq>^YMGf;l>3oi$A`{C4{VH zexvJu^Bcw~-(-tpodWQTd@<|Zm}B(-*_$6?!3Sb}fhMgE9$(5zn{BnDKcTvytO<0F z0us)YaZ>vxEs0hvJ!Qbi9b0k$LO$8;$N#3j)g4FQgx+Q7#`EfRmE3&9_N*&kYKb>m ztna*)Z7W(J!_7@4JW`0?!>Q^CWS^&S>Fg_eJ+s91;x_2RF@`V@5qg!5x<;p$|l@@U-*jjpC zSc1eeiWD|*4w^+s?UqD~z1Rquj~I1c$74WKzpRc%>o1irxHM6aupfN7`vr(32&yCX ze%`zt=z!Pc?j|oi;g@O>7jU zrQMl+cgsKNQ`m|XIt0!3p&Ic;ABsjJZ=`oZqD;@#b8s{y<8NAvgfq43QNp0RFBlNL zPuDQ{`u0Iw(l=h@M`F?mm#B=Azg4I|zI3`oXU3-O_LK(PADMjDSLM*YAoXr*WeUK+ zk|>hxbmQYiuQERCU0}FhMti6{P$7eK6~hV$=w6XV9v!tWFU5Gzg0Uz8I54&_?g^Uv z<)}d?#6DJs-8g}GCYY~CT`QoYQa+a1KH&K5+-EM}^Lqr;D9^Y(RgH+_^+E>L%9yj@i@~K12vW?k|e1c3d@e- z)4ZIVP17MKvu>ndOzqCJ(o*70?cR&4?ZP;yE;mZsGJCjG^t8PGab&rO9Y))j&h^4| zA!1Zw1MdNd&aJcOEc7`bXcw6*cAWkvu9 zT8}()x1}b2M*h7=KsV%F%Hh`F$2N~EnpVc7M6`v>!9_%-UCu|~P`xsR99+moz>?a` zb*Q$tf~cS#ZXU|90o}YCoV}*YwUI77aLnhA>N3+GlilBq^Fh|f1t!GAM3zSrste8d zON{C)Dl0h9e3zSqSwT2I-VuiQMMF5i-v=&=5n)7hZnT+vRaBP>xpxr2I9 z5Y}BwliZX7(aGgggb2o4jZJ;X1%tE?NPv;Z_zRDh?UzU5Z0kiL2|k)^-!p~EhX}f* z4UNHqGQ~A5e14zq2`FNG@=tGMaD&GP?^(yp#}A8#5d`J{QX6gD4xO z2LH$fW~1P#Rng$`xC~v`%J}L+*;hjj$@;Jeuryy)39T_=b9(9)=|Y>%wKC-|2YYz4 zxR8>JWJ^&MoCwSC_&R1;ugpQb#xW6~0PE1?09OP_fL`Uetc=9;2e5gpdF?4-WKXw@ zX6?fM@#&u`)?*XIkBaWyWMC=*KV7KI`|R*kF%I+nlUdGQ!Oflxt>R_-RPS5bl+`A? zjPrnTLM{w~ooS=t4Bzphzn`k#fW-5y6O!#3Ti6O>tTI?IMmYv~5^5%k_5pTH-P?kQ zt4Az>->|dD?-}r=DWNloBIYMi3(x)*-IErOsFAJkz1fsbS1yXl>}sdIxj!Mh{c=c9*j8`y7$Wp7dWkDyus!aIrg$R!lr zUuslvw@Nelt(l2%;3}$QHbz9!HQw^<0s}!UfV5A{|+!zhHd( z85~z@PCi`hgyZ*u2bb!`2q6ckvrw#n@30lZgF|t{&WTwaX3GDK7l?p&k#h}TpWV_e zpp-!^n{K*P21fAu(uLP?$*d$P(e(8PJ{fOSVmy&er4u}gcdfcRVKMRLwnBwLz;kb% z^aQ>l!_bp)(~>l8*bl)!G+99b_I@64h>i~4|aj+sOZMHS!?rMh_H4Z`LQ697_h zt9*y4Y5krm;{B3xJwhB5VBF0nv;|uiRg{r^V_QX~?}Gy~%jV7yIi*il822u4OF^S2 z?puJ#>JAhAw&>r5oNl%I6$YdfF7K|96|VLQdIx`SUbfJ%tCjs1R%ujNuM}_d5D;vf z7v#RB<@+k!Sz+<>6p8QE5Kl#7;)%sX$Ij$#BToUce8vZQ$!<@~jp33S&+Aob8ro=f zeOeqA#Gd;7{BU+TRQ!Dv`LK!E!vO7r)9Cr3jF=wRBcAwWJt=LjMbW^E5K6@On_4U2 zXbkIHzvaPBK}S%fr-OLuZ<920Ua`4kT5tVmE-#EX^JZz}ROINnu7bi#=R;P}QvnBT zoE^uXpM8W*j8`GB`?vN-B(H=zl6&3XgYePpTCVuPKq4(~8y{6*liPi>BqB+1$I^5g z7{kBj7M4{83bfV1no-7@3LUMRbrEUg;88i)ow%Ak0q50@&_>mYAb=H=jqlCR-Qj%_ zTAvbe^C@DtBS%M!ti?o)#TH-bCn(h>DtPz9q&@X-XZ3Y;R#GZ-Q;80`zC7i6R>R8< z&2%Q!?5;^bD!KBwL(rhTsp()#@c4U^gzNVwAq$3~R6l1-U;F+}7qR6NTzb8XpVDn7 zb*gU)7mQC99bhi5R|b9Ib^Xp9E(=3H(J4h25O2DvbF1RXFzwp9Ts|XvS)JzWAL;!Y z0Fv`8%H+=P3j|QS0}NulKJ>u?c4^zHr-HICS065{ue6@dWum6G8DrVP?u8&r{PaT( z#yB|Dx($3&m`Qxg6I=ajPo+_rvA;C;O5#?R-zX4*N{-FANVx*i9k1$|EP9jRi6o7p zgF*V195iCCbR4APT*l4+#4v&Uq$yXp5H11%V}nvY>$bQ*)sb?dxe<~}z0pr{RHM$p z${E|noSZV5#cf(!!V1~&rdSKlqTfzO>syv5QiT(L{8pK!iqIhHJn3yxRz*S|RZ}bPau#?_fJY(&cUOefw zpz*QD9#-)>`TVC@?MhR!%r3~E>|*2NubQd(qCcKXz9;lHSHIO>SB=O+BmT2nMFf#} zH*ZXP+u?(3HX>4RfpU^#Pc-tOKSitxTU=G(tvTk>jt5Y|_RFfxa1;n%V=g#6e;4#h zwq6C$lAJoJh?5T!God%ANl47Lc645{7W2eWRx}SMoqn27rT(s<4QR9ARg1|Y4SB+o zIt|c~+q`Tx(usc@s@N-wU=qpjwt`aDiG5TwOBL(*;QM=9aMJ65^7W4%6k`+mng2fx zBZ3+U=$`(1h;n>xx-j2I<0})zNYN-HEHF#w5m4@Nkal=rX9|a(JD1n0-fY0$BV#bW zy{~E1^N=u5;KfjGQlXLe{WTQz6gO7NW63}W>QmMq<_hsH<^v8ecqo? z&)$1wr4n}?WK8}}I?2+qN|kpwf(xgq}7uYvEldu6@T zTCt7>By+Gk7)MJoj;?BI)?>%z^<@D$DEnW}f4_P|fRJn?1sfmNvRkt~cvyM1c;P}I z@1njQ&KdWu+nB-o@1l2)=Nlg1nxDmjbtxBeUYq|E5AKcqK?%P(QX*YG%?Vjr^Ziq+DnX#k=EPclPHlSKz{ z+ql2-IzYI2|AJ{j6r4~fhF3LVQm^oJ09AZj-2SFvI?`lkvOmex+~F+)`L(4WB7KKe z4&nJr=gF=GDqwe!pFx?*LozqgK1^(B1{5mYGL^tq`|Nyl@VS= zYRCZL7TEb@3P?w|)-^}l^?kk-v&s}ZMs!UHR zkbe$}@_IZq`oExW)HX%p?uSC$)@VWTD_g72sc$DEyZqKTu9*eN!xGWQEuaTXvztyC!BGmNtM%tc4 zF@0)tGbyBBd@@U3QHNAS5@5Zl&bCM8KvoQGS8L2J=c(1UUwy3e zIeZHgoLseA1wCYYRMAMD&yV*=!)aG|N`y|q%9I9lY!!_(2aTXdN~zGiM6FNR;!?4= z=B-y(fMddFk6{ve-2k@y{g%7aT1u+IMg*!KDd=9jAs1He#zdPi5&Cn@^7F|<{dxDr zr&0g59w6AWOwAud?!8dK(r0}3GD?`x&EsS-&%DMW)biwH@pApNGZ96B5}YPs$M5TS zBD-MBG>?QJvDw_j`>V_7Pcu-a? z6&e(WKZu+>Y7P!M#An!4GAd-inGY|B%_2B|xJ;WKgCU9l;g(j0kb?h|Y@AU*2AC7Y zbZ7K)8C;@Zr2?PcBQf`jv!Ve*=AFujqW8Rlw4UB8cfv*?;bNG+IMD|dz1l15F37VM+#J# zNc?)nxtQ#}SH?6f#bmYCBcRc)s19B zhsp`UFGdLUdmoQphpGXkjHBV4PMmjQf=)jh(AG!o(GR3tJX53zC#z@U^k1z(X|u=@ zlIGj7D09cf^PXJ7s!hMW%RIw;y$mEIFY9IY9_-=V`r0fH&#^`%G64nrF0NW$l?%rS z09pD02y6fQVV`8UVRW&>c^Jnqa#vqG9b0uj1fK1eEN?GP-dy(D?jMikV=4My28Evy zcnh+)r)E*^43+YBA@vmqoy)UKS(EdI=pHP3es5xOXz09HIPl{IIao57L#M*E$kS&NsWVn0^!9FO8S*^sC-kalbL3~6@7Wc{ zhKP=cCcylp@fP_BnIB!b{%-7{CGPvuN1?qSWjiMI`)lq-iheB*3zH&ZjWcnQ}^tEzy1>Kya1^NZZ|zIaglz zl#p4+SgD_xmBM>*rp68dNRNq(y69aV}aJmKT;iU8R#FwB_<8p zJSz_j@*{x~Q;206C-dXygd*cqp<>5QKK5jpu^qMWR$(mh_X|2^;H0S?cMbn*Q5Jn7 zLbHYIngeu!4|l6aVq_)pW!+w!AFiFAf<(6t&eX)^M*L+G;fpSYr;GDmS22>iw(*d0 zt(Vn}>Tv|~6mBE|%>Jzrcj_e>MKIysFFMYtOro#5x)CBk7f%B)neTHGsxwDst-k$d zI8Tl1xdQgEe%15-L7=?w$oTmWwbwSS^?&~~VZvUs-0kv8FEL`eV)>xI)8tXV-~QV{ z&j6jR5)z2>m!s0wE5{W8Thkc(k?v_vuC*>>!1G3V5`g#6@IcGP0}_Jg$W=D8e66PW z#?Hrjey_~5J9vBxj9qZgI1&7?LGZ1;`NBr>Mi9@1nIT$u{M!{p%b1$o30@@`1#P@MQ#JiBFHeI>~l5xO5k#rFaqfo ztEjy2V~F5#_jtn&48sp0mnCM9$SfM!l~YslfY717rSXZz(HUJ7ZPU$hs7(5aX9Xz{ z|3?Q}0eH`Ml||o-4V(g+L{X?1Mig`VL7#E7gA{RZ?|QmB!6M>j!UUbd@Dp<+-qa>- zA8+&CsW&%sU%wUkJ&EwYgM@rHqWt8y0}h?|Bdq*vGZr#v*$ep-09hWF`So);IlG#Z z4w{~*M0#WFZ+6Z{HPl1+6wz=_3E(JW=1t_gFyfU6(?pY!6hIh%lSjPBPPAcP0J?nZ z{l$h*Iz}S;g`}9JpP%}S{Y}81qO*lik*XNEIEj~gtMF(E@tCU@^1a%)xyk*`AFYjH zAS4B;T6eh|o10jj)mum%q(~=kmzcGn;qN-t2sKyca9vD6y}~a%BMY8AeEqBM)l`L_ z)k1kxq@q`QC z4YoL&|JM?Us6XCv;cxQF-k;v{^NLT6A3f~Fv2zY3*nJ|&Pa*(~^%ojS{nvfo6dA7L zf4;CH(o2q`z@@UQR&>De;>C-iO2}_2Mn=YgvWYWlVPRp{YSksB>lQ;2zJe$j8JPz= zE#7261JUZ?FR|A@^#0cmlYT*=p`m_nUp76{$7YnGjuW!dJ^5?plAs*_ zTu5Z{(UDnB(X^`a0Nq4e{-7=`sl3V!FDP){2Mh_ts0U)vFQ^Z((N3X&SwbIwrq_x+k)4;0uw(Jl)zAD4w z+6*G_F4l%i@i9Mt7$eqURH7r1$bUT`4t0*hI)=W{mpC0+4K6i`FWnc@YNr#pv5&AR zfwqVDwVNGj%kP)+q$tKx`eHwh-i5`i%hdibLWL@ELXcm+cTe^{#cQuAuOx3rOTesQ z4`9BmUuMmSclJlztKSbwF8gXX|Ef~fxW=brQb!<(j^zSr_9D}Jk4Iqjg;bH4k3PKb z1$PfVSB6jOg&2QelXU^nsm_M);m&I@FOO^_&4YuQZl>eEvN2iQlfIlBoNq~{#yes` zA(7F?A6ahD#sZFH2EGqsc$O)YS}cWf%d>6Mq@Q%5O7*7Yq@ z#j(}0>aoe$-v|N{#fuGZ>U>mY+L!pD{3hKdK^-ot&{8d)X0*fsbHuFRY5V;WI>AgA z2_$R+t@{^o&Ee3#*mG9_thMIsb2+!n#7yP31I-6F0}7x3a2x>q2-ye5$pWpP4$>_~ zQyRhp7g3td_s-jt7M{^2U*k>xkAk5fa84wFaTomSd+0GFA>nQRnejG}j6M&r`5k?3 zGQF&bC17SN4rdRF%`)IQ^jdFhQ%dqAxhB80SV{}Fy%P+++4GYzEhRaVk%u!L#W2ce z06nQMN?ZFq`Brp;-d3mx;SYgp6rk;sF~5mBC^Ax-NqJqIsvCS` z@hNnuSy+%+T2I9|2@h3dnfIHIx!5T*tlfZfcC5>$s^G0gHWtFap^hW$Z7iumK*BD7D1 zufOrU3ga^4a#sJ07im#BL)yVN{j^Ke68(56=$mPF4?0q94YK%%lpOnIBv4VCFVX7n zkcJJ}IDUz?lD(X^6Z2owHRb zB6BB^=dR@l!)V!NMLAKucrnPvk-O9`S_J$O8(&nS{la7Ryc9ldf;etD)zIN7$;$HU zBIR`Ld<743&#xjV^-#Am)fQan9xTy4#y-*X+NrH!^T0!tyWi4|T0RNp)hjGJ2sF2icTQgR10|7+4JiP!oXZbTrHYHg8GhtE5 zgruZGg#RDrJ`_Y-A1ZEOk75X@Zrk&1M1=4U+a^hMIy~bJ5#nE*Z%7Vu#xGHqJ=r@k zxG>x;ojGJr$g_kT?sZ4F(+lA1@ZNo$wEWDeX7Da%1y_DNxGP|^vTD{Hda{h57kd~7 z=fAZnPT}Rrv?Omov%azdoGKoI;7d2W%&~u4~vnbwFW% zk7&=*#W*s(NbEKJ7T+0`7FeRK`aL6SVI!jQ>WT44*cQ?wLXw}LGT{|81y;%7AIs$N z^=BIA>D*4Yy!Y|P4(n!jU;7=1TNBuFXf#E22`S5e5j{D6f4NInYZHUjw6C7f>nD-*vStq(1hA~n;~K#R0=yW zhqNIzNr}d0n`N)SJLGQ3r+)#Ifoi@sktHRb=jOgwN)>L~$J;=qctcpq)QsWIe64rN zctQz!St54?Wvc>o-KkUdWuP%4qSTRxLTV7aI#OglRQISk5O@B4=l;+VcVTALeev4+ zir3Wo%j-ift5(2fhhX+;pv7H9JzMCeLOo~6rxsb^(|5!80a}Z51rx7LW=4O+0>`|1 zV1KkJgUCJ8X)4GA?Z#2jobi13g%;T6+U9qnsnm1iGq`6D>a`#;mSlv~rOA`3@I`!_ zaqZHBP2LYRLh*2Z`ncCJ?Bw=p6&)#$rC3N}lF1P;Sg*dA1eZ?ZKkApl(yv~Eh~w|Y z&m*7FBx2w=@~UDr$EQVljgzmW%1HZ0thK)`5P`q1RygyR-q!98r((-2zN1|dHC1Y~ z{g8!@{0|`=Cvzap>2}{+wb+_o6K2Hkf?En_fp($^Dun|Dvbl%PT9{yI&E9~m*yv?+g}cDGmG-A7#vtt1;U-t8*j0MoW!E#foTv zj{+zO9%?kQ=3T;{td2rkP}R~(8}ZLT#rsG7_GF{pyg*cFVmzs3pR&?b?kIWUU?Op| zaaW-t;dsad?I7@}-KgChtj16yI;vDBzjXf56=6S{ci^KhQ8eZu^*@V^|0Y(rs9H>y zE#>&ILOg2{O+-W@#PFxiKcX6vhgL%?EqaGP^=bfsm-D!M;5}gl1X6FtJ(BPJK#JdI zu?lS&KLLpzulWrS!HAdn&a_0As||b`SqLZ%f{>}jdVV7Ww7#?G)1?41c{9?8H)(?D?}%va8`MiKUxF&rtk%wSN!Rp!Zjub)%k+y7ks(e7 z4qhQigR-7(CoLIrBx?OM*tu=98o@g2zgl`}YRMRRE^ zI|8WGCCZZ%0sCYVo1bqWAlxNlezji?ug09Cm@GYos3?BU9 za`8PjGn}$i8Yq9`JrR-N0Q?a`VBeS#_Gksb9lNs8x%@(4^d)BP>>)PuQ8;{v(8~(= z#h%OzvMv`VhUX}O8IKOk-@Q1l_c0g`qu=Y@r zxR!#e_ggnIID+8Eduow|B6J3`@s4)m;Z0xb4b{xYP1+UCmQoj4+6c0&q^0@cO>dgs z(mRlj4An%}?}*6b<5$)V*?gr&wC$<_P=A3LU=%e21(_L?)B)ulzk3av(uo^54E^%NS`BLP)FRvz&pWAtb~I;e_(gZX8lA?~}9b4XQh zn1C#8Snx;Jw+MT$#J{%MjIL@&TP6d#Jx%Wu0;A7ynmUzz^qIcX#Z7KL6{ zbiLkIy3%&SR4zj-nGd7jL-?dJ2es+y)h4|693sJgkBX&pfb}1XtL41X@Y57AZ{1oa zthhxI5R)+izC3I^ug|bHru-+Y*yhqrRf`L^nJJp>gMtL)$+p;Z^I~< ztnTn`Ly|cT6=%pT!#30RvvilA=HwDG6=dzJ>hM@Qx_Y^1b6PEh%)@dr-%#F{G1>CU z*?qw`^(mG1(e>`**5G1(efiVsyXvh~^|Xo?xoAos+KhgR^w!$vBR#uO)rrn0__@@pt&G$)_IX8`Gx1Ehral!}x^ATersnhOQ zo_xiI+AE6+wh-H2b0@FD!7;6tpOaONA44TyHxSV~Gp0p?V?OAjm7V`K5Y4bsuqD8x zU7ULQR8!aIiV%gLD%xZEM4|Q05ka^Db!cLcZ4_UE@C+kOID1UiYI;7RcRB?|STZM_ zsi;ldXup|;8+&VHp)P~N{1U@dgWxSI8xW8^E0Fnu+HYR?bp4bM9ZRh%sY-1+! z;^N)pFe`TLW{futLOuQFYZls*@ZZ0o9Q%qXz31T)wsU{fkL$!;S(TgKBfWqJ1*gP) z6`k1KIIq%t7kI0aK6{WNXA;4&T@SPJAi1Vvl4}fLDPs>Nz0Fs~)$x<}&q2reTF+9F z7KCiXG!@#_b;AHJmjt1h*@72V@vD`?X0&Q`3cXxO9VlD1&#ogWAUH&}pxBj(~++=3% z+&gn8=j^@DnJ^_qDHKEkL?|dI6d7r8707W23JTgB{xjs8H744B1qim%S`JW9NSOb< zKS8Bu;z0^OIjBg9LRF1}jvzk(KfwxMD5%;Pq*o(YC@4d38F8?h>!-6UgiNft`j4-7 zqcs(l{-xbuWrInYQgO_D)QU|+yRa}fbgwVzK9M?}UvEiFC)-Nh2B^OH6b!45%E@nI zM9IaP2HPoMVXsQ7CB_M0$0`^u1|L1=7~EAB7Z+Ewl(#gT3mFJWXfD`SwCukhuREN# zADClNkgT&g_W2I3NG51FG)X=mgxHL!=>iYKjr}mGUePfJ3 z_%LzOj6qaB@X3((*O|JoAHzT{NtuF^o4fQ;=4S?7!4v=)v?%6KBCTqR@a+Bd5R(j!<%H|8$R8qMLes)i>KJ+xg14p5Y&UON4MbCx-?L>Fd6#KQ`4t| zY3gN0wU#X+*q@i}oR@<7O9xB!52^?tr&(nz*y^_H@RFVKx91RIcN&Rq9h>&OBc2T^ zc+04yd zY^nEQ^F3Nj>1^C8bp^H;a6ISc??3%s~G|9GxBct$aHI=B&o1X*oD99YVQOW#;{D2xr4 zJ$$_5aH3yeBQ8;IuwiiXYEQOeEU>4s z81=|ABm(EW-((WLMD=bvM?Sh>ike1BGRT<3n|BHY#*O`m>EHemugyuFn@EmxDW9K7 zQczYFhQsj9aBY^#Hc(f%RD^}dgb!G{*mBwewa0d)p+pcfOolL@H zdFgrUG)n4wjKzDM<3}ubh{P&B-Iy%V=OPkL6k_&AA zqz}axCkmDJd9Df*j(lNIb9qYdPjE2?yWvRM+&8=)tQeiG8IOpn;m&^JHPK5gce5je ziKgv5?!=TBcd`X<=Pp;<;7Tbdpr8;7xZa^lfof;}J*Cx`-0O>rQunxj31Wj=PiOz3 zi~SGz4`ilAsiZ#M-&V%?PJa8iDp360NTSazaWNSqkr5nwp+280I|sa9M3FU zn4eD)cyq2dAW0*MSn+P4oRUKAguW-zeou^Sr;XU^LT zZ?W@b?ZW-9l7~(sF2-j8jaAw8^Ff-%gole`{IdnMJy*BSEG$O9dNvs(_4J6|9tVZz zT{f&-5F;Qf7}*kUnWd>6lLozgsuwvp0r^htiQQn*kf@oUY5jPv)?5h#bLsj#Cm? zoc|4Kou%t+HoRWDrrV z4AS$mzfQ4CgI+cRrohrj2NslR(*OCQct1^pXs_CmPiR%!Ys(wqCEEwAyefE&V=eTk5*u0 zhrAYBB6#~B)fClLqYdb9Nvk%P02f`@?~&NVq9y9_Cku~^uNkWYU?hK;sl31%sarC4 zF{)5N=ci8C&M-hXOuas;Xs|iIhhYH3Y2;%PNt;S5*$ust&It;K9&{i6kWtCz3VRPv z1c?GYT_`iyOl2QJ8rs|oB%k-xK6mNB2IyL%lEM3VXxsA-H?Jz%BNa8W+C@!`lU3>F z0ifZkx!Bf$M5;+ewK^lcP2A`qN_2U*a~lHAlL%?Qy?;)B7C^Rh6ksT_Nh1A*VEPPW zGBo2sbO&2CE&sKL$kMg+ak(kP9wTHFE&lxpEJ|_)tCatXXz9W%or|?x1UOKK(jsI~ zJ^Y#vl0*LYikEBG?GO8xMiOGT_FqZAO_;DvjAd|FH&5DSFN0t6*-mw>`Ir8~5JLm6 z!>{drvfPL0n^pbrV}BdDgk>8mM<>W`0(_+b-}Bin-^}ySZ1DNMckNgeu%hv{h6xWA zb#1+B9)|FKQl2gy_T;)baL>A(Xv+L$%6%q`PLI1K(k?C_&mXiucsO6FlYir&_V12W zcnFEP?UGsO04^-XM&QoP>H$IXD80&*Bg*{oo&_UP*o=O!{JY>RpDe+8$=o3y`Q*v- zK#BE_wcoi-aZliK5ARrM*y~+~iMyBno_kfcLIqP+j>}^20o1Yj+w;Z~Rg!K|HsqoX zy&UzCWpHmOxlWd-+MdJn4v`r4-fu)~0YqG3LXA3UrB)juEHcn9iIAJ2= zEn8ujE4Mg_#F%2ywIv z+&&TP7wT4gQSi!GOoubex9c;CEgf!V$%p&A3sEm9MaYo0qX%$#K#{QSwA(ZJal9BG zB{l=hg#p1$eHtpr(!ypDhEM8hQtcEE?9ZhTZtjAS{D>}uc4wza_`V-uF<97Dr^ zQqOA1s^ER2aXOrFC%!uirj_z~`9o8#2dPgQL)(UPbP=|j?^#iIq6^v{nn8OA_2?H= zm4@`M&LbSEx!GWPF?D0xsgjm!_FS}_^6s^ru%LUB#Io80=>U5iZ5wv>NDFjWt-`fk z!vfv2zrj-VbhS~Pj}Z%*bw_U?Hz{h>OiBfhyyPZ#qIugtNWXl-p_tg@sF-4urF1F? z|6K`ELWI|dO^J$G(4tE;UlAvy#%pJC-h!qz`Zgx`a{= z^4|#FkftJsv|M^6g>sgvLTBNsFJeOeNw0+>zU? z%em~IAW+ZaeVkytY1L{^@vXeCy*5ns|Jp{;RH$wO>Wyq6H~m zg+gUMevq|0VuZ43W8P?YpD()jdcde{tUFu*@ezC`<8Uo@-vvSqBnTy;h zOn2%@Q@i<<`bma0xV1f873U8MJUGkfm965%6?bch@(mFl;fWDXuxS0{va#S6P-huH zx|$E45apWWPw@CWJNzx>32fpG9Jy1F9d|H=wbl*o8yU|!dp2f%OZc(+K_C$!R5|Od zEoy4iq%wEdr6wVIF;ftYy6VAgOr*}7$Yj^WD1T7Q`WO(4EQu}GUzyMG3C!?rNYt-z zt`!R}&Z5K>iayJzyty5OYjN@ZI{c6Nq+z<^qPigIq*0}f@`EApR*C<|DME;nzwy7R zN*h-nsP5n+J@T%2*Q3<$>i`?6ROT?i0KiO(1p>^am>kp@9| z)lO0)-AiXu-pL2v#!We%!H44~5^!faG!?M?7NIPzCB~Hzz$D9>H77tR!fW2Hn;<*` zl?n+y9m`rh#;yq>P$~WoNYS?04Tl7 zr0<&FM43x}ZcwhZ!Wk{>2*gG*0T~^LbGHa2gke&v;Em=8=lDacitt{ds%RR@Ll|}T zC8yRe1}gZ-E6o%qt6ToPh?kb^kmEUao62MiacN|Dz?C@#qlCAhjaG`)FF0B*p5vt= zi~6Q#!zEkKFV?lWtG0+^M=9o=@2RZD*?CZHmpw>>s!*b7BGmB4ol2gEr#;-5W%>xB z#PGYA;rJ1D=kRTMGL9N*eed#tjy=#*>v^eH-!nV^STa&cy-tWrQ{(H!_*`FoAK-Ph zSN=_e#UIzljy^3Txo}$=a^%z#VHcfOf92w^A+ZW+%$yd5WP{2WU549+cYsjuwHx-5 z27g3VFd&#Hz?t@6Vfk4AhDm!QEV_JRhNeXx-sSg9T=N&-nr%W%jETR%5g0L2t!a`1 zyh{wO+4XzByru_TN4zYrRc|afJ3*v80T#e@d#%$~r9RRE+>`m}@yPiGv`mMSW{ODL z=fiRgI6DEPJWm!tdQ#Z=qv-&ekJwI~DOQ6Sv5N&n2RQbB?NwJFiP z*bDP%ot0OMa3J#>{oh1i9&6qY_+BF9lnX(J6lIY38*<<^1v8LSct9mQH193kWkk^4 z)u$kdZVCG)K=# z0|6ho?e+oFW!%+>&G_!L(v*j#%t^KdqGT<*tLxe;osCEBIr+e)Hm8!3 zoymZQ^OB8-c3fs}hgxI*=s+Y0GVIuh^EH|>6_BnXCa#kDmpR{s(ByKFe#4}9`=KwJ z8_{}Sx=8Gg340=>W6*riDj4(Z3=_mN4V)n`gjRI@%MwNKBV7A_ShCk4X|pNj?y=Gu z?*GsV1VV8LzrU!fMnB)18WEm`))G2o>S->rbRu^q0lGhFZk&Yu#aXX{cmp-R!xra3 zgCEiDk$`U41=geI4R8N2MhXi;nb@M^Mg)I)37rcTswF+7m7J15>PO_bq75RQ2kavi za@V|HYM3U4mDR82AazNZKUkd-ePpgh1OLGPHry(#NZxuo9SNOZDc@VDlca!n+DBxjdlv z^zmTksyN#i#!T28Tp(nq1XbX&OS-%m0%6;JKb+26sVOLo9dIZR7M{4HSsvV3wRN-< z6zt^WoG;ck&8B?cY-%(=K3t*genN?;AwB~cJ=D4%6{QSZk!)$}6SRRQe17BTTk||0 z7G%%@AaJQdqmtltD}+RG>tw-0U@u231l7y_aaO66@%CsmU-#oknxQd7DY$ zms57DmwV4{r-v@T3}!+u%Tq2y5eUH&$<$>d`ssbK(#VVg;$fL7kcweomSl;wT4^wA zGnxObm9SQ0B=)Y$bd-%kKCMJvlH=5iN!{?D+lp^gNY39eTJ)+=%0xS#+L6(JW9vX8 z;E+COj4%1w_`M&|>+aYy@EKRrYQ_1_#`n(U>gql>)M^4_GSbMc-VhHym!&_ZCg>x= zT7{iA6w^v2I7)L&99{j4iA8u5=n^STcY|Q@E9U#-xripk_V%i(s@5Ei<&~92hphIO zWJaCKJJWXxqKms2$_0Z(2qRwW7@n*1B8&8TSW9WDBNes{6a9GU{IGxzs`&B2Z`f75 z;ok0DI<*!D&S|k;C40pYrafjo=dF{nW7K6YzXFwO8<|80pzV%fcjCPf|3ABZ=OSK1!=@C^*lqKXNRElevLo((Mffubz!&D_ErCJ-+we{S671FUB|ephjhEfKfdpjXjHwg zwGHn)Zk(lv?b2pe)OaAqi17^(aSwfWz!9%rZYbWz@H3csTPY zSDujk5cWZoNAaxI+0jq2pQlB$bc@y)7F>e+?bw8__L_38tLL$*+M8_e9}hD{ z(TraB4Uc}Wid!v;Pg8K0Z<>2Kd~R4ltDCeW_`mEyQ^ zO1JygaoMcP>ymu1Rc*~GLfnpKQHW8Z2j>u^W)?3cuSv32g;K>&pl0*1d*!cF!Z+lZ zChghD*|P8?q$vw-f40`>t*>5zRpx#QA!kyZ*^L|SRaNyhzlhJW&2k>15SS(AtpeEx zwH{ArN@7kJ+Q1^|nP3j5D9QK}m%RG=J0O#3B)9isY7u-@w}IY`5~XTQ`=sM#lg9zk zLy6UrH9c>@$LBN3G#~+%gW2Is?3d{QPFu!sD6aj;L;TAd)uB|g^o7_H7g)yKM{$0* zAY^3cF5=3({%DkXK(o!d=6e$RMWhSg=KdV5`>ol9BXYX)MH^U-bJ~W_X8I{*UXrX6JjO9*F?5HdPqHRu$ZbMP{w+{~e?2&VTsO?_bftNkJZ?Z#t=~Jq1HM+A z^%(~{LXrd^mkuLSWdQtZle8pC{N+dbKIbY;8Ne^9mT~2+%7ss5X3hkVLZk37PWbvO zX7v6-(yRb}4!ns0m@8vkviA9EAk2{awYPnXn3m@-$^4cvKeo28Ie7OO7F@0CnQwy~ z6q#1+hQjTM1Xx?+-C2vKQ~1&@=!OzN{6Aox@U`iY^GA!sAU`5LyTT2D{hR*+cQL-$ zpcv%$Safvs*9fAMlkHNKEVrlq1)iNGg+k0#`g8n;^8*3z*4z*DJWaa)yF#H^rDWA^+Qgh zvp>W*{~P)xWh@(RNEmZmDb70X6b!ar11)82^6}hr{>rabh?g?o;#$8vgtShs({MeC zP*)@U5BM995C8bPu#M>zGC3733ouJHrWmc;dmcw7;+uufkLDKQBS=P^W|2cV zA7DY9^rv12Lc)kzJcN6cZfIa3WA4SIC^Nb~tUW-t%h;ig*CXRygRbkAtA&3}CgZXW zA=td8p886I0xHjL zy?M0_k$UI_IAryiNa0te>Mx4p!(YGT9QZ?$-X79La;&t#7Tg^tCj$3(l^01%S8mLV z=NNTlPbbEdhO}TpCHu#AZ?Io(iY1@UP%E3^L%?Al#Rc0t4WnH3B_js%ilEQ*UxPdM zIs(&>ZXx{;s}A@8j?o%^h$hCV2!JUQI=D)-?S0SvOY+RFj6d0K?ZWpo1b2-YxP5k) zqS;yTgdMg}o{Y_IOThgrtJJ+{AEqQPsHwPkpVG6KQJ-P1xtgJm_1gDHukVu*u4EFDa~PUr;$p3GsS+OoARwz0 zS!AE2{^Ke7B_Ps>CS`-EPfnlIJXiTx4sDUhSjeZ|B4BPr-Qg%832BI$BA=jxK9SkY zuWg3)@w+T9aB#N3+K!QorO5GSv6mgV-4BHK9NpWTCwh3gP^}jF*mg(OZC_d8 zR$;j{yNr${rHLeKWW3Px_|XT(k^Af{MOLsnvW<3*GKo5!_O($Tg~UTSr5eJ^ByIu< z+l?kIksT|vt(IQVo_7p7#fo;;ZE60GUv_4@oVL_C)7Nr;#(}mXK@$>IK+>;YhHc5w zWjShozdxIvE08^ad%8@{qew?xsXiPkFMM21Ij1#u5xCjE1Gi~JNBZpairu%`OLUl% zLOQ*AB{e&*j~EbXyhnvfInU&NPw44ez7yX+fUx1{LM)ZvtiZ(WX-3iawEt+YkgzlX ziX*cmuj^|OlI*=U_LrZfxEUlc&|Z&uAxC>D29oMMiv#Lt&(kR#;xiq5l@V)L_phKN z@3-$a0l6lw&qpOE!Vv5sxKOFHK)CY!aIw)aA@t(O2a#CkMF-(hNyLRyRREFK2qC&! zb*<8POnN`Er`}OJ4b>D0bg1zpfl7qi&%k7 zYg88##id>BemOasNaHbnqjqn13ogT;tn;{sEj*9~tXWz4K*}5^qRQEV)Dd`urjc+L zI0%Upz4tSr(l3S>+x~WHrK-$3Ca4l;djl(Fx*ux$5nk15Ruz`kj>W{m%^|k&w)-2~ zMPvV;1*|G<=5HBA^S|1o;T@vj!8!QWmKq`bggLIjF%Z%IL(<;jTUFW~>>@22s zpzo(q0wEJ8;PZB3FwD&Iy)xD8IW?z%pjsF{=l%(77@P3*^dQyDJ)MLyBZGsTLkZ&% zR?u-xd*oANq~zZ8nZNrN*n>fqc24h_9MzFm(44(j$rD)KCW++q;4zJaaux$nxo$i0 zjE)dIhQmJ69dR*{TUw!^+`UdH3yEcTH(IYP(~_pidynjG=7yU%Bd~_Fxub`r5Vw$O zr&w#wveWVie|~-S#%C-1TTqku#9O}itO!{pSpl9sihe}%7ZB+TLhCSC;8?ZfJ~8j~ zkmY`-fQgE>L2q?L3V2#Vnuzg}Wa;$0iZD36ZU685!)Mq7I4}k2Q=fNq^%Iz5H7}m!z(jG|^(_3T#H_>P2ja&z$7w(|8J;nc-J!Pgt`#;q#Yab4b)SN?y z8Ey6J*J0w|8zcxq2fKSC)_H6$ECMy?v&Hu(0ubc~c|^bvxdlJXto^|*uY#aOdY<`r z9l5le0_~~`4q@ZVdnqe7R65Gtsq1e-FpK{4|puCX=8wIhaNS z*Kapct+LP=9kcNs-SVs78u+nN#T{M|3&b)<@%OFOD2k(xM#RIX5+0`G3Az*gKMLvR z58d6i#aU<|OXlm0(kl3;>F!=F61C6fmQAWfshtP4S)xARWZy*z{@WRPlVgJQ1=ORJ zNn{HSIGcaYV)VbX7owX6nOJRZ?5 zlK<``puSRLq6a$$}{ZGP+U9m6d!Auhp@NMa5+*^} zr3~uQtX^Tmk>TrOwO&n2lmGmF*8Mt&%yC(Y#bcZ~wZ8tY6N$VlkN$E;NI-Dh>U82P zfK zzYN8y7N7d`X{FfkMOY=^V|6Me=Sx{{&(YFy(&f+AV6@}~hurqk3*+4=4sJ#iRJ)tS z5bORuK9EVl>pIT6w)b3=Y?%|=+k32ua;yj$`FDkFRoME;W-606HS;R#M^jMa&yz1l ziD}7H?Rjbe#KA7XbvS|hM-Zw)jp8jj+jorg@jv&DMi|aJ6k{@l+;913pEAGL)t;QC z#AI?^xx3y#f@kurN*8_jalhtLwLiRPOlK(TL>$X{UG!X+dZY*t)?Pb=Dn9cOIww3E zrdYI!BG_?W4;Gef#aq2pSquL|)F;HFis~WA4Xur#0KWEq z(EbG4W^j7Wq?i_q8iNtc#rfbW5>|lZY23MCwc22#l(wUm-ZvM2{{KG{wf+0%v{-8~ z09MqB+fWckTRIvyP5C~lTETQNz*Q1YS&LyZ({ny?+~WLug*Clc zxN&9iY*0CfGz(kq;`brfd9Rg0UM*>|SG2Jx1}*p-2p1a@u8Wl?nGQg!AWE-*s8Pf~ zB|`?p%!}ahEuuWa7-YO}gh#$fV5{yN#l7dyquaO&FZmPVqr5B-NEzA=;N`q|F4FJ+ zWXmv42A1~y2J6p-W)0sK=;`lZ%Y-00+D8ZEfLEz%?`3YEYxW1y*CG_A>NMgdZQo;$ zL@Y+$PNaKy9uD5q0Fdtm2dq|N0Aydj(}Fk48UN$WYVj+Y(!y~_0Bb$#33w|EU||r4 z4DdVY?G>r>X8u?U-hNtkZ>jZ=qxQm%?T*KXRki91^j_N0{u0*t`Wu-VUk z77ZKd6&udW2KfyW#?S6QDfYS=P~4IWDecU9H&V?%ICR< zij(5Gr_J5vv=Fh|cJVAA2(^O(EDZhKAol^OLwlFHakIA8Q>$K;MZ*Na@b@F=8XKPM z9#O)hqqm5(H94`jhfn03W81wTDr2;WC=R!w_L52aROH?!uXl*51=0bVoZ4?2N35UV z-1`63u8!L~skD0y#*lo#1-|43PCC6AL5`_u9A?uzi|J}xfpoF&QdQ4IDLb1j_2ce3 zr;9ArL|mbMNlVv9CwPi-!?y07-fu#Ew%Xz7*!s7Y$OT1+UpV}*98Q*(YR}&CC0o3_ zowzZaUr@(Q*wDVHr>&)6_vFCtpZ&s2dx%qs4w0xyh_}il@L~&c$~)S#4kz8 z>4^-nr!HItW4(7*x8#`dyRMyWyLy`Y=ql+KKgi%W=W6q>jK(6Q0A;=TjWvCw7E(Xq?q5jgTEZBLkTu4h!>5}Hs#?N<)4_wK#y z7i(%)Xz(>m|1MonQ$^n2-=A5Ac(Q*ovfQXO9%NTgP^eVf2hf52o1C&}X7LV7{3cOW zDbABHL}a6`899GHGJ!Ye&vM5))>;%TEni~Y@19baR(g)l;Bh%xy)Hso8>$ltumdkJ zC`)w~!bAsL%RaY6Ev|N`n5#*a8TD%-#5Sh}jeDVDhuiFi&Zu19%EKz#FMJM-wK~RQ(xPrV zWdMX}odx=!KwuD0q$AZ(z$WHbXoQ(c9r%+?+G?0G|JcG6O`5Oah?Ku<^n|~`eRac^ zR!4kf+!KIn1u{#(Vl?P*!`^Ci$^gT+>0(tpPKvS9BBd_FD?~`d->pPldFCJH zboX79k-O$BJ}30j^pv)JbM8B%$12Db*+e|+^c>+=cCVU-Dt6T2wjA$9xWC6%QS7GE zn6+N3Begcj!_xy`gy<|FsMT*vu6Fnn>Xm=XNcRu`mK-2Xt=zr&WL{iH*OD&7Ed;U| zj?ljXy*pQ$tTu9isXTVuL@iYxglG0qjkT3G8#f0NF;w0x1}`P6i|)<%f+Q%_ZQj%y zVhjr;!rrgH-tkOV+M3GB%+Qm_vH;Kv2e@@;88lxqiw$9PHXhA?le?*I*m#z;d&Tkc zP;}`2BKf(>ESV)^i}LO|Z1gat_<(~Gx|&~KDO5Qr)c%kw%ni}un+A3RB}?cuR;#`y zf)sB84Gl6M-_B4dr0z|@x<)7mz4({novWXAuLi)LG7t!=%;-4lquLyu zqu&Nf4iOPiPWoW_$-WTCLJ-$XIh+*`e^ObYrvOPw1J{;D4ozk@Ukvd1yvtizi`(+N zbFd+%5ImJ9ntIjo6;HV{O*ft$5tf=4dY-Nh1EQOU7<-h4n2-U_ejdYRjbt>=G`OD~_TvzQt!`9+Di_ zm%m=DNGCV@V;1{&2~UikWXv|3Gv3)wB+>o6i_sjT@qO|uC{-9~ariz12X6*W%nokg z*XoO#>*D9SgpCjg$K}H{dmT+~pdf5C4XK!G(?n#3dd;?4TE=~Rs2nVL6M#Hbiw=(8 zf;6S}w%DVW1V22^nl)LO z(blg=yrB}tB8joa>!>dWXTBMG zqJiH&I$q;+Ur>FKNAEG#9}9TI3iy`Hg(Xd&#oSm=(Q&4=_1EbrzZ7=A)U@zKZ9^>& z>=S2{{Tc8G1h1U$G~C%OBN!9j1Ipz`lFX8s7H-NDy1mc{%em9>`#J8>Z~bO?GCXr5 ztrjs$+1@}aYDdspo(o%bt&4^q&1MN*WB*88uCMtOcQSTi5Z?rYm;<9TGwITd^u6(6j5eSd!6C?@#yRqcFv%KYZRl@;(E zeNfeNl$n3N%B$lbmP{wkOiku0YgwCOWI8C>q5BtAQ|FDFkDa-^T9mIXe69&W8P|?` zun5Dp$l7gmNw&}Xp4k0bbA3n0mg`6o)&`N#>QL*)pgj}M=NXF2gNil|Ud}J&l3jVW z3q2G;Uy{$Y`7JrcNO9~uBQXkoPGsj8zCcoRLQ3PmyEcLYYKDPg=emp+Yuj%bO{{hj z%LJI5bMDd2JM>D(a3)R;CjRx-^=2X#pFls7ZQA8I_sM*oexT! ze_Ey1T5J6phIK2gMTgD4_?lQvngsymIXbni{TfEQ?Dm%1|FU@akLV5j9!?zfm0&#= zRs0v5lO8_0TDtRI;M1r=`;#A2`&l;h_5LI?6`y@~z}1maZ^SC-K#R+zN|TGHD0L5- z4vsfos|a9Tz8JyI+6LCH8L5e>S3Fw$TB(^YGF4 z(AG?p7SSJs>Jz{gC6m(0X^ro$rlxL&fs5e1$*T8wWbcjoW^mm)xK&+z{-;S(p%Z5&wxX z^x>;*!kW52$}dzA;q5v(IR%l?G%CYB%asd`q@)5_QsAcwGG`gjQ!@5>$HrYQzr{?AcA1 z%r-C6>~*tP{;kSx*f0XC{CjuOKN62#(h}$@179y)_te4j=eMkiZ)Fr}evAFew1xt3 zk&dPmxp6>enRRI?emFqSKZ(;bEwv$O?iB%B1|hx3+m8mD9r>ukTb_+WeJC5Ok^uFY zF%M>DRoCXkwRX8v$(Ccu?+tFNW#)bZKSvs&!(@F&1JG)>=1tpT|t+pNN1f5eb#P-(azy^%2506Eh(WsMx^aaCG zJQkrkm5LttY=k3Y-h4Zm5I6TFHp;omU3eae5_uy@J(W zKQKjja=Ez|dqDsDY1WdE441pQeoTzBl)$X!#luQ_tt~H+l!C_>~gitF$^^7uKH5$2ehJyYTKB(8{ z-7y~Sx7IfI1+~lR(joGz^;ts%j3oDIxM)C5<~>=|YZq-&17XAYc~;-20v)Ha&PDI+ z8KES}-1Bp1yRJjYBduST3I7$8x3(y0jeQG>lnk>zv}hc1fVZ>83u27i@hP zVo2x}ejj5AW?0+MOTWgoMpTTKfkc zS#D4w%mIY?{}|WHtFd_=M61{65s{lYUqZocgO~PDjR~Od4GE>rsE#y&jfe@t*{YkX zHaBmt=>kfILzQveMhU6wj5sd=Kll-JS5Jre|7}+iSPL&K)ALw8(t*qMKqB=XcvaeR za08NiVQk0>bC*&LPBS`lzXTUzczj2Oeq;o@y=jeL!n!b)1q=VFWL6#={gZW~1%kp~ zVl!tE?f}h6z;`_kp!hst&bIXH)GxYQr}uvnKoak(MKU?evY77*`GCP&D279{!aoN7 zRR=-i8$m`5iH=DSfcf^x#Cl8j=Pq^g zuy2YpR%V|ol_OwiJ~0fu9_@40cQk?em9av_1|!N&rltLr#zJ`@87Jr=q&%eCKmeRL z$bZu}R163L+QIuHk)wib!F^=#Opr!k;QwBsVc(23j2yN8#Z!f%w309zjmdrksI6)Tkc1ZF;gQ@3lv#n)!~DdEYs%feypAes7j z%7BZGm-B*J!?&Oy2kIAKm~!RuTI+)~7F#lhD(^yrQgiA0<@-BU0nIWW&&X^z@T z3lCa-m%8jFdAH?*AWNVIfy5uZ>K8^_j?~KJ$h6#nD0+h5OX3Poq09!yQ1PoEz38Sft;7tY7U6acJo=4GEIJ8w~8%G=Tra`U|bvR5GOf1 z1vQ0tBGsix8l_U6Xw*A#0X;iXCLSA{9ia^3g^&|F!>Z3>AmNXviINw)VNq!y7G#A2 zwFxAqr>0nYu@E%V#u+&D{1EQ9@P6-rG6_R?n(A77C3y3&;x=^)yB|I{*)crg4_p1M zDcIh=(vlwQ_F=!PgUE-G#KU$-y=!1>n)j0b2GnV8g5dv=$IF;uBIH+56xgt(X=H6qBGbaA<=lC{XJ?X%H|16s25G0l!XSj@W zm~S_Exz+3Oac1Mw>e}V|iArI()%k4s>jY%$#D}%DwSKR`#@-%+3h|fsxJD&_?T-$X zN_ThuvZeg0gE_C+VhLSDa!Z;XCsC1ood=3hVZ5J*@|^uWar-XbKfXeQX2GMY)r6;2 zRfdBO0!k5Qti#q~PxdQ;yNnKtW8MTQZ5^EsUdzQrD=ab^@MH-h5j-uj9aQ1fW&qkd zA)sV>{9(o4mBs{;f7391!8>$0^jIj1@q;5Uu8s#PKl>#4X*O=FJ&`h~&##V#id0P1 z8b?1tvSY9!BC90Ytj;nWGlU097PvF^4na72!}#vZi0Gk4n_Yg~71g19-j3gj68~{# zKR5^pSUY)~^G1BY!+mRXko4$$oB8_l%UqED7~G>^M@+z&m9Euu!Ax7Ic}H(`+Q!pE zTkrOx#Pa@|PKT#a%=2@wu(GwbIi^F$1Jj}2fkOyS2SEsr$ogjl9Z=U7Xp>c!C##L% zV@*6NglV4rRO3;&7p5mHIA16}chuKfvnH5c(gQ1*XlC$$M6YUNQ3RRxi1_-)1%i~q5Q zY#}fKb4Jh+#3NNYN1?-f_LI;9s?BoHAIST$q|_>4&r-I}8Nf#&07Epf5v* zUj;v2)s7kB4ayoYP6Q%1wLpZ8JR-lLKgm*F{=g%Dnu_thjdkit`7Qzi;{5kVkcvg# z+U-}#W^nkE;bkkYE#6Z>lCd(W;oon+I0zYULPCt7b34XxM)Fu^{`j^lCWN@k`nJUp zH@>K&bdR~1HD3)7PB16q1UjxcExerJ)Tr8q0zw6fWXZ+%^?$;^g!h$hdWPO{f2m*4f0>`~zW)oC z8Qp$VoN>Y3|H%k;7>M^48fi_id&=cCREduAVv9VF(wjAL$2-d7csa^I&f2GpFr~{t z-tBpQQ33`*3@Q{y&s7F~W#0;O`|b3?dGkSb$m!tgF17Fz3?R^$G@2A28oyQQ$3cBD z&tg-1&I(pIS3V@H9pRK2!7)va!L;?RB9j-LC_Qj_tY8L&lh!4La`K?UXn|zl8vF?d z6pg5B>fIq$TOUmC=jGz(x6Z#SsDd(Uy@!cwLfWz;Af9&~V#xCYyB$J}_g9Wa?Y4mbHzqfFNMtWZ4$1(EBHk(^{#Op*V^MV*_`ZwV5e>NWAxTy9^cyrz`c< z*S>O1;_2tfOHTRAGVX?Qxxm8oEir;9^snUDT;-@0U!%7bsD@t6CdTg`RP%p>uDkKj z$iYRhc`O|Ttpy)wopWU58-hP2LPeXEcMc5kCMP&1NWSvEKpj+Fx>ps^!DUd(U*Jy@ zOt#qXk$FbBJh9)STKNMdFU`Zwnbf|>f`a++wj?X<+`K}?^IMUULIBk`060q5dQu)G zv+fF5G7hyGZZQyKi`L`C{XLOZ<0!%>WhMvxO}1zq0C}RYEa)H>V-S+4(BL+l%agn+ zK@N>RLRi65{59vDU6_~}ewaMo0WlDyphgO0u!HH zj-oLjAUtWA_x0lR98ETQOSY-J&~Xe8rztDnoHIA~3u+5b?Z$KVz}zUXu>9t2w3<3> z@}soc%JajRzAU7+qv=9=#N<+*>k=ldIBK~jP&Am`t-Z=D#@?Dx20U4&zH_kt*GY`N zU;ebaA_0I;h@Yt$6&E)2sLQu{<|uHl)mK|S-Dea#EFjz5=qhMh_d;XBweXOYJ@zXC zCIaS{S`5eX@rzMS#s&DL6#V;qlz1$>b^E zji-K$<4|)eQx-F%!?nxNpXK@&#a;g!b3v>~@OaJP@43=kQWVAlK?0W~`tdHivhee& zZDY=>x3idw*Ow27D$TvK^;hcLd;OiW{w)BK%626K7llMvr9D?suHJ5iTdv*PRIWZf z`AMzfavn_#q_L>iOqMVw)vvx5&R#B4p5I!LRy-gE^@s|tYitzuFPiQ*QcCbk$nWUN z?l3oyImEZh!?nBp*3dAcf?Q~}$j+)f2gxD5x?2zE7!`FDv*MFs1P&4|YKCpI$f9Kx z^OK0AT(P2H0bMIfYaV<2&eEF7wbhB%h)5HGDHtVj_Mb9Rx*D2(Cfoa01Z;81?;|_F zydhceF}iUu+S108RqkSx;^~HSKz46hIl5pv)|lu3P<+}MGdzrSrj^&acZUD*wzS*6c~$k5-f>pZy|cw7v(Op4ET?jOUvN`QSPG@`v3<7t!XCgZSimZ-yQ0YR zowKS9>&%@40xiC%@A+Ra-|EYmT3Thum^JkD){eeGycr}26_0_?*lQU7&;5qK`s+bT z-xXG({AZ?BcaonqxrZtwgF9)kHW!y+kG(dzWpvBR~qCfuWpZ%%qvTM>l$b<<_zqg5+T#5 zME1nrS2QybNFx7rRGb>RqYZ=?5DgTWF$(WP*01dFKHSUvZ%@k#9fkt|AhcliGk;Y! zX#(E%Ch`Le6On+XCM2e*Y~WE*2c0Jy(yxo*WS7@-K503Zrc$BteDX#}3u?4ze|O)= z@64zWtlSN->VFBrsq?}rk?;f^=J~8$XwjBeLOMM_Q&Y{+MXf@~ez7rweCut-ZB0MQ>{fN!N#-T$ z{UOQ31531EY1!yx++n#riSS|)EkfY?h0k6I*3=(&v59#UKYiltYOts!Pbk#rcKo)k zPKFdc(oZ~C@g(AZw1|I}YIVcwc+Lh&!Pnm^kr;qk+8&GsB#%$7{VqVWuybNi6|JT=b1~t{KYdQfbAtFV3?^QZV2`z-8^diy)L5d(nKw4;_N+L}G zK?uF8^xj43MX3gYfPi!%AjP}=&N(yp$GvAJvod?H%uXgdv)*?-Eg5jGuj%cADixMn zoP{-JiBr3xoA0IRua+we8}ql5>4`fQ+a8HJ`LOCJo_Bo}R8OpmqKkEySB7nKVjj>; zXmdiu#YRPZEuDl64yehyDH4} zT3VlqkQ->n0{g7Eutda#F?~9>3~biG6-FqT|r53 zrILkI72~~@_L=&T6>9fNHok1%3aVEw*9ONnj|oFSuwr+bSRu%VjHBOdrj)Ytp7ips z&t*|>jrh3psFAt$Auc*ztihrIaW`}#1q**u+3o=RQ4$>^-~;wMmtsKq#la>eyGmIj zVY9n}E=`OAvAfs@;|X@x%?fNeDmezeiCqksA5!8Re9F3a7mY3<$aqppN|Fh1y243> z0x$bcB~3x-qyy` zeH$Fi&*h0X?u9dksP+Ey@s0!2bk>N!b@?EL~sYCC>!RdlN6W7*$a zFR!SWx;KxJZE58sd28>7Z{6z%2?mVsLlT0XoT3$ zk5SYTJT#u%Mh$6Dh%f*R>|0fLVo6u-!8pYd6>NQ#8UD5idQoDhDM@=@GKYm}a(Hm1 zD$ie#3lS!9Y&Lq#y^9hDd}MP)^GXD`h~;UEyAw-hT`gZ*sBijd>gec5fFh{(Y)?>$ z%|G~*liv`62UBJ$>_h~7E>@QwD)D{nWR+>-CR^oWSYqS0YV=|wCB>=TR4-`dDSTQS z-Yu$|)&1p(iu)Z28decL9e=c?Um)^3kjBtSU#eu&ERW{7O!R z{Md1BK@raPNcnGL!UH=70t6Nw!q@Gt4m01UD>Uc`(KH38w|)gvp7a}`1$|^3rDD+Z z;5h%X0At3bC2>e)wh2etO`yPvZN>CC>`L&WOUV#c{pu8nee|So8c}YvjRsda?UDmQ z9NWEaT+cD<5}P{bv>!Ry`ZRfwcA&hvwmb{P!BSZ(g{ETzX4Nt$iflk~L8B5USz+Er z%>mYZG$ST4+wZVM126MRzXjGT$C+`NKzYA-il*rFWThw?gw_FK&(A6~r*-N%eMTO6 zEJlr(!5PNC<+qnPzrJd;G2?03eul-wjUOYerPGs@Sw^v=&B<2 z$L<#fUsarBUA(i|eBr1?uw7*ni6h`NWL7|@=H|$eeh(Urre|1c@ed&;&b4ICBP**G z(jl_x4B-}olp_>Ej`$PYKMQVF)kM$0p);wJ@->{88+1s{CQc$c62|fYGCJYJ(l+w| z3<+?k$%$A-fHc82;K;uSAz1whSGsK_#dUs}!@+|#nNkBi=~u%$0IsL!Cw=4XZ1M&v$Qi(s*}94z0CC8oM_d9)(rD%8Jy|ejeavuQ7We}Z-%ai0X_s~ zXin-hY3eowYMCAtDmkbu_3Fp_r}$yR>`TaTgpjJHlzqAJM^+>J$=Xs2Ud=C1gLA1h zaL~`4PXgu&c<1CMwSKcp{-hZNhX*J{R9LJpqhq1x=|0|+AF1ArcRA)(ofIV_2ycpN zcscb7scF=cdzAt};-1vSiJbIPdd{U|!1$)ZZdL~61Klfvbsw4D7!kYqQD3DohIAGx zM8K!3B|WQ`kiR;yY7c~ZVC%xX-Q8Q_xH-Ks_#Z2qVjM^yC?!a-GA1*2 zetsV1-hK^EV!0!&k7~@*>wmSG766&mDtLq;@epl=4Ij%S@EE!Sjp$FW)|~(xKC1y&;Fm04$-C3)Q1 z5-}81CqPt3@bAL+rNwn3Umsm_P`~Y7FF#ypJiL)2C05Jg%~KHdvpPq=__6tfXqkmA~Rt zKzq|A3HOEPyd2MuUXi1f;cqB4sMWJ>a`s5g2;>5l{h+bGiE9hKx%Tq~%7zW0o-1EI zVMIr!R3pAJ=4#*dav9bfC|lR~Gz~r;fYxkn6>+c`sHl}cbi79vB(U6#qZNHZYBw-b zMtyO{#B%%|6IcVj5l^AXjBA__cgPq1#RR9Q<`-L8yY=`!h@+Du@$DN6qZa+OF|wN+b!e5P0_=K0RD|5V6s$1a*S6YqauUrhn?7kJ=>`cx=ES2SQ7Gy$i0h#h zVU+HeGo8Lgw)nE$wnX}ZK6K;2;C#2zpl zs6vc^yRe3EaXw(x35e|S>JsQ|*LeJL`GY>A7xC4Rk+6+6Vj1dtgo%?Zdd*jrKZ7wn z8G%ejMPL4V<$^lyaGofxlW--&D7Zlg&j0rT#XJHkUz%+_Vp+|T3AIT2*0}5r4#@)p zNB2xS1{0}+DNR_`rXM5j?IP6xYwq9W^4|8tD>d~}b9Zd;witxutz

    h9u*En3I3; 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 From 056b0e9a49574a79498d14f228f7f74dd551a075 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 6 Sep 2021 19:03:36 +0300 Subject: [PATCH 100/129] [build] copy common images to common directory --- build/Gruntfile.js | 30 ++++++++++++++++++++++++++++-- build/common.json | 23 +++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index a99ebc3cb..2deb12dea 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -245,7 +245,33 @@ module.exports = function(grunt) { } } }); - doRegisterTask('apps-common'); + doRegisterTask('apps-common', (defaultConfig, packageFile) => { + return { + imagemin: { + options: { + optimizationLevel: 3 + }, + dynamic: { + files: packageFile['apps-common']['imagemin']['images-common'] + } + }, + svgmin: { + options: { + plugins: [{ + cleanupIDs: false + }, + { + convertPathData: { + floatPrecision: 4 + } + }] + }, + dist: { + files: packageFile['apps-common'].svgicons.common + } + }, + } + }); doRegisterTask('sockjs'); doRegisterTask('xregexp'); doRegisterTask('megapixel'); @@ -614,7 +640,7 @@ module.exports = function(grunt) { var copyTask = grunt.option('desktop')? "copy": "copy:script"; grunt.registerTask('deploy-api', ['api-init', 'clean', copyTask, 'replace:writeVersion']); - grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy']); + grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']); grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]); grunt.registerTask('deploy-sockjs', ['sockjs-init', 'clean', 'copy']); diff --git a/build/common.json b/build/common.json index ac73a304a..5861cf114 100644 --- a/build/common.json +++ b/build/common.json @@ -90,6 +90,29 @@ "src": "*.json", "dest": "../deploy/web-apps/apps/common/main/resources/alphabetletters" } + }, + "imagemin": { + "images-common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img/", + "src": [ + "**/*.{png,jpg,gif}", + "!toolbar/*x/**/*" + ], + "dest": "../deploy/web-apps/apps/common/main/resources/img/" + } + ] + }, + "svgicons": { + "common": [ + { + "expand": true, + "cwd": "../apps/common/main/resources/img", + "src": "**/*_s.svg", + "dest": "../deploy/web-apps/apps/common/main/resources/img" + } + ] } }, "bootstrap": { From 631b5ae79d3381b3fd2195c10da9fb088bf3d883 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 6 Sep 2021 19:04:45 +0300 Subject: [PATCH 101/129] [forms] let forms to use common icons --- build/appforms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/appforms.json b/build/appforms.json index 25246f1ff..12b4e77c2 100644 --- a/build/appforms.json +++ b/build/appforms.json @@ -113,7 +113,7 @@ }, "vars": { "app-image-const-path": "'../img'", - "common-image-const-path": "'../img'", + "common-image-const-path": "'../../../../common/main/resources/img/'", "app-image-path": "'../../../../../deploy/web-apps/apps/documenteditor/forms/resources/img'", "common-image-path": "'../../../../../deploy/web-apps/apps/documenteditor/forms/resources/img'" } From 88a53de31978b13ff432645b2a5e24d56347789c Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 6 Sep 2021 19:28:09 +0300 Subject: [PATCH 102/129] [mobile] Fix bug 47774 --- apps/common/mobile/utils/device.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/mobile/utils/device.jsx b/apps/common/mobile/utils/device.jsx index fe22cbfe7..783be9238 100644 --- a/apps/common/mobile/utils/device.jsx +++ b/apps/common/mobile/utils/device.jsx @@ -9,7 +9,7 @@ class WrapDevice { isMobile = /Mobile(\/|\s|;)/.test(ua); this.isPhone = /(iPhone|iPod)/.test(ua) || - (!/(Silk)/.test(ua) && (/(Android)/.test(ua) && (/(Android 2)/.test(ua) || isMobile))) || + (!/(Silk)/.test(ua) && (/(Android)/.test(ua) && !/Galaxy Tab S6|SCH-I800|Lenovo YT-X705X/.test(ua) && (/(Android 2)/.test(ua) || isMobile))) || (/(BlackBerry|BB)/.test(ua) && isMobile) || /(Windows Phone)/.test(ua); From 1a00215605ee04e78b87f75dacff53ed27eb9d9a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 6 Sep 2021 23:20:39 +0300 Subject: [PATCH 103/129] [Embedded] Fix Bug 52379 --- apps/documenteditor/embed/js/ApplicationController.js | 2 ++ .../forms/app/controller/ApplicationController.js | 2 ++ apps/presentationeditor/embed/js/ApplicationController.js | 2 ++ apps/spreadsheeteditor/embed/js/ApplicationController.js | 2 ++ 4 files changed, 8 insertions(+) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index da52b2010..c6863d569 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -610,6 +610,8 @@ DE.ApplicationController = new(function(){ if (config.customization.logo.url) { logo.attr('href', config.customization.logo.url); + } else if (config.customization.logo.url!==undefined) { + logo.removeAttr('href');logo.removeAttr('target'); } } var licType = params.asc_getLicenseType(); diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index bbd385060..499254f07 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -438,6 +438,8 @@ define([ if (this.appOptions.customization.logo.url) { logo.attr('href', this.appOptions.customization.logo.url); + } else if (this.appOptions.customization.logo.url!==undefined) { + logo.removeAttr('href');logo.removeAttr('target'); } } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 8b5f0c351..0cc2bf93e 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -465,6 +465,8 @@ PE.ApplicationController = new(function(){ if (config.customization.logo.url) { logo.attr('href', config.customization.logo.url); + } else if (config.customization.logo.url!==undefined) { + logo.removeAttr('href');logo.removeAttr('target'); } } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 91b9968b2..29c6e574e 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -363,6 +363,8 @@ SSE.ApplicationController = new(function(){ if (config.customization.logo.url) { logo.attr('href', config.customization.logo.url); + } else if (config.customization.logo.url!==undefined) { + logo.removeAttr('href');logo.removeAttr('target'); } } From a4d21050a33f5fcc1eb39b61a254d6f5d4d58b2c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 00:04:52 +0300 Subject: [PATCH 104/129] [DE] Fix editor without content control modification --- apps/documenteditor/main/app/controller/RightMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index 1885894af..d03610264 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -322,7 +322,7 @@ define([ this.rightmenu.tableSettings.UpdateThemeColors(); this.rightmenu.shapeSettings.UpdateThemeColors(); this.rightmenu.textartSettings.UpdateThemeColors(); - this.rightmenu.formSettings.UpdateThemeColors(); + this.rightmenu.formSettings && this.rightmenu.formSettings.UpdateThemeColors(); }, updateMetricUnit: function() { From f06b098bb0163504c14ad59e1df536d548edc643 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 00:06:54 +0300 Subject: [PATCH 105/129] [DE] Open forms editor for fill form mode --- apps/api/documents/api.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index c0a598c21..e3de713aa 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -868,18 +868,20 @@ check = function(regex){ return regex.test(userAgent); }, isIE = !check(/opera/) && (check(/msie/) || check(/trident/) || check(/edge/)), isChrome = !isIE && check(/\bchrome\b/), - isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0); + isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0), + path_type = "main"; path += app + "/"; - path += (config.type === "mobile" || isSafari_mobile) + path_type = (config.type === "mobile" || isSafari_mobile) ? "mobile" - : (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && - (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view')) - ? "embed" - : "main"; + : ((app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && + (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view')) + ? "forms" : (config.type === "embedded") ? "embed" + : "main"; + path += path_type; var index = "/index.html"; - if (config.editorConfig) { + if (config.editorConfig && path_type!=="forms") { var customization = config.editorConfig.customization; if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs || (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) { From 3c7358f0ad696d1bca93aae16c5dd42816834fb3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 7 Sep 2021 00:10:52 +0300 Subject: [PATCH 106/129] [all] fix menu item "checked" icon --- .../img/controls/common-controls.png | Bin 14158 -> 14186 bytes .../img/controls/common-controls@2x.png | Bin 29458 -> 29417 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png index f4b2fbe04379d3f9ddb2cb47a61d35753a406628..1aa1ff5e4f4612abed339c02c4f894029eb53207 100755 GIT binary patch literal 14186 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 Date: Tue, 7 Sep 2021 02:02:15 +0300 Subject: [PATCH 107/129] [SSE] Fix view and commenting mode. Fix Bug 52384 --- .../main/lib/controller/ReviewChanges.js | 2 +- .../main/app/controller/DocumentHolder.js | 2 +- .../main/app/controller/Main.js | 8 ++++--- .../main/app/controller/RightMenu.js | 8 ++++--- .../main/app/controller/Toolbar.js | 10 ++++++--- .../main/app/controller/WBProtection.js | 22 +++++++++++++------ 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 0c2953ccf..1ae06f6b4 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -1017,7 +1017,7 @@ define([ var wbprotect = this.getApplication().getController('WBProtection'); props = wbprotect ? wbprotect.getWSProps() : null; } - this._state.wsProps = props ? props.wsProps : {}; + this._state.wsProps = props ? props.wsProps : []; this._state.wsLock = props ? props.wsLock : false; if (!this.view) return; diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 15a11225c..ff1223e9e 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -116,7 +116,7 @@ define([ me._currentMathObj = undefined; me._currentParaObjDisabled = false; me._isDisabled = false; - me._state = {}; + me._state = {wsLock: false, wsProps: []}; me.fastcoauthtips = []; me._TtHeight = 20; /** coauthoring begin **/ diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f5f43f48a..9764b6f26 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1389,11 +1389,13 @@ define([ Common.Utils.Metric.setCurrentMetric(value); Common.Utils.InternalSettings.set("sse-settings-unit", value); - if (this.appOptions.isEdit || this.appOptions.isRestrictedEdit) { // set api events for toolbar in the Restricted Editing mode + if (this.appOptions.isRestrictedEdit) { + var toolbarController = application.getController('Toolbar'); + toolbarController && toolbarController.setApi(me.api); + application.getController('WBProtection').setMode(me.appOptions).setConfig({config: me.editorConfig}, me.api); + } else if (this.appOptions.isEdit) { // set api events for toolbar in the Restricted Editing mode var toolbarController = application.getController('Toolbar'); toolbarController && toolbarController.setApi(me.api); - - if (!this.appOptions.isEdit) return; var statusbarController = application.getController('Statusbar'), rightmenuController = application.getController('RightMenu'), diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index 00bcf8923..a1cf476a0 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -54,7 +54,7 @@ define([ initialize: function() { this.editMode = true; - this._state = {}; + this._state = {wsLock: false, wsProps: []}; this.addListeners({ 'Toolbar': { @@ -456,8 +456,10 @@ define([ var wbprotect = this.getApplication().getController('WBProtection'); props = wbprotect ? wbprotect.getWSProps() : null; } - this._state.wsProps = props.wsProps; - this._state.wsLock = props.wsLock; + if (props) { + this._state.wsProps = props.wsProps; + this._state.wsLock = props.wsLock; + } this.onSelectionChanged(this.api.asc_getCellInfo()); } }); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index e045f7e44..cc434b41b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -426,9 +426,10 @@ define([ this.api.asc_registerCallback('asc_onUnLockCFManager', _.bind(this.onUnLockCFManager, this)); this.api.asc_registerCallback('asc_onZoomChanged', _.bind(this.onApiZoomChange, this)); Common.NotificationCenter.on('fonts:change', _.bind(this.onApiChangeFont, this)); - } else if (config.isRestrictedEdit) + } else if (config.isRestrictedEdit) { this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChangedRestricted, this)); - + Common.NotificationCenter.on('protect:wslock', _.bind(this.onChangeProtectSheet, this)); + } }, // onNewDocument: function(btn, e) { @@ -2913,10 +2914,13 @@ define([ }, onApiSelectionChangedRestricted: function(info) { + if (!this.appConfig.isRestrictedEdit) return; + var selectionType = info.asc_getSelectionType(); this.toolbar.lockToolbar(SSE.enumLock.commentLock, (selectionType == Asc.c_oAscSelectionType.RangeCells) && (!info.asc_getComments() || info.asc_getComments().length>0 || info.asc_getLocked()) || this.appConfig && this.appConfig.compatibleFeatures && (selectionType != Asc.c_oAscSelectionType.RangeCells), { array: this.btnsComment }); + this.toolbar.lockToolbar(SSE.enumLock['Objects'], !!this._state.wsProps['Objects'], { array: this.btnsComment }); }, onApiSelectionChanged_DiagramEditor: function(info) { @@ -4065,7 +4069,7 @@ define([ this.toolbar.lockToolbar(SSE.enumLock.wsLock, this._state.wsLock); this.toolbar.lockToolbar(SSE.enumLock['InsertHyperlinks'], this._state.wsProps['InsertHyperlinks'], {array: [this.toolbar.btnInsertHyperlink]}); - this.onApiSelectionChanged(this.api.asc_getCellInfo()); + this.appConfig && this.appConfig.isEdit ? this.onApiSelectionChanged(this.api.asc_getCellInfo()) : this.onApiSelectionChangedRestricted(this.api.asc_getCellInfo()); } }, diff --git a/apps/spreadsheeteditor/main/app/controller/WBProtection.js b/apps/spreadsheeteditor/main/app/controller/WBProtection.js index 9590cbc02..a1e17fbb8 100644 --- a/apps/spreadsheeteditor/main/app/controller/WBProtection.js +++ b/apps/spreadsheeteditor/main/app/controller/WBProtection.js @@ -98,15 +98,16 @@ define([ setMode: function(mode) { this.appConfig = mode; - this.view = this.createView('WBProtection', { + this.appConfig.isEdit && (this.view = this.createView('WBProtection', { mode: mode - }); + })); return this; }, createToolbarPanel: function() { - return this.view.getPanel(); + if (this.view) + return this.view.getPanel(); }, getView: function(name) { @@ -270,6 +271,8 @@ define([ }, onAppReady: function (config) { + if (!this.view) return; + var me = this; (new Promise(function (resolve) { resolve(); @@ -284,15 +287,17 @@ define([ }, onChangeProtectWorkbook: function() { - this.view.btnProtectWB.toggle(this.api.asc_isProtectedWorkbook(), true); + this.view && this.view.btnProtectWB.toggle(this.api.asc_isProtectedWorkbook(), true); }, onChangeProtectSheet: function() { var props = this.getWSProps(true); - this.view.btnProtectSheet.toggle(props.wsLock, true); //current sheet - Common.Utils.lockControls(SSE.enumLock['Objects'], props.wsProps['Objects'], { array: [this.view.chLockedText, this.view.chLockedShape]}); - Common.Utils.lockControls(SSE.enumLock.wsLock, props.wsLock, { array: [this.view.btnAllowRanges]}); + if (this.view) { + this.view.btnProtectSheet.toggle(props.wsLock, true); //current sheet + Common.Utils.lockControls(SSE.enumLock['Objects'], props.wsProps['Objects'], { array: [this.view.chLockedText, this.view.chLockedShape]}); + Common.Utils.lockControls(SSE.enumLock.wsLock, props.wsLock, { array: [this.view.btnAllowRanges]}); + } Common.NotificationCenter.trigger('protect:wslock', props); }, @@ -301,6 +306,8 @@ define([ }, getWSProps: function(update) { + if (!this.appConfig || !this.appConfig.isEdit && !this.appConfig.isRestrictedEdit) return; + if (update || !this._state.protection) { var wsProtected = !!this.api.asc_isProtectedSheet(); var arr = []; @@ -322,6 +329,7 @@ define([ }, onApiSelectionChanged: function(info) { + if (!this.view) return; if ($('.asc-window.enable-key-events:visible').length>0) return; var selectionType = info.asc_getSelectionType(); From 8c55b7cf649cc5857f48ee4ae82cfe06b8393184 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 13:39:38 +0300 Subject: [PATCH 108/129] [DE][PE] Fix Bug 52335 --- .../main/lib/template/AutoCorrectDialog.template | 5 ++++- apps/common/main/lib/view/AutoCorrectDialog.js | 16 ++++++++++++++-- apps/documenteditor/main/app/controller/Main.js | 4 ++++ apps/documenteditor/main/locale/en.json | 1 + .../main/app/controller/Main.js | 4 ++++ apps/presentationeditor/main/locale/en.json | 1 + 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index b682a1e0a..6bded0028 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -98,8 +98,11 @@

    -
    +
    +
    +
    +
    diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 67741da94..4d813d42c 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -337,6 +337,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', me.api.asc_SetAutoCorrectFirstLetterOfSentences && me.api.asc_SetAutoCorrectFirstLetterOfSentences(checked); }); + this.chFLCells = new Common.UI.CheckBox({ + el: $window.find('#id-autocorrect-dialog-chk-fl-cells'), + labelText: this.textFLCells, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-cells") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-fl-cells", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-fl-cells", checked); + me.api.asc_SetAutoCorrectFirstLetterOfCells && me.api.asc_SetAutoCorrectFirstLetterOfCells(checked); + }); + this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false)); } else if (this.appPrefix=='sse-') { this.chNewRows = new Common.UI.CheckBox({ @@ -384,7 +395,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.chHyperlink // 2 tab ]; arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]); - arr = arr.concat(this.chFLSentence ? [this.chFLSentence] : []); + arr = arr.concat(this.chFLSentence ? [this.chFLSentence, this.chFLCells] : []); return arr; }, @@ -829,7 +840,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', textNewRowCol: 'Include new rows and columns in table', textAutoCorrect: 'AutoCorrect', textFLSentence: 'Capitalize first letter of sentences', - textHyperlink: 'Internet and network paths with hyperlinks' + textHyperlink: 'Internet and network paths with hyperlinks', + textFLCells: 'Capitalize first letter of table cells' }, Common.Views.AutoCorrectDialog || {})) }); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index a8e39c689..60de9f914 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2611,6 +2611,10 @@ define([ value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value); me.api.asc_SetAutoCorrectHyperlinks(value); + + value = Common.localStorage.getBool("de-settings-autoformat-fl-cells", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-fl-cells", value); + me.api.asc_SetAutoCorrectFirstLetterOfCells(value); }, showRenameUserDialog: function() { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 7d178ffce..ac40e9945 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -233,6 +233,7 @@ "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", + "Common.Views.AutoCorrectDialog.textFLCells": "Capitalize first letter of table cells", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.mniAuthorAsc": "Author A to Z", "Common.Views.Comments.mniAuthorDesc": "Author Z to A", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2de52dfd8..c8f9d7bf9 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2233,6 +2233,10 @@ define([ value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value); me.api.asc_SetAutoCorrectHyperlinks(value); + + value = Common.localStorage.getBool("pe-settings-autoformat-fl-cells", true); + Common.Utils.InternalSettings.set("pe-settings-autoformat-fl-cells", value); + me.api.asc_SetAutoCorrectFirstLetterOfCells && me.api.asc_SetAutoCorrectFirstLetterOfCells(value); }, showRenameUserDialog: function() { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 8af78e0a2..61dcfd35d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -126,6 +126,7 @@ "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", + "Common.Views.AutoCorrectDialog.textFLCells": "Capitalize first letter of table cells", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.mniAuthorAsc": "Author A to Z", "Common.Views.Comments.mniAuthorDesc": "Author Z to A", From 9cb43ef5253b0c0223ec57f7a4ec65c600bfdb3d Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 7 Sep 2021 13:44:36 +0300 Subject: [PATCH 109/129] [DE PE SSE] Fix bug 50155 --- apps/common/main/lib/view/SearchDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js index 41b1efb62..142dfa690 100644 --- a/apps/common/main/lib/view/SearchDialog.js +++ b/apps/common/main/lib/view/SearchDialog.js @@ -87,10 +87,10 @@ '
    ', '
    ', '', - '', + '', '
    ', '
    ', - '', + '', '
    ', '
    ', '', From 6eb6cb1db5bb402d7a9afe2b85ac2e7ce4cc387e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 19:54:22 +0300 Subject: [PATCH 110/129] [DE] Check page size and page margins when select preset from toolbar. Bug 44180 --- .../main/app/controller/Toolbar.js | 58 +++++++++++++------ .../main/app/view/PageSizeDialog.js | 5 ++ 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 8b7114bd4..9c9a1d09f 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1688,12 +1688,18 @@ define([ onPageSizeClick: function(menu, item, state) { if (this.api && state) { this._state.pgsize = [0, 0]; - if (item.value !== 'advanced') - this.api.change_DocSize(item.value[0], item.value[1]); - else { + if (item.value !== 'advanced') { + if (this.checkPageSize(item.value[0], item.value[1])) { + var section = this.api.asc_GetSectionProps(); + this.onApiPageSize(section.get_W(), section.get_H()); + return; + } else + this.api.change_DocSize(item.value[0], item.value[1]); + } else { var win, props, me = this; win = new DE.Views.PageSizeDialog({ + checkPageSize: _.bind(this.checkPageSize, this), handler: function(dlg, result) { if (result == 'ok') { props = dlg.getSettings(); @@ -1716,22 +1722,8 @@ define([ if (this.api) { this._state.pgmargins = undefined; if (item.value !== 'advanced') { - var section = this.api.asc_GetSectionProps(), - errmsg = null, - me = this; - if (item.value[1] + item.value[3] > parseFloat(section.get_W().toFixed(4))-12.7 ) - errmsg = this.txtMarginsW; - else if (item.value[0] + item.value[2] > parseFloat(section.get_H().toFixed(4))-2.6 ) - errmsg = this.txtMarginsH; - if (errmsg) { - Common.UI.warning({ - title: this.notcriticalErrorTitle, - msg : errmsg, - callback: function() { - Common.NotificationCenter.trigger('edit:complete', me.toolbar); - } - }); - this.onSectionProps(section); + if (this.checkPageSize(undefined, undefined, item.value[1], item.value[3], item.value[0], item.value[2])) { + this.onSectionProps(this.api.asc_GetSectionProps()); return; } else { var props = new Asc.CDocumentSectionProps(); @@ -1774,6 +1766,34 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, + checkPageSize: function(width, height, left, right, top, bottom) { + var section = this.api.asc_GetSectionProps(); + (width===undefined) && (width = parseFloat(section.get_W().toFixed(4))); + (height===undefined) && (height = parseFloat(section.get_H().toFixed(4))); + (left===undefined) && (left = parseFloat(section.get_LeftMargin().toFixed(4))); + (right===undefined) && (right = parseFloat(section.get_RightMargin().toFixed(4))); + (top===undefined) && (top = parseFloat(section.get_TopMargin().toFixed(4))); + (bottom===undefined) && (bottom = parseFloat(section.get_BottomMargin().toFixed(4))); + var gutterLeft = section.get_GutterAtTop() ? 0 : parseFloat(section.get_Gutter().toFixed(4)), + gutterTop = section.get_GutterAtTop() ? parseFloat(section.get_Gutter().toFixed(4)) : 0; + + var errmsg = null; + if (left + right + gutterLeft > width-12.7 ) + errmsg = this.txtMarginsW; + else if (top + bottom + gutterTop > height-2.6 ) + errmsg = this.txtMarginsH; + if (errmsg) { + Common.UI.warning({ + title: this.notcriticalErrorTitle, + msg : errmsg, + callback: function() { + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + } + }); + return true; + } + }, + onLineNumbersSelect: function(menu, item) { if (_.isUndefined(item.value)) return; diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 4b080b633..445c010cb 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -179,6 +179,11 @@ define([ _handleInput: function(state) { if (this.options.handler) { + if (state == 'ok' && this.options.checkPageSize) { + var props = this.getSettings(); + if (this.options.checkPageSize(props[0], props[1])) + return; + } this.options.handler.call(this, this, state); } From a7d388b996519f2319df4bf552c2f1e7806f1171 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 20:58:45 +0300 Subject: [PATCH 111/129] [DE] Fix custom page size --- apps/common/main/lib/component/MetricSpinner.js | 8 ++++++++ apps/documenteditor/main/app/view/FormSettings.js | 2 +- apps/documenteditor/main/app/view/PageSizeDialog.js | 8 ++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js index 4e384e287..3ebe658c6 100644 --- a/apps/common/main/lib/component/MetricSpinner.js +++ b/apps/common/main/lib/component/MetricSpinner.js @@ -242,6 +242,14 @@ define([ this.options.step = step; }, + getMinValue: function(){ + return this.options.minValue; + }, + + getMaxValue: function(){ + return this.options.maxValue; + }, + getNumberValue: function(){ return this.checkAutoText(this.value) ? -1 : parseFloat(this.value); }, diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index d5f0e6a70..129e22246 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -1079,7 +1079,7 @@ define([ val = this.api.asc_GetTextFormAutoWidth(); if ( (this._state.WidthPlaceholder!==val) || Math.abs(this._state.WidthPlaceholder-val)>0.01) { - this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM((val+1) * 25.4 / 20 / 72.0) : this.spnWidth.options.minValue); + this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM((val+1) * 25.4 / 20 / 72.0) : this.spnWidth.getMinValue()); this._state.WidthPlaceholder=val; } diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 445c010cb..44655c846 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -157,8 +157,12 @@ define([ this._noApply = true; if (record.value<0) { } else { - this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[0] : record.size[1]), true); - this.spnHeight.setValue(Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[1] : record.size[0]), true); + var w = Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[0] : record.size[1]), + h = Common.Utils.Metric.fnRecalcFromMM(this.isOrientPortrait ? record.size[1] : record.size[0]); + if (w Date: Wed, 8 Sep 2021 14:55:00 +0300 Subject: [PATCH 112/129] [SSE] Change position func menu when cell editor is focused --- .../main/app/controller/DocumentHolder.js | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index ff1223e9e..bdd853d88 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2501,12 +2501,20 @@ define([ menu.cmpEl.attr({tabindex: "-1"}); } - var coord = me.api.asc_getActiveCellCoord(), - showPoint = [coord.asc_getX() + (offset ? offset[0] : 0), (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + (offset ? offset[1] : 0)]; - menuContainer.css({left: showPoint[0], top : showPoint[1]}); + var infocus = me.cellEditor.is(":focus"); + + if (infocus) { + menu.menuAlignEl = me.cellEditor; + me.focusInCellEditor = true; + } else { + menu.menuAlignEl = undefined; + me.focusInCellEditor = false; + var coord = me.api.asc_getActiveCellCoord(), + showPoint = [coord.asc_getX() + (offset ? offset[0] : 0), (coord.asc_getY() < 0 ? 0 : coord.asc_getY()) + coord.asc_getHeight() + (offset ? offset[1] : 0)]; + menuContainer.css({left: showPoint[0], top : showPoint[1]}); + } menu.alignPosition(); - var infocus = me.cellEditor.is(":focus"); if (!menu.isVisible()) Common.UI.Menu.Manager.hideAll(); _.delay(function() { @@ -2571,12 +2579,19 @@ define([ functip.isHidden = false; } - var pos = [ - this.documentHolder.cmpEl.offset().left - $(window).scrollLeft(), - this.documentHolder.cmpEl.offset().top - $(window).scrollTop() - ], - coord = this.api.asc_getActiveCellCoord(), + var infocus = this.cellEditor.is(":focus"), + showPoint; + if (infocus || this.focusInCellEditor) { + var offset = this.cellEditor.offset(); + showPoint = [offset.left, offset.top + this.cellEditor.height() + 3]; + } else { + var pos = [ + this.documentHolder.cmpEl.offset().left - $(window).scrollLeft(), + this.documentHolder.cmpEl.offset().top - $(window).scrollTop() + ], + coord = this.api.asc_getActiveCellCoord(); showPoint = [coord.asc_getX() + pos[0] - 3, coord.asc_getY() + pos[1] - functip.ref.getBSTip().$tip.height() - 5]; + } var tipwidth = functip.ref.getBSTip().$tip.width(); if (showPoint[0] + tipwidth > this.tooltips.coauth.bodyWidth ) showPoint[0] = this.tooltips.coauth.bodyWidth - tipwidth; From d0810f43635032b7ebbec49a9e6abd1099ab4398 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 9 Sep 2021 23:07:27 +0300 Subject: [PATCH 113/129] [PE] Change shape menu in toolbar (bug 43485) --- apps/common/main/lib/component/DataView.js | 71 ++++++++++++++++++- .../main/app/view/Toolbar.js | 46 +++++------- .../main/resources/less/app.less | 14 ++++ 3 files changed, 100 insertions(+), 31 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 1fc31a77f..ea0a56769 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -874,7 +874,8 @@ define([ this.cmpEl.html(this.template({ items: me.store.toJSON(), itemTemplate: me.itemTemplate, - style: me.style + style: me.style, + options: me.options })); } var modalParents = this.cmpEl.closest('.asc-window'); @@ -1257,4 +1258,72 @@ define([ } }, 100); }); + + Common.UI.DataViewShape = Common.UI.DataViewSimple.extend(_.extend({ + template: _.template([ + '
    ', + '<% _.each(options.groups, function(group) { %>', + '
    ', + '<% if (!_.isEmpty(group.groupName)) { %>', + '
    ', + '<%= group.groupName %>', + '
    ', + '<% } %>', + '
    ', + '<% _.each(group.groupStore.toJSON(), function(item) { %>', + '<% if (!item.id) item.id = Common.UI.getId(); %>', + '
    data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
    ', + '<% }); %>', + '
    ', + '
    ', + '<% }); %>', + '
    ' + ].join('')), + onAfterShowMenu: function(e) { + if (!this.dataViewItems) { + var me = this; + _.each(me.options.groups, function (group) { + me.store.models = me.store.models.concat(group.groupStore.models); + }); + this.dataViewItems = []; + _.each(me.cmpEl.find('div.grouped-data'), function (group, indexGroup) { + _.each($(group).find('div.item'), function (item, index) { + var $item = $(item), + rec = me.options.groups.at(indexGroup).groupStore.at(index); + me.dataViewItems.push({el: $item, groupIndex: indexGroup, index: index}); + if (rec.get('tip')) { + $item.tooltip({ + title: rec.get('tip'), + placement: 'cursor', + zIndex: me.tipZIndex + }); + } + }); + }); + } + }, + onClickItem: function(e) { + if ( this.disabled ) return; + + window._event = e; // for FireFox only + + var groupIndex = $(e.currentTarget).closest('div.grouped-data').index(), + itemIndex = $(e.currentTarget).closest('div.item').index(); + var index = _.findIndex(this.dataViewItems, function (item) { + return (item.groupIndex === groupIndex && item.index === itemIndex); + }); + var record = (index>=0) ? this.store.at(index) : null, + view = (index>=0) ? this.dataViewItems[index] : null; + if (!record || !view) return; + + record.set({selected: true}); + var tip = view.el.data('bs.tooltip'); + if (tip) (tip.tip()).remove(); + + if (!this.isSuspendEvents) { + this.trigger('item:click', this, view.el, record, e); + } + } + })); + }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index b6db11ec8..34da06d31 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1688,38 +1688,24 @@ define([ updateAutoshapeMenu: function (menuShape, collection) { var me = this; - var onShowAfter = function(menu) { - for (var i = 0; i < collection.length; i++) { - var shapePicker = new Common.UI.DataViewSimple({ - el: $('.shapegroup-' + i, menu.items[i].$el), - store: collection.at(i).get('groupStore'), - parentMenu: menu.items[i].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (e.type !== 'click') Common.UI.Menu.Manager.hideAll(); - if (record) - me.fireEvent('insert:shape', [record.get('data').shapeType]); - }); - } - menu.off('show:after', onShowAfter); - }; - menuShape.on('show:after', onShowAfter); - for (var i = 0; i < collection.size(); i++) { - var group = collection.at(i); + var menuitem = new Common.UI.MenuItem({ + template: _.template('') + }); + menuShape.addItem(menuitem); - var menuitem = new Common.UI.MenuItem({ - caption: group.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tl-tr', - items: [ - {template: _.template('
    ')} - ] - }) - }); - menuShape.addItem(menuitem); - } + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-toolbar-menu-insertshape'), + itemTemplate: _.template('
    \">
    '), + groups: collection.toJSON(), + parentMenu: menuShape, + restoreHeight: true + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (e.type !== 'click') Common.UI.Menu.Manager.hideAll(); + if (record) + me.fireEvent('insert:shape', [record.get('data').shapeType]); + }); }, updateAddSlideMenu: function(collection) { diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 8a80c847c..a97cba396 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -255,4 +255,18 @@ } } } +} + +.menu-shapes { + width: 358px; + padding-top: 8px; + .menu-insertshape { + margin: 5px 5px 0 10px; + .group-description { + padding-left: 4px; + } + } + .dataview .grouped-data .group-items-container .item { + box-shadow: none; + } } \ No newline at end of file From 7e661deea31223efc505648fee151d163a301b2f Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Fri, 10 Sep 2021 10:32:39 +0300 Subject: [PATCH 114/129] [DE] Fix context menu for combo box in view form mode --- apps/documenteditor/main/app/view/DocumentHolder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 8278238a0..6aa5b1722 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2051,7 +2051,7 @@ define([ canComment = canComment && !(spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime); - canEditControl = spectype !== undefined && spectype === Asc.c_oAscContentControlSpecificType.None && !control_lock; + canEditControl = spectype !== undefined && (spectype === Asc.c_oAscContentControlSpecificType.None || spectype === Asc.c_oAscContentControlSpecificType.ComboBox) && !control_lock; } menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); From ce84feba05f07cb814d92e68eae7e501d4123481 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 14 Sep 2021 15:50:17 +0300 Subject: [PATCH 115/129] [PE] Add recent shapes into shape menu in toolbar (bug 43485) --- apps/common/main/lib/component/DataView.js | 115 +++++++++++++++++- .../main/app/view/Toolbar.js | 9 +- 2 files changed, 116 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index ea0a56769..f9330fdf0 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1089,6 +1089,8 @@ define([ if (data.keyCode==Common.UI.Keys.RETURN) { if (this.selectedBeforeHideRec) // only for ComboDataView menuPicker rec = this.selectedBeforeHideRec; + if (this.canAddRecents) // only for DaraViewShape + this.addRecentItem(rec); this.trigger('item:click', this, this, rec, e); if (this.parentMenu) this.parentMenu.hide(); @@ -1262,14 +1264,14 @@ define([ Common.UI.DataViewShape = Common.UI.DataViewSimple.extend(_.extend({ template: _.template([ '
    ', - '<% _.each(options.groups, function(group) { %>', - '
    ', + '<% _.each(options.groups, function(group, index) { %>', + '
    style="display: none;" <% } %>>', '<% if (!_.isEmpty(group.groupName)) { %>', '
    ', '<%= group.groupName %>', '
    ', '<% } %>', - '
    ', + '
    ', '<% _.each(group.groupStore.toJSON(), function(item) { %>', '<% if (!item.id) item.id = Common.UI.getId(); %>', '
    data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
    ', @@ -1279,12 +1281,42 @@ define([ '<% }); %>', '
    ' ].join('')), + initialize : function(options) { + var me = this; + this.canAddRecents = true; + + me.groups = options.groups; + + // add recent shapes to store + var recentStore = new Backbone.Collection([], {model: PE.Models.ShapeModel}), + recentArr = options.recentShapes || [], + cols = (recentArr.length) > 18 ? 7 : 6, + height = Math.ceil(recentArr.length/cols) * 35 + 3, + width = 30 * cols; + + me.recentShapes = recentArr; + + recentStore.add(recentArr); + me.groups.unshift({ + groupName : options.textRecentlyUsed, + groupStore : recentStore, + groupWidth : width, + groupHeight : height + }); + + var store = new Common.UI.DataViewStore(); + + _.each(me.groups, function (group) { + store.add(group.groupStore.models); + }); + + options.store = store; + + Common.UI.DataViewSimple.prototype.initialize.call(this, options); + }, onAfterShowMenu: function(e) { if (!this.dataViewItems) { var me = this; - _.each(me.options.groups, function (group) { - me.store.models = me.store.models.concat(group.groupStore.models); - }); this.dataViewItems = []; _.each(me.cmpEl.find('div.grouped-data'), function (group, indexGroup) { _.each($(group).find('div.item'), function (item, index) { @@ -1302,6 +1334,7 @@ define([ }); } }, + onClickItem: function(e) { if ( this.disabled ) return; @@ -1323,6 +1356,76 @@ define([ if (!this.isSuspendEvents) { this.trigger('item:click', this, view.el, record, e); } + + this.addRecentItem(record); + }, + addRecentItem: function (rec) { + var me = this; + var len = me.recentShapes.length; + + var item = rec.toJSON(), + model = { + data: item.data, + tip: item.tip, + allowSelected: item.allowSelected, + selected: false + }; + me.recentShapes.unshift(model); + if (me.recentShapes.length > 12) { + me.recentShapes.splice(12, 1); + } + + me.groups.at(0).groupStore.reset(me.recentShapes); + + var store = new Common.UI.DataViewStore(); + _.each(me.groups, function (group) { + store.add(group.groupStore.models); + }); + me.store = store; + + // add recent item in dataViewItems + for (var i = 0; i < len; i++) { + var tip = me.dataViewItems[i].el.data('bs.tooltip'); + if (tip) { + if (tip.dontShow===undefined) + tip.dontShow = true; + (tip.tip()).remove(); + } + } + me.dataViewItems = me.dataViewItems.slice(len); + + var template = _.template([ + '<% _.each(items, function(item) { %>', + '<% if (!item.id) item.id = Common.UI.getId(); %>', + '
    data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
    ', + '<% }) %>' + ].join('')); + this.cmpEl && this.cmpEl.find('.recent-items').html(template({ + items: me.recentShapes, + itemTemplate: this.itemTemplate, + style : this.style + })); + var recentViewItems = []; + _.each($('.recent-group').find('div.item'), function (item, index) { + var $item = $(item), + rec = me.recentShapes[index]; + recentViewItems.push({el: $item, groupIndex: 0, index: index}); + if (rec.tip) { + $item.tooltip({ + title: rec.tip, + placement: 'cursor', + zIndex: me.tipZIndex + }); + } + }); + me.dataViewItems = recentViewItems.concat(me.dataViewItems); + me.fillIndexesArray(); + + // add recent item in local storage + if (me.recentShapes.length === 1) { + $('.recent-group').show(); + } + Common.localStorage.setItem('pe-recent-shapes', JSON.stringify(me.recentShapes)); } })); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 34da06d31..e61ef9e40 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1694,12 +1694,16 @@ define([ }); menuShape.addItem(menuitem); + var recents = Common.localStorage.getItem('pe-recent-shapes'); + var shapePicker = new Common.UI.DataViewShape({ el: $('#id-toolbar-menu-insertshape'), itemTemplate: _.template('
    \">
    '), groups: collection.toJSON(), parentMenu: menuShape, - restoreHeight: true + restoreHeight: true, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null }); shapePicker.on('item:click', function(picker, item, record, e) { if (e.type !== 'click') Common.UI.Menu.Manager.hideAll(); @@ -1912,7 +1916,8 @@ define([ strMenuNoFill: 'No Fill', tipHighlightColor: 'Highlight color', txtScheme22: 'New Office', - textTabTransitions: 'Transitions' + textTabTransitions: 'Transitions', + textRecentlyUsed: 'Recently Used' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file From 879de8f90278e002751c30c6c84dce17979c66d5 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 14 Sep 2021 19:48:14 +0300 Subject: [PATCH 116/129] [PE] Fix shape menu (bug 43485) --- apps/common/main/lib/component/DataView.js | 4 ++-- apps/presentationeditor/main/app/view/Toolbar.js | 8 +++++--- apps/presentationeditor/main/resources/less/app.less | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index f9330fdf0..12086f023 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1371,8 +1371,8 @@ define([ selected: false }; me.recentShapes.unshift(model); - if (me.recentShapes.length > 12) { - me.recentShapes.splice(12, 1); + if (me.recentShapes.length > 14) { + me.recentShapes.splice(14, 1); } me.groups.at(0).groupStore.reset(me.recentShapes); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index e61ef9e40..a7cfddcc4 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1687,17 +1687,19 @@ define([ }, updateAutoshapeMenu: function (menuShape, collection) { - var me = this; + var me = this, + index = $(menuShape.el).prop('id').slice(-1); var menuitem = new Common.UI.MenuItem({ - template: _.template('') + template: _.template(''), + index: index }); menuShape.addItem(menuitem); var recents = Common.localStorage.getItem('pe-recent-shapes'); var shapePicker = new Common.UI.DataViewShape({ - el: $('#id-toolbar-menu-insertshape'), + el: $('#id-toolbar-menu-insertshape-'+index), itemTemplate: _.template('
    \">
    '), groups: collection.toJSON(), parentMenu: menuShape, diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index a97cba396..535340819 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -258,7 +258,7 @@ } .menu-shapes { - width: 358px; + width: 362px; padding-top: 8px; .menu-insertshape { margin: 5px 5px 0 10px; @@ -268,5 +268,6 @@ } .dataview .grouped-data .group-items-container .item { box-shadow: none; + margin: 2px 2px 2px; } } \ No newline at end of file From e83908807920cc4666879eb2c4a209b936b21c4a Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Wed, 15 Sep 2021 15:21:49 +0300 Subject: [PATCH 117/129] [DE PE SSE] Fix Bug 52260 --- apps/documenteditor/mobile/locale/en.json | 1 + apps/documenteditor/mobile/locale/ru.json | 1 + .../mobile/src/view/edit/Edit.jsx | 20 +- .../mobile/src/view/edit/EditChart.jsx | 238 ++++++++++------- apps/presentationeditor/mobile/locale/en.json | 1 + apps/presentationeditor/mobile/locale/ru.json | 1 + .../mobile/src/view/edit/Edit.jsx | 20 +- .../mobile/src/view/edit/EditChart.jsx | 239 ++++++++++------- .../mobile/src/view/edit/Edit.jsx | 20 +- .../mobile/src/view/edit/EditChart.jsx | 240 +++++++++++------- 10 files changed, 502 insertions(+), 279 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 626c53d84..1d3a67747 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -230,6 +230,7 @@ "textEditLink": "Edit Link", "textEffects": "Effects", "textEmptyImgUrl": "You need to specify image URL.", + "textDesign": "Design", "textFill": "Fill", "textFirstColumn": "First Column", "textFirstLine": "FirstLine", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 617af97a1..9ae740788 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -213,6 +213,7 @@ "textBefore": "Перед", "textBehind": "За текстом", "textBorder": "Граница", + "textDesign": "Вид", "textBringToForeground": "Перенести на передний план", "textBullets": "Маркеры", "textBulletsAndNumbers": "Маркеры и нумерация", diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 7554124c2..de502b81f 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -19,7 +19,7 @@ import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape"; import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage"; import {PageTableOptions, PageTableWrap, PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor} from "./EditTable"; -import {PageChartStyle, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartWrap, PageChartReorder} from "./EditChart"; +import {PageChartDesign, PageChartDesignType, PageChartDesignStyle, PageChartDesignFill, PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartWrap, PageChartReorder} from "./EditChart"; const routes = [ //Edit text @@ -156,9 +156,25 @@ const routes = [ path: '/edit-chart-reorder/', component: PageChartReorder, }, + { + path: '/edit-chart-design/', + component: PageChartDesign, + }, + { + path: '/edit-chart-type/', + component: PageChartDesignType + }, { path: '/edit-chart-style/', - component: PageChartStyle, + component: PageChartDesignStyle + }, + { + path: '/edit-chart-fill/', + component: PageChartDesignFill + }, + { + path: '/edit-chart-border/', + component: PageChartDesignBorder }, { path: '/edit-chart-custom-fill-color/', diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 6d0981d07..61effc4ee 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -139,21 +139,100 @@ const PageBorderColor = props => { ) }; -const PageStyle = props => { +const PageChartType = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; - const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; const types = storeChartSettings.types; - const curType = chartProperties ? chartProperties.getType() : null; - const chartStyles = storeChartSettings.chartStyles; - const isAndroid = Device.android; - // console.log(chartStyles, curType); - // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); + const storeFocusObjects = props.storeFocusObjects; + const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); + const curType = chartProperties && chartProperties.getType(); + return ( + + + +
    +
    + {types.map((row, rowIndex) => { + return ( +
      + {row.map((type, index)=>{ + return( +
    • {props.onType(type.type)}}> +
      +
      +
      • + ) + })} +
    + ) + })} +
    +
    +     + ) +} + +const PageChartStyle = props => { + const { t } = useTranslation(); + const _t = t('Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; + const chartStyles = storeChartSettings.chartStyles; + return ( + + + + {chartStyles ? +
    +
    +
      + {styles ? styles.map((row, rowIndex) => { + return ( + row.map((style, index)=>{ + return( +
    • {props.onStyle(style.asc_getName())}}> + +
      • + ) + }) + ) + }) :
      {_t.textNoStyles}
      + } +
    +
    +
    + : null} +     + ) +} + +const PageChartDesignFill = props => { + const { t } = useTranslation(); + const _t = t('Edit', {returnObjects: true}); + + return ( + + +
    + +
    +     + ) +} + +const PageChartBorder = props => { + const { t } = useTranslation(); + const _t = t('Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; const shapeObject = props.storeFocusObjects.shapeObject; + let borderSize, borderType, borderColor; if (shapeObject) { const shapeStroke = shapeObject.get_ShapeProperties().get_stroke(); @@ -171,6 +250,46 @@ const PageStyle = props => { // Init border color const displayBorderColor = borderColor !== 'transparent' ? `#${(typeof borderColor === "object" ? borderColor.color : borderColor)}` : borderColor; + + return ( + + + +
    + + +
    {_t.textSize}
    +
    + {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} + onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} + > +
    +
    + {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} +
    +     + + + +     +
    +     + ) +} + +const PageDesign = props => { + const { t } = useTranslation(); + const _t = t('Edit', {returnObjects: true}); + const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; + + // console.log(chartStyles, curType); + // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); if (!chartProperties && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); @@ -179,14 +298,7 @@ const PageStyle = props => { return ( - -
    - {_t.textType} - {chartStyles ? {_t.textStyle} : null} - {_t.textFill} - {_t.textBorder} - {isAndroid && } -
    + {Device.phone && @@ -195,78 +307,17 @@ const PageStyle = props => { } - - -
    - {types.map((row, rowIndex) => { - return ( -
      - {row.map((type, index)=>{ - return( -
    • {props.onType(type.type)}}> -
      -
      -
      • - ) - })} -
    - ) - })} -
    -     - {chartStyles ? - -
    - {styles ? styles.map((row, rowIndex) => { - return ( -
      - {row.map((style, index)=>{ - return( -
    • {props.onStyle(style.asc_getName())}}> - -
      • - ) - })} -
    - ) - }) : -
    {_t.textNoStyles}
    - } -
    -     - : null} - - - - - - -
    {_t.textSize}
    -
    - {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} - onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} - > -
    -
    - {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} -
    -     - - - -     -     -     + + + + + + + +     ) }; @@ -430,7 +481,7 @@ const EditChart = props => { return ( - { ) }; -const PageChartStyle = inject("storeChartSettings", "storeFocusObjects")(observer(PageStyle)); +const PageChartDesign = inject("storeChartSettings", "storeFocusObjects")(observer(PageDesign)); +const PageChartDesignType = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartType)); +const PageChartDesignStyle = inject("storeChartSettings")(observer(PageChartStyle)); +const PageChartDesignBorder = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartBorder)); const PageChartWrap = inject("storeChartSettings", "storeFocusObjects")(observer(PageWrap)); const PageChartReorder = inject("storeFocusObjects")(observer(PageReorder)); const PageChartCustomFillColor = inject("storeChartSettings", "storePalette")(observer(PageCustomFillColor)); @@ -463,7 +517,11 @@ const PageChartBorderColor = inject("storeChartSettings", "storePalette")(observ const PageChartCustomBorderColor = inject("storeChartSettings", "storePalette")(observer(PageCustomBorderColor)); export {EditChart, - PageChartStyle, + PageChartDesign, + PageChartDesignType, + PageChartDesignStyle, + PageChartDesignFill, + PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index eb61a4bb9..89e9d041b 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -286,6 +286,7 @@ "textDoubleStrikethrough": "Double Strikethrough", "textDuplicateSlide": "Duplicate Slide", "textDuration": "Duration", + "textDesign": "Design", "textEditLink": "Edit Link", "textEffect": "Effect", "textEffects": "Effects", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index 7a3a65a2d..18c95443c 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -369,6 +369,7 @@ "textText": "Текст", "textTheme": "Тема", "textTop": "Сверху", + "textDesign": "Вид", "textTopLeft": "Сверху слева", "textTopRight": "Сверху справа", "textTotalRow": "Строка итогов", diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 6bf147ace..e6cbde1b1 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -18,7 +18,7 @@ import { PageTextFonts, PageTextFontColor, PageTextCustomFontColor, PageTextAddF import { PageShapeStyle, PageShapeStyleNoFill, PageReplaceContainer, PageReorderContainer, PageAlignContainer, PageShapeBorderColor, PageShapeCustomBorderColor, PageShapeCustomFillColor } from './EditShape'; import { PageImageReplace, PageImageReorder, PageImageAlign, PageLinkSettings } from './EditImage'; import { PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor, PageTableReorder, PageTableAlign } from './EditTable'; -import { PageChartStyle, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartReorder, PageChartAlign } from './EditChart' +import { PageChartDesign, PageChartDesignType, PageChartDesignStyle, PageChartDesignFill, PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartReorder, PageChartAlign } from './EditChart' import { PageLinkTo, PageTypeLink } from './EditLink' const routes = [ @@ -168,9 +168,25 @@ const routes = [ // Chart + { + path: '/edit-chart-design/', + component: PageChartDesign, + }, + { + path: '/edit-chart-type/', + component: PageChartDesignType + }, { path: '/edit-chart-style/', - component: PageChartStyle + component: PageChartDesignStyle + }, + { + path: '/edit-chart-fill/', + component: PageChartDesignFill + }, + { + path: '/edit-chart-border/', + component: PageChartDesignBorder }, { path: '/edit-chart-reorder/', diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index a9929cc34..f57ffe08f 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -149,21 +149,102 @@ const PageBorderColor = props => { ) }; -const PageStyle = props => { +const PageChartType = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; - const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; const types = storeChartSettings.types; - const curType = chartProperties ? chartProperties.getType() : null; + const storeFocusObjects = props.storeFocusObjects; + const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); + const curType = chartProperties && chartProperties.getType(); + + return ( + + + +
    +
    + {types.map((row, rowIndex) => { + return ( +
      + {row.map((type, index)=>{ + return( +
    • {props.onType(type.type)}}> +
      +
      +
      • + ) + })} +
    + ) + })} +
    +
    +     + ) +} + +const PageChartStyle = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; - const shapeObject = props.storeFocusObjects.shapeObject; const chartStyles = storeChartSettings.chartStyles; - const isAndroid = Device.android; + + return ( + + + + {chartStyles ? +
    +
    +
      + {styles ? styles.map((row, rowIndex) => { + return ( + row.map((style, index)=>{ + return( +
    • {props.onStyle(style.asc_getName())}}> + +
      • + ) + }) + ) + }) :
      {_t.textNoStyles}
      + } +
    +
    +
    + : null} +     + ) +} + +const PageChartDesignFill = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + + return ( + + +
    + +
    +     + ) +} + +const PageChartBorder = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; + const shapeObject = props.storeFocusObjects.shapeObject; let borderSize, borderType, borderColor; - - if(shapeObject) { + if (shapeObject) { const shapeStroke = shapeObject.get_stroke(); borderSize = shapeStroke.get_width() * 72.0 / 25.4; borderType = shapeStroke.get_type(); @@ -171,7 +252,6 @@ const PageStyle = props => { } // Init border size - const borderSizeTransform = storeChartSettings.borderSizeTransform(); const displayBorderSize = (borderType == Asc.c_oAscStrokeType.STROKE_NONE || borderType === undefined) ? 0 : borderSizeTransform.indexSizeByValue(borderSize); const displayTextBorderSize = (borderType == Asc.c_oAscStrokeType.STROKE_NONE || borderType === undefined) ? 0 : borderSizeTransform.sizeByValue(borderSize); @@ -179,8 +259,44 @@ const PageStyle = props => { const [stateTextBorderSize, setTextBorderSize] = useState(displayTextBorderSize); // Init border color - const displayBorderColor = borderColor !== 'transparent' ? `#${(typeof borderColor === "object" ? borderColor.color : borderColor)}` : borderColor; + + return ( + + + +
    + + +
    {_t.textSize}
    +
    + {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} + onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} + > +
    +
    + {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} +
    +     + + + +     +
    +     + ) +} + +const PageDesign = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; if (!chartProperties && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); @@ -189,14 +305,7 @@ const PageStyle = props => { return ( - -
    - {_t.textType} - {chartStyles ? {_t.textStyle} : null} - {_t.textFill} - {_t.textBorder} - {isAndroid && } -
    + {Device.phone && @@ -205,78 +314,17 @@ const PageStyle = props => { } - - -
    - {types.map((row, rowIndex) => { - return ( -
      - {row.map((type, index)=>{ - return( -
    • {props.onType(type.type)}}> -
      -
      -
      • - ) - })} -
    - ) - })} -
    -     - {chartStyles ? - -
    - {styles ? styles.map((row, rowIndex) => { - return ( -
      - {row.map((style, index)=>{ - return( -
    • {props.onStyle(style.asc_getName())}}> - -
      • - ) - })} -
    - ) - }) : -
    {_t.textNoStyles}
    - } -
    -     - : null} - - - - - - -
    {_t.textSize}
    -
    - {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} - onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} - > -
    -
    - {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} -
    -     - - - -     -     -     + + + + + + + +     ) }; @@ -380,7 +428,7 @@ const EditChart = props => { return ( - { ) }; -const PageChartStyle = inject("storeChartSettings", "storeFocusObjects")(observer(PageStyle)); +const PageChartDesign = inject("storeChartSettings", "storeFocusObjects")(observer(PageDesign)); +const PageChartDesignType = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartType)); +const PageChartDesignStyle = inject("storeChartSettings")(observer(PageChartStyle)); +const PageChartDesignBorder = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartBorder)); const PageChartCustomFillColor = inject("storeChartSettings", "storePalette")(observer(PageCustomFillColor)); const PageChartBorderColor = inject("storeChartSettings", "storePalette")(observer(PageBorderColor)); const PageChartCustomBorderColor = inject("storeChartSettings", "storePalette")(observer(PageCustomBorderColor)); @@ -410,7 +461,11 @@ const PageChartAlign = inject("storeFocusObjects")(observer(PageAlign)); export { EditChart, - PageChartStyle, + PageChartDesign, + PageChartDesignType, + PageChartDesignStyle, + PageChartDesignFill, + PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 3b126b9c2..96c1c10be 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -16,7 +16,7 @@ import { PageShapeStyle, PageShapeStyleNoFill, PageReplaceContainer, PageReorder import { PageImageReplace, PageImageReorder, PageLinkSettings } from './EditImage'; import { TextColorCell, FillColorCell, CustomTextColorCell, CustomFillColorCell, FontsCell, TextFormatCell, TextOrientationCell, BorderStyleCell, BorderColorCell, CustomBorderColorCell, BorderSizeCell, PageFormatCell, PageAccountingFormatCell, PageCurrencyFormatCell, PageDateFormatCell, PageTimeFormatCell } from './EditCell'; import { PageTextFonts, PageTextFontColor, PageTextCustomFontColor } from './EditText'; -import { PageChartStyle, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartReorder, PageChartLayout, PageLegend, PageChartTitle, PageHorizontalAxisTitle, PageVerticalAxisTitle, PageHorizontalGridlines, PageVerticalGridlines, PageDataLabels, PageChartVerticalAxis, PageVertAxisCrosses, PageDisplayUnits, PageVertMajorType, PageVertMinorType, PageVertLabelPosition, PageChartHorizontalAxis, PageHorAxisCrosses, PageHorAxisPosition, PageHorMajorType, PageHorMinorType, PageHorLabelPosition } from './EditChart'; +import { PageChartDesign, PageChartDesignType, PageChartDesignStyle, PageChartDesignFill, PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, PageChartReorder, PageChartLayout, PageLegend, PageChartTitle, PageHorizontalAxisTitle, PageVerticalAxisTitle, PageHorizontalGridlines, PageVerticalGridlines, PageDataLabels, PageChartVerticalAxis, PageVertAxisCrosses, PageDisplayUnits, PageVertMajorType, PageVertMinorType, PageVertLabelPosition, PageChartHorizontalAxis, PageHorAxisCrosses, PageHorAxisPosition, PageHorMajorType, PageHorMinorType, PageHorLabelPosition } from './EditChart'; import { PageTypeLink, PageSheet } from './EditLink'; const routes = [ @@ -151,9 +151,25 @@ const routes = [ // Chart + { + path: '/edit-chart-design/', + component: PageChartDesign, + }, + { + path: '/edit-chart-type/', + component: PageChartDesignType + }, { path: '/edit-chart-style/', - component: PageChartStyle + component: PageChartDesignStyle + }, + { + path: '/edit-chart-fill/', + component: PageChartDesignFill + }, + { + path: '/edit-chart-border/', + component: PageChartDesignBorder }, { path: '/edit-chart-border-color/', diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index cb377eec2..f795d5cef 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -144,24 +144,100 @@ const PageBorderColor = props => { ) }; -const PageStyle = props => { +const PageChartType = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); - const isAndroid = Device.android; const storeChartSettings = props.storeChartSettings; + const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); + const curType = chartProperties && chartProperties.getType(); + + return ( + + + +
    +
    + {types.map((row, rowIndex) => { + return ( +
      + {row.map((type, index)=>{ + return( +
    • {props.onType(type.type)}}> +
      +
      • + ) + })} +
    + ) + })} +
    +
    +     + ) +} + +const PageChartStyle = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; + const styles = storeChartSettings.styles; + const chartStyles = storeChartSettings.chartStyles; + + return ( + + + + {chartStyles ? +
    +
    +
      + {styles ? styles.map((row, rowIndex) => { + return ( + row.map((style, index)=>{ + return( +
    • {props.onStyle(style.asc_getName())}}> + +
      • + ) + }) + ) + }) :
      {_t.textNoStyles}
      + } +
    +
    +
    + : null} +     + ) +} + +const PageChartDesignFill = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + + return ( + + +
    + +
    +     + ) +} + +const PageChartBorder = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeChartSettings = props.storeChartSettings; + const storeFocusObjects = props.storeFocusObjects; const shapeProperties = storeFocusObjects.shapeObject && storeFocusObjects.shapeObject.get_ShapeProperties(); - const styles = storeChartSettings.styles; - const types = storeChartSettings.types; - const curType = chartProperties && chartProperties.getType(); - const chartStyles = storeChartSettings.chartStyles; - // console.log(chartStyles, curType); - // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); - // Init border size - let borderSize, borderType; if (shapeProperties) { const shapeStroke = shapeProperties.get_stroke(); @@ -182,6 +258,47 @@ const PageStyle = props => { const borderColor = storeChartSettings.borderColor; const displayBorderColor = borderColor == 'transparent' ? borderColor : `#${(typeof borderColor === "object" ? borderColor.color : borderColor)}`; + + return ( + + + +
    + + +
    {_t.textSize}
    +
    + {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} + onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} + > +
    +
    + {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} +
    +     + + + +     +
    +     + ) +} + +const PageDesign = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const storeFocusObjects = props.storeFocusObjects; + const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); + + // console.log(chartStyles, curType); + // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); if ((!chartProperties || storeFocusObjects.focusOn === 'cell') && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); @@ -190,90 +307,24 @@ const PageStyle = props => { return ( - -
    - {_t.textType} - {chartStyles ? {_t.textStyle} : null} - {_t.textFill} - {_t.textBorder} - {isAndroid && } -
    + {Device.phone && } - - -
    - {types.map((row, rowIndex) => { - return ( -
      - {row.map((type, index)=>{ - return( -
    • {props.onType(type.type)}}> -
      -
      • - ) - })} -
    - ) - })} -
    -     - {chartStyles ? - -
    - {styles ? styles.map((row, rowIndex) => { - return ( -
      - {row.map((style, index)=>{ - return( -
    • {props.onStyle(style.asc_getName())}}> - -
      • - ) - })} -
    - ) - }) : -
    {_t.textNoStyles}
    - } -
    -     - : null} - - - - - - -
    {_t.textSize}
    -
    - {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} - onRangeChanged={(value) => {props.onBorderSize(borderSizeTransform.sizeByIndex(value))}} - > -
    -
    - {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)} -
    -     - - - -     -     -     + + + + + + + +     ) }; @@ -1410,7 +1461,7 @@ const EditChart = props => { return ( - { }; const PageEditChart = inject("storeFocusObjects")(observer(EditChart)); -const PageChartStyle = inject("storeChartSettings", "storeFocusObjects")(observer(PageStyle)); +const PageChartDesign = inject("storeChartSettings", "storeFocusObjects")(observer(PageDesign)); +const PageChartDesignType = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartType)); +const PageChartDesignStyle = inject("storeChartSettings")(observer(PageChartStyle)); +const PageChartDesignBorder = inject("storeChartSettings", "storeFocusObjects")(observer(PageChartBorder)); const PageChartCustomFillColor = inject("storeChartSettings", "storePalette")(observer(PageCustomFillColor)); const PageChartBorderColor = inject("storeChartSettings", "storePalette")(observer(PageBorderColor)); const PageChartCustomBorderColor = inject("storeChartSettings", "storePalette")(observer(PageCustomBorderColor)); @@ -1487,7 +1541,11 @@ const PageChartReorder = inject("storeFocusObjects")(observer(PageReorder)); export { PageEditChart as EditChart, - PageChartStyle, + PageChartDesign, + PageChartDesignType, + PageChartDesignStyle, + PageChartDesignFill, + PageChartDesignBorder, PageChartCustomFillColor, PageChartBorderColor, PageChartCustomBorderColor, From ccbabe5325357d3c46dd550c93ace15de69713bf Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 15 Sep 2021 18:15:25 +0300 Subject: [PATCH 118/129] [PE] Fix shape menu in toolbar (bug 43485) --- apps/common/main/lib/component/DataView.js | 150 +++++++++++++-------- 1 file changed, 96 insertions(+), 54 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 12086f023..87a463a3c 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1285,6 +1285,9 @@ define([ var me = this; this.canAddRecents = true; + var filter = Common.localStorage.getKeysFilter(); + this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : ''; + me.groups = options.groups; // add recent shapes to store @@ -1313,26 +1316,75 @@ define([ options.store = store; Common.UI.DataViewSimple.prototype.initialize.call(this, options); + + me.parentMenu.on('show:before', function() { me.updateRecents(); }); + if (me.recentShapes.length > 0 && !me.cmpEl.find('.recent-group').is(':visible')) { + me.cmpEl.find('.recent-group').show(); + } }, onAfterShowMenu: function(e) { - if (!this.dataViewItems) { - var me = this; - this.dataViewItems = []; + var me = this; + if (!me.dataViewItems) { + me.dataViewItems = []; _.each(me.cmpEl.find('div.grouped-data'), function (group, indexGroup) { _.each($(group).find('div.item'), function (item, index) { var $item = $(item), rec = me.options.groups.at(indexGroup).groupStore.at(index); me.dataViewItems.push({el: $item, groupIndex: indexGroup, index: index}); - if (rec.get('tip')) { - $item.tooltip({ - title: rec.get('tip'), - placement: 'cursor', - zIndex: me.tipZIndex + var tip = rec.get('tip'); + if (tip) { + $item.one('mouseenter', function(){ // hide tooltip when mouse is over menu + $item.attr('data-toggle', 'tooltip'); + $item.tooltip({ + title : tip, + placement : 'cursor', + zIndex : me.tipZIndex + }); + $item.mouseenter(); }); } }); }); } + if (me.updateDataViewItems) { + // add recent item in dataViewItems + var recent = _.where(me.dataViewItems, {groupIndex: 0}); + var len = recent ? recent.length : 0; + for (var i = 0; i < len; i++) { + var tip = me.dataViewItems[i].el.data('bs.tooltip'); + if (tip) { + if (tip.dontShow===undefined) + tip.dontShow = true; + (tip.tip()).remove(); + } + } + me.dataViewItems = me.dataViewItems.slice(len); + var recentViewItems = []; + _.each(me.cmpEl.find('.recent-group div.item'), function (item, index) { + var $item = $(item), + rec = me.recentShapes[index]; + recentViewItems.push({el: $item, groupIndex: 0, index: index}); + var tip = rec.tip; + if (tip) { + $item.one('mouseenter', function(){ // hide tooltip when mouse is over menu + $item.attr('data-toggle', 'tooltip'); + $item.tooltip({ + title: tip, + placement: 'cursor', + zIndex : me.tipZIndex + }); + $item.mouseenter(); + }); + } + }); + me.dataViewItems = recentViewItems.concat(me.dataViewItems); + me.fillIndexesArray(); + + if (me.recentShapes.length === 1) { + $('.recent-group').show(); + } + me.updateDataViewItems = false; + } }, onClickItem: function(e) { @@ -1361,7 +1413,6 @@ define([ }, addRecentItem: function (rec) { var me = this; - var len = me.recentShapes.length; var item = rec.toJSON(), model = { @@ -1374,58 +1425,49 @@ define([ if (me.recentShapes.length > 14) { me.recentShapes.splice(14, 1); } + Common.localStorage.setItem(this.appPrefix + 'recent-shapes', JSON.stringify(me.recentShapes)); + me.recentShapes = undefined; + }, + updateRecents: function () { + var me = this, + recents = Common.localStorage.getItem(this.appPrefix + 'recent-shapes'); + recents = recents ? JSON.parse(recents) : []; - me.groups.at(0).groupStore.reset(me.recentShapes); - - var store = new Common.UI.DataViewStore(); - _.each(me.groups, function (group) { - store.add(group.groupStore.models); - }); - me.store = store; - - // add recent item in dataViewItems - for (var i = 0; i < len; i++) { - var tip = me.dataViewItems[i].el.data('bs.tooltip'); - if (tip) { - if (tip.dontShow===undefined) - tip.dontShow = true; - (tip.tip()).remove(); + var diff = false; + if (me.recentShapes) { + for (var i = 0; i < recents.length; i++) { + if (!me.recentShapes[i] || (me.recentShapes[i] && recents[i].tip !== me.recentShapes[i].tip)) { + diff = true; + } } + } else { + diff = true; } - me.dataViewItems = me.dataViewItems.slice(len); - var template = _.template([ - '<% _.each(items, function(item) { %>', - '<% if (!item.id) item.id = Common.UI.getId(); %>', + if (recents.length > 0 && diff) { + me.recentShapes = recents; + me.groups.at(0).groupStore.reset(me.recentShapes); + + var store = new Common.UI.DataViewStore(); + _.each(me.groups, function (group) { + store.add(group.groupStore.models); + }); + me.store = store; + + var template = _.template([ + '<% _.each(items, function(item) { %>', + '<% if (!item.id) item.id = Common.UI.getId(); %>', '
    data-toggle="tooltip" <% } %> ><%= itemTemplate(item) %>
    ', - '<% }) %>' - ].join('')); - this.cmpEl && this.cmpEl.find('.recent-items').html(template({ - items: me.recentShapes, - itemTemplate: this.itemTemplate, - style : this.style - })); - var recentViewItems = []; - _.each($('.recent-group').find('div.item'), function (item, index) { - var $item = $(item), - rec = me.recentShapes[index]; - recentViewItems.push({el: $item, groupIndex: 0, index: index}); - if (rec.tip) { - $item.tooltip({ - title: rec.tip, - placement: 'cursor', - zIndex: me.tipZIndex - }); - } - }); - me.dataViewItems = recentViewItems.concat(me.dataViewItems); - me.fillIndexesArray(); + '<% }) %>' + ].join('')); + me.cmpEl && me.cmpEl.find('.recent-items').html(template({ + items: me.recentShapes, + itemTemplate: this.itemTemplate, + style : this.style + })); - // add recent item in local storage - if (me.recentShapes.length === 1) { - $('.recent-group').show(); + me.updateDataViewItems = true; } - Common.localStorage.setItem('pe-recent-shapes', JSON.stringify(me.recentShapes)); } })); From e1a268fc5a2a2b9aad7be42a0214bb4dad6f8060 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 16 Sep 2021 16:53:48 +0300 Subject: [PATCH 119/129] [PE] Change shape menu in right panel, fix duplication in recent shapes (bug 43485) --- apps/common/main/lib/component/DataView.js | 20 +++++- .../main/app/view/ShapeSettings.js | 69 ++++++++----------- .../main/app/view/Toolbar.js | 4 +- .../main/resources/less/app.less | 11 ++- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 87a463a3c..5813da8f0 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -1289,9 +1289,14 @@ define([ this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : ''; me.groups = options.groups; + if (options.isFromImage) { + var store = me.groups[0].groupStore.clone(); + store.shift(); + me.groups[0].groupStore = store; + } // add recent shapes to store - var recentStore = new Backbone.Collection([], {model: PE.Models.ShapeModel}), + var recentStore = new Common.UI.DataViewGroupStore, recentArr = options.recentShapes || [], cols = (recentArr.length) > 18 ? 7 : 6, height = Math.ceil(recentArr.length/cols) * 35 + 3, @@ -1346,7 +1351,7 @@ define([ }); }); } - if (me.updateDataViewItems) { + if (me.updateDataViewItems && me.cmpEl.is(':visible')) { // add recent item in dataViewItems var recent = _.where(me.dataViewItems, {groupIndex: 0}); var len = recent ? recent.length : 0; @@ -1412,7 +1417,16 @@ define([ this.addRecentItem(record); }, addRecentItem: function (rec) { - var me = this; + var me = this, + exist = false, + type = rec.get('data').shapeType; + for (var i = 0; i < me.recentShapes.length; i++) { + if (me.recentShapes[i].data.shapeType === type) { + exist = true; + break; + } + } + if (exist) return; var item = rec.toJSON(), model = { diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 97404aec3..d64200365 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1437,7 +1437,7 @@ define([ iconCls: 'btn-change-shape', menu : new Common.UI.Menu({ menuAlign: 'tr-br', - cls: 'menu-shapes', + cls: 'menu-shapes menu-change-shape', items: [] }), dataHint: '1', @@ -1641,47 +1641,35 @@ define([ fillAutoShapes: function() { var me = this, shapesStore = this.application.getCollection('ShapeGroups'), - count = shapesStore.length; + recents = Common.localStorage.getItem('pe-recent-shapes'); - var onShowAfter = function(menu) { - for (var i=-1; i0; i++) { - var store = shapesStore.at(i > -1 ? i : 0).get('groupStore'); - if (i<0) { - store = store.clone(); - store.shift(); - } - var shapePicker = new Common.UI.DataViewSimple({ - el: $('#id-shape-menu-shapegroup' + (i+1), menu.items[i+1].$el), - store: store, - parentMenu: menu.items[i+1].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (me.api) { - me.api.ChangeShapeType(record.get('data').shapeType); - me.fireEvent('editcomplete', me); - } - if (e.type !== 'click') - me.btnChangeShape.menu.hide(); - }); - } - menu.off('show:after', onShowAfter); - }; - me.btnChangeShape.menu.on('show:after', onShowAfter); - - for (var i=-1; i0; i++) { - var shapeGroup = shapesStore.at(i>-1 ? i : i+1); - var menuItem = new Common.UI.MenuItem({ - caption: shapeGroup.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tr-tl', - items: [ - { template: _.template('') } - ] - }) + for (var i = 0; i < 2; i++) { + var menuitem = new Common.UI.MenuItem({ + template: _.template(''), + index: i + }); + me.btnChangeShape.menu.addItem(menuitem); + + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-change-shape-menu-' + i), + itemTemplate: _.template('
    \">
    '), + groups: shapesStore.toJSON(), + parentMenu: me.btnChangeShape.menu, + restoreHeight: 604, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null, + isFromImage: i === 0 + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (me.api) { + me.api.ChangeShapeType(record.get('data').shapeType); + me.fireEvent('editcomplete', me); + } + if (e.type !== 'click') + me.btnChangeShape.menu.hide(); }); - me.btnChangeShape.menu.addItem(menuItem); } + me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage); me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage); }, @@ -1954,6 +1942,7 @@ define([ textPosition: 'Position', tipAddGradientPoint: 'Add gradient point', tipRemoveGradientPoint: 'Remove gradient point', - textAngle: 'Angle' + textAngle: 'Angle', + textRecentlyUsed: 'Recently Used' }, PE.Views.ShapeSettings || {})); }); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index a7cfddcc4..3e67a7287 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1249,7 +1249,7 @@ define([ btn.updateHint(me.tipInsertShape); btn.setMenu( new Common.UI.Menu({ - cls: 'menu-shapes' + cls: 'menu-shapes menu-insert-shape' }).on('hide:after', function (e) { me.fireEvent('insert:shape', ['menu:hide']); }) @@ -1703,7 +1703,7 @@ define([ itemTemplate: _.template('
    \">
    '), groups: collection.toJSON(), parentMenu: menuShape, - restoreHeight: true, + restoreHeight: 604, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null }); diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 535340819..4625fc78d 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -257,14 +257,11 @@ } } -.menu-shapes { +.menu-insert-shape, .menu-change-shape { width: 362px; - padding-top: 8px; - .menu-insertshape { - margin: 5px 5px 0 10px; - .group-description { - padding-left: 4px; - } + padding: 14px 5px 5px 10px; + .group-description { + padding-left: 4px; } .dataview .grouped-data .group-items-container .item { box-shadow: none; From cb100a3c4b2b03fca8aef2c75fc9ee7d81a4b508 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 16 Sep 2021 19:59:16 +0300 Subject: [PATCH 120/129] [PE] Fix styles for shape menu --- apps/presentationeditor/main/resources/less/app.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 4625fc78d..755cbe12a 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -259,9 +259,9 @@ .menu-insert-shape, .menu-change-shape { width: 362px; - padding: 14px 5px 5px 10px; + padding: 10px 5px 10px 10px; .group-description { - padding-left: 4px; + padding: 3px 0 3px 4px; } .dataview .grouped-data .group-items-container .item { box-shadow: none; From c8691ad74321ec2e0fe554253d54f103cb9b9691 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 16 Sep 2021 20:47:48 +0300 Subject: [PATCH 121/129] [DE SSE] Change shape menu (bug 43485) --- apps/common/main/resources/less/dataview.less | 12 +++ .../main/app/controller/Toolbar.js | 74 ++++++++---------- .../main/app/view/ShapeSettings.js | 68 +++++++---------- apps/documenteditor/main/app/view/Toolbar.js | 2 +- .../main/app/view/ShapeSettings.js | 2 +- .../main/app/view/Toolbar.js | 2 +- .../main/resources/less/app.less | 12 --- .../main/app/controller/Toolbar.js | 75 ++++++++----------- .../main/app/view/ShapeSettings.js | 68 +++++++---------- .../main/app/view/Toolbar.js | 2 +- 10 files changed, 136 insertions(+), 181 deletions(-) diff --git a/apps/common/main/resources/less/dataview.less b/apps/common/main/resources/less/dataview.less index 29eb93dc9..7acb0bcdb 100644 --- a/apps/common/main/resources/less/dataview.less +++ b/apps/common/main/resources/less/dataview.less @@ -88,4 +88,16 @@ border: @scaled-one-px-value solid @input-border; .border-radius(@border-radius-small); } +} + +.menu-insert-shape, .menu-change-shape { + width: 362px; + padding: 10px 5px 10px 10px; + .group-description { + padding: 3px 0 3px 4px; + } + .dataview .grouped-data .group-items-container .item { + box-shadow: none; + margin: 2px 2px 2px; + } } \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 9c9a1d09f..83ead42f7 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2641,50 +2641,39 @@ define([ var me = this, shapesStore = this.getApplication().getCollection('ShapeGroups'); - var onShowAfter = function(menu) { - for (var i = 0; i < shapesStore.length; i++) { - var shapePicker = new Common.UI.DataViewSimple({ - el: $('#id-toolbar-menu-shapegroup' + i, menu.items[i].$el), - store: shapesStore.at(i).get('groupStore'), - parentMenu: menu.items[i].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (me.api) { - if (record) { - me._addAutoshape(true, record.get('data').shapeType); - me._isAddingShape = true; - } + var menuitem = new Common.UI.MenuItem({ + template: _.template('') + }); + me.toolbar.btnInsertShape.menu.addItem(menuitem); - if (me.toolbar.btnInsertText.pressed) { - me.toolbar.btnInsertText.toggle(false, true); - } + var recents = Common.localStorage.getItem('de-recent-shapes'); - if (e.type !== 'click') - me.toolbar.btnInsertShape.menu.hide(); - Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape); - Common.component.Analytics.trackEvent('ToolBar', 'Add Shape'); - } - }); + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-toolbar-menu-insertshape'), + itemTemplate: _.template('
    \">
    '), + groups: shapesStore.toJSON(), + parentMenu: me.toolbar.btnInsertShape.menu, + restoreHeight: 640, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (me.api) { + if (record) { + me._addAutoshape(true, record.get('data').shapeType); + me._isAddingShape = true; + } + + if (me.toolbar.btnInsertText.pressed) { + me.toolbar.btnInsertText.toggle(false, true); + } + + if (e.type !== 'click') + me.toolbar.btnInsertShape.menu.hide(); + Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape); + Common.component.Analytics.trackEvent('ToolBar', 'Add Shape'); } - menu.off('show:after', onShowAfter); - }; - me.toolbar.btnInsertShape.menu.on('show:after', onShowAfter); - - for (var i = 0; i < shapesStore.length; i++) { - var shapeGroup = shapesStore.at(i); - - var menuItem = new Common.UI.MenuItem({ - caption: shapeGroup.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tl-tr', - items: [ - { template: _.template('') } - ] - }) - }); - me.toolbar.btnInsertShape.menu.addItem(menuItem); - } + }); }, fillEquations: function() { @@ -3670,7 +3659,8 @@ define([ textInsert: 'Insert', textTabForms: 'Forms', textGroup: 'Group', - textEmptyMMergeUrl: 'You need to specify URL.' + textEmptyMMergeUrl: 'You need to specify URL.', + textRecentlyUsed: 'Recently Used' }, DE.Controllers.Toolbar || {})); }); diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 6bd98fb15..c5b09976d 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1611,7 +1611,7 @@ define([ iconCls: 'btn-change-shape', menu : new Common.UI.Menu({ menuAlign: 'tr-br', - cls: 'menu-shapes', + cls: 'menu-shapes menu-change-shape', items: [] }), dataHint: '1', @@ -1786,46 +1786,33 @@ define([ fillAutoShapes: function() { var me = this, shapesStore = this.application.getCollection('ShapeGroups'), - count = shapesStore.length; + recents = Common.localStorage.getItem('de-recent-shapes'); - var onShowAfter = function(menu) { - for (var i=-1; i0; i++) { - var store = shapesStore.at(i > -1 ? i : 0).get('groupStore'); - if (i<0) { - store = store.clone(); - store.shift(); - } - var shapePicker = new Common.UI.DataViewSimple({ - el: $('#id-shape-menu-shapegroup' + (i+1), menu.items[i+1].$el), - store: store, - parentMenu: menu.items[i+1].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (me.api) { - me.api.ChangeShapeType(record.get('data').shapeType); - me.fireEvent('editcomplete', me); - } - if (e.type !== 'click') - me.btnChangeShape.menu.hide(); - }); - } - menu.off('show:after', onShowAfter); - }; - me.btnChangeShape.menu.on('show:after', onShowAfter); - - for (var i=-1; i0; i++) { - var shapeGroup = shapesStore.at(i > -1 ? i : i + 1); - var menuItem = new Common.UI.MenuItem({ - caption: shapeGroup.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tr-tl', - items: [ - {template: _.template('')} - ] - }) + for (var i = 0; i < 2; i++) { + var menuitem = new Common.UI.MenuItem({ + template: _.template(''), + index: i + }); + me.btnChangeShape.menu.addItem(menuitem); + + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-change-shape-menu-' + i), + itemTemplate: _.template('
    \">
    '), + groups: shapesStore.toJSON(), + parentMenu: me.btnChangeShape.menu, + restoreHeight: 640, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null, + isFromImage: i === 0 + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (me.api) { + me.api.ChangeShapeType(record.get('data').shapeType); + me.fireEvent('editcomplete', me); + } + if (e.type !== 'click') + me.btnChangeShape.menu.hide(); }); - me.btnChangeShape.menu.addItem(menuItem); } me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage); me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage); @@ -2093,6 +2080,7 @@ define([ textPosition: 'Position', tipAddGradientPoint: 'Add gradient point', tipRemoveGradientPoint: 'Remove gradient point', - textAngle: 'Angle' + textAngle: 'Angle', + textRecentlyUsed: 'Recently Used' }, DE.Views.ShapeSettings || {})); }); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 89b39e1e5..8146cfab3 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -619,7 +619,7 @@ define([ iconCls: 'toolbar__icon btn-insertshape', caption: me.capBtnInsShape, enableToggle: true, - menu: new Common.UI.Menu({cls: 'menu-shapes'}), + menu: new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}), dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index d64200365..5ecb19a7d 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1655,7 +1655,7 @@ define([ itemTemplate: _.template('
    \">
    '), groups: shapesStore.toJSON(), parentMenu: me.btnChangeShape.menu, - restoreHeight: 604, + restoreHeight: 640, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, isFromImage: i === 0 diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 3e67a7287..e5c0ce2ae 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1703,7 +1703,7 @@ define([ itemTemplate: _.template('
    \">
    '), groups: collection.toJSON(), parentMenu: menuShape, - restoreHeight: 604, + restoreHeight: 640, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null }); diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 755cbe12a..8a80c847c 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -255,16 +255,4 @@ } } } -} - -.menu-insert-shape, .menu-change-shape { - width: 362px; - padding: 10px 5px 10px 10px; - .group-description { - padding: 3px 0 3px 4px; - } - .dataview .grouped-data .group-items-container .item { - box-shadow: none; - margin: 2px 2px 2px; - } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index cc434b41b..1cd814b66 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3157,50 +3157,38 @@ define([ var me = this, shapesStore = this.getApplication().getCollection('ShapeGroups'); - var onShowAfter = function(menu) { - for (var i = 0; i < shapesStore.length; i++) { - var shapePicker = new Common.UI.DataViewSimple({ - el: $('#id-toolbar-menu-shapegroup' + i, menu.items[i].$el), - store: shapesStore.at(i).get('groupStore'), - parentMenu: menu.items[i].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (me.api) { - if (record) { - me._addAutoshape(true, record.get('data').shapeType); - me._isAddingShape = true; - } + var menuitem = new Common.UI.MenuItem({ + template: _.template('') + }); + me.toolbar.btnInsertShape.menu.addItem(menuitem); - if (me.toolbar.btnInsertText.pressed) { - me.toolbar.btnInsertText.toggle(false, true); - } - if (e.type !== 'click') - me.toolbar.btnInsertShape.menu.hide(); - Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape); - Common.component.Analytics.trackEvent('ToolBar', 'Add Shape'); - } - }); + var recents = Common.localStorage.getItem('sse-recent-shapes'); + + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-toolbar-menu-insertshape'), + itemTemplate: _.template('
    \">
    '), + groups: shapesStore.toJSON(), + parentMenu: me.toolbar.btnInsertShape.menu, + restoreHeight: 640, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (me.api) { + if (record) { + me._addAutoshape(true, record.get('data').shapeType); + me._isAddingShape = true; + } + + if (me.toolbar.btnInsertText.pressed) { + me.toolbar.btnInsertText.toggle(false, true); + } + if (e.type !== 'click') + me.toolbar.btnInsertShape.menu.hide(); + Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnInsertShape); + Common.component.Analytics.trackEvent('ToolBar', 'Add Shape'); } - menu.off('show:after', onShowAfter); - }; - me.toolbar.btnInsertShape.menu.on('show:after', onShowAfter); - - for (var i = 0; i < shapesStore.length; i++) { - var shapeGroup = shapesStore.at(i); - - var menuItem = new Common.UI.MenuItem({ - caption: shapeGroup.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tl-tr', - items: [ - { template: _.template('') } - ] - }) - }); - - me.toolbar.btnInsertShape.menu.addItem(menuItem); - } + }); }, fillEquations: function() { @@ -4440,7 +4428,8 @@ define([ textShapes: 'Shapes', textIndicator: 'Indicators', textRating: 'Ratings', - txtLockSort: 'Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?' + txtLockSort: 'Data is found next to your selection, but you do not have sufficient permissions to change those cells.
    Do you wish to continue with the current selection?', + textRecentlyUsed: 'Recently Used' }, SSE.Controllers.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index fb9c26e30..909df6986 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1463,7 +1463,7 @@ define([ iconCls: 'btn-change-shape', menu : new Common.UI.Menu({ menuAlign: 'tr-br', - cls: 'menu-shapes', + cls: 'menu-shapes menu-change-shape', items: [] }), dataHint: '1', @@ -1659,46 +1659,33 @@ define([ fillAutoShapes: function() { var me = this, shapesStore = this.application.getCollection('ShapeGroups'), - count = shapesStore.length; + recents = Common.localStorage.getItem('sse-recent-shapes'); - var onShowAfter = function(menu) { - for (var i=-1; i0; i++) { - var store = shapesStore.at(i > -1 ? i : 0).get('groupStore'); - if (i<0) { - store = store.clone(); - store.shift(); - } - var shapePicker = new Common.UI.DataViewSimple({ - el: $('#id-shape-menu-shapegroup' + (i+1), menu.items[i+1].$el), - store: store, - parentMenu: menu.items[i+1].menu, - itemTemplate: _.template('
    \">
    ') - }); - shapePicker.on('item:click', function(picker, item, record, e) { - if (me.api) { - me.api.asc_changeShapeType(record.get('data').shapeType); - Common.NotificationCenter.trigger('edit:complete', me); - } - if (e.type !== 'click') - me.btnChangeShape.menu.hide(); - }); - } - menu.off('show:after', onShowAfter); - }; - me.btnChangeShape.menu.on('show:after', onShowAfter); - - for (var i=-1; i0; i++) { - var shapeGroup = shapesStore.at(i>-1 ? i : i+1); - var menuItem = new Common.UI.MenuItem({ - caption: shapeGroup.get('groupName'), - menu: new Common.UI.Menu({ - menuAlign: 'tr-tl', - items: [ - { template: _.template('') } - ] - }) + for (var i = 0; i < 2; i++) { + var menuitem = new Common.UI.MenuItem({ + template: _.template(''), + index: i + }); + me.btnChangeShape.menu.addItem(menuitem); + + var shapePicker = new Common.UI.DataViewShape({ + el: $('#id-change-shape-menu-' + i), + itemTemplate: _.template('
    \">
    '), + groups: shapesStore.toJSON(), + parentMenu: me.btnChangeShape.menu, + restoreHeight: 640, + textRecentlyUsed: me.textRecentlyUsed, + recentShapes: recents ? JSON.parse(recents) : null, + isFromImage: i === 0 + }); + shapePicker.on('item:click', function(picker, item, record, e) { + if (me.api) { + me.api.asc_changeShapeType(record.get('data').shapeType); + Common.NotificationCenter.trigger('edit:complete', me); + } + if (e.type !== 'click') + me.btnChangeShape.menu.hide(); }); - me.btnChangeShape.menu.addItem(menuItem); } me.btnChangeShape.menu.items[0].setVisible(me._state.isFromImage); me.btnChangeShape.menu.items[1].setVisible(!me._state.isFromImage); @@ -1986,6 +1973,7 @@ define([ textPosition: 'Position', tipAddGradientPoint: 'Add gradient point', tipRemoveGradientPoint: 'Remove gradient point', - textAngle: 'Angle' + textAngle: 'Angle', + textRecentlyUsed: 'Recently Used' }, SSE.Views.ShapeSettings || {})); }); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 7a25f45e5..673e50227 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -803,7 +803,7 @@ define([ enableToggle: true, caption : me.capInsertShape, lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], - menu : new Common.UI.Menu({cls: 'menu-shapes'}), + menu : new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}), dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' From 1c59318682759aa889c1e0314bc531b4f9f7de19 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 16 Sep 2021 21:02:29 +0300 Subject: [PATCH 122/129] [DE PE SSE] Add translations for recent shape --- apps/documenteditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/en.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 5595dfb36..395ce4de2 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1224,6 +1224,7 @@ "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical ellipsis", "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", + "DE.Controllers.Toolbar.textRecentlyUsed": "Recently Used", "DE.Controllers.Viewport.textFitPage": "Fit to Page", "DE.Controllers.Viewport.textFitWidth": "Fit to Width", "DE.Views.AddNewCaptionLabelDialog.textLabel": "Label:", @@ -2311,6 +2312,7 @@ "DE.Views.ShapeSettings.txtTight": "Tight", "DE.Views.ShapeSettings.txtTopAndBottom": "Top and bottom", "DE.Views.ShapeSettings.txtWood": "Wood", + "DE.Views.ShapeSettings.textRecentlyUsed": "Recently Used", "DE.Views.SignatureSettings.notcriticalErrorTitle": "Warning", "DE.Views.SignatureSettings.strDelete": "Remove Signature", "DE.Views.SignatureSettings.strDetails": "Signature Details", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 268c79a7c..b91f928d6 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1592,6 +1592,7 @@ "PE.Views.ShapeSettings.txtNoBorders": "No Line", "PE.Views.ShapeSettings.txtPapyrus": "Papyrus", "PE.Views.ShapeSettings.txtWood": "Wood", + "PE.Views.ShapeSettings.textRecentlyUsed": "Recently Used", "PE.Views.ShapeSettingsAdvanced.strColumns": "Columns", "PE.Views.ShapeSettingsAdvanced.strMargins": "Text Padding", "PE.Views.ShapeSettingsAdvanced.textAlt": "Alternative Text", @@ -1984,6 +1985,7 @@ "PE.Views.Toolbar.txtScheme9": "Foundry", "PE.Views.Toolbar.txtSlideAlign": "Align to Slide", "PE.Views.Toolbar.txtUngroup": "Ungroup", + "PE.Views.Toolbar.textRecentlyUsed": "Recently Used", "PE.Views.Transitions.strDelay": "Delay", "PE.Views.Transitions.strDuration": "Duration", "PE.Views.Transitions.strStartOnClick": "Start On Click", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 75aabddfc..2bb10c13c 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1417,6 +1417,7 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
    Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
    Are you sure you want to continue?", + "SSE.Controllers.Toolbar.textRecentlyUsed": "Recently Used", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textFreezePanesShadow": "Show Frozen Panes Shadow", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", @@ -2856,6 +2857,7 @@ "SSE.Views.ShapeSettings.txtNoBorders": "No Line", "SSE.Views.ShapeSettings.txtPapyrus": "Papyrus", "SSE.Views.ShapeSettings.txtWood": "Wood", + "SSE.Views.ShapeSettings.textRecentlyUsed": "Recently Used", "SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns", "SSE.Views.ShapeSettingsAdvanced.strMargins": "Text Padding", "SSE.Views.ShapeSettingsAdvanced.textAbsolute": "Don't move or size with cells", From e4c58e80bdb4f8aad3a4f48e004ab0b7820da74d Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 13 Sep 2021 17:29:12 +0300 Subject: [PATCH 123/129] Make highlight color palette --- apps/common/mobile/resources/less/common.less | 8 ++++++++ apps/documenteditor/mobile/locale/en.json | 3 ++- .../mobile/src/view/edit/EditText.jsx | 17 ++++++++++------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index d14b0f595..85881fbba 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -901,6 +901,14 @@ input[type="number"]::-webkit-inner-spin-button { } } +// Highlight Colors + +.highlight-color { + width: 38px; + height: 38px; + margin: 1px; + border: 0.5px solid #9E9E9E; +} diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 626c53d84..3cdc9b2d0 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -304,7 +304,8 @@ "textTopAndBottom": "Top and Bottom", "textTotalRow": "Total Row", "textType": "Type", - "textWrap": "Wrap" + "textWrap": "Wrap", + "textNoFill": "No Fill" }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index b07f4eb7d..8f86a0cca 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -4,6 +4,7 @@ import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page, import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; +import HighlightColorPalette from '../../../../../common/mobile/lib/component/HighlightColorPalette.jsx'; import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage'; const PageFonts = props => { @@ -465,18 +466,19 @@ const PageBackgroundColor = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); const backgroundColor = props.storeTextSettings.backgroundColor; - const customColors = props.storePalette.customColors; + // const customColors = props.storePalette.customColors; const changeColor = (color, effectId) => { if (color !== 'empty') { - if (effectId !==undefined ) { + if (effectId !== undefined ) { props.onBackgroundColor({color: color, effectId: effectId}); } else { props.onBackgroundColor(color); } - } else { - // open custom color menu - props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}}); } + // } else { + // // open custom color menu + // props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}}); + // } }; return( @@ -489,12 +491,13 @@ const PageBackgroundColor = props => { } - + + {/* - +     */} ) }; From 50ce0cd3593d91f6b6491ee9069717c61ada87e9 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 13 Sep 2021 17:31:30 +0300 Subject: [PATCH 124/129] Make highlight color palette --- .../lib/component/HighlightColorPalette.jsx | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 apps/common/mobile/lib/component/HighlightColorPalette.jsx diff --git a/apps/common/mobile/lib/component/HighlightColorPalette.jsx b/apps/common/mobile/lib/component/HighlightColorPalette.jsx new file mode 100644 index 000000000..fffaaa325 --- /dev/null +++ b/apps/common/mobile/lib/component/HighlightColorPalette.jsx @@ -0,0 +1,30 @@ +import React from 'react'; +import { f7, ListItem, List, Icon, Page } from 'framework7-react'; +import { useTranslation } from 'react-i18next'; + +const HighlightColorPalette = ({onColorClick, curColor}) => { + const { t } = useTranslation(); + const highlightColors = [ + 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', + '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000' + ]; + + return ( + + +
    +
    + {highlightColors.map((effect, index) => { + return ( + {onColorClick(effect)}}> + ); + })} +
    +
    +     + +     + ) +}; + +export default HighlightColorPalette; \ No newline at end of file From d92e4f23df10054dd6d2919559e4156e773dd86d Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 14 Sep 2021 00:07:36 +0300 Subject: [PATCH 125/129] Make highlight color palette v.2 --- .../lib/component/HighlightColorPalette.jsx | 26 ++++++++++--------- .../resources/less/common-material.less | 2 +- apps/common/mobile/resources/less/common.less | 22 +++++++++++++--- .../mobile/src/view/edit/EditText.jsx | 2 +- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/apps/common/mobile/lib/component/HighlightColorPalette.jsx b/apps/common/mobile/lib/component/HighlightColorPalette.jsx index fffaaa325..86ca4db01 100644 --- a/apps/common/mobile/lib/component/HighlightColorPalette.jsx +++ b/apps/common/mobile/lib/component/HighlightColorPalette.jsx @@ -2,27 +2,29 @@ import React from 'react'; import { f7, ListItem, List, Icon, Page } from 'framework7-react'; import { useTranslation } from 'react-i18next'; -const HighlightColorPalette = ({onColorClick, curColor}) => { +const HighlightColorPalette = ({changeColor, curColor}) => { const { t } = useTranslation(); const highlightColors = [ - 'FFFF00', '00FF00', '00FFFF', 'FF00FF', '0000FF', 'FF0000', '00008B', '008B8B', - '006400', '800080', '8B0000', '808000', 'FFFFFF', 'D3D3D3', 'A9A9A9', '000000' + ['ffff00', '00ff00', '00ffff', 'ff00ff', '0000ff', 'ff0000', '00008b', '008b8b'], + ['006400', '800080', '8b0000', '808000', 'ffffff', 'd3d3d3', 'a9a9a9', '000000'] ]; return ( -
    - +
    + {highlightColors.map((row, index) => ( +
    + {row.map((effect, index) => { + return ( + {changeColor(effect)}}> + ); + })} +
    + ))}
    - + ) }; diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 65c4f182d..0101358f7 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -294,7 +294,7 @@ .color-preview { width: 30px; height: 30px; - border-radius: 16px; + border-radius: 4px; margin-top: -3px; box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; &.auto { diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 85881fbba..3d714e111 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -903,11 +903,26 @@ input[type="number"]::-webkit-inner-spin-button { // Highlight Colors +.highlight-palette { + width: 100%; +} + .highlight-color { - width: 38px; - height: 38px; + min-width: 10px; + min-height: 34px; margin: 1px; - border: 0.5px solid #9E9E9E; + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset; + position: relative; + flex-grow: 1; + &_active:after { + content: ' '; + position: absolute; + width: 100%; + height: 100%; + box-shadow: 0 0 0 1px #ffffff, 0 0 0 4px #446995; + z-index: 1; + border-radius: 1px; + } } @@ -916,3 +931,4 @@ input[type="number"]::-webkit-inner-spin-button { + diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 8f86a0cca..b0995a6f8 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -491,7 +491,7 @@ const PageBackgroundColor = props => { } - + {/* Date: Tue, 14 Sep 2021 17:56:08 +0300 Subject: [PATCH 126/129] Correct highlight color palette --- .../lib/component/HighlightColorPalette.jsx | 2 +- .../mobile/src/view/edit/EditText.jsx | 22 +++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/apps/common/mobile/lib/component/HighlightColorPalette.jsx b/apps/common/mobile/lib/component/HighlightColorPalette.jsx index 86ca4db01..5057895be 100644 --- a/apps/common/mobile/lib/component/HighlightColorPalette.jsx +++ b/apps/common/mobile/lib/component/HighlightColorPalette.jsx @@ -24,7 +24,7 @@ const HighlightColorPalette = ({changeColor, curColor}) => { ))}
    - + changeColor('transparent')} title={t('Edit.textNoFill')}> ) }; diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index b0995a6f8..147bbcda0 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -466,7 +466,7 @@ const PageBackgroundColor = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); const backgroundColor = props.storeTextSettings.backgroundColor; - // const customColors = props.storePalette.customColors; + const changeColor = (color, effectId) => { if (color !== 'empty') { if (effectId !== undefined ) { @@ -475,12 +475,9 @@ const PageBackgroundColor = props => { props.onBackgroundColor(color); } } - // } else { - // // open custom color menu - // props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}}); - // } }; - return( + + return ( {Device.phone && @@ -492,12 +489,6 @@ const PageBackgroundColor = props => { } - {/* - - - */} ) }; @@ -534,6 +525,10 @@ const EditText = props => { : ; + const backgroundColorPreview = backgroundColor !== 'transparent' ? + : + ; + return ( @@ -562,8 +557,7 @@ const EditText = props => { onBackgroundColor: props.onBackgroundColor }}> {!isAndroid ? - : - + {backgroundColorPreview} : backgroundColorPreview } Date: Wed, 15 Sep 2021 14:49:29 +0300 Subject: [PATCH 127/129] [PE mobile] Added highlight color palette --- .../lib/component/HighlightColorPalette.jsx | 2 +- apps/documenteditor/mobile/locale/en.json | 6 ++- apps/presentationeditor/mobile/locale/en.json | 3 ++ .../mobile/src/controller/Main.jsx | 6 ++- .../mobile/src/controller/edit/EditText.jsx | 14 ++++++ .../mobile/src/store/textSettings.js | 15 +++++- .../mobile/src/view/edit/Edit.jsx | 6 ++- .../mobile/src/view/edit/EditText.jsx | 46 +++++++++++++++++++ 8 files changed, 92 insertions(+), 6 deletions(-) diff --git a/apps/common/mobile/lib/component/HighlightColorPalette.jsx b/apps/common/mobile/lib/component/HighlightColorPalette.jsx index 5057895be..8ca49f41c 100644 --- a/apps/common/mobile/lib/component/HighlightColorPalette.jsx +++ b/apps/common/mobile/lib/component/HighlightColorPalette.jsx @@ -24,7 +24,7 @@ const HighlightColorPalette = ({changeColor, curColor}) => { ))}
    - changeColor('transparent')} title={t('Edit.textNoFill')}> + changeColor('transparent')} title={t('Common.HighlightColorPalette.textNoFill')}> ) }; diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 3cdc9b2d0..21a4728b3 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -161,6 +161,9 @@ "textCustomColors": "Custom Colors", "textStandartColors": "Standard Colors", "textThemeColors": "Theme Colors" + }, + "HighlightColorPalette": { + "textNoFill": "No Fill" } }, "ContextMenu": { @@ -304,8 +307,7 @@ "textTopAndBottom": "Top and Bottom", "textTotalRow": "Total Row", "textType": "Type", - "textWrap": "Wrap", - "textNoFill": "No Fill" + "textWrap": "Wrap" }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index eb61a4bb9..cb5fee058 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -37,6 +37,9 @@ "textCustomColors": "Custom Colors", "textStandartColors": "Standard Colors", "textThemeColors": "Theme Colors" + }, + "HighlightColorPalette": { + "textNoFill": "No Fill" } }, "ContextMenu": { diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 5984a6681..4b5d35d57 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -372,10 +372,14 @@ class MainController extends Component { storeTextSettings.resetDecreaseIndent(value); }); - this.api.asc_registerCallback('asc_onTextColor', (color) => { + this.api.asc_registerCallback('asc_onTextColor', color => { storeTextSettings.resetTextColor(color); }); + this.api.asc_registerCallback('asc_onTextHighLight', color => { + storeTextSettings.resetBackgroundColor(color); + }); + this.api.asc_registerCallback('asc_onParaSpacingLine', (vc) => { storeTextSettings.resetLineSpacing(vc); }); diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index af17d99a8..67837492e 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -155,6 +155,19 @@ class EditTextController extends Component { api.put_TextColor(Common.Utils.ThemeColor.getRgbColor(color)); } + onBackgroundColor(strColor) { + const api = Common.EditorApi.get(); + + if (strColor == 'transparent') { + api.SetMarkerFormat(true, false); + } else { + let r = strColor[0] + strColor[1], + g = strColor[2] + strColor[3], + b = strColor[4] + strColor[5]; + api.SetMarkerFormat(true, true, parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)); + } + } + // Additional onAdditionalStrikethrough(type, value) { @@ -243,6 +256,7 @@ class EditTextController extends Component { changeFontSize={this.changeFontSize} changeFontFamily={this.changeFontFamily} onTextColor={this.onTextColor} + onBackgroundColor={this.onBackgroundColor} onAdditionalStrikethrough={this.onAdditionalStrikethrough} onAdditionalCaps={this.onAdditionalCaps} onAdditionalScript={this.onAdditionalScript} diff --git a/apps/presentationeditor/mobile/src/store/textSettings.js b/apps/presentationeditor/mobile/src/store/textSettings.js index e82800153..891d2cfd9 100644 --- a/apps/presentationeditor/mobile/src/store/textSettings.js +++ b/apps/presentationeditor/mobile/src/store/textSettings.js @@ -52,7 +52,9 @@ export class storeTextSettings { listItemHeight: observable, spriteCols: observable, loadSprite: action, - addFontToRecent:action + addFontToRecent:action, + backgroundColor: observable, + resetBackgroundColor: action }); } @@ -81,6 +83,7 @@ export class storeTextSettings { canIncreaseIndent = undefined; canDecreaseIndent = undefined; textColor = undefined; + backgroundColor = undefined; customTextColors = []; lineSpacing = undefined; @@ -280,4 +283,14 @@ export class storeTextSettings { this.lineSpacing = line; } + resetBackgroundColor(color) { + if (color) { + console.log(color); + if (color == -1) { + this.backgroundColor = 'transparent'; + } else { + this.backgroundColor = color.get_hex(); + } + } + } } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 6bf147ace..60fdbd8a3 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import { EditLinkController } from "../../controller/edit/EditLink"; import { Theme, Layout, Transition, Type, Effect, StyleFillColor, CustomFillColor } from './EditSlide'; -import { PageTextFonts, PageTextFontColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing } from './EditText'; +import { PageTextFonts, PageTextFontColor, PageTextBackgroundColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing } from './EditText'; import { PageShapeStyle, PageShapeStyleNoFill, PageReplaceContainer, PageReorderContainer, PageAlignContainer, PageShapeBorderColor, PageShapeCustomBorderColor, PageShapeCustomFillColor } from './EditShape'; import { PageImageReplace, PageImageReorder, PageImageAlign, PageLinkSettings } from './EditImage'; import { PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor, PageTableReorder, PageTableAlign } from './EditTable'; @@ -64,6 +64,10 @@ const routes = [ path: '/edit-text-font-color/', component: PageTextFontColor }, + { + path: '/edit-text-background-color/', + component: PageTextBackgroundColor + }, { path: '/edit-text-custom-font-color/', component: PageTextCustomFontColor diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index d6c4084d9..73e2bb05e 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage'; +import HighlightColorPalette from '../../../../../common/mobile/lib/component/HighlightColorPalette.jsx'; const EditText = props => { const isAndroid = Device.android; @@ -16,6 +17,7 @@ const EditText = props => { const fontName = storeTextSettings.fontName || _t.textFonts; const fontSize = storeTextSettings.fontSize; const fontColor = storeTextSettings.textColor; + const backgroundColor = storeTextSettings.backgroundColor; const displaySize = typeof fontSize === 'undefined' || fontSize == '' ? _t.textAuto : fontSize + ' ' + _t.textPt; const isBold = storeTextSettings.isBold; const isItalic = storeTextSettings.isItalic; @@ -53,6 +55,10 @@ const EditText = props => { : ; + const backgroundColorPreview = backgroundColor !== 'transparent' ? + : + ; + return ( @@ -76,6 +82,13 @@ const EditText = props => { fontColorPreview } + + {!isAndroid ? + {backgroundColorPreview} : backgroundColorPreview + } + { ) }; +const PageBackgroundColor = props => { + const { t } = useTranslation(); + const _t = t('View.Edit', {returnObjects: true}); + const backgroundColor = props.storeTextSettings.backgroundColor; + + const changeColor = (color, effectId) => { + if (color !== 'empty') { + if (effectId !== undefined ) { + props.onBackgroundColor({color: color, effectId: effectId}); + } else { + props.onBackgroundColor(color); + } + } + }; + + return ( + + + {Device.phone && + + + + + + } + + + + ) +}; + const PageAdditionalFormatting = props => { const isAndroid = Device.android; const { t } = useTranslation(); @@ -609,6 +653,7 @@ const PageLineSpacing = props => { const EditTextContainer = inject("storeTextSettings", "storeFocusObjects")(observer(EditText)); const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer(PageFonts)); const PageTextFontColor = inject("storeTextSettings", "storePalette", "storeFocusObjects")(observer(PageFontColor)); +const PageTextBackgroundColor = inject("storeTextSettings", "storePalette")(observer(PageBackgroundColor)); const PageTextCustomFontColor = inject("storeTextSettings", "storePalette")(observer(PageCustomFontColor)); const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); const PageTextBulletsAndNumbers = inject("storeTextSettings", "storeFocusObjects")(observer(PageBulletsAndNumbers)); @@ -618,6 +663,7 @@ export { EditTextContainer as EditText, PageTextFonts, PageTextFontColor, + PageTextBackgroundColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, From 03533acc5609e88480293322c78518666d86dc3c Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 17 Sep 2021 01:59:05 +0300 Subject: [PATCH 128/129] [DE PE mobile] Correct highlight color palette and edit settings --- .../lib/component/HighlightColorPalette.jsx | 6 +++- apps/common/mobile/resources/less/icons.less | 5 +++ .../mobile/src/controller/Main.jsx | 11 +++++-- .../src/controller/edit/EditParagraph.jsx | 10 +++--- .../mobile/src/controller/edit/EditText.jsx | 15 ++++++--- .../mobile/src/store/paragraphSettings.js | 2 ++ .../mobile/src/store/textSettings.js | 31 ++++++------------- .../mobile/src/view/edit/Edit.jsx | 10 ++---- .../mobile/src/view/edit/EditText.jsx | 30 +++++++++--------- .../mobile/src/controller/Main.jsx | 2 +- .../mobile/src/controller/edit/EditText.jsx | 4 +-- .../mobile/src/store/textSettings.js | 20 ++++++------ .../mobile/src/view/edit/Edit.jsx | 6 ++-- .../mobile/src/view/edit/EditText.jsx | 26 ++++++++-------- 14 files changed, 88 insertions(+), 90 deletions(-) diff --git a/apps/common/mobile/lib/component/HighlightColorPalette.jsx b/apps/common/mobile/lib/component/HighlightColorPalette.jsx index 8ca49f41c..32980e2cf 100644 --- a/apps/common/mobile/lib/component/HighlightColorPalette.jsx +++ b/apps/common/mobile/lib/component/HighlightColorPalette.jsx @@ -1,8 +1,10 @@ import React from 'react'; import { f7, ListItem, List, Icon, Page } from 'framework7-react'; import { useTranslation } from 'react-i18next'; +import {Device} from '../../utils/device'; const HighlightColorPalette = ({changeColor, curColor}) => { + const isAndroid = Device.android; const { t } = useTranslation(); const highlightColors = [ ['ffff00', '00ff00', '00ffff', 'ff00ff', '0000ff', 'ff0000', '00008b', '008b8b'], @@ -24,7 +26,9 @@ const HighlightColorPalette = ({changeColor, curColor}) => { ))}
    - changeColor('transparent')} title={t('Common.HighlightColorPalette.textNoFill')}> + changeColor('transparent')} title={t('Common.HighlightColorPalette.textNoFill')}> + {!isAndroid && } + ) }; diff --git a/apps/common/mobile/resources/less/icons.less b/apps/common/mobile/resources/less/icons.less index 234485c7a..638f99f5e 100644 --- a/apps/common/mobile/resources/less/icons.less +++ b/apps/common/mobile/resources/less/icons.less @@ -25,4 +25,9 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-cancellation { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index b39ad5f69..99215476c 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -573,9 +573,14 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onParaSpacingLine', (vc) => { storeTextSettings.resetLineSpacing(vc); }); - this.api.asc_registerCallback('asc_onTextShd', (shd) => { - let color = shd.get_Color(); - storeTextSettings.resetBackgroundColor(color); + + this.api.asc_registerCallback('asc_onTextHighLight', color => { + let textPr = this.api.get_TextProps().get_TextPr(); + + if(textPr) { + color = textPr.get_HighLight(); + storeTextSettings.resetHighlightColor(color); + } }); // link settings diff --git a/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx index 0ecbe0bfa..016449ba3 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditParagraph.jsx @@ -133,15 +133,13 @@ class EditParagraphController extends Component { onBackgroundColor (color) { const api = Common.EditorApi.get(); - const properties = new Asc.asc_CParagraphProperty(); - properties.put_Shade(new Asc.asc_CParagraphShd()); + if (color == 'transparent') { - properties.get_Shade().put_Value(Asc.c_oAscShdNil); + api.put_ParagraphShade(false); } else { - properties.get_Shade().put_Value(Asc.c_oAscShdClear); - properties.get_Shade().put_Color(Common.Utils.ThemeColor.getRgbColor(color)); + api.put_ParagraphShade(true, Common.Utils.ThemeColor.getRgbColor(color)); } - api.paraApply(properties); + } render () { diff --git a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx index 3f22efa08..4b8e57998 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditText.jsx @@ -45,12 +45,17 @@ class EditTextController extends Component { api.put_TextColor(Common.Utils.ThemeColor.getRgbColor(color)); } - onBackgroundColor(color) { + onHighlightColor(strColor) { const api = Common.EditorApi.get(); - if (color == 'transparent') { - api.put_ParagraphShade(false); + + if (strColor == 'transparent') { + api.SetMarkerFormat(true, false); } else { - api.put_ParagraphShade(true, Common.Utils.ThemeColor.getRgbColor(color)); + let r = strColor[0] + strColor[1], + g = strColor[2] + strColor[3], + b = strColor[4] + strColor[5]; + + api.SetMarkerFormat(true, true, parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)); } } @@ -203,7 +208,7 @@ class EditTextController extends Component { changeFontFamily={this.changeFontFamily} onTextColorAuto={this.onTextColorAuto} onTextColor={this.onTextColor} - onBackgroundColor={this.onBackgroundColor} + onHighlightColor={this.onHighlightColor} toggleBold={this.toggleBold} toggleItalic={this.toggleItalic} toggleUnderline={this.toggleUnderline} diff --git a/apps/documenteditor/mobile/src/store/paragraphSettings.js b/apps/documenteditor/mobile/src/store/paragraphSettings.js index ed5bd2004..db7e81b87 100644 --- a/apps/documenteditor/mobile/src/store/paragraphSettings.js +++ b/apps/documenteditor/mobile/src/store/paragraphSettings.js @@ -51,6 +51,7 @@ export class storeParagraphSettings { getBackgroundColor (paragraphObject) { const shade = paragraphObject.get_Shade(); let backColor = 'transparent'; + if (!!shade && shade.get_Value() === Asc.c_oAscShdClear) { const color = shade.get_Color(); if (color) { @@ -64,6 +65,7 @@ export class storeParagraphSettings { } } } + this.backColor = backColor; return backColor; } diff --git a/apps/documenteditor/mobile/src/store/textSettings.js b/apps/documenteditor/mobile/src/store/textSettings.js index e6a64506c..6d31f9fb3 100644 --- a/apps/documenteditor/mobile/src/store/textSettings.js +++ b/apps/documenteditor/mobile/src/store/textSettings.js @@ -20,7 +20,7 @@ export class storeTextSettings { textColor: observable, customTextColors: observable, lineSpacing: observable, - backgroundColor: observable, + highlightColor: observable, initEditorFonts: action, resetFontName: action, resetFontsRecent:action, @@ -40,7 +40,7 @@ export class storeTextSettings { resetTextColor: action, changeCustomTextColors: action, resetLineSpacing: action, - resetBackgroundColor: action, + resetHighlightColor: action, changeFontFamily: action, iconWidth: observable, iconHeight: observable, @@ -80,7 +80,7 @@ export class storeTextSettings { textColor = undefined; customTextColors = []; lineSpacing = undefined; - backgroundColor = undefined; + highlightColor = undefined; initEditorFonts (fonts, select) { @@ -251,24 +251,11 @@ export class storeTextSettings { this.lineSpacing = line; } - resetBackgroundColor (color) { - let value; - - if(color) { - if (color.get_auto()) { - value = 'transparent' - } else { - if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - value = { - color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), - effectValue: color.get_value() - } - } else { - value = Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()); - } - } - } - - this.backgroundColor = value; + resetHighlightColor (color) { + if (color == -1) { + this.highlightColor = 'transparent'; + } else { + this.highlightColor = color.get_hex(); + } } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index 7554124c2..7b8b04ef9 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import EditHyperlinkController from "../../controller/edit/EditHyperlink"; import EditHeaderController from "../../controller/edit/EditHeader"; -import {PageTextFonts, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextBackgroundColor, PageTextCustomBackColor} from "./EditText"; +import {PageTextFonts, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing, PageTextFontColor, PageTextCustomFontColor, PageTextHighlightColor} from "./EditText"; import {ParagraphAdvSettings, PageParagraphBackColor, PageParagraphCustomColor} from "./EditParagraph"; import {PageShapeStyleNoFill, PageShapeStyle, PageShapeCustomFillColor, PageShapeBorderColor, PageShapeCustomBorderColor, PageWrap, PageReorder, PageReplace} from "./EditShape"; import {PageImageReorder, PageImageReplace, PageImageWrap, PageLinkSettings} from "./EditImage"; @@ -48,12 +48,8 @@ const routes = [ component: PageTextCustomFontColor, }, { - path: '/edit-text-background-color/', - component: PageTextBackgroundColor, - }, - { - path: '/edit-text-custom-back-color/', - component: PageTextCustomBackColor, + path: '/edit-text-highlight-color/', + component: PageTextHighlightColor, }, //Edit paragraph { diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx index 147bbcda0..2b568f068 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx @@ -462,17 +462,17 @@ const PageCustomBackColor = props => { ) }; -const PageBackgroundColor = props => { +const PageHighlightColor = props => { const { t } = useTranslation(); const _t = t('Edit', {returnObjects: true}); - const backgroundColor = props.storeTextSettings.backgroundColor; + const highlightColor = props.storeTextSettings.highlightColor; const changeColor = (color, effectId) => { if (color !== 'empty') { if (effectId !== undefined ) { - props.onBackgroundColor({color: color, effectId: effectId}); + props.onHighlightColor({color: color, effectId: effectId}); } else { - props.onBackgroundColor(color); + props.onHighlightColor(color); } } }; @@ -488,7 +488,7 @@ const PageBackgroundColor = props => { } - + ) }; @@ -500,7 +500,7 @@ const EditText = props => { const fontName = storeTextSettings.fontName || t('Edit.textFonts'); const fontSize = storeTextSettings.fontSize; const fontColor = storeTextSettings.textColor; - const backgroundColor = storeTextSettings.backgroundColor; + const highlightColor = storeTextSettings.highlightColor; const displaySize = typeof fontSize === 'undefined' ? t('Edit.textAuto') : fontSize + ' ' + t('Edit.textPt'); const isBold = storeTextSettings.isBold; const isItalic = storeTextSettings.isItalic; @@ -525,8 +525,8 @@ const EditText = props => { : ; - const backgroundColorPreview = backgroundColor !== 'transparent' ? - : + const highlightColorPreview = highlightColor !== 'transparent' ? + : ; return ( @@ -553,11 +553,11 @@ const EditText = props => { fontColorPreview } - {!isAndroid ? - {backgroundColorPreview} : backgroundColorPreview + {highlightColorPreview} : highlightColorPreview } { - storeTextSettings.resetBackgroundColor(color); + storeTextSettings.resetHighlightColor(color); }); this.api.asc_registerCallback('asc_onParaSpacingLine', (vc) => { diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx index 67837492e..e7fb78aa2 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditText.jsx @@ -155,7 +155,7 @@ class EditTextController extends Component { api.put_TextColor(Common.Utils.ThemeColor.getRgbColor(color)); } - onBackgroundColor(strColor) { + onHighlightColor(strColor) { const api = Common.EditorApi.get(); if (strColor == 'transparent') { @@ -256,7 +256,7 @@ class EditTextController extends Component { changeFontSize={this.changeFontSize} changeFontFamily={this.changeFontFamily} onTextColor={this.onTextColor} - onBackgroundColor={this.onBackgroundColor} + onHighlightColor={this.onHighlightColor} onAdditionalStrikethrough={this.onAdditionalStrikethrough} onAdditionalCaps={this.onAdditionalCaps} onAdditionalScript={this.onAdditionalScript} diff --git a/apps/presentationeditor/mobile/src/store/textSettings.js b/apps/presentationeditor/mobile/src/store/textSettings.js index 891d2cfd9..98330ea8f 100644 --- a/apps/presentationeditor/mobile/src/store/textSettings.js +++ b/apps/presentationeditor/mobile/src/store/textSettings.js @@ -53,8 +53,8 @@ export class storeTextSettings { spriteCols: observable, loadSprite: action, addFontToRecent:action, - backgroundColor: observable, - resetBackgroundColor: action + highlightColor: observable, + resetHighlightColor: action }); } @@ -83,7 +83,7 @@ export class storeTextSettings { canIncreaseIndent = undefined; canDecreaseIndent = undefined; textColor = undefined; - backgroundColor = undefined; + highlightColor = undefined; customTextColors = []; lineSpacing = undefined; @@ -283,14 +283,12 @@ export class storeTextSettings { this.lineSpacing = line; } - resetBackgroundColor(color) { - if (color) { - console.log(color); - if (color == -1) { - this.backgroundColor = 'transparent'; - } else { - this.backgroundColor = color.get_hex(); - } + resetHighlightColor(color) { + if (color == -1) { + this.highlightColor = 'transparent'; + } else { + this.highlightColor = color.get_hex(); } + } } \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 60fdbd8a3..e231dfc26 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -14,7 +14,7 @@ import EditChartController from "../../controller/edit/EditChart"; import { EditLinkController } from "../../controller/edit/EditLink"; import { Theme, Layout, Transition, Type, Effect, StyleFillColor, CustomFillColor } from './EditSlide'; -import { PageTextFonts, PageTextFontColor, PageTextBackgroundColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing } from './EditText'; +import { PageTextFonts, PageTextFontColor, PageTextHighlightColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, PageTextLineSpacing } from './EditText'; import { PageShapeStyle, PageShapeStyleNoFill, PageReplaceContainer, PageReorderContainer, PageAlignContainer, PageShapeBorderColor, PageShapeCustomBorderColor, PageShapeCustomFillColor } from './EditShape'; import { PageImageReplace, PageImageReorder, PageImageAlign, PageLinkSettings } from './EditImage'; import { PageTableStyle, PageTableStyleOptions, PageTableCustomFillColor, PageTableBorderColor, PageTableCustomBorderColor, PageTableReorder, PageTableAlign } from './EditTable'; @@ -65,8 +65,8 @@ const routes = [ component: PageTextFontColor }, { - path: '/edit-text-background-color/', - component: PageTextBackgroundColor + path: '/edit-text-highlight-color/', + component: PageTextHighlightColor }, { path: '/edit-text-custom-font-color/', diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index 73e2bb05e..65917805e 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -17,7 +17,7 @@ const EditText = props => { const fontName = storeTextSettings.fontName || _t.textFonts; const fontSize = storeTextSettings.fontSize; const fontColor = storeTextSettings.textColor; - const backgroundColor = storeTextSettings.backgroundColor; + const highlightColor = storeTextSettings.highlightColor; const displaySize = typeof fontSize === 'undefined' || fontSize == '' ? _t.textAuto : fontSize + ' ' + _t.textPt; const isBold = storeTextSettings.isBold; const isItalic = storeTextSettings.isItalic; @@ -55,8 +55,8 @@ const EditText = props => { : ; - const backgroundColorPreview = backgroundColor !== 'transparent' ? - : + const highlightColorPreview = highlightColor !== 'transparent' ? + : ; return ( @@ -82,11 +82,11 @@ const EditText = props => { fontColorPreview } - {!isAndroid ? - {backgroundColorPreview} : backgroundColorPreview + {highlightColorPreview} : highlightColorPreview } { ) }; -const PageBackgroundColor = props => { +const PageHighlightColor = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); - const backgroundColor = props.storeTextSettings.backgroundColor; + const highlightColor = props.storeTextSettings.highlightColor; const changeColor = (color, effectId) => { if (color !== 'empty') { if (effectId !== undefined ) { - props.onBackgroundColor({color: color, effectId: effectId}); + props.onHighlightColor({color: color, effectId: effectId}); } else { - props.onBackgroundColor(color); + props.onHighlightColor(color); } } }; @@ -408,7 +408,7 @@ const PageBackgroundColor = props => { } - + ) }; @@ -653,7 +653,7 @@ const PageLineSpacing = props => { const EditTextContainer = inject("storeTextSettings", "storeFocusObjects")(observer(EditText)); const PageTextFonts = inject("storeTextSettings", "storeFocusObjects")(observer(PageFonts)); const PageTextFontColor = inject("storeTextSettings", "storePalette", "storeFocusObjects")(observer(PageFontColor)); -const PageTextBackgroundColor = inject("storeTextSettings", "storePalette")(observer(PageBackgroundColor)); +const PageTextHighlightColor = inject("storeTextSettings")(observer(PageHighlightColor)); const PageTextCustomFontColor = inject("storeTextSettings", "storePalette")(observer(PageCustomFontColor)); const PageTextAddFormatting = inject("storeTextSettings", "storeFocusObjects")(observer(PageAdditionalFormatting)); const PageTextBulletsAndNumbers = inject("storeTextSettings", "storeFocusObjects")(observer(PageBulletsAndNumbers)); @@ -663,7 +663,7 @@ export { EditTextContainer as EditText, PageTextFonts, PageTextFontColor, - PageTextBackgroundColor, + PageTextHighlightColor, PageTextCustomFontColor, PageTextAddFormatting, PageTextBulletsAndNumbers, From 31dcadb289a0e156b9e1b21ee7334e790030cca2 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Sun, 19 Sep 2021 19:24:15 +0300 Subject: [PATCH 129/129] [DE PE SSE] Editing translations --- .../mobile/src/view/edit/EditChart.jsx | 38 +++++++---------- .../mobile/src/view/edit/EditChart.jsx | 38 +++++++---------- .../mobile/src/view/edit/EditChart.jsx | 42 ++++++++----------- 3 files changed, 50 insertions(+), 68 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index 61effc4ee..4b37577af 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -141,7 +141,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -150,7 +149,7 @@ const PageChartType = props => { return ( - +
    @@ -179,14 +178,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
    @@ -203,7 +201,7 @@ const PageChartStyle = props => { ) }) ) - }) :
    {_t.textNoStyles}
    + }) :
    {t('Edit.textNoStyles')}
    }
    @@ -215,11 +213,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); return ( - +
    @@ -229,7 +226,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const shapeObject = props.storeFocusObjects.shapeObject; @@ -253,12 +249,12 @@ const PageChartBorder = props => { return ( - +
    -
    {_t.textSize}
    +
    {t('Edit.textSize')}
    {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -269,7 +265,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
    - { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; // console.log(chartStyles, curType); @@ -298,7 +293,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -309,10 +304,10 @@ const PageDesign = props => { - - - - + + + @@ -476,31 +471,30 @@ const PageReorder = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('Edit', {returnObjects: true}); return ( - - - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> ) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index f57ffe08f..4a5cded23 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -151,7 +151,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -160,7 +159,7 @@ const PageChartType = props => { return ( - +
    @@ -189,14 +188,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
    @@ -213,7 +211,7 @@ const PageChartStyle = props => { ) }) ) - }) :
    {_t.textNoStyles}
    + }) :
    {t('View.Edit.textNoStyles')}
    }
    @@ -225,11 +223,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - +
    @@ -239,7 +236,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const shapeObject = props.storeFocusObjects.shapeObject; @@ -263,12 +259,12 @@ const PageChartBorder = props => { return ( - +
    -
    {_t.textSize}
    +
    {t('View.Edit.textSize')}
    {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -279,7 +275,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
    - { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const chartProperties = props.storeFocusObjects.chartObject ? props.storeFocusObjects.chartObject.get_ChartProperties() : null; if (!chartProperties && Device.phone) { @@ -305,7 +300,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -316,10 +311,10 @@ const PageDesign = props => { - - - - + + + @@ -423,27 +418,26 @@ const PageAlign = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - - - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> ) diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index f795d5cef..74b619f9a 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -146,7 +146,6 @@ const PageBorderColor = props => { const PageChartType = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const types = storeChartSettings.types; const storeFocusObjects = props.storeFocusObjects; @@ -155,7 +154,7 @@ const PageChartType = props => { return ( - +
    @@ -182,14 +181,13 @@ const PageChartType = props => { const PageChartStyle = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const styles = storeChartSettings.styles; const chartStyles = storeChartSettings.chartStyles; return ( - + {chartStyles ?
    @@ -206,7 +204,7 @@ const PageChartStyle = props => { ) }) ) - }) :
    {_t.textNoStyles}
    + }) :
    {t('View.Edit.textNoStyles')}
    }
    @@ -218,11 +216,10 @@ const PageChartStyle = props => { const PageChartDesignFill = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); return ( - +
    @@ -232,7 +229,6 @@ const PageChartDesignFill = props => { const PageChartBorder = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeChartSettings = props.storeChartSettings; const storeFocusObjects = props.storeFocusObjects; const shapeProperties = storeFocusObjects.shapeObject && storeFocusObjects.shapeObject.get_ShapeProperties(); @@ -261,12 +257,12 @@ const PageChartBorder = props => { return ( - +
    -
    {_t.textSize}
    +
    {t('View.Edit.textSize')}
    {setBorderSize(value); setTextBorderSize(borderSizeTransform.sizeByIndex(value));}} @@ -277,7 +273,7 @@ const PageChartBorder = props => { {stateTextBorderSize + ' ' + Common.Utils.Metric.getMetricName(Common.Utils.Metric.c_MetricUnits.pt)}
    - { const PageDesign = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); @@ -307,7 +302,7 @@ const PageDesign = props => { return ( - + {Device.phone && @@ -316,10 +311,10 @@ const PageDesign = props => { - - - - + + + @@ -1428,7 +1423,6 @@ const PageHorLabelPosition = props => { const EditChart = props => { const { t } = useTranslation(); - const _t = t('View.Edit', {returnObjects: true}); const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); const chartType = chartProperties && chartProperties.getType(); @@ -1461,19 +1455,19 @@ const EditChart = props => { return ( - - - { onVerAxisTickMinor: props.onVerAxisTickMinor, onVerAxisLabelPos: props.onVerAxisLabelPos }}> - { disableAxisPos, needReverse }}> - - {props.onRemoveChart()}} className='button-red button-fill button-raised'/> + {props.onRemoveChart()}} className='button-red button-fill button-raised'/> )