After merge

apps/api/documents/api.js

@@ -932,14 +932,17 @@
                 if (config.editorConfig.customization.loaderName !== 'none') params += "&customer=" + encodeURIComponent(config.editorConfig.customization.loaderName);
             } else
                 params += "&customer={{APP_CUSTOMER_NAME}}";
-            if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
+            if (typeof(config.editorConfig.customization) == 'object') {
-                if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
+                if ( config.editorConfig.customization.loaderLogo && config.editorConfig.customization.loaderLogo !== '') {
-            } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
+                    params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
-                if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
+                }
-                    params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
+                if ( config.editorConfig.customization.logo ) {
-                else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
+                    if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
-                    config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image));
+                        params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
-                    config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark));
+                    else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
+                        config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image));
+                        config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark));
+                    }
                 }
             }
         }
@@ -959,8 +962,6 @@
 
         if (config.editorConfig && config.editorConfig.customization && (config.editorConfig.customization.toolbar===false))
             params += "&toolbar=false";
-        else if (config.document && config.document.permissions && (config.document.permissions.edit === false && config.document.permissions.fillForms ))
-            params += "&toolbar=true";
 
         if (config.parentOrigin)
             params += "&parentOrigin=" + config.parentOrigin;

apps/common/forms/resources/less/common.less

@@ -80,6 +80,7 @@
 @import "../../../../common/main/resources/less/spinner.less";
 @import "../../../../common/main/resources/less/checkbox.less";
 @import "../../../../common/main/resources/less/opendialog.less";
+@import "../../../../common/main/resources/less/advanced-settings-window.less";
 
 @toolbarBorderColor:            @border-toolbar-ie;
 @toolbarBorderColor:            @border-toolbar;

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

@@ -416,6 +416,9 @@ define([
                     if (forceFill || !me.fieldPicker.store.findWhere({'id': record.get('id')})){
                         if (me.itemMarginLeft===undefined) {
                             var div = $($(this.menuPicker.el).find('.inner > div:not(.grouped-data):not(.ps-scrollbar-x-rail):not(.ps-scrollbar-y-rail)')[0]);
+                            if (!div || div.length<1) { // try to find items in groups
+                                div = $($(this.menuPicker.el).find('.inner .group-items-container > div:not(.grouped-data):not(.ps-scrollbar-x-rail):not(.ps-scrollbar-y-rail)')[0]);
+                            }
                             if (div.length > 0) {
                                 me.itemMarginLeft  = parseInt(div.css('margin-left'));
                                 me.itemMarginRight = parseInt(div.css('margin-right'));

apps/common/main/lib/controller/HintManager.js

@@ -492,7 +492,9 @@ Common.UI.HintManager = new(function() {
                         match = false;
                     var keyCode = e.keyCode;
                     if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) {
-                        curLetter = _lang === 'en' ? ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) : e.key;
+                        curLetter = _lang === 'en' ?
+                            ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) :
+                            (/[.*+?^${}()|[\]\\]/g.test(e.key) ? null : e.key);
                     }
                     if (curLetter) {
                         var curr;
@@ -592,7 +594,7 @@ Common.UI.HintManager = new(function() {
                 }
             }
 
-            _needShow = (e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0);
+            _needShow = (!e.shiftKey && e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0);
             if (e.altKey && e.keyCode !== 115) {
                 e.preventDefault();
             }

apps/common/main/lib/controller/Plugins.js

@@ -39,7 +39,8 @@
 define([
     'core',
     'common/main/lib/collection/Plugins',
-    'common/main/lib/view/Plugins'
+    'common/main/lib/view/Plugins',
+    'common/main/lib/view/PluginDlg'
 ], function () {
     'use strict';
 

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

@@ -760,10 +760,10 @@ define(function(){ 'use strict';
             textObjectCenter: 'Object Center',
             textSlideCenter: 'Slide Center',
             textInFromScreenCenter: 'In From Screen Center',
-            textInToScreenCenter: 'In To Screen Center',
-            textInSlightly: 'In Slightly',
             textOutFromScreenBottom: 'Out From Screen Bottom',
-            textToFromScreenBottom: 'Out To Screen Bottom',
+            textInSlightly: 'In Slightly',
+            textInToScreenBottom: 'In To Screen Bottom',
+            textOutToScreenCenter: 'Out To Screen Center',
             textOutSlightly: 'Out Slightly',
             textToBottom: 'To Bottom',
             textToBottomLeft: 'To Bottom-Left',
@@ -809,10 +809,10 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_APPEAR,                   iconCls: 'animation-entrance-appear',               displayValue: this.textAppear},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FADE,                     iconCls: 'animation-entrance-fade',                 displayValue: this.textFade},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLY_IN_FROM,              iconCls: 'animation-entrance-fly_in',               displayValue: this.textFlyIn},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLOAT,                    iconCls: 'animation-entrance-float_in',             displayValue: this.textFloatIn},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_FLOAT_UP,                 iconCls: 'animation-entrance-float_in',             displayValue: this.textFloatIn,     familyEffect: 'entrfloat'},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_SPLIT,                    iconCls: 'animation-entrance-split',                displayValue: this.textSplit},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WIPE_FROM,                iconCls: 'animation-entrance-wipe',                 displayValue: this.textWipe},
-                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_BOX,                      iconCls: 'animation-entrance-shape',                displayValue: this.textShape,       familyEffect: 'entrshape'},
+                    {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_CIRCLE,                   iconCls: 'animation-entrance-shape',                displayValue: this.textShape,       familyEffect: 'entrshape'},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_WHEEL,                    iconCls: 'animation-entrance-wheel',                displayValue: this.textWheel},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_RANDOM_BARS,              iconCls: 'animation-entrance-random_bars',          displayValue: this.textRandomBars},
                     {group: 'menu-effect-group-entrance',   value: AscFormat.ENTRANCE_GROW_AND_TURN,            iconCls: 'animation-entrance-grow_turn',            displayValue: this.textGrowTurn},
@@ -835,15 +835,15 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_DISAPPEAR,                    iconCls: 'animation-exit-disappear',                displayValue: this.textDisappear},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FADE,                         iconCls: 'animation-exit-fade',                     displayValue: this.textFade},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLY_OUT_TO,                   iconCls: 'animation-exit-fly_out',                  displayValue: this.textFlyOut},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLOAT,                        iconCls: 'animation-exit-float_out',                displayValue: this.textFloatOut},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_FLOAT_DOWN,                   iconCls: 'animation-exit-float_out',                displayValue: this.textFloatOut,    familyEffect: 'exitfloat'},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SPLIT,                        iconCls: 'animation-exit-split',                    displayValue: this.textSplit},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WIPE_FROM,                    iconCls: 'animation-exit-wipe',                     displayValue: this.textWipe},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_BOX,                          iconCls: 'animation-exit-shape',                    displayValue: this.textShape,       familyEffect: 'shape'},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_CIRCLE,                       iconCls: 'animation-exit-shape',                    displayValue: this.textShape,       familyEffect: 'shape'},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_WHEEL,                        iconCls: 'animation-exit-wheel',                    displayValue: this.textWheel},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_RANDOM_BARS,                  iconCls: 'animation-exit-random_bars',              displayValue: this.textRandomBars},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SHRINK_AND_TURN,              iconCls: 'animation-exit-shrink_turn',              displayValue: this.textShrinkTurn},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_ZOOM,                         iconCls: 'animation-exit-zoom',                     displayValue: this.textZoom},
-                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_BASIC_SWIVEL,                 iconCls: 'animation-exit-swivel',                   displayValue: this.textSwivel},
+                    {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_SWIVEL,                       iconCls: 'animation-exit-swivel',                   displayValue: this.textSwivel},
                     {group: 'menu-effect-group-exit',       value: AscFormat.EXIT_BOUNCE,                       iconCls: 'animation-exit-bounce',                   displayValue: this.textBounce},
                     {group: 'menu-effect-group-path',       value: AscFormat.MOTION_DOWN,                       iconCls: 'animation-motion_paths-lines',            displayValue: this.textLines,       familyEffect: 'pathlines'},
                     {group: 'menu-effect-group-path',       value: AscFormat.MOTION_ARC_DOWN,                   iconCls: 'animation-motion_paths-arcs',             displayValue: this.textArcs,        familyEffect: 'patharcs'},
@@ -896,8 +896,8 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_BASIC_ZOOM,               displayValue: this.textBasicZoom},
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_REVOLVE,           displayValue: this.textCenterRevolve},
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_CENTER_COMPRESS,          displayValue: this.textCompress},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_DOWN,               displayValue: this.textFloatDown},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_DOWN,               displayValue: this.textFloatDown,           familyEffect: 'entrfloat'},
-                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_UP,                 displayValue: this.textFloatUp},
+                    {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_FLOAT_UP,                 displayValue: this.textFloatUp,             familyEffect: 'entrfloat'},
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_GROW_AND_TURN,            displayValue: this.textGrowTurn},
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_RISE_UP,                  displayValue: this.textRiseUp},
                     {group: 'menu-effect-group-entrance',   level: 'menu-effect-level-moderate',        value: AscFormat.ENTRANCE_SPINNER,                  displayValue: this.textSpinner},
@@ -954,8 +954,8 @@ define(function(){ 'use strict';
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_BASIC_ZOOM,                   displayValue: this.textBasicZoom},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_CENTER_REVOLVE,               displayValue: this.textCenterRevolve},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_COLLAPSE,                     displayValue: this.textCollapse},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_DOWN,                   displayValue: this.textFloatDown},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_DOWN,                   displayValue: this.textFloatDown,    familyEffect: 'exitfloat'},
-                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_UP,                     displayValue: this.textFloatUp},
+                    {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_FLOAT_UP,                     displayValue: this.textFloatUp,      familyEffect: 'exitfloat'},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SHRINK_AND_TURN,              displayValue: this.textShrinkTurn},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SINK_DOWN,                    displayValue: this.textSinkDown},
                     {group: 'menu-effect-group-exit',       level: 'menu-effect-level-moderate',        value: AscFormat.EXIT_SPINNER,                      displayValue: this.textSpinner},
@@ -1043,33 +1043,33 @@ define(function(){ 'use strict';
                         switch (type) {
                             case AscFormat.ENTRANCE_BLINDS:
                                 return [
-                                    {value: AscFormat.ENTRANCE_BLINDS_HORIZONTAL,       caption: this.textHorizontal},
+                                    {value: AscFormat.ENTRANCE_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.ENTRANCE_BLINDS_VERTICAL,         caption: this.textVertical}
                                 ];
                             case AscFormat.ENTRANCE_BOX:
                                 return [
-                                    {value: AscFormat.ENTRANCE_BOX_IN,                  caption: this.textIn},
+                                    {value: AscFormat.ENTRANCE_BOX_IN,                  caption: this.textIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_BOX_OUT,                 caption: this.textOut}
                                 ];
                             case AscFormat.ENTRANCE_CHECKERBOARD:
                                 return [
-                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_ACROSS,     caption: this.textAcross},
+                                    {value: AscFormat.ENTRANCE_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
                                     {value: AscFormat.ENTRANCE_CHECKERBOARD_DOWN,       caption: this.textDown}
                                 ];
                             case AscFormat.ENTRANCE_CIRCLE:
                                 return [
-                                    {value: AscFormat.ENTRANCE_CIRCLE_IN,               caption: this.textIn},
+                                    {value: AscFormat.ENTRANCE_CIRCLE_IN,               caption: this.textIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_CIRCLE_OUT,              caption: this.textOut}
                                 ];
                             case AscFormat.ENTRANCE_DIAMOND:
                                 return [
-                                    {value: AscFormat.ENTRANCE_DIAMOND_IN,              caption: this.textIn},
+                                    {value: AscFormat.ENTRANCE_DIAMOND_IN,              caption: this.textIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_DIAMOND_OUT,             caption: this.textOut}
                                 ];
 
                             case AscFormat.ENTRANCE_FLY_IN_FROM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM,      caption: this.textFromBottom},
+                                    {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM,      caption: this.textFromBottom, defvalue: true},
                                     {value: AscFormat.ENTRANCE_FLY_IN_FROM_BOTTOM_LEFT, caption: this.textFromBottomLeft},
                                     {value: AscFormat.ENTRANCE_FLY_IN_FROM_LEFT,        caption: this.textFromLeft},
                                     {value: AscFormat.ENTRANCE_FLY_IN_FROM_TOP_LEFT,    caption: this.textFromTopLeft},
@@ -1080,38 +1080,38 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.ENTRANCE_PEEK_IN_FROM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_BOTTOM,     caption: this.textFromBottom},
+                                    {value: AscFormat.ENTRANCE_PEEK_IN_FROM_BOTTOM,     caption: this.textFromBottom, defvalue: true},
                                     {value: AscFormat.ENTRANCE_PEEK_IN_FROM_LEFT,       caption: this.textFromLeft},
                                     {value: AscFormat.ENTRANCE_PEEK_IN_FROM_RIGHT,      caption: this.textFromRight},
                                     {value: AscFormat.ENTRANCE_PEEK_IN_FROM_TOP,        caption: this.textFromTop}
                                 ];
                             case AscFormat.ENTRANCE_PLUS:
                                 return [
-                                    {value: AscFormat.ENTRANCE_PLUS_IN,                 caption: this.textIn},
+                                    {value: AscFormat.ENTRANCE_PLUS_IN,                 caption: this.textIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_PLUS_OUT,                caption: this.textOut}
                                 ];
                             case AscFormat.ENTRANCE_RANDOM_BARS:
                                 return [
-                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal},
+                                    {value: AscFormat.ENTRANCE_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.ENTRANCE_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
                                 ];
                             case AscFormat.ENTRANCE_SPLIT:
                                 return [
                                     {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
                                     {value: AscFormat.ENTRANCE_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
-                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn},
+                                    {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
                                 ];
                             case AscFormat.ENTRANCE_STRIPS:
                                 return [
-                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_DOWN,        caption: this.textLeftDown},
+                                    {value: AscFormat.ENTRANCE_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
                                     {value: AscFormat.ENTRANCE_STRIPS_LEFT_UP,          caption: this.textLeftUp},
                                     {value: AscFormat.ENTRANCE_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
                                     {value: AscFormat.ENTRANCE_STRIPS_RIGHT_UP,         caption: this.textRightUp}
                                 ];
                             case AscFormat.ENTRANCE_WHEEL:
                                 return [
-                                    {value: AscFormat.ENTRANCE_WHEEL_1_SPOKE,           caption: this.textSpoke1},
+                                    {value: AscFormat.ENTRANCE_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
                                     {value: AscFormat.ENTRANCE_WHEEL_2_SPOKES,           caption: this.textSpoke2},
                                     {value: AscFormat.ENTRANCE_WHEEL_3_SPOKES,           caption: this.textSpoke3},
                                     {value: AscFormat.ENTRANCE_WHEEL_4_SPOKES,           caption: this.textSpoke4},
@@ -1119,19 +1119,19 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.ENTRANCE_WIPE_FROM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_WIPE_FROM_BOTTOM,        caption: this.textFromBottom},
+                                    {value: AscFormat.ENTRANCE_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
                                     {value: AscFormat.ENTRANCE_WIPE_FROM_LEFT,          caption: this.textFromLeft},
                                     {value: AscFormat.ENTRANCE_WIPE_FROM_RIGHT,         caption: this.textFromRight},
                                     {value: AscFormat.ENTRANCE_WIPE_FROM_TOP,           caption: this.textFromTop}
                                 ];
                             case AscFormat.ENTRANCE_ZOOM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_ZOOM_OBJECT_CENTER,      caption: this.textObjectCenter},
+                                    {value: AscFormat.ENTRANCE_ZOOM_OBJECT_CENTER,      caption: this.textObjectCenter, defvalue: true},
                                     {value: AscFormat.ENTRANCE_ZOOM_SLIDE_CENTER,       caption: this.textSlideCenter}
                                 ];
                             case AscFormat.ENTRANCE_BASIC_ZOOM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN,           caption: this.textIn},
+                                    {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN,           caption: this.textIn, defvalue: true},
                                     {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_FROM_SCREEN_CENTER, caption: this.textInFromScreenCenter},
                                     {value: AscFormat.ENTRANCE_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly},
                                     {value: AscFormat.ENTRANCE_BASIC_ZOOM_OUT,          caption: this.textOut},
@@ -1140,7 +1140,7 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.ENTRANCE_STRETCH:
                                 return [
-                                    {value: AscFormat.ENTRANCE_STRETCH_ACROSS,          caption: this.textAcross},
+                                    {value: AscFormat.ENTRANCE_STRETCH_ACROSS,          caption: this.textAcross, defvalue: true},
                                     {value: AscFormat.ENTRANCE_STRETCH_FROM_BOTTOM,     caption: this.textFromBottom},
                                     {value: AscFormat.ENTRANCE_STRETCH_FROM_LEFT,       caption: this.textFromLeft},
                                     {value: AscFormat.ENTRANCE_STRETCH_FROM_RIGHT,      caption: this.textFromRight},
@@ -1148,7 +1148,7 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.ENTRANCE_BASIC_SWIVEL:
                                 return [
-                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal},
+                                    {value: AscFormat.ENTRANCE_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.ENTRANCE_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
                                 ];
                             default:
@@ -1160,32 +1160,32 @@ define(function(){ 'use strict';
                         switch (type){
                             case AscFormat.EXIT_BLINDS:
                                 return [
-                                    {value: AscFormat.EXIT_BLINDS_HORIZONTAL,       caption: this.textHorizontal},
+                                    {value: AscFormat.EXIT_BLINDS_HORIZONTAL,       caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.EXIT_BLINDS_VERTICAL,         caption: this.textVertical}
                                 ];
                             case AscFormat.EXIT_BOX:
                                 return [
                                     {value: AscFormat.EXIT_BOX_IN,                  caption: this.textIn},
-                                    {value: AscFormat.EXIT_BOX_OUT,                 caption: this.textOut}
+                                    {value: AscFormat.EXIT_BOX_OUT,                 caption: this.textOut, defvalue: true}
                                 ];
                             case AscFormat.EXIT_CHECKERBOARD:
                                 return [
-                                    {value: AscFormat.EXIT_CHECKERBOARD_ACROSS,     caption: this.textAcross},
+                                    {value: AscFormat.EXIT_CHECKERBOARD_ACROSS,     caption: this.textAcross, defvalue: true},
                                     {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textUp}
                                 ];
                             case AscFormat.EXIT_CIRCLE:
                                 return [
                                     {value: AscFormat.EXIT_CIRCLE_IN,               caption: this.textIn},
-                                    {value: AscFormat.EXIT_BOX_OUT,                 caption: this.textOut}
+                                    {value: AscFormat.EXIT_CIRCLE_OUT,              caption: this.textOut, defvalue: true}
                                 ];
                             case AscFormat.EXIT_DIAMOND:
                                 return [
                                     {value: AscFormat.EXIT_DIAMOND_IN,              caption: this.textIn},
-                                    {value: AscFormat.EXIT_DIAMOND_IN,              caption: this.textOut}
+                                    {value: AscFormat.EXIT_DIAMOND_OUT,             caption: this.textOut, defvalue: true}
                                 ];
                             case AscFormat.EXIT_FLY_OUT_TO:
                                 return [
-                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM,       caption: this.textToBottom},
+                                    {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM,       caption: this.textToBottom, defvalue: true},
                                     {value: AscFormat.EXIT_FLY_OUT_TO_BOTTOM_LEFT,  caption: this.textToBottomLeft},
                                     {value: AscFormat.EXIT_FLY_OUT_TO_LEFT,         caption: this.textToLeft},
                                     {value: AscFormat.EXIT_FLY_OUT_TO_TOP_LEFT,     caption: this.textToTopLeft},
@@ -1196,7 +1196,7 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.EXIT_PEEK_OUT_TO:
                                 return [
-                                    {value: AscFormat.EXIT_PEEK_OUT_TO_BOTTOM,      caption: this.textToBottom},
+                                    {value: AscFormat.EXIT_PEEK_OUT_TO_BOTTOM,      caption: this.textToBottom, defvalue: true},
                                     {value: AscFormat.EXIT_PEEK_OUT_TO_LEFT,        caption: this.textToLeft},
                                     {value: AscFormat.EXIT_PEEK_OUT_TO_RIGHT,       caption: this.textToRight},
                                     {value: AscFormat.EXIT_PEEK_OUT_TO_TOP,         caption: this.textToTop}
@@ -1204,30 +1204,30 @@ define(function(){ 'use strict';
                             case AscFormat.EXIT_PLUS:
                                 return [
                                     {value: AscFormat.EXIT_PLUS_IN,                 caption: this.textIn},
-                                    {value: AscFormat.EXIT_PLUS_OUT,                caption: this.textOut}
+                                    {value: AscFormat.EXIT_PLUS_OUT,                caption: this.textOut, defvalue: true}
                                 ];
                             case AscFormat.EXIT_RANDOM_BARS:
                                 return [
-                                    {value: AscFormat.EXIT_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal},
+                                    {value: AscFormat.EXIT_RANDOM_BARS_HORIZONTAL,  caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.EXIT_RANDOM_BARS_VERTICAL,    caption: this.textVertical}
                                 ];
                             case AscFormat.EXIT_SPLIT:
                                 return [
                                     {value: AscFormat.EXIT_SPLIT_HORIZONTAL_IN,     caption: this.textHorizontalIn},
                                     {value: AscFormat.EXIT_SPLIT_HORIZONTAL_OUT,    caption: this.textHorizontalOut},
-                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn},
+                                    {value: AscFormat.EXIT_SPLIT_VERTICAL_IN,       caption: this.textVerticalIn, defvalue: true},
                                     {value: AscFormat.EXIT_SPLIT_VERTICAL_OUT,      caption: this.textVerticalOut}
                                 ];
                             case AscFormat.EXIT_STRIPS:
                                 return [
-                                    {value: AscFormat.EXIT_STRIPS_LEFT_DOWN,        caption: this.textLeftDown},
+                                    {value: AscFormat.EXIT_STRIPS_LEFT_DOWN,        caption: this.textLeftDown, defvalue: true},
                                     {value: AscFormat.EXIT_STRIPS_LEFT_UP,          caption: this.textLeftUp},
                                     {value: AscFormat.EXIT_STRIPS_RIGHT_DOWN,       caption: this.textRightDown},
                                     {value: AscFormat.EXIT_STRIPS_RIGHT_UP,         caption: this.textRightUp}
                                 ];
                             case AscFormat.EXIT_WHEEL:
                                 return [
-                                    {value: AscFormat.EXIT_WHEEL_1_SPOKE,           caption: this.textSpoke1},
+                                    {value: AscFormat.EXIT_WHEEL_1_SPOKE,           caption: this.textSpoke1, defvalue: true},
                                     {value: AscFormat.EXIT_WHEEL_2_SPOKES,           caption: this.textSpoke2},
                                     {value: AscFormat.EXIT_WHEEL_3_SPOKES,           caption: this.textSpoke3},
                                     {value: AscFormat.EXIT_WHEEL_4_SPOKES,           caption: this.textSpoke4},
@@ -1235,28 +1235,28 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.EXIT_WIPE_FROM:
                                 return [
-                                    {value: AscFormat.EXIT_WIPE_FROM_BOTTOM,        caption: this.textFromBottom},
+                                    {value: AscFormat.EXIT_WIPE_FROM_BOTTOM,        caption: this.textFromBottom, defvalue: true},
                                     {value: AscFormat.EXIT_WIPE_FROM_LEFT,          caption: this.textFromLeft},
                                     {value: AscFormat.EXIT_WIPE_FROM_RIGHT,         caption: this.textFromRight},
                                     {value: AscFormat.EXIT_WIPE_FROM_TOP,           caption: this.textFromTop}
                                 ];
                             case AscFormat.EXIT_ZOOM:
                                 return [
-                                    {value: AscFormat.ENTRANCE_ZOOM_OBJECT_CENTER,  caption: this.textObjectCenter},
+                                    {value: AscFormat.EXIT_ZOOM_OBJECT_CENTER,  caption: this.textObjectCenter, defvalue: true},
-                                    {value: AscFormat.ENTRANCE_ZOOM_SLIDE_CENTER,   caption: this.textSlideCenter}
+                                    {value: AscFormat.EXIT_ZOOM_SLIDE_CENTER,   caption: this.textSlideCenter}
                                 ];
                             case AscFormat.EXIT_BASIC_ZOOM:
                                 return [
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT,          caption: this.textOut, defvalue: true},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_TO_SCREEN_CENTER, caption: this.textOutToScreenCenter},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly},
                                     {value: AscFormat.EXIT_BASIC_ZOOM_IN,           caption: this.textIn},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_TO_SCREEN_BOTTOM, caption: this.textInToScreenCenter},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_TO_SCREEN_BOTTOM, caption: this.textInToScreenBottom},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly},
+                                    {value: AscFormat.EXIT_BASIC_ZOOM_IN_SLIGHTLY,  caption: this.textInSlightly}
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT,          caption: this.textOut},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_TO_SCREEN_CENTER, caption: this.textOutToScreenBottom},
-                                    {value: AscFormat.EXIT_BASIC_ZOOM_OUT_SLIGHTLY, caption: this.textOutSlightly}
                                 ];
                             case AscFormat.EXIT_COLLAPSE:
                                 return [
-                                    {value: AscFormat.EXIT_COLLAPSE_ACROSS,         caption: this.textAcross},
+                                    {value: AscFormat.EXIT_COLLAPSE_ACROSS,         caption: this.textAcross, defvalue: true},
                                     {value: AscFormat.EXIT_COLLAPSE_TO_BOTTOM,      caption: this.textToBottom},
                                     {value: AscFormat.EXIT_COLLAPSE_TO_LEFT,        caption: this.textToLeft},
                                     {value: AscFormat.EXIT_COLLAPSE_TO_RIGHT,       caption: this.textToRight},
@@ -1264,7 +1264,7 @@ define(function(){ 'use strict';
                                 ];
                             case AscFormat.EXIT_BASIC_SWIVEL:
                                 return [
-                                    {value: AscFormat.EXIT_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal},
+                                    {value: AscFormat.EXIT_BASIC_SWIVEL_HORIZONTAL, caption: this.textHorizontal, defvalue: true},
                                     {value: AscFormat.EXIT_BASIC_SWIVEL_VERTICAL,   caption: this.textVertical}
                                 ];
                            default:
@@ -1279,17 +1279,17 @@ define(function(){ 'use strict';
                 switch (familyEffect){
                     case 'shape':
                         return [
-                            {value: AscFormat.EXIT_BOX,     caption: this.textBox},
                             {value: AscFormat.EXIT_CIRCLE,  caption: this.textCircle},
-                            {value: AscFormat.EXIT_PLUS,    caption: this.textPlus},
+                            {value: AscFormat.EXIT_BOX,     caption: this.textBox},
-                            {value: AscFormat.EXIT_DIAMOND, caption: this.textDiamond}
+                            {value: AscFormat.EXIT_DIAMOND, caption: this.textDiamond},
+                            {value: AscFormat.EXIT_PLUS,    caption: this.textPlus}
                         ];
                     case 'entrshape':
                         return [
-                            {value: AscFormat.ENTRANCE_BOX,     caption: this.textBox},
                             {value: AscFormat.ENTRANCE_CIRCLE,  caption: this.textCircle},
-                            {value: AscFormat.ENTRANCE_PLUS,    caption: this.textPlus},
+                            {value: AscFormat.ENTRANCE_BOX,     caption: this.textBox},
-                            {value: AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond}
+                            {value: AscFormat.ENTRANCE_DIAMOND, caption: this.textDiamond},
+                            {value: AscFormat.ENTRANCE_PLUS,    caption: this.textPlus}
                         ];
                     case 'pathlines':
                         return[
@@ -1332,6 +1332,16 @@ define(function(){ 'use strict';
                             {value: AscFormat.MOTION_VERTICAL_FIGURE_8,        caption: this.textVerticalFigure},
                             {value: AscFormat.MOTION_LOOP_DE_LOOP,             caption: this.textLoopDeLoop}
                         ];
+                    case 'entrfloat':
+                        return [
+                            {value: AscFormat.ENTRANCE_FLOAT_UP,            caption: this.textFloatUp},
+                            {value: AscFormat.ENTRANCE_FLOAT_DOWN,          caption: this.textFloatDown}
+                        ];
+                    case 'exitfloat':
+                        return [
+                            {value: AscFormat.EXIT_FLOAT_UP,            caption: this.textFloatUp},
+                            {value: AscFormat.EXIT_FLOAT_DOWN,          caption: this.textFloatDown}
+                        ];
                     default:
                         return [];
                 }

apps/common/main/lib/view/About.js

@@ -235,10 +235,10 @@ define([
                         this.lblCompanyLic.parents('tr').addClass('hidden');
 
                     value = Common.UI.Themes.isDarkTheme() ? (customer.logoDark || customer.logo) : (customer.logo || customer.logoDark);
-                    value.length ?
+                    value && value.length ?
                         this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') :
                         this.divCompanyLogo.parents('tr').addClass('hidden');
-                    value.length && Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
+                    value && value.length && Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
                 } else {
                     this.cntLicenseeInfo.addClass('hidden');
                     this.cntLicensorInfo.addClass('margin-bottom');

apps/common/main/lib/view/Header.js

@@ -104,9 +104,11 @@ define([
                                 '</div>' +
                                 '<div class="hedset">' +
                                     '<div class="btn-slot" id="slot-btn-user-name"></div>' +
-                                    '<div class="btn-current-user btn-header hidden">' +
+                                    '<div class="btn-slot">' +
-                                        '<i class="icon toolbar__icon icon--inverse btn-user"></i>' +
+                                        '<div class="btn-current-user btn-header hidden">' +
-                                    '</div>' +
+                                            '<i class="icon toolbar__icon icon--inverse btn-user"></i>' +
+                                        '</div>' +
+                                    '</div>'
                                 '</div>' +
                             '</section>' +
                         '</section>';

apps/common/main/lib/view/PluginDlg.js

@@ -0,0 +1,185 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ * User: Julia.Radzhabova
+ * Date: 17.05.16
+ * Time: 15:38
+ */
+
+if (Common === undefined)
+    var Common = {};
+
+Common.Views = Common.Views || {};
+
+define([
+    'common/main/lib/util/utils',
+    'common/main/lib/component/BaseView',
+    'common/main/lib/component/Layout',
+    'common/main/lib/component/Window'
+], function (template) {
+    'use strict';
+
+    Common.Views.PluginDlg = Common.UI.Window.extend(_.extend({
+        initialize : function(options) {
+            var _options = {};
+            _.extend(_options,  {
+                header: true,
+                enableKeyEvents: false
+            }, options);
+
+            var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
+            if (!_options.header) header_footer -= 34;
+            this.bordersOffset = 40;
+            _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
+            _options.height += header_footer;
+            _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
+            _options.cls += ' advanced-settings-dlg';
+
+            this.template = [
+                '<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
+                '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
+                '</div>',
+                '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
+                '<div class="separator horizontal"></div>',
+                '<% } %>'
+            ].join('');
+
+            _options.tpl = _.template(this.template)(_options);
+
+            this.url = options.url || '';
+            this.frameId = options.frameId || 'plugin_iframe';
+            Common.UI.Window.prototype.initialize.call(this, _options);
+        },
+
+        render: function() {
+            Common.UI.Window.prototype.render.call(this);
+            this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'});
+
+            this.boxEl = this.$window.find('.body > .box');
+            this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
+            if (!this.options.header) this._headerFooterHeight -= 34;
+            this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
+
+            var iframe = document.createElement("iframe");
+            iframe.id           = this.frameId;
+            iframe.name         = 'pluginFrameEditor';
+            iframe.width        = '100%';
+            iframe.height       = '100%';
+            iframe.align        = "top";
+            iframe.frameBorder  = 0;
+            iframe.scrolling    = "no";
+            iframe.allow = "camera; microphone; display-capture";
+            iframe.onload       = _.bind(this._onLoad,this);
+
+            var me = this;
+            setTimeout(function(){
+                if (me.isLoaded) return;
+                me.loadMask = new Common.UI.LoadMask({owner: $('#id-plugin-placeholder')});
+                me.loadMask.setTitle(me.textLoading);
+                me.loadMask.show();
+                if (me.isLoaded) me.loadMask.hide();
+            }, 500);
+
+            iframe.src = this.url;
+            $('#id-plugin-placeholder').append(iframe);
+
+            this.on('resizing', function(args){
+                me.boxEl.css('height', parseInt(me.$window.css('height')) - me._headerFooterHeight);
+            });
+
+            var onMainWindowResize = function(){
+                me.onWindowResize();
+            };
+            $(window).on('resize', onMainWindowResize);
+            this.on('close', function() {
+                $(window).off('resize', onMainWindowResize);
+            });
+        },
+
+        _onLoad: function() {
+            this.isLoaded = true;
+            if (this.loadMask)
+                this.loadMask.hide();
+        },
+
+        setInnerSize: function(width, height) {
+            var maxHeight = Common.Utils.innerHeight(),
+                maxWidth = Common.Utils.innerWidth(),
+                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
+                bordersOffset = this.bordersOffset*2;
+            if (maxHeight - bordersOffset<height + this._headerFooterHeight)
+                height = maxHeight - bordersOffset - this._headerFooterHeight;
+            if (maxWidth - bordersOffset<width + borders_width)
+                width = maxWidth - bordersOffset - borders_width;
+
+            this.boxEl.css('height', height);
+
+            Common.UI.Window.prototype.setHeight.call(this, height + this._headerFooterHeight);
+            Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
+
+            this.$window.css('left',(maxWidth - width - borders_width) / 2);
+            this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
+        },
+
+        onWindowResize: function() {
+            var main_width  = Common.Utils.innerWidth(),
+                main_height = Common.Utils.innerHeight(),
+                win_width = this.getWidth(),
+                win_height = this.getHeight(),
+                bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
+            if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
+                var left = this.getLeft(),
+                    top = this.getTop();
+
+                if (top<bordersOffset) this.$window.css('top', bordersOffset);
+                else if (top+win_height>main_height-bordersOffset)
+                    this.$window.css('top', main_height-bordersOffset - win_height);
+                if (left<bordersOffset) this.$window.css('left', bordersOffset);
+                else if (left+win_width>main_width-bordersOffset)
+                    this.$window.css('left', main_width-bordersOffset-win_width);
+            } else {
+                if (win_height>main_height-bordersOffset*2) {
+                    this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
+                    this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
+                    this.$window.css('top', bordersOffset);
+                }
+                if (win_width>main_width-bordersOffset*2) {
+                    this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
+                    this.$window.css('left', bordersOffset);
+                }
+            }
+        },
+
+        textLoading : 'Loading'
+    }, Common.Views.PluginDlg || {}));
+});

apps/common/main/lib/view/Plugins.js

@@ -429,138 +429,4 @@ define([
         groupCaption: 'Plugins'
 
     }, Common.Views.Plugins || {}));
-
-    Common.Views.PluginDlg = Common.UI.Window.extend(_.extend({
-        initialize : function(options) {
-            var _options = {};
-            _.extend(_options,  {
-                header: true,
-                enableKeyEvents: false
-            }, options);
-
-            var header_footer = (_options.buttons && _.size(_options.buttons)>0) ? 85 : 34;
-            if (!_options.header) header_footer -= 34;
-            this.bordersOffset = 40;
-            _options.width = (Common.Utils.innerWidth()-this.bordersOffset*2-_options.width)<0 ? Common.Utils.innerWidth()-this.bordersOffset*2: _options.width;
-            _options.height += header_footer;
-            _options.height = (Common.Utils.innerHeight()-this.bordersOffset*2-_options.height)<0 ? Common.Utils.innerHeight()-this.bordersOffset*2: _options.height;
-            _options.cls += ' advanced-settings-dlg';
-
-            this.template = [
-                '<div id="id-plugin-container" class="box" style="height:' + (_options.height-header_footer) + 'px;">',
-                    '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
-                '</div>',
-                '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
-                    '<div class="separator horizontal"></div>',
-                '<% } %>'
-            ].join('');
-
-            _options.tpl = _.template(this.template)(_options);
-
-            this.url = options.url || '';
-            this.frameId = options.frameId || 'plugin_iframe';
-            Common.UI.Window.prototype.initialize.call(this, _options);
-        },
-
-        render: function() {
-            Common.UI.Window.prototype.render.call(this);
-            this.$window.find('> .body').css({height: 'auto', overflow: 'hidden'});
-
-            this.boxEl = this.$window.find('.body > .box');
-            this._headerFooterHeight = (this.options.buttons && _.size(this.options.buttons)>0) ? 85 : 34;
-            if (!this.options.header) this._headerFooterHeight -= 34;
-            this._headerFooterHeight += ((parseInt(this.$window.css('border-top-width')) + parseInt(this.$window.css('border-bottom-width'))));
-
-            var iframe = document.createElement("iframe");
-            iframe.id           = this.frameId;
-            iframe.name         = 'pluginFrameEditor';
-            iframe.width        = '100%';
-            iframe.height       = '100%';
-            iframe.align        = "top";
-            iframe.frameBorder  = 0;
-            iframe.scrolling    = "no";
-            iframe.allow = "camera; microphone; display-capture";
-            iframe.onload       = _.bind(this._onLoad,this);
-
-            var me = this;
-            setTimeout(function(){
-                if (me.isLoaded) return;
-                me.loadMask = new Common.UI.LoadMask({owner: $('#id-plugin-placeholder')});
-                me.loadMask.setTitle(me.textLoading);
-                me.loadMask.show();
-                if (me.isLoaded) me.loadMask.hide();
-            }, 500);
-
-            iframe.src = this.url;
-            $('#id-plugin-placeholder').append(iframe);
-
-            this.on('resizing', function(args){
-                me.boxEl.css('height', parseInt(me.$window.css('height')) - me._headerFooterHeight);
-            });
-
-            var onMainWindowResize = function(){
-                me.onWindowResize();
-            };
-            $(window).on('resize', onMainWindowResize);
-            this.on('close', function() {
-                $(window).off('resize', onMainWindowResize);
-            });
-        },
-
-        _onLoad: function() {
-            this.isLoaded = true;
-            if (this.loadMask)
-                this.loadMask.hide();
-        },
-
-        setInnerSize: function(width, height) {
-            var maxHeight = Common.Utils.innerHeight(),
-                maxWidth = Common.Utils.innerWidth(),
-                borders_width = (parseInt(this.$window.css('border-left-width')) + parseInt(this.$window.css('border-right-width'))),
-                bordersOffset = this.bordersOffset*2;
-            if (maxHeight - bordersOffset<height + this._headerFooterHeight)
-                height = maxHeight - bordersOffset - this._headerFooterHeight;
-            if (maxWidth - bordersOffset<width + borders_width)
-                width = maxWidth - bordersOffset - borders_width;
-
-            this.boxEl.css('height', height);
-
-            Common.UI.Window.prototype.setHeight.call(this, height + this._headerFooterHeight);
-            Common.UI.Window.prototype.setWidth.call(this, width + borders_width);
-
-            this.$window.css('left',(maxWidth - width - borders_width) / 2);
-            this.$window.css('top',(maxHeight - height - this._headerFooterHeight) / 2);
-        },
-
-        onWindowResize: function() {
-            var main_width  = Common.Utils.innerWidth(),
-                main_height = Common.Utils.innerHeight(),
-                win_width = this.getWidth(),
-                win_height = this.getHeight(),
-                bordersOffset = (this.resizable) ? 0 : this.bordersOffset;
-            if (win_height<main_height-bordersOffset*2+0.1 && win_width<main_width-bordersOffset*2+0.1) {
-                var left = this.getLeft(),
-                    top = this.getTop();
-
-                if (top<bordersOffset) this.$window.css('top', bordersOffset);
-                else if (top+win_height>main_height-bordersOffset)
-                    this.$window.css('top', main_height-bordersOffset - win_height);
-                if (left<bordersOffset) this.$window.css('left', bordersOffset);
-                else if (left+win_width>main_width-bordersOffset)
-                    this.$window.css('left', main_width-bordersOffset-win_width);
-            } else {
-                if (win_height>main_height-bordersOffset*2) {
-                    this.setHeight(Math.max(main_height-bordersOffset*2, this.initConfig.minheight));
-                    this.boxEl.css('height', Math.max(main_height-bordersOffset*2, this.initConfig.minheight) - this._headerFooterHeight);
-                    this.$window.css('top', bordersOffset);
-                }
-                if (win_width>main_width-bordersOffset*2) {
-                    this.setWidth(Math.max(main_width-bordersOffset*2, this.initConfig.minwidth));
-                    this.$window.css('left', bordersOffset);
-                }
-            }
-        },
-
-        textLoading : 'Loading'
-    }, Common.Views.PluginDlg || {}));
 });

apps/common/main/resources/img/doc-formats/csv.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-csv">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#646464"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/djvu.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
 <symbol id="svg-format-djvu">
   <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#BC8C18"/>
   <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/docm.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-docm">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/docx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-docx">
     <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/docxf.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-docxf">
 <g>
     <path id="Vector" d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#27ABA3"/>

apps/common/main/resources/img/doc-formats/dotx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-dotx">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#214479"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/epub.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
   <symbol id="svg-format-epub">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#5892B6"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/fb2.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-fb2">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#B07408"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/html.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-html">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#7C9A34"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/jpg.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-jpg">
 <g>
 <path d="M95 22V118C95 118.796 94.6839 119.559 94.1213 120.121C93.5587 120.684 92.7956 121 92 121H8C7.20435 121 6.44129 120.684 5.87868 120.121C5.31607 119.559 5 118.796 5 118V7C5 6.20435 5.31607 5.44129 5.87868 4.87868C6.44129 4.31607 7.20435 4 8 4H77L95 22Z" fill="#7371D8"/>

apps/common/main/resources/img/doc-formats/odp.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-odp">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD9426"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/ods.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-ods">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#237453"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/odt.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-odt">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#3C6D88"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/oform.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-oform">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#2CA498"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/otp.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-otp">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD9426"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/ots.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-ots">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#237453"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/ott.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-ott">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#3C6D88"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/oxps.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-oxps">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#51968F"/>
 <circle cx="44.5" cy="62.5" r="2.5" fill="white"/>

apps/common/main/resources/img/doc-formats/pdf.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-pdf">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#BA4C3F"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/pdfa.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-pdfa">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#BA4C3F"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/png.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-png">
 <g>
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#D871D6"/>

apps/common/main/resources/img/doc-formats/potx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-potx">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD682B"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/ppsx.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-ppsx">
 <g>
 <path id="Vector" d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#E87616"/>

apps/common/main/resources/img/doc-formats/pptm.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-pptm">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD682B"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/pptx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-pptx">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#DD682B"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/rtf.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-rtf">
 <path d="M95 23V119C95 120.7 93.7 122 92 122H8C6.3 122 5 120.7 5 119V8C5 6.3 6.3 5 8 5H77L95 23Z" fill="#635E9B"/>
 <path opacity="0.2" d="M95 23H80C78.3 23 77 21.7 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/txt.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-txt">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#7C7C7D"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/xlsm.svg

@@ -1,4 +1,4 @@
-<svg width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" width="100" height="127" viewBox="0 0 100 127" fill="none" xmlns="http://www.w3.org/2000/svg">
 <symbol id="svg-format-xlsm">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#1F7244"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/xlsx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-xlsx">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#1F7244"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/xltx.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-xltx">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#1F7244"/>
 <path opacity="0.2" d="M95 23H80C79.2044 23 78.4413 22.6839 77.8787 22.1213C77.3161 21.5587 77 20.7956 77 20V5L95 23Z" fill="black"/>

apps/common/main/resources/img/doc-formats/xps.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
+<svg style="position: absolute; width: 0; height: 0; overflow: hidden;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 127" version="1.1" width="100" height="127">
   <symbol id="svg-format-xps">
 <path d="M95 23V119C95 119.796 94.6839 120.559 94.1213 121.121C93.5587 121.684 92.7956 122 92 122H8C7.20435 122 6.44129 121.684 5.87868 121.121C5.31607 120.559 5 119.796 5 119V8C5 7.20435 5.31607 6.44129 5.87868 5.87868C6.44129 5.31607 7.20435 5 8 5H77L95 23Z" fill="#51968F"/>
 <circle cx="44.5" cy="62.5" r="2.5" fill="white"/>

apps/common/main/resources/less/language-dialog.less

@@ -79,7 +79,7 @@ li {
   &.lv, &.lv-LV                     {background-position: -32px      -72px;}
   &.lt, &.lt-LT                     {background-position: 0          -84px;}
   &.vi, &.vi-VN                     {background-position: -16px      -84px;}
-  &.de-CH, &.fr-CH                  {background-position: -32px      -84px;}
+  &.de-CH, &.fr-CH , &.it-CH        {background-position: -32px      -84px;}
   &.pt-PT                           {background-position: -16px      -96px;}
   &.de-AT                           {background-position: -32px      -96px;}
   &.es, &.es-ES                     {background-position: 0          -108px;}

apps/common/main/resources/less/winxp_fix.less

@@ -1,6 +1,19 @@
 .winxp {
-    .toolbar .tabs>ul,
+    @toolbar-editor-height: 28px;
-        .toolbar .extra .btn-slot,#box-document-title .btn-slot {
+    @toolbar-viewer-height: 32px;
-            height:28px;
+    .toolbar {
+        .tabs > ul, .extra .btn-slot {
+            height: @toolbar-editor-height;
         }
+
+        &.toolbar-view {
+            .tabs > ul, .extra .btn-slot {
+                height: @toolbar-viewer-height;
+            }
+        }
+    }
+
+    #box-document-title .btn-slot {
+        height: @toolbar-editor-height;
+    }
 }

apps/common/mobile/lib/controller/ContextMenu.jsx

@@ -163,6 +163,8 @@ class ContextMenuController extends Component {
     }
 
     onApiShowForeignCursorLabel(UserId, X, Y, color) {
+        if (!this.isUserVisible(UserId)) return;
+
         /** coauthoring begin **/
         const tipHeight = 20;
 
@@ -173,21 +175,30 @@ class ContextMenuController extends Component {
                 break;
             }
         }
+
         if (!src) {
             src = $$(`<div class="username-tip"></div>`);
             src.attr('userid', UserId);
             src.css({'background-color': '#'+Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b())});
             src.text(this.getUserName(UserId));
-            $$('#id_main_parent').append(src);
             this.fastCoAuthTips.push(src);
             //src.fadeIn(150);
             src[0].classList.add('active');
 
-            $$('#id_main_view').append(src);
+            $$("#editor_sdk").append(src);
         }
-        src.css({
+
-            top: (Y - tipHeight) + 'px',
+        if ( X + src.outerWidth() > $$(window).width() ) { 
-            left: X + 'px'});
+            src.css({
+                top: (Y - tipHeight) + 'px',
+                left: X - src.outerWidth() + 'px'});
+        } else {
+            src.css({
+                left: X + 'px',
+                top: (Y - tipHeight) + 'px',
+            });
+        }
+        
         /** coauthoring end **/
     }
 

apps/common/mobile/lib/store/users.js

@@ -44,7 +44,7 @@ export class storeUsers {
                 }
             }
         }
-        !changed && change && (this.users[change.asc_getId()] = change);
+        !changed && change && (this.users.push(change));
     }
 
     resetDisconnected (isDisconnected) {

apps/common/mobile/resources/img/about/logo-white_s.svg

@@ -0,0 +1,6 @@
+<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7249 13.8022C62.4284 15.6827 61.3173 18.5757 61.3173 22.4089C61.3173 26.2422 62.4284 29.1352 64.7249 31.088C67.0213 33.0408 69.614 33.981 72.6512 33.981C75.6143 33.981 78.2812 33.0408 80.5035 31.088C82.7258 29.2075 83.837 26.3145 83.837 22.4813C83.837 18.5757 82.7258 15.755 80.5035 13.8022C78.2812 11.8494 75.6884 10.9092 72.6512 10.9092C69.614 10.9092 66.9472 11.8494 64.7249 13.8022ZM67.688 28.195C66.725 26.9654 66.2064 25.085 66.2064 22.4089C66.2064 19.8052 66.725 17.8524 67.688 16.7675C68.7251 15.538 69.8362 14.7424 71.0215 14.4531L71.0215 14.4531C71.3178 14.3808 71.6141 14.3085 71.8364 14.3085C72.0586 14.2362 72.2808 14.2362 72.5771 14.2362C72.7253 14.2362 72.8549 14.2542 72.9846 14.2723C73.1142 14.2904 73.2438 14.3085 73.392 14.3085C73.6142 14.3085 73.9105 14.3808 74.2069 14.4531C75.3921 14.7424 76.5033 15.538 77.4663 16.7675C78.4293 17.9971 78.9479 19.8775 78.9479 22.4813C78.9479 25.0126 78.4293 26.9654 77.4663 28.195C76.5033 29.4245 75.3921 30.2201 74.2069 30.5094C74.1561 30.5218 74.1075 30.5342 74.0604 30.5462L74.0601 30.5462L74.0601 30.5462C73.8321 30.6044 73.6375 30.654 73.392 30.654C73.0957 30.7264 72.8734 30.7264 72.5771 30.7264C72.466 30.7264 72.3364 30.7083 72.2067 30.6902C72.0771 30.6721 71.9475 30.654 71.8364 30.654C71.5909 30.654 71.3962 30.6044 71.1682 30.5462L71.168 30.5462L71.1676 30.5461C71.1206 30.5341 71.0721 30.5217 71.0215 30.5094C69.8362 30.2201 68.7251 29.4245 67.688 28.195ZM92.356 11.1262H86.2816V33.6918H90.9485V20.3839L90.8745 16.406H90.9485L92.1338 18.9374L100.134 33.6918H106.209V11.1262H101.542V24.3618L101.616 28.412H101.542L100.356 25.302L92.356 11.1262ZM111.024 11.1262H115.691V29.8585H124.876V33.6918H111.024V11.1262ZM127.395 11.1262H121.987L130.506 24.4341V33.6918H135.173V24.5064L143.544 11.1262H138.581L133.766 19.0097L133.025 20.6009H132.877L132.136 19.0097L127.395 11.1262ZM142.951 22.4089C142.951 18.5757 144.063 15.6827 146.359 13.8022C148.581 11.8494 151.248 10.9092 154.285 10.9092C157.323 10.9092 159.915 11.8494 162.138 13.8022C164.36 15.755 165.471 18.5757 165.471 22.4812C165.471 26.3145 164.36 29.2075 162.138 31.088C159.915 33.0408 157.248 33.981 154.285 33.981C151.248 33.981 148.655 33.0408 146.359 31.088C144.137 29.1352 142.951 26.2422 142.951 22.4089ZM147.841 22.4089C147.841 25.085 148.359 26.9654 149.322 28.195C150.359 29.4245 151.396 30.2201 152.656 30.5094C152.697 30.5196 152.738 30.5298 152.777 30.5398L152.802 30.5462C153.03 30.6044 153.225 30.654 153.471 30.654C153.582 30.654 153.711 30.6721 153.841 30.6902C153.971 30.7083 154.1 30.7264 154.211 30.7264C154.508 30.7264 154.73 30.7264 155.026 30.654C155.272 30.654 155.466 30.6044 155.694 30.5462L155.695 30.5461C155.742 30.5341 155.79 30.5217 155.841 30.5094C157.026 30.2201 158.137 29.4245 159.1 28.195C160.063 26.9654 160.582 25.0126 160.582 22.4812C160.582 19.8775 160.063 17.9971 159.1 16.7675C158.137 15.538 157.026 14.7424 155.841 14.4531C155.545 14.3808 155.248 14.3085 155.026 14.3085C154.878 14.3085 154.748 14.2904 154.619 14.2723C154.489 14.2542 154.359 14.2361 154.211 14.2361C153.915 14.2361 153.693 14.2362 153.471 14.3085C153.248 14.3085 152.952 14.3808 152.656 14.4531C151.47 14.7424 150.359 15.538 149.322 16.7675C148.359 17.8524 147.841 19.8052 147.841 22.4089ZM181.62 11.1262H168.73V33.6918H173.397V24.2171H181.25V20.3839H173.397V14.8871H181.62V11.1262ZM185.102 11.1262H197.991V14.8871H189.769V20.3839H197.621V24.2171H189.769V33.6918H185.102V11.1262ZM200.732 11.1262V33.6918H205.399V11.1262H200.732ZM225.963 11.6323V15.5379C225.148 15.2486 224.333 15.0316 223.444 14.887C222.555 14.7423 221.518 14.67 220.481 14.67C218.036 14.67 216.184 15.3932 214.851 16.9121C213.518 18.3586 212.851 20.239 212.851 22.4811C212.851 24.6509 213.443 26.459 214.703 27.9055C215.962 29.352 217.74 30.1476 220.036 30.1476C220.741 30.1476 221.445 30.0936 222.245 30.0323C222.37 30.0226 222.498 30.0128 222.629 30.003C223.592 29.8583 224.555 29.6413 225.592 29.2074L225.889 33.0406C225.74 33.113 225.518 33.1853 225.296 33.2576C225 33.33 224.703 33.4023 224.333 33.4746C223.95 33.568 223.506 33.6312 223 33.7033L223 33.7033C222.722 33.7428 222.426 33.785 222.111 33.8362C221.222 33.9086 220.333 33.9809 219.37 33.9809H218.999H218.629C215.962 33.8362 213.518 32.8237 211.295 31.0879C209.073 29.2797 207.962 26.459 207.962 22.6981C207.962 19.0095 209.073 16.1165 211.221 14.0914C213.369 12.0663 216.333 11.0537 219.962 11.0537C220.925 11.0537 221.814 11.0537 222.555 11.126C223.26 11.1886 223.91 11.3054 224.6 11.4295L224.601 11.4296C224.708 11.4488 224.816 11.4682 224.926 11.4877C225 11.5238 225.092 11.5419 225.185 11.56C225.277 11.5781 225.37 11.5962 225.444 11.6323C225.539 11.5862 225.633 11.5989 225.747 11.6141C225.811 11.6228 225.882 11.6323 225.963 11.6323ZM243.519 11.1262H229.667V33.6918H243.519V30.1478H234.408V23.7832H242.63V20.3116H234.408V14.6702H243.519V11.1262Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="#5DC0E8"/>
+</svg>

apps/common/mobile/resources/img/about/logo_s.svg

@@ -0,0 +1,6 @@
+<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7249 13.8022C62.4284 15.6827 61.3173 18.5757 61.3173 22.4089C61.3173 26.2422 62.4284 29.1352 64.7249 31.088C67.0213 33.0408 69.614 33.981 72.6512 33.981C75.6143 33.981 78.2812 33.0408 80.5035 31.088C82.7258 29.2075 83.837 26.3145 83.837 22.4813C83.837 18.5757 82.7258 15.755 80.5035 13.8022C78.2812 11.8494 75.6884 10.9092 72.6512 10.9092C69.614 10.9092 66.9472 11.8494 64.7249 13.8022ZM67.688 28.195C66.725 26.9654 66.2064 25.085 66.2064 22.4089C66.2064 19.8052 66.725 17.8524 67.688 16.7675C68.7251 15.538 69.8362 14.7424 71.0215 14.4531L71.0215 14.4531C71.3178 14.3808 71.6141 14.3085 71.8364 14.3085C72.0586 14.2362 72.2808 14.2362 72.5771 14.2362C72.7253 14.2362 72.8549 14.2542 72.9846 14.2723C73.1142 14.2904 73.2438 14.3085 73.392 14.3085C73.6142 14.3085 73.9105 14.3808 74.2069 14.4531C75.3921 14.7424 76.5033 15.538 77.4663 16.7675C78.4293 17.9971 78.9479 19.8775 78.9479 22.4813C78.9479 25.0126 78.4293 26.9654 77.4663 28.195C76.5033 29.4245 75.3921 30.2201 74.2069 30.5094C74.1561 30.5218 74.1075 30.5342 74.0604 30.5462L74.0601 30.5462L74.0601 30.5462C73.8321 30.6044 73.6375 30.654 73.392 30.654C73.0957 30.7264 72.8734 30.7264 72.5771 30.7264C72.466 30.7264 72.3364 30.7083 72.2067 30.6902C72.0771 30.6721 71.9475 30.654 71.8364 30.654C71.5909 30.654 71.3962 30.6044 71.1682 30.5462L71.168 30.5462L71.1676 30.5461C71.1206 30.5341 71.0721 30.5217 71.0215 30.5094C69.8362 30.2201 68.7251 29.4245 67.688 28.195ZM92.356 11.1262H86.2816V33.6918H90.9485V20.3839L90.8745 16.406H90.9485L92.1338 18.9374L100.134 33.6918H106.209V11.1262H101.542V24.3618L101.616 28.412H101.542L100.356 25.302L92.356 11.1262ZM111.024 11.1262H115.691V29.8585H124.876V33.6918H111.024V11.1262ZM127.395 11.1262H121.987L130.506 24.4341V33.6918H135.173V24.5064L143.544 11.1262H138.581L133.766 19.0097L133.025 20.6009H132.877L132.136 19.0097L127.395 11.1262ZM142.951 22.4089C142.951 18.5757 144.063 15.6827 146.359 13.8022C148.581 11.8494 151.248 10.9092 154.285 10.9092C157.323 10.9092 159.915 11.8494 162.138 13.8022C164.36 15.755 165.471 18.5757 165.471 22.4812C165.471 26.3145 164.36 29.2075 162.138 31.088C159.915 33.0408 157.248 33.981 154.285 33.981C151.248 33.981 148.655 33.0408 146.359 31.088C144.137 29.1352 142.951 26.2422 142.951 22.4089ZM147.841 22.4089C147.841 25.085 148.359 26.9654 149.322 28.195C150.359 29.4245 151.396 30.2201 152.656 30.5094C152.697 30.5196 152.738 30.5298 152.777 30.5398L152.802 30.5462C153.03 30.6044 153.225 30.654 153.471 30.654C153.582 30.654 153.711 30.6721 153.841 30.6902C153.971 30.7083 154.1 30.7264 154.211 30.7264C154.508 30.7264 154.73 30.7264 155.026 30.654C155.272 30.654 155.466 30.6044 155.694 30.5462L155.695 30.5461C155.742 30.5341 155.79 30.5217 155.841 30.5094C157.026 30.2201 158.137 29.4245 159.1 28.195C160.063 26.9654 160.582 25.0126 160.582 22.4812C160.582 19.8775 160.063 17.9971 159.1 16.7675C158.137 15.538 157.026 14.7424 155.841 14.4531C155.545 14.3808 155.248 14.3085 155.026 14.3085C154.878 14.3085 154.748 14.2904 154.619 14.2723C154.489 14.2542 154.359 14.2361 154.211 14.2361C153.915 14.2361 153.693 14.2362 153.471 14.3085C153.248 14.3085 152.952 14.3808 152.656 14.4531C151.47 14.7424 150.359 15.538 149.322 16.7675C148.359 17.8524 147.841 19.8052 147.841 22.4089ZM181.62 11.1262H168.73V33.6918H173.397V24.2171H181.25V20.3839H173.397V14.8871H181.62V11.1262ZM185.102 11.1262H197.991V14.8871H189.769V20.3839H197.621V24.2171H189.769V33.6918H185.102V11.1262ZM200.732 11.1262V33.6918H205.399V11.1262H200.732ZM225.963 11.6323V15.5379C225.148 15.2486 224.333 15.0316 223.444 14.887C222.555 14.7423 221.518 14.67 220.481 14.67C218.036 14.67 216.184 15.3932 214.851 16.9121C213.518 18.3586 212.851 20.239 212.851 22.4811C212.851 24.6509 213.443 26.459 214.703 27.9055C215.962 29.352 217.74 30.1476 220.036 30.1476C220.741 30.1476 221.445 30.0936 222.245 30.0323C222.37 30.0226 222.498 30.0128 222.629 30.003C223.592 29.8583 224.555 29.6413 225.592 29.2074L225.889 33.0406C225.74 33.113 225.518 33.1853 225.296 33.2576C225 33.33 224.703 33.4023 224.333 33.4746C223.95 33.568 223.506 33.6312 223 33.7033L223 33.7033C222.722 33.7428 222.426 33.785 222.111 33.8362C221.222 33.9086 220.333 33.9809 219.37 33.9809H218.999H218.629C215.962 33.8362 213.518 32.8237 211.295 31.0879C209.073 29.2797 207.962 26.459 207.962 22.6981C207.962 19.0095 209.073 16.1165 211.221 14.0914C213.369 12.0663 216.333 11.0537 219.962 11.0537C220.925 11.0537 221.814 11.0537 222.555 11.126C223.26 11.1886 223.91 11.3054 224.6 11.4295L224.601 11.4296C224.708 11.4488 224.816 11.4682 224.926 11.4877C225 11.5238 225.092 11.5419 225.185 11.56C225.277 11.5781 225.37 11.5962 225.444 11.6323C225.539 11.5862 225.633 11.5989 225.747 11.6141C225.811 11.6228 225.882 11.6323 225.963 11.6323ZM243.519 11.1262H229.667V33.6918H243.519V30.1478H234.408V23.7832H242.63V20.3116H234.408V14.6702H243.519V11.1262Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="#5DC0E8"/>
+</svg>

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

@@ -1,5 +1,5 @@
 // @text-normal: #000;
-// @common-image-about-path - defined in webpack config
+// @common-image-path - defined in webpack config
 
 .about {
     .page-content {
@@ -49,18 +49,18 @@
         display: inline-block;
         width: 100%;
         height: 55px;
-        background: ~"url(@{common-image-about-path}/logo_s.svg) no-repeat center";
+        background: ~"url(@{common-image-path}/about/logo_s.svg) no-repeat center";
     }
 
     .theme-type-dark {
         .about .logo {
-            background: ~"url(@{common-image-about-path}/logo-white_s.svg) no-repeat center";
+            background: ~"url(@{common-image-path}/about/logo-white_s.svg) no-repeat center";
         }
     } 
 }
 
 .theme-type-dark {
     .about .logo {
-        background: ~"url(@{common-image-about-path}/logo-white_s.svg) no-repeat center";
+        background: ~"url(@{common-image-path}/about/logo-white_s.svg) no-repeat center";
     }
 }

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

@@ -242,6 +242,9 @@
 
 .actions-modal.modal-in {
   z-index: 13700;
+  .actions-group::after {
+    background-color: @background-menu-divider;
+  }
 }
 
 .actions-backdrop.backdrop-in {

apps/common/mobile/resources/less/common-material.less

@@ -46,6 +46,10 @@
     --f7-picker-item-text-color: rgba(var(--text-normal), 0.45);
     --f7-picker-item-selected-text-color: @text-normal;
 
+    --f7-input-bg-color: @background-primary;
+    --f7-input-placeholder-color: @text-secondary;
+    --f7-input-text-color: @text-normal;
+
     .button {
         --f7-touch-ripple-color: transparent;
     }
@@ -86,7 +90,6 @@
         --f7-list-item-text-text-color: @text-normal;
         --f7-list-item-subtitle-text-color: @text-secondary;
         --f7-block-title-text-color: @text-secondary;
-        --f7-input-placeholder-color: @text-secondary;
         --f7-label-text-color: @text-normal;
         --f7-page-bg-color: @background-tertiary;
         --f7-list-bg-color: @background-primary;
@@ -95,7 +98,6 @@
         --f7-toggle-inactive-color: @background-menu-divider;
         --f7-toggle-border-color: @background-menu-divider;
         --f7-actions-button-text-color: @text-normal;
-        --f7-input-text-color: @text-normal;
         --f7-subnavbar-border-color: @background-menu-divider;
         --f7-list-border-color: @background-menu-divider;
     }
@@ -607,6 +609,7 @@
         .inputs-list {
             margin: 15px 0 0;
             ul {
+                background: none;
                 &::before, &::after {
                     display: none;
                 }

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

@@ -555,7 +555,7 @@ input[type="number"]::-webkit-inner-spin-button {
 
 .icon.lang-flag {
     background-size: 48px auto;
-    background-image: url(../img/controls/flags@2x.png);
+    background-image: ~'url(@{common-image-path}/controls/flags@2x.png)';
 }
 
 .icon.lang-flag {
@@ -653,7 +653,9 @@ input[type="number"]::-webkit-inner-spin-button {
 .lang-flag.vi-VN {
   background-position: -16px -84px;
 }
-.lang-flag.de-CH {
+.lang-flag.de-CH,
+.lang-flag.fr-CH,
+.lang-flag.it-CH {
   background-position: -32px -84px;
 }
 .lang-flag.pt-PT {

apps/common/mobile/resources/less/ios/icons.less

@@ -1,10 +1,10 @@
-// @common-image-header-path - defined in webpack config
+// @common-image-path - defined in webpack config
 
 .device-ios {
     .theme-type-dark {
         i.icon {
             &.icon-logo {
-                background: ~"url(@{common-image-header-path}/logo-android.svg)" no-repeat center;
+                background: ~"url(@{common-image-path}/header/logo-android.svg)" no-repeat center;
             }
         }
     }
@@ -15,7 +15,7 @@
         &.icon-logo {
             width: 100px;
             height: 14px;
-            background: ~"url(@{common-image-header-path}/logo-ios.svg)" no-repeat center;
+            background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center;
         }
         &.icon-prev {
             width: 22px;

apps/common/mobile/resources/less/material/icons.less

@@ -1,4 +1,4 @@
-// @common-image-header-path - defined in webpack config
+// @common-image-path - defined in webpack config
 
 .device-android {
     i.icon {
@@ -8,7 +8,7 @@
         &.icon-logo {
             width: 100px;
             height: 14px;
-            background: ~"url(@{common-image-header-path}/logo-android.svg) no-repeat center";
+            background: ~"url(@{common-image-path}/header/logo-android.svg) no-repeat center";
         }
         &.icon-prev {
             width: 20px;

apps/documenteditor/embed/locale/be.json

@@ -15,6 +15,9 @@
   "DE.ApplicationController.errorFilePassProtect": "Файл абаронены паролем, яго немагчыма адкрыць.",
   "DE.ApplicationController.errorFileSizeExceed": "Памер файла перавышае ліміт, вызначаны для вашага сервера.<br>Звярніцеся да адміністратара сервера дакументаў за дадатковымі звесткамі.",
   "DE.ApplicationController.errorForceSave": "Падчас захавання файла адбылася памылка. Калі ласка, выкарыстайце параметр \"Спампаваць як\", каб захаваць файл на цвёрдым дыску камп’ютара, альбо паспрабуйце яшчэ раз пазней.",
+  "DE.ApplicationController.errorLoadingFont": "Шрыфты не загрузіліся.<br>Звярніцеся да адміністратара сервера дакументаў.",
+  "DE.ApplicationController.errorSubmit": "Не атрымалася адправіць.",
+  "DE.ApplicationController.errorTokenExpire": "Тэрмін дзеяння токена бяспекі дакумента сышоў.<br>Калі ласка, звярніцеся да адміністратара сервера дакументаў.",
   "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Злучэнне з інтэрнэтам было адноўлена, і версія файла змянілася.<br>Перш чым працягнуць працу, неабходна спампаваць файл альбо скапіяваць яго змесціва, каб захаваць даныя, а пасля перазагрузіць старонку.",
   "DE.ApplicationController.errorUserDrop": "На дадзены момант файл недаступны.",
   "DE.ApplicationController.notcriticalErrorTitle": "Увага",
@@ -22,10 +25,13 @@
   "DE.ApplicationController.scriptLoadError": "Занадта павольнае злучэнне, не ўсе кампаненты атрымалася загрузіць. Калі ласка, абнавіце старонку.",
   "DE.ApplicationController.textAnonymous": "Ананімны карыстальнік",
   "DE.ApplicationController.textClear": "Ачысціць усе палі",
+  "DE.ApplicationController.textGotIt": "Добра",
   "DE.ApplicationController.textGuest": "Госць",
   "DE.ApplicationController.textLoadingDocument": "Загрузка дакумента",
+  "DE.ApplicationController.textNext": "Наступнае поле",
   "DE.ApplicationController.textOf": "з",
   "DE.ApplicationController.textRequired": "Запоўніце ўсе абавязковыя палі, патрэбныя для адпраўлення формы. ",
+  "DE.ApplicationController.textSubmit": "Адправіць",
   "DE.ApplicationController.textSubmited": "<b>Форма паспяхова адпраўленая</b><br>Пстрыкніце, каб закрыць падказку",
   "DE.ApplicationController.txtClose": "Закрыць",
   "DE.ApplicationController.txtEmpty": "(Пуста)",

apps/documenteditor/embed/locale/es.json

@@ -1,50 +1,50 @@
 {
   "common.view.modals.txtCopy": "Copiar al portapapeles",
-  "common.view.modals.txtEmbed": "Incorporar",
+  "common.view.modals.txtEmbed": "Insertar",
   "common.view.modals.txtHeight": "Altura",
   "common.view.modals.txtShare": "Compartir enlace",
   "common.view.modals.txtWidth": "Ancho",
   "DE.ApplicationController.convertationErrorText": "Fallo de conversión.",
-  "DE.ApplicationController.convertationTimeoutText": "Se superó el tiempo de espera de conversión.",
+  "DE.ApplicationController.convertationTimeoutText": "Se ha superado el tiempo de conversión.",
   "DE.ApplicationController.criticalErrorTitle": "Error",
-  "DE.ApplicationController.downloadErrorText": "Error en la descarga",
+  "DE.ApplicationController.downloadErrorText": "Se ha producido un error en la descarga",
   "DE.ApplicationController.downloadTextText": "Descargando documento...",
-  "DE.ApplicationController.errorAccessDeny": "Está tratando de realizar una acción para la cual no tiene permiso.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
+  "DE.ApplicationController.errorAccessDeny": "Está intentando realizar una acción para la que no tiene permiso. <br>Contacte con el administrador del servidor de documentos.",
   "DE.ApplicationController.errorDefaultMessage": "Código de error: %1",
-  "DE.ApplicationController.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.<br>Use la opción 'Descargar como...' para guardar la copia de seguridad de este archivo en el disco duro de su ordenador.",
+  "DE.ApplicationController.errorEditingDownloadas": "Se ha producido un error durante el trabajo con el documento. <br>Use la opción 'Descargar como...' para guardar la copia de seguridad del archivo en el disco duro de su ordenador.",
-  "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
+  "DE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no se puede abrir.",
-  "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede el límite establecido para su servidor. Por favor póngase en contacto con el administrador del Servidor de Documentos para obtener más información.",
+  "DE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo supera el límiete establecido por su servidor. <br>Contacte con el administrador del servidor de documentos para obtener más detalles.",
-  "DE.ApplicationController.errorForceSave": "Ha ocurrido un error al guardar el archivo. Por favor, use la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
+  "DE.ApplicationController.errorForceSave": "Se ha producido un error al guardar el archivo. Utilice la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo más tarde.",
-  "DE.ApplicationController.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
+  "DE.ApplicationController.errorLoadingFont": "Los tipos de letra no están cargados. <br>Contacte con el administrador del servidor de documentos.",
   "DE.ApplicationController.errorSubmit": "Error al enviar.",
-  "DE.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado.<br>Por favor, póngase en contacto con el administrador del Servidor de Documentos.",
+  "DE.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado. <br>Contacte con el administrador del servidor de documentos",
-  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página.",
+  "DE.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo.<br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
-  "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo en este momento.",
+  "DE.ApplicationController.errorUserDrop": "No se puede acceder al archivo.",
-  "DE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "DE.ApplicationController.notcriticalErrorTitle": "Advertencia",
   "DE.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
-  "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Por favor, recargue la página.",
+  "DE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Recargue la página.",
   "DE.ApplicationController.textAnonymous": "Anónimo",
   "DE.ApplicationController.textClear": "Borrar todos los campos",
-  "DE.ApplicationController.textGotIt": "Entiendo",
+  "DE.ApplicationController.textGotIt": "Entendido",
   "DE.ApplicationController.textGuest": "Invitado",
   "DE.ApplicationController.textLoadingDocument": "Cargando documento",
   "DE.ApplicationController.textNext": "Campo siguiente",
   "DE.ApplicationController.textOf": "de",
   "DE.ApplicationController.textRequired": "Rellene todos los campos obligatorios para enviar el formulario.",
   "DE.ApplicationController.textSubmit": "Enviar",
-  "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito</b><br>Haga clic para cerrar el consejo",
+  "DE.ApplicationController.textSubmited": "<b>Formulario enviado con éxito. </b><br>Haga clic para cerrar el consejo",
   "DE.ApplicationController.txtClose": "Cerrar",
   "DE.ApplicationController.txtEmpty": "(Vacío)",
   "DE.ApplicationController.txtPressLink": "Pulse CTRL y haga clic en el enlace",
   "DE.ApplicationController.unknownErrorText": "Error desconocido.",
   "DE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
-  "DE.ApplicationController.waitText": "Por favor, espere...",
+  "DE.ApplicationController.waitText": "Espere...",
   "DE.ApplicationView.txtDownload": "Descargar",
   "DE.ApplicationView.txtDownloadDocx": "Descargar como docx",
   "DE.ApplicationView.txtDownloadPdf": "Descargar como pdf",
-  "DE.ApplicationView.txtEmbed": "Incorporar",
+  "DE.ApplicationView.txtEmbed": "Insertar",
   "DE.ApplicationView.txtFileLocation": "Abrir ubicación del archivo",
-  "DE.ApplicationView.txtFullScreen": "Pantalla Completa",
+  "DE.ApplicationView.txtFullScreen": "Pantalla completa",
   "DE.ApplicationView.txtPrint": "Imprimir",
   "DE.ApplicationView.txtShare": "Compartir"
 }

apps/documenteditor/forms/app.js

@@ -139,7 +139,8 @@ require([
         nameSpace: 'DE',
         autoCreate: false,
         controllers : [
-            'ApplicationController'
+            'ApplicationController',
+            'Plugins'
         ]
     });
 
@@ -147,10 +148,12 @@ require([
         function() {
             require([
                 'documenteditor/forms/app/controller/ApplicationController',
+                'documenteditor/forms/app/controller/Plugins',
                 'documenteditor/forms/app/view/ApplicationView',
                 'common/main/lib/util/utils',
                 'common/main/lib/util/LocalStorage',
                 'common/main/lib/controller/Themes',
+                'common/main/lib/view/PluginDlg',
                 'common/forms/lib/view/modals'
             ], function() {
                 app.start();

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -104,6 +104,8 @@ define([
                 this.api.asc_registerCallback('asc_onCurrentPage',           this.onCurrentPage.bind(this));
                 this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
                 this.api.asc_registerCallback('asc_onZoomChange',           this.onApiZoomChange.bind(this));
+                this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
+                Common.NotificationCenter.on('api:disconnect',               _.bind(this.onApiServerDisconnect, this));
 
                 // Initialize api gateway
                 Common.Gateway.on('init',               this.loadConfig.bind(this));
@@ -414,6 +416,8 @@ define([
             this.appOptions.saveAsUrl       = this.editorConfig.saveAsUrl;
             this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
             this.appOptions.isDesktopApp    = this.editorConfig.targetApp == 'desktop';
+            this.appOptions.lang            = this.editorConfig.lang;
+            this.appOptions.canPlugins      = false;
         },
 
         onExternalMessage: function(msg) {
@@ -564,6 +568,8 @@ define([
             AscCommon.UserInfoParser.setParser(true);
             AscCommon.UserInfoParser.setCurrentName(this.appOptions.user.fullname);
 
+            DE.getController('Plugins').setMode(this.appOptions, this.api);
+
             var me = this;
             me.view.btnSubmit.setVisible(this.appOptions.canFillForms && this.appOptions.canSubmitForms);
             me.view.btnDownload.setVisible(this.appOptions.canDownload && this.appOptions.canFillForms && !this.appOptions.canSubmitForms);
@@ -674,7 +680,7 @@ define([
                 }
 
                 if (this._state.licenseType!==Asc.c_oLicenseResult.SuccessLimit && this.appOptions.canFillForms) {
-                    this.disableEditing(true);
+                    Common.NotificationCenter.trigger('api:disconnect');
                 }
 
                 var value = Common.localStorage.getItem("de-license-warning");
@@ -1339,6 +1345,7 @@ define([
                 Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this)); // try to load image from storage
                 Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this)); // set loaded image to control
             }
+            DE.getController('Plugins').setApi(this.api);
 
             this.updateWindowTitle(true);
 
@@ -1806,9 +1813,21 @@ define([
             }
         },
 
-        disableEditing: function(state) {
+        onApiServerDisconnect: function(enableDownload) {
-            this.view && this.view.btnClear && this.view.btnClear.setDisabled(state);
+            this._state.isDisconnected = true;
-            this._isDisabled = state;
+            this._isDisabled = true;
+            this.view && this.view.btnClear && this.view.btnClear.setDisabled(true);
+            if (!enableDownload) {
+                this.appOptions.canPrint = this.appOptions.canDownload = false;
+                this.view && this.view.btnDownload.setDisabled(true);
+                this.view && this.view.btnSubmit.setDisabled(true);
+                if (this.view && this.view.btnOptions && this.view.btnOptions.menu) {
+                    this.view.btnOptions.menu.items[0].setDisabled(true); // print
+                    this.view.btnOptions.menu.items[2].setDisabled(true); // download
+                    this.view.btnOptions.menu.items[3].setDisabled(true); // download docx
+                    this.view.btnOptions.menu.items[4].setDisabled(true); // download pdf
+                }
+            }
         },
 
         errorDefaultMessage     : 'Error code: %1',

apps/documenteditor/forms/app/controller/Plugins.js

@@ -0,0 +1,457 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2022
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
+/**
+ * User: Julia.Radzhabova
+ * Date: 22.02.2022
+ */
+
+define([
+    'core',
+    'common/main/lib/collection/Plugins',
+    'common/main/lib/view/PluginDlg'
+], function () {
+    'use strict';
+
+    DE.Controllers.Plugins = Backbone.Controller.extend(_.extend({
+        models: [],
+        appOptions: {},
+        configPlugins: {autostart:[]},// {config: 'from editor config', plugins: 'loaded plugins', autostart: 'autostart guids'}
+        serverPlugins: {autostart:[]},// {config: 'from editor config', plugins: 'loaded plugins', autostart: 'autostart guids'}
+        collections: [
+            'Common.Collections.Plugins'
+        ],
+        initialize: function() {
+        },
+
+        events: function() {
+        },
+
+        onLaunch: function() {
+            this._moveOffset = {x:0, y:0};
+            this.autostart = [];
+
+            Common.Gateway.on('init', this.loadConfig.bind(this));
+        },
+
+        loadConfig: function(data) {
+            var me = this;
+            me.configPlugins.config = data.config.plugins;
+            me.editor = 'word';
+        },
+
+        loadPlugins: function() {
+            if (this.configPlugins.config) {
+                this.getPlugins(this.configPlugins.config.pluginsData)
+                    .then(function(loaded)
+                    {
+                        me.configPlugins.plugins = loaded;
+                        me.mergePlugins();
+                    })
+                    .catch(function(err)
+                    {
+                        me.configPlugins.plugins = false;
+                    });
+            } else
+                this.configPlugins.plugins = false;
+
+            var server_plugins_url = '../../../../plugins.json',
+                me = this;
+            Common.Utils.loadConfig(server_plugins_url, function (obj) {
+                if ( obj != 'error' ) {
+                    me.serverPlugins.config = obj;
+                    me.getPlugins(me.serverPlugins.config.pluginsData)
+                        .then(function(loaded)
+                        {
+                            me.serverPlugins.plugins = loaded;
+                            me.mergePlugins();
+                        })
+                        .catch(function(err)
+                        {
+                            me.serverPlugins.plugins = false;
+                        });
+                } else
+                    me.serverPlugins.plugins = false;
+            });
+        },
+
+        setApi: function(api) {
+            this.api = api;
+
+            if (!this.appOptions.customization || (this.appOptions.customization.plugins!==false)) {
+                this.api.asc_registerCallback("asc_onPluginShow", _.bind(this.onPluginShow, this));
+                this.api.asc_registerCallback("asc_onPluginClose", _.bind(this.onPluginClose, this));
+                this.api.asc_registerCallback("asc_onPluginResize", _.bind(this.onPluginResize, this));
+                this.api.asc_registerCallback("asc_onPluginMouseUp", _.bind(this.onPluginMouseUp, this));
+                this.api.asc_registerCallback("asc_onPluginMouseMove", _.bind(this.onPluginMouseMove, this));
+                this.api.asc_registerCallback('asc_onPluginsReset', _.bind(this.resetPluginsList, this));
+                this.api.asc_registerCallback('asc_onPluginsInit', _.bind(this.onPluginsInit, this));
+
+                this.loadPlugins();
+            }
+            return this;
+        },
+
+        setMode: function(mode, api) {
+            this.appOptions = mode;
+            this.api = api;
+            return this;
+        },
+
+        refreshPluginsList: function() {
+            var me = this;
+            var storePlugins = this.getApplication().getCollection('Common.Collections.Plugins'),
+                arr = [];
+            storePlugins.each(function(item){
+                var plugin = new Asc.CPlugin();
+                plugin.deserialize(item.attributes);
+
+                var variations = item.get('variations'),
+                    variationsArr = [];
+                variations.forEach(function(itemVar){
+                    var variation = new Asc.CPluginVariation();
+                    variation.deserialize(itemVar.attributes);
+                    variationsArr.push(variation);
+                });
+
+                plugin.set_Variations(variationsArr);
+                item.set('pluginObj', plugin);
+                arr.push(plugin);
+            });
+            this.api.asc_pluginsRegister('', arr);
+            Common.Gateway.pluginsReady();
+        },
+
+        onPluginShow: function(plugin, variationIndex, frameId, urlAddition) {
+            var variation = plugin.get_Variations()[variationIndex];
+            if (variation.get_Visual()) {
+                var url = variation.get_Url();
+                url = ((plugin.get_BaseUrl().length == 0) ? url : plugin.get_BaseUrl()) + url;
+                if (urlAddition)
+                    url += urlAddition;
+                var me = this,
+                    isCustomWindow = variation.get_CustomWindow(),
+                    arrBtns = variation.get_Buttons(),
+                    newBtns = [],
+                    size = variation.get_Size(),
+                    isModal = variation.get_Modal();
+                if (!size || size.length<2) size = [800, 600];
+
+                if (_.isArray(arrBtns)) {
+                    _.each(arrBtns, function(b, index){
+                        if (b.visible)
+                            newBtns[index] = {caption: b.text, value: index, primary: b.primary};
+                    });
+                }
+
+                var help = variation.get_Help();
+                me.pluginDlg = new Common.Views.PluginDlg({
+                    cls: isCustomWindow ? 'plain' : '',
+                    header: !isCustomWindow,
+                    title: plugin.get_Name(),
+                    width: size[0], // inner width
+                    height: size[1], // inner height
+                    url: url,
+                    frameId : frameId,
+                    buttons: isCustomWindow ? undefined : newBtns,
+                    toolcallback: _.bind(this.onToolClose, this),
+                    help: !!help,
+                    modal: isModal!==undefined ? isModal : true
+                });
+                me.pluginDlg.on({
+                    'render:after': function(obj){
+                        obj.getChild('.footer .dlg-btn').on('click', _.bind(me.onDlgBtnClick, me));
+                        me.pluginContainer = me.pluginDlg.$window.find('#id-plugin-container');
+                    },
+                    'close': function(obj){
+                        me.pluginDlg = undefined;
+                    },
+                    'drag': function(args){
+                        me.api.asc_pluginEnableMouseEvents(args[1]=='start');
+                    },
+                    'resize': function(args){
+                        me.api.asc_pluginEnableMouseEvents(args[1]=='start');
+                    },
+                    'help': function(){
+                        help && window.open(help, '_blank');
+                    }
+                });
+
+                me.pluginDlg.show();
+            }
+        },
+
+        onPluginClose: function(plugin) {
+            if (this.pluginDlg)
+                this.pluginDlg.close();
+            this.runAutoStartPlugins();
+        },
+
+        onPluginResize: function(size, minSize, maxSize, callback ) {
+            if (this.pluginDlg) {
+                var resizable = (minSize && minSize.length>1 && maxSize && maxSize.length>1 && (maxSize[0] > minSize[0] || maxSize[1] > minSize[1] || maxSize[0]==0 || maxSize[1] == 0));
+                this.pluginDlg.setResizable(resizable, minSize, maxSize);
+                this.pluginDlg.setInnerSize(size[0], size[1]);
+                if (callback)
+                    callback.call();
+            }
+        },
+
+        onDlgBtnClick: function(event) {
+            var state = event.currentTarget.attributes['result'].value;
+            this.api.asc_pluginButtonClick(parseInt(state));
+        },
+
+        onToolClose: function() {
+            this.api.asc_pluginButtonClick(-1);
+        },
+
+        onPluginMouseUp: function(x, y) {
+            if (this.pluginDlg) {
+                if (this.pluginDlg.binding.dragStop) this.pluginDlg.binding.dragStop();
+                if (this.pluginDlg.binding.resizeStop) this.pluginDlg.binding.resizeStop();
+            }
+        },
+
+        onPluginMouseMove: function(x, y) {
+            if (this.pluginDlg) {
+                var offset = this.pluginContainer.offset();
+                if (this.pluginDlg.binding.drag) this.pluginDlg.binding.drag({ pageX: x*Common.Utils.zoom()+offset.left, pageY: y*Common.Utils.zoom()+offset.top });
+                if (this.pluginDlg.binding.resize) this.pluginDlg.binding.resize({ pageX: x*Common.Utils.zoom()+offset.left, pageY: y*Common.Utils.zoom()+offset.top });
+            }
+        },
+
+        onPluginsInit: function(pluginsdata) {
+            !(pluginsdata instanceof Array) && (pluginsdata = pluginsdata["pluginsData"]);
+            this.parsePlugins(pluginsdata)
+        },
+
+        runAutoStartPlugins: function() {
+            if (this.autostart && this.autostart.length > 0) {
+                this.api.asc_pluginRun(this.autostart.shift(), 0, '');
+            }
+        },
+
+        resetPluginsList: function() {
+            this.getApplication().getCollection('Common.Collections.Plugins').reset();
+        },
+
+        parsePlugins: function(pluginsdata) {
+            var me = this;
+            var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
+                isEdit = false,
+                editor = me.editor,
+                apiVersion = me.api ? me.api.GetVersion() : undefined;
+            if ( pluginsdata instanceof Array ) {
+                var arr = [],
+                    lang = me.appOptions.lang.split(/[\-_]/)[0];
+                pluginsdata.forEach(function(item){
+                    if ( arr.some(function(i) {
+                            return (i.get('baseUrl') == item.baseUrl || i.get('guid') == item.guid);
+                        }
+                    ) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}))
+                    {
+                        return;
+                    }
+
+                    var variationsArr = [],
+                        pluginVisible = false;
+                    item.variations.forEach(function(itemVar){
+                        var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !itemVar.isSystem;
+                        if ( visible ) pluginVisible = true;
+
+                        if (!item.isUICustomizer ) {
+                            var model = new Common.Models.PluginVariation(itemVar);
+                            var description = itemVar.description;
+                            if (typeof itemVar.descriptionLocale == 'object')
+                                description = itemVar.descriptionLocale[lang] || itemVar.descriptionLocale['en'] || description || '';
+
+                            _.each(itemVar.buttons, function(b, index){
+                                if (typeof b.textLocale == 'object')
+                                    b.text = b.textLocale[lang] || b.textLocale['en'] || b.text || '';
+                                b.visible = (isEdit || b.isViewer !== false);
+                            });
+
+                            model.set({
+                                description: description,
+                                index: variationsArr.length,
+                                url: itemVar.url,
+                                icons: itemVar.icons2 || itemVar.icons,
+                                buttons: itemVar.buttons,
+                                visible: visible,
+                                help: itemVar.help
+                            });
+
+                            variationsArr.push(model);
+                        }
+                    });
+
+                    if (variationsArr.length > 0 && !item.isUICustomizer) {
+                        var name = item.name;
+                        if (typeof item.nameLocale == 'object')
+                            name = item.nameLocale[lang] || item.nameLocale['en'] || name || '';
+
+                        if (pluginVisible)
+                            pluginVisible = me.checkPluginVersion(apiVersion, item.minVersion);
+
+                        arr.push(new Common.Models.Plugin({
+                            name : name,
+                            guid: item.guid,
+                            baseUrl : item.baseUrl,
+                            variations: variationsArr,
+                            currentVariation: 0,
+                            visible: pluginVisible,
+                            groupName: (item.group) ? item.group.name : '',
+                            groupRank: (item.group) ? item.group.rank : 0,
+                            minVersion: item.minVersion
+                        }));
+                    }
+                });
+
+                if (pluginStore)
+                {
+                    arr = pluginStore.models.concat(arr);
+                    arr.sort(function(a, b){
+                        var rank_a = a.get('groupRank'),
+                            rank_b = b.get('groupRank');
+                        if (rank_a < rank_b)
+                            return (rank_a==0) ? 1 : -1;
+                        if (rank_a > rank_b)
+                            return (rank_b==0) ? -1 : 1;
+                        return 0;
+                    });
+                    pluginStore.reset(arr);
+                    this.appOptions.canPlugins = !pluginStore.isEmpty();
+                }
+            }
+            else {
+                this.appOptions.canPlugins = false;
+            }
+
+            if (this.appOptions.canPlugins) {
+                this.refreshPluginsList();
+                this.runAutoStartPlugins();
+            }
+        },
+
+        checkPluginVersion: function(apiVersion, pluginVersion) {
+            if (apiVersion && apiVersion!=='develop' && pluginVersion && typeof pluginVersion == 'string') {
+                var res = pluginVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/),
+                    apires = apiVersion.match(/^([0-9]+)(?:.([0-9]+))?(?:.([0-9]+))?$/);
+                if (res && res.length>1 && apires && apires.length>1) {
+                    for (var i=0; i<3; i++) {
+                        var pluginVer = res[i+1] ? parseInt(res[i+1]) : 0,
+                            apiVer = apires[i+1] ? parseInt(apires[i+1]) : 0;
+                        if (pluginVer>apiVer)
+                            return false;
+                        if (pluginVer<apiVer)
+                            return true;
+                    }
+                }
+
+            }
+            return true;
+        },
+
+        getPlugins: function(pluginsData, fetchFunction) {
+            if (!pluginsData || pluginsData.length<1)
+                return Promise.resolve([]);
+
+            fetchFunction = fetchFunction || function (url) {
+                return fetch(url)
+                    .then(function(response) {
+                        if ( response.ok ) return response.json();
+                        else return Promise.reject(url);
+                    }).then(function(json) {
+                        json.baseUrl = url.substring(0, url.lastIndexOf("config.json"));
+                        return json;
+                    });
+            };
+
+            var loaded = [];
+            return pluginsData.map(fetchFunction).reduce(function (previousPromise, currentPromise) {
+                return previousPromise
+                    .then(function()
+                    {
+                        return currentPromise;
+                    })
+                    .then(function(item)
+                    {
+                        loaded.push(item);
+                        return Promise.resolve(item);
+                    })
+                    .catch(function(item)
+                    {
+                        return Promise.resolve(item);
+                    });
+
+            }, Promise.resolve())
+                .then(function ()
+                {
+                    return Promise.resolve(loaded);
+                });
+        },
+
+        mergePlugins: function() {
+            if (this.serverPlugins.plugins !== undefined && this.configPlugins.plugins !== undefined) { // undefined - plugins are loading
+                var autostart = [],
+                    arr = [],
+                    plugins = this.configPlugins,
+                    warn = false;
+                if (plugins.plugins && plugins.plugins.length>0)
+                    arr = plugins.plugins;
+                if (plugins && plugins.config) {
+                    var val = plugins.config.autostart || plugins.config.autoStartGuid;
+                    if (typeof (val) == 'string')
+                        val = [val];
+                    warn = !!plugins.config.autoStartGuid;
+                    autostart = val || [];
+                }
+
+                plugins = this.serverPlugins;
+                if (plugins.plugins && plugins.plugins.length>0)
+                    arr = arr.concat(plugins.plugins);
+                if (plugins && plugins.config) {
+                    val = plugins.config.autostart || plugins.config.autoStartGuid;
+                    if (typeof (val) == 'string')
+                        val = [val];
+                    (warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
+                    autostart = autostart.concat(val || []);
+                }
+
+                this.autostart = autostart;
+                this.parsePlugins(arr);
+            }
+        }
+
+    }, DE.Controllers.Plugins || {}));
+});

apps/documenteditor/forms/app_dev.js

@@ -129,7 +129,8 @@ require([
         nameSpace: 'DE',
         autoCreate: false,
         controllers : [
-            'ApplicationController'
+            'ApplicationController',
+            'Plugins'
         ]
     });
 
@@ -137,10 +138,12 @@ require([
         function() {
             require([
                 'documenteditor/forms/app/controller/ApplicationController',
+                'documenteditor/forms/app/controller/Plugins',
                 'documenteditor/forms/app/view/ApplicationView',
                 'common/main/lib/util/utils',
                 'common/main/lib/util/LocalStorage',
                 'common/main/lib/controller/Themes',
+                'common/main/lib/view/PluginDlg',
                 'common/forms/lib/view/modals'
             ], function() {
                 window.compareVersions = true;

apps/documenteditor/forms/locale/cs.json

@@ -123,6 +123,7 @@
   "DE.Controllers.ApplicationController.textSaveAs": "Uložit jako PDF",
   "DE.Controllers.ApplicationController.textSaveAsDesktop": "Uložit jako...",
   "DE.Controllers.ApplicationController.textSubmited": "<b>Formulář úspěšně uložen.</b><br>Klikněte pro zavření nápovědy.",
+  "DE.Controllers.ApplicationController.titleLicenseExp": "Platnost licence vypršela",
   "DE.Controllers.ApplicationController.titleServerVersion": "Editor byl aktualizován",
   "DE.Controllers.ApplicationController.titleUpdateVersion": "Verze změněna",
   "DE.Controllers.ApplicationController.txtArt": "Zde napište text",
@@ -139,6 +140,7 @@
   "DE.Controllers.ApplicationController.uploadImageSizeMessage": "Obrázek je příliš velký. Maximální velikost je 25 MB.",
   "DE.Controllers.ApplicationController.waitText": "Čekejte prosím…",
   "DE.Controllers.ApplicationController.warnLicenseExceeded": "Došlo k dosažení limitu počtu souběžných spojení %1 editorů. Dokument bude otevřen pouze pro náhled.<br>Pro více podrobností kontaktujte svého správce.",
+  "DE.Controllers.ApplicationController.warnLicenseExp": "Platnost vaší licence vypršela.<br>Prosím, aktualizujte vaší licenci a obnovte stránku.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedNoAccess": "Platnost vaší licence skončila.<br>Nemáte přístup k upravování dokumentů.<br>Obraťte se na svého správce.",
   "DE.Controllers.ApplicationController.warnLicenseLimitedRenewed": "Vaši licenci je nutné obnovit.<br>Přístup k možnostem editace dokumentu je omezen.<br>Pro získání plného přístupu prosím kontaktujte svého administrátora.",
   "DE.Controllers.ApplicationController.warnLicenseUsersExceeded": "Došlo dosažení limitu %1 editorů v režimu spolupráce na úpravách. Ohledně podrobností se obraťte na svého správce.",
@@ -147,12 +149,15 @@
   "DE.Views.ApplicationView.textClear": "Vymazat všechna pole",
   "DE.Views.ApplicationView.textCopy": "Kopírovat",
   "DE.Views.ApplicationView.textCut": "Vyjmout",
+  "DE.Views.ApplicationView.textFitToPage": "Přízpůsobit stránce",
+  "DE.Views.ApplicationView.textFitToWidth": "Přizpůsobit šířce",
   "DE.Views.ApplicationView.textNext": "Následující pole",
   "DE.Views.ApplicationView.textPaste": "Vložit",
   "DE.Views.ApplicationView.textPrintSel": "Vytisknout vybrané",
   "DE.Views.ApplicationView.textRedo": "Znovu",
   "DE.Views.ApplicationView.textSubmit": "Potvrdit",
   "DE.Views.ApplicationView.textUndo": "Zpět",
+  "DE.Views.ApplicationView.textZoom": "Přiblížení",
   "DE.Views.ApplicationView.txtDarkMode": "Tmavý režim",
   "DE.Views.ApplicationView.txtDownload": "Stáhnout",
   "DE.Views.ApplicationView.txtDownloadDocx": "Stáhnout jako docx",
@@ -162,5 +167,5 @@
   "DE.Views.ApplicationView.txtFullScreen": "Na celou obrazovku",
   "DE.Views.ApplicationView.txtPrint": "Tisk",
   "DE.Views.ApplicationView.txtShare": "Sdílet",
-  "DE.Views.ApplicationView.txtTheme": "Vzhled uživatelského rozhraní"
+  "DE.Views.ApplicationView.txtTheme": "Vzhled prostředí"
 }

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

@@ -61,6 +61,9 @@ define([
                             if (!me._navigationObject)
                                 me._navigationObject = obj;
                             me.updateNavigation();
+                        } else {
+                            if (me.panelNavigation && me.panelNavigation.viewNavigationList && me.panelNavigation.viewNavigationList.scroller)
+                                me.panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
                         }
                     },
                     'hide': function() {
@@ -293,6 +296,8 @@ define([
                     arr[0].set('tip', this.txtGotoBeginning);
                 }
                 this.getApplication().getCollection('Navigation').reset(arr);
+                if (this.panelNavigation && this.panelNavigation.viewNavigationList && this.panelNavigation.viewNavigationList.scroller)
+                    this.panelNavigation.viewNavigationList.scroller.update({alwaysVisibleY: true});
             }
         },
 

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

@@ -57,8 +57,8 @@ define([
             this.addListeners({
                 'PageThumbnails': {
                     'show': _.bind(function () {
+                        this.api.asc_viewerThumbnailsResize();
                         if (this.firstShow) {
-                            this.api.asc_viewerThumbnailsResize();
                             this.api.asc_setViewerThumbnailsUsePageRect(Common.localStorage.getBool("de-thumbnails-highlight", true));
                             this.firstShow = false;
                         }

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

@@ -246,8 +246,10 @@ define([
             if (this.view) {
                 var current_theme = Common.UI.Themes.currentThemeId() || Common.UI.Themes.defaultThemeId(),
                     menu_item = _.findWhere(this.view.btnInterfaceTheme.menu.items, {value: current_theme});
-                this.view.btnInterfaceTheme.menu.clearAll();
+                if ( menu_item ) {
-                menu_item.setChecked(true, true);
+                    this.view.btnInterfaceTheme.menu.clearAll();
+                    menu_item.setChecked(true, true);
+                }
                 this.view.btnDarkDocument.setDisabled(!Common.UI.Themes.isDarkTheme());
             }
         },

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

@@ -205,7 +205,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
 
             // date picker
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
-                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
                 { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);

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

@@ -89,7 +89,7 @@ define([
             Common.UI.Window.prototype.render.call(this);
 
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
-                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
                 { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);

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

@@ -2120,7 +2120,7 @@ define([
                     menuViewCut.setDisabled(disabled || !cancopy);
                     menuViewPaste.setVisible(me._fillFormwMode && canEditControl);
                     menuViewPaste.setDisabled(disabled);
-                    menuViewPrint.setVisible(me.mode.canPrint);
+                    menuViewPrint.setVisible(me.mode.canPrint && !me._fillFormwMode);
                     menuViewPrint.setDisabled(!cancopy);
 
                 },

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

@@ -1274,26 +1274,15 @@ define([
                 this._state.imgPositionY = 50;
             }
             this.imagePositionLabel.text(Math.round(this._state.imgPositionX) + ',' + Math.round(this._state.imgPositionY));
-
-            if (this._sendUndoPoint) {
-                this.api.setStartPointHistory();
-                this._sendUndoPoint = false;
-                this.updateslider = setInterval(_.bind(this.imgPositionApplyFunc, this, type), 100);
-            }
         },
 
         onImagePositionChangeComplete: function (type, field, newValue, oldValue) {
-            clearInterval(this.updateslider);
             if (type === 'x') {
                 this._state.imgPositionX = newValue;
             } else {
                 this._state.imgPositionY = newValue;
             }
-            if (!this._sendUndoPoint) { // start point was added
+            this.imgPositionApplyFunc(type);
-                this.api.setEndPointHistory();
-                this.imgPositionApplyFunc(type);
-            }
-            this._sendUndoPoint = true;
         },
 
         imgPositionApplyFunc: function (type) {

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

@@ -129,7 +129,7 @@ define([
                 this.txtKnit, this.txtLeather, this.txtBrownPaper, this.txtPapyrus, this.txtWood];
 
             this.fillControls = [];
-            this.gradientColorsStr="";
+            this.gradientColorsStr="#000, #fff";
             this.typeGradient = 90 ;
             this.render();
         },
@@ -468,9 +468,13 @@ define([
                 rawData = record;
             }
 
-            this.typeGradient = rawData.type + 90;
+            if (this.GradFillType === Asc.c_oAscFillGradType.GRAD_LINEAR) {
-
+                this.GradLinearDirectionType = rawData.type;
-            (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
+                this.typeGradient = rawData.type + 90;
+            } else {
+                this.GradRadialDirectionIdx = 0;
+                this.typeGradient = rawData.type;
+            }
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
                     this.numGradientAngle.setValue(rawData.type, true);
@@ -1223,13 +1227,13 @@ define([
 
         btnDirectionRedraw: function(slider, gradientColorsStr) {
             this.gradientColorsStr = gradientColorsStr;
-            if (this.mnuDirectionPicker.dataViewItems.length == 1)
+            _.each(this._viewDataLinear, function(item){
-                this.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + gradientColorsStr + ')'});
+                item.gradientColorsStr = gradientColorsStr;
-            else
+            });
-                this.mnuDirectionPicker.dataViewItems.forEach(function (item) {
+            this._viewDataRadial.gradientColorsStr = this.gradientColorsStr;
-                    var type = item.model.get('type') + 90;
+            this.mnuDirectionPicker.store.each(function(item){
-                    item.$el.children(0).css({'background': 'linear-gradient(' + type + 'deg, ' + gradientColorsStr + ')'});
+                item.set('gradientColorsStr', gradientColorsStr);
-                });
+            }, this);
 
             if (this.typeGradient == -1)
                 this.btnDirection.$icon.css({'background': 'none'});
@@ -1397,9 +1401,12 @@ define([
                 { type:270, subtype:3},
                 { type:225, subtype:7}
             ];
+            _.each(this._viewDataLinear, function(item){
+                item.gradientColorsStr = me.gradientColorsStr;
+            });
 
             this._viewDataRadial = [
-                { type:2, subtype:5}
+                { type:2, subtype:5, gradientColorsStr: this.gradientColorsStr}
             ];
 
             this.btnDirection = new Common.UI.Button({
@@ -1424,8 +1431,8 @@ define([
                     allowScrollbar: false,
                     store: new Common.UI.DataViewStore(me._viewDataLinear),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-gradient" style="background: '
-                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,#000, #fff)'
+                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,<%= gradientColorsStr %>)'
-                        +' <%} else {%> radial-gradient( #000 , #fff 70%) <%}%>;"></div>')
+                        +' <%} else {%> radial-gradient(<%= gradientColorsStr %>) <%}%>;"></div>')
                 });
             });
             this.btnDirection.render($('#shape-button-direction'));

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

@@ -108,6 +108,8 @@ define([
             this.BorderSize = 0;
             this.BorderType = Asc.c_oDashType.solid;
 
+            this.gradientColorsStr="#000, #fff";
+            this.typeGradient = 90 ;
             DE.getCollection('Common.Collections.TextArt').bind({
                 reset: this.fillTextArt.bind(this)
             });
@@ -278,10 +280,9 @@ define([
                 this.mnuDirectionPicker.restoreHeight = 174;
                 var record = this.mnuDirectionPicker.store.findWhere({type: this.GradLinearDirectionType});
                 this.mnuDirectionPicker.selectRecord(record, true);
-                if (record)
+
-                    this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
+                this.typeGradient = (record) ? this.GradLinearDirectionType + 90 : -1;
-                else
+
-                    this.btnDirection.setIconCls('');
                 this.numGradientAngle.setValue(this.GradLinearDirectionType, true);
                 this.numGradientAngle.setDisabled(this._locked);
             } else if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) {
@@ -290,9 +291,9 @@ define([
                 this.mnuDirectionPicker.restoreHeight = 58;
                 this.mnuDirectionPicker.selectByIndex(this.GradRadialDirectionIdx, true);
                 if (this.GradRadialDirectionIdx>=0)
-                    this.btnDirection.setIconCls('item-gradient ' + this._viewDataRadial[this.GradRadialDirectionIdx].iconcls);
+                    this.typeGradient = this._viewDataRadial[this.GradRadialDirectionIdx].type;
                 else
-                    this.btnDirection.setIconCls('');
+                    this.typeGradient= -1;
                 this.numGradientAngle.setValue(0, true);
                 this.numGradientAngle.setDisabled(true);
             }
@@ -332,8 +333,14 @@ define([
                 rawData = record;
             }
 
-            this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls);
+            //this.btnDirection.setIconCls('item-gradient ' + rawData.iconcls);
-            (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
+            if (this.GradFillType === Asc.c_oAscFillGradType.GRAD_LINEAR) {
+                this.GradLinearDirectionType = rawData.type;
+                this.typeGradient = rawData.type + 90;
+            } else {
+                this.GradRadialDirectionIdx = 0;
+                this.typeGradient = rawData.type;
+            }
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
                     this.numGradientAngle.setValue(rawData.type, true);
@@ -612,7 +619,7 @@ define([
                             this.onGradTypeSelect(this.cmbGradType, rec.attributes);
                         } else {
                             this.cmbGradType.setValue('');
-                            this.btnDirection.setIconCls('');
+                            this.typeGradient = -1;
                         }
                         this._state.GradFillType = this.GradFillType;
                     }
@@ -623,10 +630,7 @@ define([
                             this.GradLinearDirectionType=value;
                             var record = this.mnuDirectionPicker.store.findWhere({type: value});
                             this.mnuDirectionPicker.selectRecord(record, true);
-                            if (record)
+                            this.typeGradient = (record)? value + 90 : -1;
-                                this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls'));
-                            else
-                                this.btnDirection.setIconCls('');
                             this.numGradientAngle.setValue(value, true);
                         }
                     } else
@@ -659,10 +663,17 @@ define([
                             me.GradColor.values[index] = position;
                         }
                     });
+
+                    var arrGrCollors=[];
+                    var scale=(this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR)?1:0.7;
                     for (var index=0; index<length; index++) {
+
                         me.sldrGradient.setColorValue(Common.Utils.String.format('#{0}', (typeof(me.GradColor.colors[index]) == 'object') ? me.GradColor.colors[index].color : me.GradColor.colors[index]), index);
                         me.sldrGradient.setValue(index, me.GradColor.values[index]);
+                        arrGrCollors.push(me.sldrGradient.getColorValue(index)+ ' '+ me.sldrGradient.getValue(index)*scale +'%');
                     }
+                    this.btnDirectionRedraw(me.sldrGradient, arrGrCollors.join(', '));
+
                     if (_.isUndefined(me.GradColor.currentIdx) || me.GradColor.currentIdx >= this.GradColor.colors.length) {
                         me.GradColor.currentIdx = 0;
                     }
@@ -830,6 +841,26 @@ define([
             }
         },
 
+        btnDirectionRedraw: function(slider, gradientColorsStr) {
+            this.gradientColorsStr = gradientColorsStr;
+            _.each(this._viewDataLinear, function(item){
+                item.gradientColorsStr = gradientColorsStr;
+            });
+            this._viewDataRadial.gradientColorsStr = this.gradientColorsStr;
+            this.mnuDirectionPicker.store.each(function(item){
+                item.set('gradientColorsStr', gradientColorsStr);
+            }, this);
+
+            if (this.typeGradient == -1)
+                this.btnDirection.$icon.css({'background': 'none'});
+            else if (this.typeGradient == 2)
+                this.btnDirection.$icon.css({'background': ('radial-gradient(' + gradientColorsStr + ')')});
+            else
+                this.btnDirection.$icon.css({
+                    'background': ('linear-gradient(' + this.typeGradient + 'deg, ' + gradientColorsStr + ')')
+                });
+        },
+
         createDelayedControls: function() {
             var me = this;
 
@@ -904,18 +935,21 @@ define([
             this.lockedControls.push(this.cmbGradType);
 
             this._viewDataLinear = [
-                { offsetx: 0,   offsety: 0,   type:45,  subtype:-1, iconcls:'gradient-left-top' },
+                { type:45,  subtype:-1},
-                { offsetx: 50,  offsety: 0,   type:90,  subtype:4,  iconcls:'gradient-top'},
+                { type:90,  subtype:4},
-                { offsetx: 100, offsety: 0,   type:135, subtype:5,  iconcls:'gradient-right-top'},
+                { type:135, subtype:5},
-                { offsetx: 0,   offsety: 50,  type:0,   subtype:6,  iconcls:'gradient-left', cls: 'item-gradient-separator', selected: true},
+                { type:0,   subtype:6, cls: 'item-gradient-separator', selected: true},
-                { offsetx: 100, offsety: 50,  type:180, subtype:1,  iconcls:'gradient-right'},
+                { type:180, subtype:1},
-                { offsetx: 0,   offsety: 100, type:315, subtype:2,  iconcls:'gradient-left-bottom'},
+                { type:315, subtype:2},
-                { offsetx: 50,  offsety: 100, type:270, subtype:3,  iconcls:'gradient-bottom'},
+                { type:270, subtype:3},
-                { offsetx: 100, offsety: 100, type:225, subtype:7,  iconcls:'gradient-right-bottom'}
+                { type:225, subtype:7}
             ];
+            _.each(this._viewDataLinear, function(item){
+                item.gradientColorsStr = me.gradientColorsStr;
+            });
 
             this._viewDataRadial = [
-                { offsetx: 100, offsety: 150, type:2, subtype:5, iconcls:'gradient-radial-center'}
+                { type:2, subtype:5, gradientColorsStr: this.gradientColorsStr}
             ];
 
             this.btnDirection = new Common.UI.Button({
@@ -938,7 +972,9 @@ define([
                     parentMenu: btn.menu,
                     restoreHeight: 174,
                     store: new Common.UI.DataViewStore(me._viewDataLinear),
-                    itemTemplate: _.template('<div id="<%= id %>" class="item-gradient" style="background-position: -<%= offsetx %>px -<%= offsety %>px;"></div>')
+                    itemTemplate: _.template('<div id="<%= id %>" class="item-gradient" style="background: '
+                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,<%= gradientColorsStr %>)'
+                        +' <%} else {%> radial-gradient(<%= gradientColorsStr %>) <%}%>;"></div>')
                 });
             });
             this.btnDirection.render($('#textart-button-direction'));

apps/documenteditor/main/locale/be.json

@@ -35,7 +35,7 @@
   "Common.Controllers.ReviewChanges.textIndentRight": "Водступ справа",
   "Common.Controllers.ReviewChanges.textInserted": "<b>Устаўлена:</b>",
   "Common.Controllers.ReviewChanges.textItalic": "Курсіў",
-  "Common.Controllers.ReviewChanges.textJustify": "Па шырыні",
+  "Common.Controllers.ReviewChanges.textJustify": "Выраўнованне па шырыні",
   "Common.Controllers.ReviewChanges.textKeepLines": "Не падзяляць абзац",
   "Common.Controllers.ReviewChanges.textKeepNext": "Не адасобліваць ад наступнага",
   "Common.Controllers.ReviewChanges.textLeft": "Выраўнаваць па леваму краю",
@@ -79,16 +79,25 @@
   "Common.Controllers.ReviewChanges.textUrl": "Устаўце URL-адрас дакумента",
   "Common.Controllers.ReviewChanges.textWidow": "Кіраванне акном",
   "Common.define.chartData.textArea": "Вобласць",
+  "Common.define.chartData.textAreaStackedPer": "100% з абласцямі і зводкай",
   "Common.define.chartData.textBar": "Лінія",
   "Common.define.chartData.textBarNormal3d": "Трохвымерная гістаграма з групаваннем",
   "Common.define.chartData.textBarNormal3dPerspective": "Трохвымерная гістаграма",
   "Common.define.chartData.textBarStacked3d": "Трохвымерная састаўная гістаграма",
+  "Common.define.chartData.textBarStackedPer": "100% слупкі са зводкай",
   "Common.define.chartData.textBarStackedPer3d": "Трохвымерная састаўная гістаграма 100%",
   "Common.define.chartData.textCharts": "Дыяграмы",
   "Common.define.chartData.textColumn": "Гістаграма",
   "Common.define.chartData.textHBarNormal3d": "Трохвымерная лінейная з групаваннем",
+  "Common.define.chartData.textHBarStacked3d": "3-D лініі са зводкай",
+  "Common.define.chartData.textHBarStackedPer": "100% лініі са зводкай",
+  "Common.define.chartData.textHBarStackedPer3d": "3-D 100% лініі са зводкай",
   "Common.define.chartData.textLine": "Графік",
+  "Common.define.chartData.textLine3d": "3-D лініі",
+  "Common.define.chartData.textLineStackedPer": "100% лініі са зводкай",
+  "Common.define.chartData.textLineStackedPerMarker": "100% лініі са зводкай і адзнакамі",
   "Common.define.chartData.textPie": "Па крузе",
+  "Common.define.chartData.textPie3d": "3-D круг",
   "Common.define.chartData.textPoint": "XY (рассеяная)",
   "Common.define.chartData.textStock": "Біржа",
   "Common.define.chartData.textSurface": "Паверхня",
@@ -178,6 +187,8 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Спісы з адзнакамі",
   "Common.Views.AutoCorrectDialog.textBy": "На",
   "Common.Views.AutoCorrectDialog.textDelete": "Выдаліць",
+  "Common.Views.AutoCorrectDialog.textFLCells": "Першыя словы ў ячэйках табліцы з вялікай літары",
+  "Common.Views.AutoCorrectDialog.textFLSentence": "Сказы з вялікай літары",
   "Common.Views.AutoCorrectDialog.textHyphens": "Злучкі (--) на працяжнік (—)",
   "Common.Views.AutoCorrectDialog.textMathCorrect": "Аўтазамена матэматычнымі сімваламі",
   "Common.Views.AutoCorrectDialog.textNumbered": "Нумараваныя спісы",
@@ -197,6 +208,8 @@
   "Common.Views.AutoCorrectDialog.warnReset": "Любая дададзеная вамі аўтазамена будзе выдаленая, а значэнні вернуцца да прадвызначаных. Хочаце працягнуць?",
   "Common.Views.AutoCorrectDialog.warnRestore": "Аўтазамена для %1 скінутая да прадвызначанага значэння. Хочаце працягнуць?",
   "Common.Views.Chat.textSend": "Адправіць",
+  "Common.Views.Comments.mniAuthorAsc": "Аўтары ад А да Я",
+  "Common.Views.Comments.mniAuthorDesc": "Аўтары ад Я да А",
   "Common.Views.Comments.textAdd": "Дадаць",
   "Common.Views.Comments.textAddComment": "Дадаць каментар",
   "Common.Views.Comments.textAddCommentToDoc": "Дадаць каментар да дакумента",
@@ -339,7 +352,8 @@
   "Common.Views.ReviewChanges.txtFinalCap": "Выніковы дакумент",
   "Common.Views.ReviewChanges.txtHistory": "Гісторыя версій",
   "Common.Views.ReviewChanges.txtMarkup": "Усе змены {0}",
-  "Common.Views.ReviewChanges.txtMarkupCap": "Змены",
+  "Common.Views.ReviewChanges.txtMarkupCap": "Разметка і зноскі",
+  "Common.Views.ReviewChanges.txtMarkupSimple": "Усе змены {0}<br>Зноскі адключаныя",
   "Common.Views.ReviewChanges.txtNext": "Далей",
   "Common.Views.ReviewChanges.txtOriginal": "Усе змены адкінутыя {0}",
   "Common.Views.ReviewChanges.txtOriginalCap": "Зыходны дакумент",
@@ -489,6 +503,7 @@
   "DE.Controllers.Main.errorUsersExceed": "Перасягнута колькасць карыстальнікаў, дазволеных згодна тарыфу",
   "DE.Controllers.Main.errorViewerDisconnect": "Злучэнне страчана. Вы зможаце праглядаць дакумент,<br>але не зможаце спампаваць альбо надрукаваць яго да аднаўлення злучэння і перазагрузкі старонкі.",
   "DE.Controllers.Main.leavePageText": "У дакуменце ёсць незахаваныя змены. Пстрыкніце \"Застацца на гэтай старонцы\", пасля \"Захаваць\". Націсніце \"Пакінуць старонку\", каб адкінуць змены.",
+  "DE.Controllers.Main.leavePageTextOnClose": "Усе незахаваныя змены ў гэтым дакуменце страцяцца.<br> Націсніце \"Скасаваць\" і \"Захаваць\", каб захаваць іх. Націсніце \"Добра\", каб адкінуць незахаваныя змены.",
   "DE.Controllers.Main.loadFontsTextText": "Загрузка даных…",
   "DE.Controllers.Main.loadFontsTitleText": "Загрузка даных",
   "DE.Controllers.Main.loadFontTextText": "Загрузка даных…",
@@ -561,9 +576,9 @@
   "DE.Controllers.Main.txtEvenPage": "Цотная старонка",
   "DE.Controllers.Main.txtFiguredArrows": "Фігурныя стрэлкі",
   "DE.Controllers.Main.txtFirstPage": "Першая старонка",
-  "DE.Controllers.Main.txtFooter": "Ніжні калантытул",
+  "DE.Controllers.Main.txtFooter": "Ніжні калонтытул",
   "DE.Controllers.Main.txtFormulaNotInTable": "Формула не ў табліцы",
-  "DE.Controllers.Main.txtHeader": "Верхні калантытул",
+  "DE.Controllers.Main.txtHeader": "Верхні калонтытул",
   "DE.Controllers.Main.txtHyperlink": "Гіперспасылка",
   "DE.Controllers.Main.txtIndTooLarge": "Індэкс занадта вялікі",
   "DE.Controllers.Main.txtLines": "Лініі",
@@ -789,7 +804,7 @@
   "DE.Controllers.Main.uploadDocSizeMessage": "Перасягнуты максімальны памер дакумента.",
   "DE.Controllers.Main.uploadImageExtMessage": "Невядомы фармат выявы.",
   "DE.Controllers.Main.uploadImageFileCountMessage": "Выяў не запампавана.",
-  "DE.Controllers.Main.uploadImageSizeMessage": "Перасягнуты максімальны памер выявы",
+  "DE.Controllers.Main.uploadImageSizeMessage": "Занадта вялікая выява. Максімальны памер - 25 МБ.",
   "DE.Controllers.Main.uploadImageTextText": "Запампоўванне выявы…",
   "DE.Controllers.Main.uploadImageTitleText": "Запампоўванне выявы",
   "DE.Controllers.Main.waitText": "Калі ласка, пачакайце...",
@@ -805,6 +820,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Вам адмоўлена ў правах на рэдагаванне гэтага файла.",
   "DE.Controllers.Navigation.txtBeginning": "Пачатак дакумента",
   "DE.Controllers.Navigation.txtGotoBeginning": "Перайсці да пачатку дакумента",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>Злучэнне страчана</b><br>Выконваецца спроба падлучэння. Праверце налады.",
   "DE.Controllers.Statusbar.textHasChanges": "Адсочаны новыя змены",
   "DE.Controllers.Statusbar.textTrackChanges": "Дакумент адкрыты з уключаным рэжымам адсочвання зменаў.",
   "DE.Controllers.Statusbar.tipReview": "Адсочваць змены",
@@ -828,6 +844,7 @@
   "DE.Controllers.Toolbar.textScript": "Індэксы",
   "DE.Controllers.Toolbar.textSymbols": "Сімвалы",
   "DE.Controllers.Toolbar.textWarning": "Увага",
+  "DE.Controllers.Toolbar.tipMarkersArrow": "Маркеры-стрэлкі",
   "DE.Controllers.Toolbar.txtAccent_Accent": "Націск",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Стрэлка ўправа-ўлева зверху",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Стрэлка ўлева зверху",
@@ -1202,7 +1219,7 @@
   "DE.Views.ChartSettings.textUndock": "Адмацаваць ад панэлі",
   "DE.Views.ChartSettings.textWidth": "Шырыня",
   "DE.Views.ChartSettings.textWrap": "Стыль абцякання",
-  "DE.Views.ChartSettings.txtBehind": "За",
+  "DE.Views.ChartSettings.txtBehind": "За тэкстам",
   "DE.Views.ChartSettings.txtInFront": "Перад тэкстам",
   "DE.Views.ChartSettings.txtInline": "У тэксце",
   "DE.Views.ChartSettings.txtSquare": "Вакол",
@@ -1316,8 +1333,8 @@
   "DE.Views.DocumentHolder.directHText": "Гарызантальна",
   "DE.Views.DocumentHolder.directionText": "Напрамак тэксту",
   "DE.Views.DocumentHolder.editChartText": "Рэдагаваць даныя",
-  "DE.Views.DocumentHolder.editFooterText": "Рэдагаваць ніжні калантытул",
+  "DE.Views.DocumentHolder.editFooterText": "Рэдагаваць ніжні калонтытул",
-  "DE.Views.DocumentHolder.editHeaderText": "Рэдагаваць верхні калантытул",
+  "DE.Views.DocumentHolder.editHeaderText": "Рэдагаваць верхні калонтытул",
   "DE.Views.DocumentHolder.editHyperlinkText": "Рэдагаваць гіперспасылку",
   "DE.Views.DocumentHolder.guestText": "Госць",
   "DE.Views.DocumentHolder.hyperlinkText": "Гіперспасылка",
@@ -1421,6 +1438,7 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Абнавіць змест",
   "DE.Views.DocumentHolder.textWrap": "Стыль абцякання",
   "DE.Views.DocumentHolder.tipIsLocked": "Гэты элемент рэдагуецца іншым карыстальнікам.",
+  "DE.Views.DocumentHolder.tipMarkersArrow": "Маркеры-стрэлкі",
   "DE.Views.DocumentHolder.toDictionaryText": "Дадаць у слоўнік",
   "DE.Views.DocumentHolder.txtAddBottom": "Дадаць ніжнюю мяжу",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Дадаць рыску дробу",
@@ -1432,7 +1450,7 @@
   "DE.Views.DocumentHolder.txtAddTop": "Дадаць верхнюю мяжу",
   "DE.Views.DocumentHolder.txtAddVer": "Дадаць вертыкальную лінію",
   "DE.Views.DocumentHolder.txtAlignToChar": "Выраўноўванне па сімвале",
-  "DE.Views.DocumentHolder.txtBehind": "За",
+  "DE.Views.DocumentHolder.txtBehind": "За тэкстам",
   "DE.Views.DocumentHolder.txtBorderProps": "Уласцівасці межаў",
   "DE.Views.DocumentHolder.txtBottom": "Знізу",
   "DE.Views.DocumentHolder.txtColumnAlign": "Выраўноўванне слупка",
@@ -1576,6 +1594,7 @@
   "DE.Views.FileMenu.btnSettingsCaption": "Дадатковыя налады…",
   "DE.Views.FileMenu.btnToEditCaption": "Рэдагаваць дакумент",
   "DE.Views.FileMenu.textDownload": "Спампаваць",
+  "DE.Views.FileMenuPanels.CreateNew.txtBlank": "Пусты дакумент",
   "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Стварыць новы",
   "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Ужыць",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Дадаць аўтара",
@@ -1622,7 +1641,7 @@
   "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Перш чым убачыць змены іх патрэбна ухваліць",
   "DE.Views.FileMenuPanels.Settings.strFast": "Хуткі",
   "DE.Views.FileMenuPanels.Settings.strFontRender": "Хінтынг шрыфтоў",
-  "DE.Views.FileMenuPanels.Settings.strForcesave": "Заўсёды захоўваць на серверы (інакш захоўваць на серверы падчас закрыцця дакумента)",
+  "DE.Views.FileMenuPanels.Settings.strForcesave": " Дадаваць версію ў сховішча пасля націскання кнопкі \"Захаваць\" або \"Ctrl+S\"",
   "DE.Views.FileMenuPanels.Settings.strInputMode": "Уключыць іерогліфы",
   "DE.Views.FileMenuPanels.Settings.strLiveComment": "Уключыць адлюстраванне каментароў у тэксце",
   "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Налады макрасаў",
@@ -1643,7 +1662,7 @@
   "DE.Views.FileMenuPanels.Settings.textAutoSave": "Аўтазахаванне",
   "DE.Views.FileMenuPanels.Settings.textCompatible": "Сумяшчальнасць",
   "DE.Views.FileMenuPanels.Settings.textDisabled": "Выключана",
-  "DE.Views.FileMenuPanels.Settings.textForceSave": "Захаваць на серверы",
+  "DE.Views.FileMenuPanels.Settings.textForceSave": "Захаванне прамежкавых версій",
   "DE.Views.FileMenuPanels.Settings.textMinute": "Кожную хвіліну",
   "DE.Views.FileMenuPanels.Settings.textOldVersions": "Зрабіць файлы сумяшчальнымі са старымі версіямі MS Word пры захаванні як DOCX",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Праглядзець усе",
@@ -1669,6 +1688,7 @@
   "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Паказваць апавяшчэнне",
   "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Адключыць усе макрасы з апавяшчэннем",
   "DE.Views.FileMenuPanels.Settings.txtWin": "як Windows",
+  "DE.Views.FormSettings.textAlways": "Заўсёды",
   "DE.Views.FormSettings.textAspect": "Захоўваць прапорцыі",
   "DE.Views.FormSettings.textAutofit": "Аўтазапаўненне",
   "DE.Views.FormSettings.textBackgroundColor": "Колер фону",
@@ -1683,9 +1703,12 @@
   "DE.Views.FormSettings.textPlaceholder": "Запаўняльнік",
   "DE.Views.FormSettings.textRequired": "Патрабуецца",
   "DE.Views.FormSettings.textSelectImage": "Абраць выяву",
+  "DE.Views.FormSettings.textTipAdd": "Дадаць новае значэнне",
   "DE.Views.FormSettings.textTipDown": "Перамясціць уніз",
   "DE.Views.FormSettings.textTipUp": "Перамясціць уверх",
+  "DE.Views.FormSettings.textWidth": "Шырыня ячэйкі",
   "DE.Views.FormsTab.capBtnComboBox": "Поле са спісам",
+  "DE.Views.FormsTab.textCreateForm": "Дадайце палі і стварыце запаўняльны дакумент OFORM",
   "DE.Views.FormsTab.textNoHighlight": "Без падсвятлення",
   "DE.Views.FormsTab.tipImageField": "Уставіць выяву",
   "DE.Views.FormsTab.txtUntitled": "Без назвы",
@@ -1696,8 +1719,8 @@
   "DE.Views.HeaderFooterSettings.textDiffFirst": "Асобны для першай старонкі",
   "DE.Views.HeaderFooterSettings.textDiffOdd": "Асобныя для цотных і няцотных",
   "DE.Views.HeaderFooterSettings.textFrom": "Пачаць з",
-  "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "Ніжні калантытул",
+  "DE.Views.HeaderFooterSettings.textHeaderFromBottom": "Ніжні калонтытул",
-  "DE.Views.HeaderFooterSettings.textHeaderFromTop": "Верхні калантытул",
+  "DE.Views.HeaderFooterSettings.textHeaderFromTop": "Верхні калонтытул",
   "DE.Views.HeaderFooterSettings.textInsertCurrent": "Уставіць на бягучай пазіцыі",
   "DE.Views.HeaderFooterSettings.textOptions": "Параметры",
   "DE.Views.HeaderFooterSettings.textPageNum": "Уставіць нумар старонкі",
@@ -1745,7 +1768,7 @@
   "DE.Views.ImageSettings.textSize": "Памер",
   "DE.Views.ImageSettings.textWidth": "Шырыня",
   "DE.Views.ImageSettings.textWrap": "Стыль абцякання",
-  "DE.Views.ImageSettings.txtBehind": "За",
+  "DE.Views.ImageSettings.txtBehind": "За тэкстам",
   "DE.Views.ImageSettings.txtInFront": "Перад тэкстам",
   "DE.Views.ImageSettings.txtInline": "У тэксце",
   "DE.Views.ImageSettings.txtSquare": "Вакол",
@@ -1820,7 +1843,7 @@
   "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Лініі і стрэлкі",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Шырыня",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Стыль абцякання",
-  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "За",
+  "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "За тэкстам",
   "DE.Views.ImageSettingsAdvanced.textWrapInFrontTooltip": "Перад тэкстам",
   "DE.Views.ImageSettingsAdvanced.textWrapInlineTooltip": "У тэксце",
   "DE.Views.ImageSettingsAdvanced.textWrapSquareTooltip": "Вакол",
@@ -1853,7 +1876,7 @@
   "DE.Views.LineNumbersDialog.txtAutoText": "Аўта",
   "DE.Views.Links.capBtnBookmarks": "Закладка",
   "DE.Views.Links.capBtnCaption": "Назва",
-  "DE.Views.Links.capBtnContentsUpdate": "Абнавіць",
+  "DE.Views.Links.capBtnContentsUpdate": "Абнавіць табліцу",
   "DE.Views.Links.capBtnCrossRef": "Перакрыжаваная спасылка",
   "DE.Views.Links.capBtnInsContents": "Змест",
   "DE.Views.Links.capBtnInsFootnote": "Зноска",
@@ -2094,7 +2117,7 @@
   "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Аўта",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Без межаў",
   "DE.Views.RightMenu.txtChartSettings": "Налады дыяграмы",
-  "DE.Views.RightMenu.txtHeaderFooterSettings": "Налады верхняга і ніжняга калантытулаў",
+  "DE.Views.RightMenu.txtHeaderFooterSettings": "Налады верхняга і ніжняга калонтытулаў",
   "DE.Views.RightMenu.txtImageSettings": "Налады выявы",
   "DE.Views.RightMenu.txtMailMergeSettings": "Налады аб’яднання",
   "DE.Views.RightMenu.txtParagraphSettings": "Налады абзаца",
@@ -2147,7 +2170,7 @@
   "DE.Views.ShapeSettings.textWrap": "Стыль абцякання",
   "DE.Views.ShapeSettings.tipAddGradientPoint": "Дадаць кропку градыента",
   "DE.Views.ShapeSettings.tipRemoveGradientPoint": "Выдаліць кропку градыента",
-  "DE.Views.ShapeSettings.txtBehind": "За",
+  "DE.Views.ShapeSettings.txtBehind": "За тэкстам",
   "DE.Views.ShapeSettings.txtBrownPaper": "Карычневая папера",
   "DE.Views.ShapeSettings.txtCanvas": "Палатно",
   "DE.Views.ShapeSettings.txtCarton": "Картон",
@@ -2205,6 +2228,7 @@
   "DE.Views.TableOfContentsSettings.strLinks": "Фарматаваць змест у спасылкі",
   "DE.Views.TableOfContentsSettings.strShowPages": "Паказаць нумары старонак",
   "DE.Views.TableOfContentsSettings.textBuildTable": "Стварыць змест з",
+  "DE.Views.TableOfContentsSettings.textBuildTableOF": "Стварыць табліцу з дапамогай",
   "DE.Views.TableOfContentsSettings.textEquation": "Раўнанне",
   "DE.Views.TableOfContentsSettings.textFigure": "Фігура",
   "DE.Views.TableOfContentsSettings.textLeader": "Запаўняльнік",
@@ -2218,6 +2242,7 @@
   "DE.Views.TableOfContentsSettings.textStyles": "Стылі",
   "DE.Views.TableOfContentsSettings.textTable": "Табліца",
   "DE.Views.TableOfContentsSettings.textTitle": "Змест",
+  "DE.Views.TableOfContentsSettings.txtCentered": "Па цэнтры",
   "DE.Views.TableOfContentsSettings.txtClassic": "Класічны",
   "DE.Views.TableOfContentsSettings.txtCurrent": "Бягучы",
   "DE.Views.TableOfContentsSettings.txtModern": "Сучасны",
@@ -2375,10 +2400,13 @@
   "DE.Views.TextArtSettings.tipAddGradientPoint": "Дадаць кропку градыента",
   "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Выдаліць кропку градыента",
   "DE.Views.TextArtSettings.txtNoBorders": "Без абвядзення",
+  "DE.Views.TextToTableDialog.textAutofit": "Аўтаматычны выбар шырыні",
   "DE.Views.TextToTableDialog.textColumns": "Слупкі",
+  "DE.Views.TextToTableDialog.textContents": "Аўтазапаўненне па змесціву",
   "DE.Views.TextToTableDialog.textOther": "Іншае",
   "DE.Views.TextToTableDialog.textPara": "Абзацы",
   "DE.Views.TextToTableDialog.textTableSize": "Памеры табліцы",
+  "DE.Views.TextToTableDialog.textWindow": "Аўтазапаўненне па шырыні акна",
   "DE.Views.TextToTableDialog.txtAutoText": "Аўта",
   "DE.Views.Toolbar.capBtnAddComment": "Дадаць каментар",
   "DE.Views.Toolbar.capBtnBlankPage": "Пустая старонка",
@@ -2389,7 +2417,7 @@
   "DE.Views.Toolbar.capBtnInsControls": "Элементы кіравання змесцівам",
   "DE.Views.Toolbar.capBtnInsDropcap": "Буквіца",
   "DE.Views.Toolbar.capBtnInsEquation": "Раўнанне",
-  "DE.Views.Toolbar.capBtnInsHeader": "Калантытулы",
+  "DE.Views.Toolbar.capBtnInsHeader": "Калонтытулы",
   "DE.Views.Toolbar.capBtnInsImage": "Выява",
   "DE.Views.Toolbar.capBtnInsPagebreak": "Разрывы",
   "DE.Views.Toolbar.capBtnInsShape": "Фігура",
@@ -2407,12 +2435,13 @@
   "DE.Views.Toolbar.capImgForward": "Перамясціць уперад",
   "DE.Views.Toolbar.capImgGroup": "Групаванне",
   "DE.Views.Toolbar.capImgWrapping": "Абцяканне",
+  "DE.Views.Toolbar.mniCapitalizeWords": "Кожнае слова з вялікай літары",
   "DE.Views.Toolbar.mniCustomTable": "Уставіць адвольную табліцу",
   "DE.Views.Toolbar.mniDrawTable": "Нарысаваць табліцу",
   "DE.Views.Toolbar.mniEditControls": "Налады элемента кіравання",
   "DE.Views.Toolbar.mniEditDropCap": "Налады буквіцы",
-  "DE.Views.Toolbar.mniEditFooter": "Рэдагаваць ніжні калантытул",
+  "DE.Views.Toolbar.mniEditFooter": "Рэдагаваць ніжні калонтытул",
-  "DE.Views.Toolbar.mniEditHeader": "Рэдагаваць верхні калантытул",
+  "DE.Views.Toolbar.mniEditHeader": "Рэдагаваць верхні калонтытул",
   "DE.Views.Toolbar.mniEraseTable": "Ачысціць табліцу",
   "DE.Views.Toolbar.mniFromFile": "З файла",
   "DE.Views.Toolbar.mniFromStorage": "Са сховішча",
@@ -2504,6 +2533,7 @@
   "DE.Views.Toolbar.tipAlignRight": "Выраўнаваць па праваму краю",
   "DE.Views.Toolbar.tipBack": "Назад",
   "DE.Views.Toolbar.tipBlankPage": "Уставіць пустую старонку",
+  "DE.Views.Toolbar.tipChangeCase": "Змяніць рэгістр",
   "DE.Views.Toolbar.tipChangeChart": "Змяніць тып дыяграмы",
   "DE.Views.Toolbar.tipClearStyle": "Ачысціць стыль",
   "DE.Views.Toolbar.tipColorSchemas": "Змяніць каляровую схему",
@@ -2515,7 +2545,7 @@
   "DE.Views.Toolbar.tipDecFont": "Паменшыць памер шрыфту",
   "DE.Views.Toolbar.tipDecPrLeft": "Паменшыць водступ",
   "DE.Views.Toolbar.tipDropCap": "Уставіць буквіцу",
-  "DE.Views.Toolbar.tipEditHeader": "Рэдагаваць калантытулы",
+  "DE.Views.Toolbar.tipEditHeader": "Рэдагаваць калонтытулы",
   "DE.Views.Toolbar.tipFontColor": "Колер шрыфту",
   "DE.Views.Toolbar.tipFontName": "Шрыфт",
   "DE.Views.Toolbar.tipFontSize": "Памер шрыфту",
@@ -2583,6 +2613,7 @@
   "DE.Views.Toolbar.txtScheme7": "Справядлівасць",
   "DE.Views.Toolbar.txtScheme8": "Плаваючая",
   "DE.Views.Toolbar.txtScheme9": "Ліцейня",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Заўсёды паказваць панэль інструментаў",
   "DE.Views.ViewTab.textNavigation": "Навігацыя",
   "DE.Views.ViewTab.textZoom": "Маштаб",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Аўта",

apps/documenteditor/main/locale/ca.json

@@ -213,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Llistes automàtiques de pics",
   "Common.Views.AutoCorrectDialog.textBy": "Per",
   "Common.Views.AutoCorrectDialog.textDelete": "Suprimeix",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Afegiu punt amb doble espai",
   "Common.Views.AutoCorrectDialog.textFLCells": "Posa en majúscula la primera lletra de les cel·les de la taula",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Escriu en majúscules la primera lletra de les frases",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Camins de xarxa i d'Internet per enllaços",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "El document es desarà amb el format nou. Podreu utilitzar totes les funcions de l'editor, però podria afectar la disposició del document. <br>Useu l'opció 'Compatibilitat' de la configuració avançada si voleu que els fitxers siguin compatibles amb versions anteriors de MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Sense títol",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Si continueu i deseu en aquest format, es perdran totes les característiques, excepte el text. <br>Voleu continuar?",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "El vostre {0} es convertirà a un format editable. Això pot trigar una estona. El document resultant s'optimitzarà perquè pugueu editar el text, de manera que pot ser que no se sembli a l'original {0}, sobretot si el fitxer original contenia molts gràfics.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Si continueu i deseu en aquest format, es pot perdre part del format. <br>Voleu continuar?",
   "DE.Controllers.Main.applyChangesTextText": "S'estan carregant els canvis...",
   "DE.Controllers.Main.applyChangesTitleText": "S'estan carregant els canvis",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Signa",
   "DE.Views.DocumentHolder.styleText": "Format d'estil",
   "DE.Views.DocumentHolder.tableText": "Taula",
+  "DE.Views.DocumentHolder.textAccept": "Accepteu el canvi",
   "DE.Views.DocumentHolder.textAlign": "Alineació",
   "DE.Views.DocumentHolder.textArrange": "Organitza",
   "DE.Views.DocumentHolder.textArrangeBack": "Envia al fons",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Enganxa",
   "DE.Views.DocumentHolder.textPrevPage": "Pàgina anterior",
   "DE.Views.DocumentHolder.textRefreshField": "Actualitza el camp",
+  "DE.Views.DocumentHolder.textReject": "Rebutjeu el canvi",
   "DE.Views.DocumentHolder.textRemCheckBox": "Suprimeix la casella de selecció",
   "DE.Views.DocumentHolder.textRemComboBox": "Suprimeix el quadre combinat",
   "DE.Views.DocumentHolder.textRemDropdown": "Suprimeix el desplegable",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Pàgina {0} de {1}",
   "DE.Views.Statusbar.tipFitPage": "Ajusta-ho a la pàgina",
   "DE.Views.Statusbar.tipFitWidth": "Ajusta-ho a l'amplària",
+  "DE.Views.Statusbar.tipHandTool": "Eina manual",
+  "DE.Views.Statusbar.tipSelectTool": "Seleccioneu l'eina",
   "DE.Views.Statusbar.tipSetLang": "Estableix l'idioma del text",
   "DE.Views.Statusbar.tipZoomFactor": "Zoom",
   "DE.Views.Statusbar.tipZoomIn": "Amplia",

apps/documenteditor/main/locale/cs.json

@@ -183,7 +183,7 @@
   "Common.UI.SynchronizeTip.textDontShow": "Tuto zprávu už nezobrazovat",
   "Common.UI.SynchronizeTip.textSynchronize": "Dokument byl mezitím změněn jiným uživatelem.<br>Kliknutím uložte změny provedené vámi a načtení těch od ostatních.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standardní barvy",
-  "Common.UI.ThemeColorPalette.textThemeColors": "Barvy motivu vzhledu",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Barvy vzhledu prostředí",
   "Common.UI.Themes.txtThemeClassicLight": "Standartní světlost",
   "Common.UI.Themes.txtThemeDark": "Tmavé",
   "Common.UI.Themes.txtThemeLight": "Světlé",
@@ -213,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Automatické odrážkové seznamy",
   "Common.Views.AutoCorrectDialog.textBy": "Od",
   "Common.Views.AutoCorrectDialog.textDelete": "Odstranit",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Přidat interval s dvojitou mezerou",
   "Common.Views.AutoCorrectDialog.textFLCells": "První písmeno v obsahu buněk tabulky měnit na velké",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Velká na začátku věty",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Internetové a síťové přístupy s hypertextovými odkazy",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "Dokument bude uložen v novém formátu. Umožní vám využít všechny funkce editoru, ale může ovlivnit rozvržení dokumentu.<br>Pokud chcete, aby soubory byly kompatibilní se staršími verzemi MS Word, použijte volbu „Kompatibilita“ v pokročilých nastaveních.",
   "DE.Controllers.LeftMenu.txtUntitled": "Bez názvu",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Pokud budete pokračovat v ukládání v tomto formátu, vše kromě textu bude ztraceno.<br>Opravdu chcete pokračovat?",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "Vašich {0} bude převedeno do editovatelného formátu. Tato operace může chvíli trvat. Výsledný dokument bude optimalizován a umožní editaci textu. Nemusí vypadat totožně jako původní {0}, zvláště pokud původní soubor obsahoval velké množství grafiky. ",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Uložením v tomto formátu může být ztracena část formátování dokumentu.<br>Opravdu chcete pokračovat?",
   "DE.Controllers.Main.applyChangesTextText": "Načítání změn…",
   "DE.Controllers.Main.applyChangesTitleText": "Načítání změn",
@@ -808,16 +810,16 @@
   "DE.Controllers.Main.txtShape_snip2SameRect": "Obdélník se dvěma ustřiženými rohy na stejné straně",
   "DE.Controllers.Main.txtShape_snipRoundRect": "Obdélník s jedním zaobleným a jedním ustřiženým rohem na stejné straně",
   "DE.Controllers.Main.txtShape_spline": "Křivka",
-  "DE.Controllers.Main.txtShape_star10": "Hvězda s 10 cípy",
+  "DE.Controllers.Main.txtShape_star10": "Hvězda s 10 paprsky",
-  "DE.Controllers.Main.txtShape_star12": "Hvězda s 12 cípy",
+  "DE.Controllers.Main.txtShape_star12": "Hvězda s 12 paprsky",
-  "DE.Controllers.Main.txtShape_star16": "Hvězda se 16 cípy",
+  "DE.Controllers.Main.txtShape_star16": "Hvězda s 16 paprsky",
-  "DE.Controllers.Main.txtShape_star24": "Hvězda se 24 cípy",
+  "DE.Controllers.Main.txtShape_star24": "Hvězda se 24 paprsky",
-  "DE.Controllers.Main.txtShape_star32": "Hvězda s 32 cípy",
+  "DE.Controllers.Main.txtShape_star32": "Hvězda se 32 paprsky",
-  "DE.Controllers.Main.txtShape_star4": "Hvězda se 4 cípy",
+  "DE.Controllers.Main.txtShape_star4": "Hvězda se 4 paprsky",
-  "DE.Controllers.Main.txtShape_star5": "Hvězda s 5 cípy",
+  "DE.Controllers.Main.txtShape_star5": "Hvězda s 5 paprsky",
-  "DE.Controllers.Main.txtShape_star6": "Hvězda se 6 cípy",
+  "DE.Controllers.Main.txtShape_star6": "Hvězda se 6 paprsky",
-  "DE.Controllers.Main.txtShape_star7": "Hvězda se 7 cípy",
+  "DE.Controllers.Main.txtShape_star7": "Hvězda se 7 paprsky",
-  "DE.Controllers.Main.txtShape_star8": "Hvězda s 8 cípy",
+  "DE.Controllers.Main.txtShape_star8": "Hvězda s 8 paprsky",
   "DE.Controllers.Main.txtShape_stripedRightArrow": "Proužkovaná šipka vpravo",
   "DE.Controllers.Main.txtShape_sun": "Slunce",
   "DE.Controllers.Main.txtShape_teardrop": "Slza",
@@ -922,6 +924,7 @@
   "DE.Controllers.Toolbar.tipMarkersFRhombus": "Kosočtvercové odrážky s výplní",
   "DE.Controllers.Toolbar.tipMarkersFRound": "Vyplněné kulaté odrážky",
   "DE.Controllers.Toolbar.tipMarkersFSquare": "Plné čtvercové odrážky",
+  "DE.Controllers.Toolbar.tipMarkersHRound": "Duté kulaté odrážky",
   "DE.Controllers.Toolbar.tipMarkersStar": "Hvězdičkové odrážky",
   "DE.Controllers.Toolbar.tipMultiLevelNumbered": "Víceúrovňové číslované odrážky",
   "DE.Controllers.Toolbar.tipMultiLevelSymbols": "Víceúrovňové symbolové odrážky",
@@ -1459,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Podepsat",
   "DE.Views.DocumentHolder.styleText": "Formátování jako styl",
   "DE.Views.DocumentHolder.tableText": "Tabulka",
+  "DE.Views.DocumentHolder.textAccept": "Přijmout změnu",
   "DE.Views.DocumentHolder.textAlign": "Zarovnání",
   "DE.Views.DocumentHolder.textArrange": "Uspořádat",
   "DE.Views.DocumentHolder.textArrangeBack": "Přesunout na pozadí",
@@ -1493,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Vložit",
   "DE.Views.DocumentHolder.textPrevPage": "Předchozí stránka",
   "DE.Views.DocumentHolder.textRefreshField": "Obnovit pole",
+  "DE.Views.DocumentHolder.textReject": "Odmítnout změnu",
   "DE.Views.DocumentHolder.textRemCheckBox": "Odstranit zaškrtávací pole",
   "DE.Views.DocumentHolder.textRemComboBox": "Odstranit výběrové pole",
   "DE.Views.DocumentHolder.textRemDropdown": "Odstranit rozevírací seznam",
@@ -1532,6 +1537,7 @@
   "DE.Views.DocumentHolder.tipMarkersFRhombus": "Kosočtvercové odrážky s výplní",
   "DE.Views.DocumentHolder.tipMarkersFRound": "Vyplněné kulaté odrážky",
   "DE.Views.DocumentHolder.tipMarkersFSquare": "Plné čtvercové odrážky",
+  "DE.Views.DocumentHolder.tipMarkersHRound": "Duté kulaté odrážky",
   "DE.Views.DocumentHolder.tipMarkersStar": "Hvězdičkové odrážky",
   "DE.Views.DocumentHolder.toDictionaryText": "Přidat do slovníku",
   "DE.Views.DocumentHolder.txtAddBottom": "Přidat spodní ohraničení",
@@ -2081,7 +2087,7 @@
   "DE.Views.ListSettingsDialog.txtType": "Typ",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Poslat",
-  "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Téma",
+  "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Prostředí",
   "DE.Views.MailMergeEmailDlg.textAttachDocx": "Připojit jako DOCX",
   "DE.Views.MailMergeEmailDlg.textAttachPdf": "Připojit jako PDF",
   "DE.Views.MailMergeEmailDlg.textFileName": "Název souboru",
@@ -2376,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Stránka {0} z {1}",
   "DE.Views.Statusbar.tipFitPage": "Přizpůsobit stránce",
   "DE.Views.Statusbar.tipFitWidth": "Přizpůsobit šířce",
+  "DE.Views.Statusbar.tipHandTool": "Nástroj ruka",
+  "DE.Views.Statusbar.tipSelectTool": "Zvolit nástroj",
   "DE.Views.Statusbar.tipSetLang": "Nastavit jazyk textu",
   "DE.Views.Statusbar.tipZoomFactor": "Měřítko zobrazení",
   "DE.Views.Statusbar.tipZoomIn": "Přiblížit",
@@ -2813,7 +2821,7 @@
   "DE.Views.ViewTab.textDarkDocument": "Tmavý režim dokumentu",
   "DE.Views.ViewTab.textFitToPage": "Přizpůsobit stránce",
   "DE.Views.ViewTab.textFitToWidth": "Přizpůsobit šířce",
-  "DE.Views.ViewTab.textInterfaceTheme": "Vzhled uživatelského rozhraní",
+  "DE.Views.ViewTab.textInterfaceTheme": "Vzhled prostředí",
   "DE.Views.ViewTab.textNavigation": "Navigace",
   "DE.Views.ViewTab.textRulers": "Pravítka",
   "DE.Views.ViewTab.textStatusBar": "Stavová lišta",

apps/documenteditor/main/locale/en.json

@@ -512,8 +512,8 @@
   "DE.Controllers.LeftMenu.txtCompatible": "The document will be saved to the new format. It will allow to use all the editor features, but might affect the document layout.<br>Use the 'Compatibility' option of the advanced settings if you want to make the files compatible with older MS Word versions.",
   "DE.Controllers.LeftMenu.txtUntitled": "Untitled",
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
-  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.LeftMenu.warnDownloadAsPdf": "Your {0} will be converted to an editable format. This may take a while. The resulting document will be optimized to allow you to edit the text, so it might not look exactly like the original {0}, especially if the original file contained lots of graphics.",
+  "DE.Controllers.LeftMenu.warnDownloadAsRTF": "If you continue saving in this format some of the formatting might be lost.<br>Are you sure you want to continue?",
   "DE.Controllers.Main.applyChangesTextText": "Loading the changes...",
   "DE.Controllers.Main.applyChangesTitleText": "Loading the Changes",
   "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",

apps/documenteditor/main/locale/fr.json

@@ -213,6 +213,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",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "Le fichier sera enregistré au nouveau format. Toutes les fonctionnalités des éditeurs vous seront disponibles, mais cela peut affecter la mise en page du document.<br>Activez l'option \" Compatibilité \" dans les paramètres avancés pour rendre votre fichier compatible avec les anciennes versions de MS Word.   ",
   "DE.Controllers.LeftMenu.txtUntitled": "Sans titre",
   "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.Main.applyChangesTextText": "Chargement des changemets...",
   "DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Signer",
   "DE.Views.DocumentHolder.styleText": "En tant que style",
   "DE.Views.DocumentHolder.tableText": "Tableau",
+  "DE.Views.DocumentHolder.textAccept": "Accepter la modification",
   "DE.Views.DocumentHolder.textAlign": "Aligner",
   "DE.Views.DocumentHolder.textArrange": "Organiser",
   "DE.Views.DocumentHolder.textArrangeBack": "Mettre en arrière-plan",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Coller",
   "DE.Views.DocumentHolder.textPrevPage": "Page précédente",
   "DE.Views.DocumentHolder.textRefreshField": "Actualiser le champ",
+  "DE.Views.DocumentHolder.textReject": "Rejeter la modification",
   "DE.Views.DocumentHolder.textRemCheckBox": "Supprimer une case à cocher",
   "DE.Views.DocumentHolder.textRemComboBox": "Supprimer une zone de liste déroulante",
   "DE.Views.DocumentHolder.textRemDropdown": "Supprimer une liste déroulante",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Page {0} de {1}",
   "DE.Views.Statusbar.tipFitPage": "Ajuster à la page",
   "DE.Views.Statusbar.tipFitWidth": "Ajuster à la largeur",
+  "DE.Views.Statusbar.tipHandTool": "Outil Main",
+  "DE.Views.Statusbar.tipSelectTool": "Outil de sélection",
   "DE.Views.Statusbar.tipSetLang": "Définir la langue du texte",
   "DE.Views.Statusbar.tipZoomFactor": "Grossissement",
   "DE.Views.Statusbar.tipZoomIn": "Zoom avant",

apps/documenteditor/main/locale/id.json

@@ -49,6 +49,9 @@
   "Common.Controllers.ReviewChanges.textParaDeleted": "<b>Paragraph Deleted</b>",
   "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted",
   "Common.Controllers.ReviewChanges.textParaInserted": "<b>Paragraph Inserted</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromDown": "<b>Pindah ke bawah</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveFromUp": "<b>Pindah ke atas</b>",
+  "Common.Controllers.ReviewChanges.textParaMoveTo": "<b>Pindah</b>",
   "Common.Controllers.ReviewChanges.textPosition": "Position",
   "Common.Controllers.ReviewChanges.textRight": "Align right",
   "Common.Controllers.ReviewChanges.textShape": "Shape",
@@ -60,12 +63,23 @@
   "Common.Controllers.ReviewChanges.textStrikeout": "Strikeout",
   "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
+  "Common.Controllers.ReviewChanges.textTableChanged": "<b>Setelan tabel</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Baris tabel ditambah</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Baris Tabel dihapus</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textWidow": "Widow control",
+  "Common.define.chartData.textBar": "Palang",
+  "Common.define.chartData.textCharts": "Bagan",
   "Common.define.chartData.textColumn": "Kolom",
   "Common.define.chartData.textLine": "Garis",
+  "Common.define.chartData.textPie": "Diagram Lingkaran",
+  "Common.define.chartData.textStock": "Diagram Garis",
+  "Common.Translation.warnFileLockedBtnEdit": "Buat salinan",
+  "Common.UI.ButtonColored.textAutoColor": "Otomatis",
   "Common.UI.ButtonColored.textNewColor": "Tambahkan warna khusus baru",
+  "Common.UI.Calendar.textMonths": "bulan",
+  "Common.UI.Calendar.textYears": "tahun",
   "Common.UI.ComboBorderSize.txtNoBorders": "Tidak ada pembatas",
   "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Tidak ada pembatas",
   "Common.UI.ComboDataView.emptyComboText": "Tidak ada model",
@@ -87,6 +101,7 @@
   "Common.UI.SynchronizeTip.textDontShow": "Jangan tampilkan pesan ini lagi",
   "Common.UI.SynchronizeTip.textSynchronize": "Dokumen telah diubah oleh pengguna lain.<br>Silakan klik untuk menyimpan perubahan dan memuat ulang pembaruan.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Warna Standar",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Warna Tema",
   "Common.UI.Window.cancelButtonText": "Batalkan",
   "Common.UI.Window.closeButtonText": "Tutup",
   "Common.UI.Window.noButtonText": "Tidak",
@@ -105,11 +120,18 @@
   "Common.Views.About.txtTel": "tel:",
   "Common.Views.About.txtVersion": "Versi",
   "Common.Views.AutoCorrectDialog.textAdd": "Tambahkan",
+  "Common.Views.AutoCorrectDialog.textBy": "oleh",
+  "Common.Views.AutoCorrectDialog.textDelete": "Hapus",
+  "Common.Views.AutoCorrectDialog.textReplace": "Ganti",
+  "Common.Views.AutoCorrectDialog.textReset": "Atur ulang",
+  "Common.Views.AutoCorrectDialog.textResetAll": "Atur ulang kembali ke awal",
+  "Common.Views.AutoCorrectDialog.textRestore": "Pemulihan",
   "Common.Views.Chat.textSend": "Kirim",
   "Common.Views.Comments.textAdd": "Tambahkan",
   "Common.Views.Comments.textAddComment": "Tambahkan",
   "Common.Views.Comments.textAddCommentToDoc": "Tambahkan Komentar untuk Dokumen",
   "Common.Views.Comments.textAddReply": "Tambahkan Balasan",
+  "Common.Views.Comments.textAll": "Semua",
   "Common.Views.Comments.textAnonym": "Tamu",
   "Common.Views.Comments.textCancel": "Batalkan",
   "Common.Views.Comments.textClose": "Tutup",
@@ -135,8 +157,21 @@
   "Common.Views.ExternalMergeEditor.textClose": "Close",
   "Common.Views.ExternalMergeEditor.textSave": "Save & Exit",
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
+  "Common.Views.Header.textAdvSettings": "Pengaturan Lanjut",
   "Common.Views.Header.textBack": "Buka Dokumen",
+  "Common.Views.Header.textHideLines": "Sembunyikan Mistar",
+  "Common.Views.Header.textHideStatusBar": "Sembunyikan Bilah Status",
+  "Common.Views.Header.textZoom": "Pembesaran",
+  "Common.Views.Header.tipDownload": "Unduh File",
+  "Common.Views.Header.tipRedo": "Ulangi",
+  "Common.Views.Header.tipSave": "Simpan",
+  "Common.Views.Header.tipUndo": "Batalkan",
+  "Common.Views.Header.tipViewSettings": "Lihat Pengaturan",
   "Common.Views.Header.txtAccessRights": "Ubah hak akses",
+  "Common.Views.Header.txtRename": "Ganti nama",
+  "Common.Views.History.textCloseHistory": "Tutup riwayat",
+  "Common.Views.History.textRestore": "Pemulihan",
+  "Common.Views.History.textVer": "ver.",
   "Common.Views.ImageFromUrlDialog.textUrl": "Tempel URL gambar:",
   "Common.Views.ImageFromUrlDialog.txtEmpty": "Kolom ini harus diisi",
   "Common.Views.ImageFromUrlDialog.txtNotUrl": "Bagian ini harus berupa URL dengn format \"http://www.contoh.com\"",
@@ -146,28 +181,64 @@
   "Common.Views.InsertTableDialog.txtMinText": "Input minimal untuk kolom ini adalah {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Jumlah Baris",
   "Common.Views.InsertTableDialog.txtTitle": "Ukuran Tabel",
+  "Common.Views.InsertTableDialog.txtTitleSplit": "Pisahkan Sel",
+  "Common.Views.LanguageDialog.labelSelect": "Pilih bahasa dokumen",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
   "Common.Views.OpenDialog.txtOpenFile": "Masukkan kata sandi untuk buka file",
+  "Common.Views.OpenDialog.txtPassword": "Kata Sandi",
+  "Common.Views.OpenDialog.txtPreview": "Pratinjau",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
+  "Common.Views.PasswordDialog.txtPassword": "Kata Sandi",
+  "Common.Views.PasswordDialog.txtTitle": "Setel kata sandi",
   "Common.Views.PasswordDialog.txtWarning": "Perhatian: Tidak bisa dipulihkan jika Anda kehilangan atau lupa kata sandi. Simpan di tempat yang aman.",
+  "Common.Views.Plugins.textStart": "Mulai",
+  "Common.Views.Protection.txtChangePwd": "Ubah kata sandi",
+  "Common.Views.RenameDialog.textName": "Nama file",
+  "Common.Views.ReviewChanges.textEnable": "Aktifkan",
   "Common.Views.ReviewChanges.tipHistory": "Tampilkan riwayat versi",
+  "Common.Views.ReviewChanges.tipSetDocLang": "Atur Bahasa Dokumen",
+  "Common.Views.ReviewChanges.tipSetSpelling": "Periksa Ejaan",
   "Common.Views.ReviewChanges.txtAccept": "Accept",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Changes",
   "Common.Views.ReviewChanges.txtClose": "Close",
   "Common.Views.ReviewChanges.txtCommentRemove": "Hapus",
+  "Common.Views.ReviewChanges.txtCommentResolve": "Selesaikan",
+  "Common.Views.ReviewChanges.txtDocLang": "Bahasa",
   "Common.Views.ReviewChanges.txtHistory": "Riwayat versi",
   "Common.Views.ReviewChanges.txtNext": "To Next Change",
   "Common.Views.ReviewChanges.txtPrev": "To Previous Change",
+  "Common.Views.ReviewChanges.txtPreview": "Pratinjau",
   "Common.Views.ReviewChanges.txtReject": "Reject",
   "Common.Views.ReviewChanges.txtRejectAll": "Reject All Changes",
   "Common.Views.ReviewChanges.txtRejectCurrent": "Reject Current Changes",
+  "Common.Views.ReviewChanges.txtSpelling": "Periksa Ejaan",
   "Common.Views.ReviewChangesDialog.txtAccept": "Terima",
   "Common.Views.ReviewChangesDialog.txtAcceptAll": "Terima semua perubahan",
   "Common.Views.ReviewChangesDialog.txtReject": "Tolak",
   "Common.Views.ReviewPopover.textAdd": "Tambahkan",
   "Common.Views.ReviewPopover.textAddReply": "Tambahkan balasan",
+  "Common.Views.ReviewPopover.textCancel": "Batalkan",
+  "Common.Views.ReviewPopover.textClose": "Tutup",
+  "Common.Views.ReviewPopover.textEdit": "OK",
+  "Common.Views.ReviewPopover.textOpenAgain": "Buka Lagi",
+  "Common.Views.ReviewPopover.textReply": "Balas",
+  "Common.Views.ReviewPopover.textResolve": "Selesaikan",
   "Common.Views.ReviewPopover.txtAccept": "Terima",
+  "Common.Views.ReviewPopover.txtDeleteTip": "Hapus",
+  "Common.Views.ReviewPopover.txtEditTip": "Sunting",
+  "Common.Views.ReviewPopover.txtReject": "Tolak",
+  "Common.Views.SelectFileDlg.textTitle": "Pilih sumber data",
+  "Common.Views.SignDialog.textBold": "Tebal",
+  "Common.Views.SignDialog.textChange": "Ganti",
+  "Common.Views.SignDialog.textItalic": "Miring",
+  "Common.Views.SignDialog.textSelect": "Pilih",
+  "Common.Views.SignDialog.tipFontSize": "Ukuran Huruf",
+  "Common.Views.SignSettingsDialog.textInfoName": "Nama",
+  "Common.Views.SignSettingsDialog.txtEmpty": "Kolom ini harus diisi",
+  "Common.Views.SymbolTableDialog.textCharacter": "Karakter",
+  "Common.Views.SymbolTableDialog.textFont": "Huruf",
+  "Common.Views.SymbolTableDialog.textSpecial": "karakter khusus",
   "Common.Views.SymbolTableDialog.textSymbols": "Simbol",
   "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.<br> Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.",
   "DE.Controllers.LeftMenu.newDocumentTitle": "Dokumen tidak bernama",
@@ -232,7 +303,10 @@
   "DE.Controllers.Main.splitMaxColsErrorText": "Jumlah kolom harus kurang dari %1.",
   "DE.Controllers.Main.splitMaxRowsErrorText": "Jumlah haris harus kurang dari %1.",
   "DE.Controllers.Main.textAnonymous": "Anonim",
+  "DE.Controllers.Main.textClose": "Tutup",
   "DE.Controllers.Main.textCloseTip": "Klik untuk menutup tips",
+  "DE.Controllers.Main.textGuest": "Tamu",
+  "DE.Controllers.Main.textLearnMore": "Pelajari selengkapnya",
   "DE.Controllers.Main.textLoadingDocument": "Memuat dokumen",
   "DE.Controllers.Main.textStrict": "Strict mode",
   "DE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.<br>Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.",
@@ -240,19 +314,36 @@
   "DE.Controllers.Main.txtAbove": "Di atas",
   "DE.Controllers.Main.txtArt": "Your text here",
   "DE.Controllers.Main.txtBasicShapes": "Bentuk Dasar",
+  "DE.Controllers.Main.txtBelow": "Di bawah",
   "DE.Controllers.Main.txtButtons": "Tombol",
   "DE.Controllers.Main.txtCallouts": "Balon Kata",
   "DE.Controllers.Main.txtCharts": "Bagan",
   "DE.Controllers.Main.txtDiagramTitle": "Chart Title",
   "DE.Controllers.Main.txtEditingMode": "Atur mode editing...",
   "DE.Controllers.Main.txtErrorLoadHistory": "History loading failed",
+  "DE.Controllers.Main.txtEvenPage": "Halaman Genap",
   "DE.Controllers.Main.txtFiguredArrows": "Tanda Panah Berpola",
   "DE.Controllers.Main.txtLines": "Garis",
   "DE.Controllers.Main.txtMath": "Matematika",
   "DE.Controllers.Main.txtNeedSynchronize": "Ada pembaruan",
+  "DE.Controllers.Main.txtNone": "tidak ada",
   "DE.Controllers.Main.txtRectangles": "Persegi Panjang",
   "DE.Controllers.Main.txtSeries": "Series",
+  "DE.Controllers.Main.txtShape_bevel": "Miring",
+  "DE.Controllers.Main.txtShape_frame": "Kerangka",
+  "DE.Controllers.Main.txtShape_leftArrow": "Panah Kiri",
+  "DE.Controllers.Main.txtShape_line": "Garis",
+  "DE.Controllers.Main.txtShape_mathEqual": "Setara",
+  "DE.Controllers.Main.txtShape_mathMinus": "Minus",
+  "DE.Controllers.Main.txtShape_mathPlus": "Plus",
+  "DE.Controllers.Main.txtShape_pie": "Diagram Lingkaran",
+  "DE.Controllers.Main.txtShape_plus": "Plus",
+  "DE.Controllers.Main.txtShape_rightArrow": "Tanda Panah ke Kanan",
   "DE.Controllers.Main.txtStarsRibbons": "Bintang & Pita",
+  "DE.Controllers.Main.txtStyle_Normal": "Normal",
+  "DE.Controllers.Main.txtStyle_Quote": "Kutip",
+  "DE.Controllers.Main.txtStyle_Title": "Judul",
+  "DE.Controllers.Main.txtTableOfContents": "Daftar Isi",
   "DE.Controllers.Main.txtXAxis": "X Axis",
   "DE.Controllers.Main.txtYAxis": "Y Axis",
   "DE.Controllers.Main.unknownErrorText": "Error tidak dikenal.",
@@ -262,6 +353,7 @@
   "DE.Controllers.Main.uploadImageSizeMessage": "Melebihi ukuran maksimal file.",
   "DE.Controllers.Main.uploadImageTextText": "Mengunggah gambar...",
   "DE.Controllers.Main.uploadImageTitleText": "Mengunggah Gambar",
+  "DE.Controllers.Main.waitText": "Silahkan menunggu",
   "DE.Controllers.Main.warnBrowserIE9": "Aplikasi ini tidak berjalan dengan baik di IE9. Gunakan IE10 atau versi yang terbaru",
   "DE.Controllers.Main.warnBrowserZoom": "Pengaturan pembesaran tampilan pada browser Anda saat ini tidak didukung sepenuhnya. Silakan atur ulang ke tampilan standar dengan menekan Ctrl+0.",
   "DE.Controllers.Main.warnProcessRightsChange": "Hak Anda untuk mengedit file ditolak.",
@@ -276,6 +368,7 @@
   "DE.Controllers.Toolbar.textFontSizeErr": "Input yang dimasukkan salah.<br>Silakan masukkan input numerik antara 1 dan 300",
   "DE.Controllers.Toolbar.textFraction": "Pecahan",
   "DE.Controllers.Toolbar.textFunction": "Fungsi",
+  "DE.Controllers.Toolbar.textGroup": "Grup",
   "DE.Controllers.Toolbar.textInsert": "Sisipkan",
   "DE.Controllers.Toolbar.textIntegral": "Integral",
   "DE.Controllers.Toolbar.textLargeOperator": "Operator Besar",
@@ -604,10 +697,23 @@
   "DE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
   "DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
   "DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
+  "DE.Controllers.Viewport.textFitPage": "Sesuaikan Halaman",
+  "DE.Controllers.Viewport.textFitWidth": "Sesuaikan Lebar",
   "DE.Views.BookmarksDialog.textAdd": "Tambahkan",
+  "DE.Views.BookmarksDialog.textClose": "Tutup",
+  "DE.Views.BookmarksDialog.textCopy": "Salin",
+  "DE.Views.BookmarksDialog.textDelete": "Hapus",
+  "DE.Views.BookmarksDialog.textLocation": "Lokasi",
+  "DE.Views.BookmarksDialog.textName": "Nama",
+  "DE.Views.BookmarksDialog.textSort": "Urutkan berdasar",
   "DE.Views.CaptionDialog.textAfter": "setelah",
   "DE.Views.CaptionDialog.textBefore": "Sebelum",
+  "DE.Views.CaptionDialog.textColon": "Titik dua",
+  "DE.Views.CaptionDialog.textInsert": "Sisipkan",
+  "DE.Views.CaptionDialog.textNumbering": "Penomoran",
   "DE.Views.CaptionDialog.textTable": "Tabel",
+  "DE.Views.CellsAddDialog.textCol": "Kolom",
+  "DE.Views.CellsAddDialog.textRow": "Baris",
   "DE.Views.ChartSettings.textAdvanced": "Tampilkan pengaturan lanjut",
   "DE.Views.ChartSettings.textChartType": "Ubah Tipe Bagan",
   "DE.Views.ChartSettings.textEditData": "Edit Data",
@@ -626,9 +732,25 @@
   "DE.Views.ChartSettings.txtTight": "Ketat",
   "DE.Views.ChartSettings.txtTitle": "Bagan",
   "DE.Views.ChartSettings.txtTopAndBottom": "Atas dan bawah",
+  "DE.Views.ControlSettingsDialog.strGeneral": "Umum",
   "DE.Views.ControlSettingsDialog.textAdd": "Tambahkan",
+  "DE.Views.ControlSettingsDialog.textChange": "Sunting",
+  "DE.Views.ControlSettingsDialog.textColor": "Warna",
+  "DE.Views.ControlSettingsDialog.textDelete": "Hapus",
+  "DE.Views.ControlSettingsDialog.textLang": "Bahasa",
+  "DE.Views.ControlSettingsDialog.textName": "Judul",
+  "DE.Views.ControlSettingsDialog.textNone": "tidak ada",
+  "DE.Views.ControlSettingsDialog.textTag": "Tandai",
+  "DE.Views.ControlSettingsDialog.textUp": "Naik",
+  "DE.Views.ControlSettingsDialog.textValue": "Nilai",
+  "DE.Views.CrossReferenceDialog.textInsert": "Sisipkan",
+  "DE.Views.CrossReferenceDialog.textTable": "Tabel",
+  "DE.Views.CustomColumnsDialog.textColumns": "Jumlah Kolom",
+  "DE.Views.CustomColumnsDialog.textTitle": "Kolom",
+  "DE.Views.DateTimeDialog.textLang": "Bahasa",
   "DE.Views.DocumentHolder.aboveText": "Di atas",
   "DE.Views.DocumentHolder.addCommentText": "Tambahkan Komentar",
+  "DE.Views.DocumentHolder.advancedDropCapText": "Pengaturan Drop Cap",
   "DE.Views.DocumentHolder.advancedFrameText": "Pengaturan Lanjut untuk Kerangka",
   "DE.Views.DocumentHolder.advancedParagraphText": "Pengaturan Lanjut untuk Paragraf",
   "DE.Views.DocumentHolder.advancedTableText": "Pengaturan Lanjut untuk Tabel",
@@ -672,6 +794,7 @@
   "DE.Views.DocumentHolder.mergeCellsText": "Gabungkan Sel",
   "DE.Views.DocumentHolder.moreText": "Varian lain...",
   "DE.Views.DocumentHolder.noSpellVariantsText": "Tidak ada varian",
+  "DE.Views.DocumentHolder.notcriticalErrorTitle": "Peringatan",
   "DE.Views.DocumentHolder.originalSizeText": "Ukuran Standar",
   "DE.Views.DocumentHolder.paragraphText": "Paragraf",
   "DE.Views.DocumentHolder.removeHyperlinkText": "Hapus Hyperlink",
@@ -696,11 +819,16 @@
   "DE.Views.DocumentHolder.textArrangeForward": "Majukan",
   "DE.Views.DocumentHolder.textArrangeFront": "Tampilkan di Halaman Muka",
   "DE.Views.DocumentHolder.textCopy": "Salin",
+  "DE.Views.DocumentHolder.textCropFill": "Isian",
   "DE.Views.DocumentHolder.textCut": "Potong",
   "DE.Views.DocumentHolder.textEditWrapBoundary": "Edit Pembatas Potongan Teks",
+  "DE.Views.DocumentHolder.textFromFile": "Dari File",
+  "DE.Views.DocumentHolder.textFromUrl": "Dari URL",
   "DE.Views.DocumentHolder.textNextPage": "Halaman Selanjutnya",
   "DE.Views.DocumentHolder.textPaste": "Tempel",
   "DE.Views.DocumentHolder.textPrevPage": "Halaman Sebelumnya",
+  "DE.Views.DocumentHolder.textRemove": "Hapus",
+  "DE.Views.DocumentHolder.textReplace": "Ganti Gambar",
   "DE.Views.DocumentHolder.textSettings": "Pengaturan",
   "DE.Views.DocumentHolder.textShapeAlignBottom": "Rata Bawah",
   "DE.Views.DocumentHolder.textShapeAlignCenter": "Rata Tengah",
@@ -709,6 +837,7 @@
   "DE.Views.DocumentHolder.textShapeAlignRight": "Rata Kanan",
   "DE.Views.DocumentHolder.textShapeAlignTop": "Rata Atas",
   "DE.Views.DocumentHolder.textTOC": "Daftar Isi",
+  "DE.Views.DocumentHolder.textUndo": "Batalkan",
   "DE.Views.DocumentHolder.textWrap": "Bentuk Potongan",
   "DE.Views.DocumentHolder.tipIsLocked": "Elemen ini sedang diedit oleh pengguna lain.",
   "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
@@ -834,6 +963,7 @@
   "DE.Views.DropcapSettingsAdvanced.textWidth": "Lebar",
   "DE.Views.DropcapSettingsAdvanced.tipFontName": "Nama Huruf",
   "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Tidak ada pembatas",
+  "DE.Views.EditListItemDialog.textValue": "Nilai",
   "DE.Views.FileMenu.btnBackCaption": "Buka Dokumen",
   "DE.Views.FileMenu.btnCreateNewCaption": "Buat Baru",
   "DE.Views.FileMenu.btnDownloadCaption": "Unduh sebagai...",
@@ -849,22 +979,30 @@
   "DE.Views.FileMenu.btnSettingsCaption": "Pengaturan Lanjut...",
   "DE.Views.FileMenu.btnToEditCaption": "Edit Dokumen",
   "DE.Views.FileMenu.textDownload": "Download",
+  "DE.Views.FileMenuPanels.CreateNew.txtCreateNew": "Buat Baru",
+  "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Terapkan",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAddAuthor": "Tambahkan penulis",
   "DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Penulis",
   "DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Ubah hak akses",
   "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Komentar",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Dibuat",
   "DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Memuat...",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtOwner": "Pemilik",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Halaman",
   "DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Paragraf",
   "DE.Views.FileMenuPanels.DocumentInfo.txtPlacement": "Lokasi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtRights": "Orang yang memiliki hak",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSpaces": "Simbol dengan spasi",
   "DE.Views.FileMenuPanels.DocumentInfo.txtStatistics": "Statistik",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtSubject": "Subyek",
   "DE.Views.FileMenuPanels.DocumentInfo.txtSymbols": "Simbol",
   "DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Judul Dokumen",
+  "DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Diunggah",
   "DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Kata",
   "DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
   "DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
+  "DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Peringatan",
+  "DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edit Dokumen",
   "DE.Views.FileMenuPanels.Settings.okButtonText": "Terapkan",
   "DE.Views.FileMenuPanels.Settings.strAlignGuides": "Turn on alignment guides",
   "DE.Views.FileMenuPanels.Settings.strAutosave": "Aktifkan simpan otomatis",
@@ -890,6 +1028,8 @@
   "DE.Views.FileMenuPanels.Settings.textMinute": "Tiap Menit",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Lihat Semua",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Sentimeter",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Sesuaikan Halaman",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Sesuaikan Lebar",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Ganti Input",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Lihat yang Terakhir",
   "DE.Views.FileMenuPanels.Settings.txtLiveComment": "Komentar Langsung",
@@ -899,6 +1039,15 @@
   "DE.Views.FileMenuPanels.Settings.txtPt": "Titik",
   "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Periksa Ejaan",
   "DE.Views.FileMenuPanels.Settings.txtWin": "sebagai Windows",
+  "DE.Views.FormSettings.textBackgroundColor": "Warna Latar",
+  "DE.Views.FormSettings.textColor": "Warna Pembatas",
+  "DE.Views.FormSettings.textDelete": "Hapus",
+  "DE.Views.FormSettings.textDisconnect": "Putuskan hubungan",
+  "DE.Views.FormSettings.textFromFile": "Dari File",
+  "DE.Views.FormSettings.textFromUrl": "Dari URL",
+  "DE.Views.FormSettings.textImage": "Gambar",
+  "DE.Views.FormSettings.textNever": "tidak pernah",
+  "DE.Views.FormsTab.capBtnImage": "Gambar",
   "DE.Views.FormsTab.tipImageField": "Sisipkan Gambar",
   "DE.Views.HeaderFooterSettings.textBottomCenter": "Bawah Tengah",
   "DE.Views.HeaderFooterSettings.textBottomLeft": "Bawah Kiri",
@@ -916,12 +1065,15 @@
   "DE.Views.HeaderFooterSettings.textTopRight": "Atas Kanan",
   "DE.Views.HyperlinkSettingsDialog.textDefault": "Fragmen teks yang dipilih",
   "DE.Views.HyperlinkSettingsDialog.textDisplay": "Tampilan",
+  "DE.Views.HyperlinkSettingsDialog.textExternal": "Tautan eksternal",
   "DE.Views.HyperlinkSettingsDialog.textTitle": "Pengaturan Hyperlink",
   "DE.Views.HyperlinkSettingsDialog.textTooltip": "Teks ScreenTip",
   "DE.Views.HyperlinkSettingsDialog.textUrl": "Tautkan dengan",
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Kolom ini harus diisi",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Bagian ini harus berupa URL dengn format \"http://www.contoh.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Tampilkan pengaturan lanjut",
+  "DE.Views.ImageSettings.textCropFill": "Isian",
+  "DE.Views.ImageSettings.textEdit": "Sunting",
   "DE.Views.ImageSettings.textFromFile": "Dari File",
   "DE.Views.ImageSettings.textFromUrl": "Dari URL",
   "DE.Views.ImageSettings.textHeight": "Ketinggian",
@@ -939,6 +1091,8 @@
   "DE.Views.ImageSettings.txtTopAndBottom": "Atas dan bawah",
   "DE.Views.ImageSettingsAdvanced.strMargins": "Lapisan Teks",
   "DE.Views.ImageSettingsAdvanced.textAlignment": "Perataan",
+  "DE.Views.ImageSettingsAdvanced.textAltDescription": "Deskripsi",
+  "DE.Views.ImageSettingsAdvanced.textAltTitle": "Judul",
   "DE.Views.ImageSettingsAdvanced.textArrows": "Tanda panah",
   "DE.Views.ImageSettingsAdvanced.textBeginSize": "Ukuran Mulai",
   "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Gaya Mulai",
@@ -1001,11 +1155,21 @@
   "DE.Views.LeftMenu.tipSearch": "Cari",
   "DE.Views.LeftMenu.tipSupport": "Masukan & Dukungan",
   "DE.Views.LeftMenu.tipTitles": "Judul",
+  "DE.Views.LineNumbersDialog.textNumbering": "Penomoran",
+  "DE.Views.LineNumbersDialog.txtAutoText": "Otomatis",
+  "DE.Views.Links.capBtnInsContents": "Daftar Isi",
+  "DE.Views.Links.textContentsSettings": "Pengaturan",
   "DE.Views.Links.tipInsertHyperlink": "Tambahkan hyperlink",
   "DE.Views.ListSettingsDialog.textAuto": "Otomatis",
+  "DE.Views.ListSettingsDialog.textCenter": "Tengah",
   "DE.Views.ListSettingsDialog.textLeft": "Kiri",
+  "DE.Views.ListSettingsDialog.textPreview": "Pratinjau",
   "DE.Views.ListSettingsDialog.textRight": "Kanan",
+  "DE.Views.ListSettingsDialog.txtAlign": "Perataan",
+  "DE.Views.ListSettingsDialog.txtColor": "Warna",
+  "DE.Views.ListSettingsDialog.txtNone": "tidak ada",
   "DE.Views.ListSettingsDialog.txtSize": "Ukuran",
+  "DE.Views.ListSettingsDialog.txtType": "Tipe",
   "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
   "DE.Views.MailMergeEmailDlg.okButtonText": "Send",
   "DE.Views.MailMergeEmailDlg.subjectPlaceholder": "Theme",
@@ -1053,9 +1217,17 @@
   "DE.Views.MailMergeSettings.txtPrev": "To previous record",
   "DE.Views.MailMergeSettings.txtUntitled": "Untitled",
   "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed",
+  "DE.Views.Navigation.txtCollapse": "Tutup semua",
+  "DE.Views.Navigation.txtExpand": "Buka semua",
+  "DE.Views.NoteSettingsDialog.textApply": "Terapkan",
+  "DE.Views.NoteSettingsDialog.textInsert": "Sisipkan",
+  "DE.Views.NoteSettingsDialog.textLocation": "Lokasi",
+  "DE.Views.NoteSettingsDialog.textNumbering": "Penomoran",
   "DE.Views.PageMarginsDialog.notcriticalErrorTitle": "Warning",
   "DE.Views.PageMarginsDialog.textBottom": "Bottom",
   "DE.Views.PageMarginsDialog.textLeft": "Left",
+  "DE.Views.PageMarginsDialog.textNormal": "Normal",
+  "DE.Views.PageMarginsDialog.textPreview": "Pratinjau",
   "DE.Views.PageMarginsDialog.textRight": "Right",
   "DE.Views.PageMarginsDialog.textTitle": "Margins",
   "DE.Views.PageMarginsDialog.textTop": "Top",
@@ -1064,6 +1236,10 @@
   "DE.Views.PageSizeDialog.textHeight": "Height",
   "DE.Views.PageSizeDialog.textTitle": "Page Size",
   "DE.Views.PageSizeDialog.textWidth": "Width",
+  "DE.Views.PageSizeDialog.txtCustom": "Khusus",
+  "DE.Views.ParagraphSettings.strIndent": "Indentasi",
+  "DE.Views.ParagraphSettings.strIndentsLeftText": "Kiri",
+  "DE.Views.ParagraphSettings.strIndentsRightText": "Kanan",
   "DE.Views.ParagraphSettings.strLineHeight": "Spasi Antar Baris",
   "DE.Views.ParagraphSettings.strParagraphSpacing": "Spasi",
   "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Jangan tambahkan interval antar paragraf dengan model yang sama",
@@ -1086,6 +1262,8 @@
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Kiri",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Spasi Antar Baris",
   "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Kanan",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Setelah",
+  "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Sebelum",
   "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Tetap satukan garis",
   "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Satukan dengan berikutnya",
   "DE.Views.ParagraphSettingsAdvanced.strMargins": "Lapisan",
@@ -1113,7 +1291,9 @@
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Efek",
   "DE.Views.ParagraphSettingsAdvanced.textExact": "Persis",
   "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Baris Pertama",
+  "DE.Views.ParagraphSettingsAdvanced.textJustified": "Rata Kiri-Kanan",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Kiri",
+  "DE.Views.ParagraphSettingsAdvanced.textNone": "tidak ada",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Posisi",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Hapus",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Hapus Semua",
@@ -1134,6 +1314,7 @@
   "DE.Views.ParagraphSettingsAdvanced.tipOuter": "Buat Pembatas Luar Saja",
   "DE.Views.ParagraphSettingsAdvanced.tipRight": "Buat Pembatas Kanan Saja",
   "DE.Views.ParagraphSettingsAdvanced.tipTop": "Buat Pembatas Atas Saja",
+  "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Otomatis",
   "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Tidak ada pembatas",
   "DE.Views.RightMenu.txtChartSettings": "Pengaturan Bagan",
   "DE.Views.RightMenu.txtHeaderFooterSettings": "Pengaturan Header dan Footer",
@@ -1152,6 +1333,7 @@
   "DE.Views.ShapeSettings.strSize": "Ukuran",
   "DE.Views.ShapeSettings.strStroke": "Tekanan",
   "DE.Views.ShapeSettings.strTransparency": "Opasitas",
+  "DE.Views.ShapeSettings.strType": "Tipe",
   "DE.Views.ShapeSettings.textAdvanced": "Tampilkan pengaturan lanjut",
   "DE.Views.ShapeSettings.textBorderSizeErr": "Input yang dimasukkan salah.<br>Silakan masukkan input antara 1pt dan 1584pt.",
   "DE.Views.ShapeSettings.textColor": "Isian Warna",
@@ -1165,6 +1347,7 @@
   "DE.Views.ShapeSettings.textLinear": "Linier",
   "DE.Views.ShapeSettings.textNoFill": "Tidak ada Isian",
   "DE.Views.ShapeSettings.textPatternFill": "Pola",
+  "DE.Views.ShapeSettings.textPosition": "Jabatan",
   "DE.Views.ShapeSettings.textRadial": "Radial",
   "DE.Views.ShapeSettings.textSelectTexture": "Pilih",
   "DE.Views.ShapeSettings.textStretch": "Rentangkan",
@@ -1191,6 +1374,7 @@
   "DE.Views.ShapeSettings.txtTight": "Ketat",
   "DE.Views.ShapeSettings.txtTopAndBottom": "Atas dan bawah",
   "DE.Views.ShapeSettings.txtWood": "Kayu",
+  "DE.Views.SignatureSettings.notcriticalErrorTitle": "Peringatan",
   "DE.Views.Statusbar.goToPageText": "Buka Halaman",
   "DE.Views.Statusbar.pageIndexText": "Halaman {0} dari {1}",
   "DE.Views.Statusbar.tipFitPage": "Sesuaikan Halaman",
@@ -1205,6 +1389,12 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.TableOfContentsSettings.textNone": "tidak ada",
+  "DE.Views.TableOfContentsSettings.textRadioStyle": "Model",
+  "DE.Views.TableOfContentsSettings.textStyle": "Model",
+  "DE.Views.TableOfContentsSettings.textTable": "Tabel",
+  "DE.Views.TableOfContentsSettings.textTitle": "Daftar Isi",
+  "DE.Views.TableOfContentsSettings.txtCurrent": "Saat ini",
   "DE.Views.TableSettings.deleteColumnText": "Hapus Kolom",
   "DE.Views.TableSettings.deleteRowText": "Hapus Baris",
   "DE.Views.TableSettings.deleteTableText": "Hapus Tabel",
@@ -1230,11 +1420,13 @@
   "DE.Views.TableSettings.textEmptyTemplate": "Tidak ada template",
   "DE.Views.TableSettings.textFirst": "Pertama",
   "DE.Views.TableSettings.textHeader": "Header",
+  "DE.Views.TableSettings.textHeight": "Ketinggian",
   "DE.Views.TableSettings.textLast": "Terakhir",
   "DE.Views.TableSettings.textRows": "Baris",
   "DE.Views.TableSettings.textSelectBorders": "Pilih pembatas yang ingin Anda ubah dengan menerarpkan model yang telah dipilih di atas",
   "DE.Views.TableSettings.textTemplate": "Pilih Dari Template",
   "DE.Views.TableSettings.textTotal": "Total",
+  "DE.Views.TableSettings.textWidth": "Lebar",
   "DE.Views.TableSettings.tipAll": "Buat Pembatas Luar dan Semua Garis Dalam",
   "DE.Views.TableSettings.tipBottom": "Buat Pembatas Bawah-Luar Saja",
   "DE.Views.TableSettings.tipInner": "Buat Garis Dalam Saja",
@@ -1249,6 +1441,8 @@
   "DE.Views.TableSettingsAdvanced.textAlign": "Perataan",
   "DE.Views.TableSettingsAdvanced.textAlignment": "Perataan",
   "DE.Views.TableSettingsAdvanced.textAllowSpacing": "Beri spasi antar sel",
+  "DE.Views.TableSettingsAdvanced.textAltDescription": "Deskripsi",
+  "DE.Views.TableSettingsAdvanced.textAltTitle": "Judul",
   "DE.Views.TableSettingsAdvanced.textAnchorText": "Teks",
   "DE.Views.TableSettingsAdvanced.textAutofit": "Otomatis sesuaikan ukuran dengan konten ",
   "DE.Views.TableSettingsAdvanced.textBackColor": "Latar Sel",
@@ -1281,7 +1475,9 @@
   "DE.Views.TableSettingsAdvanced.textRight": "Kanan",
   "DE.Views.TableSettingsAdvanced.textRightOf": "ke sebelah kanan dari",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Kanan",
+  "DE.Views.TableSettingsAdvanced.textTable": "Tabel",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Latar Belakang Tabel",
+  "DE.Views.TableSettingsAdvanced.textTableSize": "Ukuran Tabel",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabel - Pengaturan Lanjut",
   "DE.Views.TableSettingsAdvanced.textTop": "Atas",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertikal",
@@ -1290,6 +1486,7 @@
   "DE.Views.TableSettingsAdvanced.textWrap": "Potongan Teks",
   "DE.Views.TableSettingsAdvanced.textWrapNoneTooltip": "Tabel berderet",
   "DE.Views.TableSettingsAdvanced.textWrapParallelTooltip": "Tabel alur",
+  "DE.Views.TableSettingsAdvanced.textWrappingStyle": "Bentuk Potongan",
   "DE.Views.TableSettingsAdvanced.tipAll": "Buat Pembatas Luar dan Semua Garis Dalam",
   "DE.Views.TableSettingsAdvanced.tipCellAll": "Buat Pembatas untuk Sel Dalam Saja",
   "DE.Views.TableSettingsAdvanced.tipCellInner": "Buat Garis Vertikal dan Horisontal untuk Sel Dalam Saja",
@@ -1300,12 +1497,17 @@
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellAll": "Buat Pembatas Luar dan Pembatas untuk Semua Sel Dalam",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellInner": "Buat Pembatas Luar dan Garis Vertikal dan Horisontal untuk Sel Dalam",
   "DE.Views.TableSettingsAdvanced.tipTableOuterCellOuter": "Buat Pembatas Luar Tabel dan Pembatas Luar untuk Sel Dalam",
+  "DE.Views.TableSettingsAdvanced.txtCm": "Sentimeter",
   "DE.Views.TableSettingsAdvanced.txtNoBorders": "Tidak ada pembatas",
+  "DE.Views.TableSettingsAdvanced.txtPt": "Titik",
+  "DE.Views.TableToTextDialog.textOther": "Lainnya",
+  "DE.Views.TableToTextDialog.textTab": "Tab",
   "DE.Views.TextArtSettings.strColor": "Color",
   "DE.Views.TextArtSettings.strFill": "Fill",
   "DE.Views.TextArtSettings.strSize": "Size",
   "DE.Views.TextArtSettings.strStroke": "Stroke",
   "DE.Views.TextArtSettings.strTransparency": "Opacity",
+  "DE.Views.TextArtSettings.strType": "Tipe",
   "DE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
   "DE.Views.TextArtSettings.textColor": "Color Fill",
   "DE.Views.TextArtSettings.textDirection": "Direction",
@@ -1313,19 +1515,38 @@
   "DE.Views.TextArtSettings.textGradientFill": "Gradient Fill",
   "DE.Views.TextArtSettings.textLinear": "Linear",
   "DE.Views.TextArtSettings.textNoFill": "No Fill",
+  "DE.Views.TextArtSettings.textPosition": "Jabatan",
   "DE.Views.TextArtSettings.textRadial": "Radial",
   "DE.Views.TextArtSettings.textSelectTexture": "Select",
   "DE.Views.TextArtSettings.textStyle": "Style",
   "DE.Views.TextArtSettings.textTemplate": "Template",
   "DE.Views.TextArtSettings.textTransform": "Transform",
   "DE.Views.TextArtSettings.txtNoBorders": "No Line",
+  "DE.Views.TextToTableDialog.textColumns": "Kolom",
+  "DE.Views.TextToTableDialog.textOther": "Lainnya",
+  "DE.Views.TextToTableDialog.textPara": "Paragraf",
+  "DE.Views.TextToTableDialog.textRows": "Baris",
+  "DE.Views.TextToTableDialog.textTab": "Tab",
+  "DE.Views.TextToTableDialog.textTableSize": "Ukuran Tabel",
+  "DE.Views.TextToTableDialog.txtAutoText": "Otomatis",
   "DE.Views.Toolbar.capBtnAddComment": "Tambahkan komentar",
+  "DE.Views.Toolbar.capBtnColumns": "Kolom",
+  "DE.Views.Toolbar.capBtnComment": "Komentar",
   "DE.Views.Toolbar.capBtnInsChart": "Bagan",
+  "DE.Views.Toolbar.capBtnInsDropcap": "Drop Cap",
+  "DE.Views.Toolbar.capBtnInsImage": "Gambar",
+  "DE.Views.Toolbar.capBtnInsTable": "Tabel",
+  "DE.Views.Toolbar.capBtnPageSize": "Ukuran",
+  "DE.Views.Toolbar.capImgAlign": "Sejajarkan",
+  "DE.Views.Toolbar.capImgBackward": "Mundurkan",
+  "DE.Views.Toolbar.capImgForward": "Majukan",
   "DE.Views.Toolbar.capImgGroup": "Grup",
   "DE.Views.Toolbar.mniCustomTable": "Sisipkan Tabel Khusus",
   "DE.Views.Toolbar.mniEditDropCap": "Pengaturan Drop Cap",
   "DE.Views.Toolbar.mniEditFooter": "Edit Footer",
   "DE.Views.Toolbar.mniEditHeader": "Edit Header",
+  "DE.Views.Toolbar.mniFromFile": "Dari File",
+  "DE.Views.Toolbar.mniFromUrl": "Dari URL",
   "DE.Views.Toolbar.mniHiddenBorders": "Pembatas Tabel Disembunyikan",
   "DE.Views.Toolbar.mniHiddenChars": "Karakter Tidak Dicetak",
   "DE.Views.Toolbar.mniImageFromFile": "Gambar dari File",
@@ -1340,6 +1561,7 @@
   "DE.Views.Toolbar.textColumnsThree": "Three",
   "DE.Views.Toolbar.textColumnsTwo": "Two",
   "DE.Views.Toolbar.textContPage": "Halaman Bersambung",
+  "DE.Views.Toolbar.textDateControl": "Tanggal",
   "DE.Views.Toolbar.textEvenPage": "Halaman Genap",
   "DE.Views.Toolbar.textInMargin": "Dalam Margin",
   "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break",
@@ -1370,7 +1592,11 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection",
   "DE.Views.Toolbar.textSubscript": "Subskrip",
   "DE.Views.Toolbar.textSuperscript": "Superskrip",
+  "DE.Views.Toolbar.textTabFile": "File",
   "DE.Views.Toolbar.textTabHome": "Halaman Depan",
+  "DE.Views.Toolbar.textTabInsert": "Sisipkan",
+  "DE.Views.Toolbar.textTabReview": "Ulasan",
+  "DE.Views.Toolbar.textTabView": "Lihat",
   "DE.Views.Toolbar.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "Ke posisi saat ini",
   "DE.Views.Toolbar.textTop": "Top: ",
@@ -1419,6 +1645,8 @@
   "DE.Views.Toolbar.tipRedo": "Ulangi",
   "DE.Views.Toolbar.tipSave": "Simpan",
   "DE.Views.Toolbar.tipSaveCoauth": "Simpan perubahan yang Anda buat agar dapat dilihat oleh pengguna lain",
+  "DE.Views.Toolbar.tipSendBackward": "Mundurkan",
+  "DE.Views.Toolbar.tipSendForward": "Majukan",
   "DE.Views.Toolbar.tipShowHiddenChars": "Karakter Tidak Dicetak",
   "DE.Views.Toolbar.tipSynchronize": "Dokumen telah diubah oleh pengguna lain. Silakan klik untuk menyimpan perubahan dan memuat ulang pembaruan.",
   "DE.Views.Toolbar.tipUndo": "Batalkan",
@@ -1442,5 +1670,21 @@
   "DE.Views.Toolbar.txtScheme6": "Himpunan",
   "DE.Views.Toolbar.txtScheme7": "Margin Sisa",
   "DE.Views.Toolbar.txtScheme8": "Alur",
-  "DE.Views.Toolbar.txtScheme9": "Cetakan"
+  "DE.Views.Toolbar.txtScheme9": "Cetakan",
+  "DE.Views.ViewTab.textFitToPage": "Sesuaikan Halaman",
+  "DE.Views.ViewTab.textFitToWidth": "Sesuaikan Lebar",
+  "DE.Views.ViewTab.textZoom": "Perbesar",
+  "DE.Views.WatermarkSettingsDialog.textAuto": "Otomatis",
+  "DE.Views.WatermarkSettingsDialog.textBold": "Tebal",
+  "DE.Views.WatermarkSettingsDialog.textFont": "Huruf",
+  "DE.Views.WatermarkSettingsDialog.textFromFile": "Dari File",
+  "DE.Views.WatermarkSettingsDialog.textFromUrl": "Dari URL",
+  "DE.Views.WatermarkSettingsDialog.textHor": "Horizontal",
+  "DE.Views.WatermarkSettingsDialog.textItalic": "Miring",
+  "DE.Views.WatermarkSettingsDialog.textLanguage": "Bahasa",
+  "DE.Views.WatermarkSettingsDialog.textNone": "tidak ada",
+  "DE.Views.WatermarkSettingsDialog.textStrikeout": "Coret ganda",
+  "DE.Views.WatermarkSettingsDialog.textText": "Teks",
+  "DE.Views.WatermarkSettingsDialog.textUnderline": "Garis bawah",
+  "DE.Views.WatermarkSettingsDialog.tipFontSize": "Ukuran Huruf"
 }

apps/documenteditor/main/locale/ja.json

@@ -213,6 +213,8 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "自動箇条書き",
   "Common.Views.AutoCorrectDialog.textBy": "幅",
   "Common.Views.AutoCorrectDialog.textDelete": "削除する",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "スペース2回でピリオドを入力する",
+  "Common.Views.AutoCorrectDialog.textFLCells": "テーブルセルの最初の文字を大文字にする",
   "Common.Views.AutoCorrectDialog.textFLSentence": "文章の最初の文字を大文字にする",
   "Common.Views.AutoCorrectDialog.textHyperlink": "インターネットとネットワークのアドレスをハイパーリンクに変更する",
   "Common.Views.AutoCorrectDialog.textHyphens": "ハイフン(--)の代わりにダッシュ(—)",
@@ -505,11 +507,12 @@
   "DE.Controllers.LeftMenu.requestEditRightsText": "アクセス権の編集の要求中...",
   "DE.Controllers.LeftMenu.textLoadHistory": "バリエーションの履歴の読み込み中...",
   "DE.Controllers.LeftMenu.textNoTextFound": "検索データが見つかりませんでした。他の検索設定を選択してください。",
-  "DE.Controllers.LeftMenu.textReplaceSkipped": "置換が行われました。スキップされた発生回数は{0}です。",
+  "DE.Controllers.LeftMenu.textReplaceSkipped": "置換が完了しました。{0}つスキップされました。",
   "DE.Controllers.LeftMenu.textReplaceSuccess": "検索が行われました。変更された発生回数は{0}です。",
   "DE.Controllers.LeftMenu.txtCompatible": "ドキュメントは新しい形式で保存されます。 すべてのエディタ機能を使用できますが、ドキュメントのレイアウトに影響する可能性があります。<br>ファイルを古いバージョンのMS Wordと互換性を持たせる場合は、詳細設定の[互換性]オプションをご使用ください。",
   "DE.Controllers.LeftMenu.txtUntitled": "タイトルなし",
   "DE.Controllers.LeftMenu.warnDownloadAs": "この形式で保存し続ける場合は、テキスト以外のすべての機能が失われます。<br>続行してもよろしいですか？",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "あなたの{0}は編集可能な形式に変換されます。これには時間がかかる場合があります。変換後のドキュメントは、テキストを編集できるように最適化されるため、特に元のファイルに多くのグラフィックが含まれている場合、元の {0} と全く同じようには見えないかもしれません。",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "この形式で保存を続けると、一部の書式が失われる可能性があります。<br>続行しますか？",
   "DE.Controllers.Main.applyChangesTextText": "変更の読み込み中...",
   "DE.Controllers.Main.applyChangesTitleText": "変更の読み込み中",
@@ -608,6 +611,7 @@
   "DE.Controllers.Main.textLongName": "128文字未満の名前を入力してください。",
   "DE.Controllers.Main.textNoLicenseTitle": "ライセンス制限に達しました。",
   "DE.Controllers.Main.textPaidFeature": "有料機能",
+  "DE.Controllers.Main.textReconnect": "接続を回復しました",
   "DE.Controllers.Main.textRemember": "選択内容を保存する",
   "DE.Controllers.Main.textRenameError": "ユーザー名は空にできません。",
   "DE.Controllers.Main.textRenameLabel": "コラボレーションに使用する名前を入力します",
@@ -1453,6 +1457,7 @@
   "DE.Views.DocumentHolder.strSign": "サイン",
   "DE.Views.DocumentHolder.styleText": "スタイルようにフォーマッティングする",
   "DE.Views.DocumentHolder.tableText": "テーブル",
+  "DE.Views.DocumentHolder.textAccept": "変更を受け入れる",
   "DE.Views.DocumentHolder.textAlign": "整列",
   "DE.Views.DocumentHolder.textArrange": "整列",
   "DE.Views.DocumentHolder.textArrangeBack": "背景へ移動",
@@ -1892,6 +1897,7 @@
   "DE.Views.ImageSettings.textCrop": "トリミング",
   "DE.Views.ImageSettings.textCropFill": "塗りつぶし",
   "DE.Views.ImageSettings.textCropFit": "収める",
+  "DE.Views.ImageSettings.textCropToShape": "図形に合わせてトリミング",
   "DE.Views.ImageSettings.textEdit": "編集する",
   "DE.Views.ImageSettings.textEditObject": "オブジェクトを編集する",
   "DE.Views.ImageSettings.textFitMargins": "余白内に収まる",
@@ -2176,6 +2182,7 @@
   "DE.Views.PageSizeDialog.textTitle": "ページのサイズ",
   "DE.Views.PageSizeDialog.textWidth": "幅",
   "DE.Views.PageSizeDialog.txtCustom": "ユーザー設定",
+  "DE.Views.PageThumbnails.textClosePanel": "ページサムネイルを閉じる",
   "DE.Views.ParagraphSettings.strIndent": "インデント",
   "DE.Views.ParagraphSettings.strIndentsLeftText": "左",
   "DE.Views.ParagraphSettings.strIndentsRightText": "右",
@@ -2794,9 +2801,11 @@
   "DE.Views.Toolbar.txtScheme7": "株主資本",
   "DE.Views.Toolbar.txtScheme8": "フロー",
   "DE.Views.Toolbar.txtScheme9": "エコロジー",
-  "DE.Views.ViewTab.textAlwaysShowToolbar": "常にツールバーを表示する",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "ツールバーを常に表示する",
+  "DE.Views.ViewTab.textDarkDocument": "ダーク ドキュメント",
   "DE.Views.ViewTab.textFitToPage": "ページに合わせる",
   "DE.Views.ViewTab.textInterfaceTheme": "インターフェイスのテーマ",
+  "DE.Views.ViewTab.textNavigation": "ナビゲーション",
   "DE.Views.ViewTab.textRulers": "ルーラー",
   "DE.Views.ViewTab.textZoom": "ズーム",
   "DE.Views.WatermarkSettingsDialog.textAuto": "自動",

apps/documenteditor/main/locale/nl.json

@@ -168,6 +168,8 @@
   "Common.UI.ExtendedColorDialog.textNew": "Nieuw",
   "Common.UI.ExtendedColorDialog.textRGBErr": "De ingevoerde waarde is onjuist.<br>Voer een numerieke waarde tussen 0 en 255 in.",
   "Common.UI.HSBColorPicker.textNoColor": "Geen kleur",
+  "Common.UI.InputFieldBtnPassword.textHintHidePwd": "Wachtwoord verbergen",
+  "Common.UI.InputFieldBtnPassword.textHintShowPwd": "Wachtwoord weergeven",
   "Common.UI.SearchDialog.textHighlight": "Resultaten markeren",
   "Common.UI.SearchDialog.textMatchCase": "Hoofdlettergevoelig",
   "Common.UI.SearchDialog.textReplaceDef": "Voer de vervangende tekst in",
@@ -236,12 +238,14 @@
   "Common.Views.Comments.mniAuthorDesc": "Auteur Z tot A",
   "Common.Views.Comments.mniDateAsc": "Oudste",
   "Common.Views.Comments.mniDateDesc": "Nieuwste",
+  "Common.Views.Comments.mniFilterGroups": "Filter per groep",
   "Common.Views.Comments.mniPositionAsc": "Van bovenkant",
   "Common.Views.Comments.mniPositionDesc": "Van onderkant",
   "Common.Views.Comments.textAdd": "Toevoegen",
   "Common.Views.Comments.textAddComment": "Opmerking toevoegen",
   "Common.Views.Comments.textAddCommentToDoc": "Opmerking toevoegen aan document",
   "Common.Views.Comments.textAddReply": "Antwoord toevoegen",
+  "Common.Views.Comments.textAll": "Alle",
   "Common.Views.Comments.textAnonym": "Gast",
   "Common.Views.Comments.textCancel": "Annuleren",
   "Common.Views.Comments.textClose": "Sluiten",
@@ -255,6 +259,7 @@
   "Common.Views.Comments.textResolve": "Oplossen",
   "Common.Views.Comments.textResolved": "Opgelost",
   "Common.Views.Comments.textSort": "Opmerkingen sorteren",
+  "Common.Views.Comments.textViewResolved": "U heeft geen toestemming om deze opmerking te heropenen",
   "Common.Views.CopyWarningDialog.textDontShow": "Dit bericht niet meer weergeven",
   "Common.Views.CopyWarningDialog.textMsg": "De acties Kopiëren, Knippen en Plakken kunnen alleen met behulp van de knoppen op de werkbalk en de acties in het contextmenu worden uitgevoerd op dit tabblad van de editor.<br><br>Als u wilt kopiëren naar of plakken van toepassingen buiten het tabblad van de editor, gebruikt u de volgende toetsencombinaties:",
   "Common.Views.CopyWarningDialog.textTitle": "Acties Kopiëren, Knippen en Plakken",
@@ -431,6 +436,7 @@
   "Common.Views.ReviewPopover.textOpenAgain": "Opnieuw openen",
   "Common.Views.ReviewPopover.textReply": "Beantwoorden",
   "Common.Views.ReviewPopover.textResolve": "Oplossen",
+  "Common.Views.ReviewPopover.textViewResolved": "U heeft geen toestemming om deze opmerking te heropenen",
   "Common.Views.ReviewPopover.txtAccept": "Accepteer",
   "Common.Views.ReviewPopover.txtDeleteTip": "Verwijder",
   "Common.Views.ReviewPopover.txtEditTip": "Bewerken",
@@ -602,6 +608,7 @@
   "DE.Controllers.Main.textLongName": "Voer een naam in die uit minder dan 128 tekens bestaat.",
   "DE.Controllers.Main.textNoLicenseTitle": "Licentielimiet bereikt",
   "DE.Controllers.Main.textPaidFeature": "Betaalde optie",
+  "DE.Controllers.Main.textReconnect": "Connectie is hervat",
   "DE.Controllers.Main.textRemember": "Onthoud voorkeur",
   "DE.Controllers.Main.textRenameError": "Gebruikersnaam mag niet leeg zijn. ",
   "DE.Controllers.Main.textRenameLabel": "Voer een naam in die voor samenwerking moet worden gebruikt ",
@@ -879,6 +886,7 @@
   "DE.Controllers.Main.warnProcessRightsChange": "Het recht om het bestand te bewerken is u ontzegd.",
   "DE.Controllers.Navigation.txtBeginning": "Begin van het document",
   "DE.Controllers.Navigation.txtGotoBeginning": "Ga naar het begin van het document",
+  "DE.Controllers.Statusbar.textDisconnect": "<b>Verbinding verbroken</b><br>Proberen opnieuw te verbinden. Controleer de netwerkinstellingen.",
   "DE.Controllers.Statusbar.textHasChanges": "Er zijn nieuwe wijzigingen bijgehouden",
   "DE.Controllers.Statusbar.textSetTrackChanges": "U bevindt zich in de modus Wijzigingen bijhouden ",
   "DE.Controllers.Statusbar.textTrackChanges": "Het document is geopend met de modus 'Wijzigingen bijhouden' geactiveerd",
@@ -902,10 +910,14 @@
   "DE.Controllers.Toolbar.textMatrix": "Matrices",
   "DE.Controllers.Toolbar.textOperator": "Operators",
   "DE.Controllers.Toolbar.textRadical": "Wortels",
+  "DE.Controllers.Toolbar.textRecentlyUsed": "Recent gebruikt",
   "DE.Controllers.Toolbar.textScript": "Scripts",
   "DE.Controllers.Toolbar.textSymbols": "Symbolen",
   "DE.Controllers.Toolbar.textTabForms": "Formulieren",
   "DE.Controllers.Toolbar.textWarning": "Waarschuwing",
+  "DE.Controllers.Toolbar.tipMarkersArrow": "Pijltjes",
+  "DE.Controllers.Toolbar.tipMarkersCheckmark": "Vinkjes",
+  "DE.Controllers.Toolbar.tipMarkersDash": "Streepjes",
   "DE.Controllers.Toolbar.txtAccent_Accent": "Aigu",
   "DE.Controllers.Toolbar.txtAccent_ArrowD": "Pijl van rechts naar links boven",
   "DE.Controllers.Toolbar.txtAccent_ArrowL": "Pijl links boven",
@@ -1439,6 +1451,7 @@
   "DE.Views.DocumentHolder.strSign": "Onderteken",
   "DE.Views.DocumentHolder.styleText": "Opmaak als stijl",
   "DE.Views.DocumentHolder.tableText": "Tabel",
+  "DE.Views.DocumentHolder.textAccept": "Accepteer verandering",
   "DE.Views.DocumentHolder.textAlign": "Uitlijnen",
   "DE.Views.DocumentHolder.textArrange": "Ordenen",
   "DE.Views.DocumentHolder.textArrangeBack": "Naar achtergrond sturen",
@@ -1472,6 +1485,7 @@
   "DE.Views.DocumentHolder.textPaste": "Plakken",
   "DE.Views.DocumentHolder.textPrevPage": "Vorige pagina",
   "DE.Views.DocumentHolder.textRefreshField": "Ververs veld",
+  "DE.Views.DocumentHolder.textReject": "Verandering weigeren",
   "DE.Views.DocumentHolder.textRemCheckBox": "Verwijder het selectievakje",
   "DE.Views.DocumentHolder.textRemComboBox": "Verwijder keuzelijst met invoervak",
   "DE.Views.DocumentHolder.textRemDropdown": "Dropdown verwijderen",
@@ -1505,6 +1519,9 @@
   "DE.Views.DocumentHolder.textUpdateTOC": "Inhoudsopgave verversen",
   "DE.Views.DocumentHolder.textWrap": "Terugloopstijl",
   "DE.Views.DocumentHolder.tipIsLocked": "Dit element wordt op dit moment bewerkt door een andere gebruiker.",
+  "DE.Views.DocumentHolder.tipMarkersArrow": "Pijltjes",
+  "DE.Views.DocumentHolder.tipMarkersCheckmark": "Vinkjes",
+  "DE.Views.DocumentHolder.tipMarkersDash": "Streepjes",
   "DE.Views.DocumentHolder.toDictionaryText": "Toevoegen aan woordenboek",
   "DE.Views.DocumentHolder.txtAddBottom": "Onderrand toevoegen",
   "DE.Views.DocumentHolder.txtAddFractionBar": "Deelteken toevoegen",
@@ -1871,6 +1888,7 @@
   "DE.Views.ImageSettings.textCrop": "Uitsnijden",
   "DE.Views.ImageSettings.textCropFill": "Vulling",
   "DE.Views.ImageSettings.textCropFit": "Aanpassen",
+  "DE.Views.ImageSettings.textCropToShape": "Bijsnijden naar vorm",
   "DE.Views.ImageSettings.textEdit": "Bewerken",
   "DE.Views.ImageSettings.textEditObject": "Object bewerken",
   "DE.Views.ImageSettings.textFitMargins": "Aan Marge Aanpassen",
@@ -1885,6 +1903,7 @@
   "DE.Views.ImageSettings.textHintFlipV": "Verticaal omdraaien",
   "DE.Views.ImageSettings.textInsert": "Afbeelding vervangen",
   "DE.Views.ImageSettings.textOriginalSize": "Ware grootte",
+  "DE.Views.ImageSettings.textRecentlyUsed": "Recent gebruikt",
   "DE.Views.ImageSettings.textRotate90": "Draaien 90°",
   "DE.Views.ImageSettings.textRotation": "Draaien",
   "DE.Views.ImageSettings.textSize": "Grootte",
@@ -2155,6 +2174,9 @@
   "DE.Views.PageSizeDialog.textTitle": "Paginaformaat",
   "DE.Views.PageSizeDialog.textWidth": "Breedte",
   "DE.Views.PageSizeDialog.txtCustom": "Aangepast",
+  "DE.Views.PageThumbnails.textPageThumbnails": "Pagina pictogrammen",
+  "DE.Views.PageThumbnails.textThumbnailsSettings": "Pictograminstellingen",
+  "DE.Views.PageThumbnails.textThumbnailsSize": "Pictogram grootte",
   "DE.Views.ParagraphSettings.strIndent": "Inspringen",
   "DE.Views.ParagraphSettings.strIndentsLeftText": "Links",
   "DE.Views.ParagraphSettings.strIndentsRightText": "Rechts",
@@ -2290,6 +2312,7 @@
   "DE.Views.ShapeSettings.textPatternFill": "Patroon",
   "DE.Views.ShapeSettings.textPosition": "Positie",
   "DE.Views.ShapeSettings.textRadial": "Radiaal",
+  "DE.Views.ShapeSettings.textRecentlyUsed": "Recent gebruikt",
   "DE.Views.ShapeSettings.textRotate90": "Draaien 90°",
   "DE.Views.ShapeSettings.textRotation": "Draaien",
   "DE.Views.ShapeSettings.textSelectImage": "selecteer afbeelding",
@@ -2340,6 +2363,7 @@
   "DE.Views.Statusbar.pageIndexText": "Pagina {0} van {1}",
   "DE.Views.Statusbar.tipFitPage": "Aan pagina aanpassen",
   "DE.Views.Statusbar.tipFitWidth": "Aan breedte aanpassen",
+  "DE.Views.Statusbar.tipSelectTool": "Gereedschap selecteren",
   "DE.Views.Statusbar.tipSetLang": "Taal van tekst instellen",
   "DE.Views.Statusbar.tipZoomFactor": "Zoomen",
   "DE.Views.Statusbar.tipZoomIn": "Inzoomen",
@@ -2681,6 +2705,7 @@
   "DE.Views.Toolbar.textTabLinks": "Verwijzingen",
   "DE.Views.Toolbar.textTabProtect": "Beveiliging",
   "DE.Views.Toolbar.textTabReview": "Beoordelen",
+  "DE.Views.Toolbar.textTabView": "Bekijken",
   "DE.Views.Toolbar.textTitleError": "Fout",
   "DE.Views.Toolbar.textToCurrent": "Naar huidige positie",
   "DE.Views.Toolbar.textTop": "Boven:",
@@ -2772,6 +2797,15 @@
   "DE.Views.Toolbar.txtScheme7": "Vermogen",
   "DE.Views.Toolbar.txtScheme8": "Stroom",
   "DE.Views.Toolbar.txtScheme9": "Gieterij",
+  "DE.Views.ViewTab.textAlwaysShowToolbar": "Werkbalk altijd weergeven",
+  "DE.Views.ViewTab.textDarkDocument": "Donker document",
+  "DE.Views.ViewTab.textFitToPage": "Aan pagina aanpassen",
+  "DE.Views.ViewTab.textFitToWidth": "Aan breedte aanpassen",
+  "DE.Views.ViewTab.textInterfaceTheme": "Thema van de interface",
+  "DE.Views.ViewTab.textNavigation": "Navigatie",
+  "DE.Views.ViewTab.textRulers": "Linialen",
+  "DE.Views.ViewTab.textStatusBar": "Statusbalk",
+  "DE.Views.ViewTab.textZoom": "Inzoomen",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Automatisch",
   "DE.Views.WatermarkSettingsDialog.textBold": "Vet",
   "DE.Views.WatermarkSettingsDialog.textColor": "Tekstkleur",

apps/documenteditor/main/locale/pt.json

@@ -213,6 +213,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",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "O documento será salvo em novo formato. Isto permitirá usar todos os recursos de editor, mas pode afetar o layout do documento. <br> Use a opção de 'Compatibilidade' para configurações avançadas se deseja tornar o arquivo compatível com versões antigas do MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Sem título",
   "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.<br>Are you sure you want to continue?",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "O documento resultante será otimizado para permitir que você edite o texto, portanto, não gráficos exatamente iguais ao original, se o arquivo original contiver muitos gráficos.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Se você continuar salvando neste formato algumas formatações podem ser perdidas.<br>Você tem certeza que deseja continuar?",
   "DE.Controllers.Main.applyChangesTextText": "Carregando as alterações...",
   "DE.Controllers.Main.applyChangesTitleText": "Carregando as alterações",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Assinar",
   "DE.Views.DocumentHolder.styleText": "Formatar como Estilo",
   "DE.Views.DocumentHolder.tableText": "Tabela",
+  "DE.Views.DocumentHolder.textAccept": "Aceitar alteração",
   "DE.Views.DocumentHolder.textAlign": "Alinhar",
   "DE.Views.DocumentHolder.textArrange": "Organizar",
   "DE.Views.DocumentHolder.textArrangeBack": "Enviar para plano de fundo",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Colar",
   "DE.Views.DocumentHolder.textPrevPage": "Página anterior",
   "DE.Views.DocumentHolder.textRefreshField": "Atualizar o campo",
+  "DE.Views.DocumentHolder.textReject": "Rejeitar alteração",
   "DE.Views.DocumentHolder.textRemCheckBox": "Remover caixa de seleção",
   "DE.Views.DocumentHolder.textRemComboBox": "Remover caixa de combinação",
   "DE.Views.DocumentHolder.textRemDropdown": "Remover lista suspensa",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Página {0} de {1}",
   "DE.Views.Statusbar.tipFitPage": "Ajustar página",
   "DE.Views.Statusbar.tipFitWidth": "Ajustar largura",
+  "DE.Views.Statusbar.tipHandTool": "Ferramenta de mão",
+  "DE.Views.Statusbar.tipSelectTool": "Selecionar ferramenta",
   "DE.Views.Statusbar.tipSetLang": "Definir idioma do texto",
   "DE.Views.Statusbar.tipZoomFactor": "Zoom",
   "DE.Views.Statusbar.tipZoomIn": "Ampliar",

apps/documenteditor/main/locale/ro.json

@@ -213,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Creare automată a listei cu marcatori",
   "Common.Views.AutoCorrectDialog.textBy": "După",
   "Common.Views.AutoCorrectDialog.textDelete": "Ștergere",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Adăugarea unui punct prin apăsarea dublă a barei de spațiu ",
   "Common.Views.AutoCorrectDialog.textFLCells": "Scrie cu majusculă prima litera din fiecare celulă de tabel",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Scrie cu majusculă prima literă a propoziției",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Căi Internet și de rețea cu hyperlink-uri",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "Documentul va fi slvat în format nou. În acest caz, toate opțiunile editorului vor deveni disponibile, totuși aspectul documentului poate fi afectat.<br>Folosiți setări avansate și opțiunea de Compatibilitate dacă fișierul trebuie să fie compatibil cu o versiune mai veche MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Fără titlu",
   "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.Main.applyChangesTextText": "Încărcarea modificărilor...",
   "DE.Controllers.Main.applyChangesTitleText": "Încărcare modificări",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Semnare",
   "DE.Views.DocumentHolder.styleText": "Formatare cu stil",
   "DE.Views.DocumentHolder.tableText": "Tabel",
+  "DE.Views.DocumentHolder.textAccept": "Acceptați această modificare",
   "DE.Views.DocumentHolder.textAlign": "Aliniere",
   "DE.Views.DocumentHolder.textArrange": "Aranjare",
   "DE.Views.DocumentHolder.textArrangeBack": "Trimitere în plan secundar",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Lipire",
   "DE.Views.DocumentHolder.textPrevPage": "Pagina anterioară",
   "DE.Views.DocumentHolder.textRefreshField": "Actualizare câmp",
+  "DE.Views.DocumentHolder.textReject": "Respingenți această modificare",
   "DE.Views.DocumentHolder.textRemCheckBox": "Eliminare control casetă de selectare",
   "DE.Views.DocumentHolder.textRemComboBox": "Eliminare control casetă combo",
   "DE.Views.DocumentHolder.textRemDropdown": "Eliminare listă verticală",
@@ -2032,7 +2036,7 @@
   "DE.Views.LineNumbersDialog.txtAutoText": "Auto",
   "DE.Views.Links.capBtnBookmarks": "Marcaj",
   "DE.Views.Links.capBtnCaption": "Legenda",
-  "DE.Views.Links.capBtnContentsUpdate": "Actualizare",
+  "DE.Views.Links.capBtnContentsUpdate": "Actualizare tabel",
   "DE.Views.Links.capBtnCrossRef": "Referință încrucișată",
   "DE.Views.Links.capBtnInsContents": "Cuprins",
   "DE.Views.Links.capBtnInsFootnote": "Notă de subsol",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Page {0} din {1}",
   "DE.Views.Statusbar.tipFitPage": "Portivire la pagina",
   "DE.Views.Statusbar.tipFitWidth": "Potrivire lățime",
+  "DE.Views.Statusbar.tipHandTool": "Instrumentul Mână",
+  "DE.Views.Statusbar.tipSelectTool": "Instrumentul Selectare",
   "DE.Views.Statusbar.tipSetLang": "Setare limba text",
   "DE.Views.Statusbar.tipZoomFactor": "Zoom",
   "DE.Views.Statusbar.tipZoomIn": "Mărire",

apps/documenteditor/main/locale/ru.json

@@ -213,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "Стили маркированных списков",
   "Common.Views.AutoCorrectDialog.textBy": "На",
   "Common.Views.AutoCorrectDialog.textDelete": "Удалить",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "Добавлять точку двойным пробелом",
   "Common.Views.AutoCorrectDialog.textFLCells": "Делать первые буквы ячеек таблиц прописными",
   "Common.Views.AutoCorrectDialog.textFLSentence": "Делать первые буквы предложений прописными",
   "Common.Views.AutoCorrectDialog.textHyperlink": "Адреса в Интернете и сетевые пути гиперссылками",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "Документ будет сохранен в новый формат. Это позволит использовать все функции редактора, но может повлиять на структуру документа.<br>Используйте опцию 'Совместимость' в дополнительных параметрах, если хотите сделать файлы совместимыми с более старыми версиями MS Word.",
   "DE.Controllers.LeftMenu.txtUntitled": "Без имени",
   "DE.Controllers.LeftMenu.warnDownloadAs": "Если Вы продолжите сохранение в этот формат, весь функционал, кроме текста, будет потерян.<br>Вы действительно хотите продолжить?",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "{0} будет сконвертирован в редактируемый формат. Это может занять некоторое время. Получившийся в результате документ будет оптимизирован для редактирования текста, поэтому он может отличаться от исходного {0}, особенно если исходный файл содержит много графических элементов.",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "Если вы продолжите сохранение в этот формат, часть форматирования может быть потеряна.<br>Вы действительно хотите продолжить?",
   "DE.Controllers.Main.applyChangesTextText": "Загрузка изменений...",
   "DE.Controllers.Main.applyChangesTitleText": "Загрузка изменений",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "Подписать",
   "DE.Views.DocumentHolder.styleText": "Форматирование как стиль",
   "DE.Views.DocumentHolder.tableText": "Таблицу",
+  "DE.Views.DocumentHolder.textAccept": "Принять изменение",
   "DE.Views.DocumentHolder.textAlign": "Выравнивание",
   "DE.Views.DocumentHolder.textArrange": "Порядок",
   "DE.Views.DocumentHolder.textArrangeBack": "Перенести на задний план",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "Вставить",
   "DE.Views.DocumentHolder.textPrevPage": "Предыдущая страница",
   "DE.Views.DocumentHolder.textRefreshField": "Обновить поле",
+  "DE.Views.DocumentHolder.textReject": "Отклонить изменение",
   "DE.Views.DocumentHolder.textRemCheckBox": "Удалить флажок",
   "DE.Views.DocumentHolder.textRemComboBox": "Удалить поле со списком",
   "DE.Views.DocumentHolder.textRemDropdown": "Удалить выпадающий список",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "Страница {0} из {1}",
   "DE.Views.Statusbar.tipFitPage": "По размеру страницы",
   "DE.Views.Statusbar.tipFitWidth": "По ширине",
+  "DE.Views.Statusbar.tipHandTool": "Инструмент \"Рука\"",
+  "DE.Views.Statusbar.tipSelectTool": "Инструмент выделения",
   "DE.Views.Statusbar.tipSetLang": "Выбрать язык текста",
   "DE.Views.Statusbar.tipZoomFactor": "Масштаб",
   "DE.Views.Statusbar.tipZoomIn": "Увеличить",

apps/documenteditor/main/locale/zh.json

@@ -213,6 +213,7 @@
   "Common.Views.AutoCorrectDialog.textBulleted": "自动项目符号列表",
   "Common.Views.AutoCorrectDialog.textBy": "依据",
   "Common.Views.AutoCorrectDialog.textDelete": "删除",
+  "Common.Views.AutoCorrectDialog.textDoubleSpaces": "按两下空白键自动增加一个句点(.)符号",
   "Common.Views.AutoCorrectDialog.textFLCells": "表格单元格的首字母大写",
   "Common.Views.AutoCorrectDialog.textFLSentence": "将句子首字母大写",
   "Common.Views.AutoCorrectDialog.textHyperlink": "带超链接的互联网与网络路径",
@@ -511,6 +512,7 @@
   "DE.Controllers.LeftMenu.txtCompatible": "文档将保存为新格式。它将允许使用所有编辑器功能，但可能会影响文档布局。<br>如果要使文档与旧版微软 Word 兼容，请使用高级设置的“兼容性”选项。",
   "DE.Controllers.LeftMenu.txtUntitled": "无标题",
   "DE.Controllers.LeftMenu.warnDownloadAs": "如果您继续以此格式保存，除文本之外的所有功能将丢失。<br>您确定要继续吗？",
+  "DE.Controllers.LeftMenu.warnDownloadAsPdf": "您的 {0} 将转换成一份可修改的文件。系统需要处理一段时间。转换后的文件即可随之修改，但可能不完全跟您的原 {0} 相同，特别是如果原文件有过多的图像将会更有差异。",
   "DE.Controllers.LeftMenu.warnDownloadAsRTF": "如果您继续以此格式保存，一些格式可能会丢失。<br>您确定要继续吗？",
   "DE.Controllers.Main.applyChangesTextText": "载入更改...",
   "DE.Controllers.Main.applyChangesTitleText": "加载更改",
@@ -1460,6 +1462,7 @@
   "DE.Views.DocumentHolder.strSign": "签名",
   "DE.Views.DocumentHolder.styleText": "格式化为样式",
   "DE.Views.DocumentHolder.tableText": "表格",
+  "DE.Views.DocumentHolder.textAccept": "接受变化",
   "DE.Views.DocumentHolder.textAlign": "对齐",
   "DE.Views.DocumentHolder.textArrange": "安排",
   "DE.Views.DocumentHolder.textArrangeBack": "发送到背景",
@@ -1494,6 +1497,7 @@
   "DE.Views.DocumentHolder.textPaste": "粘贴",
   "DE.Views.DocumentHolder.textPrevPage": "上一页",
   "DE.Views.DocumentHolder.textRefreshField": "刷新字段",
+  "DE.Views.DocumentHolder.textReject": "拒绝变化",
   "DE.Views.DocumentHolder.textRemCheckBox": "删除多选框",
   "DE.Views.DocumentHolder.textRemComboBox": "删除组合框",
   "DE.Views.DocumentHolder.textRemDropdown": "删除候选列表",
@@ -2378,6 +2382,8 @@
   "DE.Views.Statusbar.pageIndexText": "第{0}页共{1}页",
   "DE.Views.Statusbar.tipFitPage": "适合页面",
   "DE.Views.Statusbar.tipFitWidth": "适合宽度",
+  "DE.Views.Statusbar.tipHandTool": "移动工具",
+  "DE.Views.Statusbar.tipSelectTool": "选取工具",
   "DE.Views.Statusbar.tipSetLang": "设置文本语言",
   "DE.Views.Statusbar.tipZoomFactor": "放大",
   "DE.Views.Statusbar.tipZoomIn": "放大",

apps/documenteditor/mobile/locale/cs.json

@@ -41,6 +41,7 @@
     "textLocation": "Umístění",
     "textNextPage": "Další stránka",
     "textOddPage": "Lichá stránka",
+    "textOk": "OK",
     "textOther": "Jiné",
     "textPageBreak": "Konec stránky",
     "textPageNumber": "Číslo stránky",
@@ -56,8 +57,7 @@
     "textStartAt": "Začít na",
     "textTable": "Tabulka",
     "textTableSize": "Velikost tabulky",
-    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\"",
+    "txtNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\""
-    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -158,13 +158,13 @@
       "textUsers": "Uživatelé",
       "textWidow": "Ovládací prvek okna"
     },
+    "HighlightColorPalette": {
+      "textNoFill": "Bez výplně"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "Vlastní barvy",
       "textStandartColors": "Standardní barvy",
-      "textThemeColors": "Barvy motivu vzhledu"
+      "textThemeColors": "Barvy vzhledu prostředí"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -229,6 +229,7 @@
     "textContinueFromPreviousSection": "Pokračovat od předchozí sekce",
     "textCustomColor": "Vlastní barva",
     "textDecember": "prosinec",
+    "textDesign": "Vzhled",
     "textDifferentFirstPage": "Odlišná první stránka",
     "textDifferentOddAndEvenPages": "Rozdílné liché a sudé stránky",
     "textDisplay": "Zobrazit",
@@ -238,6 +239,7 @@
     "textEffects": "Efekty",
     "textEmpty": "prázdné",
     "textEmptyImgUrl": "Musíte upřesnit URL obrázku.",
+    "textFebruary": "únor",
     "textFill": "Výplň",
     "textFirstColumn": "První sloupec",
     "textFirstLine": "První řádek",
@@ -246,6 +248,7 @@
     "textFontColors": "Barvy písma",
     "textFonts": "Styly",
     "textFooter": "Zápatí",
+    "textFr": "pá",
     "textHeader": "Záhlaví",
     "textHeaderRow": "Záhlaví řádků",
     "textHighlightColor": "Barva zvýraznění",
@@ -254,6 +257,9 @@
     "textImageURL": "URL obrázku",
     "textInFront": "Vpředu",
     "textInline": "V textu",
+    "textJanuary": "leden",
+    "textJuly": "červenec",
+    "textJune": "červen",
     "textKeepLinesTogether": "Držet řádky pohromadě",
     "textKeepWithNext": "Svázat s následujícím",
     "textLastColumn": "Poslední sloupec",
@@ -262,13 +268,19 @@
     "textLink": "Odkaz",
     "textLinkSettings": "Nastavení odkazů",
     "textLinkToPrevious": "Odkaz na předchozí",
+    "textMarch": "březen",
+    "textMay": "květen",
+    "textMo": "po",
     "textMoveBackward": "Jít zpět",
     "textMoveForward": "Posunout vpřed",
     "textMoveWithText": "Přesunout s textem",
     "textNone": "Žádné",
     "textNoStyles": "Žádné styly pro tento typ grafů.",
     "textNotUrl": "Toto pole by mělo obsahovat adresu URL ve formátu \"http://www.example.com\"",
+    "textNovember": "listopad",
     "textNumbers": "Čísla",
+    "textOctober": "říjen",
+    "textOk": "OK",
     "textOpacity": "Průhlednost",
     "textOptions": "Možnosti",
     "textOrphanControl": "Kontrola osamocených řádků",
@@ -289,9 +301,11 @@
     "textReplace": "Nahradit",
     "textReplaceImage": "Nahradit obrázek",
     "textResizeToFitContent": "Změnit velikost pro přizpůsobení obsahu",
+    "textSa": "so",
     "textScreenTip": "Nápověda",
     "textSelectObjectToEdit": "Vyberte objekt pro úpravu",
     "textSendToBackground": "Přesunout do pozadí",
+    "textSeptember": "září",
     "textSettings": "Nastavení",
     "textShape": "Obrazec",
     "textSize": "Velikost",
@@ -302,35 +316,21 @@
     "textStrikethrough": "Přeškrtnuté",
     "textStyle": "Styl",
     "textStyleOptions": "Možnosti stylu",
+    "textSu": "ne",
     "textSubscript": "Dolní index",
     "textSuperscript": "Horní index",
     "textTable": "Tabulka",
     "textTableOptions": "Možnosti tabulky",
     "textText": "Text",
+    "textTh": "čt",
     "textThrough": "Skrz",
     "textTight": "Těsné",
     "textTopAndBottom": "Nahoře a dole",
     "textTotalRow": "Součtový řádek",
+    "textTu": "út",
     "textType": "Typ",
-    "textWrap": "Obtékání",
+    "textWe": "st",
-    "textDesign": "Design",
+    "textWrap": "Obtékání"
-    "textFebruary": "February",
-    "textFr": "Fr",
-    "textJanuary": "January",
-    "textJuly": "July",
-    "textJune": "June",
-    "textMarch": "March",
-    "textMay": "May",
-    "textMo": "Mo",
-    "textNovember": "November",
-    "textOctober": "October",
-    "textOk": "Ok",
-    "textSa": "Sa",
-    "textSeptember": "September",
-    "textSu": "Su",
-    "textTh": "Th",
-    "textTu": "Tu",
-    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "Vypršel čas konverze.",
@@ -487,8 +487,11 @@
     "textHasMacros": "Soubor obsahuje automatická makra.<br>Opravdu chcete makra spustit?",
     "textNo": "Ne",
     "textNoLicenseTitle": "Došlo k dosažení limitu licence",
+    "textNoTextFound": "Text nebyl nalezen",
     "textPaidFeature": "Placená funkce",
     "textRemember": "Zapamatovat moji volbu",
+    "textReplaceSkipped": "Nahrazení bylo provedeno. {0} výskytů bylo přeskočeno.",
+    "textReplaceSuccess": "Hledání bylo dokončeno. Nahrazeno výskytů: {0}",
     "textYes": "Ano",
     "titleLicenseExp": "Platnost licence vypršela",
     "titleServerVersion": "Editor byl aktualizován",
@@ -500,10 +503,7 @@
     "warnLicenseUsersExceeded": "Došlo dosažení limitu %1 editorů v režimu spolupráce na úpravách. Ohledně podrobností se obraťte na svého správce.",
     "warnNoLicense": "Došlo k dosažení limitu souběžného připojení %1 editorů. Tento dokument bude otevřen pouze pro náhled. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
     "warnNoLicenseUsers": "Došlo k dosažení limitu %1 editorů. Pro rozšíření funkcí kontaktujte %1 obchodní oddělení.",
-    "warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu.",
+    "warnProcessRightsChange": "Nemáte oprávnění pro úpravu tohoto dokumentu."
-    "textNoTextFound": "Text not found",
-    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
-    "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {
     "advDRMOptions": "Zabezpečený soubor",

apps/documenteditor/mobile/locale/ja.json

@@ -41,6 +41,7 @@
     "textLocation": "場所",
     "textNextPage": "次のページ",
     "textOddPage": "奇数ページ",
+    "textOk": "OK",
     "textOther": "その他",
     "textPageBreak": "改ページ",
     "textPageNumber": "ページ番号",
@@ -56,8 +57,7 @@
     "textStartAt": "から始まる",
     "textTable": "表",
     "textTableSize": "表のサイズ",
-    "txtNotUrl": "このフィールドは、「http://www.example.com」の形式のURLである必要があります。",
+    "txtNotUrl": "このフィールドは、「http://www.example.com」の形式のURLである必要があります。"
-    "textOk": "Ok"
   },
   "Common": {
     "Collaboration": {
@@ -158,13 +158,13 @@
       "textUsers": "ユーザー",
       "textWidow": "改ページ時 1 行残して段落を区切らない"
     },
+    "HighlightColorPalette": {
+      "textNoFill": "塗りつぶしなし"
+    },
     "ThemeColorPalette": {
       "textCustomColors": "ユーザー設定の色",
       "textStandartColors": "標準の色",
       "textThemeColors": "テーマの色"
-    },
-    "HighlightColorPalette": {
-      "textNoFill": "No Fill"
     }
   },
   "ContextMenu": {
@@ -229,6 +229,7 @@
     "textContinueFromPreviousSection": "前のセクションから続ける",
     "textCustomColor": "ユーザー設定の色",
     "textDecember": "12月",
+    "textDesign": "デザイン",
     "textDifferentFirstPage": "先頭ページのみ別指定",
     "textDifferentOddAndEvenPages": "奇数/偶数ページ別指定",
     "textDisplay": "表示する",
@@ -236,6 +237,7 @@
     "textDoubleStrikethrough": "二重取り消し線",
     "textEditLink": "リンクを編集する",
     "textEffects": "効果",
+    "textEmpty": "空",
     "textEmptyImgUrl": "イメージのURLを指定すべきです。",
     "textFebruary": "2月",
     "textFill": "塗りつぶし",
@@ -246,6 +248,7 @@
     "textFontColors": "フォントの色",
     "textFonts": "フォント",
     "textFooter": "フッター",
+    "textFr": "金",
     "textHeader": "ヘッダー",
     "textHeaderRow": "ヘッダー行",
     "textHighlightColor": "強調表示の色",
@@ -267,6 +270,7 @@
     "textLinkToPrevious": "前に結合する",
     "textMarch": "3月",
     "textMay": "5月",
+    "textMo": "月",
     "textMoveBackward": "背面に動かす",
     "textMoveForward": "前面に動かす",
     "textMoveWithText": "テキストと一緒に移動する",
@@ -276,6 +280,7 @@
     "textNovember": "11月",
     "textNumbers": "数",
     "textOctober": "10月",
+    "textOk": "OK",
     "textOpacity": "不透明度",
     "textOptions": "オプション",
     "textOrphanControl": "改ページ時 1 行残して段落を区切らない",
@@ -296,6 +301,7 @@
     "textReplace": "置換する",
     "textReplaceImage": "イメージを置換する",
     "textResizeToFitContent": "内容に合わせてサイズを変更する",
+    "textSa": "土",
     "textScreenTip": "ヒント",
     "textSelectObjectToEdit": "編集するためにオブジェクト​​を選んでください",
     "textSendToBackground": "背景へ動かす",
@@ -310,27 +316,21 @@
     "textStrikethrough": "取り消し線",
     "textStyle": "スタイル",
     "textStyleOptions": "スタイルの設定",
+    "textSu": "日",
     "textSubscript": "下付き文字",
     "textSuperscript": "上付き文字",
     "textTable": "表",
     "textTableOptions": "表の設定",
     "textText": "テキスト",
+    "textTh": "木",
     "textThrough": "スルー",
     "textTight": "外周",
     "textTopAndBottom": "上と下",
     "textTotalRow": "合計行",
+    "textTu": "火",
     "textType": "タイプ",
-    "textWrap": "折り返す",
+    "textWe": "水",
-    "textDesign": "Design",
+    "textWrap": "折り返す"
-    "textEmpty": "Empty",
-    "textFr": "Fr",
-    "textMo": "Mo",
-    "textOk": "Ok",
-    "textSa": "Sa",
-    "textSu": "Su",
-    "textTh": "Th",
-    "textTu": "Tu",
-    "textWe": "We"
   },
   "Error": {
     "convertationTimeoutText": "変換のタイムアウトを超過しました。",
@@ -487,8 +487,10 @@
     "textHasMacros": "ファイルには自動マクロが含まれています。<br>マクロを実行しますか？",
     "textNo": "いいえ",
     "textNoLicenseTitle": "ライセンス制限に達しました",
+    "textNoTextFound": "テキストが見つかりませんでした",
     "textPaidFeature": "有料機能",
     "textRemember": "選択を覚える",
+    "textReplaceSkipped": "置換が完了しました。{0}つスキップされました。",
     "textYes": "はい",
     "titleLicenseExp": "ライセンスの有効期限が切れています",
     "titleServerVersion": "編集者が更新された",
@@ -501,8 +503,6 @@
     "warnNoLicense": "％１エディター　時接続数の制限に達しました。この文書が見るだけのために開かれる。個人的なアップグレード条件については、％1営業チームを連絡してください。",
     "warnNoLicenseUsers": "％1エディターのユーザー制限に達しました。 個人的なアップグレード条件については、％1営業チームを連絡してください。",
     "warnProcessRightsChange": "ファイルを編集する権限がありません！",
-    "textNoTextFound": "Text not found",
-    "textReplaceSkipped": "The replacement has been made. {0} occurrences were skipped.",
     "textReplaceSuccess": "The search has been done. Occurrences replaced: {0}"
   },
   "Settings": {

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

@@ -30,6 +30,7 @@ class ContextMenu extends ContextMenuController {
         this.onApiHideComment = this.onApiHideComment.bind(this);
         this.onApiShowChange = this.onApiShowChange.bind(this);
         this.getUserName = this.getUserName.bind(this);
+        this.isUserVisible = this.isUserVisible.bind(this);
         this.ShowModal = this.ShowModal.bind(this);
     }
 
@@ -42,6 +43,11 @@ class ContextMenu extends ContextMenuController {
         return AscCommon.UserInfoParser.getParsedName(user.asc_getUserName());
     }
 
+    isUserVisible(id) {
+        const user = this.props.users.searchUserByCurrentId(id);
+        return user ? (user.asc_getIdOriginal()===this.props.users.currentUser.asc_getIdOriginal() || AscCommon.UserInfoParser.isUserVisible(user.asc_getUserName())) : true;
+    }
+
     componentWillUnmount() {
         super.componentWillUnmount();
 

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

@@ -32,7 +32,7 @@
             border-top: 1px solid #446995;
             border-bottom: 1px solid #446995;
             input {
-                color: #000;
+                color: @text-normal;
                 font-size: 17px;
                 font-weight: var(--f7-list-item-after-line-height);
             }

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

@@ -79,7 +79,7 @@
             border:none;
 
             input {
-                color: #000;
+                color: @text-normal;
                 font-size: 16px;
                 width: 40px;
                 font-weight: var(--f7-list-item-after-line-height);

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

@@ -200,6 +200,9 @@
         border: 1px solid @brandColor;
         background-color: transparent;
     }
+    .calendar-day-weekend .calendar-day-number {
+        color: #D25252;
+    }
     .calendar-day-number {
         color: @text-normal;
         font-size: 14px;
@@ -236,6 +239,3 @@
         color: @brandColor;
     }
 }
-
-
-

apps/documenteditor/mobile/src/less/icons-material.less

@@ -78,7 +78,7 @@
     &.icon-expand-down {
       width: 17px;
       height: 17px;
-      .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{fill-white}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>', @fill-white);
+      .encoded-svg-mask('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 22 22" fill="@{brand-word}"><g><polygon points="10.9,16.9 2,8.1 4.1,6 11.1,12.8 17.9,6 20,8.1 11.2,16.9 11.1,17 "/></g></svg>');
     }
     &.icon-expand-up {
       width: 17px;

apps/documenteditor/mobile/src/store/textSettings.js

@@ -101,11 +101,11 @@ export class storeTextSettings {
         this.thumbCanvas = document.createElement('canvas');
         this.thumbContext = this.thumbCanvas.getContext('2d');
         this.thumbs = [
-            {ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight},
+            {ratio: 1, path: '../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight},
-            {ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25},
+            {ratio: 1.25, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25},
-            {ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5},
+            {ratio: 1.5, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5},
-            {ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75},
+            {ratio: 1.75, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75},
-            {ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2}
+            {ratio: 2, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2}
         ];
 
         const applicationPixelRatio = Common.Utils.applicationPixelRatio();

apps/presentationeditor/embed/locale/be.json

@@ -14,6 +14,7 @@
   "PE.ApplicationController.errorFilePassProtect": "Файл абаронены паролем, яго немагчыма адкрыць.",
   "PE.ApplicationController.errorFileSizeExceed": "Памер файла перавышае ліміт, вызначаны для вашага сервера.<br>Звярніцеся да адміністратара сервера дакументаў за дадатковымі звесткамі.",
   "PE.ApplicationController.errorForceSave": "Падчас захавання файла адбылася памылка. Калі ласка, выкарыстайце параметр \"Спампаваць як\", каб захаваць файл на цвёрдым дыску камп’ютара, альбо паспрабуйце яшчэ раз пазней.",
+  "PE.ApplicationController.errorLoadingFont": "Шрыфты не загрузіліся.<br>Звярніцеся да адміністратара сервера дакументаў.",
   "PE.ApplicationController.errorTokenExpire": "Тэрмін дзеяння токена бяспекі дакумента сышоў.<br>Калі ласка, звярніцеся да адміністратара сервера дакументаў.",
   "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Злучэнне з інтэрнэтам было адноўлена, і версія файла змянілася.<br>Перш чым працягнуць працу, неабходна спампаваць файл альбо скапіяваць яго змесціва, каб захаваць даныя, а пасля перазагрузіць старонку.",
   "PE.ApplicationController.errorUserDrop": "На дадзены момант файл недаступны.",

apps/presentationeditor/embed/locale/es.json

@@ -1,38 +1,38 @@
 {
   "common.view.modals.txtCopy": "Copiar al portapapeles",
-  "common.view.modals.txtEmbed": "Incorporar",
+  "common.view.modals.txtEmbed": "Insertar",
   "common.view.modals.txtHeight": "Altura",
   "common.view.modals.txtShare": "Compartir enlace",
   "common.view.modals.txtWidth": "Ancho",
-  "PE.ApplicationController.convertationErrorText": "Fallo de conversión.",
+  "PE.ApplicationController.convertationErrorText": "Se ha producido un error en la conversión.",
-  "PE.ApplicationController.convertationTimeoutText": "Límite de tiempo de conversión está superado.",
+  "PE.ApplicationController.convertationTimeoutText": "Se ha superado el tiempo de conversión.",
   "PE.ApplicationController.criticalErrorTitle": "Error",
-  "PE.ApplicationController.downloadErrorText": "Fallo en descarga.",
+  "PE.ApplicationController.downloadErrorText": "Se ha producido un error en la descarga",
   "PE.ApplicationController.downloadTextText": "Descargando presentación...",
-  "PE.ApplicationController.errorAccessDeny": "Usted no tiene permisos para realizar la acción que está intentando hacer.<br> Por favor, contacte con su Administrador del Servidor de Documentos.",
+  "PE.ApplicationController.errorAccessDeny": "Está intentando realizar una acción para la que no tiene permiso. <br>Contacte con el administrador del servidor de documentos.",
   "PE.ApplicationController.errorDefaultMessage": "Código de error: %1",
-  "PE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.",
+  "PE.ApplicationController.errorFilePassProtect": "El archivo está protegido por una contraseña y no se puede abrir.",
-  "PE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo excede la limitación establecida para su servidor. Póngase en contacto con el administrador del Servidor de documentos para obtener más información.",
+  "PE.ApplicationController.errorFileSizeExceed": "El tamaño del archivo supera el límiete establecido por su servidor. <br>Contacte con el administrador del servidor de documentos para obtener más detalles.",
-  "PE.ApplicationController.errorForceSave": "Ha ocurrido un error al guardar el archivo. Por favor, use la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo de nuevo más tarde.",
+  "PE.ApplicationController.errorForceSave": "Se ha producido un error al guardar el archivo. Utilice la opción \"Descargar como\" para guardar el archivo en el disco duro de su ordenador o inténtelo más tarde.",
-  "PE.ApplicationController.errorLoadingFont": "Las fuentes no están cargadas.<br>Por favor, póngase en contacto con el administrador del Document Server.",
+  "PE.ApplicationController.errorLoadingFont": "Los tipos de letra no están cargados. <br>Contacte con el administrador del servidor de documentos.",
-  "PE.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado.<br>Por favor, póngase en contacto con el administrador del Servidor de Documentos.",
+  "PE.ApplicationController.errorTokenExpire": "El token de seguridad del documento ha expirado. <br>Contacte con el administrador del servidor de documentos",
-  "PE.ApplicationController.errorUpdateVersionOnDisconnect": "La conexión a Internet ha sido restaurada, y la versión del archivo ha sido cambiada. Antes de poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se pierda nada, y luego recargar esta página. ",
+  "PE.ApplicationController.errorUpdateVersionOnDisconnect": "Se ha restablecido la conexión a Internet y se ha cambiado la versión del archivo. <br>Para poder seguir trabajando, es necesario descargar el archivo o copiar su contenido para asegurarse de que no se ha perdido nada, y luego volver a cargar esta página.",
-  "PE.ApplicationController.errorUserDrop": "No se puede acceder al archivo ahora mismo.",
+  "PE.ApplicationController.errorUserDrop": "No se puede acceder al archivo.",
-  "PE.ApplicationController.notcriticalErrorTitle": "Aviso",
+  "PE.ApplicationController.notcriticalErrorTitle": "Advertencia",
   "PE.ApplicationController.openErrorText": "Se ha producido un error al abrir el archivo. ",
-  "PE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.",
+  "PE.ApplicationController.scriptLoadError": "La conexión a Internet es demasiado lenta, algunos de los componentes no se han podido cargar. Recargue la página.",
   "PE.ApplicationController.textAnonymous": "Anónimo",
   "PE.ApplicationController.textGuest": "Invitado",
   "PE.ApplicationController.textLoadingDocument": "Cargando presentación",
   "PE.ApplicationController.textOf": "de",
   "PE.ApplicationController.txtClose": "Cerrar",
   "PE.ApplicationController.unknownErrorText": "Error desconocido.",
-  "PE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no está soportado.",
+  "PE.ApplicationController.unsupportedBrowserErrorText": "Su navegador no es compatible.",
-  "PE.ApplicationController.waitText": "Por favor, espere...",
+  "PE.ApplicationController.waitText": "Espere...",
   "PE.ApplicationView.txtDownload": "Descargar",
-  "PE.ApplicationView.txtEmbed": "Incorporar",
+  "PE.ApplicationView.txtEmbed": "Insertar",
   "PE.ApplicationView.txtFileLocation": "Abrir ubicación del archivo",
-  "PE.ApplicationView.txtFullScreen": "Pantalla Completa",
+  "PE.ApplicationView.txtFullScreen": "Pantalla completa",
   "PE.ApplicationView.txtPrint": "Imprimir",
   "PE.ApplicationView.txtShare": "Compartir"
 }

apps/presentationeditor/embed/locale/id.json

@@ -17,7 +17,7 @@
   "PE.ApplicationController.errorUserDrop": "File tidak dapat di akses",
   "PE.ApplicationController.notcriticalErrorTitle": "Peringatan",
   "PE.ApplicationController.scriptLoadError": "Koneksi terlalu lambat,",
-  "PE.ApplicationController.textAnonymous": "Tamu",
+  "PE.ApplicationController.textAnonymous": "Anonim",
   "PE.ApplicationController.textLoadingDocument": "Memuat penyajian",
   "PE.ApplicationController.textOf": "Dari",
   "PE.ApplicationController.txtClose": "Tutup",
@@ -26,6 +26,7 @@
   "PE.ApplicationController.waitText": "Mohon menunggu",
   "PE.ApplicationView.txtDownload": "Unduh",
   "PE.ApplicationView.txtEmbed": "Melekatkan",
+  "PE.ApplicationView.txtFileLocation": "Buka Dokumen",
   "PE.ApplicationView.txtFullScreen": "Layar penuh",
   "PE.ApplicationView.txtShare": "Bagikan"
 }

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

@@ -546,11 +546,11 @@ define([
                 this.lockToolbar(PE.enumLock.noMoveAnimationLater, this._state.noMoveAnimationLater);
             if (this._state.noMoveAnimationEarlier != undefined)
                 this.lockToolbar(PE.enumLock.noMoveAnimationEarlier, this._state.noMoveAnimationEarlier);
-            if (PE.enumLock.noAnimationPreview != undefined)
+            if (this._state.noAnimationPreview != undefined)
                 this.lockToolbar(PE.enumLock.noAnimationPreview, this._state.noAnimationPreview);
-            if (PE.enumLock.noAnimationRepeat != undefined)
+            if (this._state.noAnimationRepeat != undefined)
                 this.lockToolbar(PE.enumLock.noAnimationRepeat, this._state.noAnimationRepeat);
-            if (PE.enumLock.noAnimationDuration != undefined)
+            if (this._state.noAnimationDuration != undefined)
                 this.lockToolbar(PE.enumLock.noAnimationDuration, this._state.noAnimationDuration);
         }
 

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

@@ -202,8 +202,10 @@ define([
             if (this.view) {
                 var current_theme = Common.UI.Themes.currentThemeId() || Common.UI.Themes.defaultThemeId(),
                     menu_item = _.findWhere(this.view.btnInterfaceTheme.menu.items, {value: current_theme});
-                this.view.btnInterfaceTheme.menu.clearAll();
+                if ( !!menu_item ) {
-                menu_item.setChecked(true, true);
+                    this.view.btnInterfaceTheme.menu.clearAll();
+                    menu_item.setChecked(true, true);
+                }
             }
         },
 

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

@@ -558,13 +558,13 @@ define([
                             opt.checkable = true;
                             opt.toggleGroup = 'animateeffects';
                             this.btnParameters.menu.addItem(opt);
-                            (opt.value == option) && (selectedElement = this.btnParameters.menu.items[index]);
+                            (opt.value == option || option===undefined && !!opt.defvalue) && (selectedElement = this.btnParameters.menu.items[index]);
                         }, this);
                         (effect && effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'});
                     } else {
                         this.btnParameters.menu.clearAll();
                         this.btnParameters.menu.items.forEach(function (opt) {
-                            if(opt.toggleGroup == 'animateeffects' && opt.value == option)
+                            if(opt.toggleGroup == 'animateeffects' && (opt.value == option || option===undefined && !!opt.options.defvalue))
                                 selectedElement = opt;
                         },this);
                     }

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

@@ -110,6 +110,7 @@ define([
                 el      : $('#animation-level'),
                 cls: 'input-group-nr',
                 editable: false,
+                valueField: 'id',
                 style   : 'margin-top: 16px; width: 100%;',
                 menuStyle: 'min-width: 100%;',
                 takeFocusOnClose: true
@@ -156,7 +157,7 @@ define([
         {
             this.cmbLevel.store.reset(Common.define.effectData.getLevelEffect(this._state.activeGroup == 'menu-effect-group-path'));
             var item = (this.activeLevel)?this.cmbLevel.store.findWhere({id: this.activeLevel}):this.cmbLevel.store.at(0);
-            this.cmbLevel.setValue(item.get('displayValue'));
+            this.cmbLevel.setValue(item.get('id'), item.get('displayValue'));
             this.activeLevel = item.get('id');
             this.fillEffect();
         },

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

@@ -89,7 +89,7 @@ define([
             Common.UI.Window.prototype.render.call(this);
 
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
-                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
                 { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);

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

@@ -123,7 +123,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
             });
 
             var data = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0C07 }, { value: 0x0407 },  {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
-                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
+                { value: 0x040B }, { value: 0x040C }, { value: 0x100C }, { value: 0x0410 }, { value: 0x0810 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x040E }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
                 { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }];
             data.forEach(function(item) {
                 var langinfo = Common.util.LanguageInfo.getLocalLanguageName(item.value);

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

@@ -448,8 +448,13 @@ define([
                 rawData = record;
             }
 
-            this.typeGradient = rawData.type + 90;
+            if (this.GradFillType === Asc.c_oAscFillGradType.GRAD_LINEAR) {
-            (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
+                this.GradLinearDirectionType = rawData.type;
+                this.typeGradient = rawData.type + 90;
+            } else {
+                this.GradRadialDirectionIdx = 0;
+                this.typeGradient = rawData.type;
+            }
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
                     this.numGradientAngle.setValue(rawData.type, true);
@@ -536,13 +541,13 @@ define([
 
         btnDirectionRedraw: function(slider, gradientColorsStr) {
             this.gradientColorsStr = gradientColorsStr;
-            if (this.mnuDirectionPicker.dataViewItems.length == 1)
+            _.each(this._viewDataLinear, function(item){
-                this.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + gradientColorsStr + ')'});
+                item.gradientColorsStr = gradientColorsStr;
-            else
+            });
-                this.mnuDirectionPicker.dataViewItems.forEach(function (item) {
+            this._viewDataRadial.gradientColorsStr = this.gradientColorsStr;
-                    var type = item.model.get('type') + 90;
+            this.mnuDirectionPicker.store.each(function(item){
-                    item.$el.children(0).css({'background': 'linear-gradient(' + type + 'deg, ' + gradientColorsStr + ')'});
+                item.set('gradientColorsStr', gradientColorsStr);
-                });
+            }, this);
 
             if (this.typeGradient == -1)
                 this.btnDirection.$icon.css({'background': 'none'});
@@ -1302,9 +1307,12 @@ define([
                 { type:270, subtype:3},
                 { type:225, subtype:7}
             ];
+            _.each(this._viewDataLinear, function(item){
+                item.gradientColorsStr = me.gradientColorsStr;
+            });
 
             this._viewDataRadial = [
-                { type:2, subtype:5}
+                { type:2, subtype:5, gradientColorsStr: this.gradientColorsStr}
             ];
 
             this.btnDirection = new Common.UI.Button({
@@ -1328,8 +1336,8 @@ define([
                     restoreHeight: 174,
                     store: new Common.UI.DataViewStore(me._viewDataLinear),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-gradient" style="background: '
-                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg, ' + me.gradientColorsStr + ' )'
+                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,<%= gradientColorsStr %>)'
-                        +' <%} else {%> radial-gradient( ' + me.gradientColorsStr + ' 70%) <%}%>;"></div>')
+                        +' <%} else {%> radial-gradient(<%= gradientColorsStr %>) <%}%>;"></div>')
                 });
             });
             this.btnDirection.render($('#shape-button-direction'));

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

@@ -110,7 +110,7 @@ define([
             this.textureNames = [this.txtCanvas, this.txtCarton, this.txtDarkFabric, this.txtGrain, this.txtGranite, this.txtGreyPaper,
                 this.txtKnit, this.txtLeather, this.txtBrownPaper, this.txtPapyrus, this.txtWood];
 
-            this.gradientColorsStr="";
+            this.gradientColorsStr="#000, #fff";
             this.typeGradient = 90;
 
             this.render();
@@ -519,8 +519,13 @@ define([
                 rawData = record;
             }
 
-            this.typeGradient = rawData.type + 90;
+            if (this.GradFillType === Asc.c_oAscFillGradType.GRAD_LINEAR) {
-            (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) ? this.GradLinearDirectionType = rawData.type : this.GradRadialDirectionIdx = 0;
+                this.GradLinearDirectionType = rawData.type;
+                this.typeGradient = rawData.type + 90;
+            } else {
+                this.GradRadialDirectionIdx = 0;
+                this.typeGradient = rawData.type;
+            }
             if (this.api) {
                 if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) {
                     this.numGradientAngle.setValue(rawData.type, true);
@@ -607,13 +612,13 @@ define([
 
         btnDirectionRedraw: function(slider, gradientColorsStr) {
             this.gradientColorsStr = gradientColorsStr;
-            if (this.mnuDirectionPicker.dataViewItems.length == 1)
+            _.each(this._viewDataLinear, function(item){
-                this.mnuDirectionPicker.dataViewItems[0].$el.children(0).css({'background': 'radial-gradient(' + gradientColorsStr + ')'});
+                item.gradientColorsStr = gradientColorsStr;
-            else
+            });
-                this.mnuDirectionPicker.dataViewItems.forEach(function (item) {
+            this._viewDataRadial.gradientColorsStr = this.gradientColorsStr;
-                    var type = item.model.get('type') + 90;
+            this.mnuDirectionPicker.store.each(function(item){
-                    item.$el.children(0).css({'background': 'linear-gradient(' + type + 'deg, ' + gradientColorsStr + ')'});
+                item.set('gradientColorsStr', gradientColorsStr);
-                });
+            }, this);
 
             if (this.typeGradient == -1)
                 this.btnDirection.$icon.css({'background': 'none'});
@@ -799,9 +804,12 @@ define([
                 { type:270, subtype:3},
                 { type:225, subtype:7}
             ];
+            _.each(this._viewDataLinear, function(item){
+                item.gradientColorsStr = me.gradientColorsStr;
+            });
 
             this._viewDataRadial = [
-                { type:2, subtype:5}
+                { type:2, subtype:5, gradientColorsStr: this.gradientColorsStr}
             ];
 
             this.btnDirection = new Common.UI.Button({
@@ -825,8 +833,8 @@ define([
                     restoreHeight: 174,
                     store: new Common.UI.DataViewStore(me._viewDataLinear),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-gradient" style="background: '
-                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,#000, #fff)'
+                        +'<% if(type!=2) {%>linear-gradient(<%= type + 90 %>deg,<%= gradientColorsStr %>)'
-                        +' <%} else {%> radial-gradient( #000 , #fff 70%) <%}%>;"></div>')
+                        +' <%} else {%> radial-gradient(<%= gradientColorsStr %>) <%}%>;"></div>')
                 });
             });
             this.btnDirection.render($('#slide-button-direction'));