diff --git a/apps/common/main/resources/img/toolbar/1.25x/big/btn-merge-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/big/btn-merge-shapes.png new file mode 100644 index 0000000000..538e176342 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/big/btn-merge-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-combine-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/btn-combine-shapes.png new file mode 100644 index 0000000000..7f7890f9da Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-combine-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-fragment-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/btn-fragment-shapes.png new file mode 100644 index 0000000000..b0358463cb Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-fragment-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-intersect-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/btn-intersect-shapes.png new file mode 100644 index 0000000000..db3d84f0ee Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-intersect-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-substract-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/btn-substract-shapes.png new file mode 100644 index 0000000000..67e3c1f4a5 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-substract-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-union-shapes.png b/apps/common/main/resources/img/toolbar/1.25x/btn-union-shapes.png new file mode 100644 index 0000000000..14a7ba6e83 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-union-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/big/btn-merge-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/big/btn-merge-shapes.png new file mode 100644 index 0000000000..cab887a15b Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/big/btn-merge-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-combine-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/btn-combine-shapes.png new file mode 100644 index 0000000000..819bfa45d5 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-combine-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-fragment-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/btn-fragment-shapes.png new file mode 100644 index 0000000000..d5cc9687a1 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-fragment-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-intersect-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/btn-intersect-shapes.png new file mode 100644 index 0000000000..c1812a93bd Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-intersect-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-substract-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/btn-substract-shapes.png new file mode 100644 index 0000000000..fc4a49b7d0 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-substract-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-union-shapes.png b/apps/common/main/resources/img/toolbar/1.5x/btn-union-shapes.png new file mode 100644 index 0000000000..b83df44789 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-union-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/big/btn-merge-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/big/btn-merge-shapes.png new file mode 100644 index 0000000000..8b1ab7f9ec Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/big/btn-merge-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-combine-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/btn-combine-shapes.png new file mode 100644 index 0000000000..538e176342 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-combine-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-fragment-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/btn-fragment-shapes.png new file mode 100644 index 0000000000..e0ac499944 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-fragment-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-intersect-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/btn-intersect-shapes.png new file mode 100644 index 0000000000..ed063d0391 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-intersect-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-substract-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/btn-substract-shapes.png new file mode 100644 index 0000000000..b946685e2f Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-substract-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-union-shapes.png b/apps/common/main/resources/img/toolbar/1.75x/btn-union-shapes.png new file mode 100644 index 0000000000..193f68da7e Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-union-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/big/btn-merge-shapes.png b/apps/common/main/resources/img/toolbar/1x/big/btn-merge-shapes.png new file mode 100644 index 0000000000..dbe0155c45 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/big/btn-merge-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-combine-shapes.png b/apps/common/main/resources/img/toolbar/1x/btn-combine-shapes.png new file mode 100644 index 0000000000..2a979b04bb Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-combine-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-fragment-shapes.png b/apps/common/main/resources/img/toolbar/1x/btn-fragment-shapes.png new file mode 100644 index 0000000000..016d91573d Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-fragment-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-intersect-shapes.png b/apps/common/main/resources/img/toolbar/1x/btn-intersect-shapes.png new file mode 100644 index 0000000000..7d259fc2a1 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-intersect-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-substract-shapes.png b/apps/common/main/resources/img/toolbar/1x/btn-substract-shapes.png new file mode 100644 index 0000000000..e0b7807890 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-substract-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/1x/btn-union-shapes.png b/apps/common/main/resources/img/toolbar/1x/btn-union-shapes.png new file mode 100644 index 0000000000..05adfc95b6 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-union-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2.5x/big/btn-merge-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/big/btn-merge-shapes.svg new file mode 100644 index 0000000000..f678b6d8c3 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/big/btn-merge-shapes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-combine-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-combine-shapes.svg new file mode 100644 index 0000000000..e4fef5aa23 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-combine-shapes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-fragment-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-fragment-shapes.svg new file mode 100644 index 0000000000..c56c997dd7 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-fragment-shapes.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-intersect-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-intersect-shapes.svg new file mode 100644 index 0000000000..1e89831934 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-intersect-shapes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-substract-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-substract-shapes.svg new file mode 100644 index 0000000000..c772ac3698 --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-substract-shapes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-union-shapes.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-union-shapes.svg new file mode 100644 index 0000000000..a0c9a5b60f --- /dev/null +++ b/apps/common/main/resources/img/toolbar/2.5x/btn-union-shapes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/common/main/resources/img/toolbar/2x/big/btn-merge-shapes.png b/apps/common/main/resources/img/toolbar/2x/big/btn-merge-shapes.png new file mode 100644 index 0000000000..10c8eff71a Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/big/btn-merge-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-combine-shapes.png b/apps/common/main/resources/img/toolbar/2x/btn-combine-shapes.png new file mode 100644 index 0000000000..b3d195d813 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-combine-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-fragment-shapes.png b/apps/common/main/resources/img/toolbar/2x/btn-fragment-shapes.png new file mode 100644 index 0000000000..ae9254b8be Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-fragment-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-intersect-shapes.png b/apps/common/main/resources/img/toolbar/2x/btn-intersect-shapes.png new file mode 100644 index 0000000000..fd84fdbaab Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-intersect-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-substract-shapes.png b/apps/common/main/resources/img/toolbar/2x/btn-substract-shapes.png new file mode 100644 index 0000000000..e1c70184e9 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-substract-shapes.png differ diff --git a/apps/common/main/resources/img/toolbar/2x/btn-union-shapes.png b/apps/common/main/resources/img/toolbar/2x/btn-union-shapes.png new file mode 100644 index 0000000000..6bc2eabd87 Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-union-shapes.png differ diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index e8b8d8ee63..e36d481442 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -428,6 +428,7 @@ define([ view.menuTableInsertText.menu.on('item:click', _.bind(me.tableInsertText, me)); view.menuTableDeleteText.menu.on('item:click', _.bind(me.tableDeleteText, me)); view.menuImageAlign.menu.on('item:click', _.bind(me.onImgAlign, me)); + view.menuShapesMerge.menu.on('item:click', _.bind(me.onShapesMerge, me)); view.menuImageArrange.menu.on('item:click', _.bind(me.onImgArrange, me)); view.mnuGroup.on('click', _.bind(me.onImgGroup, me)); view.mnuUnGroup.on('click', _.bind(me.onImgUnGroup, me)); @@ -2416,6 +2417,15 @@ define([ me.editComplete(); }, + onShapesMerge : function(menu, item, e) { + var me = this; + if (item && item.value) { + me.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('DocumentHolder', 'Shapes Merge'); + } + me.editComplete(); + }, + onImgArrange: function(menu, item, e) { var me = this; if (me.api && item.options.valign!==undefined) { diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index 69d0c29679..dd801520cc 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -79,6 +79,9 @@ define([ toolbar.btnImgForward.on('click', me.onClickMenuForward.bind(me, 'forward')); toolbar.btnImgBackward.on('click', me.onClickMenuForward.bind(me, 'backward')); + toolbar.btnShapesMerge.menu.on('item:click', me.onClickMenuShapesMerge.bind(me)); + toolbar.btnShapesMerge.menu.on('show:before', me.onBeforeShapesMerge.bind(me)); + toolbar.btnsPageBreak.forEach( function(btn) { var _menu_section_break = btn.menu.items[2].menu; _menu_section_break.on('item:click', function (menu, item, e) { @@ -179,10 +182,11 @@ define([ paraProps = objects[i].get_ObjectValue() } } - me.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward]}); - me.toolbar.lockToolbar(Common.enumLock.imageLock, islocked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping]}); - me.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward]}); - me.toolbar.lockToolbar(Common.enumLock.inImageInline, wrapping == Asc.c_oAscWrapStyle2.Inline, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup]}); + me.toolbar.lockToolbar(Common.enumLock.cantMergeShape, !me.api.asc_canMergeSelectedShapes(), { array: [me.toolbar.btnShapesMerge] }); + me.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward, me.toolbar.btnShapesMerge]}); + me.toolbar.lockToolbar(Common.enumLock.imageLock, islocked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnShapesMerge]}); + me.toolbar.lockToolbar(Common.enumLock.contentLock, content_locked, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnImgWrapping, me.toolbar.btnImgForward, me.toolbar.btnImgBackward, me.toolbar.btnShapesMerge]}); + me.toolbar.lockToolbar(Common.enumLock.inImageInline, wrapping == Asc.c_oAscWrapStyle2.Inline, {array: [me.toolbar.btnImgAlign, me.toolbar.btnImgGroup, me.toolbar.btnShapesMerge]}); me.toolbar.lockToolbar(Common.enumLock.inSmartartInternal, shapeProps && shapeProps.asc_getFromSmartArtInternal(), {array: [me.toolbar.btnImgForward, me.toolbar.btnImgBackward]}); me.toolbar.lockToolbar(Common.enumLock.cantGroup, !canGroupUngroup, {array: [me.toolbar.btnImgGroup]}); me.toolbar.lockToolbar(Common.enumLock.cantWrap, disable.wrapping, {array: [me.toolbar.btnImgWrapping]}); @@ -222,6 +226,20 @@ define([ this.toolbar.fireEvent('editcomplete', this.toolbar); }, + onBeforeShapesMerge: function() { + this.toolbar.btnShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!this.api.asc_canMergeSelectedShapes(item.value)); + }, this); + }, + + onClickMenuShapesMerge: function (menu, item, e) { + if (item && item.value) { + this.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('ToolBar', 'Shapes Merge'); + } + this.toolbar.fireEvent('editcomplete', this.toolbar); + }, + onClickMenuWrapping: function (menu, item, e) { if (item.options.wrapType=='edit') { this.api.StartChangeWrapPolygon(); diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index f570d161a1..d82d6fc5b2 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -169,6 +169,7 @@ +
diff --git a/apps/documenteditor/main/app/view/DocumentHolderExt.js b/apps/documenteditor/main/app/view/DocumentHolderExt.js index e355eb7801..b374bacd03 100644 --- a/apps/documenteditor/main/app/view/DocumentHolderExt.js +++ b/apps/documenteditor/main/app/view/DocumentHolderExt.js @@ -107,6 +107,45 @@ define([], function () { }) }); + var _toolbar_view = DE.getController('Toolbar').getView(); + me.menuShapesMerge = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-combine-shapes', + caption : me.textShapesMerge, + menu : new Common.UI.Menu({ + cls: 'ppm-toolbar shifted-right', + menuAlign: 'tl-tr', + items: [ + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesUnion, + iconCls : 'menu__icon btn-union-shapes', + value : 'unite', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesCombine, + iconCls : 'menu__icon btn-combine-shapes', + value : 'exclude', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesFragment, + iconCls : 'menu__icon btn-fragment-shapes', + value : 'divide', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesIntersect, + iconCls : 'menu__icon btn-intersect-shapes', + value : 'intersect', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesSubstract, + iconCls : 'menu__icon btn-substract-shapes', + value : 'subtract', + }) + ] + }) + }); + + + me.mnuGroup = new Common.UI.MenuItem({ caption : this.txtGroup, iconCls : 'menu__icon btn-shape-group' @@ -513,6 +552,12 @@ define([], function () { me.menuImageAlign.menu.items[7].setDisabled(objcount==2 && (!alignto || alignto==3)); me.menuImageAlign.menu.items[8].setDisabled(objcount==2 && (!alignto || alignto==3)); } + me.menuShapesMerge.setDisabled(islocked || !me.api.asc_canMergeSelectedShapes()); + if (!me.menuShapesMerge.isDisabled()) { + me.menuShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!me.api.asc_canMergeSelectedShapes(item.value)); + }); + } me.menuImageArrange.setDisabled( (wrapping == Asc.c_oAscWrapStyle2.Inline) && !value.imgProps.value.get_FromGroup() || content_locked || (me.api && !me.api.CanUnGroup() && !me.api.CanGroup() && value.imgProps.isSmartArtInternal)); me.menuImageArrange.menu.items[0].setDisabled(value.imgProps.isSmartArtInternal); @@ -575,6 +620,7 @@ define([], function () { menuImgControlSeparator, me.menuImageArrange, me.menuImageAlign, + me.menuShapesMerge, me.menuImageWrap, me.menuImgRotate, { caption: '--' }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 1ebbc5842d..bd71d64022 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -120,7 +120,8 @@ define([ fixedForm: 'fixed-form', fileMenuOpened: 'file-menu-opened', changeModeLock: 'change-mode-lock', - noStyles: 'no-styles' + noStyles: 'no-styles', + cantMergeShape: 'merge-shape-lock' }; for (var key in enumLock) { if (enumLock.hasOwnProperty(key)) { @@ -1561,6 +1562,19 @@ define([ dataHintDirection: 'bottom', dataHintOffset: 'small' }); + + me.btnShapesMerge = new Common.UI.Button({ + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'toolbar__icon btn-merge-shapes', + lock: [_set.imageLock, _set.contentLock, _set.noObjectSelected, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode, _set.cantMergeShape], + caption: me.capShapesMerge, + menu: true, + action: 'shapes-merge', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' + }); + me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-frwd', @@ -1643,7 +1657,7 @@ define([ }); me.toolbarControls.push(me.btnImgAlign, - me.btnImgGroup, me.btnImgForward, me.btnImgBackward, me.btnImgWrapping, me.btnWatermark, me.btnPageColor); + me.btnImgGroup, me.btnImgForward, me.btnImgBackward, me.btnImgWrapping, me.btnWatermark, me.btnPageColor, me.btnShapesMerge); // // Menus @@ -2112,10 +2126,11 @@ define([ _injectComponent('#slot-btn-paracolor', this.btnParagraphColor); _injectComponent('#slot-field-styles', this.listStyles); _injectComponent('#slot-img-align', this.btnImgAlign); - _injectComponent('#slot-img-group', this.btnImgGroup); + _injectComponent('#slot-img-group', this.btnImgGroup); _injectComponent('#slot-img-movefrwd', this.btnImgForward); _injectComponent('#slot-img-movebkwd', this.btnImgBackward); _injectComponent('#slot-img-wrapping', this.btnImgWrapping); + _injectComponent('#slot-shapes-merge', this.btnShapesMerge); _injectComponent('#slot-btn-watermark', this.btnWatermark); _injectComponent('#slot-btn-hyphenation', this.btnHyphenation); _injectComponent('#slot-spin-ind-left', this.numIndentsLeft); @@ -2364,6 +2379,38 @@ define([ ] })); + me.btnShapesMerge.updateHint(me.tipShapesMerge); + me.btnShapesMerge.setMenu(new Common.UI.Menu({ + cls: 'shifted-right', + items: [ + { + caption: me.textShapesUnion, + iconCls: 'menu__icon btn-union-shapes', + value: 'unite', + }, + { + caption: me.textShapesCombine, + iconCls: 'menu__icon btn-combine-shapes', + value: 'exclude', + }, + { + caption: me.textShapesFragment, + iconCls: 'menu__icon btn-fragment-shapes', + value: 'divide', + }, + { + caption: me.textShapesIntersect, + iconCls: 'menu__icon btn-intersect-shapes', + value: 'intersect', + }, + { + caption: me.textShapesSubstract, + iconCls: 'menu__icon btn-substract-shapes', + value: 'subtract', + }, + ] + })); + me.btnImgGroup.updateHint(me.tipImgGroup); me.btnImgGroup.setMenu(new Common.UI.Menu({ items: [{ diff --git a/apps/documenteditor/main/locale/ar.json b/apps/documenteditor/main/locale/ar.json index 1ddb6845cf..f23af71579 100644 --- a/apps/documenteditor/main/locale/ar.json +++ b/apps/documenteditor/main/locale/ar.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "شبه شفاف", "DE.Views.WatermarkSettingsDialog.textUnderline": "تحته خط", "DE.Views.WatermarkSettingsDialog.tipFontName": "اسم الخط", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "حجم الخط" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "حجم الخط", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/az.json b/apps/documenteditor/main/locale/az.json index 4ca4fb34fa..af8d900262 100644 --- a/apps/documenteditor/main/locale/az.json +++ b/apps/documenteditor/main/locale/az.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Yarım şəffaf", "DE.Views.WatermarkSettingsDialog.textUnderline": "Altından xətt çəkilmiş", "DE.Views.WatermarkSettingsDialog.tipFontName": "Şrift Adı", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Şrift Ölçüsü" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Şrift Ölçüsü", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/be.json b/apps/documenteditor/main/locale/be.json index 6d87daba98..e5258963ca 100644 --- a/apps/documenteditor/main/locale/be.json +++ b/apps/documenteditor/main/locale/be.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Паўпразрысты", "DE.Views.WatermarkSettingsDialog.textUnderline": "Падкрэслены", "DE.Views.WatermarkSettingsDialog.tipFontName": "Назва шрыфту", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Памер шрыфту" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Памер шрыфту", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/bg.json b/apps/documenteditor/main/locale/bg.json index b53274f7ef..9e50e4d9ed 100644 --- a/apps/documenteditor/main/locale/bg.json +++ b/apps/documenteditor/main/locale/bg.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", "DE.Views.WatermarkSettingsDialog.tipFontName": "Име на шрифта", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер на шрифта" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер на шрифта", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ca.json b/apps/documenteditor/main/locale/ca.json index 1e60b4d6e1..e0f63e5acb 100644 --- a/apps/documenteditor/main/locale/ca.json +++ b/apps/documenteditor/main/locale/ca.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Subratllar", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la lletra", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Mida de la lletra" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Mida de la lletra", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index bb8e2071fd..a8aac27c56 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Poloprůhledné", "DE.Views.WatermarkSettingsDialog.textUnderline": "Podtržené", "DE.Views.WatermarkSettingsDialog.tipFontName": "Název písma", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Velikost písma" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Velikost písma", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/da.json b/apps/documenteditor/main/locale/da.json index a5a3a7a773..9b6590c9f2 100644 --- a/apps/documenteditor/main/locale/da.json +++ b/apps/documenteditor/main/locale/da.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Halvgennemsigtig", "DE.Views.WatermarkSettingsDialog.textUnderline": "Understreg", "DE.Views.WatermarkSettingsDialog.tipFontName": "Skrifttypenavn", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Skriftstørrelse" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Skriftstørrelse", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index e2f07aaff6..61e3d89754 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Halbtransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Unterstrichen", "DE.Views.WatermarkSettingsDialog.tipFontName": "Schriftartname", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Schriftgrad" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Schriftgrad", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index 7647b607a4..26281b1144 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Ημιδιαφανές", "DE.Views.WatermarkSettingsDialog.textUnderline": "Υπογράμμιση", "DE.Views.WatermarkSettingsDialog.tipFontName": "Όνομα γραμματοσειράς", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Μέγεθος γραμματοσειράς" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Μέγεθος γραμματοσειράς", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e065d54582..59c861e9fd 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1951,6 +1951,7 @@ "DE.Views.DocumentHolder.tableText": "Table", "DE.Views.DocumentHolder.textAccept": "Accept change", "DE.Views.DocumentHolder.textAlign": "Align", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", "DE.Views.DocumentHolder.textArrange": "Arrange", "DE.Views.DocumentHolder.textArrangeBack": "Send to background", "DE.Views.DocumentHolder.textArrangeBackward": "Send backward", @@ -3397,6 +3398,7 @@ "DE.Views.Toolbar.capImgBackward": "Send Backward", "DE.Views.Toolbar.capImgForward": "Bring Forward", "DE.Views.Toolbar.capImgGroup": "Group", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", "DE.Views.Toolbar.capImgWrapping": "Wrapping", "DE.Views.Toolbar.mniCapitalizeWords": "Capitalize Each Word", "DE.Views.Toolbar.mniCustomTable": "Insert custom table", @@ -3540,6 +3542,11 @@ "DE.Views.Toolbar.textTradeMark": "Trade Mark Sign", "DE.Views.Toolbar.textUnderline": "Underline", "DE.Views.Toolbar.textYen": "Yen Sign", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", "DE.Views.Toolbar.tipAlignCenter": "Align center", "DE.Views.Toolbar.tipAlignJust": "Justified", "DE.Views.Toolbar.tipAlignLeft": "Align left", @@ -3570,6 +3577,7 @@ "DE.Views.Toolbar.tipHyphenation": "Change hyphenation", "DE.Views.Toolbar.tipImgAlign": "Align objects", "DE.Views.Toolbar.tipImgGroup": "Group objects", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes", "DE.Views.Toolbar.tipImgWrapping": "Wrap text", "DE.Views.Toolbar.tipIncFont": "Increment font size", "DE.Views.Toolbar.tipIncPrLeft": "Increase indent", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index a4c1af244c..c4ce1de594 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente", "DE.Views.WatermarkSettingsDialog.textUnderline": "Subrayado", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nombre de la fuente", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño de la fuente" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño de la fuente", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/eu.json b/apps/documenteditor/main/locale/eu.json index c07527c496..97bf1bd141 100644 --- a/apps/documenteditor/main/locale/eu.json +++ b/apps/documenteditor/main/locale/eu.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Erdigardena", "DE.Views.WatermarkSettingsDialog.textUnderline": "Azpimarra", "DE.Views.WatermarkSettingsDialog.tipFontName": "Letra-tipoaren izena", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Letra-tamaina" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Letra-tamaina", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/fi.json b/apps/documenteditor/main/locale/fi.json index f9a713656d..05fac6aa4b 100644 --- a/apps/documenteditor/main/locale/fi.json +++ b/apps/documenteditor/main/locale/fi.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Läpikuultava", "DE.Views.WatermarkSettingsDialog.textUnderline": "Alleviivaus", "DE.Views.WatermarkSettingsDialog.tipFontName": "Fontti", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fonttikoko" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fonttikoko", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 77ab2ebca3..b172d8d15a 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi-transparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Souligné", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nom de la police", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Taille de police", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/gl.json b/apps/documenteditor/main/locale/gl.json index dea295df59..3b812a2632 100644 --- a/apps/documenteditor/main/locale/gl.json +++ b/apps/documenteditor/main/locale/gl.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente", "DE.Views.WatermarkSettingsDialog.textUnderline": "Subliñado", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome da fonte", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño da fonte" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamaño da fonte", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/he.json b/apps/documenteditor/main/locale/he.json index 22f7a07fc6..bf842e169e 100644 --- a/apps/documenteditor/main/locale/he.json +++ b/apps/documenteditor/main/locale/he.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "חצי שקוף", "DE.Views.WatermarkSettingsDialog.textUnderline": "קו תחתון", "DE.Views.WatermarkSettingsDialog.tipFontName": "שם גופן", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "גודל גופן" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "גודל גופן", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 8bf1b5b9eb..decc84edf2 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Féligáttetsző", "DE.Views.WatermarkSettingsDialog.textUnderline": "Aláhúzott", "DE.Views.WatermarkSettingsDialog.tipFontName": "Betűtípus neve", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Betűméret" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Betűméret", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/hy.json b/apps/documenteditor/main/locale/hy.json index 4e91ca979d..6cc780046b 100644 --- a/apps/documenteditor/main/locale/hy.json +++ b/apps/documenteditor/main/locale/hy.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Կիսաթափանցիկ", "DE.Views.WatermarkSettingsDialog.textUnderline": "Ընդգծված", "DE.Views.WatermarkSettingsDialog.tipFontName": "Տառատեսակի անուն", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Տառատեսակի չափ" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Տառատեսակի չափ", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/id.json b/apps/documenteditor/main/locale/id.json index 07977349ed..d512324c7c 100644 --- a/apps/documenteditor/main/locale/id.json +++ b/apps/documenteditor/main/locale/id.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi Transparan", "DE.Views.WatermarkSettingsDialog.textUnderline": "Garis bawah", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nama font", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Ukuran font" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Ukuran font", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index b7205916b9..6be3df68ef 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitrasparente", "DE.Views.WatermarkSettingsDialog.textUnderline": "Sottolineato", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome carattere", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensione carattere" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensione carattere", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index 60a8fc303b..dd5d0dedb3 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "半透明", "DE.Views.WatermarkSettingsDialog.textUnderline": "アンダーライン", "DE.Views.WatermarkSettingsDialog.tipFontName": "フォント名", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "フォントのサイズ" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "フォントのサイズ", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ko.json b/apps/documenteditor/main/locale/ko.json index f8ddfd3802..dc5c7b6327 100644 --- a/apps/documenteditor/main/locale/ko.json +++ b/apps/documenteditor/main/locale/ko.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "투명한", "DE.Views.WatermarkSettingsDialog.textUnderline": "밑줄", "DE.Views.WatermarkSettingsDialog.tipFontName": "글꼴 이름", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "글꼴 크기" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "글꼴 크기", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/lo.json b/apps/documenteditor/main/locale/lo.json index 8aaa096e7d..a3fc4d2be8 100644 --- a/apps/documenteditor/main/locale/lo.json +++ b/apps/documenteditor/main/locale/lo.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "ຂີ້ດກ້ອງ", "DE.Views.WatermarkSettingsDialog.tipFontName": "ຊື່ຕົວອັກສອນ", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "ຂະໜາດຕົວອັກສອນ" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "ຂະໜາດຕົວອັກສອນ", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/lv.json b/apps/documenteditor/main/locale/lv.json index 0989f73a98..73554ef413 100644 --- a/apps/documenteditor/main/locale/lv.json +++ b/apps/documenteditor/main/locale/lv.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Daļēji caurspīdīgs", "DE.Views.WatermarkSettingsDialog.textUnderline": "Pasvītrot", "DE.Views.WatermarkSettingsDialog.tipFontName": "Fonta nosaukums", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fonta izmērs" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fonta izmērs", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ms.json b/apps/documenteditor/main/locale/ms.json index b708aa3e8c..d653b0bc40 100644 --- a/apps/documenteditor/main/locale/ms.json +++ b/apps/documenteditor/main/locale/ms.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Separa telus", "DE.Views.WatermarkSettingsDialog.textUnderline": "Garis bawah", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nama Fon", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Saiz Fon" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Saiz Fon", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 260f7da262..75772d62fc 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "semi-transparant", "DE.Views.WatermarkSettingsDialog.textUnderline": "Onderstreept", "DE.Views.WatermarkSettingsDialog.tipFontName": "Lettertype", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tekengrootte" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tekengrootte", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/no.json b/apps/documenteditor/main/locale/no.json index 7c59bb2535..2c2b2e8a15 100644 --- a/apps/documenteditor/main/locale/no.json +++ b/apps/documenteditor/main/locale/no.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Understreking", "DE.Views.WatermarkSettingsDialog.tipFontName": "Font name", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index 1513707c01..e95287b1ed 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Półprzezroczysty", "DE.Views.WatermarkSettingsDialog.textUnderline": "Podkreślenie", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nazwa czcionki", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Rozmiar czcionki" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Rozmiar czcionki", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/pt-pt.json b/apps/documenteditor/main/locale/pt-pt.json index b382cca012..73e0f55792 100644 --- a/apps/documenteditor/main/locale/pt-pt.json +++ b/apps/documenteditor/main/locale/pt-pt.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semi-transparente", "DE.Views.WatermarkSettingsDialog.textUnderline": "Sublinhado", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome do tipo de letra", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamanho do tipo de letra" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamanho do tipo de letra", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index 64fe892293..4c14f69e2b 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparente", "DE.Views.WatermarkSettingsDialog.textUnderline": "Sublinhar", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nome da Fonte", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamanho da fonte" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Tamanho da fonte", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json index 559e66a28a..4637a1a81f 100644 --- a/apps/documenteditor/main/locale/ro.json +++ b/apps/documenteditor/main/locale/ro.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Subliniat", "DE.Views.WatermarkSettingsDialog.tipFontName": "Denumire font", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensiune font" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Dimensiune font", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 2d2f9feb1e..98da0c6c29 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Полупрозрачный", "DE.Views.WatermarkSettingsDialog.textUnderline": "Подчёркнутый", "DE.Views.WatermarkSettingsDialog.tipFontName": "Шрифт", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер шрифта" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Размер шрифта", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/si.json b/apps/documenteditor/main/locale/si.json index 25d641c3a6..a30a214898 100644 --- a/apps/documenteditor/main/locale/si.json +++ b/apps/documenteditor/main/locale/si.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "අර්ධ පාරදෘශ්‍යතාව", "DE.Views.WatermarkSettingsDialog.textUnderline": "යටිඉර", "DE.Views.WatermarkSettingsDialog.tipFontName": "රුවකුරේ නම", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "රුවකුරේ තරම" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "රුවකුරේ තරම", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index fde3ecac2f..2157973819 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Polopriehľadný", "DE.Views.WatermarkSettingsDialog.textUnderline": "Podčiarknutie", "DE.Views.WatermarkSettingsDialog.tipFontName": "Názov písma", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Veľkosť písma" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Veľkosť písma", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 9cba82d02b..0668df9de7 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", "DE.Views.WatermarkSettingsDialog.tipFontName": "Ime pisave", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Velikost pisave" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Velikost pisave", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sr-cyrl.json b/apps/documenteditor/main/locale/sr-cyrl.json index 87f8082c98..9e7ce8da2a 100644 --- a/apps/documenteditor/main/locale/sr-cyrl.json +++ b/apps/documenteditor/main/locale/sr-cyrl.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Полупровидно", "DE.Views.WatermarkSettingsDialog.textUnderline": "Подвуци", "DE.Views.WatermarkSettingsDialog.tipFontName": "Назив фонта", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Величина фонта" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Величина фонта", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sr.json b/apps/documenteditor/main/locale/sr.json index 818169a3da..c4be7bf966 100644 --- a/apps/documenteditor/main/locale/sr.json +++ b/apps/documenteditor/main/locale/sr.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Poluprovidno", "DE.Views.WatermarkSettingsDialog.textUnderline": "Podvuci", "DE.Views.WatermarkSettingsDialog.tipFontName": "Naziv fonta ", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Veličina fonta" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Veličina fonta", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/sv.json b/apps/documenteditor/main/locale/sv.json index 202630189a..6f637d34c1 100644 --- a/apps/documenteditor/main/locale/sv.json +++ b/apps/documenteditor/main/locale/sv.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "halvgenomskinlig", "DE.Views.WatermarkSettingsDialog.textUnderline": "Understrykning", "DE.Views.WatermarkSettingsDialog.tipFontName": "Fontnamn", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fontstorlek" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Fontstorlek", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/tr.json b/apps/documenteditor/main/locale/tr.json index 387333a5ea..63969b7a6c 100644 --- a/apps/documenteditor/main/locale/tr.json +++ b/apps/documenteditor/main/locale/tr.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Yarı saydam", "DE.Views.WatermarkSettingsDialog.textUnderline": "Altı çizili", "DE.Views.WatermarkSettingsDialog.tipFontName": "Yazı Tipi", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Yazıtipi boyutu" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Yazıtipi boyutu", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/uk.json b/apps/documenteditor/main/locale/uk.json index c15b3cac60..b06be96c65 100644 --- a/apps/documenteditor/main/locale/uk.json +++ b/apps/documenteditor/main/locale/uk.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Напівпрозорий", "DE.Views.WatermarkSettingsDialog.textUnderline": "Підкреслений", "DE.Views.WatermarkSettingsDialog.tipFontName": "Шрифт", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Розмір шрифту" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Розмір шрифту", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/vi.json b/apps/documenteditor/main/locale/vi.json index a869140c6f..c425cd0cba 100644 --- a/apps/documenteditor/main/locale/vi.json +++ b/apps/documenteditor/main/locale/vi.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", "DE.Views.WatermarkSettingsDialog.tipFontName": "Font name", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/zh-tw.json b/apps/documenteditor/main/locale/zh-tw.json index a7aa6517dc..0c38d1da07 100644 --- a/apps/documenteditor/main/locale/zh-tw.json +++ b/apps/documenteditor/main/locale/zh-tw.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "半透明", "DE.Views.WatermarkSettingsDialog.textUnderline": "底線", "DE.Views.WatermarkSettingsDialog.tipFontName": "字型名稱", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "字型大小" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "字型大小", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index d5aeb563f1..d7e3debd45 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -3687,5 +3687,14 @@ "DE.Views.WatermarkSettingsDialog.textTransparency": "半透明", "DE.Views.WatermarkSettingsDialog.textUnderline": "下划线", "DE.Views.WatermarkSettingsDialog.tipFontName": "字体名称", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "字体大小" + "DE.Views.WatermarkSettingsDialog.tipFontSize": "字体大小", + "DE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "DE.Views.ImageSettings.strTransparency": "Opacity", + "DE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "DE.Views.Toolbar.textShapesUnion": "Union", + "DE.Views.Toolbar.textShapesCombine": "Combine", + "DE.Views.Toolbar.textShapesFragment": "Fragment", + "DE.Views.Toolbar.textShapesIntersect": "Intersect", + "DE.Views.Toolbar.textShapesSubstract": "Substract", + "DE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js index 84a899afbf..91fc4afef5 100644 --- a/apps/pdfeditor/main/app/controller/DocumentHolderExt.js +++ b/apps/pdfeditor/main/app/controller/DocumentHolderExt.js @@ -208,6 +208,7 @@ define([], function () { view.mnuArrangeForward.on('click', _.bind(me.onArrangeForward, me)); view.mnuArrangeBackward.on('click', _.bind(me.onArrangeBackward, me)); view.menuImgShapeAlign.menu.on('item:click', _.bind(me.onImgShapeAlign, me)); + view.menuShapesMerge.menu.on('item:click', _.bind(me.onShapesMerge, me)); view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me)); view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me)); view.menuTableSelectText.menu.on('item:click', _.bind(me.tableSelectText, me)); @@ -2237,6 +2238,15 @@ define([], function () { } }; + dh.onShapesMerge = function(menu, item, e) { + var me = this; + if (item && item.value) { + me.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('DocumentHolder', 'Shapes Merge'); + } + me.editComplete(); + }; + dh.onParagraphVAlign = function (menu, item) { var me = this; if (me.api) { diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js index efc3d74801..f194b6577f 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -331,6 +331,8 @@ define([ toolbar.btnClearStyle.on('click', _.bind(this.onClearStyleClick, this)); toolbar.btnShapeAlign.menu.on('item:click', _.bind(this.onShapeAlign, this)); toolbar.btnShapeAlign.menu.on('show:before', _.bind(this.onBeforeShapeAlign, this)); + toolbar.btnShapesMerge.menu.on('item:click', _.bind(this.onClickMenuShapesMerge, this)); + toolbar.btnShapesMerge.menu.on('show:before', _.bind(this.onBeforeShapesMerge, this)); toolbar.btnShapeArrange.menu.on('item:click', _.bind(this.onShapeArrange, this)); toolbar.btnRotatePage.menu.on('item:click', _.bind(this.onRotatePageMenu, this)); toolbar.btnRotatePage.on('click', _.bind(this.onRotatePage, this)); @@ -610,7 +612,7 @@ define([ var no_drawing_objects = this.api.asc_getSelectedDrawingObjectsCount()<1; if (this._state.no_drawing_objects !== no_drawing_objects ) { if (this._state.activated) this._state.no_drawing_objects = no_drawing_objects; - this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [toolbar.btnShapeAlign, toolbar.btnShapeArrange]}); + this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [toolbar.btnShapeAlign, toolbar.btnShapeArrange, toolbar.btnShapesMerge]}); } if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) { @@ -646,6 +648,7 @@ define([ toolbar.mnuArrangeForward.setDisabled(in_smartart_internal); toolbar.mnuArrangeBackward.setDisabled(in_smartart_internal); } + this.toolbar.lockToolbar(Common.enumLock.cantMergeShape, !this.api.asc_canMergeSelectedShapes(), { array: [this.toolbar.btnShapesMerge] }); }, onApiZoomChange: function(percent, type) {}, @@ -2228,6 +2231,20 @@ define([ } }, + onBeforeShapesMerge: function() { + this.toolbar.btnShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!this.api.asc_canMergeSelectedShapes(item.value)); + }, this); + }, + + onClickMenuShapesMerge: function (menu, item) { + if (item && item.value) { + this.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('ToolBar', 'Shapes Merge'); + } + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + }, + onDelPage: function() { this.api && this.api.asc_RemovePage(); Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/pdfeditor/main/app/template/Toolbar.template b/apps/pdfeditor/main/app/template/Toolbar.template index 7c58175654..40c5bccefa 100644 --- a/apps/pdfeditor/main/app/template/Toolbar.template +++ b/apps/pdfeditor/main/app/template/Toolbar.template @@ -145,6 +145,7 @@
+
diff --git a/apps/pdfeditor/main/app/view/DocumentHolderExt.js b/apps/pdfeditor/main/app/view/DocumentHolderExt.js index a2ee4fb751..b2290fbe70 100644 --- a/apps/pdfeditor/main/app/view/DocumentHolderExt.js +++ b/apps/pdfeditor/main/app/view/DocumentHolderExt.js @@ -593,6 +593,43 @@ define([], function () { }) }); + var _toolbar_view = PDFE.getController('Toolbar').getView('Toolbar'); + me.menuShapesMerge = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-combine-shapes', + caption : me.textShapesMerge, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + items: [ + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesUnion, + iconCls : 'menu__icon btn-union-shapes', + value : 'unite', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesCombine, + iconCls : 'menu__icon btn-combine-shapes', + value : 'exclude', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesFragment, + iconCls : 'menu__icon btn-fragment-shapes', + value : 'divide', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesIntersect, + iconCls : 'menu__icon btn-intersect-shapes', + value : 'intersect', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesSubstract, + iconCls : 'menu__icon btn-substract-shapes', + value : 'subtract', + }) + ] + }) + }); + var menuImgShapeSeparator = new Common.UI.MenuItem({ caption : '--' }); @@ -797,6 +834,12 @@ define([], function () { me.menuImgShapeAlign.menu.items[7].setDisabled(objcount==2 && !slide_checked); me.menuImgShapeAlign.menu.items[8].setDisabled(objcount==2 && !slide_checked); } + me.menuShapesMerge.setDisabled(disabled || !me.api.asc_canMergeSelectedShapes()); + if (!me.menuShapesMerge.isDisabled()) { + me.menuShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!me.api.asc_canMergeSelectedShapes(item.value)); + }); + } me.menuImageAdvanced.setDisabled(disabled); me.menuShapeAdvanced.setDisabled(disabled); // me.menuChartAdvanced.setDisabled(disabled); @@ -816,6 +859,7 @@ define([], function () { { caption: '--' }, //Separator menuImgShapeArrange, me.menuImgShapeAlign, + me.menuShapesMerge, me.menuImgShapeRotate, menuImgShapeSeparator, //Separator me.menuImgSaveAsPicture, diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index 307c99d979..ec6ab807b7 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -94,7 +94,8 @@ define([ inSmartartInternal: 'in-smartart-internal', inEquation: 'in-equation', inAnnotation: 'in-annotation', - singlePage: 'single-page' + singlePage: 'single-page', + cantMergeShape: 'merge-shape-lock' }; for (var key in enumLock) { if (enumLock.hasOwnProperty(key)) { @@ -735,6 +736,49 @@ define([ this.shapeControls.push(this.btnShapeArrange); arr.push(this.btnShapeArrange); + this.btnShapesMerge = new Common.UI.Button({ + id: 'id-toolbar-btn-merge-shapes', + cls: 'btn-toolbar', + iconCls: 'toolbar__icon btn-combine-shapes', + lock: [_set.shapeLock, _set.lostConnect, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape], + menu: new Common.UI.Menu({ + cls: 'shifted-right', + items: [ + { + caption: this.textShapesUnion, + iconCls: 'menu__icon btn-union-shapes', + value: 'unite', + }, + { + caption: this.textShapesCombine, + iconCls: 'menu__icon btn-combine-shapes', + value: 'exclude', + }, + { + caption: this.textShapesFragment, + iconCls: 'menu__icon btn-fragment-shapes', + value: 'divide', + }, + { + caption: this.textShapesIntersect, + iconCls: 'menu__icon btn-intersect-shapes', + value: 'intersect', + }, + { + caption: this.textShapesSubstract, + iconCls: 'menu__icon btn-substract-shapes', + value: 'subtract', + }, + ] + }), + action: 'object-merge', + dataHint: '1', + dataHintDirection: 'top', + dataHintOffset: '0, -6' + }); + this.shapeControls.push(this.btnShapesMerge); + arr.push(this.btnShapesMerge); + this.btnDelPage = new Common.UI.Button({ id: 'id-toolbar-btn-delpage', cls: 'btn-toolbar x-huge icon-top', @@ -1286,6 +1330,7 @@ define([ _injectComponent('#slot-btn-arrange-shape', this.btnShapeArrange); _injectComponent('#slot-btn-align-shape', this.btnShapeAlign); _injectComponent('#slot-btn-rotate', this.btnRotatePage); + _injectComponent('#slot-btn-shapes-merge', this.btnShapesMerge); _injectComponent('#slot-btn-deletepage', this.btnDelPage); }, @@ -1523,6 +1568,7 @@ define([ this.btnColumns.updateHint(this.tipColumns); this.btnShapeAlign.updateHint(this.tipShapeAlign); this.btnShapeArrange.updateHint(this.tipShapeArrange); + this.btnShapesMerge.updateHint(this.tipShapeMerge); this.btnRotatePage.updateHint([this.txtRotatePageRight, this.txtRotatePage]); this.btnDelPage.updateHint(this.tipDelPage); this.btnMarkers.setMenu( diff --git a/apps/pdfeditor/main/locale/ar.json b/apps/pdfeditor/main/locale/ar.json index 52ef7160d7..af0eb1c9cf 100644 --- a/apps/pdfeditor/main/locale/ar.json +++ b/apps/pdfeditor/main/locale/ar.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "ملائم للعرض", "PDFE.Views.ViewTab.tipHeadings": "العناوين", "PDFE.Views.ViewTab.tipInterfaceTheme": "سمة الواجهة", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/az.json b/apps/pdfeditor/main/locale/az.json index 3e2182f49c..9342d6b6b1 100644 --- a/apps/pdfeditor/main/locale/az.json +++ b/apps/pdfeditor/main/locale/az.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Enə uyğun tənzimlə", "PDFE.Views.ViewTab.tipHeadings": "Başlıqlar", "PDFE.Views.ViewTab.tipInterfaceTheme": "İnterfeys mövzusu", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/be.json b/apps/pdfeditor/main/locale/be.json index 87c86bc645..6588604430 100644 --- a/apps/pdfeditor/main/locale/be.json +++ b/apps/pdfeditor/main/locale/be.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Па шырыні", "PDFE.Views.ViewTab.tipHeadings": "Загалоўкі", "PDFE.Views.ViewTab.tipInterfaceTheme": "Тэма інтэрфейсу", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/bg.json b/apps/pdfeditor/main/locale/bg.json index 5cbb6e675b..aec65137bd 100644 --- a/apps/pdfeditor/main/locale/bg.json +++ b/apps/pdfeditor/main/locale/bg.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Поставя се в ширина", "PDFE.Views.ViewTab.tipHeadings": "Заглавия", "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема на интерфейса", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ca.json b/apps/pdfeditor/main/locale/ca.json index 0aab236937..f4963f809b 100644 --- a/apps/pdfeditor/main/locale/ca.json +++ b/apps/pdfeditor/main/locale/ca.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Ajusta-ho a l'amplària", "PDFE.Views.ViewTab.tipHeadings": "Capçaleres", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de la interfície", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/cs.json b/apps/pdfeditor/main/locale/cs.json index 40ca71dd26..c5e9ad9332 100644 --- a/apps/pdfeditor/main/locale/cs.json +++ b/apps/pdfeditor/main/locale/cs.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Přizpůsobit šířce", "PDFE.Views.ViewTab.tipHeadings": "Nadpisy", "PDFE.Views.ViewTab.tipInterfaceTheme": "Vzhled uživatelského rozhraní", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/da.json b/apps/pdfeditor/main/locale/da.json index 8e9fdc1992..a6a584bcb7 100644 --- a/apps/pdfeditor/main/locale/da.json +++ b/apps/pdfeditor/main/locale/da.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Tilpas til bredde", "PDFE.Views.ViewTab.tipHeadings": "Overskrifter", "PDFE.Views.ViewTab.tipInterfaceTheme": "Interface tema", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/de.json b/apps/pdfeditor/main/locale/de.json index af79e7ece5..2cf59d5343 100644 --- a/apps/pdfeditor/main/locale/de.json +++ b/apps/pdfeditor/main/locale/de.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Breite anpassen", "PDFE.Views.ViewTab.tipHeadings": "Überschriften", "PDFE.Views.ViewTab.tipInterfaceTheme": "Thema der Benutzeroberfläche", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/el.json b/apps/pdfeditor/main/locale/el.json index 0c9b823d1c..e0bbeff84d 100644 --- a/apps/pdfeditor/main/locale/el.json +++ b/apps/pdfeditor/main/locale/el.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Προσαρμογή στο πλάτος", "PDFE.Views.ViewTab.tipHeadings": "Κεφαλίδες", "PDFE.Views.ViewTab.tipInterfaceTheme": "Θέμα διεπαφής", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json index f25fd2c392..1cf12d7490 100644 --- a/apps/pdfeditor/main/locale/en.json +++ b/apps/pdfeditor/main/locale/en.json @@ -1161,6 +1161,7 @@ "PDFE.Views.DocumentHolder.txtAddVer": "Add vertical line", "PDFE.Views.DocumentHolder.txtAlign": "Align", "PDFE.Views.DocumentHolder.txtAlignToChar": "Align to character", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", "PDFE.Views.DocumentHolder.txtArrange": "Arrange", "PDFE.Views.DocumentHolder.txtBackground": "Background", "PDFE.Views.DocumentHolder.txtBorderProps": "Border properties", @@ -1941,6 +1942,11 @@ "PDFE.Views.Toolbar.textTabInsert": "Insert", "PDFE.Views.Toolbar.textTabView": "View", "PDFE.Views.Toolbar.textUnderline": "Underline", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", "PDFE.Views.Toolbar.tipAddComment": "Add comment", "PDFE.Views.Toolbar.tipChangeCase": "Change case", "PDFE.Views.Toolbar.tipClearStyle": "Clear style", @@ -1995,6 +2001,7 @@ "PDFE.Views.Toolbar.tipSelectTool": "Select tool", "PDFE.Views.Toolbar.tipShapeAlign": "Align shape", "PDFE.Views.Toolbar.tipShapeArrange": "Arrange shape", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes", "PDFE.Views.Toolbar.tipSubmit": "Submit form", "PDFE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "PDFE.Views.Toolbar.tipUndo": "Undo", diff --git a/apps/pdfeditor/main/locale/es.json b/apps/pdfeditor/main/locale/es.json index be4940265b..d0786a51bc 100644 --- a/apps/pdfeditor/main/locale/es.json +++ b/apps/pdfeditor/main/locale/es.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Ajustar al ancho", "PDFE.Views.ViewTab.tipHeadings": "Encabezados", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de la interfaz", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/eu.json b/apps/pdfeditor/main/locale/eu.json index ac71b288a3..1499b4025c 100644 --- a/apps/pdfeditor/main/locale/eu.json +++ b/apps/pdfeditor/main/locale/eu.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Doitu zabalerara", "PDFE.Views.ViewTab.tipHeadings": "Izenburuak", "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfazearen gaia", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/fi.json b/apps/pdfeditor/main/locale/fi.json index 40437a39ce..0ac70403ec 100644 --- a/apps/pdfeditor/main/locale/fi.json +++ b/apps/pdfeditor/main/locale/fi.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Sovita leveyden mukaan", "PDFE.Views.ViewTab.tipHeadings": "Headings", "PDFE.Views.ViewTab.tipInterfaceTheme": "Käyttöliittymän teema", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/fr.json b/apps/pdfeditor/main/locale/fr.json index d439f9b509..6b62df6aa0 100644 --- a/apps/pdfeditor/main/locale/fr.json +++ b/apps/pdfeditor/main/locale/fr.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Ajuster à la largeur", "PDFE.Views.ViewTab.tipHeadings": "Titres", "PDFE.Views.ViewTab.tipInterfaceTheme": "Thème d’interface", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/gl.json b/apps/pdfeditor/main/locale/gl.json index 1676cb50d9..1b380e3d72 100644 --- a/apps/pdfeditor/main/locale/gl.json +++ b/apps/pdfeditor/main/locale/gl.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Axustar á anchura", "PDFE.Views.ViewTab.tipHeadings": "Títulos", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/he.json b/apps/pdfeditor/main/locale/he.json index e1fea5dc37..24f1ed875b 100644 --- a/apps/pdfeditor/main/locale/he.json +++ b/apps/pdfeditor/main/locale/he.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "מתאים לרוחב", "PDFE.Views.ViewTab.tipHeadings": "כותרות", "PDFE.Views.ViewTab.tipInterfaceTheme": "ערכת נושא", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/hu.json b/apps/pdfeditor/main/locale/hu.json index ca11f4398b..832a1d0611 100644 --- a/apps/pdfeditor/main/locale/hu.json +++ b/apps/pdfeditor/main/locale/hu.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Szélességhez igazít", "PDFE.Views.ViewTab.tipHeadings": "Címsorok", "PDFE.Views.ViewTab.tipInterfaceTheme": "Felhasználói felület témája", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/hy.json b/apps/pdfeditor/main/locale/hy.json index 3884740a44..64e004c359 100644 --- a/apps/pdfeditor/main/locale/hy.json +++ b/apps/pdfeditor/main/locale/hy.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Հարմարեցնել լայնությանը", "PDFE.Views.ViewTab.tipHeadings": "Գլխագրեր", "PDFE.Views.ViewTab.tipInterfaceTheme": "Ինտերֆեյսի թեմա", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/id.json b/apps/pdfeditor/main/locale/id.json index b88d728696..8a1d0c06af 100644 --- a/apps/pdfeditor/main/locale/id.json +++ b/apps/pdfeditor/main/locale/id.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Sesuaikan Lebar", "PDFE.Views.ViewTab.tipHeadings": "Tajuk", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antarmuka", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/it.json b/apps/pdfeditor/main/locale/it.json index e2cf23c27a..53ef4041d3 100644 --- a/apps/pdfeditor/main/locale/it.json +++ b/apps/pdfeditor/main/locale/it.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Adatta alla larghezza", "PDFE.Views.ViewTab.tipHeadings": "Intestazioni", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema dell'interfaccia", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ja.json b/apps/pdfeditor/main/locale/ja.json index 4771c631ee..c5a7a95d1f 100644 --- a/apps/pdfeditor/main/locale/ja.json +++ b/apps/pdfeditor/main/locale/ja.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "幅に合わせる", "PDFE.Views.ViewTab.tipHeadings": "見出し", "PDFE.Views.ViewTab.tipInterfaceTheme": "インターフェイスのテーマ", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ko.json b/apps/pdfeditor/main/locale/ko.json index 368da89458..153aa101bd 100644 --- a/apps/pdfeditor/main/locale/ko.json +++ b/apps/pdfeditor/main/locale/ko.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "너비에 맞춤", "PDFE.Views.ViewTab.tipHeadings": "제목", "PDFE.Views.ViewTab.tipInterfaceTheme": "인터페이스 테마", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/lo.json b/apps/pdfeditor/main/locale/lo.json index be2af42246..b3d673fdc8 100644 --- a/apps/pdfeditor/main/locale/lo.json +++ b/apps/pdfeditor/main/locale/lo.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "ຄວາມກວ້າງພໍດີ", "PDFE.Views.ViewTab.tipHeadings": "ຫົວເລື່ອງ", "PDFE.Views.ViewTab.tipInterfaceTheme": "ຮູບແບບການສະແດງຜົນ", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/lv.json b/apps/pdfeditor/main/locale/lv.json index 0eea496429..9b95c7342c 100644 --- a/apps/pdfeditor/main/locale/lv.json +++ b/apps/pdfeditor/main/locale/lv.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Saskaņot ar platumu", "PDFE.Views.ViewTab.tipHeadings": "Virsraksti", "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfeisa tēma", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ms.json b/apps/pdfeditor/main/locale/ms.json index 760a692704..27ae9dbaa5 100644 --- a/apps/pdfeditor/main/locale/ms.json +++ b/apps/pdfeditor/main/locale/ms.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Muat kepada Kelebaran", "PDFE.Views.ViewTab.tipHeadings": "Pengepala", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema antara muka", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/nl.json b/apps/pdfeditor/main/locale/nl.json index 2145bd0e91..e3d57d2500 100644 --- a/apps/pdfeditor/main/locale/nl.json +++ b/apps/pdfeditor/main/locale/nl.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Aan breedte aanpassen", "PDFE.Views.ViewTab.tipHeadings": "Koppen", "PDFE.Views.ViewTab.tipInterfaceTheme": "Interfacethema", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/pl.json b/apps/pdfeditor/main/locale/pl.json index 114c840605..1fc73b708e 100644 --- a/apps/pdfeditor/main/locale/pl.json +++ b/apps/pdfeditor/main/locale/pl.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Dopasuj do szerokości", "PDFE.Views.ViewTab.tipHeadings": "Nagłówki", "PDFE.Views.ViewTab.tipInterfaceTheme": "Motyw interfejsu", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/pt-pt.json b/apps/pdfeditor/main/locale/pt-pt.json index 8415640809..0d86517ba0 100644 --- a/apps/pdfeditor/main/locale/pt-pt.json +++ b/apps/pdfeditor/main/locale/pt-pt.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Ajustar à largura", "PDFE.Views.ViewTab.tipHeadings": "Títulos", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema da interface", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/pt.json b/apps/pdfeditor/main/locale/pt.json index a5c7be94ef..7d0e0f5841 100644 --- a/apps/pdfeditor/main/locale/pt.json +++ b/apps/pdfeditor/main/locale/pt.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Ajustar à Largura", "PDFE.Views.ViewTab.tipHeadings": "Títulos", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interface", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ro.json b/apps/pdfeditor/main/locale/ro.json index 3e71ce85d5..5a65ec0d78 100644 --- a/apps/pdfeditor/main/locale/ro.json +++ b/apps/pdfeditor/main/locale/ro.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Potrivire lățime", "PDFE.Views.ViewTab.tipHeadings": "Titluri", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema de interfață", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/ru.json b/apps/pdfeditor/main/locale/ru.json index 4faf850f86..e94b09f181 100644 --- a/apps/pdfeditor/main/locale/ru.json +++ b/apps/pdfeditor/main/locale/ru.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "По ширине", "PDFE.Views.ViewTab.tipHeadings": "Заголовки", "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфейса", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/si.json b/apps/pdfeditor/main/locale/si.json index d36cc780f3..85a61ecb84 100644 --- a/apps/pdfeditor/main/locale/si.json +++ b/apps/pdfeditor/main/locale/si.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "පළලට ගළපන්න", "PDFE.Views.ViewTab.tipHeadings": "ශ්‍රීර්ෂනාම", "PDFE.Views.ViewTab.tipInterfaceTheme": "අතුරුමුහුණතේ තේමාව", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/sk.json b/apps/pdfeditor/main/locale/sk.json index 6e79c72bd7..e4f10a1978 100644 --- a/apps/pdfeditor/main/locale/sk.json +++ b/apps/pdfeditor/main/locale/sk.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Prispôsobiť na šírku", "PDFE.Views.ViewTab.tipHeadings": "Nadpisy", "PDFE.Views.ViewTab.tipInterfaceTheme": "Vzhľad prostredia", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/sl.json b/apps/pdfeditor/main/locale/sl.json index 5b5a2a3842..950dda181f 100644 --- a/apps/pdfeditor/main/locale/sl.json +++ b/apps/pdfeditor/main/locale/sl.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Prilagodi širino", "PDFE.Views.ViewTab.tipHeadings": "Naslovi", "PDFE.Views.ViewTab.tipInterfaceTheme": "Interface theme", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/sr-cyrl.json b/apps/pdfeditor/main/locale/sr-cyrl.json index 8d3da2d00f..dd8b2f420e 100644 --- a/apps/pdfeditor/main/locale/sr-cyrl.json +++ b/apps/pdfeditor/main/locale/sr-cyrl.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Прилагоди ширини", "PDFE.Views.ViewTab.tipHeadings": "Наслови", "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема интерфејса", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/sr.json b/apps/pdfeditor/main/locale/sr.json index fce308cb86..bc1538576b 100644 --- a/apps/pdfeditor/main/locale/sr.json +++ b/apps/pdfeditor/main/locale/sr.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Prilagodi Širinu ", "PDFE.Views.ViewTab.tipHeadings": "Naslovi", "PDFE.Views.ViewTab.tipInterfaceTheme": "Tema interfejsa", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/sv.json b/apps/pdfeditor/main/locale/sv.json index a86363ade4..46527437b4 100644 --- a/apps/pdfeditor/main/locale/sv.json +++ b/apps/pdfeditor/main/locale/sv.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Anpassa till bredd", "PDFE.Views.ViewTab.tipHeadings": "Rubriker", "PDFE.Views.ViewTab.tipInterfaceTheme": "Gränssnittstema", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/tr.json b/apps/pdfeditor/main/locale/tr.json index 1496351a64..f2485db182 100644 --- a/apps/pdfeditor/main/locale/tr.json +++ b/apps/pdfeditor/main/locale/tr.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "Genişliğe Sığdır", "PDFE.Views.ViewTab.tipHeadings": "Başlıklar", "PDFE.Views.ViewTab.tipInterfaceTheme": "Arayüz teması", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/uk.json b/apps/pdfeditor/main/locale/uk.json index 976e649ba7..0c5b2b5999 100644 --- a/apps/pdfeditor/main/locale/uk.json +++ b/apps/pdfeditor/main/locale/uk.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "По ширині", "PDFE.Views.ViewTab.tipHeadings": "Заголовки", "PDFE.Views.ViewTab.tipInterfaceTheme": "Тема інтерфейсу", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/zh-tw.json b/apps/pdfeditor/main/locale/zh-tw.json index 62f672e7f5..deff185aa5 100644 --- a/apps/pdfeditor/main/locale/zh-tw.json +++ b/apps/pdfeditor/main/locale/zh-tw.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "調整至寬度", "PDFE.Views.ViewTab.tipHeadings": "頁首", "PDFE.Views.ViewTab.tipInterfaceTheme": "介面主題", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/pdfeditor/main/locale/zh.json b/apps/pdfeditor/main/locale/zh.json index 2180859e49..45214fc9f9 100644 --- a/apps/pdfeditor/main/locale/zh.json +++ b/apps/pdfeditor/main/locale/zh.json @@ -2026,5 +2026,13 @@ "PDFE.Views.ViewTab.tipFitToWidth": "适合宽度", "PDFE.Views.ViewTab.tipHeadings": "标题", "PDFE.Views.ViewTab.tipInterfaceTheme": "界面主题", - "PDFE.Views.DocumentHolder.textColor": "Color" + "PDFE.Views.DocumentHolder.textColor": "Color", + "PDFE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PDFE.Views.ImageSettings.strTransparency": "Opacity", + "PDFE.Views.Toolbar.textShapesUnion": "Union", + "PDFE.Views.Toolbar.textShapesCombine": "Combine", + "PDFE.Views.Toolbar.textShapesFragment": "Fragment", + "PDFE.Views.Toolbar.textShapesIntersect": "Intersect", + "PDFE.Views.Toolbar.textShapesSubstract": "Substract", + "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 9c7f8a0cbd..e7f8e7a3d2 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -404,6 +404,7 @@ define([ view.mnuArrangeForward.on('click', _.bind(me.onArrangeForward, me)); view.mnuArrangeBackward.on('click', _.bind(me.onArrangeBackward, me)); view.menuImgShapeAlign.menu.on('item:click', _.bind(me.onImgShapeAlign, me)); + view.menuShapesMerge.menu.on('item:click', _.bind(me.onShapesMerge, me)); view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me)); view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me)); view.menuTableSelectText.menu.on('item:click', _.bind(me.tableSelectText, me)); @@ -2394,6 +2395,15 @@ define([ } }, + onShapesMerge : function(menu, item, e) { + var me = this; + if (item && item.value) { + me.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('DocumentHolder', 'Shapes Merge'); + } + me.editComplete(); + }, + onParagraphVAlign: function (menu, item) { var me = this; if (me.api) { diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 4e2e8f6bf0..9c261d1406 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -387,6 +387,8 @@ define([ toolbar.btnShapeAlign.menu.on('item:click', _.bind(this.onShapeAlign, this)); toolbar.btnShapeAlign.menu.on('show:before', _.bind(this.onBeforeShapeAlign, this)); toolbar.btnShapeArrange.menu.on('item:click', _.bind(this.onShapeArrange, this)); + toolbar.btnShapesMerge.menu.on('item:click', _.bind(this.onClickMenuShapesMerge, this)); + toolbar.btnShapesMerge.menu.on('show:before', _.bind(this.onBeforeShapesMerge, this)); toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlinkClick, this)); toolbar.mnuTablePicker.on('select', _.bind(this.onTablePickerSelect, this)); toolbar.btnInsertTable.menu.on('item:click', _.bind(this.onInsertTableClick, this)); @@ -809,7 +811,7 @@ define([ this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, {array: this.toolbar.cmbsInsertShape.concat([ this.toolbar.btnChangeSlide, this.toolbar.btnPreview, this.toolbar.btnPrint, this.toolbar.btnCopy, this.toolbar.btnCut, this.toolbar.btnSelectAll, this.toolbar.btnReplace, this.toolbar.btnPaste, this.toolbar.btnCopyStyle, this.toolbar.btnInsertTable, this.toolbar.btnInsertChart, this.toolbar.btnInsertSmartArt, - this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign, + this.toolbar.btnColorSchemas, this.toolbar.btnShapeAlign, this.toolbar.btnShapesMerge, this.toolbar.btnShapeArrange, this.toolbar.btnSlideSize, this.toolbar.listTheme, this.toolbar.btnEditHeader, this.toolbar.btnInsDateTime, this.toolbar.btnInsSlideNum ])}); this.toolbar.lockToolbar(Common.enumLock.noSlides, this._state.no_slides, @@ -904,6 +906,7 @@ define([ } this.toolbar.lockToolbar(Common.enumLock.noParagraphObject, !in_para, {array: [me.toolbar.btnLineSpace]}); + this.toolbar.lockToolbar(Common.enumLock.cantMergeShape, !this.api.asc_canMergeSelectedShapes(), { array: [this.toolbar.btnShapesMerge] }); if (this._state.prcontrolsdisable !== paragraph_locked) { if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked; @@ -930,7 +933,7 @@ define([ if (this._state.no_drawing_objects !== no_drawing_objects ) { if (this._state.activated) this._state.no_drawing_objects = no_drawing_objects; - this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange]}); + this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange, me.toolbar.btnShapesMerge]}); } if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) { @@ -1756,6 +1759,20 @@ define([ } }, + onBeforeShapesMerge: function() { + this.toolbar.btnShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!this.api.asc_canMergeSelectedShapes(item.value)); + }, this); + }, + + onClickMenuShapesMerge: function (menu, item) { + if (item && item.value) { + this.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('ToolBar', 'Shapes Merge'); + } + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + }, + onHyperlinkClick: function(btn) { var me = this, win, props, text; diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template index 2c927d2b5e..1199c9cb10 100644 --- a/apps/presentationeditor/main/app/template/Toolbar.template +++ b/apps/presentationeditor/main/app/template/Toolbar.template @@ -100,6 +100,7 @@
+
diff --git a/apps/presentationeditor/main/app/view/DocumentHolderExt.js b/apps/presentationeditor/main/app/view/DocumentHolderExt.js index b952edf91f..03d3cd326e 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolderExt.js +++ b/apps/presentationeditor/main/app/view/DocumentHolderExt.js @@ -1000,6 +1000,43 @@ define([], function () { }) }); + var _toolbar_view = PE.getController('Toolbar').getView('Toolbar'); + me.menuShapesMerge = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-combine-shapes', + caption : me.textShapesMerge, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + items: [ + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesUnion, + iconCls : 'menu__icon btn-union-shapes', + value : 'unite', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesCombine, + iconCls : 'menu__icon btn-combine-shapes', + value : 'exclude', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesFragment, + iconCls : 'menu__icon btn-fragment-shapes', + value : 'divide', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesIntersect, + iconCls : 'menu__icon btn-intersect-shapes', + value : 'intersect', + }), + new Common.UI.MenuItem({ + caption : _toolbar_view.textShapesSubstract, + iconCls : 'menu__icon btn-substract-shapes', + value : 'subtract', + }) + ] + }) + }); + me.menuChartEdit = new Common.UI.MenuItem({ caption : me.editChartText }); @@ -1710,6 +1747,12 @@ define([], function () { me.menuImgShapeAlign.menu.items[7].setDisabled(objcount==2 && !slide_checked); me.menuImgShapeAlign.menu.items[8].setDisabled(objcount==2 && !slide_checked); } + me.menuShapesMerge.setDisabled(disabled || !me.api.asc_canMergeSelectedShapes()); + if (!me.menuShapesMerge.isDisabled()) { + me.menuShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!me.api.asc_canMergeSelectedShapes(item.value)); + }); + } me.menuImageAdvanced.setDisabled(disabled); me.menuShapeAdvanced.setDisabled(disabled); me.menuChartAdvanced.setDisabled(disabled); @@ -1732,6 +1775,7 @@ define([], function () { { caption: '--' }, //Separator menuImgShapeArrange, me.menuImgShapeAlign, + me.menuShapesMerge, me.menuImgShapeRotate, menuImgShapeSeparator, //Separator me.menuImgSaveAsPicture, diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index e3278ff769..16df20cfad 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -103,7 +103,8 @@ define([ fileMenuOpened: 'file-menu-opened', noParagraphObject: 'no-paragraph-obj', inSlideMaster: 'in-slide-master', - slideMasterMode: 'slide-master-mode' + slideMasterMode: 'slide-master-mode', + cantMergeShape: 'merge-shape-lock' }; for (var key in enumLock) { if (enumLock.hasOwnProperty(key)) { @@ -1212,6 +1213,50 @@ define([ me.slideOnlyControls.push(me.btnShapeArrange); me.lockControls.push(me.btnShapeArrange); + me.btnShapesMerge = new Common.UI.Button({ + id: 'id-toolbar-btn-merge-shapes', + cls: 'btn-toolbar', + iconCls: 'toolbar__icon btn-combine-shapes', + lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noDrawingObjects, _set.disableOnStart, _set.cantMergeShape], + menu: new Common.UI.Menu({ + cls: 'shifted-right', + items: [ + { + caption: me.textShapesUnion, + iconCls: 'menu__icon btn-union-shapes', + value: 'unite', + }, + { + caption: me.textShapesCombine, + iconCls: 'menu__icon btn-combine-shapes', + value: 'exclude', + }, + { + caption: me.textShapesFragment, + iconCls: 'menu__icon btn-fragment-shapes', + value: 'divide', + }, + { + caption: me.textShapesIntersect, + iconCls: 'menu__icon btn-intersect-shapes', + value: 'intersect', + }, + { + caption: me.textShapesSubstract, + iconCls: 'menu__icon btn-substract-shapes', + value: 'subtract', + }, + ] + }), + action: 'object-merge', + dataHint: '1', + dataHintDirection: 'top', + dataHintOffset: '0, -6' + }); + me.shapeControls.push(me.btnShapesMerge); + me.slideOnlyControls.push(me.btnShapesMerge); + me.lockControls.push(me.btnShapesMerge); + me.btnSlideSize = new Common.UI.Button({ id: 'id-toolbar-btn-slide-size', cls: 'btn-toolbar x-huge icon-top', @@ -1446,6 +1491,7 @@ define([ _injectComponent('#slot-btn-columns', this.btnColumns); _injectComponent('#slot-btn-arrange-shape', this.btnShapeArrange); _injectComponent('#slot-btn-align-shape', this.btnShapeAlign); + _injectComponent('#slot-btn-shapes-merge', this.btnShapesMerge); _injectComponent('#slot-btn-inssmartart', this.btnInsertSmartArt); _injectComponent('#slot-btn-insertequation', this.btnInsertEquation); _injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol); @@ -1677,6 +1723,7 @@ define([ this.btnInsVideo && this.btnInsVideo.updateHint(this.tipInsertVideo); this.btnColorSchemas.updateHint(this.tipColorSchemas); this.btnShapeAlign.updateHint(this.tipShapeAlign); + this.btnShapesMerge.updateHint(this.tipShapesMerge); this.btnShapeArrange.updateHint(this.tipShapeArrange); this.btnSlideSize.updateHint(this.tipSlideSize); this.btnEditHeader.updateHint(this.tipEditHeaderFooter); diff --git a/apps/presentationeditor/main/locale/ar.json b/apps/presentationeditor/main/locale/ar.json index 50fc5210b3..adda434e81 100644 --- a/apps/presentationeditor/main/locale/ar.json +++ b/apps/presentationeditor/main/locale/ar.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "وحدات الماكرو", "PE.Views.ViewTab.tipNormal": "عادي", "PE.Views.ViewTab.tipSelectTool": "حدد الأداة", - "PE.Views.ViewTab.tipSlideMaster": "الشريحة الرئيسية" + "PE.Views.ViewTab.tipSlideMaster": "الشريحة الرئيسية", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/az.json b/apps/presentationeditor/main/locale/az.json index 61c4c7b316..4080b2f1df 100644 --- a/apps/presentationeditor/main/locale/az.json +++ b/apps/presentationeditor/main/locale/az.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/be.json b/apps/presentationeditor/main/locale/be.json index b90737b62c..f38bcbd0fc 100644 --- a/apps/presentationeditor/main/locale/be.json +++ b/apps/presentationeditor/main/locale/be.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/bg.json b/apps/presentationeditor/main/locale/bg.json index 26d6eafc06..eb6334b08d 100644 --- a/apps/presentationeditor/main/locale/bg.json +++ b/apps/presentationeditor/main/locale/bg.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ca.json b/apps/presentationeditor/main/locale/ca.json index 0712d16c68..23fa6952d0 100644 --- a/apps/presentationeditor/main/locale/ca.json +++ b/apps/presentationeditor/main/locale/ca.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 8bab53b1bf..5822f25125 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normální", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Hlavní snímek" + "PE.Views.ViewTab.tipSlideMaster": "Hlavní snímek", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 2b50fdaa03..27f6658794 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index 7104b5268c..9b3271e7d4 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Makros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Auswählungstool", - "PE.Views.ViewTab.tipSlideMaster": "Folienmaster" + "PE.Views.ViewTab.tipSlideMaster": "Folienmaster", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index fea7939293..ec555119c4 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Μακροεντολές", "PE.Views.ViewTab.tipNormal": "Κανονικό", "PE.Views.ViewTab.tipSelectTool": "Εργαλείο επιλογής", - "PE.Views.ViewTab.tipSlideMaster": "Υπόδειγμα διαφανειών" + "PE.Views.ViewTab.tipSlideMaster": "Υπόδειγμα διαφανειών", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index b132bf3978..34b0b0016c 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1924,6 +1924,7 @@ "PE.Views.DocumentHolder.txtAddVer": "Add vertical line", "PE.Views.DocumentHolder.txtAlign": "Align", "PE.Views.DocumentHolder.txtAlignToChar": "Align to character", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", "PE.Views.DocumentHolder.txtArrange": "Arrange", "PE.Views.DocumentHolder.txtBackground": "Background", "PE.Views.DocumentHolder.txtBorderProps": "Border properties", @@ -2804,6 +2805,11 @@ "PE.Views.Toolbar.textTradeMark": "Trade Mark Sign", "PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.textYen": "Yen Sign", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", "PE.Views.Toolbar.tipAddLayout": "Add layout", "PE.Views.Toolbar.tipAddSlide": "Add slide", "PE.Views.Toolbar.tipAddSlideMaster": "Add slide master", @@ -2873,6 +2879,7 @@ "PE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.", "PE.Views.Toolbar.tipSelectAll": "Select all", "PE.Views.Toolbar.tipShapeAlign": "Align shape", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes", "PE.Views.Toolbar.tipShapeArrange": "Arrange shape", "PE.Views.Toolbar.tipSlideNum": "Insert slide number", "PE.Views.Toolbar.tipSlideSize": "Select slide size", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 7fc681a9db..a499825829 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Herramienta de selección", - "PE.Views.ViewTab.tipSlideMaster": "Patrón de diapositivas" + "PE.Views.ViewTab.tipSlideMaster": "Patrón de diapositivas", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/eu.json b/apps/presentationeditor/main/locale/eu.json index b0e945b95d..0b9fd15e1d 100644 --- a/apps/presentationeditor/main/locale/eu.json +++ b/apps/presentationeditor/main/locale/eu.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/fi.json b/apps/presentationeditor/main/locale/fi.json index 3a87556a4d..dfdfb5128b 100644 --- a/apps/presentationeditor/main/locale/fi.json +++ b/apps/presentationeditor/main/locale/fi.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index d74addcb84..6e4fa43c1a 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normale", "PE.Views.ViewTab.tipSelectTool": "Outil de sélection", - "PE.Views.ViewTab.tipSlideMaster": "Masque de diapositives" + "PE.Views.ViewTab.tipSlideMaster": "Masque de diapositives", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/gl.json b/apps/presentationeditor/main/locale/gl.json index 7378bf7f22..4475a84696 100644 --- a/apps/presentationeditor/main/locale/gl.json +++ b/apps/presentationeditor/main/locale/gl.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/he.json b/apps/presentationeditor/main/locale/he.json index d3d23e3203..4e119163a0 100644 --- a/apps/presentationeditor/main/locale/he.json +++ b/apps/presentationeditor/main/locale/he.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "רגיל", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "תבנית בסיס לשקופיות" + "PE.Views.ViewTab.tipSlideMaster": "תבנית בסיס לשקופיות", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index cfec3c2446..9c2f93669c 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/hy.json b/apps/presentationeditor/main/locale/hy.json index a53584bf14..e3c78f4fb0 100644 --- a/apps/presentationeditor/main/locale/hy.json +++ b/apps/presentationeditor/main/locale/hy.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/id.json b/apps/presentationeditor/main/locale/id.json index d5396a0337..a42b8fc185 100644 --- a/apps/presentationeditor/main/locale/id.json +++ b/apps/presentationeditor/main/locale/id.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index 1da9365a71..f5737860e2 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normale", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 8809583e5a..0dc839ce60 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "標準", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "スライドマスター" + "PE.Views.ViewTab.tipSlideMaster": "スライドマスター", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ko.json b/apps/presentationeditor/main/locale/ko.json index 8fe4aa813a..2748a32926 100644 --- a/apps/presentationeditor/main/locale/ko.json +++ b/apps/presentationeditor/main/locale/ko.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/lo.json b/apps/presentationeditor/main/locale/lo.json index 7e58731bc3..7b35f10699 100644 --- a/apps/presentationeditor/main/locale/lo.json +++ b/apps/presentationeditor/main/locale/lo.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/lv.json b/apps/presentationeditor/main/locale/lv.json index 1671c0db2a..24c530639f 100644 --- a/apps/presentationeditor/main/locale/lv.json +++ b/apps/presentationeditor/main/locale/lv.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ms.json b/apps/presentationeditor/main/locale/ms.json index 7ae5d5afb5..e3084800fd 100644 --- a/apps/presentationeditor/main/locale/ms.json +++ b/apps/presentationeditor/main/locale/ms.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index bc342e5a4b..32cb8139e3 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/pl.json b/apps/presentationeditor/main/locale/pl.json index 2fe1b9ea87..e5c3c9e67c 100644 --- a/apps/presentationeditor/main/locale/pl.json +++ b/apps/presentationeditor/main/locale/pl.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/pt-pt.json b/apps/presentationeditor/main/locale/pt-pt.json index e01f7ee747..80323afbd6 100644 --- a/apps/presentationeditor/main/locale/pt-pt.json +++ b/apps/presentationeditor/main/locale/pt-pt.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index 836c0ebc1c..428fdfd003 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Selecionar ferramenta", - "PE.Views.ViewTab.tipSlideMaster": "Slide mestre" + "PE.Views.ViewTab.tipSlideMaster": "Slide mestre", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index f2928af2bb..e7fb8a07c3 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macrocomandă", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Instrumentul Selectare", - "PE.Views.ViewTab.tipSlideMaster": "Coordonator de diapozitive" + "PE.Views.ViewTab.tipSlideMaster": "Coordonator de diapozitive", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 5c5effb2b3..ba89a76a3e 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Макросы", "PE.Views.ViewTab.tipNormal": "Обычный", "PE.Views.ViewTab.tipSelectTool": "Инструмент выделения", - "PE.Views.ViewTab.tipSlideMaster": "Образец слайдов" + "PE.Views.ViewTab.tipSlideMaster": "Образец слайдов", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/si.json b/apps/presentationeditor/main/locale/si.json index ebff892389..0295a7bc57 100644 --- a/apps/presentationeditor/main/locale/si.json +++ b/apps/presentationeditor/main/locale/si.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "සාමාන්‍ය", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "ප්‍රධාන සර්පණය" + "PE.Views.ViewTab.tipSlideMaster": "ප්‍රධාන සර්පණය", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 80041b24db..c0de2eec66 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index 1e02c581e3..9c37a119c4 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sr-cyrl.json b/apps/presentationeditor/main/locale/sr-cyrl.json index 79906d93c4..151c9ce426 100644 --- a/apps/presentationeditor/main/locale/sr-cyrl.json +++ b/apps/presentationeditor/main/locale/sr-cyrl.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sr.json b/apps/presentationeditor/main/locale/sr.json index 216756f896..4fe305e178 100644 --- a/apps/presentationeditor/main/locale/sr.json +++ b/apps/presentationeditor/main/locale/sr.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Makroi", "PE.Views.ViewTab.tipNormal": "Normalno", "PE.Views.ViewTab.tipSelectTool": "Odaberi alatku", - "PE.Views.ViewTab.tipSlideMaster": "Glavni upravljaš slajdova" + "PE.Views.ViewTab.tipSlideMaster": "Glavni upravljaš slajdova", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/sv.json b/apps/presentationeditor/main/locale/sv.json index 55d4a0e2c1..a7dff55b38 100644 --- a/apps/presentationeditor/main/locale/sv.json +++ b/apps/presentationeditor/main/locale/sv.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/tr.json b/apps/presentationeditor/main/locale/tr.json index 5aa7497b76..f49242d7cf 100644 --- a/apps/presentationeditor/main/locale/tr.json +++ b/apps/presentationeditor/main/locale/tr.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/uk.json b/apps/presentationeditor/main/locale/uk.json index 3b78f67fb5..5ccec27855 100644 --- a/apps/presentationeditor/main/locale/uk.json +++ b/apps/presentationeditor/main/locale/uk.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/vi.json b/apps/presentationeditor/main/locale/vi.json index 607c0c2f97..a7a07ddb27 100644 --- a/apps/presentationeditor/main/locale/vi.json +++ b/apps/presentationeditor/main/locale/vi.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/zh-tw.json b/apps/presentationeditor/main/locale/zh-tw.json index 9ac6b1a9d6..4554ad3c1d 100644 --- a/apps/presentationeditor/main/locale/zh-tw.json +++ b/apps/presentationeditor/main/locale/zh-tw.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "Normal", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "Slide master" + "PE.Views.ViewTab.tipSlideMaster": "Slide master", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 45cf34dc04..34a3c98a60 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -2967,5 +2967,13 @@ "PE.Views.ViewTab.tipMacros": "Macros", "PE.Views.ViewTab.tipNormal": "正常", "PE.Views.ViewTab.tipSelectTool": "Select tool", - "PE.Views.ViewTab.tipSlideMaster": "幻灯片版式" + "PE.Views.ViewTab.tipSlideMaster": "幻灯片版式", + "PE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "PE.Views.ImageSettings.strTransparency": "Opacity", + "PE.Views.Toolbar.textShapesUnion": "Union", + "PE.Views.Toolbar.textShapesCombine": "Combine", + "PE.Views.Toolbar.textShapesFragment": "Fragment", + "PE.Views.Toolbar.textShapesIntersect": "Intersect", + "PE.Views.Toolbar.textShapesSubstract": "Substract", + "PE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a918f82024..c03287bf7d 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -246,8 +246,9 @@ define([ view.menuImageArrange.menu.on('item:click', _.bind(me.onImgMenu, me)); view.menuImgRotate.menu.on('item:click', _.bind(me.onImgMenu, me)); view.menuImgCrop.menu.on('item:click', _.bind(me.onImgCrop, me)); - view.menuImgResetCrop.on('click', _.bind(me.onImgResetCrop, me)) + view.menuImgResetCrop.on('click', _.bind(me.onImgResetCrop, me)); view.menuImageAlign.menu.on('item:click', _.bind(me.onImgMenuAlign, me)); + view.menuShapesMerge.menu.on('item:click', _.bind(me.onShapesMerge, me)); view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me)); view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me)); view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectBulletMenu, me)); @@ -1276,6 +1277,15 @@ define([ } }, + onShapesMerge : function(menu, item, e) { + var me = this; + if (item && item.value) { + me.api.asc_mergeSelectedShapes(item.value); + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'Shapes Merge'); + } + }, + onParagraphVAlign: function(menu, item) { if (this.api) { var properties = new Asc.asc_CImgProperty(); @@ -2649,6 +2659,13 @@ define([ documentHolder.mnuUnGroupImg.setDisabled(isObjLocked || !this.api.asc_canUnGroupGraphicsObjects()); documentHolder.mnuGroupImg.setDisabled(isObjLocked || !cangroup); documentHolder.menuImageAlign.setDisabled(isObjLocked || !cangroup); + + documentHolder.menuShapesMerge.setDisabled(isObjLocked || !this.api.asc_canMergeSelectedShapes()); + if (!documentHolder.menuShapesMerge.isDisabled()) { + documentHolder.menuShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!documentHolder.api.asc_canMergeSelectedShapes(item.value)); + }); + } var objcount = this.api.asc_getSelectedDrawingObjectsCount(); documentHolder.menuImageAlign.menu.items[7].setDisabled(objcount<3); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3da65e93f0..8c429aa41b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -480,6 +480,8 @@ define([ toolbar.btnPageBreak.menu.on('item:click', _.bind(this.onPageBreakClick, this)); toolbar.btnPageBreak.menu.on('show:after', _.bind(this.onPageBreakMenuOpen, this)); toolbar.btnImgGroup.menu.on('item:click', _.bind(this.onImgGroupSelect, this)); + toolbar.btnShapesMerge.menu.on('item:click', _.bind(this.onClickMenuShapesMerge, this)); + toolbar.btnShapesMerge.menu.on('show:before', _.bind(this.onBeforeShapesMerge, this)); toolbar.btnImgBackward.menu.on('item:click', _.bind(this.onImgArrangeSelect, this)); toolbar.btnImgForward.menu.on('item:click', _.bind(this.onImgArrangeSelect, this)); toolbar.btnImgAlign.menu.on('item:click', _.bind(this.onImgAlignSelect, this)); @@ -2951,7 +2953,7 @@ define([ need_disable = (selectionType === Asc.c_oAscSelectionType.RangeCells || selectionType === Asc.c_oAscSelectionType.RangeCol || selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeMax); - toolbar.lockToolbar(Common.enumLock.selRange, need_disable, { array: [toolbar.btnImgAlign, toolbar.btnImgBackward, toolbar.btnImgForward, toolbar.btnImgGroup]}); + toolbar.lockToolbar(Common.enumLock.selRange, need_disable, { array: [toolbar.btnImgAlign, toolbar.btnImgBackward, toolbar.btnImgForward, toolbar.btnImgGroup, toolbar.btnShapesMerge]}); var cangroup = this.api.asc_canGroupGraphicsObjects(), canungroup = this.api.asc_canUnGroupGraphicsObjects(); @@ -2963,6 +2965,8 @@ define([ var objcount = this.api.asc_getSelectedDrawingObjectsCount(); toolbar.btnImgAlign.menu.items[7].setDisabled(objcount<3); toolbar.btnImgAlign.menu.items[8].setDisabled(objcount<3); + + toolbar.lockToolbar(Common.enumLock.cantMergeShape, !this.api.asc_canMergeSelectedShapes(), { array: [toolbar.btnShapesMerge] }); // disable on protected sheet // lock formatting controls in cell with FormatCells protection or in shape and Objects protection @@ -4783,6 +4787,20 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, + onBeforeShapesMerge: function() { + this.toolbar.btnShapesMerge.menu.items.forEach(function (item) { + item.setDisabled(!this.api.asc_canMergeSelectedShapes(item.value)); + }, this); + }, + + onClickMenuShapesMerge: function (menu, item) { + if (item && item.value) { + this.api.asc_mergeSelectedShapes(item.value); + Common.component.Analytics.trackEvent('ToolBar', 'Shapes Merge'); + } + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + }, + onPrintAreaClick: function(menu, item) { if (this.api) { this.api.asc_ChangePrintArea(item.value); diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index e245367f04..2f952c8bc9 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -205,6 +205,7 @@ +
diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js b/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js index f97d4a8498..c06c16f32f 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js @@ -1065,6 +1065,45 @@ define([], function () { }) }); + var _toolbar_view = SSE.getController('Toolbar').getView('Toolbar'); + me.menuShapesMerge = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-combine-shapes', + caption : me.textShapesMerge, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + items: [ + { + caption : _toolbar_view.textShapesUnion, + iconCls : 'menu__icon btn-union-shapes', + value : 'unite', + }, + { + caption : _toolbar_view.textShapesCombine, + iconCls : 'menu__icon btn-combine-shapes', + value : 'exclude', + }, + { + caption : _toolbar_view.textShapesFragment, + iconCls : 'menu__icon btn-fragment-shapes', + value : 'divide', + }, + { + caption : _toolbar_view.textShapesIntersect, + iconCls : 'menu__icon btn-intersect-shapes', + value : 'intersect', + }, + { + caption : _toolbar_view.textShapesSubstract, + iconCls : 'menu__icon btn-substract-shapes', + value : 'subtract', + } + ] + }) + }); + + + me.menuImgRotate = new Common.UI.MenuItem({ caption : me.textRotate, menu : new Common.UI.Menu({ @@ -1139,6 +1178,7 @@ define([], function () { me.menuEditSignSeparator, me.menuImageArrange, me.menuImageAlign, + me.menuShapesMerge, me.menuImgRotate, me.menuImgMacro, menuSaveAsPictureSeparator, diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 346698c010..6160c4301f 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -113,7 +113,8 @@ define([ editVisibleArea: 'is-visible-area', userProtected: 'cell-user-protected', pageBreakLock: 'page-break-lock', - fileMenuOpened: 'file-menu-opened' + fileMenuOpened: 'file-menu-opened', + cantMergeShape: 'merge-shape-lock' }; for (var key in enumLock) { if (enumLock.hasOwnProperty(key)) { @@ -2226,6 +2227,19 @@ define([ dataHintDirection: 'bottom', dataHintOffset: 'small' }); + + me.btnShapesMerge = new Common.UI.Button({ + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'toolbar__icon btn-merge-shapes', + lock: [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText, _set.cantMergeShape, _set["Objects"]], + caption: me.capShapesMerge, + menu: true, + action: 'shapes-merge', + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' + }); + me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-img-frwd', @@ -2275,7 +2289,7 @@ define([ me.btnCopy, me.btnPaste, me.btnCut, me.btnSelectAll, me.btnReplace, me.listStyles, me.btnPrint, /*me.btnSave,*/ me.btnClearStyle, me.btnCopyStyle, me.btnPageMargins, me.btnPageSize, me.btnPageOrient, me.btnPrintArea, me.btnPageBreak, me.btnPrintTitles, me.btnImgAlign, me.btnImgBackward, me.btnImgForward, me.btnImgGroup, me.btnScale, - me.chPrintGridlines, me.chPrintHeadings, me.btnRtlSheet, me.btnVisibleArea, me.btnVisibleAreaClose, me.btnTextFormatting, me.btnHorizontalAlign, me.btnVerticalAlign + me.chPrintGridlines, me.chPrintHeadings, me.btnRtlSheet, me.btnVisibleArea, me.btnVisibleAreaClose, me.btnTextFormatting, me.btnHorizontalAlign, me.btnVerticalAlign, me.btnShapesMerge ]; _.each(me.lockControls.concat([me.btnSave]), function(cmp) { @@ -2484,6 +2498,7 @@ define([ _injectComponent('#slot-img-group', this.btnImgGroup); _injectComponent('#slot-img-movefrwd', this.btnImgForward); _injectComponent('#slot-img-movebkwd', this.btnImgBackward); + _injectComponent('#slot-shapes-merge', this.btnShapesMerge); _injectComponent('#slot-btn-scale', this.btnScale); _injectComponent('#slot-btn-condformat', this.btnCondFormat); _injectComponent('#slot-btn-visible-area', this.btnVisibleArea); @@ -3425,6 +3440,39 @@ define([ }] })); + me.btnShapesMerge.updateHint(me.tipShapesMerge); + me.btnShapesMerge.setMenu(new Common.UI.Menu({ + cls: 'shifted-right', + items: [ + { + caption: me.textShapesUnion, + iconCls: 'menu__icon btn-union-shapes', + value: 'unite', + }, + { + caption: me.textShapesCombine, + iconCls: 'menu__icon btn-combine-shapes', + value: 'exclude', + }, + { + caption: me.textShapesFragment, + iconCls: 'menu__icon btn-fragment-shapes', + value: 'divide', + }, + { + caption: me.textShapesIntersect, + iconCls: 'menu__icon btn-intersect-shapes', + value: 'intersect', + }, + { + caption: me.textShapesSubstract, + iconCls: 'menu__icon btn-substract-shapes', + value: 'subtract', + }, + ] + })); + + me.btnImgGroup.updateHint(me.tipImgGroup); me.btnImgGroup.setMenu(new Common.UI.Menu({ items: [{ diff --git a/apps/spreadsheeteditor/main/locale/ar.json b/apps/spreadsheeteditor/main/locale/ar.json index a81cfb67e3..c3ecbaa554 100644 --- a/apps/spreadsheeteditor/main/locale/ar.json +++ b/apps/spreadsheeteditor/main/locale/ar.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "أدخل كلمة السر لفك تشفير الصفحة", "SSE.Views.WBProtection.txtSheetUnlockTitle": "فك حماية الورقة", "SSE.Views.WBProtection.txtWBUnlockDescription": "أدخل كلمة سر لفك تشفير المصنف", - "SSE.Views.WBProtection.txtWBUnlockTitle": "فك حماية المصنف" + "SSE.Views.WBProtection.txtWBUnlockTitle": "فك حماية المصنف", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/az.json b/apps/spreadsheeteditor/main/locale/az.json index f80083d400..10e4a44be8 100644 --- a/apps/spreadsheeteditor/main/locale/az.json +++ b/apps/spreadsheeteditor/main/locale/az.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Vərəqin mühafizəsini ləğv etmək üçün parol daxil edin", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Vərəqin qorumasını ləğv et", "SSE.Views.WBProtection.txtWBUnlockDescription": "İş kitabının mühafizəsini ləğv etmək üçün parol daxil edin", - "SSE.Views.WBProtection.txtWBUnlockTitle": "İş kitabının qorumasını ləğv et" + "SSE.Views.WBProtection.txtWBUnlockTitle": "İş kitabının qorumasını ləğv et", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/be.json b/apps/spreadsheeteditor/main/locale/be.json index cf3caa73a5..c0019d2260 100644 --- a/apps/spreadsheeteditor/main/locale/be.json +++ b/apps/spreadsheeteditor/main/locale/be.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Каб зняць абарону аркуша, увядзіце пароль", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Зняць абарону аркуша", "SSE.Views.WBProtection.txtWBUnlockDescription": "Каб зняць абарону кнігі, увядзіце пароль", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняць абарону працоўнай кнігі" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняць абарону працоўнай кнігі", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/bg.json b/apps/spreadsheeteditor/main/locale/bg.json index f686e52d2e..80d19df3f1 100644 --- a/apps/spreadsheeteditor/main/locale/bg.json +++ b/apps/spreadsheeteditor/main/locale/bg.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ca.json b/apps/spreadsheeteditor/main/locale/ca.json index 9df1e3a58b..9d8e04fc74 100644 --- a/apps/spreadsheeteditor/main/locale/ca.json +++ b/apps/spreadsheeteditor/main/locale/ca.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introdueix una contrasenya per desprotegir el full", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desprotegeix el full", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introdueix una contrasenya per desprotegir el llibre", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotegeix el llibre de treball" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotegeix el llibre de treball", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index 2bb691a660..fffd6750f8 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zadejte heslo pro deaktivaci zabezpečení listu", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Zrušit zabezpečení listu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Vložte heslo pro přístup k sešitu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušit zabezpečení sešitu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušit zabezpečení sešitu", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index 906fb9c87a..5edb4dfedb 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Indtast en adgangskode for at fjerne beskyttelsen af ​​arket", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Fjern beskyttelse af ark", "SSE.Views.WBProtection.txtWBUnlockDescription": "Indtast en adgangskode for at fjerne beskyttelsen af ​​projektmappen", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ubeskyt projektmappe" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ubeskyt projektmappe", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 9f8115bcec..d8d8f72a04 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zum Entschützen der Tabellenkalkulation bitte Kennwort eingeben", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Liste entschützen", "SSE.Views.WBProtection.txtWBUnlockDescription": "Zum Entschützen der Arbeitsmappe bitte Kennwort eingeben", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Arbeitsmappe entschützen" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Arbeitsmappe entschützen", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index cd62ed7c29..fc9e02dbb0 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Εισάγετε συνθηματικό για άρση προστασίας φύλλου", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Άρση προστασίας φύλλου", "SSE.Views.WBProtection.txtWBUnlockDescription": "Εισάγετε συνθηματικό για άρση προστασίας βιβλίου εργασίας", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Άρση προστασίας βιβλίου εργασίας" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Άρση προστασίας βιβλίου εργασίας", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 541a6e873b..6ad3c5816b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2472,6 +2472,7 @@ "SSE.Views.DocumentHolder.textShapeAlignMiddle": "Align middle", "SSE.Views.DocumentHolder.textShapeAlignRight": "Align right", "SSE.Views.DocumentHolder.textShapeAlignTop": "Align top", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", "SSE.Views.DocumentHolder.textStdDev": "StdDev", "SSE.Views.DocumentHolder.textSum": "Sum", "SSE.Views.DocumentHolder.textUndo": "Undo", @@ -4119,6 +4120,7 @@ "SSE.Views.Toolbar.capImgBackward": "Send Backward", "SSE.Views.Toolbar.capImgForward": "Bring Forward", "SSE.Views.Toolbar.capImgGroup": "Group", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", "SSE.Views.Toolbar.capInsertChart": "Chart", "SSE.Views.Toolbar.capInsertChartRecommend": "Recommended Chart", "SSE.Views.Toolbar.capInsertEquation": "Equation", @@ -4271,6 +4273,11 @@ "SSE.Views.Toolbar.textWidth": "Width", "SSE.Views.Toolbar.textYen": "Yen Sign", "SSE.Views.Toolbar.textZoom": "Zoom", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", "SSE.Views.Toolbar.tipAlignBottom": "Align bottom", "SSE.Views.Toolbar.tipAlignCenter": "Align center", "SSE.Views.Toolbar.tipAlignJust": "Justified", @@ -4307,6 +4314,7 @@ "SSE.Views.Toolbar.tipHAlighOle": "Horizontal align", "SSE.Views.Toolbar.tipImgAlign": "Align objects", "SSE.Views.Toolbar.tipImgGroup": "Group objects", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes", "SSE.Views.Toolbar.tipIncDecimal": "Increase decimal", "SSE.Views.Toolbar.tipIncFont": "Increment font size", "SSE.Views.Toolbar.tipInsertChart": "Insert chart", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 5084d5e171..6bbe193588 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -4528,5 +4528,14 @@ "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" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger libro", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/eu.json b/apps/spreadsheeteditor/main/locale/eu.json index 3c821dbdf8..57159e1bc3 100644 --- a/apps/spreadsheeteditor/main/locale/eu.json +++ b/apps/spreadsheeteditor/main/locale/eu.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Idatzi pasahitza orriari babesa kentzeko", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Kendu babesa orriari", "SSE.Views.WBProtection.txtWBUnlockDescription": "Idatzi pasahitza laneko liburuari babesa kentzeko", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Kendu babesa laneko liburuari" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Kendu babesa laneko liburuari", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json index a3953b73c3..ba9d925349 100644 --- a/apps/spreadsheeteditor/main/locale/fi.json +++ b/apps/spreadsheeteditor/main/locale/fi.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index de91796c89..9e92bd7e6e 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Entrez un mot de passe pour déprotéger la feuille de calcul", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Déprotéger la feuille de calcul", "SSE.Views.WBProtection.txtWBUnlockDescription": "Entrez un mot de passe pour déprotéger le classeur", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Déprotéger le classeur" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Déprotéger le classeur", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/gl.json b/apps/spreadsheeteditor/main/locale/gl.json index 15e7728c65..a5cd7a58f1 100644 --- a/apps/spreadsheeteditor/main/locale/gl.json +++ b/apps/spreadsheeteditor/main/locale/gl.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduza un contrasinal para quitarlle a protección á folla", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desprotexer folla", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduza un contrasinal para quitarlle a protección ao libro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotexer libro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desprotexer libro", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/he.json b/apps/spreadsheeteditor/main/locale/he.json index 13616707df..35e9af8efe 100644 --- a/apps/spreadsheeteditor/main/locale/he.json +++ b/apps/spreadsheeteditor/main/locale/he.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "הזנת סיסמה כדי להסיר הגנה גיליון", "SSE.Views.WBProtection.txtSheetUnlockTitle": "הסרת הגנה על גליון", "SSE.Views.WBProtection.txtWBUnlockDescription": "הזנת סיסמה כדי לבטל את ההגנה חוברת עבודה", - "SSE.Views.WBProtection.txtWBUnlockTitle": "חוברת עבודה לא מוגנת" + "SSE.Views.WBProtection.txtWBUnlockTitle": "חוברת עבודה לא מוגנת", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index f372ff7f6d..06352b9af2 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Írjon be egy jelszót a munkalap védelmének megszüntetéséhez", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Munkalap védelmének megszüntetése", "SSE.Views.WBProtection.txtWBUnlockDescription": "Írjon be egy jelszót a munkafüzet védelmének megszüntetéséhez", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Munkafüzet védelmének megszüntetése" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Munkafüzet védelmének megszüntetése", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/hy.json b/apps/spreadsheeteditor/main/locale/hy.json index 54452f546d..f89340d01c 100644 --- a/apps/spreadsheeteditor/main/locale/hy.json +++ b/apps/spreadsheeteditor/main/locale/hy.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Մուտքագրեք գաղտնաբառ՝ թերթը չպաշտպանելու համար", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Չպաշտպանել թերթիկը", "SSE.Views.WBProtection.txtWBUnlockDescription": "Մուտքագրեք գաղտնաբառ՝ աշխատանքային գրքույկը պաշտպանելու համար", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Չպաշտպանել աշխատանքային գրքույկը" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Չպաշտպանել աշխատանքային գրքույկը", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/id.json b/apps/spreadsheeteditor/main/locale/id.json index 7bf6b3d9c8..2421ea587b 100644 --- a/apps/spreadsheeteditor/main/locale/id.json +++ b/apps/spreadsheeteditor/main/locale/id.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Masukkan password untuk membuka proteksi sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Buka Proteksi Sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Masukkan password untuk membuka proteksi workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Buka Proteksi Workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Buka Proteksi Workbook", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index a49611118d..167b1e8e9a 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Inserisci una password per rimuovere la protezione del foglio", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Rimuovi la protezione del foglio", "SSE.Views.WBProtection.txtWBUnlockDescription": "Inserisci una password per rimuovere la protezione del libro di lavoro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Rimuovi la protezione del libro di lavoro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Rimuovi la protezione del libro di lavoro", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 349582ceb6..3549e15e21 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "シートを保護解除するようにパスワードを入力してください", "SSE.Views.WBProtection.txtSheetUnlockTitle": "シートを保護を解除する", "SSE.Views.WBProtection.txtWBUnlockDescription": "ブックを保護解除するようにパスワードを入力してください", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ブックを保護を解除する" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ブックを保護を解除する", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ko.json b/apps/spreadsheeteditor/main/locale/ko.json index 9aeee9e451..ab59e30f62 100644 --- a/apps/spreadsheeteditor/main/locale/ko.json +++ b/apps/spreadsheeteditor/main/locale/ko.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "양식 보호를 해제하려면 비밀번호를 입력하세요.", "SSE.Views.WBProtection.txtSheetUnlockTitle": "시트 보호해제", "SSE.Views.WBProtection.txtWBUnlockDescription": "통합 문서 보호를 해제하려면 비밀번호를 입력하세요.", - "SSE.Views.WBProtection.txtWBUnlockTitle": "통합 문서 보호 잠금 해제" + "SSE.Views.WBProtection.txtWBUnlockTitle": "통합 문서 보호 잠금 해제", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lo.json b/apps/spreadsheeteditor/main/locale/lo.json index c8b78a96cc..38b616bf5a 100644 --- a/apps/spreadsheeteditor/main/locale/lo.json +++ b/apps/spreadsheeteditor/main/locale/lo.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "ໃສ່ລະຫັດຜ່ານເພື່ອຍົກເລີກການປ້ອງກັນແຜ່ນ", "SSE.Views.WBProtection.txtSheetUnlockTitle": "ບໍ່ປ້ອງກັນແຜ່ນຊີດ", "SSE.Views.WBProtection.txtWBUnlockDescription": "ປ້ອນລະຫັດຜ່ານເພື່ອບໍ່ປົກປ້ອງປື້ມບັນທືກ", - "SSE.Views.WBProtection.txtWBUnlockTitle": "ບໍ່ປ້ອງ ປື້ມບັນທືກ" + "SSE.Views.WBProtection.txtWBUnlockTitle": "ບໍ່ປ້ອງ ປື້ມບັນທືກ", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 795809e373..5a0a09cce1 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Ievadiet paroli, lai noņemtu lapas aizsardzību", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Noņemt aizsargāto lapu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Ievadiet paroli, lai noņemtu darbgrāmatas aizsardzību", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Noņemt darbgrāmatas aizsardzību" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Noņemt darbgrāmatas aizsardzību", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ms.json b/apps/spreadsheeteditor/main/locale/ms.json index 21e59f9f73..3cc354c77e 100644 --- a/apps/spreadsheeteditor/main/locale/ms.json +++ b/apps/spreadsheeteditor/main/locale/ms.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Masukkan kata laluan untuk melindungi helaian", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Helaian Nyahlindung", "SSE.Views.WBProtection.txtWBUnlockDescription": "Masukkan kata laluan untuk melindungi buku kerja", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Buku Kerja Nyahlindung" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Buku Kerja Nyahlindung", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index db15a7545a..8c48bb599d 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Voer een wachtwoord in om de beveiliging voor het blad op te heffen", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Beveiliging van blad opheffen", "SSE.Views.WBProtection.txtWBUnlockDescription": "Voer een wachtwoord in om de beveiliging voor het werkboek op te heffen", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Beveiliging van werkboek opheffen" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Beveiliging van werkboek opheffen", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index 58c1ab660a..5289d1760d 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Wprowadź hasło, aby odblokować arkusz", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Usuń ochronę arkusza", "SSE.Views.WBProtection.txtWBUnlockDescription": "Wprowadź hasło, aby wyłączyć ochronę skoroszytu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Usuń ochronę skoroszytu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Usuń ochronę skoroszytu", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt-pt.json b/apps/spreadsheeteditor/main/locale/pt-pt.json index 7079fcb676..d7126fbbc9 100644 --- a/apps/spreadsheeteditor/main/locale/pt-pt.json +++ b/apps/spreadsheeteditor/main/locale/pt-pt.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Introduza uma palavra-passe para desbloquear a folha", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger folha", "SSE.Views.WBProtection.txtWBUnlockDescription": "Introduza uma palavra-passe para desbloquear o livro", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger Livro" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger Livro", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index 22c3d3fb0f..8254209497 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Digite uma senha para desproteger a folha", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Desproteger a folha", "SSE.Views.WBProtection.txtWBUnlockDescription": "Digite uma senha para desproteger a pasta de trabalho", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger pasta de trabalho" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Desproteger pasta de trabalho", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index 4be82e871a..ee3599ee37 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -4528,5 +4528,14 @@ "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" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Dezactivarea protejării registrului de calcul", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 1888490ad4..e8a1d441cf 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Введите пароль для отключения защиты листа", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Снять защиту листа", "SSE.Views.WBProtection.txtWBUnlockDescription": "Введите пароль для отключения защиты книги", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Снять защиту книги", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/si.json b/apps/spreadsheeteditor/main/locale/si.json index c2eed1c5fe..3e54d143cb 100644 --- a/apps/spreadsheeteditor/main/locale/si.json +++ b/apps/spreadsheeteditor/main/locale/si.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "පත්‍රය අනාරක්‍ෂණයට මුරපදයක් යොදන්න", "SSE.Views.WBProtection.txtSheetUnlockTitle": "කොළය අනාරක්‍ෂණය", "SSE.Views.WBProtection.txtWBUnlockDescription": "වැඩපොත අනාරක්‍ෂණයට මුරපදයක් ඇතුල් කරන්න", - "SSE.Views.WBProtection.txtWBUnlockTitle": "වැඩපොත අනාරක්‍ෂණය" + "SSE.Views.WBProtection.txtWBUnlockTitle": "වැඩපොත අනාරක්‍ෂණය", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sk.json b/apps/spreadsheeteditor/main/locale/sk.json index c1064b95fa..59187984a7 100644 --- a/apps/spreadsheeteditor/main/locale/sk.json +++ b/apps/spreadsheeteditor/main/locale/sk.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Zadajte heslo pre deaktiváciu zabezpečenia listu", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Zrušte ochranu listu", "SSE.Views.WBProtection.txtWBUnlockDescription": "Vložte heslo pre vstup k zošitu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušte ochranu zošita" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Zrušte ochranu zošita", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index c5a28e9f66..2a35918475 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr-cyrl.json b/apps/spreadsheeteditor/main/locale/sr-cyrl.json index 3d2c9d7783..22513e3c0f 100644 --- a/apps/spreadsheeteditor/main/locale/sr-cyrl.json +++ b/apps/spreadsheeteditor/main/locale/sr-cyrl.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Унесите лозинку да незаштитите лист", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Незаштити лист", "SSE.Views.WBProtection.txtWBUnlockDescription": "Унесите лозинку да незаштитите радну књигу", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Незаштити радну књигу" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Незаштити радну књигу", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sr.json b/apps/spreadsheeteditor/main/locale/sr.json index 27d4e20abb..f6bcab0dd6 100644 --- a/apps/spreadsheeteditor/main/locale/sr.json +++ b/apps/spreadsheeteditor/main/locale/sr.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Unesite lozinku da nezaštitite list", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Nezaštiti list", "SSE.Views.WBProtection.txtWBUnlockDescription": "Unesite lozinku da nezaštitite radnu knjigu", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Nezaštiti radnu knjigu" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Nezaštiti radnu knjigu", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/sv.json b/apps/spreadsheeteditor/main/locale/sv.json index 2cdad7cd57..32117cf1a8 100644 --- a/apps/spreadsheeteditor/main/locale/sv.json +++ b/apps/spreadsheeteditor/main/locale/sv.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Ange ett lösenord för att låsa upp kalkylarkets skydd", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Lås upp kalkylbladet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Ange ett lösenord för att låsa upp arbetsbokens skydd", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Lås upp arbetsboken" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Lås upp arbetsboken", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/tr.json b/apps/spreadsheeteditor/main/locale/tr.json index fa6d0304f8..eef1ceb2f6 100644 --- a/apps/spreadsheeteditor/main/locale/tr.json +++ b/apps/spreadsheeteditor/main/locale/tr.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Sayfanın korumasını kaldırmak için bir şifre girin", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Korumasız Sayfa", "SSE.Views.WBProtection.txtWBUnlockDescription": "Çalışma kitabının korumasını kaldırmak için bir parola girin", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Korumasız Çalışma Sayfası" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Korumasız Çalışma Sayfası", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/uk.json b/apps/spreadsheeteditor/main/locale/uk.json index 0283b146cd..d8853bd810 100644 --- a/apps/spreadsheeteditor/main/locale/uk.json +++ b/apps/spreadsheeteditor/main/locale/uk.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Введіть пароль для вимкнення захисту аркуша", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Зняти захист аркуша", "SSE.Views.WBProtection.txtWBUnlockDescription": "Введіть пароль для вимкнення захисту книги", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняти захист книги" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Зняти захист книги", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/vi.json b/apps/spreadsheeteditor/main/locale/vi.json index f5c62024bb..335f682a43 100644 --- a/apps/spreadsheeteditor/main/locale/vi.json +++ b/apps/spreadsheeteditor/main/locale/vi.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "Enter a password to unprotect sheet", "SSE.Views.WBProtection.txtSheetUnlockTitle": "Unprotect sheet", "SSE.Views.WBProtection.txtWBUnlockDescription": "Enter a password to unprotect workbook", - "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook" + "SSE.Views.WBProtection.txtWBUnlockTitle": "Unprotect workbook", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh-tw.json b/apps/spreadsheeteditor/main/locale/zh-tw.json index 35a41a1f6d..934aa1aa65 100644 --- a/apps/spreadsheeteditor/main/locale/zh-tw.json +++ b/apps/spreadsheeteditor/main/locale/zh-tw.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "輸入密碼以解除工作表的保護", "SSE.Views.WBProtection.txtSheetUnlockTitle": "解除工作表保護", "SSE.Views.WBProtection.txtWBUnlockDescription": "輸入密碼以解除工作簿的保護", - "SSE.Views.WBProtection.txtWBUnlockTitle": "解除工作簿保護" + "SSE.Views.WBProtection.txtWBUnlockTitle": "解除工作簿保護", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index c830a7cb06..468d46438c 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -4528,5 +4528,14 @@ "SSE.Views.WBProtection.txtSheetUnlockDescription": "输入密码以取消工作表保护", "SSE.Views.WBProtection.txtSheetUnlockTitle": "撤消工作表保护", "SSE.Views.WBProtection.txtWBUnlockDescription": "输入密码以取消工作簿保护", - "SSE.Views.WBProtection.txtWBUnlockTitle": "撤消工作簿保护" + "SSE.Views.WBProtection.txtWBUnlockTitle": "撤消工作簿保护", + "SSE.Views.DocumentHolder.textShapesMerge": "Merge shapes", + "SSE.Views.ImageSettings.strTransparency": "Opacity", + "SSE.Views.Toolbar.capShapesMerge": "Merge Shapes", + "SSE.Views.Toolbar.textShapesUnion": "Union", + "SSE.Views.Toolbar.textShapesCombine": "Combine", + "SSE.Views.Toolbar.textShapesFragment": "Fragment", + "SSE.Views.Toolbar.textShapesIntersect": "Intersect", + "SSE.Views.Toolbar.textShapesSubstract": "Substract", + "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes" } \ No newline at end of file