Merge branch 'release/v7.1.0' into develop

apps/common/main/lib/component/ComboDataViewShape.js

@@ -128,6 +128,39 @@ define([
                 recents = Common.localStorage.getItem(this.appPrefix + 'recent-shapes');
             recents = recents ? JSON.parse(recents) : [];
 
+            // check lang
+            if (recents.length > 0) {
+                var isTranslated = _.findWhere(groups, {groupName: recents[0].groupName});
+                if (!isTranslated) {
+                    for (var r = 0; r < recents.length; r++) {
+                        var type = recents[r].data.shapeType,
+                            record;
+                        for (var g = 0; g < groups.length; g++) {
+                            var store = groups[g].groupStore,
+                                groupName = groups[g].groupName;
+                            for (var i = 0; i < store.length; i++) {
+                                if (store.at(i).get('data').shapeType === type) {
+                                    record = store.at(i).toJSON();
+                                    recents[r] = {
+                                        data: record.data,
+                                        tip: record.tip,
+                                        allowSelected: record.allowSelected,
+                                        selected: false,
+                                        groupName: groupName
+                                    };
+                                    break;
+                                }
+                            }
+                            if (record) {
+                                record = undefined;
+                                break;
+                            }
+                        }
+                    }
+                    Common.localStorage.setItem(this.appPrefix + 'recent-shapes', JSON.stringify(recents));
+                }
+            }
+
             if (recents.length < 12) {
                 var count = 12 - recents.length;
 

apps/common/main/lib/component/DataView.js

@@ -397,13 +397,7 @@ define([
                 });
 
                 if (record) {
-                    if (this.delaySelect) {
-                        setTimeout(function () {
                     record.set({selected: true});
-                        }, 300);
-                    } else {
-                        record.set({selected: true});
-                    }
                 }
             } else {
                 if (record)
@@ -607,15 +601,31 @@ define([
 
             window._event = e;  //  for FireFox only
 
-            if (this.showLast) this.selectRecord(record);
+            if (this.showLast) {
+                if (!this.delaySelect) {
+                    this.selectRecord(record);
+                } else {
+                    _.each(this.store.where({selected: true}), function(rec){
+                        rec.set({selected: false});
+                    });
+                    if (record) {
+                        setTimeout(_.bind(function () {
+                            record.set({selected: true});
+                            this.trigger('item:click', this, view, record, e);
+                        }, this), 300);
+                    }
+                }
+            }
             this.lastSelectedRec = null;
 
             var tip = view.$el.data('bs.tooltip');
             if (tip) (tip.tip()).remove();
 
             if (!this.isSuspendEvents) {
+                if (!this.delaySelect) {
                     this.trigger('item:click', this, view, record, e);
                 }
+            }
         },
 
         onDblClickItem: function(view, record, e) {
@@ -1387,6 +1397,39 @@ define([
 
             me.recentShapes = recentArr;
 
+            // check lang
+            if (me.recentShapes.length > 0) {
+                var isTranslated = _.findWhere(me.groups, {groupName: me.recentShapes[0].groupName});
+                if (!isTranslated) {
+                    for (var r = 0; r < me.recentShapes.length; r++) {
+                        var type = me.recentShapes[r].data.shapeType,
+                            record;
+                        for (var g = 0; g < me.groups.length; g++) {
+                            var store = me.groups[g].groupStore,
+                                groupName = me.groups[g].groupName;
+                            for (var i = 0; i < store.length; i++) {
+                                if (store.at(i).get('data').shapeType === type) {
+                                    record = store.at(i).toJSON();
+                                    me.recentShapes[r] = {
+                                        data: record.data,
+                                        tip: record.tip,
+                                        allowSelected: record.allowSelected,
+                                        selected: false,
+                                        groupName: groupName
+                                    };
+                                    break;
+                                }
+                            }
+                            if (record) {
+                                record = undefined;
+                                break;
+                            }
+                        }
+                    }
+                    Common.localStorage.setItem(this.appPrefix + 'recent-shapes', JSON.stringify(me.recentShapes));
+                }
+            }
+
             // Add default recent
 
             if (me.recentShapes.length < 12) {

apps/common/main/lib/util/define.js

@@ -915,9 +915,11 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-exciting',        value: AscFormat.ENTRANCE_WHIP,                     displayValue: this.textWhip},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FILL_COLOR,               displayValue: this.textFillColor},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_GROW_SHRINK,              displayValue: this.textGrowShrink},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_FONT_COLOR,               displayValue: this.textFontColor, notsupported: true},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_LINE_COLOR,               displayValue: this.textLineColor},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_SPIN,                     displayValue: this.textSpin},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-basic',           value: AscFormat.EMPHASIS_TRANSPARENCY,             displayValue: this.textTransparency},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BOLD_FLASH,               displayValue: this.textBoldFlash, notsupported: true},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR,      displayValue: this.textComplementaryColor},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_COMPLEMENTARY_COLOR_2,    displayValue: this.textComplementaryColor2},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_CONTRASTING_COLOR,        displayValue: this.textContrastingColor},
@@ -926,11 +928,15 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_LIGHTEN,                  displayValue: this.textLighten},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_OBJECT_COLOR,             displayValue: this.textObjectColor},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_PULSE,                    displayValue: this.textPulse},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_UNDERLINE,                displayValue: this.textUnderline, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-subtle',          value: AscFormat.EMPHASIS_BRUSH_COLOR,              displayValue: this.textBrushColor, notsupported: true},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_COLOR_PULSE,              displayValue: this.textColorPulse},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_GROW_WITH_COLOR,          displayValue: this.textGrowWithColor},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_SHIMMER,                  displayValue: this.textShimmer},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-moderate',        value: AscFormat.EMPHASIS_TEETER,                   displayValue: this.textTeeter},
                     {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BLINK,                    displayValue: this.textBlink},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_BOLD_REVEAL,              displayValue: this.textBoldReveal, notsupported: true},
+                    {group: 'menu-effect-group-emphasis',   level: 'menu-effect-level-exciting',        value: AscFormat.EMPHASIS_WAVE,                     displayValue: this.textWave, notsupported: true},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BLINDS,                       displayValue: this.textBlinds},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_BOX,                          displayValue: this.textBox,                 familyEffect: 'shape'},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-basic',           value: AscFormat.EXIT_CHECKERBOARD,                 displayValue: this.textCheckerboard},

apps/common/main/resources/less/toolbar.less

@@ -194,6 +194,7 @@
                     .inner-box-caption {
                         justify-content: center;
                         align-items: center;
+                        padding: 0 2px;
                     }
 
                     .compact-caret {

apps/common/mobile/resources/less/common.less

@@ -124,12 +124,14 @@
         }
     }
 }
+
 // Bullets, numbers and multilevels
+
 .bullets,
 .numbers,
 .multilevels {
     .list {
-            margin: 5px;
+        margin: 0;
         ul {
             background: none;
             &:before, &:after {
@@ -138,8 +140,7 @@
             display: flex;
             justify-content: space-around;
             width: 100%;
-                margin-top: 10px;
+            padding: 5px;
-                padding:  0 5px;
 
             li {
                 width: 70px;
@@ -195,6 +196,14 @@
     }
 }
 
+.popover .list + .list {
+    margin-top: 0;
+}
+
+.popover .list:first-child li:first-child, .popover .list:first-child li:first-child a, .popover .list:first-child li:first-child > label, .popover .list:last-child li:last-child, .popover .list:last-child li:last-child a, .popover .list:last-child li:last-child > label {
+    border-radius: 0;
+}
+
 .shapes {
     li {
         width: 70px;
@@ -261,6 +270,9 @@
     margin: 32px 0;
     padding: 0 16px;
     box-sizing: border-box;
+    p {
+        color: @text-normal;
+    }
 }
 
 

apps/documenteditor/main/app/controller/RightMenu.js

@@ -155,7 +155,8 @@ define([
             this._settings[Common.Utils.documentSettingsType.MailMerge].locked = false;
             this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
 
-            var isChart = false;
+            var isChart = false,
+                isSmartArtInternal = false;
             var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
                 control_lock = false;
             for (i=0; i<SelectedObjects.length; i++)
@@ -179,6 +180,7 @@ define([
                         settingsType = Common.Utils.documentSettingsType.Chart;
                     } else if (value.get_ShapeProperties() !== null) {
                         isChart = value.get_ShapeProperties().get_FromChart();
+                        isSmartArtInternal = value.get_ShapeProperties().get_FromSmartArtInternal();
                         settingsType = Common.Utils.documentSettingsType.Shape;
                         if (value.get_ShapeProperties().asc_getTextArtProperties()) {
                             this._settings[Common.Utils.documentSettingsType.TextArt].props = value;
@@ -189,6 +191,7 @@ define([
                     control_lock = control_lock || value.get_Locked();
                 } else if (settingsType == Common.Utils.documentSettingsType.Paragraph) {
                     this._settings[settingsType].panel.isChart = isChart;
+                    this._settings[settingsType].panel.isSmartArtInternal = isSmartArtInternal;
                     can_add_table = value.get_CanAddTable();
                     control_lock = control_lock || value.get_Locked();
                 }

apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template

@@ -182,7 +182,7 @@
                     <label class="input-label"><%= scope.textAlign %></label>
                     <div id="paraadv-cmb-align"></div>
                 </div>
-                <div class="padding-large" style="display: inline-block;">
+                <div class="padding-large text-only" style="display: inline-block;">
                     <label class="input-label"><%= scope.textLeader %></label>
                     <div id="paraadv-cmb-leader"></div>
                 </div>

apps/documenteditor/main/app/template/StatusBar.template

@@ -1,36 +1,36 @@
 
 <div class="statusbar" style="display:table;">
     <div class="status-group dropup">
-        <label id="label-pages" class="status-label dropdown-toggle" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
+        <label id="label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 40px;" data-toggle="dropdown" data-hint="0" data-hint-direction="top"><%= textPageNumber %></label>
         <div id="status-goto-box" class="dropdown-menu">
             <label style="float:left;line-height:22px;"><%= textGotoPage %></label>
             <div id="status-goto-page" style="display:inline-block;"></div>
         </div>
     </div>
     <div class="status-group" style="width:100%; text-align:center;">
-        <label id="label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
+        <label id="label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
     </div>
     <div class="status-group" style="">
         <div class="separator short el-edit"></div>
-        <span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
+        <span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
-        <span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
+        <span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
         <div class="separator short el-edit space"></div>
-        <span id="btn-doc-spell" class="el-edit"></span>
+        <span id="btn-doc-spell" class="el-edit margin-top-small"></span>
         <div class="separator short el-edit el-lang"></div>
-        <div id="btn-doc-review" class="el-edit el-review" style="display: inline-block;"></div>
+        <div id="btn-doc-review" class="el-edit el-review margin-top-small" style="display: inline-block;"></div>
         <div class="separator short el-edit el-review"></div>
         <div class="separator short hide-select-tools"></div>
-        <button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
+        <button id="btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-select-tool">&nbsp;</span></button>
-        <button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
+        <button id="btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-hand-tool">&nbsp;</span></button>
         <div class="separator short hide-select-tools"></div>
-        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
+        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</span></button>
-        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
+        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
-        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
+        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
         <div class="cnt-zoom">
             <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
                 <label id="label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
-        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
+        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
     </div>
 </div>

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -1709,6 +1709,7 @@ define([
                                 paragraphProps      : elValue,
                                 borderProps         : me.borderAdvancedProps,
                                 isChart             : (item.isChart===true),
+                                isSmartArtInternal  : (item.isSmartArtInternal===true),
                                 api             : me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {
@@ -2782,9 +2783,11 @@ define([
                     menuImgReplace.menu.items[2].setVisible(me.mode.canRequestInsertImage || me.mode.fileChoiceUrl && me.mode.fileChoiceUrl.indexOf("{documentType}")>-1);
 
                     menuImgRotate.setVisible(!value.imgProps.isChart && (pluginGuid===null || pluginGuid===undefined));
-                    if (menuImgRotate.isVisible())
+                    if (menuImgRotate.isVisible()) {
                         menuImgRotate.setDisabled(islocked || value.imgProps.isSmartArt);
-
+                        menuImgRotate.menu.items[3].setDisabled(value.imgProps.isSmartArtInternal);
+                        menuImgRotate.menu.items[4].setDisabled(value.imgProps.isSmartArtInternal);
+                    }
                     me.menuImgCrop.setVisible(me.api.asc_canEditCrop());
                     if (me.menuImgCrop.isVisible())
                         me.menuImgCrop.setDisabled(islocked);
@@ -4071,6 +4074,7 @@ define([
                         me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270);
                     }
                     menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart);
+                    menuParagraphAdvanced.isSmartArtInternal = (value.imgProps && value.imgProps.isSmartArtInternal);
                     menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation);
                     menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation);
                     if (value.paraProps) {

apps/documenteditor/main/app/view/ImageSettingsAdvanced.js

@@ -1561,6 +1561,8 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                 }
                 if (props.get_FromSmartArtInternal()) {
                     this.chAutofit.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 var stroke = props.get_stroke();

apps/documenteditor/main/app/view/ParagraphSettings.js

@@ -87,6 +87,7 @@ define([
             this.lockedControls = [];
             this._locked = true;
             this.isChart = false;
+            this.isSmartArtInternal = false;
 
             this._arrLineRule = [
                 {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03,   step: 0.01, defaultUnit: 'cm'},
@@ -452,7 +453,7 @@ define([
                 this.createDelayedElements();
 
             this.disableControls(this._locked);
-            this.hideTextOnlySettings(this.isChart);
+            this.hideTextOnlySettings(this.isChart || this.isSmartArtInternal);
 
             if (prop) {
                 var Spacing = {
@@ -635,6 +636,7 @@ define([
                                 paragraphProps: elValue,
                                 borderProps: me.borderAdvancedProps,
                                 isChart: me.isChart,
+                                isSmartArtInternal: me.isSmartArtInternal,
                                 api: me.api,
                                 handler: function(result, value) {
                                     if (result == 'ok') {

apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js

@@ -95,6 +95,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             this.api = this.options.api;
             this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps);
             this.isChart = this.options.isChart;
+            this.isSmartArtInternal = this.options.isSmartArtInternal;
 
             this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule();
 
@@ -410,7 +411,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             _.each(_arrBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[2]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[1],
                     strId   :item[0],
@@ -549,7 +550,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
                     '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
                     '<div style="width:117px;display: inline-block;"><%= value %></div>',
                     '<div style="width:121px;display: inline-block;"><%= displayTabAlign %></div>',
-                    '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
+                    (this.isChart || this.isSmartArtInternal) ? '' : '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
                     '</div>'
                 ].join('')),
                 tabindex: 1
@@ -809,7 +810,7 @@ define([    'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
             if (props ){
                 this._originalProps = new Asc.asc_CParagraphProperty(props);
 
-                this.hideTextOnlySettings(this.isChart);
+                this.hideTextOnlySettings(this.isChart || this.isSmartArtInternal);
 
                 this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null;
                 this.LeftIndent = (props.get_Ind() !== null) ? props.get_Ind().get_Left() : null;

apps/documenteditor/main/app/view/ShapeSettings.js

@@ -822,6 +822,8 @@ define([
                 this._originalProps = new Asc.asc_CImgProperty(props);
 
                 this._noApply = true;
+                this._state.isFromImage = !!shapeprops.get_FromImage();
+                this._state.isFromSmartArtInternal = !!shapeprops.get_FromSmartArtInternal();
 
                 this.disableControls(this._locked, !shapeprops.get_CanFill());
                 this.hideShapeOnlySettings(shapeprops.get_FromChart() || !!shapeprops.get_FromImage());
@@ -832,10 +834,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype || control_props);
-                this._state.isFromImage = !!shapeprops.get_FromImage();
-                this._state.isFromSmartArtInternal = !!shapeprops.get_FromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || shapeprops.get_FromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 var value = props.get_WrappingStyle();
@@ -1986,6 +1986,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/documenteditor/main/app/view/TableSettingsAdvanced.js

@@ -948,7 +948,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             _.each(_arrBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[2]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[1],
                     strId   :item[0],
@@ -974,7 +974,7 @@ define([    'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
             _.each(_arrTableBorderPresets, function(item, index, list){
                 var _btn = new Common.UI.Button({
                     parentEl: $('#'+item[3]),
-                    style: 'margin-left: 5px; margin-bottom: 4px;',
+                    style: 'margin-left: 4px; margin-bottom: 4px;',
                     cls: 'btn-options large border-off',
                     iconCls: item[2],
                     strCellId  :item[0],

apps/documenteditor/main/app/view/Toolbar.js

@@ -367,7 +367,6 @@ define([
                         dataHintOffset: '0, -16'
                     });
                     this.paragraphControls.push(this.btnHighlightColor);
-                    this.textOnlyControls.push(this.btnHighlightColor);
 
                     this.btnFontColor = new Common.UI.ButtonColored({
                         id: 'id-toolbar-btn-fontcolor',

apps/documenteditor/main/locale/be.json

@@ -103,7 +103,7 @@
   "Common.define.chartData.textSurface": "Паверхня",
   "Common.Translation.warnFileLocked": "Дакумент зараз выкарыстоўваецца іншай праграмай.",
   "Common.UI.ButtonColored.textAutoColor": "Аўтаматычна",
-  "Common.UI.ButtonColored.textNewColor": "Дадаць новы адвольны колер",
+  "Common.UI.ButtonColored.textNewColor": "Адвольны колер",
   "Common.UI.Calendar.textApril": "Красавік",
   "Common.UI.Calendar.textAugust": "Жнівень",
   "Common.UI.Calendar.textDecember": "Снежань",
@@ -2486,7 +2486,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Звычайныя",
   "DE.Views.Toolbar.textMarginsUsNormal": "Звычайныя (US)",
   "DE.Views.Toolbar.textMarginsWide": "Шырокія",
-  "DE.Views.Toolbar.textNewColor": "Дадаць новы адвольны колер",
+  "DE.Views.Toolbar.textNewColor": "Адвольны колер",
   "DE.Views.Toolbar.textNextPage": "Наступная старонка",
   "DE.Views.Toolbar.textNoHighlight": "Без падсвятлення",
   "DE.Views.Toolbar.textNone": "Няма",

apps/documenteditor/main/locale/ca.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
   "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització",
   "Common.UI.ButtonColored.textAutoColor": "Automàtic",
-  "Common.UI.ButtonColored.textNewColor": "Afegeix un color personalitzat nou ",
+  "Common.UI.ButtonColored.textNewColor": "Color personalitzat nou ",
   "Common.UI.Calendar.textApril": "abril",
   "Common.UI.Calendar.textAugust": "agost",
   "Common.UI.Calendar.textDecember": "desembre",
@@ -2673,7 +2673,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Ample",
-  "DE.Views.Toolbar.textNewColor": "Afegeix un color personalitzat nou ",
+  "DE.Views.Toolbar.textNewColor": "Color personalitzat nou ",
   "DE.Views.Toolbar.textNextPage": "Pàgina següent",
   "DE.Views.Toolbar.textNoHighlight": "Sense ressaltar",
   "DE.Views.Toolbar.textNone": "Cap",

apps/documenteditor/main/locale/da.json

@@ -2647,7 +2647,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Bredde",
-  "DE.Views.Toolbar.textNewColor": "Tilføj ny brugerdefineret farve",
+  "DE.Views.Toolbar.textNewColor": "Brugerdefineret farve",
   "DE.Views.Toolbar.textNextPage": "Næste side",
   "DE.Views.Toolbar.textNoHighlight": "Ingen fremhævning",
   "DE.Views.Toolbar.textNone": "ingen",

apps/documenteditor/main/locale/de.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Kopie erstellen",
   "Common.Translation.warnFileLockedBtnView": "Schreibgeschützt öffnen",
   "Common.UI.ButtonColored.textAutoColor": "Automatisch",
-  "Common.UI.ButtonColored.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "Common.UI.ButtonColored.textNewColor": "Benutzerdefinierte Farbe",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "August",
   "Common.UI.Calendar.textDecember": "Dezember",

apps/documenteditor/main/locale/el.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου",
   "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή",
   "Common.UI.ButtonColored.textAutoColor": "Αυτόματα",
-  "Common.UI.ButtonColored.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "Common.UI.ButtonColored.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "Common.UI.Calendar.textApril": "Απρίλιος",
   "Common.UI.Calendar.textAugust": "Αύγουστος",
   "Common.UI.Calendar.textDecember": "Δεκέμβριος",
@@ -2672,7 +2672,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Κανονικό",
   "DE.Views.Toolbar.textMarginsUsNormal": "ΗΠΑ Κανονικό",
   "DE.Views.Toolbar.textMarginsWide": "Πλατύ",
-  "DE.Views.Toolbar.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "DE.Views.Toolbar.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "DE.Views.Toolbar.textNextPage": "Επόμενη Σελίδα",
   "DE.Views.Toolbar.textNoHighlight": "Χωρίς επισήμανση",
   "DE.Views.Toolbar.textNone": "Κανένα",

apps/documenteditor/main/locale/en.json

@@ -1695,12 +1695,17 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Change access rights",
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Comment",
   "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Created",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtFastWV": "Fast Web View",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Loading...",
   "DE.Views.FileMenuPanels.DocumentInfo.txtModifyBy": "Last Modified By",
   "DE.Views.FileMenuPanels.DocumentInfo.txtModifyDate": "Last Modified",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtNo": "No",
   "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Owner",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Pages",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtPageSize": "Page Size",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraphs",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtPdfTagged": "Tagged PDF",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Version",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Location",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Persons who have rights",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Symbols with spaces",
@@ -1710,12 +1715,7 @@
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title",
   "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtPageSize": "Page Size",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtPdfVer": "PDF Version",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtPdfTagged": "Tagged PDF",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtFastWV": "Fast Web View",
   "DE.Views.FileMenuPanels.DocumentInfo.txtYes": "Yes",
-  "DE.Views.FileMenuPanels.DocumentInfo.txtNo": "No",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
   "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",

apps/documenteditor/main/locale/es.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear una copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Agregar nuevo color personalizado",
+  "Common.UI.ButtonColored.textNewColor": "Color personalizado",
   "Common.UI.Calendar.textApril": "Abril",
   "Common.UI.Calendar.textAugust": "Agosto",
   "Common.UI.Calendar.textDecember": "Diciembre",
@@ -514,6 +514,7 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "Si sigue guardando en este formato todas las características a excepción del texto se perderán.<br> ¿Está seguro de que quiere continuar?",
   "DE.Controllers.LeftMenu.warnDownloadAsPdf": "Su {0} se convertirá en un formato editable. Esto puede llevar un tiempo. El documento resultante será optimizado para permitirle editar el texto, por lo que puede que no se vea exactamente como el {0} original, especialmente si el archivo original contenía muchos gráficos.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si Usted sigue guardando en este formato, una parte de formateo puede perderse.<br>¿Está seguro de que desea continuar?",
+  "DE.Controllers.LeftMenu.warnReplaceString": "{0} no es un carácter especial válido para el campo de sustitución.",
   "DE.Controllers.Main.applyChangesTextText": "Cargando cambios...",
   "DE.Controllers.Main.applyChangesTitleText": "Cargando cambios",
   "DE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
@@ -2672,7 +2673,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Amplio",
-  "DE.Views.Toolbar.textNewColor": "Agregar nuevo color personalizado",
+  "DE.Views.Toolbar.textNewColor": "Color personalizado",
   "DE.Views.Toolbar.textNextPage": "Página siguiente",
   "DE.Views.Toolbar.textNoHighlight": "No resaltar",
   "DE.Views.Toolbar.textNone": "Ningún",

apps/documenteditor/main/locale/fi.json

@@ -63,6 +63,7 @@
   "Common.Controllers.ReviewChanges.textTabs": "Vaihda välilehtiä",
   "Common.Controllers.ReviewChanges.textUnderline": "Alleviivaus",
   "Common.Controllers.ReviewChanges.textWidow": "Leskirivien hallinta",
+  "Common.UI.ButtonColored.textNewColor": "Lisää uusi mukautettu väri",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunusta",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia",
   "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä",

apps/documenteditor/main/locale/fr.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Créer une copie",
   "Common.Translation.warnFileLockedBtnView": "Ouvrir pour visualisation",
   "Common.UI.ButtonColored.textAutoColor": "Automatique",
-  "Common.UI.ButtonColored.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "Common.UI.ButtonColored.textNewColor": "Couleur personnalisée",
   "Common.UI.Calendar.textApril": "Avril",
   "Common.UI.Calendar.textAugust": "Août",
   "Common.UI.Calendar.textDecember": "décembre",
@@ -514,6 +514,7 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer ?",
   "DE.Controllers.LeftMenu.warnDownloadAsPdf": "Votre {0} sera converti en un format modifiable. Cette opération peut prendre quelque temps. Le document résultant sera optimisé pour l'édition de texte, il peut donc être différent de l'original {0}, surtout si le fichier original contient de nombreux éléments graphiques.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si vous continuer à sauvegarder dans ce format une partie de la mise en forme peut être supprimée <br>Êtes-vous sûr de vouloir continuer?",
+  "DE.Controllers.LeftMenu.warnReplaceString": "{0} n'est pas un caractère spécial valide pour le champ de remplacement.",
   "DE.Controllers.Main.applyChangesTextText": "Chargement des changemets...",
   "DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
   "DE.Controllers.Main.convertationTimeoutText": "Délai de conversion expiré.",
@@ -1662,7 +1663,7 @@
   "DE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu",
   "DE.Views.FileMenu.btnCreateNewCaption": "Nouveau document",
   "DE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...",
-  "DE.Views.FileMenu.btnExitCaption": "Quitter",
+  "DE.Views.FileMenu.btnExitCaption": "Fermer",
   "DE.Views.FileMenu.btnFileOpenCaption": "Ouvrir...",
   "DE.Views.FileMenu.btnHelpCaption": "Aide...",
   "DE.Views.FileMenu.btnHistoryCaption": "Historique des versions",
@@ -2672,7 +2673,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US normale",
   "DE.Views.Toolbar.textMarginsWide": "Large",
-  "DE.Views.Toolbar.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "DE.Views.Toolbar.textNewColor": "Couleur personnalisée",
   "DE.Views.Toolbar.textNextPage": "Page suivante",
   "DE.Views.Toolbar.textNoHighlight": "Pas de surbrillance ",
   "DE.Views.Toolbar.textNone": "Aucune",

apps/documenteditor/main/locale/gl.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear unha copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Engadir nova cor personalizada",
+  "Common.UI.ButtonColored.textNewColor": "Nova cor personalizada",
   "Common.UI.Calendar.textApril": "Abril",
   "Common.UI.Calendar.textAugust": "Agosto",
   "Common.UI.Calendar.textDecember": "Decembro",
@@ -2666,7 +2666,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Amplo",
-  "DE.Views.Toolbar.textNewColor": "Engadir nova cor personalizada",
+  "DE.Views.Toolbar.textNewColor": "Nova cor personalizada",
   "DE.Views.Toolbar.textNextPage": "Seguinte páxina",
   "DE.Views.Toolbar.textNoHighlight": "Non realzar",
   "DE.Views.Toolbar.textNone": "Ningún",

apps/documenteditor/main/locale/it.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crea copia",
   "Common.Translation.warnFileLockedBtnView": "‎Aperto per la visualizzazione‎",
   "Common.UI.ButtonColored.textAutoColor": "Automatico",
-  "Common.UI.ButtonColored.textNewColor": "Aggiungere un nuovo colore personalizzato",
+  "Common.UI.ButtonColored.textNewColor": "Aggiungi Colore personalizzato",
   "Common.UI.Calendar.textApril": "Aprile",
   "Common.UI.Calendar.textAugust": "Agosto",
   "Common.UI.Calendar.textDecember": "Dicembre",

apps/documenteditor/main/locale/ja.json

@@ -2307,6 +2307,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "パターン",
   "DE.Views.ShapeSettings.textPosition": "位置",
   "DE.Views.ShapeSettings.textRadial": "放射状",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "最近使用された",
   "DE.Views.ShapeSettings.textRotate90": "90度回転",
   "DE.Views.ShapeSettings.textRotation": "回転",
   "DE.Views.ShapeSettings.textSelectImage": "画像の選択",

apps/documenteditor/main/locale/lv.json

@@ -1728,7 +1728,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "Parastie (ASV standarts)",
   "DE.Views.Toolbar.textMarginsWide": "Wide",
-  "DE.Views.Toolbar.textNewColor": "Pievienot jaunu krāsu",
+  "DE.Views.Toolbar.textNewColor": "Pievienot jauno krāsu",
   "DE.Views.Toolbar.textNextPage": "Next Page",
   "DE.Views.Toolbar.textNone": "None",
   "DE.Views.Toolbar.textOddPage": "Odd Page",

apps/documenteditor/main/locale/nb.json

@@ -34,6 +34,7 @@
   "Common.define.chartData.textCharts": "Diagrammer",
   "Common.define.chartData.textColumn": "Kolonne",
   "Common.UI.ButtonColored.textAutoColor": "Automatisk",
+  "Common.UI.ButtonColored.textNewColor": "Legg til ny egendefinert farge",
   "Common.UI.Calendar.textApril": "april",
   "Common.UI.Calendar.textAugust": "august",
   "Common.UI.Calendar.textDecember": "desember",

apps/documenteditor/main/locale/nl.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Maak een kopie",
   "Common.Translation.warnFileLockedBtnView": "Open voor lezen",
   "Common.UI.ButtonColored.textAutoColor": "Automatisch",
-  "Common.UI.ButtonColored.textNewColor": "Voeg nieuwe aangepaste kleur toe",
+  "Common.UI.ButtonColored.textNewColor": "Nieuwe aangepaste kleur",
   "Common.UI.Calendar.textApril": "april",
   "Common.UI.Calendar.textAugust": "augustus",
   "Common.UI.Calendar.textDecember": "december",
@@ -2665,7 +2665,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normaal",
   "DE.Views.Toolbar.textMarginsUsNormal": "Normaal (VS)",
   "DE.Views.Toolbar.textMarginsWide": "Breed",
-  "DE.Views.Toolbar.textNewColor": "Nieuwe aangepaste kleur toevoegen",
+  "DE.Views.Toolbar.textNewColor": "Nieuwe aangepaste kleur",
   "DE.Views.Toolbar.textNextPage": "Volgende pagina",
   "DE.Views.Toolbar.textNoHighlight": "Geen accentuering",
   "DE.Views.Toolbar.textNone": "Geen",

apps/documenteditor/main/locale/pl.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Utwórz kopię",
   "Common.Translation.warnFileLockedBtnView": "Otwarte do oglądania",
   "Common.UI.ButtonColored.textAutoColor": "Automatyczny",
-  "Common.UI.ButtonColored.textNewColor": "Dodaj nowy niestandardowy kolor",
+  "Common.UI.ButtonColored.textNewColor": "Nowy niestandardowy kolor",
   "Common.UI.Calendar.textApril": "Kwiecień",
   "Common.UI.Calendar.textAugust": "Sierpień",
   "Common.UI.Calendar.textDecember": "Grudzień",

apps/documenteditor/main/locale/pt.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia",
   "Common.Translation.warnFileLockedBtnView": "Aberto para visualização",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Adicionar nova cor personalizada",
+  "Common.UI.ButtonColored.textNewColor": "Nova cor personalizada",
   "Common.UI.Calendar.textApril": "Abril",
   "Common.UI.Calendar.textAugust": "Agosto",
   "Common.UI.Calendar.textDecember": "Dezembro",
@@ -2672,7 +2672,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Amplo",
-  "DE.Views.Toolbar.textNewColor": "Adicionar nova cor personalizada",
+  "DE.Views.Toolbar.textNewColor": "Nova cor personalizada",
   "DE.Views.Toolbar.textNextPage": "Próxima página",
   "DE.Views.Toolbar.textNoHighlight": "Sem destaque",
   "DE.Views.Toolbar.textNone": "Nenhum",

apps/documenteditor/main/locale/ro.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crează o copie",
   "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea",
   "Common.UI.ButtonColored.textAutoColor": "Automat",
-  "Common.UI.ButtonColored.textNewColor": "Adăugarea unei culori particularizate noi",
+  "Common.UI.ButtonColored.textNewColor": "Сuloare particularizată",
   "Common.UI.Calendar.textApril": "Aprilie",
   "Common.UI.Calendar.textAugust": "August",
   "Common.UI.Calendar.textDecember": "Decembrie",
@@ -514,6 +514,7 @@
   "DE.Controllers.LeftMenu.warnDownloadAs": "Dacă salvați în acest format de fișier, este posibil ca unele dintre caracteristici să se piardă, cu excepția textului.<br>Sunteți sigur că doriți să continuați?",
   "DE.Controllers.LeftMenu.warnDownloadAsPdf": "Fișierul dvs {0} va fi convertit într-un format editabil. Convertirea poate dura ceva timp. Documentul rezultat va fi optimizat pentru a vă permite să editați textul, dar s-ar putea să nu arate exact ca original {0}, mai ales dacă fișierul original conține mai multe elemente grafice.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Dacă salvați în acest format de fișier, este posibil ca unele dintre formatări să se piardă.<br>Sigur doriți să continuați?",
+  "DE.Controllers.LeftMenu.warnReplaceString": "{0} nu este un caracter special pe care îl puteți introduce în câmpul pentru înlocuire.",
   "DE.Controllers.Main.applyChangesTextText": "Încărcarea modificărilor...",
   "DE.Controllers.Main.applyChangesTitleText": "Încărcare modificări",
   "DE.Controllers.Main.convertationTimeoutText": "Timpul de așteptare pentru conversie a expirat.",

apps/documenteditor/main/locale/sl.json

@@ -100,6 +100,7 @@
   "Common.define.chartData.textStock": "Založni grafikon",
   "Common.Translation.warnFileLockedBtnEdit": "Ustvari kopijo",
   "Common.UI.ButtonColored.textAutoColor": "Avtomatsko",
+  "Common.UI.ButtonColored.textNewColor": "Dodaj novo barvo po meri",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "Avgust",
   "Common.UI.Calendar.textDecember": "December",

apps/documenteditor/main/locale/sv.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Skapa en kopia",
   "Common.Translation.warnFileLockedBtnView": "Öppna skrivskyddad",
   "Common.UI.ButtonColored.textAutoColor": "Automatisk",
-  "Common.UI.ButtonColored.textNewColor": "Lägg till en ny anpassad färg",
+  "Common.UI.ButtonColored.textNewColor": "Lägg till ny egen färg",
   "Common.UI.Calendar.textApril": "April",
   "Common.UI.Calendar.textAugust": "Augusti",
   "Common.UI.Calendar.textDecember": "December",

apps/documenteditor/main/locale/uk.json

@@ -125,7 +125,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Створити копію",
   "Common.Translation.warnFileLockedBtnView": "Відкрити на перегляд",
   "Common.UI.ButtonColored.textAutoColor": "Автоматичний",
-  "Common.UI.ButtonColored.textNewColor": "Додати новий спеціальний колір",
+  "Common.UI.ButtonColored.textNewColor": "Новий спеціальний колір",
   "Common.UI.Calendar.textApril": "Квітень",
   "Common.UI.Calendar.textAugust": "Серпень",
   "Common.UI.Calendar.textDecember": "Грудень",
@@ -2666,7 +2666,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Нормальний",
   "DE.Views.Toolbar.textMarginsUsNormal": "Нормальний US",
   "DE.Views.Toolbar.textMarginsWide": "Широкий",
-  "DE.Views.Toolbar.textNewColor": "Додати новий власний колір",
+  "DE.Views.Toolbar.textNewColor": "Новий спеціальний колір",
   "DE.Views.Toolbar.textNextPage": "Наступна сторінка",
   "DE.Views.Toolbar.textNoHighlight": "Без виділення",
   "DE.Views.Toolbar.textNone": "Жоден",

apps/documenteditor/main/locale/vi.json

@@ -71,6 +71,7 @@
   "Common.define.chartData.textPoint": "XY (Phân tán)",
   "Common.define.chartData.textStock": "Cổ phiếu",
   "Common.define.chartData.textSurface": "Bề mặt",
+  "Common.UI.ButtonColored.textNewColor": "Màu tùy chỉnh",
   "Common.UI.ComboBorderSize.txtNoBorders": "Không viền",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền",
   "Common.UI.ComboDataView.emptyComboText": "Không có kiểu",
@@ -1505,7 +1506,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Thường",
   "DE.Views.Toolbar.textMarginsUsNormal": "Mỹ Thường",
   "DE.Views.Toolbar.textMarginsWide": "Rộng",
-  "DE.Views.Toolbar.textNewColor": "Thêm màu tùy chỉnh mới",
+  "DE.Views.Toolbar.textNewColor": "Màu tùy chỉnh",
   "DE.Views.Toolbar.textNextPage": "Trang tiếp theo",
   "DE.Views.Toolbar.textNone": "Không",
   "DE.Views.Toolbar.textOddPage": "Trang lẻ",

apps/documenteditor/main/resources/less/statusbar.less

@@ -4,15 +4,11 @@
 
     .status-label {
         position: relative;
-        top: 1px;
     }
 
     #label-pages, #label-zoom {
         cursor: pointer;
     }
-    #label-pages, #label-action {
-        margin-top: 2px;
-    }
 
     #users-icon,#status-users-count {
         display: inline-block;
@@ -41,11 +37,20 @@
     .status-group {
         display: table-cell;
         white-space: nowrap;
-        padding-top: 3px;
         vertical-align: top;
         &.dropup {
             position: static;
         }
+
+        .status-label.margin-top-large {
+            margin-top: 6px;
+        }
+
+        button.margin-top-small,
+        .margin-top-small > button,
+        .margin-top-small > .btn-group {
+            margin-top: 3px;
+        }
     }
 
     .separator {
@@ -53,7 +58,6 @@
 
         &.short {
             height: 25px;
-            margin-top: -2px;
         }
 
         &.space {
@@ -70,7 +74,8 @@
 
     .cnt-zoom {
         display: inline-block;
-
+        vertical-align: middle;
+        margin-top: 4px;
         .dropdown-menu {
             min-width: 80px;
             margin-left: -4px;

apps/documenteditor/mobile/locale/en.json

@@ -616,6 +616,12 @@
     "textSubject": "Subject",
     "textSymbols": "Symbols",
     "textTitle": "Title",
+    "textPageSize": "Page Size",
+    "textPdfVer": "PDF Version",
+    "textPdfTagged": "Tagged PDF",
+    "textFastWV": "Fast Web View",
+    "textYes": "Yes",
+    "textNo": "No",
     "textTop": "Top",
     "textUnitOfMeasurement": "Unit Of Measurement",
     "textUploaded": "Uploaded",

apps/documenteditor/mobile/src/controller/ContextMenu.jsx

@@ -242,7 +242,7 @@ class ContextMenu extends ContextMenuController {
         } else {
             const { t } = this.props;
             const _t = t("ContextMenu", {returnObjects: true});
-            const { canViewComments, canCoAuthoring, canComments } = this.props;
+            const { canViewComments, canCoAuthoring, canComments, dataDoc } = this.props;
 
             const api = Common.EditorApi.get();
             const inToc = api.asc_GetTableOfContentsPr(true);

apps/documenteditor/mobile/src/controller/settings/DocumentInfo.jsx

@@ -1,20 +1,100 @@
 import React, { Component } from "react";
 import { observer, inject } from "mobx-react";
 import DocumentInfo from "../../view/settings/DocumentInfo";
+import { withTranslation } from 'react-i18next';
 
 class DocumentInfoController extends Component {
     constructor(props) {
         super(props);
         this.docProps = this.getDocProps();
+        this.pdfProps = this.getPdfProps();
+        this.docInfoObject = {};
+
+        this.getAppProps = this.getAppProps.bind(this);
 
         if(this.docProps) {
-            this.modified = this.getModified();
+            this.updateFileInfo(this.docProps);
-            this.modifiedBy = this.getModifiedBy();
+        } else if (this.pdfProps) {
-            this.creators = this.getCreators();
+            this.updatePdfInfo(this.pdfProps);
-            this.title = this.getTitle();
+        }
-            this.subject = this.getSubject();
+    }
-            this.description = this.getDescription();
+
-            this.created = this.getCreated();
+    updateFileInfo(props) {
+        let value;
+
+        if(props) {
+            value = props.asc_getCreated();
+            if(value) this.docInfoObject.dateCreated = this.getModified(value);
+
+            value = props.asc_getModified();
+            if(value) this.docInfoObject.modifyDate = this.getModified(value);
+
+            value = props.asc_getLastModifiedBy();
+            if(value) this.docInfoObject.modifyBy = AscCommon.UserInfoParser.getParsedName(value);
+
+            this.docInfoObject.title = props.asc_getTitle() || '';
+            this.docInfoObject.subject = props.asc_getSubject() || '';
+            this.docInfoObject.description = props.asc_getDescription() || '';
+
+            value = props.asc_getCreator();
+            if(value) this.docInfoObject.creators = value;
+        }
+    }
+
+    updatePdfInfo(props) {
+        const { t } = this.props;
+        const _t = t("Settings", { returnObjects: true });
+        let value;
+
+        if(props) {
+            value = props.CreationDate;
+            if (value)
+                this.docInfoObject.dateCreated = this.getModified(new Date(value));
+            
+            value = props.ModDate;
+            if (value)
+                this.docInfoObject.modifyDate = this.getModified(new Date(value));
+
+            if(props.PageWidth && props.PageHeight && (typeof props.PageWidth === 'number') && (typeof props.PageHeight === 'number')) {
+                let width = props.PageWidth,
+                    heigth = props.PageHeight;
+                switch(Common.Utils.Metric.getCurrentMetric()) {
+                    case Common.Utils.Metric.c_MetricUnits.cm:
+                        width = parseFloat((width* 25.4 / 72000.).toFixed(2));
+                        heigth = parseFloat((heigth* 25.4 / 72000.).toFixed(2));
+                        break;
+                    case Common.Utils.Metric.c_MetricUnits.pt:
+                        width = parseFloat((width/100.).toFixed(2));
+                        heigth = parseFloat((heigth/100.).toFixed(2));
+                        break;
+                    case Common.Utils.Metric.c_MetricUnits.inch:
+                        width = parseFloat((width/7200.).toFixed(2));
+                        heigth = parseFloat((heigth/7200.).toFixed(2));
+                        break;
+                }
+
+                this.docInfoObject.pageSize = (width + ' ' + Common.Utils.Metric.getCurrentMetricName() + ' x ' + heigth + ' ' + Common.Utils.Metric.getCurrentMetricName());
+            } else this.docInfoObject.pageSize = null;
+
+            value = props.Title;
+            if(value) this.docInfoObject.title = value;
+
+            value = props.Subject;
+            if(value) this.docInfoObject.subject = value;
+
+            value = props.Author;
+            if(value) this.docInfoObject.author = value;
+
+            value = props.Version;
+            if(value) this.docInfoObject.version = value;
+
+            value = props.Tagged;
+            if (value !== undefined)
+                this.docInfoObject.tagged = (value===true ? _t.textYes : _t.textNo);
+            
+            value = props.FastWebView;
+            if (value !== undefined)
+                this.docInfoObject.fastWebView = (value===true ? _t.textYes : _t.textNo);
         }
     }
 
@@ -23,21 +103,29 @@ class DocumentInfoController extends Component {
         return api.asc_getCoreProps();
     }
 
+    getPdfProps() {
+        const api = Common.EditorApi.get();
+        return api.asc_getPdfProps();
+    }
+
     getAppProps() {
         const api = Common.EditorApi.get();
         const appProps = api.asc_getAppProps();
+        let appName;
 
         if (appProps) {
-            let appName =
+            appName = appProps.asc_getApplication();
-                (appProps.asc_getApplication() || "") +
+            if ( appName && appProps.asc_getAppVersion() )
-                (appProps.asc_getAppVersion() ? " " : "") +
+                appName += ` ${appProps.asc_getAppVersion()}`;
-                (appProps.asc_getAppVersion() || "");
+           
+            return appName || '';
+        } else if (this.pdfProps) {
+            appName = this.pdfProps ? this.pdfProps.Producer || '' : '';
             return appName;
         }
     }
 
-    getModified() {
+    getModified(valueModified) {
-        let valueModified = this.docProps.asc_getModified();
         const _lang = this.props.storeAppOptions.lang;
 
         if (valueModified) {
@@ -53,39 +141,6 @@ class DocumentInfoController extends Component {
         }
     }
 
-    getModifiedBy() {
-        let valueModifiedBy = this.docProps.asc_getLastModifiedBy();
-
-        if (valueModifiedBy) {
-            return AscCommon.UserInfoParser.getParsedName(valueModifiedBy);
-        }
-    }
-
-    getCreators() {
-        return this.docProps.asc_getCreator();
-    }
-
-    getTitle() {
-        return this.docProps.asc_getTitle();
-    }
-
-    getSubject() {
-        return this.docProps.asc_getSubject();
-    }
-
-    getDescription() {
-        return this.docProps.asc_getDescription();
-    }
-
-    getCreated() {
-        let value = this.docProps.asc_getCreated();
-        const _lang = this.props.storeAppOptions.lang;
-
-        if(value) {
-            return value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleTimeString(_lang, {timeStyle: 'short'});
-        }
-    }
-
     componentDidMount() {
         const api = Common.EditorApi.get();
         api.startGetDocInfo();
@@ -95,17 +150,11 @@ class DocumentInfoController extends Component {
         return (
             <DocumentInfo
                 getAppProps={this.getAppProps}
-                modified={this.modified}
+                docInfoObject={this.docInfoObject}
-                modifiedBy={this.modifiedBy}
-                creators={this.creators}
-                created={this.created}
-                title={this.title}
-                subject={this.subject}
-                description={this.description}
             />
         );
     }
 }
 
 
-export default inject("storeAppOptions")(observer(DocumentInfoController));
+export default inject("storeAppOptions")(observer(withTranslation()(DocumentInfoController)));

apps/documenteditor/mobile/src/less/app.less

@@ -308,3 +308,9 @@
         color: @brandColor;
     }
 }
+
+.calendar-sheet {
+    .calendar-month-picker, .calendar-year-picker {
+        border-top: 1px solid var(--background-menu-divider);
+    }
+}

apps/documenteditor/mobile/src/view/edit/EditText.jsx

@@ -207,11 +207,7 @@ const PageBullets = observer( props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
-                                        storeTextSettings.resetBullets(-1);
-                                    } else {
                                     storeTextSettings.resetBullets(bullet.type);
-                                    }
                                     props.onBullet(bullet.type);
                                 }}>
                                 {bullet.thumb.length < 1 ?
@@ -256,11 +252,7 @@ const PageNumbers = observer( props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
-                                    storeTextSettings.resetNumbers(-1);
-                                } else {
                                 storeTextSettings.resetNumbers(number.type);
-                                }
                                 props.onNumber(number.type);
                             }}>
                             {number.thumb.length < 1 ?

apps/documenteditor/mobile/src/view/settings/DocumentInfo.jsx

@@ -7,6 +7,8 @@ const PageDocumentInfo = (props) => {
     const { t } = useTranslation();
     const _t = t("Settings", { returnObjects: true });
     const storeInfo = props.storeDocumentInfo;
+    const fileType = storeInfo.dataDoc.fileType;
+
     const dataApp = props.getAppProps();
     
     const {
@@ -17,6 +19,21 @@ const PageDocumentInfo = (props) => {
         wordsCount,
     } = storeInfo.infoObj;
 
+    const {
+        pageSize,
+        title,
+        subject,
+        description,
+        dateCreated,
+        modifyBy,
+        modifyDate,
+        author,
+        version,
+        tagged,
+        fastWebView,
+        creators
+    } = props.docInfoObject;
+
     const dataDoc = JSON.parse(JSON.stringify(storeInfo.dataDoc));
     const isLoaded = storeInfo.isLoaded;
   
@@ -62,70 +79,87 @@ const PageDocumentInfo = (props) => {
                 <ListItem title={t('Settings.textWords')} after={isLoaded ? String(wordsCount) : _t.textLoading}></ListItem>
                 <ListItem title={t('Settings.textSymbols')} after={isLoaded ? String(symbolsCount) : _t.textLoading}></ListItem>
                 <ListItem title={t('Settings.textSpaces')} after={isLoaded ? String(symbolsWSCount) : _t.textLoading}></ListItem>
+                {pageSize && <ListItem title={t('Settings.textPageSize')} after={pageSize}></ListItem>}
             </List>
-            {props.title ? (
+            {title ? (
                 <Fragment>
-                    <BlockTitle>{_t.textTitle}</BlockTitle>
+                    <BlockTitle>{t('Settings.textTitle')}</BlockTitle>
                     <List>
-                        <ListItem title={props.title}></ListItem>
+                        <ListItem title={title}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.subject ? (
+            {subject ? (
                 <Fragment>
-                    <BlockTitle>{_t.textSubject}</BlockTitle>
+                    <BlockTitle>{t('Settings.textSubject')}</BlockTitle>
                     <List>
-                        <ListItem title={props.subject}></ListItem>
+                        <ListItem title={subject}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.description ? (
+            {description ? (
                 <Fragment>
-                    <BlockTitle>{_t.textComment}</BlockTitle>
+                    <BlockTitle>{t('Settings.textComment')}</BlockTitle>
                     <List>
-                        <ListItem title={props.description}></ListItem>
+                        <ListItem title={description}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.modified ? (
+            {modifyDate ? (
                 <Fragment>
-                    <BlockTitle>{_t.textLastModified}</BlockTitle>
+                    <BlockTitle>{t('Settings.textLastModified')}</BlockTitle>
                     <List>
-                        <ListItem title={props.modified}></ListItem>
+                        <ListItem title={modifyDate}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.modifiedBy ? (
+            {modifyBy ? (
                 <Fragment>
-                    <BlockTitle>{_t.textLastModifiedBy}</BlockTitle>
+                    <BlockTitle>{t('Settings.textLastModifiedBy')}</BlockTitle>
                     <List>
-                        <ListItem title={props.modifiedBy}></ListItem>
+                        <ListItem title={modifyBy}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.created ? (
+            {dateCreated ? (
                 <Fragment>
-                    <BlockTitle>{_t.textCreated}</BlockTitle>
+                    <BlockTitle>{t('Settings.textCreated')}</BlockTitle>
                     <List>
-                        <ListItem title={props.created}></ListItem>
+                        <ListItem title={dateCreated}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
             {dataApp ? (
                 <Fragment>
-                    <BlockTitle>{_t.textApplication}</BlockTitle>
+                    <BlockTitle>{t('Settings.textApplication')}</BlockTitle>
                     <List>
                         <ListItem title={dataApp}></ListItem>
                     </List>
                 </Fragment>
             ) : null}
-            {props.creators ? (
+            {fileType === 'xps' && author ? (
                 <Fragment>
-                    <BlockTitle>{_t.textAuthor}</BlockTitle>
+                    <BlockTitle>{t('Settings.textAuthor')}</BlockTitle>
+                    <List>
+                        <ListItem title={author}></ListItem>
+                    </List>
+                </Fragment>
+            ) : null}
+            { fileType === 'pdf' ? (
+                <List>
+                    <ListItem title={t('Settings.textAuthor')} after={author} />
+                    <ListItem title={t('Settings.textPdfVer')} after={version} />
+                    <ListItem title={t('Settings.textPdfTagged')} after={tagged} />
+                    <ListItem title={t('Settings.textFastWV')} after={fastWebView} />
+                </List>
+            ) : null}
+            {creators ? (
+                <Fragment>
+                    <BlockTitle>{t('Settings.textAuthor')}</BlockTitle>
                     <List>
                         {
-                            props.creators.split(/\s*[,;]\s*/).map(item => {
+                            creators.split(/\s*[,;]\s*/).map(item => {
-                                return <ListItem title={item}></ListItem>
+                                return <ListItem key="item" title={item}></ListItem>
                             })
                         }
                     </List>

apps/presentationeditor/main/app/controller/Animation.js

@@ -410,13 +410,14 @@ define([
                         } else { // add custom effect to appropriate group
                             if (group) {
                                 var items = store.where({group: group.get('id')});
-                                var index = (items && items.length>0) ? store.indexOf(items.at(items.length-1)) : store.length-1;
+                                var index = (items && items.length>0) ? store.indexOf(items[items.length-1]) : store.length-1;
                                 var rec = _.findWhere(Common.define.effectData.getEffectFullData(), {group: group.get('id'), value: this._state.Effect});
                                 item = store.add(new Common.UI.DataViewModel({
                                     group: group.get('id'),
                                     value: this._state.Effect,
                                     iconCls: group.get('iconClsCustom'),
                                     displayValue: rec ? rec.displayValue : '',
+                                    tip: rec ? rec.displayValue : '',
                                     isCustom: true
                                 }), {at:index+1});
                                 view.listEffects.selectRecord(item);

apps/presentationeditor/main/app/template/StatusBar.template

@@ -1,10 +1,10 @@
 
 <div class="statusbar" style="display:table;">
     <div class="status-group">
-        <div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;"></div>
+        <div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;" class="margin-top-small"></div>
     </div>
     <div class="status-group dropup">
-        <label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
+        <label id="status-label-pages" class="status-label dropdown-toggle margin-top-large" style="margin-left: 7px; display: none;" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="-3, 0"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
         <div id="status-goto-box" class="dropdown-menu">
             <label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
             <div id="status-goto-page" style="display:inline-block;"></div>
@@ -24,22 +24,22 @@
         <div class="separator short" style="margin-left: 10px;"></div>
     </div>
     <div class="status-group" style="width:100%; text-align:center;">
-        <label id="status-label-action" class="status-label" data-layout-name="statusBar-actionStatus"></label>
+        <label id="status-label-action" class="status-label margin-top-large" data-layout-name="statusBar-actionStatus"></label>
     </div>
     <div class="status-group" style="">
-        <span id="btn-cnt-lang" class="el-edit" data-layout-name="statusBar-textLang"></span>
+        <span id="btn-cnt-lang" class="el-edit margin-top-small" data-layout-name="statusBar-textLang"></span>
-        <span id="btn-doc-lang" class="el-edit" data-layout-name="statusBar-docLang"></span>
+        <span id="btn-doc-lang" class="el-edit margin-top-small" data-layout-name="statusBar-docLang"></span>
         <div class="separator short el-edit space"></div>
-        <span id="btn-doc-spell" class="el-edit"></span>
+        <span id="btn-doc-spell" class="el-edit margin-top-small"></span>
         <div class="separator short el-edit el-lang"></div>
-        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtoslide"></i></button>
+        <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtoslide">&nbsp;</span></button>
-        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth"></i></button>
+        <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><span class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</span></button>
-        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown"></i></button>
+        <button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><span class="icon toolbar__icon btn-zoomdown">&nbsp;</span></button>
         <div class="cnt-zoom">
             <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
                 <label id="status-label-zoom" class="status-label">Zoom 100%</label>
             </div>
         </div>
-        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup"></i></button>
+        <button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small" style="margin-right:40px;"><span class="icon toolbar__icon btn-zoomup">&nbsp;</span></button>
     </div>
 </div>

apps/presentationeditor/main/app/view/AnimationDialog.js

@@ -170,6 +170,9 @@ define([
 
         fillEffect: function () {
             var arr = _.where(this.allEffects, {group: this._state.activeGroup, level: this.activeLevel });
+            arr = _.reject(arr, function (item) {
+                return !!item.notsupported;
+            });
             this.lstEffectList.store.reset(arr);
             var  item = this.lstEffectList.store.findWhere({value: this._state.activeEffect});
             if(!item)

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -3594,8 +3594,11 @@ define([
                     mnuArrangeBackward.setDisabled(inSmartartInternal);
 
                     menuImgShapeRotate.setVisible(_.isUndefined(value.chartProps) && (pluginGuid===null || pluginGuid===undefined));
-                    if (menuImgShapeRotate.isVisible())
+                    if (menuImgShapeRotate.isVisible()) {
                         menuImgShapeRotate.setDisabled(disabled || (value.shapeProps && value.shapeProps.value.get_FromSmartArt()));
+                        menuImgShapeRotate.menu.items[3].setDisabled(inSmartartInternal);
+                        menuImgShapeRotate.menu.items[4].setDisabled(inSmartartInternal);
+                    }
 
                     // image properties
                     menuImgOriginalSize.setVisible(isimage);

apps/presentationeditor/main/app/view/ShapeSettings.js

@@ -767,6 +767,8 @@ define([
             {
                 this._originalProps = props;
                 this._noApply = true;
+                this._state.isFromImage = !!props.get_FromImage();
+                this._state.isFromSmartArtInternal = !!props.get_FromSmartArtInternal();
 
                 var shapetype = props.asc_getType();
 
@@ -779,10 +781,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype);
-                this._state.isFromImage = !!props.get_FromImage();
-                this._state.isFromSmartArtInternal = !!props.get_FromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(props.get_FromImage() || props.get_FromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(props.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 // background colors
@@ -1850,6 +1850,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js

@@ -627,6 +627,8 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                     this.radioNofit.setDisabled(true);
                     this.radioShrink.setDisabled(true);
                     this.radioFit.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);

apps/presentationeditor/main/app/view/Toolbar.js

@@ -409,7 +409,7 @@ define([
                         enableToggle: true,
                         allowDepress: true,
                         split: true,
-                        lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inSmartart, _set.inSmartartInternal],
+                        lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
                         menu: new Common.UI.Menu({
                             style: 'min-width: 100px;',
                             items: [

apps/presentationeditor/main/locale/az.json

@@ -1086,6 +1086,8 @@
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
   "PE.Controllers.Viewport.textFitPage": "Slayda uyğun tənzimlə",
   "PE.Controllers.Viewport.textFitWidth": "Enə uyğun tənzimlə",
+  "PE.Views.Animation.textNoRepeat": "(yoxdur)",
+  "PE.Views.Animation.txtParameters": "Parametreler",
   "PE.Views.ChartSettings.textAdvanced": "Qabaqcıl Parametrləri Göstər",
   "PE.Views.ChartSettings.textChartType": "Diaqramın növünü dəyiş",
   "PE.Views.ChartSettings.textEditData": "Məlumatları Redaktə edin",

apps/presentationeditor/main/locale/be.json

@@ -53,7 +53,7 @@
   "Common.define.effectData.textZoom": "Маштаб",
   "Common.Translation.warnFileLocked": "Дакумент выкарыстоўваецца іншай праграмай. Вы можаце працягнуць рэдагаванне і захаваць яго як копію.",
   "Common.UI.ButtonColored.textAutoColor": "Аўтаматычна",
-  "Common.UI.ButtonColored.textNewColor": "Дадаць новы адвольны колер",
+  "Common.UI.ButtonColored.textNewColor": "Адвольны колер",
   "Common.UI.ComboBorderSize.txtNoBorders": "Без межаў",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без межаў",
   "Common.UI.ComboDataView.emptyComboText": "Без стыляў",

apps/presentationeditor/main/locale/bg.json

@@ -14,6 +14,7 @@
   "Common.define.chartData.textPoint": "XY (точкова)",
   "Common.define.chartData.textStock": "Борсова",
   "Common.define.chartData.textSurface": "Повърхност",
+  "Common.UI.ButtonColored.textNewColor": "Нов Потребителски Цвят",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",

apps/presentationeditor/main/locale/ca.json

@@ -245,7 +245,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
   "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització",
   "Common.UI.ButtonColored.textAutoColor": "Automàtic",
-  "Common.UI.ButtonColored.textNewColor": "Afegeix un color personalitzat nou ",
+  "Common.UI.ButtonColored.textNewColor": "Color personalitzat nou ",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sense vores",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sense vores",
   "Common.UI.ComboDataView.emptyComboText": "Sense estils",

apps/presentationeditor/main/locale/da.json

@@ -51,7 +51,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Opret en kopi",
   "Common.Translation.warnFileLockedBtnView": "Åben for visning",
   "Common.UI.ButtonColored.textAutoColor": "Automatisk",
-  "Common.UI.ButtonColored.textNewColor": "Tilføj ny brugerdefineret farve",
+  "Common.UI.ButtonColored.textNewColor": "Brugerdefineret farve",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ingen rammer",
   "Common.UI.ComboDataView.emptyComboText": "Ingen stilarter",

apps/presentationeditor/main/locale/de.json

@@ -2168,6 +2168,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Video einfügen",
   "PE.Views.Toolbar.tipLineSpace": "Zeilenabstand",
   "PE.Views.Toolbar.tipMarkers": "Aufzählung",
+  "PE.Views.Toolbar.tipMarkersArrow": "Pfeilförmige Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Häkchenaufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersDash": "Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Ausgefüllte karoförmige Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersFRound": "Ausgefüllte runde Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Ausgefüllte quadratische Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersHRound": "Leere runde Aufzählungszeichen",
+  "PE.Views.Toolbar.tipMarkersStar": "Sternförmige Aufzählungszeichen",
   "PE.Views.Toolbar.tipNumbers": "Nummerierung",
   "PE.Views.Toolbar.tipPaste": "Einfügen",
   "PE.Views.Toolbar.tipPreview": "Vorschau starten",

apps/presentationeditor/main/locale/el.json

@@ -238,7 +238,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου",
   "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή",
   "Common.UI.ButtonColored.textAutoColor": "Αυτόματα",
-  "Common.UI.ButtonColored.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "Common.UI.ButtonColored.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "Common.UI.ComboBorderSize.txtNoBorders": "Χωρίς περιγράμματα",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Χωρίς περιγράμματα",
   "Common.UI.ComboDataView.emptyComboText": "Χωρίς τεχνοτροπίες",
@@ -2168,6 +2168,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Εισαγωγή βίντεο",
   "PE.Views.Toolbar.tipLineSpace": "Διάστιχο",
   "PE.Views.Toolbar.tipMarkers": "Κουκκίδες",
+  "PE.Views.Toolbar.tipMarkersArrow": "Κουκίδες βέλη",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Κουκίδες τσεκαρίσματος",
+  "PE.Views.Toolbar.tipMarkersDash": "Κουκίδες παύλας",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Κουκίδες πλήρους ρόμβου",
+  "PE.Views.Toolbar.tipMarkersFRound": "Κουκίδες πλήρεις στρογγυλές",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Κουκίδες πλήρεις τετράγωνες",
+  "PE.Views.Toolbar.tipMarkersHRound": "Κουκίδες κούφιες στρογγυλές",
+  "PE.Views.Toolbar.tipMarkersStar": "Κουκίδες αστέρια",
   "PE.Views.Toolbar.tipNumbers": "Αρίθμηση",
   "PE.Views.Toolbar.tipPaste": "Επικόλληση",
   "PE.Views.Toolbar.tipPreview": "Εκκίνηση παρουσίασης",

apps/presentationeditor/main/locale/es.json

@@ -52,6 +52,7 @@
   "Common.define.effectData.textArcDown": "Arco hacia abajo",
   "Common.define.effectData.textArcLeft": "Arco hacia a la izquierda",
   "Common.define.effectData.textArcRight": "Arco hacia la derecha",
+  "Common.define.effectData.textArcs": "Arcos",
   "Common.define.effectData.textArcUp": "Arco hacia arriba",
   "Common.define.effectData.textBasic": "Básico",
   "Common.define.effectData.textBasicSwivel": "Giro básico",
@@ -139,6 +140,7 @@
   "Common.define.effectData.textIn": "Hacia dentro",
   "Common.define.effectData.textInFromScreenCenter": "Aumentar desde el centro de pantalla",
   "Common.define.effectData.textInSlightly": "Acercar ligeramente",
+  "Common.define.effectData.textInToScreenBottom": "Acercar hacia parte inferior de la pantalla",
   "Common.define.effectData.textInvertedSquare": "Cuadrado invertido",
   "Common.define.effectData.textInvertedTriangle": "Triángulo invertido",
   "Common.define.effectData.textLeft": "Izquierda",
@@ -146,8 +148,10 @@
   "Common.define.effectData.textLeftUp": "Izquierda y arriba",
   "Common.define.effectData.textLighten": "Iluninar",
   "Common.define.effectData.textLineColor": "Color de línea",
+  "Common.define.effectData.textLines": "Líneas",
   "Common.define.effectData.textLinesCurves": "Líneas curvas",
   "Common.define.effectData.textLoopDeLoop": "Bucle",
+  "Common.define.effectData.textLoops": "Bucles",
   "Common.define.effectData.textModerate": "Moderado",
   "Common.define.effectData.textNeutron": "Neutrón",
   "Common.define.effectData.textObjectCenter": "Centro del objeto",
@@ -156,6 +160,7 @@
   "Common.define.effectData.textOut": "Hacia fuera",
   "Common.define.effectData.textOutFromScreenBottom": "Alejar desde la zona inferior de la pantalla",
   "Common.define.effectData.textOutSlightly": "Alejar ligeramente",
+  "Common.define.effectData.textOutToScreenCenter": "Alejar hacia el centro de la pantalla",
   "Common.define.effectData.textParallelogram": "Paralelogramo",
   "Common.define.effectData.textPath": "Rutas de movimiento",
   "Common.define.effectData.textPeanut": "Cacahuete",
@@ -179,6 +184,7 @@
   "Common.define.effectData.textSCurve1": "Curva S 1",
   "Common.define.effectData.textSCurve2": "Curva S 2",
   "Common.define.effectData.textShape": "Forma",
+  "Common.define.effectData.textShapes": "Formas",
   "Common.define.effectData.textShimmer": "Reflejos",
   "Common.define.effectData.textShrinkTurn": "Reducir y girar",
   "Common.define.effectData.textSineWave": "Sine Wave",
@@ -219,6 +225,7 @@
   "Common.define.effectData.textTrapezoid": "Trapecio",
   "Common.define.effectData.textTurnDown": "Giro hacia abajo",
   "Common.define.effectData.textTurnDownRight": "Girar hacia abajo y a la derecha",
+  "Common.define.effectData.textTurns": "Giros",
   "Common.define.effectData.textTurnUp": "Girar hacia arriba",
   "Common.define.effectData.textTurnUpRight": "Girar hacia arriba a la derecha",
   "Common.define.effectData.textUnderline": "Subrayar",
@@ -238,7 +245,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Agregar nuevo color personalizado",
+  "Common.UI.ButtonColored.textNewColor": "Color personalizado",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
   "Common.UI.ComboDataView.emptyComboText": "Sin estilo",
@@ -293,6 +300,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Listas con viñetas automáticas",
   "Common.Views.AutoCorrectDialog.textBy": "Por",
   "Common.Views.AutoCorrectDialog.textDelete": "Eliminar",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Añadir punto con doble espacio",
   "Common.Views.AutoCorrectDialog.textFLCells": "Poner en mayúsculas la primera letra de las celdas de la tabla",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Poner en mayúscula la primera letra de una oración",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Rutas de red e Internet por hipervínculos",
@@ -1282,6 +1290,12 @@
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Dseda",
   "PE.Controllers.Viewport.textFitPage": "Ajustar a la diapositiva",
   "PE.Controllers.Viewport.textFitWidth": "Ajustar al ancho",
+  "PE.Views.Animation.str0_5": "0,5 s (muy rápido)",
+  "PE.Views.Animation.str1": "1 s (rápido)",
+  "PE.Views.Animation.str2": "2 s (medio)",
+  "PE.Views.Animation.str20": "20 s (muy lento)",
+  "PE.Views.Animation.str3": "3 s (lento)",
+  "PE.Views.Animation.str5": "5 s (muy lento)",
   "PE.Views.Animation.strDelay": "Retraso",
   "PE.Views.Animation.strDuration": "Duración ",
   "PE.Views.Animation.strRepeat": "Repetir",
@@ -1293,11 +1307,14 @@
   "PE.Views.Animation.textMoveLater": "Mover después",
   "PE.Views.Animation.textMultiple": "Múltiple",
   "PE.Views.Animation.textNone": "Ninguno",
+  "PE.Views.Animation.textNoRepeat": "(ninguno)",
   "PE.Views.Animation.textOnClickOf": "Al hacer clic con",
   "PE.Views.Animation.textOnClickSequence": "Secuencia de clics",
   "PE.Views.Animation.textStartAfterPrevious": "Después de la anterior",
   "PE.Views.Animation.textStartOnClick": "Al hacer clic",
   "PE.Views.Animation.textStartWithPrevious": "Con la anterior",
+  "PE.Views.Animation.textUntilEndOfSlide": "Hasta el final de la diapositiva",
+  "PE.Views.Animation.textUntilNextClick": "Hasta el siguiente clic",
   "PE.Views.Animation.txtAddEffect": "Agregar animación",
   "PE.Views.Animation.txtAnimationPane": "Panel de animación",
   "PE.Views.Animation.txtParameters": "Parámetros",
@@ -2168,6 +2185,15 @@
   "PE.Views.Toolbar.tipInsertVideo": "Insertar vídeo",
   "PE.Views.Toolbar.tipLineSpace": "Espaciado de línea",
   "PE.Views.Toolbar.tipMarkers": "Viñetas",
+  "PE.Views.Toolbar.tipMarkersArrow": "Viñetas de flecha",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Viñetas de marca de verificación",
+  "PE.Views.Toolbar.tipMarkersDash": "Viñetas guión",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Rombos rellenos",
+  "PE.Views.Toolbar.tipMarkersFRound": "Viñetas redondas rellenas",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Viñetas cuadradas rellenas",
+  "PE.Views.Toolbar.tipMarkersHRound": "Viñetas redondas huecas",
+  "PE.Views.Toolbar.tipMarkersStar": "Viñetas de estrella",
+  "PE.Views.Toolbar.tipNone": "Ninguno",
   "PE.Views.Toolbar.tipNumbers": "Numeración",
   "PE.Views.Toolbar.tipPaste": "Pegar",
   "PE.Views.Toolbar.tipPreview": "Iniciar presentación",

apps/presentationeditor/main/locale/fi.json

@@ -6,6 +6,7 @@
   "Common.Controllers.ExternalDiagramEditor.warningText": "Ohjekti ei ole käytössä koska toinen käyttäjä muokkaa sitä.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Varoitus",
   "Common.UI.ButtonColored.textAutoColor": "Automaattinen",
+  "Common.UI.ButtonColored.textNewColor": "Lisää uusi mukautettu väri",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunuksia",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia",
   "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä",

apps/presentationeditor/main/locale/fr.json

@@ -52,6 +52,7 @@
   "Common.define.effectData.textArcDown": "Arc vers le bas",
   "Common.define.effectData.textArcLeft": "Arc à gauche",
   "Common.define.effectData.textArcRight": "Arc à droite",
+  "Common.define.effectData.textArcs": "Arcs",
   "Common.define.effectData.textArcUp": "Arc vers le haut",
   "Common.define.effectData.textBasic": "Simple",
   "Common.define.effectData.textBasicSwivel": "Rotation de base",
@@ -98,11 +99,11 @@
   "Common.define.effectData.textDissolveOut": "Dissolution externe",
   "Common.define.effectData.textDown": "Bas",
   "Common.define.effectData.textDrop": "Déplacer",
-  "Common.define.effectData.textEmphasis": "Effet d’accentuation",
+  "Common.define.effectData.textEmphasis": "Effets d’accentuation",
-  "Common.define.effectData.textEntrance": "Effet d’entrée",
+  "Common.define.effectData.textEntrance": "Effets d’entrée",
   "Common.define.effectData.textEqualTriangle": "Triangle équilatéral",
   "Common.define.effectData.textExciting": "Captivant",
-  "Common.define.effectData.textExit": "Effet de sortie",
+  "Common.define.effectData.textExit": "Effets de sortie",
   "Common.define.effectData.textExpand": "Développer",
   "Common.define.effectData.textFade": "Fondu",
   "Common.define.effectData.textFigureFour": "Figure quatre 8",
@@ -139,6 +140,7 @@
   "Common.define.effectData.textIn": "Vers l’intérieur",
   "Common.define.effectData.textInFromScreenCenter": "Avant depuis le centre de l’écran",
   "Common.define.effectData.textInSlightly": "Avant léger",
+  "Common.define.effectData.textInToScreenBottom": "Zoomer vers le bas de l'écran",
   "Common.define.effectData.textInvertedSquare": "Carré inversé",
   "Common.define.effectData.textInvertedTriangle": "Triangle inversé",
   "Common.define.effectData.textLeft": "Gauche",
@@ -146,8 +148,10 @@
   "Common.define.effectData.textLeftUp": "Gauche haut",
   "Common.define.effectData.textLighten": "Éclaircir",
   "Common.define.effectData.textLineColor": "Couleur du trait",
+  "Common.define.effectData.textLines": "Lignes",
   "Common.define.effectData.textLinesCurves": "Lignes сourbes",
   "Common.define.effectData.textLoopDeLoop": "Boucle",
+  "Common.define.effectData.textLoops": "Boucles",
   "Common.define.effectData.textModerate": "Modérer",
   "Common.define.effectData.textNeutron": "Neutron",
   "Common.define.effectData.textObjectCenter": "Centre de l’objet",
@@ -156,8 +160,9 @@
   "Common.define.effectData.textOut": "Arrière",
   "Common.define.effectData.textOutFromScreenBottom": "Arrière depuis le bas de l’écran",
   "Common.define.effectData.textOutSlightly": "Arrière léger",
+  "Common.define.effectData.textOutToScreenCenter": "Diminuer au centre de l'écran",
   "Common.define.effectData.textParallelogram": "Parallélogramme",
-  "Common.define.effectData.textPath": "Trajectoire du mouvement",
+  "Common.define.effectData.textPath": "Trajectoires du mouvement",
   "Common.define.effectData.textPeanut": "Cacahuète",
   "Common.define.effectData.textPeekIn": "Insertion furtive",
   "Common.define.effectData.textPeekOut": "Sortie furtive",
@@ -179,6 +184,7 @@
   "Common.define.effectData.textSCurve1": "Courbe S 1",
   "Common.define.effectData.textSCurve2": "Courbe S 2",
   "Common.define.effectData.textShape": "Forme",
+  "Common.define.effectData.textShapes": "Formes",
   "Common.define.effectData.textShimmer": "Miroiter",
   "Common.define.effectData.textShrinkTurn": "Rétrécir et faire pivoter",
   "Common.define.effectData.textSineWave": "Vague sinusoïdale",
@@ -219,6 +225,7 @@
   "Common.define.effectData.textTrapezoid": "Trapèze",
   "Common.define.effectData.textTurnDown": "Tourner vers le bas",
   "Common.define.effectData.textTurnDownRight": "Tourner vers le bas à droite",
+  "Common.define.effectData.textTurns": "Tours",
   "Common.define.effectData.textTurnUp": "Tourner vers le haut",
   "Common.define.effectData.textTurnUpRight": "Tourner vers le haut à droite",
   "Common.define.effectData.textUnderline": "Souligner",
@@ -293,6 +300,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Listes à puces automatiques",
   "Common.Views.AutoCorrectDialog.textBy": "Par",
   "Common.Views.AutoCorrectDialog.textDelete": "Supprimer",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Ajouter un point avec un double espace",
   "Common.Views.AutoCorrectDialog.textFLCells": "Mettre la première lettre des cellules du tableau en majuscule",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Majuscule en début de phrase",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Adresses Internet et réseau avec des liens hypertextes",
@@ -1282,6 +1290,12 @@
   "PE.Controllers.Toolbar.txtSymbol_zeta": "Zêta",
   "PE.Controllers.Viewport.textFitPage": "Ajuster à la diapositive",
   "PE.Controllers.Viewport.textFitWidth": "Ajuster à la largeur",
+  "PE.Views.Animation.str0_5": "0,5 s (très rapide)",
+  "PE.Views.Animation.str1": "1 s (Rapide)",
+  "PE.Views.Animation.str2": "2 s (Moyen)",
+  "PE.Views.Animation.str20": "20 s (Extrêmement lent)",
+  "PE.Views.Animation.str3": "3 s (Lent)",
+  "PE.Views.Animation.str5": "5 s (Très lent)",
   "PE.Views.Animation.strDelay": "Retard",
   "PE.Views.Animation.strDuration": "Durée",
   "PE.Views.Animation.strRepeat": "Répéter",
@@ -1293,11 +1307,14 @@
   "PE.Views.Animation.textMoveLater": "Déplacer après",
   "PE.Views.Animation.textMultiple": "Multiple ",
   "PE.Views.Animation.textNone": "Aucun",
+  "PE.Views.Animation.textNoRepeat": "(aucun)",
   "PE.Views.Animation.textOnClickOf": "Au clic sur",
   "PE.Views.Animation.textOnClickSequence": "Séquence de clics",
   "PE.Views.Animation.textStartAfterPrevious": "Après la précédente",
   "PE.Views.Animation.textStartOnClick": "Au clic",
   "PE.Views.Animation.textStartWithPrevious": "Avec la précédente",
+  "PE.Views.Animation.textUntilEndOfSlide": "Jusqu’à la fin de la diapositive",
+  "PE.Views.Animation.textUntilNextClick": "Jusqu’au clic suivant",
   "PE.Views.Animation.txtAddEffect": "Ajouter une animation",
   "PE.Views.Animation.txtAnimationPane": "Volet Animation",
   "PE.Views.Animation.txtParameters": "Paramètres",
@@ -1522,7 +1539,7 @@
   "PE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu",
   "PE.Views.FileMenu.btnCreateNewCaption": "Nouvelle présentation",
   "PE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...",
-  "PE.Views.FileMenu.btnExitCaption": "Quitter",
+  "PE.Views.FileMenu.btnExitCaption": "Fermer",
   "PE.Views.FileMenu.btnFileOpenCaption": "Ouvrir...",
   "PE.Views.FileMenu.btnHelpCaption": "Aide...",
   "PE.Views.FileMenu.btnHistoryCaption": "Historique des versions",
@@ -2168,6 +2185,15 @@
   "PE.Views.Toolbar.tipInsertVideo": "Insérer vidéo",
   "PE.Views.Toolbar.tipLineSpace": "Interligne",
   "PE.Views.Toolbar.tipMarkers": "Puces",
+  "PE.Views.Toolbar.tipMarkersArrow": "Puces fléchées",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Puces coches",
+  "PE.Views.Toolbar.tipMarkersDash": "Tirets",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Losanges remplis",
+  "PE.Views.Toolbar.tipMarkersFRound": "Puces arrondies remplies",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Puces carrées remplies",
+  "PE.Views.Toolbar.tipMarkersHRound": "Puces rondes vides",
+  "PE.Views.Toolbar.tipMarkersStar": "Puces en étoile",
+  "PE.Views.Toolbar.tipNone": "Aucun",
   "PE.Views.Toolbar.tipNumbers": "Numérotation",
   "PE.Views.Toolbar.tipPaste": "Coller",
   "PE.Views.Toolbar.tipPreview": "Démarrer le diaporama",

apps/presentationeditor/main/locale/gl.json

@@ -238,7 +238,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear unha copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Engadir nova cor personalizada",
+  "Common.UI.ButtonColored.textNewColor": "Nova cor personalizada",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sen bordos",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sen bordos",
   "Common.UI.ComboDataView.emptyComboText": "Sen estilo",
@@ -2168,6 +2168,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Inserir vídeo",
   "PE.Views.Toolbar.tipLineSpace": "Espazo entre liñas",
   "PE.Views.Toolbar.tipMarkers": "Viñetas",
+  "PE.Views.Toolbar.tipMarkersArrow": "Viñetas de flecha",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Viñetas de marca de verificación",
+  "PE.Views.Toolbar.tipMarkersDash": "Viñetas guión",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Rombos recheos",
+  "PE.Views.Toolbar.tipMarkersFRound": "Viñetas redondas recheas",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Viñetas cadradas recheas",
+  "PE.Views.Toolbar.tipMarkersHRound": "Viñetas redondas ocas",
+  "PE.Views.Toolbar.tipMarkersStar": "Viñetas de estrela",
   "PE.Views.Toolbar.tipNumbers": "Numeración",
   "PE.Views.Toolbar.tipPaste": "Pegar",
   "PE.Views.Toolbar.tipPreview": "Iniciar presentación",

apps/presentationeditor/main/locale/hu.json

@@ -1945,6 +1945,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Videó beszúrása",
   "PE.Views.Toolbar.tipLineSpace": "Sortávolság",
   "PE.Views.Toolbar.tipMarkers": "Felsorolás",
+  "PE.Views.Toolbar.tipMarkersArrow": "Nyíl felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Jelölőnégyzet felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersDash": "Kötőjel felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Tömör rombusz felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersFRound": "Tömör kör felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Tömör szögletes felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersHRound": "Üreges kör felsorolásjelek",
+  "PE.Views.Toolbar.tipMarkersStar": "Csillag felsorolásjelek",
   "PE.Views.Toolbar.tipNumbers": "Számozás",
   "PE.Views.Toolbar.tipPaste": "Beilleszt",
   "PE.Views.Toolbar.tipPreview": "Diavetítés elindítása",

apps/presentationeditor/main/locale/it.json

@@ -146,6 +146,7 @@
   "Common.define.effectData.textLeftUp": "Sinistra in alto",
   "Common.define.effectData.textLighten": "Illuminare",
   "Common.define.effectData.textLineColor": "Colore linea",
+  "Common.define.effectData.textLines": "Linee",
   "Common.define.effectData.textLinesCurves": "Linee Curve",
   "Common.define.effectData.textLoopDeLoop": "Ciclo continuo",
   "Common.define.effectData.textModerate": "Moderato",
@@ -179,6 +180,7 @@
   "Common.define.effectData.textSCurve1": "Curva S 1",
   "Common.define.effectData.textSCurve2": "Curva S 2",
   "Common.define.effectData.textShape": "Forma",
+  "Common.define.effectData.textShapes": "Forme",
   "Common.define.effectData.textShimmer": "Riflesso",
   "Common.define.effectData.textShrinkTurn": "Restringere e girare",
   "Common.define.effectData.textSineWave": "Onda sinusoidale",
@@ -238,7 +240,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crea una copia",
   "Common.Translation.warnFileLockedBtnView": "‎Aperto per la visualizzazione‎",
   "Common.UI.ButtonColored.textAutoColor": "Automatico",
-  "Common.UI.ButtonColored.textNewColor": "Aggiungere un nuovo colore personalizzato",
+  "Common.UI.ButtonColored.textNewColor": "Aggiungi Colore personalizzato",
   "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo",
   "Common.UI.ComboDataView.emptyComboText": "Nessuno stile",
@@ -1293,6 +1295,7 @@
   "PE.Views.Animation.textMoveLater": "Spostare di seguito",
   "PE.Views.Animation.textMultiple": "Multipli",
   "PE.Views.Animation.textNone": "Nessuno",
+  "PE.Views.Animation.textNoRepeat": "(nessuna)",
   "PE.Views.Animation.textOnClickOf": "Al clic di",
   "PE.Views.Animation.textOnClickSequence": "Alla sequenza di clic",
   "PE.Views.Animation.textStartAfterPrevious": "Dopo il precedente",
@@ -2168,6 +2171,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Inserisci video",
   "PE.Views.Toolbar.tipLineSpace": "Interlinea",
   "PE.Views.Toolbar.tipMarkers": "Elenchi puntati",
+  "PE.Views.Toolbar.tipMarkersArrow": "Punti elenco a freccia",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Punti elenco a segno di spunta",
+  "PE.Views.Toolbar.tipMarkersDash": "Punti elenco a trattino",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Punti elenco a rombo pieno",
+  "PE.Views.Toolbar.tipMarkersFRound": "Punti elenco rotondi pieni",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Punti elenco quadrati pieni",
+  "PE.Views.Toolbar.tipMarkersHRound": "Punti elenco rotondi vuoti",
+  "PE.Views.Toolbar.tipMarkersStar": "Punti elenco a stella",
   "PE.Views.Toolbar.tipNumbers": "Elenchi numerati",
   "PE.Views.Toolbar.tipPaste": "Incolla",
   "PE.Views.Toolbar.tipPreview": "Avvia presentazione",

apps/presentationeditor/main/locale/ja.json

@@ -47,6 +47,7 @@
   "Common.define.chartData.textScatterSmoothMarker": "マーカーと平滑線付き散布図",
   "Common.define.chartData.textStock": "株価チャート",
   "Common.define.chartData.textSurface": "表面",
+  "Common.define.effectData.textBasic": "基本",
   "Common.define.effectData.textBox": "ボックス",
   "Common.define.effectData.textCircle": "円",
   "Common.define.effectData.textDown": "下",
@@ -59,12 +60,16 @@
   "Common.define.effectData.textRight": "右",
   "Common.define.effectData.textRightDown": "右下",
   "Common.define.effectData.textRightUp": "右上",
+  "Common.define.effectData.textShapes": "形",
   "Common.define.effectData.textSpoke1": "1スポーク",
   "Common.define.effectData.textSpoke2": "2スポーク",
   "Common.define.effectData.textSpoke3": "3スポーク",
   "Common.define.effectData.textSpoke4": "4スポーク",
   "Common.define.effectData.textSpoke8": "8スポーク",
+  "Common.define.effectData.textUnderline": "下線",
   "Common.define.effectData.textUp": "上",
+  "Common.define.effectData.textVerticalIn": "縦（中）",
+  "Common.define.effectData.textVerticalOut": "縦（外）",
   "Common.define.effectData.textWave": "波",
   "Common.define.effectData.textWipe": "ワイプ",
   "Common.define.effectData.textZigzag": "ジグザグ",
@@ -128,6 +133,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "自動箇条書き",
   "Common.Views.AutoCorrectDialog.textBy": "幅",
   "Common.Views.AutoCorrectDialog.textDelete": "削除する",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "スペース2回でピリオドを入力する",
   "Common.Views.AutoCorrectDialog.textFLSentence": "文章の最初の文字を大文字にする",
   "Common.Views.AutoCorrectDialog.textHyperlink": "インターネットとネットワークのアドレスをハイパーリンクに変更する",
   "Common.Views.AutoCorrectDialog.textHyphens": "ハイフン(--)の代わりにダッシュ(—)",
@@ -1114,6 +1120,8 @@
   "PE.Controllers.Viewport.textFitPage": "スライドのサイズに合わせる",
   "PE.Controllers.Viewport.textFitWidth": "幅に合わせる",
   "PE.Views.Animation.strDuration": "継続時間",
+  "PE.Views.Animation.textNone": "なし",
+  "PE.Views.Animation.textNoRepeat": "（なし）",
   "PE.Views.Animation.txtAddEffect": "アニメーションを追加",
   "PE.Views.Animation.txtPreview": "プレビュー",
   "PE.Views.ChartSettings.textAdvanced": "詳細設定の表示",
@@ -1972,6 +1980,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "ビデオの挿入",
   "PE.Views.Toolbar.tipLineSpace": "行間",
   "PE.Views.Toolbar.tipMarkers": "箇条書き",
+  "PE.Views.Toolbar.tipMarkersArrow": "箇条書き（矢印）",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "箇条書き（チェックマーク）",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "箇条書き（ひし形）",
+  "PE.Views.Toolbar.tipMarkersFRound": "箇条書き（丸）",
+  "PE.Views.Toolbar.tipMarkersFSquare": "箇条書き（四角）",
+  "PE.Views.Toolbar.tipMarkersHRound": "箇条書き（円）",
+  "PE.Views.Toolbar.tipMarkersStar": "箇条書き（星）",
+  "PE.Views.Toolbar.tipNone": "なし",
   "PE.Views.Toolbar.tipNumbers": "番号設定",
   "PE.Views.Toolbar.tipPaste": "貼り付け",
   "PE.Views.Toolbar.tipPreview": "プレビューの開始",
@@ -2053,5 +2069,6 @@
   "PE.Views.Transitions.txtPreview": "プレビュー",
   "PE.Views.Transitions.txtSec": "秒",
   "PE.Views.ViewTab.textAlwaysShowToolbar": "ツールバーを常に表示する",
+  "PE.Views.ViewTab.textRulers": "ルーラー",
   "PE.Views.ViewTab.textZoom": "ズーム"
 }

apps/presentationeditor/main/locale/lv.json

@@ -6,6 +6,7 @@
   "Common.Controllers.ExternalDiagramEditor.warningText": "The object is disabled because it is being edited by another user.",
   "Common.Controllers.ExternalDiagramEditor.warningTitle": "Warning",
   "Common.UI.ButtonColored.textAutoColor": "Automātisks",
+  "Common.UI.ButtonColored.textNewColor": "Pievienot jauno krāsu",
   "Common.UI.ComboBorderSize.txtNoBorders": "No borders",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "No borders",
   "Common.UI.ComboDataView.emptyComboText": "No styles",

apps/presentationeditor/main/locale/nl.json

@@ -61,7 +61,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Maak een kopie",
   "Common.Translation.warnFileLockedBtnView": "Open voor lezen",
   "Common.UI.ButtonColored.textAutoColor": "Automatisch",
-  "Common.UI.ButtonColored.textNewColor": "Voeg nieuwe aangepaste kleur toe",
+  "Common.UI.ButtonColored.textNewColor": "Nieuwe aangepaste kleur",
   "Common.UI.ComboBorderSize.txtNoBorders": "Geen randen",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Geen randen",
   "Common.UI.ComboDataView.emptyComboText": "Geen stijlen",

apps/presentationeditor/main/locale/pl.json

@@ -22,7 +22,7 @@
   "Common.define.chartData.textStock": "Zbiory",
   "Common.define.chartData.textSurface": "Powierzchnia",
   "Common.UI.ButtonColored.textAutoColor": "Automatyczny",
-  "Common.UI.ButtonColored.textNewColor": "Dodaj Nowy Niestandardowy Kolor",
+  "Common.UI.ButtonColored.textNewColor": "Nowy niestandardowy kolor",
   "Common.UI.ComboBorderSize.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Bez krawędzi",
   "Common.UI.ComboDataView.emptyComboText": "Brak styli",

apps/presentationeditor/main/locale/pt.json

@@ -179,6 +179,7 @@
   "Common.define.effectData.textSCurve1": "Curva S 1",
   "Common.define.effectData.textSCurve2": "Curva S 2",
   "Common.define.effectData.textShape": "Forma",
+  "Common.define.effectData.textShapes": "Formas",
   "Common.define.effectData.textShimmer": "Cintilar",
   "Common.define.effectData.textShrinkTurn": "Encolher e girar",
   "Common.define.effectData.textSineWave": "Onda senoidal",
@@ -238,7 +239,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia",
   "Common.Translation.warnFileLockedBtnView": "Aberto para visualização",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Adicionar nova cor personalizada",
+  "Common.UI.ButtonColored.textNewColor": "Nova cor personalizada",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sem bordas",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sem bordas",
   "Common.UI.ComboDataView.emptyComboText": "Sem estilos",
@@ -293,6 +294,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Listas com marcadores automáticas",
   "Common.Views.AutoCorrectDialog.textBy": "Por",
   "Common.Views.AutoCorrectDialog.textDelete": "Excluir",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Adicionar ponto com espaço duplo",
   "Common.Views.AutoCorrectDialog.textFLCells": "Capitalizar a primeira letra das células da tabela",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Capitalizar a primeira carta de sentenças",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Internet e caminhos de rede com hyperlinks",
@@ -1293,6 +1295,7 @@
   "PE.Views.Animation.textMoveLater": "Mover-se depois",
   "PE.Views.Animation.textMultiple": "Múltiplo",
   "PE.Views.Animation.textNone": "Nenhum",
+  "PE.Views.Animation.textNoRepeat": "(nenhum)",
   "PE.Views.Animation.textOnClickOf": "Em Clique de",
   "PE.Views.Animation.textOnClickSequence": "Em Sequência de cliques",
   "PE.Views.Animation.textStartAfterPrevious": "Após o anterior",
@@ -2168,6 +2171,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Inserir Vídeo",
   "PE.Views.Toolbar.tipLineSpace": "Espaçamento de linha",
   "PE.Views.Toolbar.tipMarkers": "Marcadores",
+  "PE.Views.Toolbar.tipMarkersArrow": "Balas de flecha",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Marcas de verificação",
+  "PE.Views.Toolbar.tipMarkersDash": "Marcadores de roteiro",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Vinhetas rômbicas cheias",
+  "PE.Views.Toolbar.tipMarkersFRound": "Balas redondas cheias",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Balas quadradas cheias",
+  "PE.Views.Toolbar.tipMarkersHRound": "Balas redondas ocas",
+  "PE.Views.Toolbar.tipMarkersStar": "Balas de estrelas",
   "PE.Views.Toolbar.tipNumbers": "Numeração",
   "PE.Views.Toolbar.tipPaste": "Colar",
   "PE.Views.Toolbar.tipPreview": "Iniciar pré-visualização",

apps/presentationeditor/main/locale/ro.json

@@ -140,6 +140,7 @@
   "Common.define.effectData.textIn": "În interior",
   "Common.define.effectData.textInFromScreenCenter": "În interior din centrul ecranului",
   "Common.define.effectData.textInSlightly": "Ușor în interior",
+  "Common.define.effectData.textInToScreenBottom": "În interior către josul ecranului",
   "Common.define.effectData.textInvertedSquare": "Pătrat invers",
   "Common.define.effectData.textInvertedTriangle": "Triunghi invers",
   "Common.define.effectData.textLeft": "Stânga",
@@ -159,6 +160,7 @@
   "Common.define.effectData.textOut": "În exterior",
   "Common.define.effectData.textOutFromScreenBottom": "În exterior din josul ecranului",
   "Common.define.effectData.textOutSlightly": "Ușor în exterior",
+  "Common.define.effectData.textOutToScreenCenter": "În exterior către centrul ecranului",
   "Common.define.effectData.textParallelogram": "Paralelogram",
   "Common.define.effectData.textPath": "Căi de mișcare",
   "Common.define.effectData.textPeanut": "Alună",
@@ -243,7 +245,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crează o copie",
   "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea",
   "Common.UI.ButtonColored.textAutoColor": "Automat",
-  "Common.UI.ButtonColored.textNewColor": "Adăugarea unei culori particularizate noi",
+  "Common.UI.ButtonColored.textNewColor": "Сuloare particularizată",
   "Common.UI.ComboBorderSize.txtNoBorders": "Fără borduri",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Fără borduri",
   "Common.UI.ComboDataView.emptyComboText": "Fără stiluri",
@@ -1312,6 +1314,7 @@
   "PE.Views.Animation.textStartOnClick": "La clic",
   "PE.Views.Animation.textStartWithPrevious": "Cu anteriorul",
   "PE.Views.Animation.textUntilEndOfSlide": "Până la finalul diapositivului",
+  "PE.Views.Animation.textUntilNextClick": "Până la următorul clic",
   "PE.Views.Animation.txtAddEffect": "Adăugare animație",
   "PE.Views.Animation.txtAnimationPane": "Panou de animație",
   "PE.Views.Animation.txtParameters": "Opțiuni",

apps/presentationeditor/main/locale/sk.json

@@ -179,6 +179,7 @@
   "Common.define.effectData.textSCurve1": "S Krivka 1",
   "Common.define.effectData.textSCurve2": "S Krivka 2",
   "Common.define.effectData.textShape": "Tvar",
+  "Common.define.effectData.textShapes": "Tvary",
   "Common.define.effectData.textShimmer": "Trblietať sa",
   "Common.define.effectData.textShrinkTurn": "Zmenšiť a otočiť",
   "Common.define.effectData.textSineWave": "Sínusová vlna",
@@ -293,6 +294,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatické zoznamy s odrážkami",
   "Common.Views.AutoCorrectDialog.textBy": "Od",
   "Common.Views.AutoCorrectDialog.textDelete": "Vymazať",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Pridaj interval s dvojitou medzerou",
   "Common.Views.AutoCorrectDialog.textFLCells": "Prvé písmeno v obsahu buniek tabuľky meniť na veľké",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Veľlé písmeno na začiatku vety",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Internetové a sieťové prístupy s hypertextovými odkazmi",
@@ -1293,6 +1295,7 @@
   "PE.Views.Animation.textMoveLater": "Presunúť neskôr",
   "PE.Views.Animation.textMultiple": "Viacnásobný",
   "PE.Views.Animation.textNone": "žiadny",
+  "PE.Views.Animation.textNoRepeat": "(žiadne)",
   "PE.Views.Animation.textOnClickOf": "Pri kliknutí na",
   "PE.Views.Animation.textOnClickSequence": "Kliknite na položku Sekvencia",
   "PE.Views.Animation.textStartAfterPrevious": "Po predchádzajúcom",
@@ -2168,6 +2171,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Vložiť video",
   "PE.Views.Toolbar.tipLineSpace": "Riadkovanie",
   "PE.Views.Toolbar.tipMarkers": "Odrážky",
+  "PE.Views.Toolbar.tipMarkersArrow": "Šípkové odrážky",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Začiarknuteľné odrážky",
+  "PE.Views.Toolbar.tipMarkersDash": "Pomlčkové odrážky",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Kosoštvorcové odrážky s výplňou",
+  "PE.Views.Toolbar.tipMarkersFRound": "Vyplnené okrúhle odrážky",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Vyplnené štvorcové odrážky",
+  "PE.Views.Toolbar.tipMarkersHRound": "Prázdne okrúhle odrážky",
+  "PE.Views.Toolbar.tipMarkersStar": "Hviezdičkové odrážky",
   "PE.Views.Toolbar.tipNumbers": "Číslovanie",
   "PE.Views.Toolbar.tipPaste": "Vložiť",
   "PE.Views.Toolbar.tipPreview": "Spustiť prezentáciu",

apps/presentationeditor/main/locale/sl.json

@@ -28,6 +28,7 @@
   "Common.define.chartData.textPoint": "Točkovni grafikon",
   "Common.define.chartData.textStock": "Založni grafikon",
   "Common.Translation.warnFileLockedBtnEdit": "Ustvari kopijo",
+  "Common.UI.ButtonColored.textNewColor": "Dodaj novo barvo po meri",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej",
   "Common.UI.ComboDataView.emptyComboText": "Ni slogov",

apps/presentationeditor/main/locale/sv.json

@@ -179,6 +179,7 @@
   "Common.define.effectData.textSCurve1": "S kurva 1",
   "Common.define.effectData.textSCurve2": "S kurva 2",
   "Common.define.effectData.textShape": "Form",
+  "Common.define.effectData.textShapes": "Former",
   "Common.define.effectData.textShimmer": "Skimmer",
   "Common.define.effectData.textShrinkTurn": "Krymp och sväng",
   "Common.define.effectData.textSineWave": "Sinusvåg",
@@ -238,7 +239,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Skapa en kopia",
   "Common.Translation.warnFileLockedBtnView": "Öppna skrivskyddad",
   "Common.UI.ButtonColored.textAutoColor": "Automatisk",
-  "Common.UI.ButtonColored.textNewColor": "Lägg till ny anpassad färg",
+  "Common.UI.ButtonColored.textNewColor": "Lägg till ny egen färg",
   "Common.UI.ComboBorderSize.txtNoBorders": "Inga ramar",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Inga ramar",
   "Common.UI.ComboDataView.emptyComboText": "Inga stilar",
@@ -2168,6 +2169,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Infoga video",
   "PE.Views.Toolbar.tipLineSpace": "Radavstånd",
   "PE.Views.Toolbar.tipMarkers": "Punktlista",
+  "PE.Views.Toolbar.tipMarkersArrow": "Pil punkter",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Bock punkt",
+  "PE.Views.Toolbar.tipMarkersDash": "Sträck punkter",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Fyllda romb punkter",
+  "PE.Views.Toolbar.tipMarkersFRound": "Fyllda runda punkter",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Fyllda kvadratiska punkter",
+  "PE.Views.Toolbar.tipMarkersHRound": "Ofyllda runda punkter",
+  "PE.Views.Toolbar.tipMarkersStar": "Stjärn punkter",
   "PE.Views.Toolbar.tipNumbers": "Numrering",
   "PE.Views.Toolbar.tipPaste": "Klistra in",
   "PE.Views.Toolbar.tipPreview": "Starta visning",

apps/presentationeditor/main/locale/tr.json

@@ -1199,6 +1199,7 @@
   "PE.Views.Animation.strDelay": "Geciktir",
   "PE.Views.Animation.strDuration": "Süre",
   "PE.Views.Animation.strRepeat": "Tekrar",
+  "PE.Views.Animation.textNoRepeat": "(hiçbiri)",
   "PE.Views.Animation.textStartAfterPrevious": "Öncekinden Sonra",
   "PE.Views.Animation.txtAddEffect": "Animasyon ekle",
   "PE.Views.Animation.txtAnimationPane": "Animasyon Bölmesi",
@@ -2062,6 +2063,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Video ekle",
   "PE.Views.Toolbar.tipLineSpace": "Satır Aralığı",
   "PE.Views.Toolbar.tipMarkers": "Maddeler",
+  "PE.Views.Toolbar.tipMarkersArrow": "Ok işaretleri",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Onay işaretleri",
+  "PE.Views.Toolbar.tipMarkersDash": "Çizgi işaretleri",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Dolu eşkenar dörtgen işaretler",
+  "PE.Views.Toolbar.tipMarkersFRound": "Dolu yuvarlak işaretler",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Dolu kare işaretler",
+  "PE.Views.Toolbar.tipMarkersHRound": "İçi boş daire işaretler",
+  "PE.Views.Toolbar.tipMarkersStar": "Yıldız işaretleri",
   "PE.Views.Toolbar.tipNumbers": "Numaralandırma",
   "PE.Views.Toolbar.tipPaste": "Yapıştır",
   "PE.Views.Toolbar.tipPreview": "Önizlemeye Başla",

apps/presentationeditor/main/locale/uk.json

@@ -179,6 +179,7 @@
   "Common.define.effectData.textSCurve1": "Синусоїда 1",
   "Common.define.effectData.textSCurve2": "Синусоїда 2",
   "Common.define.effectData.textShape": "Фігура",
+  "Common.define.effectData.textShapes": "Фігури",
   "Common.define.effectData.textShimmer": "Мерехтіння",
   "Common.define.effectData.textShrinkTurn": "Зменшення з поворотом",
   "Common.define.effectData.textSineWave": "Часта синусоїда",
@@ -238,7 +239,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Створити копію",
   "Common.Translation.warnFileLockedBtnView": "Відкрити на перегляд",
   "Common.UI.ButtonColored.textAutoColor": "Автоматичний",
-  "Common.UI.ButtonColored.textNewColor": "Додати новий спеціальний колір",
+  "Common.UI.ButtonColored.textNewColor": "Новий спеціальний колір",
   "Common.UI.ComboBorderSize.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Немає кордонів",
   "Common.UI.ComboDataView.emptyComboText": "Немає стилів",
@@ -2168,6 +2169,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "Вставити відео",
   "PE.Views.Toolbar.tipLineSpace": "Лінія інтервалу",
   "PE.Views.Toolbar.tipMarkers": "Кулі",
+  "PE.Views.Toolbar.tipMarkersArrow": "Маркери-стрілки",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "Маркери-галочки",
+  "PE.Views.Toolbar.tipMarkersDash": "Маркери-тире",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "Заповнені ромбоподібні маркери",
+  "PE.Views.Toolbar.tipMarkersFRound": "Заповнені круглі маркери",
+  "PE.Views.Toolbar.tipMarkersFSquare": "Заповнені квадратні маркери",
+  "PE.Views.Toolbar.tipMarkersHRound": "Пусті круглі маркери",
+  "PE.Views.Toolbar.tipMarkersStar": "Маркери-зірочки",
   "PE.Views.Toolbar.tipNumbers": "Нумерація",
   "PE.Views.Toolbar.tipPaste": "Вставити",
   "PE.Views.Toolbar.tipPreview": "Розпочати слайдшоу",

apps/presentationeditor/main/locale/vi.json

@@ -13,6 +13,7 @@
   "Common.define.chartData.textPoint": "XY (Phân tán)",
   "Common.define.chartData.textStock": "Cổ phiếu",
   "Common.define.chartData.textSurface": "Bề mặt",
+  "Common.UI.ButtonColored.textNewColor": "Màu tùy chỉnh",
   "Common.UI.ComboBorderSize.txtNoBorders": "Không viền",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Không viền",
   "Common.UI.ComboDataView.emptyComboText": "Không có kiểu",

apps/presentationeditor/main/locale/zh.json

@@ -179,6 +179,7 @@
   "Common.define.effectData.textSCurve1": "S形曲线1",
   "Common.define.effectData.textSCurve2": "S形曲线2",
   "Common.define.effectData.textShape": "形状",
+  "Common.define.effectData.textShapes": "形状",
   "Common.define.effectData.textShimmer": "闪现",
   "Common.define.effectData.textShrinkTurn": "收缩并旋转",
   "Common.define.effectData.textSineWave": "正弦波",
@@ -2168,6 +2169,14 @@
   "PE.Views.Toolbar.tipInsertVideo": "插入视频",
   "PE.Views.Toolbar.tipLineSpace": "行间距",
   "PE.Views.Toolbar.tipMarkers": "项目符号",
+  "PE.Views.Toolbar.tipMarkersArrow": "箭头项目符号",
+  "PE.Views.Toolbar.tipMarkersCheckmark": "选中标记项目符号",
+  "PE.Views.Toolbar.tipMarkersDash": "划线项目符号",
+  "PE.Views.Toolbar.tipMarkersFRhombus": "实心菱形项目符号",
+  "PE.Views.Toolbar.tipMarkersFRound": "实心圆形项目符号",
+  "PE.Views.Toolbar.tipMarkersFSquare": "实心方形项目符号",
+  "PE.Views.Toolbar.tipMarkersHRound": "空心圆形项目符号",
+  "PE.Views.Toolbar.tipMarkersStar": "星形项目符号",
   "PE.Views.Toolbar.tipNumbers": "编号",
   "PE.Views.Toolbar.tipPaste": "粘贴",
   "PE.Views.Toolbar.tipPreview": "开始幻灯片放映",

apps/presentationeditor/main/resources/help/en/UsageInstructions/InsertEquation.htm

@@ -89,6 +89,12 @@
                 <li>To delete an <em>Accent</em>, you can right-click on it and select the <b>Remove accent character</b>, <b>Delete char</b> or <b>Remove bar</b> option from the menu (the available options differ depending on the selected accent).</li>
                 <li>To delete a row or a column of a <em>Matrix</em>, you can right-click on the placeholder within the row/column you need to delete, select the <b>Delete</b> option from the menu, then select <b>Delete Row/Column</b>.</li>
             </ul>
+            <h3 id="convertequation">Convert equations</h3>
+            <p>If you open an existing document containing equations which were created with an old version of equation editor (for example, with MS Office versions before 2007), you need to convert these equations to the Office Math ML format to be able to edit them.</p>
+            <p>To convert an equation, double-click it. The warning window will appear:</p>
+            <p><img alt="Convert equation" src="../images/convertequation.png" /></p>
+            <p>To convert the selected equation only, click the <b>Yes</b> button in the warning window. To convert all equations in this document, check the <b>Apply to all equations</b> box and click <b>Yes</b>.</p>
+            <p>Once the equation is converted, you can edit it.</p>
 		</div>
 	</body>
 </html>

apps/presentationeditor/main/resources/help/fr/UsageInstructions/InsertEquation.htm

@@ -89,6 +89,12 @@
                 <li>Pour supprimer une <I>Accentuation</I>, vous pouvez cliquer avec le bouton droit de la souris et sélectionner l'option <b>Supprimer le caractère d'accentuation</b>, <b>Supprimer le caractère</b> ou <b>Supprimer la barre</b> dans le menu (les options disponibles varient en fonction de l'accent sélectionné).</li>
                 <li>Pour supprimer une ligne ou une colonne d'une <I>Matrice</I>, vous pouvez cliquer avec le bouton droit de la souris sur l'espace réservé dans la ligne/colonne à supprimer, sélectionner l'option <b>Supprimer</b> dans le menu, puis sélectionner <b>Supprimer la ligne/Colonne</b>.</li>
             </ul>
+            <h3 id="convertequation">Conversion des équations</h3>
+            <p>Si vous disposez d'un document contenant des équations créées avec l'éditeur d'équations dans les versions plus anciennes (par exemple, avec MS Office version antérieure à 2007) vous devez convertir toutes les équations au format Office Math ML pour pouvoir les modifier. </p>
+            <p>Faites un double-clic sur l'équation pour la convertir. La fenêtre d'avertissement s'affiche:</p>
+            <p><img alt="Conversion des équations" src="../images/convertequation.png" /></p>
+            <p>Pour ne convertir que l'équation sélectionnée, cliquez sur <b>OK</b> dans la fenêtre d'avertissement. Pour convertir toutes les équations du document, activez la case <b>Appliquer à toutes les équations</b> et cliquez sur <b>OK</b>.</p>
+            <p>Une fois converti, l'équation peut être modifiée.</p>
 		</div>
 	</body>
 </html>

apps/presentationeditor/main/resources/help/ru/UsageInstructions/InsertEquation.htm

@@ -91,6 +91,12 @@
                 <li>Чтобы удалить <em>Диакритический знак</em>, можно щелкнуть по нему правой кнопкой мыши и выбрать из контекстного меню пункт <b>Удалить диакритический знак</b>, <b>Удалить символ</b> или <b>Удалить черту</b> (доступные опции отличаются в зависимости от выбранного диакритического знака).</li>
                 <li>Чтобы удалить строку или столбец <em>Матрицы</em>, можно щелкнуть правой кнопкой мыши по полю для заполнения внутри строки/столбца, который требуется удалить, выбрать из контекстного меню пункт <b>Удалить</b>, а затем - <b>Удалить строку/столбец</b>.</li>
             </ul>
+            <h3 id="convertequation">Преобразование уравнений</h3>
+            <p>Если вы открываете существующий документ с уравнениями, которые были созданы с помощью старой версии редактора уравнений (например, в версиях, предшествующих MS Office 2007), эти уравнения необходимо преобразовать в формат Office Math ML, чтобы иметь возможность их редактировать.</p>
+            <p>Чтобы преобразовать уравнение, дважды щелкните по нему. Откроется окно с предупреждением:</p>
+            <p><img alt="Преобразование уравнений" src="../images/convertequation.png" /></p>
+            <p>Чтобы преобразовать только выбранное уравнение, нажмите кнопку <b>Да</b> в окне предупреждения. Чтобы преобразовать все уравнения в документе, поставьте галочку <b>Применить ко всем уравнениям</b> и нажмите кнопку <b>Да</b>.</p>
+            <p>После преобразования уравнения вы сможете его редактировать.</p>
 		</div>
 	</body>
 </html>

apps/presentationeditor/main/resources/less/statusbar.less

@@ -4,17 +4,12 @@
 
     .status-label {
         position: relative;
-        top: 1px;
     }
 
     #status-label-pages, #status-label-zoom {
         cursor: pointer;
     }
 
-    #status-label-pages, #status-label-action {
-        margin-top: 2px;
-    }
-
     #status-users-icon, #status-users-count {
         display: inline-block;
         cursor: pointer;
@@ -44,10 +39,19 @@
         display: table-cell;
         white-space: nowrap;
         vertical-align: top;
-        padding-top: 3px;
         &.dropup {
             position: static;
         }
+
+        .status-label.margin-top-large {
+            margin-top: 6px;
+        }
+
+        button.margin-top-small,
+        .margin-top-small > button,
+        .margin-top-small > .btn-group {
+            margin-top: 3px;
+        }
     }
 
     .separator {
@@ -55,7 +59,6 @@
 
         &.short {
             height: 25px;
-            margin-top: -2px;
         }
 
         &.space {
@@ -72,7 +75,8 @@
 
     .cnt-zoom {
         display: inline-block;
-
+        vertical-align: middle;
+        margin-top: 4px;
         .dropdown-menu {
             min-width: 80px;
             margin-left: -4px;

apps/presentationeditor/mobile/locale/es.json

@@ -123,9 +123,9 @@
       "warnLicenseExp": "Su licencia ha expirado. Por favor, actualícela y recargue la página.",
       "warnLicenseLimitedNoAccess": "La licencia ha expirado. No tiene acceso a la funcionalidad de edición de documentos. Por favor, póngase en contacto con su administrador.",
       "warnLicenseLimitedRenewed": "La licencia necesita renovación. Tiene acceso limitado a la funcionalidad de edición de documentos.<br>Por favor, póngase en contacto con su administrador para obtener acceso completo",
-      "warnLicenseUsersExceeded": "Usted ha alcanzado el límite de usuarios para los editores de %1. Por favor, contacte con su administrador para recibir más información.",
+      "warnLicenseUsersExceeded": "Ha alcanzado el límite de usuarios para los editores de %1. Contacte con su administrador para recibir más información.",
       "warnNoLicense": "Ha alcanzado el límite de conexiones simultáneas con %1 editores. Este documento se abrirá sólo para su visualización. Póngase en contacto con el equipo de ventas de %1 para conocer las condiciones de actualización personal.",
-      "warnNoLicenseUsers": "Usted ha alcanzado el límite de usuarios para los editores de %1.<br>Contacte con el equipo de ventas de %1 para conocer los términos de actualización personal.",
+      "warnNoLicenseUsers": "Ha alcanzado el límite de usuarios para los editores de %1. <br>Contacte con el equipo de ventas de %1 para conocer los términos de actualización personal.",
       "warnProcessRightsChange": "No tiene permiso para editar el archivo."
     }
   },

apps/presentationeditor/mobile/src/view/edit/EditText.jsx

@@ -490,7 +490,7 @@ const PageAdditionalFormatting = props => {
     )
 };
 
-const PageBullets = props => {
+const PageBullets = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const bulletArrays = [
@@ -525,11 +525,8 @@ const PageBullets = props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
+                                    storeTextSettings.resetBullets(bullet.type);
-                                        storeTextSettings.resetBullets(-1);
+                                    props.onBullet(bullet.type);
-                                    }
-                                    props.onBullet(bullet.type)
-                                    props.f7router.back();
                                 }}>
                                 {bullet.thumb.length < 1 ?
                                     <Icon className="thumb" style={{position: 'relative'}}>
@@ -543,9 +540,9 @@ const PageBullets = props => {
             ))}
         </View>
     )
-};
+});
 
-const PageNumbers = props => {
+const PageNumbers = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const numberArrays = [
@@ -581,11 +578,8 @@ const PageNumbers = props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
+                                storeTextSettings.resetNumbers(number.type);
-                                    storeTextSettings.resetNumbers(-1);
+                                props.onNumber(number.type);
-                                }
-                                props.onNumber(number.type)
-                                props.f7router.back();
                             }}>
                             {number.thumb.length < 1 ?
                                 <Icon className="thumb" style={{position: 'relative'}}>
@@ -599,7 +593,7 @@ const PageNumbers = props => {
             ))}
         </View>
     )
-};
+});
 
 const PageBulletsAndNumbers = props => {
     const { t } = useTranslation();

apps/spreadsheeteditor/main/app/controller/DocumentHolder.js

@@ -1998,6 +1998,8 @@ define([
 
                 documentHolder.menuImgRotate.setVisible(!ischartmenu && (pluginGuid===null || pluginGuid===undefined) && !isslicermenu);
                 documentHolder.menuImgRotate.setDisabled(isObjLocked || isSmartArt);
+                documentHolder.menuImgRotate.menu.items[3].setDisabled(isSmartArtInternal);
+                documentHolder.menuImgRotate.menu.items[4].setDisabled(isSmartArtInternal);
 
                 documentHolder.menuImgCrop.setVisible(this.api.asc_canEditCrop());
                 documentHolder.menuImgCrop.setDisabled(isObjLocked);

apps/spreadsheeteditor/main/app/controller/Print.js

@@ -644,6 +644,10 @@ define([
         },
 
         onPreviewWheel: function (e) {
+            if (e.ctrlKey) {
+                e.preventDefault();
+                e.stopImmediatePropagation();
+            }
             var forward = (e.deltaY || (e.detail && -e.detail) || e.wheelDelta) < 0;
             this.onChangePreviewPage(forward);
         },

apps/spreadsheeteditor/main/app/view/ShapeSettings.js

@@ -764,6 +764,8 @@ define([
                 this._originalProps = shapeprops;
 
                 this._noApply = true;
+                this._state.isFromImage = !!shapeprops.get_FromImage();
+                this._state.isFromSmartArtInternal = !!shapeprops.asc_getFromSmartArtInternal();
 
                 this.disableControls(this._locked, !shapeprops.asc_getCanFill());
                 this.hideShapeOnlySettings(shapeprops.asc_getFromChart() || !!shapeprops.asc_getFromImage());
@@ -774,10 +776,8 @@ define([
                     || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
                     || shapetype=='straightConnector1';
                 this.hideChangeTypeSettings(hidechangetype);
-                this._state.isFromImage = !!shapeprops.get_FromImage();
-                this._state.isFromSmartArtInternal = !!shapeprops.asc_getFromSmartArtInternal();
                 if (!hidechangetype && this.btnChangeShape.menu.items.length) {
-                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || shapeprops.asc_getFromSmartArtInternal());
+                    this.btnChangeShape.shapePicker.hideTextRect(shapeprops.get_FromImage() || this._state.isFromSmartArtInternal);
                 }
 
                 // background colors
@@ -1868,6 +1868,8 @@ define([
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
             }
+            this.btnFlipV.setDisabled(disable || this._state.isFromSmartArtInternal);
+            this.btnFlipH.setDisabled(disable || this._state.isFromSmartArtInternal);
         },
 
         hideShapeOnlySettings: function(value) {

apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js

@@ -635,6 +635,8 @@ define([    'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
                 if (shapeprops.asc_getFromSmartArtInternal()) {
                     this.chAutofit.setDisabled(true);
                     this.chOverflow.setDisabled(true);
+                    this.chFlipHor.setDisabled(true);
+                    this.chFlipVert.setDisabled(true);
                 }
 
                 this.spnWidth.setValue(Common.Utils.Metric.fnRecalcFromMM(props.asc_getWidth()).toFixed(2), true);

apps/spreadsheeteditor/main/locale/be.json

@@ -36,7 +36,7 @@
   "Common.define.conditionalData.textLessEq": "Менш альбо роўна",
   "Common.Translation.warnFileLocked": "Дакумент выкарыстоўваецца іншай праграмай. Вы можаце працягнуць рэдагаванне і захаваць яго як копію.",
   "Common.UI.ButtonColored.textAutoColor": "Аўтаматычна",
-  "Common.UI.ButtonColored.textNewColor": "Дадаць новы адвольны колер",
+  "Common.UI.ButtonColored.textNewColor": "Адвольны колер",
   "Common.UI.ComboBorderSize.txtNoBorders": "Без межаў",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Без межаў",
   "Common.UI.ComboDataView.emptyComboText": "Без стыляў",
@@ -1890,7 +1890,7 @@
   "SSE.Views.FormatRulesEditDlg.textItem": "Элемент",
   "SSE.Views.FormatRulesEditDlg.textLeftBorders": "Левыя межы",
   "SSE.Views.FormatRulesEditDlg.textMiddleBorders": "Унутраныя гарызантальныя межы",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Дадаць новы адвольны колер",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Адвольны колер",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Без межаў",
   "SSE.Views.FormatRulesEditDlg.textNone": "Няма",
   "SSE.Views.FormatRulesEditDlg.tipBorders": "Межы",
@@ -1982,7 +1982,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Курсіў",
   "SSE.Views.HeaderFooterDialog.textLeft": "Злева",
   "SSE.Views.HeaderFooterDialog.textMaxError": "Уведзены занадта доўгі тэкставы радок. Паменшыце колькасць знакаў.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Дадаць новы адвольны колер",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Адвольны колер",
   "SSE.Views.HeaderFooterDialog.textOdd": "Няцотная старонка",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Колькасць старонак",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Нумар старонкі",
@@ -2660,7 +2660,7 @@
   "SSE.Views.Statusbar.textCount": "Колькасць",
   "SSE.Views.Statusbar.textMax": "Макс",
   "SSE.Views.Statusbar.textMin": "Мін",
-  "SSE.Views.Statusbar.textNewColor": "Дадаць новы адвольны колер",
+  "SSE.Views.Statusbar.textNewColor": "Адвольны колер",
   "SSE.Views.Statusbar.textNoColor": "Без колеру",
   "SSE.Views.Statusbar.textSum": "Сума",
   "SSE.Views.Statusbar.tipAddTab": "Дадаць аркуш",
@@ -2841,7 +2841,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Унутраныя гарызантальныя межы",
   "SSE.Views.Toolbar.textMoreFormats": "Іншыя фарматы",
   "SSE.Views.Toolbar.textMorePages": "Іншыя старонкі",
-  "SSE.Views.Toolbar.textNewColor": "Дадаць новы адвольны колер",
+  "SSE.Views.Toolbar.textNewColor": "Адвольны колер",
   "SSE.Views.Toolbar.textNoBorders": "Без межаў",
   "SSE.Views.Toolbar.textOnePage": "Старонка",
   "SSE.Views.Toolbar.textOutBorders": "Вонкавыя межы",

apps/spreadsheeteditor/main/locale/bg.json

@@ -15,6 +15,10 @@
   "Common.define.chartData.textStock": "Борсова",
   "Common.define.chartData.textSurface": "Повърхност",
   "Common.define.chartData.textWinLossSpark": "Печалба/Загуба",
+  "Common.define.conditionalData.textError": "Грешка",
+  "Common.define.conditionalData.textFormula": "Формула",
+  "Common.UI.ButtonColored.textAutoColor": "Автоматичен",
+  "Common.UI.ButtonColored.textNewColor": "Нов Потребителски Цвят",
   "Common.UI.ComboBorderSize.txtNoBorders": "Няма граници",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Няма граници",
   "Common.UI.ComboDataView.emptyComboText": "Няма стилове",
@@ -57,6 +61,8 @@
   "Common.Views.About.txtPoweredBy": "Задвижвани от",
   "Common.Views.About.txtTel": "тел.: ",
   "Common.Views.About.txtVersion": "Версия",
+  "Common.Views.AutoCorrectDialog.textDelete": "Изтрий",
+  "Common.Views.AutoCorrectDialog.textRestore": "Възстанови",
   "Common.Views.Chat.textSend": "Изпращам",
   "Common.Views.Comments.textAdd": "Добави",
   "Common.Views.Comments.textAddComment": "Добави коментар ",
@@ -103,10 +109,13 @@
   "Common.Views.Header.tipViewUsers": "Преглеждайте потребителите и управлявайте правата за достъп до документи",
   "Common.Views.Header.txtAccessRights": "Промяна на правата за достъп",
   "Common.Views.Header.txtRename": "Преименувам",
+  "Common.Views.History.textRestore": "Възстанови",
+  "Common.Views.History.textShow": "Разширете",
   "Common.Views.ImageFromUrlDialog.textUrl": "Поставете URL адрес на изображение:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Това поле е задължително",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "Това поле трябва да е URL адрес във формат \"http://www.example.com\"",
   "Common.Views.OpenDialog.closeButtonText": "Затвори файла",
+  "Common.Views.OpenDialog.txtAdvanced": "Допълнително",
   "Common.Views.OpenDialog.txtColon": "Дебело черво",
   "Common.Views.OpenDialog.txtComma": "Запетая",
   "Common.Views.OpenDialog.txtDelimiter": "Разделител",
@@ -194,6 +203,7 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Отвори отново",
   "Common.Views.ReviewPopover.textReply": "Отговор",
   "Common.Views.ReviewPopover.textResolve": "Решение",
+  "Common.Views.ReviewPopover.txtDeleteTip": "Изтрий",
   "Common.Views.SaveAsDlg.textLoading": "Зареждане",
   "Common.Views.SaveAsDlg.textTitle": "Папка за запис",
   "Common.Views.SelectFileDlg.textLoading": "Зареждане",
@@ -221,6 +231,7 @@
   "Common.Views.SignSettingsDialog.textShowDate": "Покажете датата на знака в реда за подпис",
   "Common.Views.SignSettingsDialog.textTitle": "Настройка на подпис",
   "Common.Views.SignSettingsDialog.txtEmpty": "Това поле е задължително",
+  "SSE.Controllers.DataTab.txtExpand": "Разширете",
   "SSE.Controllers.DocumentHolder.alignmentText": "Подравняване",
   "SSE.Controllers.DocumentHolder.centerText": "Център",
   "SSE.Controllers.DocumentHolder.deleteColumnText": "Изтриване на колона",
@@ -477,11 +488,13 @@
   "SSE.Controllers.Main.scriptLoadError": "Връзката е твърде бавна, някои от компонентите не могат да бъдат заредени. Моля, презаредете страницата.",
   "SSE.Controllers.Main.textAnonymous": "Анонимен",
   "SSE.Controllers.Main.textBuyNow": "Посетете уебсайта",
+  "SSE.Controllers.Main.textChangesSaved": "Всички промени са запазени",
   "SSE.Controllers.Main.textClose": "Затвори",
   "SSE.Controllers.Main.textCloseTip": "Кликнете, за да затворите върха",
   "SSE.Controllers.Main.textConfirm": "Потвърждаване",
   "SSE.Controllers.Main.textContactUs": "Свържете се с продажбите",
   "SSE.Controllers.Main.textCustomLoader": "Моля, имайте предвид, че според условията на лиценза нямате право да сменяте товарача. <br> Моля, свържете се с нашия отдел Продажби, за да получите оферта.",
+  "SSE.Controllers.Main.textGuest": "Гост",
   "SSE.Controllers.Main.textLoadingDocument": "Електронната таблица се зарежда",
   "SSE.Controllers.Main.textNo": "Не",
   "SSE.Controllers.Main.textNoLicenseTitle": "Ограничение за връзка ONLYOFFICE",
@@ -502,6 +515,7 @@
   "SSE.Controllers.Main.txtDiagramTitle": "Заглавие на диаграмата",
   "SSE.Controllers.Main.txtEditingMode": "Задаване на режим на редактиране ...",
   "SSE.Controllers.Main.txtFiguredArrows": "Фигурни стрели",
+  "SSE.Controllers.Main.txtGroup": "Група",
   "SSE.Controllers.Main.txtLines": "Линии",
   "SSE.Controllers.Main.txtMath": "Математик",
   "SSE.Controllers.Main.txtPrintArea": "Печат_зона",
@@ -736,6 +750,7 @@
   "SSE.Controllers.Toolbar.textFontSizeErr": "Въведената стойност е неправилна. <br> Въведете числова стойност между 1 и 409",
   "SSE.Controllers.Toolbar.textFraction": "Фракции",
   "SSE.Controllers.Toolbar.textFunction": "Функция",
+  "SSE.Controllers.Toolbar.textInsert": "Вмъкни",
   "SSE.Controllers.Toolbar.textIntegral": "Интеграли",
   "SSE.Controllers.Toolbar.textLargeOperator": "Големи оператори",
   "SSE.Controllers.Toolbar.textLimitAndLog": "Граници и логаритми",
@@ -1074,6 +1089,7 @@
   "SSE.Controllers.Viewport.textHideFBar": "Скриване на лентата за формули",
   "SSE.Controllers.Viewport.textHideGridlines": "Скриване на решетки",
   "SSE.Controllers.Viewport.textHideHeadings": "Скриване на заглавията",
+  "SSE.Views.AdvancedSeparatorDialog.textTitle": "Разширени настройки",
   "SSE.Views.AutoFilterDialog.btnCustomFilter": "Персонализиран филтър",
   "SSE.Views.AutoFilterDialog.textAddSelection": "Добавяне на текуща селекция за филтриране",
   "SSE.Views.AutoFilterDialog.textEmptyItem": "{Заготовки}",
@@ -1121,6 +1137,7 @@
   "SSE.Views.CellSettings.textBorderColor": "Цвят",
   "SSE.Views.CellSettings.textBorders": "Стил на границите",
   "SSE.Views.CellSettings.textOrientation": "Ориентация на текста",
+  "SSE.Views.CellSettings.textPosition": "Позиция",
   "SSE.Views.CellSettings.textSelectBorders": "Изберете граници, които искате да промените, като използвате избрания по-горе стил",
   "SSE.Views.CellSettings.tipAll": "Задайте външната граница и всички вътрешни линии",
   "SSE.Views.CellSettings.tipBottom": "Задайте само външната долна граница",
@@ -1270,6 +1287,9 @@
   "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Заглавие на ос",
   "SSE.Views.ChartSettingsDlg.textZero": "Нула",
   "SSE.Views.ChartSettingsDlg.txtEmpty": "Това поле е задължително",
+  "SSE.Views.DataTab.capBtnGroup": "Група",
+  "SSE.Views.DataValidationDialog.textAllow": "Позволява",
+  "SSE.Views.DataValidationDialog.textFormula": "Формула",
   "SSE.Views.DigitalFilterDialog.capAnd": "И",
   "SSE.Views.DigitalFilterDialog.capCondition1": "равно на",
   "SSE.Views.DigitalFilterDialog.capCondition10": "не завършва с",
@@ -1429,6 +1449,8 @@
   "SSE.Views.FileMenu.btnSaveCopyAsCaption": "Запазване на копието като ...",
   "SSE.Views.FileMenu.btnSettingsCaption": "Разширени настройки ...",
   "SSE.Views.FileMenu.btnToEditCaption": "Редактиране на електронна таблица",
+  "SSE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Приложи",
+  "SSE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Добави автор",
   "SSE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Приложение",
   "SSE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Автор",
   "SSE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Промяна на правата за достъп",
@@ -1480,6 +1502,7 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Точка",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Руски",
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "като Windows",
+  "SSE.Views.FileMenuPanels.MainSpellCheckSettings.okButtonText": "Приложи",
   "SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Внимание",
   "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "С парола",
   "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "Защитете електронната таблица",
@@ -1493,6 +1516,16 @@
   "SSE.Views.FileMenuPanels.ProtectDoc.txtView": "Преглед на подписи",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Общ",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Настройки на страницата",
+  "SSE.Views.FormatRulesEditDlg.textAllBorders": "Всички граници",
+  "SSE.Views.FormatRulesEditDlg.textAutomatic": "Автоматичен",
+  "SSE.Views.FormatRulesEditDlg.textFormat": "Формат",
+  "SSE.Views.FormatRulesEditDlg.textFormula": "Формула",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Нов Потребителски Цвят",
+  "SSE.Views.FormatRulesEditDlg.textPosition": "Позиция",
+  "SSE.Views.FormatRulesEditDlg.txtFraction": "Фракция",
+  "SSE.Views.FormatRulesManagerDlg.guestText": "Гост",
+  "SSE.Views.FormatRulesManagerDlg.textDelete": "Изтрий",
+  "SSE.Views.FormatRulesManagerDlg.textFormat": "Формат",
   "SSE.Views.FormatSettingsDialog.textCategory": "Категория",
   "SSE.Views.FormatSettingsDialog.textDecimal": "Десетичен",
   "SSE.Views.FormatSettingsDialog.textFormat": "Формат",
@@ -1525,6 +1558,14 @@
   "SSE.Views.FormulaDialog.textGroupDescription": "Изберете функционална група",
   "SSE.Views.FormulaDialog.textListDescription": "Изберете функция",
   "SSE.Views.FormulaDialog.txtTitle": "Вмъкване на функция",
+  "SSE.Views.FormulaTab.textAutomatic": "Автоматичен",
+  "SSE.Views.FormulaTab.txtAdditional": "Допълнителен",
+  "SSE.Views.FormulaTab.txtFormula": "Функция",
+  "SSE.Views.FormulaWizard.textFunction": "Функция",
+  "SSE.Views.HeaderFooterDialog.textEven": "Дори страница",
+  "SSE.Views.HeaderFooterDialog.textInsert": "Вмъкни",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Нов Потребителски Цвят",
+  "SSE.Views.HeaderFooterDialog.tipFontSize": "Размер на шрифта",
   "SSE.Views.HyperlinkSettingsDialog.strDisplay": "Показ",
   "SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Връзка към",
   "SSE.Views.HyperlinkSettingsDialog.strRange": "Диапазон",
@@ -1667,6 +1708,7 @@
   "SSE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Разстояние между знаците",
   "SSE.Views.ParagraphSettingsAdvanced.textDefault": "Разделът по подразбиране",
   "SSE.Views.ParagraphSettingsAdvanced.textEffects": "Ефекти",
+  "SSE.Views.ParagraphSettingsAdvanced.textExact": "Точно",
   "SSE.Views.ParagraphSettingsAdvanced.textRemove": "Премахване",
   "SSE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Премахнете всички",
   "SSE.Views.ParagraphSettingsAdvanced.textSet": "Посочете",
@@ -1675,6 +1717,8 @@
   "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Позиция на раздела",
   "SSE.Views.ParagraphSettingsAdvanced.textTabRight": "Прав",
   "SSE.Views.ParagraphSettingsAdvanced.textTitle": "Параграф - Разширени настройки",
+  "SSE.Views.ParagraphSettingsAdvanced.txtAutoText": "Автоматичен",
+  "SSE.Views.PivotGroupDialog.textAuto": "Автоматичен",
   "SSE.Views.PivotSettings.textAdvanced": "Показване на разширените настройки",
   "SSE.Views.PivotSettings.textColumns": "Колони",
   "SSE.Views.PivotSettings.textFields": "Изберете полета",
@@ -1759,6 +1803,10 @@
   "SSE.Views.PrintSettings.textShowHeadings": "Показване на заглавията на редове и колони",
   "SSE.Views.PrintSettings.textTitle": "Настройки за печат",
   "SSE.Views.PrintSettings.textTitlePDF": "Настройки на PDF",
+  "SSE.Views.PrintWithPreview.txtPageOrientation": "Ориентация на страницата",
+  "SSE.Views.PrintWithPreview.txtPageSize": "Размер на страницата",
+  "SSE.Views.ProtectRangesDlg.guestText": "Гост",
+  "SSE.Views.ProtectRangesDlg.textDelete": "Изтрий",
   "SSE.Views.RightMenu.txtCellSettings": "Настройки на клетката",
   "SSE.Views.RightMenu.txtChartSettings": "Настройки на диаграмата",
   "SSE.Views.RightMenu.txtImageSettings": "Настройки на изображението",
@@ -1770,6 +1818,8 @@
   "SSE.Views.RightMenu.txtSparklineSettings": "Настройки за спарклайн",
   "SSE.Views.RightMenu.txtTableSettings": "Настройки на таблицата",
   "SSE.Views.RightMenu.txtTextArtSettings": "Настройки за текстово изкуство",
+  "SSE.Views.ScaleDialog.textAuto": "Автоматичен",
+  "SSE.Views.ScaleDialog.textHeight": "Височина",
   "SSE.Views.SetValueDialog.txtMaxText": "Максималната стойност за това поле е {0}",
   "SSE.Views.SetValueDialog.txtMinText": "Минималната стойност за това поле е {0}",
   "SSE.Views.ShapeSettings.strBackground": "Цвят на фона",
@@ -1783,6 +1833,7 @@
   "SSE.Views.ShapeSettings.strTransparency": "Непрозрачност",
   "SSE.Views.ShapeSettings.strType": "Тип",
   "SSE.Views.ShapeSettings.textAdvanced": "Показване на разширените настройки",
+  "SSE.Views.ShapeSettings.textAngle": "Ъгъл",
   "SSE.Views.ShapeSettings.textBorderSizeErr": "Въведената стойност е неправилна. <br> Въведете стойност между 0 pt и 1584 pt.",
   "SSE.Views.ShapeSettings.textColor": "Цветово пълнене",
   "SSE.Views.ShapeSettings.textDirection": "Посока",
@@ -1801,6 +1852,7 @@
   "SSE.Views.ShapeSettings.textNoFill": "Без попълване",
   "SSE.Views.ShapeSettings.textOriginalSize": "Оригинален размер",
   "SSE.Views.ShapeSettings.textPatternFill": "Модел",
+  "SSE.Views.ShapeSettings.textPosition": "Позиция",
   "SSE.Views.ShapeSettings.textRadial": "Радиален",
   "SSE.Views.ShapeSettings.textRotate90": "Завъртане на 90 °",
   "SSE.Views.ShapeSettings.textRotation": "Завъртане",
@@ -1872,6 +1924,16 @@
   "SSE.Views.SignatureSettings.txtRequestedSignatures": "Тази електронна таблица трябва да бъде подписана.",
   "SSE.Views.SignatureSettings.txtSigned": "В електронната таблица са добавени валидни подписи. Електронната таблица е защитена от редактиране.",
   "SSE.Views.SignatureSettings.txtSignedInvalid": "Някои от цифровите подписи в електронната таблица са невалидни или не можаха да бъдат потвърдени. Електронната таблица е защитена от редактиране.",
+  "SSE.Views.SlicerSettings.textAsc": "Възходящ",
+  "SSE.Views.SlicerSettings.textHeight": "Височина",
+  "SSE.Views.SlicerSettings.textPosition": "Позиция",
+  "SSE.Views.SlicerSettingsAdvanced.strHeight": "Височина",
+  "SSE.Views.SlicerSettingsAdvanced.textAsc": "Възходящ",
+  "SSE.Views.SortDialog.textAsc": "Възходящ",
+  "SSE.Views.SortDialog.textAuto": "Автоматичен",
+  "SSE.Views.SortDialog.textFontColor": "Цвят на шрифта",
+  "SSE.Views.SpecialPasteDialog.textFormats": "Формати",
+  "SSE.Views.SpecialPasteDialog.textFormulas": "Формули",
   "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Копиране до края)",
   "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Преместване в края)",
   "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Копиране преди лист",
@@ -1961,6 +2023,7 @@
   "SSE.Views.TextArtSettings.strStroke": "Удар",
   "SSE.Views.TextArtSettings.strTransparency": "Непрозрачност",
   "SSE.Views.TextArtSettings.strType": "Тип",
+  "SSE.Views.TextArtSettings.textAngle": "Ъгъл",
   "SSE.Views.TextArtSettings.textBorderSizeErr": "Въведената стойност е неправилна. <br> Въведете стойност между 0 pt и 1584 pt.",
   "SSE.Views.TextArtSettings.textColor": "Цветово пълнене",
   "SSE.Views.TextArtSettings.textDirection": "Посока",
@@ -1973,6 +2036,7 @@
   "SSE.Views.TextArtSettings.textLinear": "Линеен",
   "SSE.Views.TextArtSettings.textNoFill": "Без попълване",
   "SSE.Views.TextArtSettings.textPatternFill": "Модел",
+  "SSE.Views.TextArtSettings.textPosition": "Позиция",
   "SSE.Views.TextArtSettings.textRadial": "Радиален",
   "SSE.Views.TextArtSettings.textSelectTexture": "Изберете",
   "SSE.Views.TextArtSettings.textStretch": "Разтягане",
@@ -1993,6 +2057,7 @@
   "SSE.Views.TextArtSettings.txtNoBorders": "Няма линия",
   "SSE.Views.TextArtSettings.txtPapyrus": "Папирус",
   "SSE.Views.TextArtSettings.txtWood": "Дърво",
+  "SSE.Views.Toolbar.capBtnAddComment": "Добави коментар",
   "SSE.Views.Toolbar.capBtnComment": "Коментар",
   "SSE.Views.Toolbar.capBtnMargins": "Полета",
   "SSE.Views.Toolbar.capBtnPageOrient": "Ориентация",
@@ -2021,6 +2086,8 @@
   "SSE.Views.Toolbar.textAlignRight": "Подравняване надясно",
   "SSE.Views.Toolbar.textAlignTop": "Подравняване отгоре",
   "SSE.Views.Toolbar.textAllBorders": "Всички граници",
+  "SSE.Views.Toolbar.textAuto": "Автоматичен",
+  "SSE.Views.Toolbar.textAutoColor": "Автоматичен",
   "SSE.Views.Toolbar.textBold": "Получер",
   "SSE.Views.Toolbar.textBordersColor": "Цвят на границата",
   "SSE.Views.Toolbar.textBordersStyle": "Стил на границата",
@@ -2036,6 +2103,7 @@
   "SSE.Views.Toolbar.textDiagUpBorder": "Диагонална граница нагоре",
   "SSE.Views.Toolbar.textEntireCol": "Цяла колона",
   "SSE.Views.Toolbar.textEntireRow": "Цял ред",
+  "SSE.Views.Toolbar.textHeight": "Височина",
   "SSE.Views.Toolbar.textHorizontal": "Хоризонтален текст",
   "SSE.Views.Toolbar.textInsDown": "Преместете клетките надолу",
   "SSE.Views.Toolbar.textInsideBorders": "Вътрешни граници",
@@ -2068,6 +2136,7 @@
   "SSE.Views.Toolbar.textSuperscript": "Горен индекс",
   "SSE.Views.Toolbar.textTabCollaboration": "Сътрудничество",
   "SSE.Views.Toolbar.textTabFile": "досие",
+  "SSE.Views.Toolbar.textTabFormula": "Формула",
   "SSE.Views.Toolbar.textTabHome": "У дома",
   "SSE.Views.Toolbar.textTabInsert": "Вмъкни",
   "SSE.Views.Toolbar.textTabLayout": "Оформление",
@@ -2206,5 +2275,8 @@
   "SSE.Views.Top10FilterDialog.txtItems": "Вещ",
   "SSE.Views.Top10FilterDialog.txtPercent": "На сто",
   "SSE.Views.Top10FilterDialog.txtTitle": "Топ 10 на автофилтъра",
-  "SSE.Views.Top10FilterDialog.txtTop": "Отгоре"
+  "SSE.Views.Top10FilterDialog.txtTop": "Отгоре",
+  "SSE.Views.ViewManagerDlg.guestText": "Гост",
+  "SSE.Views.ViewManagerDlg.textDelete": "Изтрий",
+  "SSE.Views.ViewTab.textGridlines": "Мрежови линии"
 }

apps/spreadsheeteditor/main/locale/ca.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crea una còpia",
   "Common.Translation.warnFileLockedBtnView": "Obre per a la seva visualització",
   "Common.UI.ButtonColored.textAutoColor": "Automàtic",
-  "Common.UI.ButtonColored.textNewColor": "Afegeix un color personalitzat nou ",
+  "Common.UI.ButtonColored.textNewColor": "Color personalitzat nou ",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sense vores",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sense vores",
   "Common.UI.ComboDataView.emptyComboText": "Sense estils",
@@ -2219,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Mínim",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Punt mínim",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Negatiu",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Afegeix un color personalitzat nou ",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Color personalitzat nou ",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Sense vores",
   "SSE.Views.FormatRulesEditDlg.textNone": "Cap",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Un o més dels valors especificats no són un percentatge vàlid.",
@@ -2388,7 +2388,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Cursiva",
   "SSE.Views.HeaderFooterDialog.textLeft": "Esquerra",
   "SSE.Views.HeaderFooterDialog.textMaxError": "La cadena de text que heu introduït és massa llarga. Redueix el nombre de caràcters utilitzats.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Afegeix un color personalitzat nou ",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Color personalitzat nou ",
   "SSE.Views.HeaderFooterDialog.textOdd": "Pàgina senar",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Recompte de pàgines",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Número de pàgina",
@@ -3162,7 +3162,7 @@
   "SSE.Views.Statusbar.textCount": "Recompte",
   "SSE.Views.Statusbar.textMax": "Màx",
   "SSE.Views.Statusbar.textMin": "Mín",
-  "SSE.Views.Statusbar.textNewColor": "Afegeix un color personalitzat nou ",
+  "SSE.Views.Statusbar.textNewColor": "Color personalitzat nou ",
   "SSE.Views.Statusbar.textNoColor": "Cap color",
   "SSE.Views.Statusbar.textSum": "Suma",
   "SSE.Views.Statusbar.tipAddTab": "Afegeix un full de càlcul",
@@ -3349,7 +3349,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Vores interiors horitzontals",
   "SSE.Views.Toolbar.textMoreFormats": "Més formats",
   "SSE.Views.Toolbar.textMorePages": "Més pàgines",
-  "SSE.Views.Toolbar.textNewColor": "Afegeix un color personalitzat nou ",
+  "SSE.Views.Toolbar.textNewColor": "Color personalitzat nou ",
   "SSE.Views.Toolbar.textNewRule": "Crea una norma",
   "SSE.Views.Toolbar.textNoBorders": "Sense vores",
   "SSE.Views.Toolbar.textOnePage": "pàgina",

apps/spreadsheeteditor/main/locale/da.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Opret en kopi",
   "Common.Translation.warnFileLockedBtnView": "Åben for visning",
   "Common.UI.ButtonColored.textAutoColor": "Automatisk",
-  "Common.UI.ButtonColored.textNewColor": "Tilføj ny brugerdefineret farve",
+  "Common.UI.ButtonColored.textNewColor": "Brugerdefineret farve",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ingen rammer",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ingen rammer",
   "Common.UI.ComboDataView.emptyComboText": "Ingen stilarter",
@@ -2193,7 +2193,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Minimum",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Minpunkt",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Negativ",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Tilføj ny brugerdefineret farve",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Brugerdefineret farve",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Ingen rammer",
   "SSE.Views.FormatRulesEditDlg.textNone": "ingen",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "En eller flere af de angivne værdier er ikke en gyldig procentdel.",
@@ -2361,7 +2361,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Kursiv",
   "SSE.Views.HeaderFooterDialog.textLeft": "Venstre",
   "SSE.Views.HeaderFooterDialog.textMaxError": "Den indtastede tekststreng er for lang. Reducer antallet af anvendte tegn.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Tilføj ny brugerdefineret farve",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Brugerdefineret farve",
   "SSE.Views.HeaderFooterDialog.textOdd": "Ulige side",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Side antal",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Sidetal",
@@ -3092,7 +3092,7 @@
   "SSE.Views.Statusbar.textCount": "Tæl",
   "SSE.Views.Statusbar.textMax": "Max",
   "SSE.Views.Statusbar.textMin": "Min",
-  "SSE.Views.Statusbar.textNewColor": "Tilføj ny brugerdefineret farve",
+  "SSE.Views.Statusbar.textNewColor": "Brugerdefineret farve",
   "SSE.Views.Statusbar.textNoColor": "Ingen farve",
   "SSE.Views.Statusbar.textSum": "SUM",
   "SSE.Views.Statusbar.tipAddTab": "Tilføj regneark",
@@ -3278,7 +3278,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Indsæt vandrette rammer",
   "SSE.Views.Toolbar.textMoreFormats": "Flere formatter",
   "SSE.Views.Toolbar.textMorePages": "Flere sider",
-  "SSE.Views.Toolbar.textNewColor": "Tilføj ny brugerdefineret farve",
+  "SSE.Views.Toolbar.textNewColor": "Brugerdefineret farve",
   "SSE.Views.Toolbar.textNewRule": "Ny regel",
   "SSE.Views.Toolbar.textNoBorders": "Ingen rammer",
   "SSE.Views.Toolbar.textOnePage": "Side",

apps/spreadsheeteditor/main/locale/de.json

@@ -2219,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Minimum",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Minimaler Wert",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Negativ",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Benutzerdefinierte Farbe",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Keine Rahmen",
   "SSE.Views.FormatRulesEditDlg.textNone": "Kein(e)",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Mindestens einer der angegebenen Werte ist kein gültiger Prozentwert.",

apps/spreadsheeteditor/main/locale/el.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου",
   "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή",
   "Common.UI.ButtonColored.textAutoColor": "Αυτόματα",
-  "Common.UI.ButtonColored.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "Common.UI.ButtonColored.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "Common.UI.ComboBorderSize.txtNoBorders": "Χωρίς περιγράμματα",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Χωρίς περιγράμματα",
   "Common.UI.ComboDataView.emptyComboText": "Χωρίς τεχνοτροπίες",
@@ -2219,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Ελάχιστο",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Ελάχιστο σημείο",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Αρνητική",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Χωρίς Περιγράμματα",
   "SSE.Views.FormatRulesEditDlg.textNone": "Κανένα",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Μία ή περισσότερες από τις καθορισμένες τιμές δεν είναι έγκυρο ποσοστό.",
@@ -2388,7 +2388,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Πλάγια",
   "SSE.Views.HeaderFooterDialog.textLeft": "Αριστερά",
   "SSE.Views.HeaderFooterDialog.textMaxError": "Η συμβολοσειρά που εισαγάγατε είναι πολύ μεγάλη. Μειώστε τον αριθμό των χαρακτήρων.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "SSE.Views.HeaderFooterDialog.textOdd": "Μονή σελίδα",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Αρίθμηση σελίδων",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Αριθμός σελίδας",
@@ -3162,7 +3162,7 @@
   "SSE.Views.Statusbar.textCount": "Μέτρηση",
   "SSE.Views.Statusbar.textMax": "Μέγιστο",
   "SSE.Views.Statusbar.textMin": "Ελάχιστο",
-  "SSE.Views.Statusbar.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "SSE.Views.Statusbar.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "SSE.Views.Statusbar.textNoColor": "Χωρίς Χρώμα",
   "SSE.Views.Statusbar.textSum": "Άθροισμα",
   "SSE.Views.Statusbar.tipAddTab": "Προσθήκη φύλλου εργασίας",
@@ -3349,7 +3349,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Εσωτερικά Οριζόντια Περιγράμματα",
   "SSE.Views.Toolbar.textMoreFormats": "Περισσότερες μορφές",
   "SSE.Views.Toolbar.textMorePages": "Περισσότερες σελίδες",
-  "SSE.Views.Toolbar.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος",
+  "SSE.Views.Toolbar.textNewColor": "Νέου Προσαρμοσμένου Χρώματος",
   "SSE.Views.Toolbar.textNewRule": "Νέος Κανόνας",
   "SSE.Views.Toolbar.textNoBorders": "Χωρίς Περιγράμματα",
   "SSE.Views.Toolbar.textOnePage": "σελίδα",

apps/spreadsheeteditor/main/locale/es.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Agregar nuevo color personalizado",
+  "Common.UI.ButtonColored.textNewColor": "Color personalizado",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sin bordes",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sin bordes",
   "Common.UI.ComboDataView.emptyComboText": "Sin estilo",
@@ -2219,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Mínimo",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Punto mínimo",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Negativo",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Agregar nuevo color personalizado",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Color personalizado",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Sin bordes",
   "SSE.Views.FormatRulesEditDlg.textNone": "Ningún",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Uno o varios valores especificados no son un porcentaje válido.",
@@ -2388,7 +2388,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Cursiva",
   "SSE.Views.HeaderFooterDialog.textLeft": "A la izquierda",
   "SSE.Views.HeaderFooterDialog.textMaxError": "El texto es demasiado largo. Reduzca el número de caracteres usados.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Agregar nuevo color personalizado",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Color personalizado",
   "SSE.Views.HeaderFooterDialog.textOdd": "Página impar",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Número de páginas",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Número de página",
@@ -3162,7 +3162,7 @@
   "SSE.Views.Statusbar.textCount": "Contar",
   "SSE.Views.Statusbar.textMax": "Máx.",
   "SSE.Views.Statusbar.textMin": "Mín.",
-  "SSE.Views.Statusbar.textNewColor": "Agregar nuevo color personalizado",
+  "SSE.Views.Statusbar.textNewColor": "Color personalizado",
   "SSE.Views.Statusbar.textNoColor": "Sin color",
   "SSE.Views.Statusbar.textSum": "Suma",
   "SSE.Views.Statusbar.tipAddTab": "Agregar hoja de cálculo",
@@ -3349,7 +3349,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Bordes horizontales internos",
   "SSE.Views.Toolbar.textMoreFormats": "Otros formatos",
   "SSE.Views.Toolbar.textMorePages": "Más páginas",
-  "SSE.Views.Toolbar.textNewColor": "Agregar nuevo color personalizado",
+  "SSE.Views.Toolbar.textNewColor": "Color personalizado",
   "SSE.Views.Toolbar.textNewRule": "Nueva regla",
   "SSE.Views.Toolbar.textNoBorders": "Sin bordes",
   "SSE.Views.Toolbar.textOnePage": "página",

apps/spreadsheeteditor/main/locale/fi.json

@@ -2,6 +2,7 @@
   "cancelButtonText": "Peruuta",
   "Common.Controllers.Chat.notcriticalErrorTitle": "Varoitus",
   "Common.Controllers.Chat.textEnterMessage": "Syötä viestisi tässä",
+  "Common.UI.ButtonColored.textNewColor": "Lisää uusi mukautettu väri",
   "Common.UI.ComboBorderSize.txtNoBorders": "Ei reunuksia",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ei reunuksia",
   "Common.UI.ComboDataView.emptyComboText": "Ei tyylejä",
@@ -1010,11 +1011,13 @@
   "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "kuten Windows",
   "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Yleistä",
   "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Sivun asetukset",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Lisää uusi mukautettu väri",
   "SSE.Views.FormatSettingsDialog.txtAccounting": "Kirjanpito",
   "SSE.Views.FormulaDialog.sDescription": "Kuvaus",
   "SSE.Views.FormulaDialog.textGroupDescription": "Valitse funktioryhmä",
   "SSE.Views.FormulaDialog.textListDescription": "Valitse funktio",
   "SSE.Views.FormulaDialog.txtTitle": "Lisää funktio",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Lisää uusi mukautettu väri",
   "SSE.Views.HyperlinkSettingsDialog.strDisplay": "Näyttö",
   "SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Linkitä:",
   "SSE.Views.HyperlinkSettingsDialog.strRange": "Tietoalue",

apps/spreadsheeteditor/main/locale/fr.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Créer une copie",
   "Common.Translation.warnFileLockedBtnView": "Ouvrir pour visualisation",
   "Common.UI.ButtonColored.textAutoColor": "Automatique",
-  "Common.UI.ButtonColored.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "Common.UI.ButtonColored.textNewColor": "Couleur personnalisée",
   "Common.UI.ComboBorderSize.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Pas de bordures",
   "Common.UI.ComboDataView.emptyComboText": "Aucun style",
@@ -218,7 +218,7 @@
   "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier",
   "Common.Views.Header.textCompactView": "Masquer la barre d'outils",
   "Common.Views.Header.textHideLines": "Masquer les règles",
-  "Common.Views.Header.textHideStatusBar": "Combiner la feuille et les barres d'état",
+  "Common.Views.Header.textHideStatusBar": "Combiner la barre de la feuille et la barre d'état",
   "Common.Views.Header.textRemoveFavorite": "Enlever des favoris",
   "Common.Views.Header.textSaveBegin": "Enregistrement en cours...",
   "Common.Views.Header.textSaveChanged": "Modifié",
@@ -1920,6 +1920,14 @@
   "SSE.Views.DocumentHolder.textUndo": "Annuler",
   "SSE.Views.DocumentHolder.textUnFreezePanes": "Libérer les volets",
   "SSE.Views.DocumentHolder.textVar": "Var",
+  "SSE.Views.DocumentHolder.tipMarkersArrow": "Puces fléchées",
+  "SSE.Views.DocumentHolder.tipMarkersCheckmark": "Puces coches",
+  "SSE.Views.DocumentHolder.tipMarkersDash": "Tirets",
+  "SSE.Views.DocumentHolder.tipMarkersFRhombus": "Losanges remplis",
+  "SSE.Views.DocumentHolder.tipMarkersFRound": "Puces arrondies remplies",
+  "SSE.Views.DocumentHolder.tipMarkersFSquare": "Puces carrées remplies",
+  "SSE.Views.DocumentHolder.tipMarkersHRound": "Puces rondes vides",
+  "SSE.Views.DocumentHolder.tipMarkersStar": "Puces en étoile",
   "SSE.Views.DocumentHolder.topCellText": "Aligner en haut",
   "SSE.Views.DocumentHolder.txtAccounting": "Comptabilité",
   "SSE.Views.DocumentHolder.txtAddComment": "Ajouter un commentaire",
@@ -2018,7 +2026,7 @@
   "SSE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu",
   "SSE.Views.FileMenu.btnCreateNewCaption": "Nouveau classeur",
   "SSE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...",
-  "SSE.Views.FileMenu.btnExitCaption": "Quitter",
+  "SSE.Views.FileMenu.btnExitCaption": "Fermer",
   "SSE.Views.FileMenu.btnFileOpenCaption": "Ouvrir...",
   "SSE.Views.FileMenu.btnHelpCaption": "Aide...",
   "SSE.Views.FileMenu.btnHistoryCaption": "Historique des versions",
@@ -2211,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Minimum",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Valeur minimum",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Négatif",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Ajouter une nouvelle couleur personnalisée",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Couleur personnalisée",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Pas de bordures",
   "SSE.Views.FormatRulesEditDlg.textNone": "Rien",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Une ou plusieurs valeurs spécifiées ne correspondent pas à un pourcentage valide.",
@@ -2773,7 +2781,7 @@
   "SSE.Views.PrintWithPreview.txtPrintGrid": "Imprimer le quadrillage",
   "SSE.Views.PrintWithPreview.txtPrintHeadings": "Imprimer les titres des lignes et des colonnes",
   "SSE.Views.PrintWithPreview.txtPrintRange": "Zone d'impression",
-  "SSE.Views.PrintWithPreview.txtPrintTitles": "Imprimer les titres",
+  "SSE.Views.PrintWithPreview.txtPrintTitles": "Titres à imprimer",
   "SSE.Views.PrintWithPreview.txtRepeat": "Répéter...",
   "SSE.Views.PrintWithPreview.txtRepeatColumnsAtLeft": "Répéter les colonnes à gauche",
   "SSE.Views.PrintWithPreview.txtRepeatRowsAtTop": "Répéter les lignes en haut",
@@ -3577,7 +3585,7 @@
   "SSE.Views.ViewTab.capBtnSheetView": "Afficher une feuille",
   "SSE.Views.ViewTab.textAlwaysShowToolbar": "Toujours afficher la barre d'outils",
   "SSE.Views.ViewTab.textClose": "Fermer",
-  "SSE.Views.ViewTab.textCombineSheetAndStatusBars": "Combiner les barres des feuilles et d'état",
+  "SSE.Views.ViewTab.textCombineSheetAndStatusBars": "Combiner la barre de la feuille et la barre d'état",
   "SSE.Views.ViewTab.textCreate": "Nouveau",
   "SSE.Views.ViewTab.textDefault": "Par défaut",
   "SSE.Views.ViewTab.textFormula": "Barre de formule",

apps/spreadsheeteditor/main/locale/gl.json

@@ -104,7 +104,7 @@
   "Common.Translation.warnFileLockedBtnEdit": "Crear unha copia",
   "Common.Translation.warnFileLockedBtnView": "Abrir para visualizar",
   "Common.UI.ButtonColored.textAutoColor": "Automático",
-  "Common.UI.ButtonColored.textNewColor": "Engadir nova cor personalizada",
+  "Common.UI.ButtonColored.textNewColor": "Nova cor personalizada",
   "Common.UI.ComboBorderSize.txtNoBorders": "Sen bordos",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Sen bordos",
   "Common.UI.ComboDataView.emptyComboText": "Sen estilo",
@@ -2219,7 +2219,7 @@
   "SSE.Views.FormatRulesEditDlg.textMinimum": "Mínimo",
   "SSE.Views.FormatRulesEditDlg.textMinpoint": "Punto mínimo",
   "SSE.Views.FormatRulesEditDlg.textNegative": "Negativo",
-  "SSE.Views.FormatRulesEditDlg.textNewColor": "Engadir nova cor personalizada",
+  "SSE.Views.FormatRulesEditDlg.textNewColor": "Nova cor personalizada",
   "SSE.Views.FormatRulesEditDlg.textNoBorders": "Sen bordos",
   "SSE.Views.FormatRulesEditDlg.textNone": "Ningún",
   "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Un ou máis dos valores especificados non é unha porcentaxe válida.",
@@ -2388,7 +2388,7 @@
   "SSE.Views.HeaderFooterDialog.textItalic": "Cursiva",
   "SSE.Views.HeaderFooterDialog.textLeft": "Esquerda",
   "SSE.Views.HeaderFooterDialog.textMaxError": "O texto é demasiado longo. Reduza o número de caracteres usados.",
-  "SSE.Views.HeaderFooterDialog.textNewColor": "Engadir nova cor personalizada",
+  "SSE.Views.HeaderFooterDialog.textNewColor": "Nova cor personalizada",
   "SSE.Views.HeaderFooterDialog.textOdd": "Páxina impar",
   "SSE.Views.HeaderFooterDialog.textPageCount": "Número de páxinas",
   "SSE.Views.HeaderFooterDialog.textPageNum": "Número da páxina",
@@ -3162,7 +3162,7 @@
   "SSE.Views.Statusbar.textCount": "Contar",
   "SSE.Views.Statusbar.textMax": "Máx",
   "SSE.Views.Statusbar.textMin": "Mín.",
-  "SSE.Views.Statusbar.textNewColor": "Engadir nova cor personalizada",
+  "SSE.Views.Statusbar.textNewColor": "Nova cor personalizada",
   "SSE.Views.Statusbar.textNoColor": "Sen cor",
   "SSE.Views.Statusbar.textSum": "Suma",
   "SSE.Views.Statusbar.tipAddTab": "Engadir folla de cálculo",
@@ -3349,7 +3349,7 @@
   "SSE.Views.Toolbar.textMiddleBorders": "Bordos horizontais interiores",
   "SSE.Views.Toolbar.textMoreFormats": "Outros formatos",
   "SSE.Views.Toolbar.textMorePages": "Máis páxinas",
-  "SSE.Views.Toolbar.textNewColor": "Engadir nova cor personalizada",
+  "SSE.Views.Toolbar.textNewColor": "Nova cor personalizada",
   "SSE.Views.Toolbar.textNewRule": "Nova regra",
   "SSE.Views.Toolbar.textNoBorders": "Sen bordos",
   "SSE.Views.Toolbar.textOnePage": "páxina",